1853 files changed, 0 insertions, 426758 deletions

diff --git a/CIAO/connectors/dds4ccm/DDS4CCM-INSTALL.html b/CIAO/connectors/dds4ccm/DDS4CCM-INSTALL.html
deleted file mode 100644
index d0ac2877f3c..00000000000
--- a/CIAO/connectors/dds4ccm/DDS4CCM-INSTALL.html
+++ /dev/null
@@ -1,199 +0,0 @@
-<!--   -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-    <html xmlns="http://www.w3.org/1999/xhtml"><head>
-    <title>Building and Installing DDS4CCM</title>
-    <LINK rev="made" href="mailto:jwillemsen@remedy.nl"></head>
-  <body text="#000000" vLink="#ff0f0f" link="#000fff" bgColor="#ffffff">
-    <hr>
-    <h3>Introduction</h3>
-    <p>The DDS4CCM connector implements the DDS4LwCCM specification.
-      DDS4CCM is part of CIAO and integrates DDS into CCM,
-      which can be easily deployed, using DAnCE.
-      The CIAO DDS4CCM connector implementation supports
-      <a href="http://www.rti.com/products/dds/index.html">RTI DDS</a> and
-      <a href="http://www.opendds.org">OpenDDS</a> as underlying DDS vendors.
-    </p>
-    <h3>Building and Installing DDS4CCM on Linux</h3>
-DDS4CCM is used frequently on linux. Before building DDS4CCM make sure that perl, make, gcc-g++, and libxerces-c-devel are installed
-as packages.
-    <h4>Building and Installing DDS4CCM with OpenDDS on Linux</h4>
-
-Building DDS4CCM with OpenDDS integration takes a few manual steps to get the job done. Besides downloading ACE+TAO+CIAO+DAnCE and OpenDDS
-the build has to be configured. For this integration we need 3 configuration files. For controlling the MPC makefile generation
-we need to create $ACE_ROOT/bin/MakeProjectCreator/config/default.features. This is needed because each DDS vendor has its own IDL compiler
-which has to be triggered during the build step. Secondly we need to create $ACE_ROOT/include/makeinclude/platform_macros.GNU to define
-the settings for GNU make, and as last we create $ACE_ROOT/ace/config.h to control the compiler settings. After initial compilation you can
-tweak more settings in these 3 files, but we do recommend to do a full rebuild when changing any of these files.
-</p><p>
-The steps below download ATCD and OpenDDS, create all needed environment variables and configuration
-files and compiles all core code and the DDS4CCM shapes example. As last step it deploys this
-example which dumps shapes information to the console.
-<pre>
-wget http://download.dre.vanderbilt.edu/ACE+TAO-distribution/ACE+TAO+CIAO-src.tar.bz2
-wget http://download.ociweb.com/OpenDDS/OpenDDS-3.5.tar.gz
-tar xvf ACE+TAO+CIAO-src.tar.bz2
-tar xvf OpenDDS-3.5.tar.gz
-export DOC_ROOT=`pwd`
-export ACE_ROOT=$DOC_ROOT/ACE_wrappers
-export TAO_ROOT=$ACE_ROOT/TAO
-export CIAO_ROOT=$TAO_ROOT/CIAO
-export DANCE_ROOT=$TAO_ROOT/DAnCE
-export DDS_ROOT=$DOC_ROOT/DDS
-export LD_LIBRARY_PATH=$ACE_ROOT/lib:$DDS_ROOT/lib:$LD_LIBRARY_PATH
-echo -e '#include "ace/config-linux.h"' > $ACE_ROOT/ace/config.h
-echo -e 'dds4ccm_opendds=1\nxerces3=1\ninclude $(ACE_ROOT)/include/makeinclude/platform_linux.GNU' > $ACE_ROOT/include/makeinclude/platform_macros.GNU
-echo -e 'dds4ccm_opendds=1\ndds_suppress_anys=0\nxerces3=1\n' > $ACE_ROOT/bin/MakeProjectCreator/config/default.features
-cd $CIAO_ROOT && $ACE_ROOT/bin/mwc.pl -type gnuace -workers 4 CIAO_TAO_DAnCE_OpenDDS.mwc
-cd $CIAO_ROOT/connectors/dds4ccm/examples/Shapes && $ACE_ROOT/bin/mwc.pl -type gnuace -workers 4
-cd $CIAO_ROOT && make
-cd $CIAO_ROOT/connectors/dds4ccm/examples/Shapes && make
-cd $CIAO_ROOT/connectors/dds4ccm/examples/Shapes/descriptors && perl run_test.pl
-</pre>
-    <h4>Building and Installing DDS4CCM with RTI DDS on Linux</h4>
-
-Building DDS4CCM with RTI DDS integration takes a few manual steps to get the job done. Besides downloading ACE+TAO+CIAO+DAnCE and RTI DDS
-the build has to be configured. For this integration we need 3 configuration files. For controlling the MPC makefile generation
-we need to create $ACE_ROOT/bin/MakeProjectCreator/config/default.features. This is needed because each DDS vendor has its own IDL compiler
-which has to be triggered during the build step. Secondly we need to create $ACE_ROOT/include/makeinclude/platform_macros.GNU to define
-the settings for GNU make, and as last we create $ACE_ROOT/ace/config.h to control the compiler settings. After initial compilation you can
-tweak more settings in these 3 files, but we do recommend to do a full rebuild when changing any of these files.
-</p><p>
-The steps below assume that RTI DDS has been obtained from RTI including their CORBA Compatibility Kit (CCK). The environment
-variables NDDSHOME and  NDDSARCHITECTURE must be defined accordingly the RTI documentation.
-
-</p><p>
-The steps below download ATCD, create all needed ATCD environment variables and configuration
-files and compiles all core code and the DDS4CCM shapes example. As last step it deploys this
-example which dumps shapes information to the console.
-<pre>
-wget http://download.dre.vanderbilt.edu/ACE+TAO-distribution/ACE+TAO+CIAO-src.tar.bz2
-tar xvf ACE+TAO+CIAO-src.tar.bz2
-export DOC_ROOT=`pwd`
-export ACE_ROOT=$DOC_ROOT/ACE_wrappers
-export TAO_ROOT=$ACE_ROOT/TAO
-export CIAO_ROOT=$TAO_ROOT/CIAO
-export DANCE_ROOT=$TAO_ROOT/DAnCE
-export LD_LIBRARY_PATH=$ACE_ROOT/lib:$LD_LIBRARY_PATH
-echo -e '#include "ace/config-linux.h"' > $ACE_ROOT/ace/config.h
-echo -e 'dds4ccm_ndds=1\nndds=1\nxerces3=1\ninclude $(ACE_ROOT)/include/makeinclude/platform_linux.GNU' > $ACE_ROOT/include/makeinclude/platform_macros.GNU
-echo -e 'dds4ccm_ndds=1\nndds=1\nxerces3=1\n' > $ACE_ROOT/bin/MakeProjectCreator/config/default.features
-cd $CIAO_ROOT && $ACE_ROOT/bin/mwc.pl -type gnuace -workers 4 CIAO_TAO_DAnCE.mwc
-cd $CIAO_ROOT/connectors/dds4ccm/examples/Shapes && $ACE_ROOT/bin/mwc.pl -type gnuace -workers 4
-cd $CIAO_ROOT && make
-cd $CIAO_ROOT/connectors/dds4ccm/examples/Shapes && make
-cd $CIAO_ROOT/connectors/dds4ccm/examples/Shapes/descriptors && perl run_test.pl
-</pre>
-    <h3>Building and Installing DDS4CCM with RTI DDS on Windows</h3>
-
-Building DDS4CCM with RTI DDS integration takes a few manual steps to get the job done. Besides downloading ACE+TAO+CIAO+DAnCE and RTI DDS
-the build has to be configured. For this integration we need 2 configuration files. For controlling the MPC makefile generation
-we need to create $ACE_ROOT/bin/MakeProjectCreator/config/default.features. This is needed because each DDS vendor has its own IDL compiler
-which has to be triggered during the build step. Secondly we need to create $ACE_ROOT/ace/config.h to control the compiler settings. After initial compilation you can
-tweak more settings in these 2 files, but we do recommend to do a full rebuild when changing any of these files.
-</p><p>
-The steps below assume that RTI DDS has been obtained from RTI including their CORBA Compatibility Kit (CCK). The environment
-variables NDDSHOME and NDDSARCHITECTURE must be defined accordingly the RTI documentation.
-Make sure that when you have
-a path with spaces in it you don't use double quotes around the path when setting the environment variable.
-</p><p>
-These instructions assume that you have cygwin installed including wget and unzip and that these utilities are in your path.
-For perl we advice to use ActiveState perl. You also need
-to obtain and install xerces3, the XERCESCROOT environment variable should point to the location of your xerces3 tree.
-</p><p>
-The steps below download ATCD, create all needed ATCD environment variables and configuration
-files and compiles all core code and the DDS4CCM shapes example. As last step it deploys this
-example which dumps shapes information to the console. Run the commands from a Visual Studio command
-prompt. In the steps where <code>devenv</code> is used, the IDE will start and you can use
-the IDE to compile the project. Compiling the code will take some time, we can recommend Incredibuild
-to speed up compilation using distribution compilation. When the full solution has compiled, close the IDE
-and perform the next step.
-<pre>
-\cygwin\bin\wget http://download.dre.vanderbilt.edu/ACE+TAO-distribution/ACE+TAO+CIAO-src.zip
-\cygwin\bin\unzip ACE+TAO+CIAO-src.zip
-set DOC_ROOT=%CD%
-set ACE_ROOT=%DOC_ROOT%\ACE_wrappers
-set TAO_ROOT=%ACE_ROOT%\TAO
-set CIAO_ROOT=%TAO_ROOT%\CIAO
-set DANCE_ROOT=%TAO_ROOT%\DAnCE
-set PATH=%ACE_ROOT%\lib;%XERCESCROOT%\bin;%NDDSHOME%\lib\%NDDSARCHITECTURE%;%PATH%
-echo #include "ace/config-win32.h" > %ACE_ROOT%/ace/config.h
-echo dds4ccm_ndds=1 > %ACE_ROOT%/bin/MakeProjectCreator/config/default.features
-echo ndds=1 > %ACE_ROOT%/bin/MakeProjectCreator/config/default.features
-echo xerces3=1 > %ACE_ROOT%/bin/MakeProjectCreator/config/default.features
-</pre>
-    <h3>Building and Installing DDS4CCM on Windows using Visual Studio 2010</h3>
-When you want to compile now using Visual Studio 2010 you can use the following steps
-<pre>
-cd %CIAO_ROOT% && perl %ACE_ROOT%\bin\mwc.pl -type vc10 -workers 4 CIAO_TAO_DAnCE.mwc
-cd %CIAO_ROOT%\connectors\dds4ccm\examples\Shapes && perl %ACE_ROOT%\bin\mwc.pl -type vc10 -workers 4
-cd %CIAO_ROOT% && devenv CIAO_TAO_DAnCE.sln
-cd %CIAO_ROOT%\connectors\dds4ccm\examples\Shapes && devenv Shapes.sln
-cd %CIAO_ROOT%\connectors\dds4ccm\examples\Shapes\descriptors && perl run_test.pl
-</pre>
-    <h3>Building and Installing DDS4CCM on Windows using nmake</h3>
-When using nmake you can use the following steps. At the moment you want to compile for Windows x86_64, add
-<code>-value_template platforms=x64</code> to the mwc.pl commands below.
-
-<pre>
-cd %CIAO_ROOT% && perl %ACE_ROOT%\bin\mwc.pl -type nmake -workers 4 CIAO_TAO_DAnCE.mwc
-cd %CIAO_ROOT%\connectors\dds4ccm\examples\Shapes && perl %ACE_ROOT%\bin\mwc.pl -type nmake -workers 4
-cd %CIAO_ROOT% && nmake
-cd %CIAO_ROOT%\connectors\dds4ccm\examples\Shapes && nmake
-cd %CIAO_ROOT%\connectors\dds4ccm\examples\Shapes\descriptors && perl run_test.pl
-</pre>
-    <h3>Additionally Building and Installing DDS4CCM</h3>
-    <p>
-      If you already have a configuration of CIAO, the instruction below
-      explain which additional settings are needed in order to compile
-      DDS4CCM.For compiling DDS4CCM the correct flags need to be in the default.features and platform_macros.GNU files..
-      For compiling and installing CIAO see <a href="../../CIAO-INSTALL.html">CIAO-INSTALL.html</a>.
-      DDS4CCM uses DAnCE as deployement tool in all of the examples and tests.
-      Therefor one should also be sure that DAnCE is build and installed
-      in order to run the DDS4CCM examples.<br/>
-    </p>
-    <h4>Setting up default.features and platform_macros.GNU</h4>
-    <p>Besided the flags needed to build ACE, TAO, CIAO, and, DAnCE, the following
-      flags should be added for DDS4CCM.
-    </p>
-    <p>$ACE_ROOT/bin/MakeProjectCreator/config/default.features should contain at least the following flags for RTI DDS:<br/>
-      <ul>
-        <li><code>ndds=1</code></li>
-        <li><code>dds4ccm_ndds=1</code></li>
-      </ul>
-    </p>
-    <p>$ACE_ROOT/bin/MakeProjectCreator/config/default.features should contain at least the following flags for OpenDDS:<br/>
-      <ul>
-        <li><code>dds4ccm_opendds=1</code></li>
-        <li><code>dds_suppress_anys=0</code></li>
-      </ul>
-    </p>
-    <p>$ACE_ROOT/include/makeinclude/platform_macros.GNU should contain at least the following flags for RTI DDS:<br/>
-      <ul>
-        <li><code>ndds=1</code></li>
-        <li><code>dds4ccm_ndds=1</code></li>
-      </ul>
-    </p>
-    <p>$ACE_ROOT/include/makeinclude/platform_macros.GNU should contain at least the following flags for OpenDDS:<br/>
-      <ul>
-        <li><code>dds4ccm_opendds=1</code></li>
-      </ul>
-    </p>
-    <p>
-      To be sure that CIAO, DAnCE and DDS4CCM are build correctly, one might
-      use the $CIAO_ROOT/CIAO_TAO_DAnCE.mwc workspace for RTI DDS.
-<p>
-</p>
-      When using DDS4CCM with OpenDDS we commend you to use the $CIAO_ROOT/CIAO_TAO_DAnCE_OpenDDS.mwc workspace. This workspace
-      will compile all needed parts of ACE, TAO, CIAO, DAnCE, and OpenDDS. OpenDDS has to be compiled before compiling DDS4CCM
-      because we are using several of the OpenDDS libraries and the OpenDDS IDL compiler.
-    </p>
-    <hr>
-    <h3>Supported Platforms for DDS4CCM</h3>
-    <p>DDS4CCM is daily compiled and tested on Linux with RTI DDS and OpenDDS. It does compile on Windows with Microsoft Visual Studio 10 but
-    we have not validated all tests.
-    </p>
-    <hr>
-    <p>Back to the <a href="../../CIAO-INSTALL.html">CIAO</a> install page</p>
-  </body>
-</html>
diff --git a/CIAO/connectors/dds4ccm/docs/DDS4CCM Cheat Sheet.rtf b/CIAO/connectors/dds4ccm/docs/DDS4CCM Cheat Sheet.rtf
deleted file mode 100644
index 2c2182eb1da..00000000000
--- a/CIAO/connectors/dds4ccm/docs/DDS4CCM Cheat Sheet.rtf
+++ /dev/null
@@ -1,331 +0,0 @@
-{\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff31507\deff0\stshfdbch0\stshfloch31506\stshfhich31506\stshfbi31506\deflang1043\deflangfe1043\themelang1033\themelangfe0\themelangcs0{\fonttbl{\f0\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f34\fbidi \froman\fcharset0\fprq2{\*\panose 02040503050406030204}Cambria Math;}

-{\f36\fbidi \froman\fcharset0\fprq2{\*\panose 02040503050406030204}Cambria;}{\f37\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}{\flomajor\f31500\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}

-{\fdbmajor\f31501\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fhimajor\f31502\fbidi \froman\fcharset0\fprq2{\*\panose 02040503050406030204}Cambria;}

-{\fbimajor\f31503\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\flominor\f31504\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}

-{\fdbminor\f31505\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fhiminor\f31506\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}

-{\fbiminor\f31507\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f41\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\f42\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}

-{\f44\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\f45\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\f46\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\f47\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}

-{\f48\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\f49\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f381\fbidi \froman\fcharset238\fprq2 Cambria Math CE;}{\f382\fbidi \froman\fcharset204\fprq2 Cambria Math Cyr;}

-{\f384\fbidi \froman\fcharset161\fprq2 Cambria Math Greek;}{\f385\fbidi \froman\fcharset162\fprq2 Cambria Math Tur;}{\f388\fbidi \froman\fcharset186\fprq2 Cambria Math Baltic;}{\f401\fbidi \froman\fcharset238\fprq2 Cambria CE;}

-{\f402\fbidi \froman\fcharset204\fprq2 Cambria Cyr;}{\f404\fbidi \froman\fcharset161\fprq2 Cambria Greek;}{\f405\fbidi \froman\fcharset162\fprq2 Cambria Tur;}{\f408\fbidi \froman\fcharset186\fprq2 Cambria Baltic;}

-{\f411\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}{\f412\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}{\f414\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\f415\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;}

-{\f418\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;}{\flomajor\f31508\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\flomajor\f31509\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}

-{\flomajor\f31511\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\flomajor\f31512\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\flomajor\f31513\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}

-{\flomajor\f31514\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\flomajor\f31515\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\flomajor\f31516\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}

-{\fdbmajor\f31518\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fdbmajor\f31519\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fdbmajor\f31521\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}

-{\fdbmajor\f31522\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fdbmajor\f31523\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fdbmajor\f31524\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}

-{\fdbmajor\f31525\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fdbmajor\f31526\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fhimajor\f31528\fbidi \froman\fcharset238\fprq2 Cambria CE;}

-{\fhimajor\f31529\fbidi \froman\fcharset204\fprq2 Cambria Cyr;}{\fhimajor\f31531\fbidi \froman\fcharset161\fprq2 Cambria Greek;}{\fhimajor\f31532\fbidi \froman\fcharset162\fprq2 Cambria Tur;}

-{\fhimajor\f31535\fbidi \froman\fcharset186\fprq2 Cambria Baltic;}{\fbimajor\f31538\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fbimajor\f31539\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}

-{\fbimajor\f31541\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbimajor\f31542\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fbimajor\f31543\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}

-{\fbimajor\f31544\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbimajor\f31545\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fbimajor\f31546\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}

-{\flominor\f31548\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\flominor\f31549\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\flominor\f31551\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}

-{\flominor\f31552\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\flominor\f31553\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\flominor\f31554\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}

-{\flominor\f31555\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\flominor\f31556\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fdbminor\f31558\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}

-{\fdbminor\f31559\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fdbminor\f31561\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fdbminor\f31562\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}

-{\fdbminor\f31563\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fdbminor\f31564\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fdbminor\f31565\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}

-{\fdbminor\f31566\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fhiminor\f31568\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}{\fhiminor\f31569\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}

-{\fhiminor\f31571\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\fhiminor\f31572\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;}{\fhiminor\f31575\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;}

-{\fbiminor\f31578\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fbiminor\f31579\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fbiminor\f31581\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}

-{\fbiminor\f31582\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fbiminor\f31583\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fbiminor\f31584\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}

-{\fbiminor\f31585\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fbiminor\f31586\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}}{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;

-\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;

-\red192\green192\blue192;\caccentone\ctint255\cshade191\red54\green95\blue145;\caccenttwo\ctint255\cshade191\red148\green54\blue52;\ctexttwo\ctint153\cshade255\red84\green141\blue212;}{\*\defchp \f31506\fs22 }{\*\defpap \ql \li0\ri0\sa200\sl276\slmult1

-\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 }\noqfpromote {\stylesheet{\ql \li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af31507\afs22\alang1025 

-\ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \snext0 \sqformat \spriority0 \styrsid15026008 Normal;}{\s1\ql \li0\ri0\sb480\sl276\slmult1

-\keep\keepn\widctlpar\wrapdefault\aspalpha\aspnum\faauto\outlinelevel0\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \ab\af31503\afs28\alang1025 \ltrch\fcs0 \b\fs28\cf17\lang1033\langfe1033\loch\f31502\hich\af31502\dbch\af31501\cgrid\langnp1033\langfenp1033 

-\sbasedon0 \snext0 \slink15 \sqformat \spriority9 \styrsid9653913 heading 1;}{\*\cs10 \additive \ssemihidden \sunhideused \spriority1 Default Paragraph Font;}{\*

-\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\tblind0\tblindtype3\tscellwidthfts0\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv \ql \li0\ri0\sa200\sl276\slmult1

-\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af31506\afs22\alang1025 \ltrch\fcs0 \f31506\fs22\lang1043\langfe1043\cgrid\langnp1043\langfenp1043 \snext11 \ssemihidden \sunhideused \sqformat Normal Table;}{\*\cs15 

-\additive \rtlch\fcs1 \ab\af31503\afs28 \ltrch\fcs0 \b\fs28\cf17\loch\f31502\hich\af31502\dbch\af31501 \sbasedon10 \slink1 \slocked \spriority9 \styrsid9653913 Heading 1 Char;}{\s16\ql \li720\ri0\sa200\sl276\slmult1

-\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin720\itap0\contextualspace \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 

-\sbasedon0 \snext16 \sqformat \spriority34 \styrsid11697437 List Paragraph;}}{\*\listtable{\list\listtemplateid-53073786\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext

-\leveltemplateid67698703\'02\'00.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \fbias0\hres0\chhres0 \fi-360\li720\lin720 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext

-\leveltemplateid67698713\'02\'01.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li1440\lin1440 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext

-\leveltemplateid67698715\'02\'02.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-180\li2160\lin2160 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext

-\leveltemplateid67698703\'02\'03.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li2880\lin2880 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext

-\leveltemplateid67698713\'02\'04.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li3600\lin3600 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext

-\leveltemplateid67698715\'02\'05.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-180\li4320\lin4320 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext

-\leveltemplateid67698703\'02\'06.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li5040\lin5040 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext

-\leveltemplateid67698713\'02\'07.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li5760\lin5760 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext

-\leveltemplateid67698715\'02\'08.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-180\li6480\lin6480 }{\listname ;}\listid1728650877}}{\*\listoverridetable{\listoverride\listid1728650877\listoverridecount0\ls1}}{\*\pgptbl {\pgp\ipgp5

-\itap0\li13\ri3206\sb0\sa0}{\pgp\ipgp1\itap0\li0\ri3068\sb0\sa250}{\pgp\ipgp2\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp0\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp0\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp7\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp2\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp3\itap0

-\li0\ri0\sb0\sa0}{\pgp\ipgp7\itap0\li0\ri0\sb0\sa0}}{\*\rsidtbl \rsid8454\rsid15315\rsid67679\rsid77780\rsid84957\rsid87025\rsid153986\rsid203886\rsid275853\rsid278286\rsid328307\rsid345313\rsid347212\rsid415250\rsid471019\rsid598854\rsid808264\rsid929963

-\rsid1209787\rsid1256658\rsid1269269\rsid1270632\rsid1271289\rsid1592404\rsid1867106\rsid1974756\rsid1993465\rsid2122301\rsid2235269\rsid2317587\rsid2448722\rsid2491227\rsid2583900\rsid2622451\rsid2776445\rsid2833315\rsid2895496\rsid2969746\rsid3171861

-\rsid3306671\rsid3364695\rsid3540144\rsid3544782\rsid3609585\rsid3627019\rsid3758634\rsid3883925\rsid4016460\rsid4131369\rsid4146898\rsid4203378\rsid4339062\rsid4350283\rsid4457963\rsid4670306\rsid4684338\rsid4725190\rsid4919091\rsid4934880\rsid5263182

-\rsid5383469\rsid5397924\rsid5457871\rsid5714160\rsid5727512\rsid5778033\rsid5973740\rsid6180484\rsid6323867\rsid6383671\rsid6502984\rsid6562354\rsid6574358\rsid6892139\rsid6892932\rsid7096006\rsid7100257\rsid7107184\rsid7157087\rsid7489967\rsid7671569

-\rsid7693542\rsid7752817\rsid7756596\rsid7829550\rsid7883739\rsid7892250\rsid8200726\rsid8203585\rsid8345035\rsid8589070\rsid8724633\rsid8811513\rsid8848805\rsid8855485\rsid8870814\rsid8940962\rsid9124194\rsid9243072\rsid9271489\rsid9384744\rsid9388898

-\rsid9452363\rsid9534822\rsid9653913\rsid9770997\rsid9830716\rsid9915170\rsid10571263\rsid10638047\rsid11080896\rsid11149407\rsid11225654\rsid11286512\rsid11486316\rsid11681155\rsid11697437\rsid11873757\rsid11881575\rsid12137180\rsid12141597\rsid12272359

-\rsid12281811\rsid13047800\rsid13050400\rsid13505611\rsid13526351\rsid13702661\rsid13711679\rsid13721774\rsid13960238\rsid14094245\rsid14297001\rsid14305119\rsid14486031\rsid14564103\rsid14692711\rsid14693039\rsid14765909\rsid14950011\rsid15026008

-\rsid15079565\rsid15087040\rsid15095150\rsid15095400\rsid15295863\rsid15430320\rsid15478184\rsid15560246\rsid15612630\rsid15689730\rsid15800169\rsid15995885\rsid16070791\rsid16476994\rsid16584720\rsid16591234\rsid16594231}{\mmathPr\mmathFont34\mbrkBin0

-\mbrkBinSub0\msmallFrac0\mdispDef1\mlMargin0\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0\mnaryLim1}{\info{\author Marcel Smit}{\operator Johnny}{\creatim\yr2010\mo7\dy26\hr14\min35}{\revtim\yr2010\mo7\dy27\hr7\min31}{\printim\yr2010\mo7\dy26\hr11\min12}

-{\version4}{\edmins209}{\nofpages1}{\nofwords346}{\nofchars2002}{\*\company ACE/TAO/CIAO opensource community}{\nofcharsws2311}{\vern32771}}{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wordml}}

-\paperw12240\paperh15840\margl1008\margr1008\margt1008\margb1008\gutter0\ltrsect 

-\widowctrl\ftnbj\aenddoc\hyphhotz425\trackmoves1\trackformatting1\donotembedsysfont1\relyonvml0\donotembedlingdata0\grfdocevents0\validatexml1\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0\showxmlerrors1

-\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\formshade\horzdoc\dgmargin\dghspace180\dgvspace180\dghorigin1008\dgvorigin1008\dghshow1\dgvshow1

-\jexpand\viewkind1\viewscale120\pgbrdrhead\pgbrdrfoot\splytwnine\ftnlytwnine\htmautsp\nolnhtadjtbl\useltbaln\alntblind\lytcalctblwd\lyttblrtgr\lnbrkrule\nobrkwrptbl\snaptogridincell\allowfieldendsel\wrppunct

-\asianbrkrule\rsidroot9653913\newtblstyruls\nogrowautofit\viewbksp1\usenormstyforlist\noindnmbrts\felnbrelev\nocxsptable\indrlsweleven\noafcnsttbl\afelev\utinl\hwelev\spltpgpar\notcvasp\notbrkcnstfrctbl\notvatxbx\krnprsnet\cachedcolbal \nouicompat \fet0

-{\*\wgrffmtfilter 2450}\nofeaturethrottle1\ilfomacatclnup0\ltrpar \sectd \ltrsect\linex0\headery708\footery708\colsx708\endnhere\sectlinegrid360\sectdefaultcl\sectrsid16476994\sftnbj {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}

-{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}

-{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl9

-\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}\pard\plain \ltrpar\s1\qc \li0\ri0\sl276\slmult1\keep\keepn\widctlpar\wrapdefault\aspalpha\aspnum\faauto\outlinelevel0\adjustright\rin0\lin0\itap0\pararsid11080896 \rtlch\fcs1 

-\ab\af31503\afs28\alang1025 \ltrch\fcs0 \b\fs28\cf17\lang1033\langfe1033\loch\af31502\hich\af31502\dbch\af31501\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af31503 \ltrch\fcs0 \insrsid9653913 \hich\af31502\dbch\af31501\loch\f31502 DDS4CCM Cheat Sheet}{

-\rtlch\fcs1 \af31503 \ltrch\fcs0 \insrsid15026008 

-\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \b\f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid2448722 \hich\af31506\dbch\af0\loch\f31506 1.\tab}}\pard\plain \ltrpar\s16\ql \fi-360\li720\ri0\sb120\sl276\slmult1

-\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\adjustright\rin0\lin720\itap0\pararsid14765909\contextualspace \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af31507 

-\ltrch\fcs0 \b\ul\insrsid2448722 Where the DDS4CCM connector lives

-\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid2448722 \hich\af31506\dbch\af0\loch\f31506 a.\tab}}\pard \ltrpar\s16\ql \fi-360\li1440\ri0\sb120\sl276\slmult1

-\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\ilvl1\adjustright\rin0\lin1440\itap0\pararsid14765909\contextualspace {\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid2448722 Implementation: }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\insrsid2448722\charrsid1592404 

-$CIAO_ROOT/connectors/dds4ccm/impl}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid2448722\charrsid2448722 

-\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid2448722 \hich\af31506\dbch\af0\loch\f31506 b.\tab}}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid2448722 IDL Definitions: }{

-\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\insrsid2448722\charrsid1592404 $CIAO_ROOT/connectors/dds4ccm/idl}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid2448722\charrsid1592404 

-\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \b\f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid11681155\charrsid14692711 \hich\af31506\dbch\af0\loch\f31506 2.\tab}}\pard \ltrpar

-\s16\ql \fi-360\li720\ri0\sb120\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\adjustright\rin0\lin720\itap0\pararsid11681155 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\ul\insrsid11681155\charrsid14692711 RTI\rquote s actual DDS objects

-\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid11681155\charrsid15079565 \hich\af31506\dbch\af0\loch\f31506 a.\tab}}\pard \ltrpar

-\s16\ql \fi-360\li1440\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\ilvl1\adjustright\rin0\lin1440\itap0\pararsid11681155\contextualspace {\rtlch\fcs1 \af31507 \ltrch\fcs0 \ul\insrsid11681155\charrsid15079565 Naming}{

-\rtlch\fcs1 \af31507 \ltrch\fcs0 \ul\insrsid11681155 :}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid11681155  }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf18\insrsid11681155\charrsid1592404 DDS*}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid11681155\charrsid5714160 

- or}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\insrsid11681155  }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf18\insrsid11681155\charrsid1592404 DDS_*}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid11681155\charrsid5714160  }{\rtlch\fcs1 \af31507 \ltrch\fcs0 

-\i\insrsid11681155\charrsid5714160 using RTI\rquote s \'93no namespace}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\insrsid11681155 \'94}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\insrsid11681155\charrsid5714160  version of }{\rtlch\fcs1 \af31507 \ltrch\fcs0 

-\i\insrsid11681155 entity }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\insrsid11681155\charrsid5714160 names}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\insrsid11681155 .}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid11681155 

-\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid11681155 \hich\af31506\dbch\af0\loch\f31506 b.\tab}}\pard \ltrpar\s16\ql \fi-360\li1440\ri0\sa200\sl276\slmult1

-\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\ilvl1\adjustright\rin0\lin1440\itap0\pararsid11681155 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid11681155 Objects created on demand.

-\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \b\f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid7892250\charrsid14692711 \hich\af31506\dbch\af0\loch\f31506 3.\tab}}\pard \ltrpar

-\s16\ql \fi-360\li720\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\adjustright\rin0\lin720\itap0\pararsid11697437\contextualspace {\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\ul\insrsid7892250\charrsid14692711 DDS }{\rtlch\fcs1 

-\af31507 \ltrch\fcs0 \b\ul\insrsid8848805 entities }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\ul\insrsid7157087 defined in IDL}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\ul\insrsid7892250\charrsid14692711 

-\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid15079565\charrsid15079565 \hich\af31506\dbch\af0\loch\f31506 a.\tab}}\pard \ltrpar

-\s16\ql \fi-360\li1440\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\ilvl1\adjustright\rin0\lin1440\itap0\pararsid3306671 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \ul\insrsid15079565\charrsid15079565 Naming}{\rtlch\fcs1 \af31507 

-\ltrch\fcs0 \ul\insrsid278286 :}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid1270632  }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf18\insrsid1270632\charrsid1592404 ::DDS::*}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\insrsid1270632  }{\rtlch\fcs1 \af31507 \ltrch\fcs0 

-\i\insrsid1270632 - definitions in }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\i\insrsid1270632\charrsid1270632 idl/dds_rtf2_dcps.idl}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\insrsid1270632\charrsid1270632  (modified DDS spec IDL)}{\rtlch\fcs1 \af31507 \ltrch\fcs0 

-\i\insrsid1270632  use DDS module}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid15430320 .}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid7892250 

-\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \b\f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid11697437\charrsid14692711 \hich\af31506\dbch\af0\loch\f31506 4.\tab}}\pard \ltrpar

-\s16\ql \fi-360\li720\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\adjustright\rin0\lin720\itap0\pararsid11697437\contextualspace {\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\ul\insrsid11697437\charrsid14692711 DDS \'93proxy\'94

- classes}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\ul\insrsid4457963\charrsid4457963  (implement DDS entities defined in IDL)}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\ul\insrsid11697437\charrsid4457963 :}{\rtlch\fcs1 \af31507 \ltrch\fcs0 

-\b\ul\insrsid14486031\charrsid14692711 

-\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid278286\charrsid15079565 \hich\af31506\dbch\af0\loch\f31506 a.\tab}}\pard \ltrpar\s16\ql \fi-360\li1440\ri0\sl276\slmult1

-\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\ilvl1\adjustright\rin0\lin1440\itap0\pararsid3540144\contextualspace {\rtlch\fcs1 \af31507 \ltrch\fcs0 \ul\insrsid278286\charrsid15079565 Naming}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \ul\insrsid278286 :}{

-\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid278286  }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf18\insrsid278286\charrsid929963 ::CIAO::DDS4CCM}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \cf18\insrsid278286\charrsid929963 ::}{\rtlch\fcs1 \af31507 \ltrch\fcs0 

-\b\cf18\insrsid278286\charrsid929963  CCM_DDS_*}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\i\cf18\insrsid278286\charrsid929963 <}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\i\cf18\insrsid153986\charrsid929963 XXX}{\rtlch\fcs1 \af31507 \ltrch\fcs0 

-\b\i\cf18\insrsid278286\charrsid929963 >}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\insrsid278286  }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid4684338 

-\par }\pard\plain \ltrpar\ql \li1440\ri0\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin1440\itap0\pararsid3540144 \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {

-\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf18\insrsid153986\charrsid929963 <XXX>}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid14305119  -}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid14692711  }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \cf19\insrsid14692711\charrsid3540144 

-class }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf19\insrsid14692711\charrsid3540144 and}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf19\insrsid6323867\charrsid3540144  some (not all)}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf19\insrsid14692711\charrsid3540144 

- filename}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf19\insrsid6323867\charrsid3540144 s}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid14305119 

-\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \b\f31506\fs22\cf18\lang1033\langfe1033\langnp1033\langfenp1033\insrsid14305119\charrsid929963 \hich\af31506\dbch\af0\loch\f31506 1.\tab}}\pard\plain \ltrpar

-\s16\ql \fi-360\li2333\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\ilvl3\adjustright\rin0\lin2333\itap0\pararsid3540144\contextualspace \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 

-\f31506\fs22\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf18\insrsid14305119\charrsid929963 _Base}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid14305119  for non-typed code from which typed code derives

-\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \b\f31506\fs22\cf18\lang1033\langfe1033\langnp1033\langfenp1033\insrsid14305119\charrsid929963 \hich\af31506\dbch\af0\loch\f31506 2.\tab}}\pard \ltrpar

-\s16\ql \fi-360\li2333\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\ilvl3\adjustright\rin0\lin2333\itap0\pararsid7489967\contextualspace {\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf18\insrsid14305119\charrsid929963 _T}{\rtlch\fcs1 

-\af31507 \ltrch\fcs0 \insrsid14305119  - }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid6383671 for }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid14305119 typed code

-\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid8855485 \hich\af31506\dbch\af0\loch\f31506 b.\tab}}\pard \ltrpar\s16\ql \fi-360\li1440\ri0\sa200\sl276\slmult1

-\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\ilvl1\adjustright\rin0\lin1440\itap0\pararsid11697437\contextualspace {\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid8855485 Have data member (}{\rtlch\fcs1 \af31507 \ltrch\fcs0 

-\cf19\insrsid1256658\charrsid2583900 Marcel }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \cf19\insrsid4131369\charrsid2583900 think}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \cf19\insrsid1256658\charrsid2583900 s}{\rtlch\fcs1 \af31507 \ltrch\fcs0 

-\cf19\insrsid4131369\charrsid2583900  it is always a}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \cf19\insrsid8855485\charrsid2583900  pointer}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid8855485 ) with the RTI equivalent entity object.

-\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid5457871 \hich\af31506\dbch\af0\loch\f31506 c.\tab}}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid5457871 Inherit}{\rtlch\fcs1 

-\af31507 \ltrch\fcs0 \insrsid2776445 s}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid5457871  from}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid11697437  DDS }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid7096006 spec }{\rtlch\fcs1 \af31507 \ltrch\fcs0 

-\insrsid11697437 name (i.e. }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf18\insrsid11697437\charrsid6892139 DDS::Subscriber}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid11697437 )}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid8811513  generated by idl compiler}{

-\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid7096006  }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\insrsid7096006\charrsid11873757 (See #2 above)}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\insrsid11873757 .}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid8855485 

-\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid2833315 \hich\af31506\dbch\af0\loch\f31506 d.\tab}}\pard \ltrpar\s16\ql \fi-360\li1440\ri0\sa200\sl276\slmult1

-\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\ilvl1\adjustright\rin0\lin1440\itap0\pararsid3306671\contextualspace {\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid2833315 Has}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid14094245  public}{\rtlch\fcs1 \af31507 

-\ltrch\fcs0 \insrsid9534822  }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf18\insrsid14094245\charrsid6892139 get_i}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf18\insrsid2833315\charrsid6892139 mpl()}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid2833315  method }{

-\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid8345035 for other classes }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid15430320 to access raw RTI object by its RTI type.}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid4016460 

-\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid4016460 \hich\af31506\dbch\af0\loch\f31506 e.\tab}}\pard \ltrpar\s16\ql \fi-360\li1440\ri0\sa200\sl276\slmult1

-\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\ilvl1\adjustright\rin0\lin1440\itap0\pararsid11286512\contextualspace {\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid4016460 Has }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf18\insrsid4016460\charrsid6892139 impl()}

-{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid4016460  method used internally which t}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid2895496 hrows }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf18\insrsid11149407\charrsid6892139 CORBA::BAD_INV}{\rtlch\fcs1 \af31507 

-\ltrch\fcs0 \insrsid11149407  }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid2895496 exception if RT}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid4016460 I object not set.}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid2833315 

-\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid1209787 \hich\af31506\dbch\af0\loch\f31506 f.\tab}}\pard \ltrpar\s16\ql \fi-360\li1440\ri0\sa200\sl276\slmult1

-\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\ilvl1\adjustright\rin0\lin1440\itap0\pararsid598854 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid1209787 Lifecycle: }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid598854 Some }{\rtlch\fcs1 \af31507 \ltrch\fcs0 

-\insrsid4670306 (}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid598854 like the }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf18\insrsid598854\charrsid6892139 DataReader}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid598854 

- proxy) are created when the basic port for the }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf18\insrsid598854\charrsid6892139 Reader}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid598854  is created. Other proxies (like for instance the }{\rtlch\fcs1 \af31507 

-\ltrch\fcs0 \b\cf18\insrsid598854\charrsid6892139 Query}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid598854 /}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf18\insrsid598854\charrsid6892139 ReadCondition}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid598854 

- proxies) are created }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid4350283 as}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid598854  needed

-\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \b\f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid5727512 \hich\af31506\dbch\af0\loch\f31506 5.\tab}}\pard \ltrpar\s16\ql \fi-360\li720\ri0\sa200\sl276\slmult1

-\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\adjustright\rin0\lin720\itap0\pararsid14692711\contextualspace {\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\ul\insrsid5727512 Local Interfaces (basic ports)

-\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid5727512\charrsid9915170 \hich\af31506\dbch\af0\loch\f31506 a.\tab}}\pard \ltrpar

-\s16\ql \fi-360\li1440\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\ilvl1\adjustright\rin0\lin1440\itap0\pararsid5727512\contextualspace {\rtlch\fcs1 \af31507 \ltrch\fcs0 \ul\insrsid5727512\charrsid9915170 Naming:}{\rtlch\fcs1 

-\af31507 \ltrch\fcs0 \insrsid5727512  }{\rtlch\fcs1 \ab\af31507 \ltrch\fcs0 \b\cf18\insrsid5727512\charrsid6892139 ::CCM_DDS::CCM_}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf18\insrsid5727512\charrsid6892139 *}{\rtlch\fcs1 \af31507 \ltrch\fcs0 

-\insrsid5727512\charrsid9915170 

-\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid4934880 \hich\af31506\dbch\af0\loch\f31506 b.\tab}}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid4934880 

-Inherits from equivalently named interfaces }{\rtlch\fcs1 \ab\af31507 \ltrch\fcs0 \b\cf18\insrsid4934880\charrsid6892139 ::CCM_DDS::}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf18\insrsid4934880\charrsid6892139 * in <name>.idl}{\rtlch\fcs1 \af31507 

-\ltrch\fcs0 \insrsid5727512\charrsid4934880 

-\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid4934880\charrsid4934880 \hich\af31506\dbch\af0\loch\f31506 c.\tab}}{\rtlch\fcs1 \af31507 \ltrch\fcs0 

-\insrsid4934880\charrsid4934880 Gener}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid4934880 ated by }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\insrsid8203585\charrsid12141597 tao_idl}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid8203585  }{\rtlch\fcs1 \af31507 

-\ltrch\fcs0 \insrsid4934880 compiler into }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf18\insrsid4934880\charrsid6892139 <name>E.idl}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid4934880  }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\insrsid4934880\charrsid4934880 -}{

-\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\insrsid4934880  local executor classes}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid4934880\charrsid15095150 

-\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \i\f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid9770997 \hich\af31506\dbch\af0\loch\f31506 d.\tab}}\pard \ltrpar\s16\ql \fi-360\li1440\ri0\sa200\sl276\slmult1

-\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\ilvl1\adjustright\rin0\lin1440\itap0\pararsid9770997 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\insrsid9770997 Both connector code and user components should use these types}{\rtlch\fcs1 \af31507 \ltrch\fcs0 

-\i\insrsid15095150  to access connector interfaces.}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid15095150\charrsid4934880 

-\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \b\f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid7100257 \hich\af31506\dbch\af0\loch\f31506 6.\tab}}\pard \ltrpar\s16\ql \fi-360\li720\ri0\sa200\sl276\slmult1

-\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\adjustright\rin0\lin720\itap0\pararsid14692711\contextualspace {\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\ul\insrsid7100257 Interface}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\ul\insrsid9384744\charrsid67679 

- (basic ports)}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\ul\insrsid6892932  Implementations}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\ul\insrsid14692711\charrsid67679 

-\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid9915170\charrsid9915170 \hich\af31506\dbch\af0\loch\f31506 a.\tab}}\pard \ltrpar

-\s16\ql \fi-360\li1440\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\ilvl1\adjustright\rin0\lin1440\itap0\pararsid14692711\contextualspace {\rtlch\fcs1 \af31507 \ltrch\fcs0 \ul\insrsid9915170\charrsid9915170 Naming:}{

-\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid9915170  }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf18\insrsid9915170\charrsid13721774 *_T}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid13960238 - }{\rtlch\fcs1 \af31507 \ltrch\fcs0 

-\cf19\insrsid13960238\charrsid14692711 class }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf19\insrsid13960238\charrsid13050400 and filename}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid9915170\charrsid9915170 

-\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid13526351 \hich\af31506\dbch\af0\loch\f31506 b.\tab}}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid13526351 

-Inherits from IDL generated interface class.}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid5397924  }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\insrsid5397924 See }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\i\insrsid5397924\charrsid5397924 ccm_dds.idl}{\rtlch\fcs1 

-\af31507 \ltrch\fcs0 \b\i\insrsid2122301  }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\insrsid13711679 and other .idl files in same directory}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\insrsid7752817 .}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid14692711 

-\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid8724633 \hich\af31506\dbch\af0\loch\f31506 c.\tab}}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid8724633 

-When users make calls to the connector, these classes methods are invoked.

-\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid10571263 \hich\af31506\dbch\af0\loch\f31506 d.\tab}}\pard \ltrpar\s16\ql \fi-360\li1440\ri0\sa200\sl276\slmult1

-\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\ilvl1\adjustright\rin0\lin1440\itap0\pararsid14692711 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid10571263 These live in the extended ports.

-\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \b\f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid471019\charrsid471019 \hich\af31506\dbch\af0\loch\f31506 7.\tab}}\pard \ltrpar

-\s16\ql \fi-360\li720\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\adjustright\rin0\lin720\itap0\pararsid471019\contextualspace {\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\ul\insrsid471019\charrsid471019 Port type (extended ports)}{

-\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\ul\insrsid6892932\charrsid6892932  }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\ul\insrsid6892932 Implementations}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\ul\insrsid471019\charrsid471019 

-\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid7671569\charrsid9915170 \hich\af31506\dbch\af0\loch\f31506 a.\tab}}\pard \ltrpar

-\s16\ql \fi-360\li1440\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\ilvl1\adjustright\rin0\lin1440\itap0\pararsid6574358\contextualspace {\rtlch\fcs1 \af31507 \ltrch\fcs0 \ul\insrsid7671569\charrsid9915170 Naming:}{\rtlch\fcs1 

-\af31507 \ltrch\fcs0 \insrsid7671569  }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf18\insrsid3544782\charrsid13721774 DDS_}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf18\insrsid7671569\charrsid13721774 *_T}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\insrsid7671569  }{

-\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid7671569 - }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \cf19\insrsid7671569\charrsid14692711 class }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf19\insrsid7671569\charrsid13050400 and filename}{\rtlch\fcs1 \af31507 \ltrch\fcs0 

-\insrsid471019\charrsid6574358 

-\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid6574358 \hich\af31506\dbch\af0\loch\f31506 b.\tab}}\pard \ltrpar\s16\ql \fi-360\li1440\ri0\sa200\sl276\slmult1

-\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\ilvl1\adjustright\rin0\lin1440\itap0\pararsid2122301\contextualspace {\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid6574358 All their basic port types \'93used\'94 by user component are/should be }{\rtlch\fcs1 

-\af31507 \ltrch\fcs0 \b\insrsid6574358\charrsid5778033 data members by value}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid6574358\charrsid2122301 

-\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid2122301\charrsid2122301 \hich\af31506\dbch\af0\loch\f31506 c.\tab}}\pard \ltrpar

-\s16\ql \fi-360\li1440\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\ilvl1\adjustright\rin0\lin1440\itap0\pararsid6574358 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid2122301\charrsid2122301 Defined}{\rtlch\fcs1 \af31507 

-\ltrch\fcs0 \insrsid2122301  in }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\i\insrsid2122301\charrsid5397924 ccm_dds.idl}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid2122301\charrsid2122301 

-\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \b\f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid15612630\charrsid15612630 \hich\af31506\dbch\af0\loch\f31506 8.\tab}}\pard \ltrpar

-\s16\ql \fi-360\li720\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\adjustright\rin0\lin720\itap0\pararsid14486031\contextualspace {\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\ul\insrsid15612630\charrsid15612630 Connector}{\rtlch\fcs1 

-\af31507 \ltrch\fcs0 \b\ul\insrsid6892932\charrsid6892932  }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\ul\insrsid6892932 Implementations}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid14486031\charrsid15612630 

-\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid11486316 \hich\af31506\dbch\af0\loch\f31506 a.\tab}}\pard \ltrpar\s16\ql \fi-360\li1440\ri0\sa200\sl276\slmult1

-\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\ilvl1\adjustright\rin0\lin1440\itap0\pararsid14564103\contextualspace {\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid11486316 Inheritance Hierarchy}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid16070791  }{

-\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\insrsid16070791\charrsid11225654 (Defined in}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid16070791  }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\i\insrsid16070791\charrsid5397924 ccm_dds.id}{\rtlch\fcs1 \af31507 \ltrch\fcs0 

-\b\i\insrsid16070791 l}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\insrsid16070791\charrsid14950011 )}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid11486316 

-\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \b\f31506\fs22\cf18\lang1033\langfe1033\langnp1033\langfenp1033\insrsid11486316\charrsid13721774 \hich\af31506\dbch\af0\loch\f31506 i.\tab}}\pard \ltrpar

-\s16\ql \fi-180\li2160\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\ilvl2\adjustright\rin0\lin2160\itap0\pararsid11486316\contextualspace {\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf18\insrsid11486316\charrsid13721774 

-DDS_State_Connector_T}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\insrsid11486316  }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid11486316\charrsid6574358 =}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid6574358 =}{\rtlch\fcs1 \af31507 \ltrch\fcs0 

-\insrsid11486316\charrsid6574358 >}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\insrsid11486316\charrsid11486316  }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf18\insrsid11486316\charrsid13721774 DDS_TopicBase_Connector_T}{\rtlch\fcs1 \af31507 \ltrch\fcs0 

-\b\insrsid11486316  }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid11486316\charrsid6574358 =}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid6574358 =}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid11486316\charrsid6574358 >}{\rtlch\fcs1 \af31507 \ltrch\fcs0 

-\b\insrsid11486316  }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf18\insrsid11486316\charrsid13721774 DDS_Base_Connector_T}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid11486316 

-\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \b\f31506\fs22\cf18\lang1033\langfe1033\langnp1033\langfenp1033\insrsid11486316\charrsid13721774 \hich\af31506\dbch\af0\loch\f31506 ii.\tab}}{\rtlch\fcs1 \af31507 \ltrch\fcs0 

-\b\cf18\insrsid11486316\charrsid13721774 DDS_Event_Connector_T}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\insrsid11486316  }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid11486316\charrsid6574358 =}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid6574358 =}{\rtlch\fcs1 

-\af31507 \ltrch\fcs0 \insrsid11486316\charrsid6574358 > }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf18\insrsid11486316\charrsid13721774 DDS_TopicBase_Connector_T}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\insrsid11486316  }{\rtlch\fcs1 \af31507 \ltrch\fcs0 

-\insrsid11486316\charrsid6574358 =}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid6574358 =}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid11486316\charrsid6574358 >}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\insrsid11486316  }{\rtlch\fcs1 \af31507 \ltrch\fcs0 

-\b\cf18\insrsid11486316\charrsid13721774 DDS_Base_Connector_T}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid11486316 

-\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid14564103 \hich\af31506\dbch\af0\loch\f31506 b.\tab}}\pard \ltrpar\s16\ql \fi-360\li1440\ri0\sa200\sl276\slmult1

-\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\ilvl1\adjustright\rin0\lin1440\itap0\pararsid16070791\contextualspace {\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid14564103 All }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid12272359 their}{\rtlch\fcs1 \af31507 

-\ltrch\fcs0 \insrsid14564103  extended port types are }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\insrsid14564103\charrsid5778033 data members by value}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid16070791\charrsid14486031 

-\par }{\*\themedata 504b030414000600080000002100828abc13fa0000001c020000130000005b436f6e74656e745f54797065735d2e786d6cac91cb6ac3301045f785fe83d0b6d8

-72ba28a5d8cea249777d2cd20f18e4b12d6a8f843409c9df77ecb850ba082d74231062ce997b55ae8fe3a00e1893f354e9555e6885647de3a8abf4fbee29bbd7

-2a3150038327acf409935ed7d757e5ee14302999a654e99e393c18936c8f23a4dc072479697d1c81e51a3b13c07e4087e6b628ee8cf5c4489cf1c4d075f92a0b

-44d7a07a83c82f308ac7b0a0f0fbf90c2480980b58abc733615aa2d210c2e02cb04430076a7ee833dfb6ce62e3ed7e14693e8317d8cd0433bf5c60f53fea2fe7

-065bd80facb647e9e25c7fc421fd2ddb526b2e9373fed4bb902e182e97b7b461e6bfad3f010000ffff0300504b030414000600080000002100a5d6a7e7c00000

-00360100000b0000005f72656c732f2e72656c73848fcf6ac3300c87ef85bd83d17d51d2c31825762fa590432fa37d00e1287f68221bdb1bebdb4fc7060abb08

-84a4eff7a93dfeae8bf9e194e720169aaa06c3e2433fcb68e1763dbf7f82c985a4a725085b787086a37bdbb55fbc50d1a33ccd311ba548b63095120f88d94fbc

-52ae4264d1c910d24a45db3462247fa791715fd71f989e19e0364cd3f51652d73760ae8fa8c9ffb3c330cc9e4fc17faf2ce545046e37944c69e462a1a82fe353

-bd90a865aad41ed0b5b8f9d6fd010000ffff0300504b0304140006000800000021006b799616830000008a0000001c0000007468656d652f7468656d652f7468

-656d654d616e616765722e786d6c0ccc4d0ac3201040e17da17790d93763bb284562b2cbaebbf600439c1a41c7a0d29fdbd7e5e38337cedf14d59b4b0d592c9c

-070d8a65cd2e88b7f07c2ca71ba8da481cc52c6ce1c715e6e97818c9b48d13df49c873517d23d59085adb5dd20d6b52bd521ef2cdd5eb9246a3d8b4757e8d3f7

-29e245eb2b260a0238fd010000ffff0300504b03041400060008000000210096b5ade296060000501b0000160000007468656d652f7468656d652f7468656d65

-312e786d6cec594f6fdb3614bf0fd87720746f6327761a07758ad8b19b2d4d1bc46e871e698996d850a240d2497d1bdae38001c3ba618715d86d87615b8116d8

-a5fb34d93a6c1dd0afb0475292c5585e9236d88aad3e2412f9e3fbff1e1fa9abd7eec70c1d1221294fda5efd72cd4324f1794093b0eddd1ef62fad79482a9c04

-98f184b4bd2991deb58df7dfbb8ad755446282607d22d771db8b944ad79796a40fc3585ee62949606ecc458c15bc8a702910f808e8c66c69b9565b5d8a314d3c

-94e018c8de1a8fa94fd05093f43672e23d06af89927ac06762a049136785c10607758d9053d965021d62d6f6804fc08f86e4bef210c352c144dbab999fb7b471

-7509af678b985ab0b6b4ae6f7ed9ba6c4170b06c788a705430adf71bad2b5b057d03606a1ed7ebf5babd7a41cf00b0ef83a6569632cd467faddec9699640f671

-9e76b7d6ac355c7c89feca9cccad4ea7d36c65b258a206641f1b73f8b5da6a6373d9c11b90c537e7f08dce66b7bbeae00dc8e257e7f0fd2badd5868b37a088d1

-e4600ead1ddaef67d40bc898b3ed4af81ac0d76a197c86826828a24bb318f3442d8ab518dfe3a20f000d6458d104a9694ac6d88728eee2782428d60cf03ac1a5

-193be4cbb921cd0b495fd054b5bd0f530c1931a3f7eaf9f7af9e3f45c70f9e1d3ff8e9f8e1c3e3073f5a42ceaa6d9c84e5552fbffdeccfc71fa33f9e7ef3f2d1

-17d57859c6fffac327bffcfc793510d26726ce8b2f9ffcf6ecc98baf3efdfdbb4715f04d814765f890c644a29be408edf3181433567125272371be15c308d3f2

-8acd249438c19a4b05fd9e8a1cf4cd296699771c393ac4b5e01d01e5a30a787d72cf1178108989a2159c77a2d801ee72ce3a5c545a6147f32a99793849c26ae6

-6252c6ed637c58c5bb8b13c7bfbd490a75330f4b47f16e441c31f7184e140e494214d273fc80900aedee52ead87597fa824b3e56e82e451d4c2b4d32a423279a

-668bb6690c7e9956e90cfe766cb37b077538abd27a8b1cba48c80acc2a841f12e698f13a9e281c57911ce298950d7e03aba84ac8c154f8655c4f2af074481847

-bd804859b5e696007d4b4edfc150b12addbecba6b18b148a1e54d1bc81392f23b7f84137c2715a851dd0242a633f900710a218ed715505dfe56e86e877f0034e

-16bafb0e258ebb4faf06b769e888340b103d3311da9750aa9d0a1cd3e4efca31a3508f6d0c5c5c398602f8e2ebc71591f5b616e24dd893aa3261fb44f95d843b

-5974bb5c04f4edafb95b7892ec1108f3f98de75dc97d5772bdff7cc95d94cf672db4b3da0a6557f70db629362d72bcb0431e53c6066acac80d699a6409fb44d0

-8741bdce9c0e4971624a2378cceaba830b05366b90e0ea23aaa241845368b0eb9e2612ca8c742851ca251ceccc70256d8d87265dd96361531f186c3d9058edf2

-c00eafe8e1fc5c509031bb4d680e9f39a3154de0accc56ae644441edd76156d7429d995bdd88664a9dc3ad50197c38af1a0c16d684060441db02565e85f3b966

-0d0713cc48a0ed6ef7dedc2dc60b17e92219e180643ed27acffba86e9c94c78ab90980d8a9f0913ee49d62b512b79626fb06dccee2a432bbc60276b9f7dec44b

-7904cfbca4f3f6443ab2a49c9c2c41476dafd55c6e7ac8c769db1bc399161ee314bc2e75cf8759081743be1236ec4f4d6693e5336fb672c5dc24a8c33585b5fb

-9cc24e1d4885545b58463634cc5416022cd19cacfccb4d30eb45296023fd35a458598360f8d7a4003bbaae25e331f155d9d9a5116d3bfb9a95523e51440ca2e0

-088dd844ec6370bf0e55d027a012ae264c45d02f708fa6ad6da6dce29c255df9f6cae0ec38666984b372ab5334cf640b37795cc860de4ae2816e95b21be5ceaf

-8a49f90b52a51cc6ff3355f47e0237052b81f6800fd7b802239daf6d8f0b1571a8426944fdbe80c6c1d40e8816b88b8569082ab84c36ff0539d4ff6dce591a26

-ade1c0a7f669880485fd484582903d284b26fa4e2156cff62e4b9265844c4495c495a9157b440e091bea1ab8aaf7760f4510eaa69a6465c0e04ec69ffb9e65d0

-28d44d4e39df9c1a52ecbd3607fee9cec7263328e5d661d3d0e4f62f44acd855ed7ab33cdf7bcb8ae889599bd5c8b3029895b6825696f6af29c239b75a5bb1e6

-345e6ee6c28117e73586c1a2214ae1be07e93fb0ff51e133fb65426fa843be0fb515c187064d0cc206a2fa926d3c902e907670048d931db4c1a44959d366ad93

-b65abe595f70a75bf03d616c2dd959fc7d4e6317cd99cbcec9c58b34766661c7d6766ca1a9c1b327531486c6f941c638c67cd22a7f75e2a37be0e82db8df9f30

-254d30c1372581a1f51c983c80e4b71ccdd28dbf000000ffff0300504b0304140006000800000021000dd1909fb60000001b010000270000007468656d652f74

-68656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73848f4d0ac2301484f78277086f6fd3ba109126dd88d0add40384e4350d363f24

-51eced0dae2c082e8761be9969bb979dc9136332de3168aa1a083ae995719ac16db8ec8e4052164e89d93b64b060828e6f37ed1567914b284d262452282e3198

-720e274a939cd08a54f980ae38a38f56e422a3a641c8bbd048f7757da0f19b017cc524bd62107bd5001996509affb3fd381a89672f1f165dfe514173d9850528

-a2c6cce0239baa4c04ca5bbabac4df000000ffff0300504b01022d0014000600080000002100828abc13fa0000001c0200001300000000000000000000000000

-000000005b436f6e74656e745f54797065735d2e786d6c504b01022d0014000600080000002100a5d6a7e7c0000000360100000b000000000000000000000000

-002b0100005f72656c732f2e72656c73504b01022d00140006000800000021006b799616830000008a0000001c00000000000000000000000000140200007468

-656d652f7468656d652f7468656d654d616e616765722e786d6c504b01022d001400060008000000210096b5ade296060000501b000016000000000000000000

-00000000d10200007468656d652f7468656d652f7468656d65312e786d6c504b01022d00140006000800000021000dd1909fb60000001b010000270000000000

-00000000000000009b0900007468656d652f7468656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73504b050600000000050005005d010000960a00000000}

-{\*\colorschememapping 3c3f786d6c2076657273696f6e3d22312e302220656e636f64696e673d225554462d3822207374616e64616c6f6e653d22796573223f3e0d0a3c613a636c724d

-617020786d6c6e733a613d22687474703a2f2f736368656d61732e6f70656e786d6c666f726d6174732e6f72672f64726177696e676d6c2f323030362f6d6169

-6e22206267313d226c743122207478313d22646b3122206267323d226c743222207478323d22646b322220616363656e74313d22616363656e74312220616363

-656e74323d22616363656e74322220616363656e74333d22616363656e74332220616363656e74343d22616363656e74342220616363656e74353d22616363656e74352220616363656e74363d22616363656e74362220686c696e6b3d22686c696e6b2220666f6c486c696e6b3d22666f6c486c696e6b222f3e}

-{\*\latentstyles\lsdstimax267\lsdlockeddef0\lsdsemihiddendef1\lsdunhideuseddef1\lsdqformatdef0\lsdprioritydef99{\lsdlockedexcept \lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority0 \lsdlocked0 Normal;

-\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 1;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 2;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 3;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 4;

-\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 5;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 6;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 7;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 8;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 9;

-\lsdpriority39 \lsdlocked0 toc 1;\lsdpriority39 \lsdlocked0 toc 2;\lsdpriority39 \lsdlocked0 toc 3;\lsdpriority39 \lsdlocked0 toc 4;\lsdpriority39 \lsdlocked0 toc 5;\lsdpriority39 \lsdlocked0 toc 6;\lsdpriority39 \lsdlocked0 toc 7;

-\lsdpriority39 \lsdlocked0 toc 8;\lsdpriority39 \lsdlocked0 toc 9;\lsdqformat1 \lsdpriority35 \lsdlocked0 caption;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority10 \lsdlocked0 Title;\lsdpriority1 \lsdlocked0 Default Paragraph Font;

-\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority11 \lsdlocked0 Subtitle;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority22 \lsdlocked0 Strong;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority20 \lsdlocked0 Emphasis;

-\lsdsemihidden0 \lsdunhideused0 \lsdpriority59 \lsdlocked0 Table Grid;\lsdunhideused0 \lsdlocked0 Placeholder Text;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority1 \lsdlocked0 No Spacing;

-\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading;\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List;\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid;

-\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1;

-\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2;

-\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List;\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading;

-\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List;\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid;\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading Accent 1;

-\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 1;

-\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1 Accent 1;\lsdunhideused0 \lsdlocked0 Revision;

-\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority34 \lsdlocked0 List Paragraph;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority29 \lsdlocked0 Quote;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority30 \lsdlocked0 Intense Quote;

-\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2 Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 1;

-\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading Accent 1;

-\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading Accent 2;

-\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 2;

-\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1 Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2 Accent 2;

-\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 2;

-\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List Accent 2;

-\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List Accent 3;

-\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 3;

-\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1 Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2 Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 3;

-\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List Accent 3;

-\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid Accent 3;

-\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid Accent 4;

-\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1 Accent 4;

-\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2 Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 4;

-\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading Accent 4;

-\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading Accent 5;

-\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 5;

-\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1 Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2 Accent 5;

-\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 5;

-\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List Accent 5;

-\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List Accent 6;

-\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 6;

-\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1 Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2 Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 6;

-\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List Accent 6;

-\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid Accent 6;

-\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority19 \lsdlocked0 Subtle Emphasis;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority21 \lsdlocked0 Intense Emphasis;

-\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority31 \lsdlocked0 Subtle Reference;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority32 \lsdlocked0 Intense Reference;

-\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority33 \lsdlocked0 Book Title;\lsdpriority37 \lsdlocked0 Bibliography;\lsdqformat1 \lsdpriority39 \lsdlocked0 TOC Heading;}}{\*\datastore 010500000200000018000000

-4d73786d6c322e534158584d4c5265616465722e352e30000000000000000000000e0000

-d0cf11e0a1b11ae1000000000000000000000000000000003e000300feff0900060000000000000000000000010000000100000000000000001000000200000001000000feffffff0000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-fffffffffffffffffdffffff04000000feffffff05000000fefffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffff01000000ec69d9888b8b3d4c859eaf6cd158be0f00000000000000000000000070bd

-0f50552dcb010300000080020000000000004d0073006f004400610074006100530074006f0072006500000000000000000000000000000000000000000000000000000000000000000000000000000000001a000101ffffffffffffffff02000000000000000000000000000000000000000000000070bd0f50552dcb01

-70bd0f50552dcb010000000000000000000000005300d500c5004b003300c000d100d200590045005700d800dc00cc00df00c900cf004c00c4005500c600d0003d003d000000000000000000000000000000000032000101ffffffffffffffff03000000000000000000000000000000000000000000000070bd0f50552d

-cb0170bd0f50552dcb010000000000000000000000004900740065006d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000201ffffffff04000000ffffffff000000000000000000000000000000000000000000000000

-00000000000000000000000000000000cf00000000000000010000000200000003000000feffffff0500000006000000070000000800000009000000feffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff3c623a536f757263657320786d6c6e733a623d22687474703a2f2f736368656d61732e6f70656e786d6c666f726d6174732e6f72672f6f6666696365446f63756d656e742f323030362f6269626c696f6772617068792220786d6c6e733d

-22687474703a2f2f736368656d61732e6f70656e786d6c666f726d6174732e6f72672f6f6666696365446f63756d656e742f323030362f6269626c696f677261706879222053656c65637465645374796c653d225c4150412e58534c22205374796c654e616d653d22415041222f3e0d0a2020203c78733a646f63756d65

-6e746174696f6e3e0d0a20202020202053656520687474703a2f2f7777772e77332e6f723c3f786d6c2076657273696f6e3d22312e302220656e636f64696e673d225554462d3822207374616e64616c6f6e653d226e6f223f3e0d0a3c64733a6461746173746f72654974656d2064733a6974656d49443d227b37363441

-353934422d373230432d343536302d423846322d4346453942434239313439427d2220786d6c6e733a64733d22687474703a2f2f736368656d61732e6f70656e786d6c666f726d6174732e6f72672f6f6666696365446f63756d656e742f323030362f637573746f6d586d6c223e3c64733a736368656d61526566733e3c

-64733a736368656d615265662064733a7572693d22687474703a2f2f736368656d61732e6f70656e500072006f007000650072007400690065007300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000200ffffffffffffffffffffffff000000000000

-0000000000000000000000000000000000000000000000000000000000000400000055010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000

-00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000

-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff

-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000786d6c666f726d6174732e6f72672f6f6666696365446f63756d656e742f323030362f6269626c696f677261706879222f3e3c2f64733a736368656d61526566733e3c2f64733a6461746173746f

-72654974656d3e656c6f772077696c6c2068617665207468652064657369726564206566666563742c20652e672e0d0a202020202020266c743b74797065202e202e202e3e0d0a2020202020202e202e202e0d0a202020202020266c743b61747472696275746547726f7570207265663d22786d6c3a7370656369616c41

-74747273222f3e0d0a20202020202077696c6c20646566696e65206120747970652077686963682077696c6c20736368656d612d76616c6964617465206120696e7374616e63650d0a202020202020656c656d656e74207769746820616e79206f662074686f736520617474726962757465733c2f78733a646f63756d65

-6e746174696f6e3e0d0a202020203c2f78733a616e6e6f746174696f6e3e0d0a202020203c78733a617474726962757465206e616d653d226c616e672220747970653d2278733a6c616e6775616765223e0d0a2020202020203c78733a616e6e6f746174696f6e3e0d0a20202020202020203c78733a646f63756d656e74

-6174696f6e3e0d0a20202020202020202020496e2064756520636f757273652c2077652073686f756c6420696e7374616c6c2074686520720105000000000000}}
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/docs/TestCoverage.ods b/CIAO/connectors/dds4ccm/docs/TestCoverage.ods
deleted file mode 100644
index 44bbab04d1d..00000000000
--- a/CIAO/connectors/dds4ccm/docs/TestCoverage.ods
+++ /dev/null
diff --git a/CIAO/connectors/dds4ccm/docs/details.txt b/CIAO/connectors/dds4ccm/docs/details.txt
deleted file mode 100644
index 118ccf9c8ea..00000000000
--- a/CIAO/connectors/dds4ccm/docs/details.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-For more information regarding DDS4CCM also check the CCM tutoral, see
-$CIAO_ROOT/docs/OMG-CCM-Tutorial.ppt
-
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/.gitignore b/CIAO/connectors/dds4ccm/examples/Hello/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Hello/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Base/.gitignore b/CIAO/connectors/dds4ccm/examples/Hello/Base/.gitignore
deleted file mode 100644
index 0dc742545c6..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Hello/Base/.gitignore
+++ /dev/null
@@ -1,11 +0,0 @@
-/Hello_Base.cxx
-/Hello_Base.h
-/Hello_BaseC.cpp
-/Hello_BaseC.h
-/Hello_BaseC.inl
-/Hello_BasePlugin.cxx
-/Hello_BasePlugin.h
-/Hello_BaseS.h
-/Hello_BaseSupport.cxx
-/Hello_BaseSupport.h
-/Hello_Base_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl b/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl
deleted file mode 100644
index 3a0996040f4..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file Hello_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef HELLO_BASE_IDL
-#define HELLO_BASE_IDL
-
-#pragma ndds typesupport "Base/Hello_BaseSupport.h"
-#pragma opendds typesupport "Base/Hello_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "DDSHello"
-
-struct DDSHello {
-  string hello;
-  short iterator;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<DDSHello> DDSHelloSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc b/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc
deleted file mode 100644
index dcd326b1c14..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_Hello_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_Hello_Base_stub
-  dynamicflags += HELLO_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=HELLO_BASE_STUB_Export \
-              -Wb,stub_export_include=Hello_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    Hello_Base.idl
-  }
-
-  opendds_ts_flags += --export=HELLO_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    Hello_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.idl b/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.idl
deleted file mode 100644
index c71a797fa36..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file Hello_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef HELLO_CONNECTOR_IDL_
-#define HELLO_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Hello_Base.idl"
-
-#pragma ciao lem "Connector/Hello_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/Hello_BaseTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::DDSHello, ::DDSHelloSeq> Hello;
-
-#endif /* HELLO_CONNECTOR_IDL_ */
-
-
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc b/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc
deleted file mode 100644
index ab3fa393504..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc
+++ /dev/null
@@ -1,149 +0,0 @@
-project(DDS_Hello_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after  += DDS4CCM_idl_gen DDS_Hello_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=HELLO_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=Hello_Connector_stub_export.h \
-              -Wb,skel_export_macro=HELLO_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=Hello_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=HELLO_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=Hello_Connector_svnt_export.h \
-              -Wb,conn_export_macro=HELLO_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Hello_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Hello_Connector.idl
-  }
-}
-
-project(DDS_Hello_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_Hello_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=HELLO_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=Hello_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    Hello_ConnectorE.idl
-  }
-}
-
-project(DDS_Hello_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after  += DDS_Hello_Connector_lem_gen \
-            DDS_Hello_Connector_stub \
-            DDS_Hello_Base_stub
-  libs   += DDS_Hello_Base_stub \
-            DDS_Hello_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Hello_Connector_lem_stub
-  dynamicflags += HELLO_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Hello_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    Hello_ConnectorEC.h
-    Hello_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Hello_ConnectorEC.inl
-  }
-}
-
-project(DDS_Hello_Connector_stub) : ccm_stub, dds4ccm_base {
-  after  += DDS_Hello_Connector_idl_gen DDS_Hello_Base_stub
-  libs   += DDS_Hello_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Hello_Connector_stub
-  dynamicflags += HELLO_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Hello_ConnectorC.cpp
-  }
-
-  Header_Files {
-    Hello_ConnectorC.h
-    Hello_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    Hello_ConnectorC.inl
-  }
-}
-
-project(DDS_Hello_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after  += DDS_Hello_Connector_lem_stub \
-            DDS_Hello_Connector_stub \
-            DDS_Hello_Base_stub
-  sharedname = DDS_Hello_Connector_exec
-  libs += DDS_Hello_Connector_stub \
-          DDS_Hello_Connector_lem_stub \
-          DDS_Hello_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += HELLO_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Hello_Connector_conn.cpp
-  }
-
-  Header_Files {
-    Hello_Connector_conn.h
-    Hello_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_Hello_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_Hello_Connector_lem_stub \
-                DDS_Hello_Connector_exec \
-                DDS_Hello_Connector_stub
-  sharedname  = DDS_Hello_Connector_svnt
-  libs       += DDS_Hello_Connector_stub \
-                DDS_Hello_Connector_lem_stub  \
-                DDS_Hello_Base_stub \
-                DDS_Hello_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += HELLO_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Hello_ConnectorS.cpp
-    Hello_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    Hello_ConnectorS.h
-    Hello_Connector_svnt.h
-    Hello_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/DDS_Receiver/DDS_Receiver.mpc b/CIAO/connectors/dds4ccm/examples/Hello/DDS_Receiver/DDS_Receiver.mpc
deleted file mode 100644
index bb2ed9a7a7d..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Hello/DDS_Receiver/DDS_Receiver.mpc
+++ /dev/null
@@ -1,9 +0,0 @@
-project(*hello_receiver) : nddslib, acelib {
-  exename = DDS_receiver
-  avoids += ace_for_tao
-
-  Source_Files {
-    Hello_Receiver.cpp
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/DDS_Receiver/Hello_Receiver.cpp b/CIAO/connectors/dds4ccm/examples/Hello/DDS_Receiver/Hello_Receiver.cpp
deleted file mode 100644
index f3cd10094a5..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Hello/DDS_Receiver/Hello_Receiver.cpp
+++ /dev/null
@@ -1,167 +0,0 @@
-#include "ace/OS_main.h"
-#include "ace/Get_Opt.h"
-#include "ace/OS_NS_unistd.h"
-#include "ace/OS_NS_string.h"
-#include "ace/OS_NS_stdlib.h"
-#include "ace/Date_Time.h"
-#include "ace/SString.h"
-
-#include <ndds/ndds_namespace_cpp.h>
-
-/* By default DDS::String type manage strings up to 1k */
-#define MAX_STRING_SIZE         1024
-
-bool shutdown_flag = false;
-long num_samples = 0;
-long received_samples = 0;
-
-/* The listener of events and data from the middleware */
-class HelloListener: public ::DDS::DataReaderListener {
-public:
-  void on_data_available(::DDS::DataReader *reader);
-};
-
-
-int ACE_TMAIN(int argc, ACE_TCHAR** argv) {
-  HelloListener listener;
-  int           main_result = 1; /* error by default */
-  ::DDS::Topic * topic = 0;
-  ::DDS::DataReader *data_reader = 0;
-
-  if (argc == 2)
-    {
-      ACE_TCHAR *end = 0;
-      num_samples = ACE_OS::strtol (argv[1], &end, 10);
-
-      if (end == argv[1] && num_samples < 0)
-        {
-          ACE_ERROR ((LM_ERROR, "Error: provided argument not a valid integer over zero\n"));
-          return -1;
-        }
-    }
-
-  /* Create the domain participant on domain ID 0 */
-  ::DDS::DomainParticipant *participant = ::DDS::DomainParticipantFactory::get_instance()->
-      create_participant(
-                         0,                              /* Domain ID */
-                         DDS_PARTICIPANT_QOS_DEFAULT,    /* QoS */
-                         0,                           /* Listener */
-                         DDS_STATUS_MASK_NONE);
-  if (!participant) {
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create domain participant.\n")));
-    goto clean_exit;
-  }
-
-  /* Create the topic "Hello, World" for the String type */
-  topic = participant->create_topic(
-                                    "Hello, World",                        /* Topic name*/
-                                    ::DDS::StringTypeSupport::get_type_name(), /* Type name */
-                                    DDS_TOPIC_QOS_DEFAULT,                 /* Topic QoS */
-                                    0,                                  /* Listener  */
-                                    DDS_STATUS_MASK_NONE);
-  if (!topic) {
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create topic.\n")));
-    goto clean_exit;
-  }
-
-  /* Create the data writer using the default publisher */
-  data_reader = participant->create_datareader(
-                                               topic,
-                                               DDS_DATAREADER_QOS_DEFAULT,    /* QoS */
-                                               &listener,                      /* Listener */
-                                               DDS_DATA_AVAILABLE_STATUS);
-  if (!data_reader) {
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create data reader.\n")));
-    goto clean_exit;
-  }
-
-  /* --- Sleep During Asynchronous Reception ---------------------------- */
-
-  /* This thread sleeps forever. When a sample is received, RTI Data
-   * Distribution Service will call the on_data_available_callback function.
-   */
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ready to read data.\n")));
-  for (;;) {
-    ACE_OS::sleep (1);
-    if(shutdown_flag){
-      break;
-    }
-  }
-
-  /* --- Clean Up ------------------------------------------------------- */
-
-  main_result = 0;
- clean_exit:
-  ::DDS::ReturnCode_t retcode;
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Exiting.")));
-  if (participant) {
-    retcode = participant->delete_contained_entities();
-    if (retcode != DDS_RETCODE_OK) {
-      ACE_ERROR ((LM_ERROR, ACE_TEXT ("Deletion failed.\n")));
-      main_result = 1;
-    }
-    retcode = ::DDS::DomainParticipantFactory::get_instance()->
-      delete_participant(participant);
-    if (retcode != DDS_RETCODE_OK) {
-      ACE_ERROR ((LM_ERROR, ACE_TEXT ("Deletion failed.\n")));
-      main_result = 1;
-    }
-  }
-
-  return main_result;
-}
-
-
-/* This method gets called back by DDS when one or more data samples have been
- * received.
- */
-void HelloListener::on_data_available(::DDS::DataReader *reader) {
-  /* Perform a safe type-cast from a generic data reader into a
-   * specific data reader for the type "DDS::String"
-   */
-  ::DDS::StringDataReader * string_reader = ::DDS::StringDataReader::narrow(reader);
-  if (!string_reader) {
-    /* In this specific case, this will never fail */
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("::DDS::StringDataReader::narrow failed.\n")));
-    return;
-  }
-
-  /* Loop until there are messages available in the queue */
-  char                  sample[MAX_STRING_SIZE];
-  char *ptr_sample = &sample[0];
-  for(;;) {
-    ::DDS::SampleInfo        info;
-    ::DDS::ReturnCode_t retcode = string_reader->take_next_sample(
-                                                                  ptr_sample,
-                                                                  info);
-    if (retcode == DDS_RETCODE_NO_DATA) {
-      /* No more samples */
-      break;
-    } else if (retcode != DDS_RETCODE_OK) {
-      ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to take data from data reader, error %d.\n"), retcode));
-      return;
-    }
-    if (info.valid_data) {
-      // Valid (this isn't just a lifecycle sample): print it
-      ++received_samples;
-      ACE_CString rec (sample);
-      ACE_Date_Time now;
-      int sec_rec = ACE_OS::atoi (rec.substr (0, 2).c_str() );
-      if (sec_rec > 0)
-        {
-          int usec_rec = ACE_OS::atoi (rec.substr (3, 6).c_str ());
-          if (sec_rec != now.second ())
-            usec_rec += 10000000;
-          ACE_DEBUG ((LM_DEBUG, ACE_TEXT("%C duration <%d>\n"), sample, now.microsec () - usec_rec));
-        }
-      else
-        {
-          ACE_DEBUG ((LM_DEBUG, ACE_TEXT("%C\n"), sample));
-        }
-      if(received_samples == num_samples || ACE_OS::strlen(sample) == 0){
-        shutdown_flag = true;
-      }
-    }
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/DDS_Sender/DDS_Sender.mpc b/CIAO/connectors/dds4ccm/examples/Hello/DDS_Sender/DDS_Sender.mpc
deleted file mode 100644
index 665a26daacc..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Hello/DDS_Sender/DDS_Sender.mpc
+++ /dev/null
@@ -1,9 +0,0 @@
-project(*hello_sender) : nddslib, acelib {
-  exename = DDS_Sender
-  avoids += ace_for_tao
-
-  Source_Files {
-    Hello_Sender.cpp
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/DDS_Sender/Hello_Sender.cpp b/CIAO/connectors/dds4ccm/examples/Hello/DDS_Sender/Hello_Sender.cpp
deleted file mode 100644
index c050afbab37..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Hello/DDS_Sender/Hello_Sender.cpp
+++ /dev/null
@@ -1,150 +0,0 @@
-#include "ace/OS_main.h"
-#include "ace/Get_Opt.h"
-#include "ace/OS_NS_unistd.h"
-#include "ace/OS_NS_stdio.h"
-#include "ace/Date_Time.h"
-#include "ace/SString.h"
-#include <ndds/ndds_namespace_cpp.h>
-
-int number_of_iterations = 100;
-bool log_time = false;
-const char* send_string = "This is a DDS sender";
-
-int
-parse_args (int argc, ACE_TCHAR *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("i:s:t"));
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 's':
-        send_string = ACE_TEXT_ALWAYS_CHAR (get_opts.opt_arg ());
-        break;
-      case 'i':
-        number_of_iterations = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-      case 't':
-        log_time = true;
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage: %s "
-                           "-s <send string>"
-                           "-i <number of iterations>"
-                           "-t log timing"
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates successful parsing of the command line
-  return 0;
-}
-
-int ACE_TMAIN(int argc, ACE_TCHAR* argv[]) {
-    ::DDS::ReturnCode_t retcode;
-    ::DDS::StringDataWriter *string_writer = 0;
-    ::DDS::Topic *topic = 0;
-    ::DDS::DataWriter *data_writer = 0;
-    int              main_result = 1; /* error by default */
-
-    if (parse_args (argc, argv) != 0)
-      return 1;
-
-    ACE_Time_Value tv (0, 1000); //1 msec
-    /* Create the domain participant */
-    ::DDS::DomainParticipant *participant = ::DDS::DomainParticipantFactory::get_instance()->
-                        create_participant(
-                                0,                              /* Domain ID */
-                                DDS_PARTICIPANT_QOS_DEFAULT,    /* QoS */
-                                0,                           /* Listener */
-                                DDS_STATUS_MASK_NONE);
-    if (!participant) {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create domain participant.\n")));
-        goto clean_exit;
-    }
-
-    /* Create the topic "Hello, World" for the String type */
-    topic = participant->create_topic(
-                        "Hello, World",                        /* Topic name*/
-                        ::DDS::StringTypeSupport::get_type_name(), /* Type name */
-                        DDS_TOPIC_QOS_DEFAULT,                 /* Topic QoS */
-                        0,                                  /* Listener  */
-                        DDS_STATUS_MASK_NONE);
-    if (!topic) {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create topic.\n")));
-        goto clean_exit;
-    }
-
-    /* Create the data writer using the default publisher */
-    data_writer = participant->create_datawriter(
-                                topic,
-                                DDS_DATAWRITER_QOS_DEFAULT,     /* QoS */
-                                0,                           /* Listener */
-                                DDS_STATUS_MASK_NONE);
-    if (!data_writer) {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create data writer.\n")));
-        goto clean_exit;
-    }
-
-    /* Perform a safe type-cast from a generic data writer into a
-     * specific data writer for the type "DDS::String"
-     */
-    string_writer = ::DDS::StringDataWriter::narrow(data_writer);
-    if (!string_writer) {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("DDS_StringDataWriter_narrow failed.\n")));
-        /* In this specific case, this will never fail */
-        goto clean_exit;
-    }
-
-    // Sleep a couple seconds to allow discovery to happen
-    ACE_OS::sleep (1);
-
-    /* --- Write Data ----------------------------------------------------- */
-
-    for (int i = 0; i < number_of_iterations; i++)
-      {
-        char timestamp[16];
-        ACE_CString msg (send_string);
-        ACE_CString ret;
-        ACE_Date_Time now;
-        ACE_OS::sprintf (timestamp,
-                         "%02d.%d",
-                         static_cast<int> (now.second()),
-                         static_cast<int> (now.microsec ()));
-        ret.set (timestamp);
-        ret = ret + " " + msg;
-        retcode = string_writer->write(
-                            ret.c_str (),
-                            DDS_HANDLE_NIL);
-        if (retcode != DDS_RETCODE_OK)
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("Write failed: %d.\n"), retcode));
-          }
-        ACE_OS::sleep (tv);
-    }
-
-    /* --- Clean Up ------------------------------------------------------- */
-
-    main_result = 0;
-clean_exit:
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Exiting.")));
-    if (participant) {
-        retcode = participant->delete_contained_entities();
-        if (retcode != DDS_RETCODE_OK) {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("Deletion failed.\n")));
-            main_result = 1;
-        }
-        retcode = ::DDS::DomainParticipantFactory::get_instance()->
-                        delete_participant(participant);
-        if (retcode != DDS_RETCODE_OK) {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("Deletion failed.\n")));
-            main_result = 1;
-        }
-    }
-    return main_result;
-}
-
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/.gitignore b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/.gitignore
deleted file mode 100644
index f185a14049e..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/DDS_Hello_Receiver_idl_gen.mk
-/DDS_Hello_Receiver_lem_gen.mk
-/Hello_ReceiverE.idl
-/Receiver_exec_export.h
-/Receiver_lem_stub_export.h
-/Receiver_stub_export.h
-/Receiver_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.idl b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.idl
deleted file mode 100644
index 82f637ba6bd..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef HELLO_RECEIVER_IDL
-#define HELLO_RECEIVER_IDL
-
-#include "Connector/Hello_Connector.idl"
-
-module Hello
-{
-  component Receiver
-  {
-    port Hello::DDS_Listen info_out;
-    provides CCM_DDS::ConnectorStatusListener info_out_connector_status;
-
-    attribute string name;
-    attribute unsigned long expected_samples;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc
deleted file mode 100644
index e58fc7bac02..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc
+++ /dev/null
@@ -1,141 +0,0 @@
-project(DDS_Hello_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  avoids += ace_for_tao
-  custom_only = 1
-  after += DDS_Hello_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=HELLO_RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=HELLO_RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=HELLO_RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=HELLO_RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h -I..
-
-  IDL_Files {
-    Hello_Receiver.idl
-  }
-}
-
-project(DDS_Hello_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  avoids += ace_for_tao
-  after += DDS_Hello_Receiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=HELLO_RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    Hello_ReceiverE.idl
-  }
-}
-
-project(DDS_Hello_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  avoids += ace_for_tao
-  after += DDS_Hello_Receiver_lem_gen DDS_Hello_Receiver_stub  DDS_Hello_Connector_stub DDS_Hello_Base_stub
-  libs  +=  Receiver_stub DDS_Hello_Connector_stub DDS_Hello_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += HELLO_RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Hello_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    Hello_ReceiverEC.h
-    Hello_Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Hello_ReceiverEC.inl
-  }
-}
-
-project(DDS_Hello_Receiver_stub) : ccm_stub, dds4ccm_base {
-  avoids += ace_for_tao
-  after += DDS_Hello_Receiver_idl_gen  DDS_Hello_Connector_stub DDS_Hello_Base_stub DDS_Hello_Connector_lem_gen
-  libs  += DDS_Hello_Connector_stub DDS_Hello_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += HELLO_RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Hello_ReceiverC.cpp
-  }
-
-  Header_Files {
-    Hello_ReceiverC.h
-    Hello_Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    Hello_ReceiverC.inl
-  }
-}
-
-project(DDS_Hello_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  avoids  += ace_for_tao
-  after   += DDS_Hello_Receiver_lem_stub DDS_Hello_Receiver_stub DDS_Hello_Base_stub DDS_Hello_Connector_stub DDS_Hello_Connector_lem_stub 
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_Hello_Base_stub DDS_Hello_Connector_stub DDS_Hello_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += HELLO_RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Hello_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    Hello_Receiver_exec.h
-    Hello_Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_Hello_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  avoids     += ace_for_tao
-  after      +=   DDS_Hello_Receiver_lem_stub DDS_Hello_Base_stub DDS_Hello_Connector_stub DDS_Hello_Connector_svnt DDS_Hello_Receiver_exec DDS_Hello_Connector_lem_stub 
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_Hello_Base_stub DDS_Hello_Connector_stub DDS_Hello_Connector_svnt Receiver_exec DDS_Hello_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += HELLO_RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Hello_ReceiverS.cpp
-    Hello_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    Hello_ReceiverS.h
-    Hello_Receiver_svnt.h
-    Hello_Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp
deleted file mode 100644
index f3a64fc4cba..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp
+++ /dev/null
@@ -1,376 +0,0 @@
-// -*- C++ -*-
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:1344
-
-#include "Hello_Receiver_exec.h"
-#include "ace/Log_Msg.h"
-#include "tao/ORB_Core.h"
-#include "ace/Date_Time.h"
-
-namespace CIAO_Hello_Receiver_Impl
-{
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_component/facet_exs.cpp:75
-  //============================================================
-  // Facet Executor Implementation Class: info_out_data_listener_exec_i
-  //============================================================
-
-  info_out_data_listener_exec_i::info_out_data_listener_exec_i (
-        ::Hello::CCM_Receiver_Context_ptr ctx,
-        Atomic_ULong &received,
-        const ACE_CString &name)
-    : ciao_context_ (
-        ::Hello::CCM_Receiver_Context::_duplicate (ctx)),
-      received_ (received),
-      name_ (name)
-  {
-  }
-
-  info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("~info_out_data_listener_exec_i\n")));
-  }
-
-  // Operations from ::Hello::Listener
-
-  void
-  info_out_data_listener_exec_i::on_one_data (
-    const ::DDSHello & datum,
-    const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    ++this->received_;
-    ACE_CString rec (datum.hello.in ());
-    ACE_Date_Time now;
-    int const sec_rec = ACE_OS::atoi (rec.substr (0, 2).c_str() );
-    if (sec_rec > 0)
-      {
-        int usec_rec = ACE_OS::atoi (rec.substr (3, 6).c_str ());
-        if (sec_rec != now.second ())
-          {
-            usec_rec += 10000000;
-          }
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("<%C> received <%C> - <%d>. difference <%d>\n"),
-                    this->name_.c_str (),
-                    datum.hello.in (),
-                    datum.iterator,
-                    now.microsec () - usec_rec));
-      }
-    else
-    {
-      ACE_DEBUG ((LM_DEBUG, ACE_TEXT("<%C> received <%C> - <%d>.\n"),
-      this->name_.c_str (),
-      datum.hello.in (),
-      datum.iterator));
-    }
-  }
-
-  void
-  info_out_data_listener_exec_i::on_many_data (
-    const ::DDSHelloSeq & /* data */,
-    const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    /* Your code here. */
-  }
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_component/facet_exs.cpp:75
-  //============================================================
-  // Facet Executor Implementation Class: info_out_status_exec_i
-  //============================================================
-
-  info_out_status_exec_i::info_out_status_exec_i (
-        ::Hello::CCM_Receiver_Context_ptr ctx,
-        Atomic_ULong &lost)
-    : ciao_context_ (
-        ::Hello::CCM_Receiver_Context::_duplicate (ctx)),
-      lost_ (lost)
-  {
-  }
-
-  info_out_status_exec_i::~info_out_status_exec_i (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("~info_out_status_exec_i\n")));
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_out_status_exec_i::on_requested_deadline_missed (
-    ::DDS::DataReader_ptr /* the_reader */,
-    const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_status_exec_i::on_sample_lost (
-    ::DDS::DataReader_ptr /* the_reader */,
-    const ::DDS::SampleLostStatus & /* status */)
-  {
-    ++this->lost_;
-    ACE_DEBUG ((LM_ERROR, ACE_TEXT("port status listener::on_sample_lost\n")));
-  }
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_component/facet_exs.cpp:75
-  //============================================================
-  // Facet Executor Implementation Class: info_out_connector_status_exec_i
-  //============================================================
-
-  info_out_connector_status_exec_i::info_out_connector_status_exec_i (
-        ::Hello::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::Hello::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_connector_status_exec_i::~info_out_connector_status_exec_i (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("~info_out_connector_status_exec_i\n")));
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-
-  void
-  info_out_connector_status_exec_i::on_inconsistent_topic (
-    ::DDS::Topic_ptr /* the_topic */,
-    const ::DDS::InconsistentTopicStatus & /* status */)
-  {
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Receiver: ")
-          ACE_TEXT ("ConnectorStatusListener_exec_i::on_inconsistent_topic\n")));
-  }
-
-  void
-  info_out_connector_status_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /* the_reader */,
-    const ::DDS::RequestedIncompatibleQosStatus & /* status */)
-  {
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Receiver: ")
-          ACE_TEXT ("ConnectorStatusListener_exec_i::on_requested_incompatible_qos\n")));
-  }
-
-  void
-  info_out_connector_status_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /* the_reader */,
-    const ::DDS::SampleRejectedStatus & /* status */)
-  {
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Receiver: ")
-          ACE_TEXT ("ConnectorStatusListener_exec_i::on_sample_rejected\n")));
-  }
-
-  void
-  info_out_connector_status_exec_i::on_offered_deadline_missed (
-    ::DDS::DataWriter_ptr /* the_writer */,
-    const ::DDS::OfferedDeadlineMissedStatus & /* status */)
-  {
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Receiver: ")
-          ACE_TEXT ("ConnectorStatusListener_exec_i::on_offered_deadline_missed\n")));
-  }
-
-  void
-  info_out_connector_status_exec_i::on_offered_incompatible_qos (
-    ::DDS::DataWriter_ptr /* the_writer */,
-    const ::DDS::OfferedIncompatibleQosStatus & /* status */)
-  {
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Receiver: ")
-          ACE_TEXT ("ConnectorStatusListener_exec_i::on_offered_incompatible_qos\n")));
-  }
-
-  void
-  info_out_connector_status_exec_i::on_unexpected_status (
-    ::DDS::Entity_ptr /* the_entity */,
-    ::DDS::StatusKind /* status_kind */)
-  {
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Receiver: ")
-          ACE_TEXT ("ConnectorStatusListener_exec_i::on_unexpected_status\n")));
-  }
-
-  //============================================================
-  // Component Executor Implementation Class: Receiver_exec_i
-  //============================================================
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : expected_ (0),
-      received_ (0),
-      lost_ (0)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("~Receiver_exec_i\n")));
-  }
-
-  // Supported operations and attributes.
-
-  // Component attributes and port operations.
-
-  ::Hello::CCM_Listener_ptr
-  Receiver_exec_i::get_info_out_data_listener (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new DDSHello RAW listener\n")));
-    if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ()))
-      {
-        info_out_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_data_listener_exec_i (
-            this->ciao_context_.in (),
-            this->received_,
-            this->name_),
-          ::Hello::CCM_Listener::_nil ());
-
-        this->ciao_info_out_data_listener_ = tmp;
-      }
-
-    return
-      ::Hello::CCM_Listener::_duplicate (
-        this->ciao_info_out_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_status (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new PortStatuslistener\n")));
-    if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ()))
-      {
-        info_out_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_status_exec_i (
-            this->ciao_context_.in (),
-            this->lost_),
-          ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-        this->ciao_info_out_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_out_status_.in ());
-  }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Receiver_exec_i::get_info_out_connector_status (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new ConnectorStatusListener\n")));
-    if ( ::CORBA::is_nil (this->ciao_info_out_connector_status_.in ()))
-      {
-        info_out_connector_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_connector_status_exec_i (
-            this->ciao_context_.in ()),
-          ::CCM_DDS::CCM_ConnectorStatusListener::_nil ());
-
-        this->ciao_info_out_connector_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_ConnectorStatusListener::_duplicate (
-        this->ciao_info_out_connector_status_.in ());
-  }
-
-  char *
-  Receiver_exec_i::name (void)
-  {
-    return CORBA::string_dup (this->name_.c_str ());
-  }
-
-  void
-  Receiver_exec_i::name (
-    const char * name)
-  {
-    this->name_ = name;
-  }
-
-  ::CORBA::ULong
-  Receiver_exec_i::expected_samples (void)
-  {
-    return this->expected_;
-  }
-
-  void
-  Receiver_exec_i::expected_samples (
-    ::CORBA::ULong expected_samples)
-  {
-    this->expected_ = expected_samples;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Hello::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    ::CCM_DDS::DataListenerControl_var lc =
-      this->ciao_context_->get_connection_info_out_data_control ();
-
-    if (::CORBA::is_nil (lc.in ()))
-      {
-        ACE_ERROR ((LM_INFO,
-                    ACE_TEXT ("Error:  Listener control receptacle is null!\n")));
-
-        throw ::CORBA::INTERNAL ();
-      }
-    lc->mode ( ::CCM_DDS::ONE_BY_ONE);
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    ACE_DEBUG ((LM_INFO,
-                "Receiver_exec_i summary: received <%u> - expected <%d> - lost <%u>\n",
-                this->received_.value (),
-                this->expected_,
-                this->lost_.value ()));
-    if (this->lost_ > 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR : Lost %u samples\n",
-            this->lost_.value ()));
-      }
-    if (this->received_ < this->expected_)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR : Expected to receive %u samples, actually got %u\n",
-            this->expected_, this->received_.value ()));
-      }
-  }
-
-  extern "C" HELLO_RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Hello_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h
deleted file mode 100644
index 0ff9e79448a..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h
+++ /dev/null
@@ -1,213 +0,0 @@
-// -*- C++ -*-
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:1283
-
-#ifndef CIAO_HELLO_RECEIVER_EXEC_0PTXJW_H_
-#define CIAO_HELLO_RECEIVER_EXEC_0PTXJW_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Hello_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_Hello_Receiver_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::ULong > Atomic_ULong;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_component/facet_exh.cpp:53
-  class HELLO_RECEIVER_EXEC_Export info_out_data_listener_exec_i
-    : public virtual ::Hello::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_data_listener_exec_i (
-      ::Hello::CCM_Receiver_Context_ptr ctx,
-      Atomic_ULong &received,
-      const ACE_CString &name);
-
-    virtual ~info_out_data_listener_exec_i (void);
-
-    // Operations and attributes from Hello::Listener
-
-    virtual
-    void on_one_data (
-      const ::DDSHello & datum,
-      const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (
-      const ::DDSHelloSeq & data,
-      const ::CCM_DDS::ReadInfoSeq & infos);
-
-  private:
-    ::Hello::CCM_Receiver_Context_var ciao_context_;
-    Atomic_ULong &received_;
-    const ACE_CString &name_;
-  };
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_component/facet_exh.cpp:53
-  class HELLO_RECEIVER_EXEC_Export info_out_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_status_exec_i (
-      ::Hello::CCM_Receiver_Context_ptr ctx,
-      Atomic_ULong &lost);
-    virtual ~info_out_status_exec_i (void);
-
-    // Operations and attributes from CCM_DDS::PortStatusListener
-
-    virtual
-    void on_requested_deadline_missed (
-      ::DDS::DataReader_ptr the_reader,
-      const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (
-      ::DDS::DataReader_ptr the_reader,
-      const ::DDS::SampleLostStatus & status);
-
-  private:
-    ::Hello::CCM_Receiver_Context_var ciao_context_;
-    Atomic_ULong &lost_;
-  };
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_component/facet_exh.cpp:53
-  class HELLO_RECEIVER_EXEC_Export info_out_connector_status_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_connector_status_exec_i (
-      ::Hello::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_connector_status_exec_i (void);
-
-    // Operations and attributes from CCM_DDS::ConnectorStatusListener
-
-    virtual
-    void on_inconsistent_topic (
-      ::DDS::Topic_ptr the_topic,
-      const ::DDS::InconsistentTopicStatus & status);
-
-    virtual
-    void on_requested_incompatible_qos (
-      ::DDS::DataReader_ptr the_reader,
-      const ::DDS::RequestedIncompatibleQosStatus & status);
-
-    virtual
-    void on_sample_rejected (
-      ::DDS::DataReader_ptr the_reader,
-      const ::DDS::SampleRejectedStatus & status);
-
-    virtual
-    void on_offered_deadline_missed (
-      ::DDS::DataWriter_ptr the_writer,
-      const ::DDS::OfferedDeadlineMissedStatus & status);
-
-    virtual
-    void on_offered_incompatible_qos (
-      ::DDS::DataWriter_ptr the_writer,
-      const ::DDS::OfferedIncompatibleQosStatus & status);
-
-    virtual
-    void on_unexpected_status (
-      ::DDS::Entity_ptr the_entity,
-      ::DDS::StatusKind status_kind);
-
-  private:
-    ::Hello::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  class HELLO_RECEIVER_EXEC_Export Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-
-    virtual ::Hello::CCM_Listener_ptr
-    get_info_out_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_status (void);
-
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_info_out_connector_status (void);
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:36
-
-    virtual char *
-    name (void);
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:36
-
-    virtual void
-    name (
-      const char * name);
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:36
-
-    virtual ::CORBA::ULong
-    expected_samples (void);
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:36
-
-    virtual void
-    expected_samples (
-      ::CORBA::ULong expected_samples);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete (void);
-
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-  private:
-    ::Hello::CCM_Receiver_Context_var ciao_context_;
-    ::Hello::CCM_Listener_var ciao_info_out_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_;
-    ::CCM_DDS::CCM_ConnectorStatusListener_var ciao_info_out_connector_status_;
-    CORBA::ULong expected_;
-    Atomic_ULong received_;
-    Atomic_ULong lost_;
-    ACE_CString name_;
-  };
-
-  extern "C" HELLO_RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Hello_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Sender/.gitignore b/CIAO/connectors/dds4ccm/examples/Hello/Sender/.gitignore
deleted file mode 100644
index 6600e59d890..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Hello/Sender/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/DDS_Hello_Sender_idl_gen.mk
-/DDS_Hello_Sender_lem_gen.mk
-/Hello_SenderE.idl
-/Sender_exec_export.h
-/Sender_lem_stub_export.h
-/Sender_stub_export.h
-/Sender_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl
deleted file mode 100644
index 4674cf34f6d..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_SENDER_IDL
-#define DDS_SENDER_IDL
-
-#include "Connector/Hello_Connector.idl"
-
-module Hello
-{
-  component Sender
-  {
-    port Hello::DDS_Write info_in;
-    attribute unsigned long rate;
-    attribute unsigned long iterations;
-    attribute string message;
-    attribute boolean log_time;
-    provides CCM_DDS::ConnectorStatusListener connector_status;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc
deleted file mode 100644
index b653dc864b7..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc
+++ /dev/null
@@ -1,141 +0,0 @@
-project(DDS_Hello_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  avoids += ace_for_tao
-  after  += DDS_Hello_Connector_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=HELLO_SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=HELLO_SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=HELLO_SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=HELLO_SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I ..
-
-  IDL_Files {
-    Hello_Sender.idl
-  }
-}
-
-project(DDS_Hello_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  avoids += ace_for_tao
-  after  += DDS_Hello_Sender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=HELLO_SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    Hello_SenderE.idl
-  }
-}
-
-project(DDS_Hello_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  avoids += ace_for_tao
-  after  += DDS_Hello_Sender_lem_gen DDS_Hello_Sender_stub DDS_Hello_Base_stub
-  libs   += DDS_Hello_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += HELLO_SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Hello_SenderEC.cpp
-  }
-
-  Header_Files {
-    Hello_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Hello_SenderEC.inl
-  }
-}
-
-project(DDS_Hello_Sender_stub) : ccm_stub, dds4ccm_base {
-  avoids += ace_for_tao
-  after  += DDS_Hello_Sender_idl_gen DDS_Hello_Base_stub DDS_Hello_Connector_stub
-  libs   += DDS_Hello_Base_stub DDS_Hello_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += HELLO_SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Hello_SenderC.cpp
-  }
-
-  Header_Files {
-    Hello_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    Hello_SenderC.inl
-  }
-}
-
-project(DDS_Hello_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after  += DDS_Hello_Sender_lem_stub DDS_Hello_Sender_stub DDS_Hello_Connector_lem_stub DDS_Hello_Connector_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub DDS_Hello_Base_stub DDS_Hello_Connector_lem_stub DDS_Hello_Connector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += HELLO_SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Hello_Sender_exec.cpp
-  }
-
-  Header_Files {
-    Hello_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_Hello_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  avoids     += ace_for_tao
-  after      += DDS_Hello_Base_stub  DDS_Hello_Sender_lem_stub DDS_Hello_Connector_stub DDS_Hello_Connector_svnt  DDS_Hello_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                DDS_Hello_Base_stub DDS_Hello_Connector_stub DDS_Hello_Connector_svnt DDS_Hello_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += HELLO_SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Hello_SenderS.cpp
-    Hello_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    Hello_SenderS.h
-    Hello_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp
deleted file mode 100644
index 7c4e6634ee7..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp
+++ /dev/null
@@ -1,383 +0,0 @@
-// -*- C++ -*-
-#include "Hello_Sender_exec.h"
-#include "ace/Guard_T.h"
-#include "ace/Log_Msg.h"
-#include "tao/ORB_Core.h"
-#include "ace/Date_Time.h"
-#include "ace/OS_NS_unistd.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_Hello_Sender_Impl
-{
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_component/facet_exs.cpp:75
-  //============================================================
-  // Facet Executor Implementation Class: connector_status_exec_i
-  //============================================================
-
-  connector_status_exec_i::connector_status_exec_i (
-        ::Hello::CCM_Sender_Context_ptr ctx,
-        Atomic_Boolean &ready_to_start)
-    : ciao_context_ (
-        ::Hello::CCM_Sender_Context::_duplicate (ctx)),
-      ready_to_start_(ready_to_start)
-  {
-  }
-
-  connector_status_exec_i::~connector_status_exec_i (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("~connector_status_exec_i\n")));
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-
-  void
-  connector_status_exec_i::on_inconsistent_topic (
-    ::DDS::Topic_ptr /* the_topic */,
-    const ::DDS::InconsistentTopicStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  connector_status_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /* the_reader */,
-    const ::DDS::RequestedIncompatibleQosStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  connector_status_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /* the_reader */,
-    const ::DDS::SampleRejectedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  connector_status_exec_i::on_offered_deadline_missed (
-    ::DDS::DataWriter_ptr /* the_writer */,
-    const ::DDS::OfferedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  connector_status_exec_i::on_offered_incompatible_qos (
-    ::DDS::DataWriter_ptr /* the_writer */,
-    const ::DDS::OfferedIncompatibleQosStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  connector_status_exec_i::on_unexpected_status (
-    ::DDS::Entity_ptr /* the_entity */,
-    ::DDS::StatusKind status_kind)
-  {
-    if (status_kind == DDS::PUBLICATION_MATCHED_STATUS)
-      {
-        // be aware that when only the sender runs, ready_to_start will never
-        // be true.
-        this->ready_to_start_ = true;
-      }
-  }
-
-  //============================================================
-  // Pulse generator
-  //============================================================
-
-  pulse_Generator::pulse_Generator (Sender_exec_i &callback)
-    : pulse_callback_ (callback)
-  {
-  }
-
-  pulse_Generator::~pulse_Generator ()
-  {
-  }
-
-  int
-  pulse_Generator::handle_timeout (const ACE_Time_Value &,
-                                   const void *)
-  {
-    // Notify the subscribers
-    this->pulse_callback_.tick ();
-    return 0;
-  }
-
-  //============================================================
-  // Component Executor Implementation Class: Sender_exec_i
-  //============================================================
-
-  Sender_exec_i::Sender_exec_i (void)
-    : rate_ (1),
-      iteration_ (0),
-      iterations_ (1000),
-      log_time_ (false),
-      msg_ ("Hello World!"),
-      ready_to_start_(false)
-  {
-    this->ticker_ = new pulse_Generator (*this);
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-
-  // Component attributes and port operations.
-
-  ::CORBA::ULong
-  Sender_exec_i::rate (void)
-  {
-    return this->rate_;
-  }
-
-  void
-  Sender_exec_i::rate (
-    ::CORBA::ULong rate)
-  {
-    if (rate == 0)
-      {
-        rate = 1;
-      }
-    else
-      {
-        this->rate_ = rate;
-      }
-  }
-
-  ::CORBA::ULong
-  Sender_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (
-    ::CORBA::ULong iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  char *
-  Sender_exec_i::message (void)
-  {
-    return CORBA::string_dup (this->msg_.c_str());
-  }
-
-  void
-  Sender_exec_i::message (
-    const char * message)
-  {
-    this->msg_ = message;
-  }
-
-  ::CORBA::Boolean
-  Sender_exec_i::log_time (void)
-  {
-    return this->log_time_;
-  }
-
-  void
-  Sender_exec_i::log_time (
-    ::CORBA::Boolean log_time)
-  {
-    this->log_time_ = log_time;
-  }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_connector_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_connector_status_.in ()))
-      {
-        connector_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          connector_status_exec_i (
-            this->ciao_context_.in (),
-            this->ready_to_start_),
-          ::CCM_DDS::CCM_ConnectorStatusListener::_nil ());
-
-        this->ciao_connector_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_ConnectorStatusListener::_duplicate (
-        this->ciao_connector_status_.in ());
-  }
-
-  ACE_CString
-  Sender_exec_i::create_message (const ACE_CString &msg)
-  {
-    if (!this->log_time_)
-      return msg;
-    char timestamp[16];
-    ACE_Date_Time now;
-    ACE_OS::sprintf (timestamp,
-                     "%02d.%06d",
-                     static_cast<int> (now.second()),
-                     static_cast<int> (now.microsec ()));
-    ACE_CString ret (timestamp);
-    ret = ret + " " + msg;
-    return ret.c_str ();
-  }
-
-  void
-  Sender_exec_i::tick ()
-  {
-    // Start writing after DataWriter find first DataReader that matched the
-    // Topic It is still possible that other Readers aren't yet ready to
-    // receive data, for that case in the profile the durability is set to
-    // TRANSIENT_DURABILITY_QOS, so each Reader should receive each message.
-    if(this->ready_to_start_.value())
-      {
-        if (this->iteration_ < this->iterations_)
-          {
-            Hello::Writer_var writer =
-              this->ciao_context_->get_connection_info_in_data ();
-            if (! ::CORBA::is_nil (writer.in ()))
-              {
-                DDSHello new_msg;
-                ACE_CString msg = create_message (this->msg_);
-                new_msg.hello = msg.c_str ();
-                new_msg.iterator = ++this->iteration_;
-                writer->write_one (new_msg, ::DDS::HANDLE_NIL);
-                ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::tick - "
-                                      "Written sample: <%C> - <%u>\n",
-                                      msg.c_str (),
-                                      new_msg.iterator));
-              }
-          }
-        else
-          {
-            // We are done
-            this->stop ();
-          }
-       }
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    ACE_Reactor* reactor = 0;
-
-    ::CORBA::Object_var ccm_object = this->ciao_context_->get_CCM_object();
-    if (!::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (!::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-
-    if (reactor)
-      {
-        // calculate the interval time
-        long const usec = 1000000 / this->rate_;
-        if (reactor->schedule_timer (
-                    this->ticker_,
-                    0,
-                    ACE_Time_Value (3, usec),
-                    ACE_Time_Value (0, usec)) == -1)
-        {
-          ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                                ACE_TEXT ("Error scheduling timer")));
-        }
-      }
-    else
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::stop (void)
-  {
-    ACE_Reactor* reactor = 0;
-
-    ::CORBA::Object_var ccm_object = this->ciao_context_->get_CCM_object();
-    if (!::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (!::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-
-    if (reactor)
-      {
-        reactor->cancel_timer (this->ticker_);
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n")));
-      }
-    else
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-
-    if (!this->ready_to_start_.value())
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::stop - ")
-                              ACE_TEXT ("Sender never got ready to start\n")));
-      }
-  }
-
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Hello::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-    this->start ();
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    this->stop ();
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" HELLO_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Hello_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h
deleted file mode 100644
index 5b6c508df0c..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h
+++ /dev/null
@@ -1,196 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_HELLO_SENDER_EXEC_YPB9XX_H_
-#define CIAO_HELLO_SENDER_EXEC_YPB9XX_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Hello_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-#include <map>
-
-namespace CIAO_Hello_Sender_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_component/facet_exh.cpp:53
-  class HELLO_SENDER_EXEC_Export connector_status_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    connector_status_exec_i (
-      ::Hello::CCM_Sender_Context_ptr ctx,
-      Atomic_Boolean &ready_to_start);
-    virtual ~connector_status_exec_i (void);
-
-    // Operations and attributes from CCM_DDS::ConnectorStatusListener
-
-    virtual
-    void on_inconsistent_topic (
-      ::DDS::Topic_ptr the_topic,
-      const ::DDS::InconsistentTopicStatus & status);
-
-    virtual
-    void on_requested_incompatible_qos (
-      ::DDS::DataReader_ptr the_reader,
-      const ::DDS::RequestedIncompatibleQosStatus & status);
-
-    virtual
-    void on_sample_rejected (
-      ::DDS::DataReader_ptr the_reader,
-      const ::DDS::SampleRejectedStatus & status);
-
-    virtual
-    void on_offered_deadline_missed (
-      ::DDS::DataWriter_ptr the_writer,
-      const ::DDS::OfferedDeadlineMissedStatus & status);
-
-    virtual
-    void on_offered_incompatible_qos (
-      ::DDS::DataWriter_ptr the_writer,
-      const ::DDS::OfferedIncompatibleQosStatus & status);
-
-    virtual
-    void on_unexpected_status (
-      ::DDS::Entity_ptr the_entity,
-      ::DDS::StatusKind status_kind);
-
-  private:
-    ::Hello::CCM_Sender_Context_var ciao_context_;
-    Atomic_Boolean &ready_to_start_;
-  };
-
-  class Sender_exec_i;
-
-  class pulse_Generator :
-    public ACE_Event_Handler
-  {
-  public:
-    pulse_Generator (Sender_exec_i &callback);
-
-    ~pulse_Generator ();
-
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    Sender_exec_i &pulse_callback_;
-  };
-
-
-  class HELLO_SENDER_EXEC_Export Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-    void start (void);
-
-    void stop (void);
-
-    void tick ();
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:36
-
-    virtual ::CORBA::ULong
-    rate (void);
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:36
-
-    virtual void
-    rate (
-      ::CORBA::ULong rate);
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:36
-
-    virtual ::CORBA::ULong
-    iterations (void);
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:36
-
-    virtual void
-    iterations (
-      ::CORBA::ULong iterations);
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:36
-
-    virtual char *
-    message (void);
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:36
-
-    virtual void
-    message (
-      const char * message);
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:36
-
-    virtual ::CORBA::Boolean
-    log_time (void);
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:36
-
-    virtual void
-    log_time (
-      ::CORBA::Boolean log_time);
-
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_connector_status (void);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete (void);
-
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-  private:
-    ::Hello::CCM_Sender_Context_var ciao_context_;
-    ::CCM_DDS::CCM_ConnectorStatusListener_var ciao_connector_status_;
-    pulse_Generator * ticker_;
-    CORBA::ULong rate_;
-    CORBA::ULong iteration_, iterations_;
-    CORBA::Boolean log_time_;
-    ACE_CString msg_;
-
-    ACE_CString create_message (const ACE_CString &msg);
-    Atomic_Boolean ready_to_start_;
-  };
-
-  extern "C" HELLO_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Hello_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/1_to_5.cdp b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/1_to_5.cdp
deleted file mode 100644
index 4444fa41604..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/1_to_5.cdp
+++ /dev/null
@@ -1,1049 +0,0 @@
-<!--  -->
-<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>Hello_Depl_1</label>
-  <UUID>Hello_Depl_1</UUID>
-
-  <implementation xmi:id="Hello_ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Hello_ConnectorComponentImplementation">
-    <name>Hello_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Hello_Connector_ExecArtifact" />
-    <artifact xmi:idref="Hello_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="Hello_ReceiverComponentInstanceOne">
-    <name>Hello_ReceiverComponentOne</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Hello_ReceiverComponentImplementation" />
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReceiverOne</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReceiverOne</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>expected_samples</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>100</ulong>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Hello_ReceiverConnectorComponentInstanceOne">
-    <name>Hello_ReceiverConnectorComponentOne</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Hello_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DDS_Hello</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReceiverConnectorOne</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>HelloTest_Library#HelloProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-
-  <instance xmi:id="Hello_ReceiverComponentInstanceTwo">
-    <name>Hello_ReceiverComponentTwo</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Hello_ReceiverComponentImplementation" />
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReceiverTwo</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReceiverTwo</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>expected_samples</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>100</ulong>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Hello_ReceiverConnectorComponentInstanceTwo">
-    <name>Hello_ReceiverConnectorComponentTwo</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Hello_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DDS_Hello</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReceiverConnectorTwo</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>HelloTest_Library#HelloProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-
-  <instance xmi:id="Hello_ReceiverComponentInstanceThree">
-    <name>Hello_ReceiverComponentThree</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Hello_ReceiverComponentImplementation" />
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReceiverThree</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReceiverThree</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>expected_samples</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>100</ulong>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Hello_ReceiverConnectorComponentInstanceThree">
-    <name>Hello_ReceiverConnectorComponentThree</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Hello_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DDS_Hello</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReceiverConnectorThree</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>HelloTest_Library#HelloProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-
-  <instance xmi:id="Hello_ReceiverComponentInstanceFour">
-    <name>Hello_ReceiverComponentFour</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Hello_ReceiverComponentImplementation" />
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReceiverFour</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReceiverFour</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>expected_samples</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>100</ulong>
-        </value>
-      </value>
-    </configProperty>
-
-  </instance>
-
-  <instance xmi:id="Hello_ReceiverConnectorComponentInstanceFour">
-    <name>Hello_ReceiverConnectorComponentFour</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Hello_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DDS_Hello</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReceiverConnectorFour</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>HelloTest_Library#HelloProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-
-  <instance xmi:id="Hello_ReceiverComponentInstanceFive">
-    <name>Hello_ReceiverComponentFive</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Hello_ReceiverComponentImplementation" />
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReceiverFive</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReceiverFive</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>expected_samples</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>100</ulong>
-        </value>
-      </value>
-    </configProperty>
-   </instance>
-
-  <instance xmi:id="Hello_ReceiverConnectorComponentInstanceFive">
-    <name>Hello_ReceiverConnectorComponentFive</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Hello_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DDS_Hello</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReceiverConnectorFive</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>HelloTest_Library#HelloProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-
-
-  <instance xmi:id="Hello_SenderConnectorComponentInstance">
-    <name>Hello_SenderConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Hello_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DDS_Hello</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>HelloTest_Library#HelloProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>10</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>100</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>message</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello, World via DDS</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>log_time</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>true</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>info_write_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_in_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_SenderConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-  <name>connector_status_sender</name>
-  <deployRequirement>
-    <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-    <resourceType>Local_Interface</resourceType>
-  </deployRequirement>
-  <internalEndpoint>
-    <portName>connector_status</portName>
-    <provider>true</provider>
-    <kind>Facet</kind>
-    <instance xmi:idref="SenderComponentInstance" />
-  </internalEndpoint>
-  <internalEndpoint>
-    <portName>error_listener</portName>
-    <provider>false</provider>
-    <kind>SimplexReceptacle</kind>
-    <instance xmi:idref="Hello_SenderConnectorComponentInstance" />
-  </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_listenercontrolOne</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_ReceiverComponentInstanceOne" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceOne" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_listenercontrolTwo</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_ReceiverComponentInstanceTwo" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceTwo" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_listenercontrolThree</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_ReceiverComponentInstanceThree" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceThree" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_listenercontrolFour</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_ReceiverComponentInstanceFour" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceFour" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_listenercontrolFive</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_ReceiverComponentInstanceFive" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceFive" />
-    </internalEndpoint>
-  </connection>
-
-
-
-
-  <connection>
-    <name>_portstatuslistenerOne</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_ReceiverComponentInstanceOne" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceOne" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_portstatuslistenerTwo</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_ReceiverComponentInstanceTwo" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceTwo" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_portstatuslistenerThree</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_ReceiverComponentInstanceThree" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceThree" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_portstatuslistenerFour</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_ReceiverComponentInstanceFour" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceFour" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_portstatuslistenerFive</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_ReceiverComponentInstanceFive" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceFive" />
-    </internalEndpoint>
-  </connection>
-
-
-
-
-  <connection>
-    <name>_listenerOne</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_ReceiverComponentInstanceOne" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceOne" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_listenerTwo</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_ReceiverComponentInstanceTwo" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceTwo" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_listenerThree</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_ReceiverComponentInstanceThree" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceThree" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_listenerFour</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_ReceiverComponentInstanceFour" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceFour" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_listenerFive</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_ReceiverComponentInstanceFive" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceFive" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="Hello_Connector_ExecArtifact">
-    <name>Hello_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Hello_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Hello_Connector_SvntArtifact">
-    <name>Hello_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Hello_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Hello_Connector_StubArtifact">
-    <name>Hello_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Hello_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/5_Receivers.cdp b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/5_Receivers.cdp
deleted file mode 100644
index 16a942d257e..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/5_Receivers.cdp
+++ /dev/null
@@ -1,1042 +0,0 @@
-<!--  -->
-<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>Hello_DDS_Deployment_5_Receivers</label>
-  <UUID>Hello_DDS_Deployment_5_Receivers</UUID>
-
-  <!-- Implementations declarations -->
-
-  <!-- Home implementation -->
-  <implementation xmi:id="Hello_ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Hello_ReceiverConnectorComponentImplementation">
-    <name>Hello_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Hello_Connector_ExecArtifact" />
-    <artifact xmi:idref="Hello_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="Hello_ReceiverComponentInstanceOne">
-    <name>Hello_ReceiverComponentOne</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Hello_ReceiverComponentImplementation" />
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello_ReceiverHome</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReceiverOne</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReceiverOne</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>expected_samples</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>500</ulong>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Hello_ReceiverConnectorComponentInstanceOne">
-    <name>Hello_ReceiverConnectorComponentOne</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Hello_ReceiverConnectorComponentImplementation" />
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello_ReceiverConnectorHome</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReceiverConnectorOne</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>hello</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>HelloTest_Library#HelloProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-
-  <instance xmi:id="Hello_ReceiverComponentInstanceTwo">
-    <name>Hello_ReceiverComponentTwo</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Hello_ReceiverComponentImplementation" />
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello_ReceiverHome</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReceiverTwo</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReceiverTwo</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>expected_samples</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>500</ulong>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Hello_ReceiverConnectorComponentInstanceTwo">
-    <name>Hello_ReceiverConnectorComponentTwo</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Hello_ReceiverConnectorComponentImplementation" />
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello_ReceiverConnectorHome</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReceiverConnectorTwo</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>hello</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>HelloTest_Library#HelloProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-
-  <instance xmi:id="Hello_ReceiverComponentInstanceThree">
-    <name>Hello_ReceiverComponentThree</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Hello_ReceiverComponentImplementation" />
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello_ReceiverHome</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReceiverThree</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReceiverThree</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>expected_samples</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>500</ulong>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Hello_ReceiverConnectorComponentInstanceThree">
-    <name>Hello_ReceiverConnectorComponentThree</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Hello_ReceiverConnectorComponentImplementation" />
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello_ReceiverConnectorHome</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReceiverConnectorThree</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>hello</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>HelloTest_Library#HelloProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-
-  <instance xmi:id="Hello_ReceiverComponentInstanceFour">
-    <name>Hello_ReceiverComponentFour</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Hello_ReceiverComponentImplementation" />
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello_ReceiverHome</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReceiverFour</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReceiverFour</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>expected_samples</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>500</ulong>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Hello_ReceiverConnectorComponentInstanceFour">
-    <name>Hello_ReceiverConnectorComponentFour</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Hello_ReceiverConnectorComponentImplementation" />
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello_ReceiverConnectorHome</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReceiverConnectorFour</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>hello</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>HelloTest_Library#HelloProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-
-  <instance xmi:id="Hello_ReceiverComponentInstanceFive">
-    <name>Hello_ReceiverComponentFive</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Hello_ReceiverComponentImplementation" />
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello_ReceiverHome</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReceiverFive</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReceiverFive</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>expected_samples</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>500</ulong>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Hello_ReceiverConnectorComponentInstanceFive">
-    <name>Hello_ReceiverConnectorComponentFive</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Hello_ReceiverConnectorComponentImplementation" />
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello_ReceiverConnectorHome</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReceiverConnectorFive</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>hello</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>HelloTest_Library#HelloProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>_listenercontrolOne</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_ReceiverComponentInstanceOne" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceOne" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_listenercontrolTwo</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_ReceiverComponentInstanceTwo" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceTwo" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_listenercontrolThree</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_ReceiverComponentInstanceThree" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceThree" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_listenercontrolFour</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_ReceiverComponentInstanceFour" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceFour" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_listenercontrolFive</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_ReceiverComponentInstanceFive" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceFive" />
-    </internalEndpoint>
-  </connection>
-
-
-
-
-  <connection>
-    <name>_portstatuslistenerOne</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_ReceiverComponentInstanceOne" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceOne" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_portstatuslistenerTwo</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_ReceiverComponentInstanceTwo" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceTwo" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_portstatuslistenerThree</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_ReceiverComponentInstanceThree" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceThree" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_portstatuslistenerFour</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_ReceiverComponentInstanceFour" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceFour" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_portstatuslistenerFive</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_ReceiverComponentInstanceFive" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceFive" />
-    </internalEndpoint>
-  </connection>
-
-
-
-
-  <connection>
-    <name>_listenerOne</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_ReceiverComponentInstanceOne" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceOne" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_listenerTwo</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_ReceiverComponentInstanceTwo" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceTwo" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_listenerThree</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_ReceiverComponentInstanceThree" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceThree" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_listenerFour</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_ReceiverComponentInstanceFour" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceFour" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_listenerFive</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_ReceiverComponentInstanceFive" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceFive" />
-    </internalEndpoint>
-  </connection>
-
-  <!-- Artifacts declarations -->
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="Hello_Connector_ExecArtifact">
-    <name>Hello_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Hello_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Hello_Connector_SvntArtifact">
-    <name>Hello_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Hello_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Hello_Connector_StubArtifact">
-    <name>Hello_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Hello_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/5_Senders.cdp b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/5_Senders.cdp
deleted file mode 100644
index f44e39849cc..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/5_Senders.cdp
+++ /dev/null
@@ -1,883 +0,0 @@
-<!--  -->
-<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>Hello_DDS_Deployment_5_Senders</label>
-  <UUID>Hello_DDS_Deployment_5_Senders</UUID>
-
-  <!-- Implementations declarations -->
-
-  <!-- Home implementation -->
-  <implementation xmi:id="Hello_ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Hello_ConnectorComponentImplementation">
-    <name>Hello_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Hello_Connector_ExecArtifact" />
-    <artifact xmi:idref="Hello_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="Hello_SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="Hello_SenderComponentInstanceOne">
-    <name>Hello_SenderComponentOne</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Hello_SenderComponentImplementation" />
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SenderOne</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>message</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hi, I'm sender One!</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>10</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>100</ulong>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Hello_SenderConnectorComponentInstanceOne">
-    <name>Hello_SenderConnectorComponentOne</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Hello_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SenderConnectorOne</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>hello</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>HelloTest_Library#HelloProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Hello_SenderComponentInstanceTwo">
-    <name>Hello_SenderComponentTwo</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Hello_SenderComponentImplementation" />
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SenderTwo</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>message</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hi, I'm sender Two!</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>10</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>100</ulong>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Hello_SenderConnectorComponentInstanceTwo">
-    <name>Hello_SenderConnectorComponentTwo</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Hello_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SenderConnectorTwo</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>hello</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>HelloTest_Library#HelloProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-
-  <instance xmi:id="Hello_SenderComponentInstanceThree">
-    <name>Hello_SenderComponentThree</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Hello_SenderComponentImplementation" />
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SenderThree</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>message</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hi, I'm sender Three!</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>10</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>100</ulong>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Hello_SenderConnectorComponentInstanceThree">
-    <name>Hello_SenderConnectorComponentThree</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Hello_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SenderConnectorThree</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>hello</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>HelloTest_Library#HelloProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-
-  <instance xmi:id="Hello_SenderComponentInstanceFour">
-    <name>Hello_SenderComponentFour</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Hello_SenderComponentImplementation" />
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SenderFour</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>message</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hi, I'm sender Four!</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>10</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>100</ulong>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-
-  <instance xmi:id="Hello_SenderConnectorComponentInstanceFour">
-    <name>Hello_SenderConnectorComponentFour</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Hello_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SenderConnectorFour</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>hello</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>HelloTest_Library#HelloProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-
-  <instance xmi:id="Hello_SenderComponentInstanceFive">
-    <name>Hello_SenderComponentFive</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Hello_SenderComponentImplementation" />
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SenderFive</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>message</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hi, I'm sender Five!</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>10</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>100</ulong>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Hello_SenderConnectorComponentInstanceFive">
-    <name>Hello_SenderConnectorComponentFive</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Hello_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SenderConnectorFive</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>hello</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>HelloTest_Library#HelloProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>info_write_dataOne</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_in_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_SenderComponentInstanceOne" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_SenderConnectorComponentInstanceOne" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>connector_status_senderOne</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_SenderComponentInstanceOne" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_SenderConnectorComponentInstanceOne" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>info_write_dataTwo</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_in_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_SenderComponentInstanceTwo" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_SenderConnectorComponentInstanceTwo" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>connector_status_senderTwo</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_SenderComponentInstanceTwo" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_SenderConnectorComponentInstanceTwo" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>info_write_dataThree</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_in_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_SenderComponentInstanceThree" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_SenderConnectorComponentInstanceThree" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>connector_status_senderThree</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_SenderComponentInstanceThree" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_SenderConnectorComponentInstanceThree" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>info_write_dataFour</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_in_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_SenderComponentInstanceFour" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_SenderConnectorComponentInstanceFour" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>connector_status_senderFour</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_SenderComponentInstanceFour" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_SenderConnectorComponentInstanceFour" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>info_write_dataFive</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_in_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_SenderComponentInstanceFive" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_SenderConnectorComponentInstanceFive" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>connector_status_senderFive</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_SenderComponentInstanceFive" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_SenderConnectorComponentInstanceFive" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="Hello_Connector_ExecArtifact">
-    <name>Hello_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Hello_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Hello_Connector_SvntArtifact">
-    <name>Hello_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Hello_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Hello_Connector_StubArtifact">
-    <name>Hello_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Hello_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/5_to_1.cdp b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/5_to_1.cdp
deleted file mode 100644
index 23225b3ead8..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/5_to_1.cdp
+++ /dev/null
@@ -1,1044 +0,0 @@
-<!--  -->
-<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>Hello_Depl_1</label>
-  <UUID>Hello_Depl_1</UUID>
-
-  <implementation xmi:id="Hello_ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Hello_ConnectorComponentImplementation">
-    <name>Hello_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Hello_Connector_ExecArtifact" />
-    <artifact xmi:idref="Hello_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="Hello_SenderComponentInstanceOne">
-    <name>Hello_SenderComponentOne</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>10</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>100</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>message</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello, World via DDS Sender One</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>log_time</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>true</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SenderOne</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Hello_SenderConnectorComponentInstanceOne">
-    <name>Hello_SenderConnectorComponentOne</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Hello_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DDS_Hello</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SenderConnectorOne</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>HelloTest_Library#HelloProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-
-  <instance xmi:id="Hello_SenderComponentInstanceTwo">
-    <name>Hello_SenderComponentTwo</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>10</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>100</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>message</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello, World via DDS Sender Two</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>log_time</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>true</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SenderTwo</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Hello_SenderConnectorComponentInstanceTwo">
-    <name>Hello_SenderConnectorComponentTwo</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Hello_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DDS_Hello</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SenderConnectorTwo</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>HelloTest_Library#HelloProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-
-  <instance xmi:id="Hello_SenderComponentInstanceThree">
-    <name>Hello_SenderComponentThree</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>10</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>100</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>message</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello, World via DDS Sender Three</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>log_time</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>true</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SenderThree</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Hello_SenderConnectorComponentInstanceThree">
-    <name>Hello_SenderConnectorComponentThree</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Hello_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DDS_Hello</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SenderConnectorThree</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>HelloTest_Library#HelloProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-
-  <instance xmi:id="Hello_SenderComponentInstanceFour">
-    <name>Hello_SenderComponentFour</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>10</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>100</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>message</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello, World via DDS Sender Four</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>log_time</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>true</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SenderFour</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Hello_SenderConnectorComponentInstanceFour">
-    <name>Hello_SenderConnectorComponentFour</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Hello_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DDS_Hello</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SenderConnectorFour</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>HelloTest_Library#HelloProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-
-  <instance xmi:id="Hello_SenderComponentInstanceFive">
-    <name>Hello_SenderComponentFive</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>10</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>100</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>message</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello, World via DDS Sender Five</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>log_time</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>true</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SenderFive</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Hello_SenderConnectorComponentInstanceFive">
-    <name>Hello_SenderConnectorComponentFive</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Hello_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DDS_Hello</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SenderConnectorFive</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>HelloTest_Library#HelloProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-
-
-  <instance xmi:id="Hello_ReceiverConnectorComponentInstance">
-    <name>Hello_ReceiverConnectorComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Hello_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DDS_Hello</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>HelloTest_Library#HelloProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Hello_ReceiverComponentImplementation" />
-    <configProperty>
-      <name>expected_samples</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>500</ulong>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>info_write_dataOne</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_in_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_SenderComponentInstanceOne" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_SenderConnectorComponentInstanceOne" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>connector_status_senderOne</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_SenderComponentInstanceOne" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_SenderConnectorComponentInstanceOne" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>info_write_dataTwo</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_in_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_SenderComponentInstanceTwo" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_SenderConnectorComponentInstanceTwo" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>connector_status_senderTwo</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_SenderComponentInstanceTwo" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_SenderConnectorComponentInstanceTwo" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>info_write_dataThree</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_in_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_SenderComponentInstanceThree" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_SenderConnectorComponentInstanceThree" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>connector_status_senderThree</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_SenderComponentInstanceThree" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_SenderConnectorComponentInstanceThree" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>info_write_dataFour</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_in_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_SenderComponentInstanceFour" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_SenderConnectorComponentInstanceFour" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>connector_status_senderFour</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_SenderComponentInstanceFour" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_SenderConnectorComponentInstanceFour" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>info_write_dataFive</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_in_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_SenderComponentInstanceFive" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_SenderConnectorComponentInstanceFive" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>connector_status_senderFive</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_SenderComponentInstanceFive" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_SenderConnectorComponentInstanceFive" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>_listenercontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_ReceiverConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>_portstatuslistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_ReceiverConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_ReceiverConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="Hello_Connector_ExecArtifact">
-    <name>Hello_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Hello_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Hello_Connector_SvntArtifact">
-    <name>Hello_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Hello_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Hello_Connector_StubArtifact">
-    <name>Hello_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Hello_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/DeploymentPlan.cdp b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/DeploymentPlan.cdp
deleted file mode 100644
index df6a164c7e7..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/DeploymentPlan.cdp
+++ /dev/null
@@ -1,464 +0,0 @@
-<!--  -->
-<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>Hello_Depl_1</label>
-  <UUID>Hello_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Hello_ConnectorComponentImplementation">
-    <name>Hello_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Hello_Connector_ExecArtifact" />
-    <artifact xmi:idref="Hello_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-    <configProperty>
-      <name>expected_samples</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>100</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver1</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="Hello_ReceiverConnectorComponentInstance">
-    <name>Hello_ReceiverConnectorComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Hello_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>HelloTest_Library#HelloProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="Hello_SenderConnectorComponentInstance">
-    <name>Hello_SenderConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Hello_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>HelloTest_Library#HelloProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>HelloTest_Library#HelloProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>10</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>100</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>message</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello, World via DDS</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>log_time</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>true</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_in_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_SenderConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>connector_status_sender</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_SenderConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_listenercontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_ReceiverConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_portstatuslistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_ReceiverConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_ReceiverConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="Hello_Connector_ExecArtifact">
-    <name>Hello_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Hello_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Hello_Connector_SvntArtifact">
-    <name>Hello_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Hello_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Hello_Connector_StubArtifact">
-    <name>Hello_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Hello_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/HelloTest_Library.xml b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/HelloTest_Library.xml
deleted file mode 100644
index 9295f565474..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/HelloTest_Library.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-  <qos_profile name="HelloProfile">
-     <datawriter_qos>
-          <reliability>
-               <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-         </reliability>
-          <durability>
-               <kind>TRANSIENT_DURABILITY_QOS</kind>
-          </durability>
-          <history>
-               <kind>KEEP_ALL_HISTORY_QOS</kind>
-          </history>
-     </datawriter_qos>
-    <datareader_qos>
-          <reliability>
-               <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-          </reliability>
-          <history>
-               <kind>KEEP_ALL_HISTORY_QOS</kind>
-          </history>
-          <durability>
-                 <kind>TRANSIENT_DURABILITY_QOS</kind>
-          </durability>
-     </datareader_qos>
-  </qos_profile>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/ReceiverOnly.cdp b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/ReceiverOnly.cdp
deleted file mode 100644
index 2252a8e2e86..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/ReceiverOnly.cdp
+++ /dev/null
@@ -1,249 +0,0 @@
-<!--  -->
-<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>Hello_DDS_Deployment_1</label>
-  <UUID>Hello_DDS_Deployment_1</UUID>
-
-  <!-- Implementations declarations -->
-
-  <!-- Home implementation -->
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Hello_ConnectorComponentImplementation">
-    <name>Hello_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Hello_Connector_ExecArtifact" />
-    <artifact xmi:idref="Hello_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-    <configProperty>
-      <name>name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver1</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="Hello_ConnectorComponentInstance">
-    <name>Hello_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Hello_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>_listenercontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_portstatuslistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <!-- Artifacts declarations -->
-  <artifact xmi:id="Hello_Connector_ExecArtifact">
-    <name>Hello_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Hello_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Hello_Connector_SvntArtifact">
-    <name>Hello_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Hello_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Hello_Connector_StubArtifact">
-    <name>Hello_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Hello_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/SenderOnly.cdp b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/SenderOnly.cdp
deleted file mode 100644
index 837f99ae63b..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/SenderOnly.cdp
+++ /dev/null
@@ -1,200 +0,0 @@
-<!--  -->
-<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>Hello_DDS_Deployment_1</label>
-  <UUID>Hello_DDS_Deployment_1</UUID>
-
-  <!-- Implementations declarations -->
-
-  <!-- Home implementation -->
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Hello_ConnectorComponentImplementation">
-    <name>Hello_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Hello_Connector_ExecArtifact" />
-    <artifact xmi:idref="Hello_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-  </instance>
-  <instance xmi:id="Hello_ConnectorComponentInstance">
-    <name>Hello_ConnectorComponent2</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Hello_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>info_write_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_in_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <!-- Artifacts declarations -->
-  <artifact xmi:id="Hello_Connector_ExecArtifact">
-    <name>Hello_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Hello_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Hello_Connector_SvntArtifact">
-    <name>Hello_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Hello_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Hello_Connector_StubArtifact">
-    <name>Hello_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Hello_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index 0175a48be5c..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-Description
-XML QoS Profile
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="HelloTest_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="HelloProfile" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-       </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-
-    </qos_profile>
-  </qos_library>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl
deleted file mode 100755
index 3cc3272485e..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl
+++ /dev/null
@@ -1,244 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "Sender.ior", "Receiver.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "1_to_5.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 60 seconds to allow task to complete\n";
-sleep (60);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl
deleted file mode 100755
index 5b24efcba40..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl
+++ /dev/null
@@ -1,244 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "Sender.ior", "Receiver.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "5_to_1.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 60 seconds to allow task to complete\n";
-sleep (60);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl
deleted file mode 100755
index 6e37446fbf4..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl
+++ /dev/null
@@ -1,251 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "Sender.ior", "Receiver.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$E2 = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "5_Senders.cdp";
-$cdp_file_two = "5_Receivers.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Start dance_plan_launcher.exe with -x $cdp_file_two -k file://$ior_emfile\n";
-$E2 = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file_two -k file://$ior_emfile");
-$E2->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 60 seconds to allow task to complete\n";
-sleep (60);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -s\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$E->SpawnWaitKill (5 * $tg_executor->ProcessStopWaitInterval ());
-
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file_two -s\n";
-
-$E2 = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file_two -s");
-$E2->SpawnWaitKill (5 * $tg_executor->ProcessStopWaitInterval ());
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl
deleted file mode 100755
index 52b6717f27a..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 1;
-@ports = ( 60002 );
-@iorbases = ( "Receiver.ior" );
-@iorfiles = 0;
-@nodenames = ( "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "ReceiverOnly.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 20 seconds to allow task to complete\n";
-sleep (20);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl
deleted file mode 100755
index a4aabfcb9f6..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 1;
-@ports = ( 60001 );
-@iorbases = ( "Sender.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "SenderOnly.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 20 seconds to allow task to complete\n";
-sleep (20);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_test.pl
deleted file mode 100755
index f7af673c0cd..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_test.pl
+++ /dev/null
@@ -1,245 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-$DDS4CCM_TRACE_ENABLE = "$ENV{'DDS4CCM_TRACE_ENABLE'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "Sender.ior", "Receiver.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "DeploymentPlan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 60 seconds to allow task to complete\n";
-sleep (60);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_test_dds.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_test_dds.pl
deleted file mode 100755
index e45a367e630..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_test_dds.pl
+++ /dev/null
@@ -1,25 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-
-$tg_sender = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-$tg_receiver = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-
-
-print "Start receiver\n";
-$R = $tg_receiver->CreateProcess ("$CIAO_ROOT/connectors/dds4ccm/examples/Hello/DDS_Receiver/DDS_receiver", "");
-$R->Spawn();
-print "Start sender\n";
-$S = $tg_sender->CreateProcess ("$CIAO_ROOT/connectors/dds4ccm/examples/Hello/DDS_Sender/DDS_Sender",
-                        "-i 10000 -t -s \"Hello, World\"");
-$S->SpawnWaitKill ($tg_sender->ProcessStartWaitInterval ());
-$R->Kill ();
-
-exit 0;
diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.idl b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.idl
deleted file mode 100644
index 7ac916b5ae1..00000000000
--- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.idl
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * @file I2C_ShapeType.idl
- * @author
- */
-
-#ifndef I2C_SHAPE_TYPE_IDL_
-#define I2C_SHAPE_TYPE_IDL_
-
-#include "connectors/dds4ccm/idl/dds4ccm_Entity.idl"
-
-#include "Base/I2C_Shapes_Base.idl"
-
-#pragma ciao lem "Base/I2C_ShapeTypeE.idl"
-
-module I2C_Typed <typename T, sequence<T> TSeq> {
-  alias DDS_Entity<T, TSeq> DDS_Typed_Entity;
-  typedef DDS_Typed_Entity::DataReader DataReader;
-  typedef DDS_Typed_Entity::DataWriter DataWriter;
-};
-
-module ::I2C_Typed < ::ShapeType, ::ShapeTypeSeq> I2C_Shapes;
-
-#endif /* #ifndef I2C_SHAPE_TYPE_IDL_
- */
-
-
diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.mpc b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.mpc
deleted file mode 100644
index e1db7db6f9a..00000000000
--- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.mpc
+++ /dev/null
@@ -1,81 +0,0 @@
-project(I2C_ShapeType_idl_gen) : connectoridldefaults, ndds_idltocpp_stub {
-  after += DDS4CCM_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=I2C_SHAPES_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=I2C_ShapeType_stub_export.h \
-              -I..
-  idlflags -= -Gcn -Gxhcn
-  IDL_Files {
-    I2C_ShapeType.idl
-  }
-}
-
-project(I2C_ShapeType_lem_gen) : ciaoidldefaults, ndds_idltocpp_stub {
-  custom_only = 1
-  after += I2C_ShapeType_idl_gen
-  idlflags += -Wb,stub_export_macro=I2C_SHAPES_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=I2C_ShapeType_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    I2C_ShapeTypeE.idl
-  }
-}
-
-project(I2C_ShapeType_lem_stub) : ndds_idltocpp_lem_stub {
-  after += I2C_ShapeType_lem_gen I2C_ShapeType_stub I2C_Shapes_Base_stub
-  libs  += I2C_Shapes_Base_stub I2C_ShapeType_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = I2C_ShapeType_lem_stub
-  dynamicflags += I2C_SHAPES_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  requires += dds4ccm_ndds
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    I2C_ShapeTypeEC.cpp
-  }
-
-  Header_Files {
-    I2C_ShapeTypeEC.h
-    I2C_ShapeType_lem_stub_export.h
-  }
-
-  Inline_Files {
-    I2C_ShapeTypeEC.inl
-  }
-}
-
-project(I2C_ShapeType_stub) : ndds_idltocpp_stub {
-  after += I2C_ShapeType_idl_gen I2C_Shapes_Base_stub
-  libs  += I2C_Shapes_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = I2C_ShapeType_stub
-  dynamicflags += I2C_SHAPES_CONNECTOR_STUB_BUILD_DLL
-
-  requires += dds4ccm_ndds
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    I2C_ShapeTypeC.cpp
-  }
-
-  Header_Files {
-    I2C_ShapeTypeC.h
-    I2C_ShapeType_stub_export.h
-    I2C_Shapes_Traits.h
-  }
-
-  Inline_Files {
-    I2C_ShapeTypeC.inl
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Base.idl b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Base.idl
deleted file mode 100644
index 1e7cd3a5555..00000000000
--- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Base.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file I2C_Shapes_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef I2C_SHAPES_BASE_IDL
-#define I2C_SHAPES_BASE_IDL
-
-struct ShapeType {
-  string color; //@key
-  long x;
-  long y;
-  long shapesize;
-};
-
-struct Attributes {
-  string shape; //@key
-  string color; //@key
-  float speed;
-};
-typedef sequence<ShapeType> ShapeTypeSeq;
-
-#endif /* I2C_SHAPES_BASE_IDL */
diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Base.mpc b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Base.mpc
deleted file mode 100644
index 4396c262684..00000000000
--- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Base.mpc
+++ /dev/null
@@ -1,22 +0,0 @@
-project(I2C_Shapes_Base_stub) : taoidldefaults, ndds_idltocpp_ts_defaults {
-  sharedname = I2C_Shapes_Base_stub
-  dynamicflags += SHAPES_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=SHAPES_BASE_STUB_Export \
-              -Wb,stub_export_include=Shapes_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    I2C_Shapes_Base.idl
-  }
-
-  DDSGenerator_Files {
-    I2C_Shapes_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Traits.h b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Traits.h
deleted file mode 100644
index 14afeadd3c1..00000000000
--- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Traits.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// -*- C++ -*-
-#ifndef I2C_SHAPES_TRAITS_H_
-#define I2C_SHAPES_TRAITS_H_
-
-#include "Base/I2C_Shapes_BaseSupport.h"
-#include "Base/I2C_ShapeTypeC.h"
-
-struct ShapeType_DDS_Traits
-{
-  typedef ::ShapeType value_type;
-  typedef ::ShapeTypeRTISeq dds_seq_type;
-  typedef ::ShapeTypeTypeSupport type_support;
-  typedef ::DDS_SampleInfoSeq sampleinfo_seq_type;
-  typedef ::DDS_SampleInfo sampleinfo_type;
-  typedef ::ShapeTypeDataWriter datawriter_type;
-  typedef ::ShapeTypeDataReader datareader_type;
-  typedef ::I2C_Shapes::DataWriter typed_writer_type;
-  typedef ::I2C_Shapes::DataReader typed_reader_type;
-};
-
-#endif /* I2C_SHAPES_TRAITS_H_ */
diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.cpp b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.cpp
deleted file mode 100644
index 14bc5aadd30..00000000000
--- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-#include "I2C_Shapes_Common.h"
-
-#include "ace/Env_Value_T.h"
-
-#include "connectors/dds4ccm/impl/ndds/DomainParticipant.h"
-#include "connectors/dds4ccm/impl/logger/Log_Macros.h"
-
-#define TOPIC_NAME "Square"
-
-I2C_Shapes_Common::I2C_Shapes_Common (void)
-  : factory_ (0)
-{
-  ACE_Env_Value<int> trace (ACE_TEXT("DDS4CCM_TRACE_ENABLE"), 0);
-  if (trace)
-    {
-      DDS4CCM_ENABLE_TRACE ();
-    }
-  else
-    {
-      DDS4CCM_DISABLE_TRACE ();
-    }
-
-}
-
-I2C_Shapes_Common::~I2C_Shapes_Common (void)
-{
-  delete this->factory_;
-}
-
-int
-I2C_Shapes_Common::get_domain_id (void)
-{
-  int domain_id = 0;
-  ACE_Env_Value<int> id (ACE_TEXT("DDS4CCM_DEFAULT_DOMAIN_ID"), domain_id);
-  return id;
-}
-
-void
-I2C_Shapes_Common::initialize (void)
-{
-  this->participant_ = this->participant_factory_.create_participant_with_profile (
-                                  this->get_domain_id (),
-                                  QOS_PROFILE,
-                                  ::DDS::DomainParticipantListener::_nil (),
-                                  0);
-
-  ::CIAO::NDDS::DDS_DomainParticipant_i *part =
-    dynamic_cast< CIAO::NDDS::DDS_DomainParticipant_i * > (this->participant_.in ());
-  if (!part)
-    {
-      DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-          "I2C_Shapes_Common::initialize - Unable to cast the "
-          "DomainParticipant proxy to its internal representation.\n"));
-      throw ::CORBA::INTERNAL ();
-    }
-
-  ACE_NEW_THROW_EX (this->factory_,
-                    dds_type_factory (),
-                    ::CORBA::NO_MEMORY ());
-
-  const char* typesupport_name = ShapeType_DDS_Traits::type_support::get_type_name ();
-
-  if (! ::CIAO::NDDS::DDS_TypeSupport_i::register_type (this->participant_,
-                                                        typesupport_name,
-                                                        this->factory_))
-    {
-      DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-          "I2C_Shapes_Common::initialize - Unable to register type factory\n"));
-      throw ::CORBA::INTERNAL ();
-    }
-
-  ::DDS::ReturnCode_t retcode = ShapeType_DDS_Traits::type_support::register_type (
-        part->get_rti_entity (),
-        typesupport_name);
-  if (retcode != ::DDS::RETCODE_OK)
-    {
-      DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-          "I2C_Shapes_Common::initialize - Unable to register type\n"));
-      throw ::CORBA::INTERNAL ();
-    }
-  this->topic_ = this->participant_->create_topic_with_profile (TOPIC_NAME,
-                                  typesupport_name,
-                                  QOS_PROFILE,
-                                  ::DDS::TopicListener::_nil (),
-                                  0);
-  if (::CORBA::is_nil (this->topic_.in ()))
-    {
-      ACE_ERROR ((LM_ERROR, "I2C_Shapes_Common::initialize - "
-                "Topic seems to be nil\n"));
-      throw ::CORBA::INTERNAL ();
-    }
-}
-
-::DDS::Topic_ptr
-I2C_Shapes_Common::get_topic (void)
-{
-  return ::DDS::Topic::_duplicate (this->topic_.in ());
-}
-
-::DDS::Publisher_ptr
-I2C_Shapes_Common::create_publisher (void)
-{
-  if (::CORBA::is_nil (participant_.in ()))
-    {
-      initialize();
-    }
-  ::DDS::Publisher_var publisher = participant_->create_publisher_with_profile (
-                                  QOS_PROFILE,
-                                  ::DDS::PublisherListener::_nil (),
-                                  0);
-  return publisher._retn ();
-}
-
-::DDS::Subscriber_ptr
-I2C_Shapes_Common::create_subscriber (void)
-{
-  if (::CORBA::is_nil (participant_.in ()))
-    {
-      initialize();
-    }
-  ::DDS::Subscriber_var subscriber = participant_->create_subscriber_with_profile (
-                                  QOS_PROFILE,
-                                  ::DDS::SubscriberListener::_nil (),
-                                  0);
-  return subscriber._retn ();
-}
diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.h b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.h
deleted file mode 100644
index 9e42f379a6a..00000000000
--- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#ifndef I2C_SHAPES_COMMON_H_
-#define I2C_SHAPES_COMMON_H_
-
-#include "I2C_Shapes_Common_export.h"
-#include "connectors/dds4ccm/impl/ndds/DomainParticipant.h"
-#include "connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h"
-#include "connectors/dds4ccm/impl/ndds/TypeSupport.h"
-#include "Base/I2C_Shapes_Traits.h"
-
-/**
- * Pulse generator
- */
-
-#define QOS_PROFILE "Shapes_Library#ShapesProfile"
-
-class I2C_SHAPES_Export I2C_Shapes_Common
-{
-public:
-  I2C_Shapes_Common ();
-  ~I2C_Shapes_Common ();
-
-  //@{
-  /** Public methods. */
-  ::DDS::Publisher_ptr create_publisher (void);
-  ::DDS::Subscriber_ptr create_subscriber (void);
-  //@}
-
-  //@{
-  /** Getters. */
-  ::DDS::Topic_ptr get_topic (void);
-  //@}
-
-private:
-  typedef ::CIAO::NDDS::DDS_TypeFactory_T <ShapeType_DDS_Traits,
-                                           ShapeTypeSeq> dds_type_factory;
-
-  //@{
-  /** Members. */
-  ::CIAO::NDDS::DDS_DomainParticipantFactory_i participant_factory_;
-  ::DDS::DomainParticipant_var participant_;
-  ::CIAO::NDDS::DDS_TypeFactory_i * factory_;
-  ::DDS::Topic_var topic_;
-  //@}
-
-  //@{
-  /** Private methods. */
-  int get_domain_id (void);
-  void initialize (void);
-  //@}
-};
-
-#endif /* I2C_SHAPES_COMMON_H_ */
diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.mpc b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.mpc
deleted file mode 100644
index e7af95e6cf7..00000000000
--- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.mpc
+++ /dev/null
@@ -1,23 +0,0 @@
-project(I2C_Shapes_Common) : dds4ccm_logger, ndds_idltocpp_impl {
-  sharedname = I2C_Shapes_Common
-  dynamicflags += I2C_SHAPES_COMMON_BUILD_DLL
-
-  after += I2C_Shapes_Base_stub I2C_ShapeType_stub
-  libs += I2C_Shapes_Base_stub I2C_ShapeType_stub
-
-  libout = ../lib
-  libpaths += ../lib
-
-  requires += dds4ccm_ndds
-
-  includes += .. $(CIAO_ROOT) $(CIAO_ROOT)/connectors
-
-  Header_Files {
-    I2C_Shapes_Common.h
-    I2C_Shapes_Common_export.h
-  }
-
-  Source_Files {
-    I2C_Shapes_Common.cpp
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common_export.h b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common_export.h
deleted file mode 100644
index 259357cb5d0..00000000000
--- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common_export.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// -*- C++ -*-
-// Definition for Win32 Export directives.
-// ------------------------------
-#ifndef I2C_SHAPES_COMMON_EXPORT_H
-#define I2C_SHAPES_COMMON_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (I2C_SHAPES_HAS_DLL)
-#  define I2C_SHAPES_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && I2C_SHAPES_HAS_DLL */
-
-#if !defined (I2C_SHAPES_HAS_DLL)
-#  define I2C_SHAPES_HAS_DLL 1
-#endif /* ! I2C_SHAPES_HAS_DLL */
-
-#if defined (I2C_SHAPES_HAS_DLL) && (I2C_SHAPES_HAS_DLL == 1)
-#  if defined (I2C_SHAPES_COMMON_BUILD_DLL)
-#    define I2C_SHAPES_Export ACE_Proper_Export_Flag
-#    define I2C_SHAPES_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define I2C_SHAPES_COMMON_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* I2C_SHAPES_COMMON_BUILD_DLL */
-#    define I2C_SHAPES_Export ACE_Proper_Import_Flag
-#    define I2C_SHAPES_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define I2C_SHAPES_COMMON_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* I2C_SHAPES_COMMON_BUILD_DLL */
-#else /* I2C_SHAPES_HAS_DLL == 1 */
-#  define I2C_SHAPES_Export
-#  define I2C_SHAPES_SINGLETON_DECLARATION(T)
-#  define I2C_SHAPES_COMMON_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* I2C_SHAPES_HAS_DLL == 1 */
-
-#endif /* I2C_SHAPES_COMMON_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.cpp b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.cpp
deleted file mode 100644
index 3b15db7c2bc..00000000000
--- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-#include "Common/I2C_Shapes_Common.h"
-#include "connectors/dds4ccm/impl/ndds/DataReader_T.h"
-
-#include "ace/OS_NS_unistd.h"
-
-typedef ::I2C_Shapes::DataReader TypedDataReader;
-
-void
-read (TypedDataReader::_ptr_type shapes_dr)
-{
-  int samples_received = 0;
-  if (shapes_dr)
-    {
-      while (samples_received < 1000)
-        {
-          // Start to read
-          ShapeTypeSeq data;
-          ::DDS::SampleInfoSeq  info;
-          ::DDS::ReturnCode_t retcode = shapes_dr->take (
-                                                    data,
-                                                    info,
-                                                    ::DDS::LENGTH_UNLIMITED,
-                                                    ::DDS::NOT_READ_SAMPLE_STATE,
-                                                    ::DDS::ANY_VIEW_STATE,
-                                                    ::DDS::ALIVE_INSTANCE_STATE);
-          samples_received += data.length ();
-          if (retcode == ::DDS::RETCODE_OK)
-            {
-              for (::CORBA::ULong i = 0; i < data.length (); ++i)
-                {
-                  ACE_DEBUG ((LM_DEBUG, "read - "
-                            "Received sample: x <%u> - y <%u>\n",
-                            data[i].x,
-                            data[i].y));
-                }
-            }
-          else if (retcode != ::DDS::RETCODE_NO_DATA)
-            {
-              ACE_ERROR ((LM_ERROR, "Receiver_exec_i::start_read_using_idl_proxy - "
-                        "ERROR: Error during read\n"));
-            }
-          ACE_Time_Value tv (0, 50);
-          ACE_OS::sleep (tv);
-        }
-      ACE_DEBUG ((LM_DEBUG, "read - Ready\n"));
-    }
-  else
-    {
-      ACE_ERROR ((LM_ERROR, "read- ERROR: DataReader seems to be nil\n"));
-    }
-}
-
-int ACE_TMAIN (int , ACE_TCHAR *[])
-{
-  int main_result = 0;
-
-  I2C_Shapes_Common common;
-
-  try
-    {
-      ::DDS::Subscriber_var subscriber;
-      subscriber = common.create_subscriber ();
-      if (::CORBA::is_nil (subscriber.in ()))
-        {
-          ACE_ERROR ((LM_ERROR, "ACE_TMAIN - Subscriber seems to be nil\n"));
-          throw ::CORBA::INTERNAL ();
-        }
-
-      ::DDS::Topic_var topic = common.get_topic ();
-      ::DDS::DataReader_var dr = subscriber->create_datareader_with_profile (
-                                      topic.in (),
-                                      QOS_PROFILE,
-                                      ::DDS::DataReaderListener::_nil (),
-                                      0);
-
-      TypedDataReader::_var_type shapes_dr = TypedDataReader::_narrow (dr.in ());
-      if (shapes_dr->enable () != DDS_RETCODE_OK)
-        {
-          ACE_ERROR ((LM_ERROR, "ACE_TMAIN - Unable to enable the datareader.\n"));
-          throw ::CORBA::INTERNAL ();
-        }
-      read (shapes_dr.in ());
-    }
-  catch (::CORBA::Exception &e)
-    {
-      e._tao_print_exception ("ACE_TMAIN RECEIVER");
-    }
-  catch (...)
-    {
-      ACE_ERROR ((LM_ERROR, "ACE_TMAIN RECEIVER - "
-                "Error: unexpected exception caught\n"));
-    }
-
-  return main_result;
-}
diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.mpc b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.mpc
deleted file mode 100644
index 141295aa128..00000000000
--- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.mpc
+++ /dev/null
@@ -1,21 +0,0 @@
-project(*i2c_shapes_rec) : dds4ccm_logger, ndds_idltocpp_impl {
-  exename = I2C_Shapes_Receiver
-  after += I2C_Shapes_Base_Stub I2C_ShapeType_stub I2C_Shapes_Common
-
-  includes += .. $(CIAO_ROOT) $(CIAO_ROOT)/connectors
-
-  requires += dds4ccm_ndds
-
-  libs += I2C_Shapes_Common I2C_Shapes_Base_stub I2C_ShapeType_stub
-  libpaths += ../lib
-
-  exeout += ../lib
-
-  Source_Files {
-    I2C_Shapes_Receiver.cpp
-  }
-
-  Header_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.cpp b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.cpp
deleted file mode 100644
index 9db989a3b61..00000000000
--- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-#include "Common/I2C_Shapes_Common.h"
-#include "connectors/dds4ccm/impl/ndds/DataWriter_T.h"
-
-#include "ace/OS_NS_unistd.h"
-
-#define MAX_X_Y 250
-
-typedef ::I2C_Shapes::DataWriter TypedDataWriter;
-
-void
-write (TypedDataWriter::_ptr_type shapes_dw)
-{
-  if (shapes_dw)
-    {
-      ShapeType square;
-      square.color = "GREEN";
-      square.x = ACE_OS::rand () % MAX_X_Y;
-      square.y = ACE_OS::rand () % MAX_X_Y;
-      square.shapesize = 25;
-      bool x_increasing = true;
-      bool y_increasing = true;
-      for (::CORBA::ULong i = 0; i < 1000; ++i)
-        {
-          if (x_increasing)
-            {
-              ++square.x;
-              x_increasing = square.x + 1 <= MAX_X_Y;
-            }
-          else
-            {
-              --square.x;
-              x_increasing = square.x - 1 < 0;
-            }
-          if (y_increasing)
-            {
-              ++square.y;
-              y_increasing = square.y + 1 <= MAX_X_Y;
-            }
-          else
-            {
-              --square.y;
-              y_increasing = square.y - 1 < 0;
-            }
-          ::DDS::ReturnCode_t retcode = shapes_dw->write (square, ::DDS::HANDLE_NIL);
-          if (retcode == ::DDS::RETCODE_OK)
-            {
-              ACE_DEBUG ((LM_DEBUG, "Updated square - "
-                        "x: <%u> - y: <%u>\n",
-                        square.x, square.y));
-            }
-          ACE_Time_Value tv (0, 500000);
-          ACE_OS::sleep (tv);
-        }
-      ACE_DEBUG ((LM_DEBUG, "write - Ready. Written 1000 samples.\n"));
-    }
-  else
-    {
-      ACE_ERROR ((LM_ERROR, "write - ERROR: DataWriter seems to be nil\n"));
-    }
-}
-
-int ACE_TMAIN (int , ACE_TCHAR *[])
-{
-  int main_result = 0;
-  I2C_Shapes_Common common;
-  try
-    {
-      ::DDS::Publisher_var publisher = common.create_publisher ();
-      if (::CORBA::is_nil (publisher.in ()))
-        {
-          ACE_ERROR ((LM_ERROR, "ACE_TMAIN - Publisher seems to be nil\n"));
-          throw ::CORBA::INTERNAL ();
-        }
-
-      ::DDS::Topic_var topic = common.get_topic ();
-      ::DDS::DataWriter_var dw = publisher->create_datawriter_with_profile (
-                                      topic.in (),
-                                      QOS_PROFILE,
-                                      ::DDS::DataWriterListener::_nil (),
-                                      0);
-
-      TypedDataWriter::_var_type shapes_dw = TypedDataWriter::_narrow (dw.in ());
-      if (shapes_dw->enable () != DDS_RETCODE_OK)
-        {
-          ACE_ERROR ((LM_ERROR, "ACE_TMAIN - Unable to enable the datawriter.\n"));
-          throw ::CORBA::INTERNAL ();
-        }
-      write (shapes_dw);
-    }
-  catch (::CORBA::Exception &e)
-    {
-      e._tao_print_exception ("ACE_TMAIN SENDER");
-    }
-  catch (...)
-    {
-      ACE_ERROR ((LM_ERROR, "ACE_TMAIN SENDER - "
-                "Error: unexpected exception caught\n"));
-    }
-
-  return main_result;
-}
-
diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.mpc b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.mpc
deleted file mode 100644
index 4de969ba030..00000000000
--- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.mpc
+++ /dev/null
@@ -1,19 +0,0 @@
-project(*i2c_shapes_sender) : dds4ccm_logger, ndds_idltocpp_impl, ndds_cck_ts_defaults {
-  exename = I2C_Shapes_Sender
-  after += I2C_Shapes_Base_Stub I2C_ShapeType_stub I2C_Shapes_Common
-
-  includes += .. $(CIAO_ROOT) $(CIAO_ROOT)/connectors
-
-  exeout += ../lib
-  libs += I2C_Shapes_Common I2C_Shapes_Base_stub I2C_ShapeType_stub
-  libpaths += ../lib
-
-  requires += dds4ccm_ndds
-
-  Source_Files {
-    I2C_Shapes_Sender.cpp
-  }
-
-  Header_Files {
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index 315cf33da4d..00000000000
--- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-Description
-XML QoS Profile
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="Shapes_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="ShapesProfile" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>10</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/descriptors/run_test.pl
deleted file mode 100755
index 84dce36ee0f..00000000000
--- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/descriptors/run_test.pl
+++ /dev/null
@@ -1,32 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$tg_sender = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-$tg_receiver = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-$tg_sender->AddLibPath ('../lib');
-$tg_receiver->AddLibPath ('../lib');
-
-
-print "Start receiver\n";
-$R = $tg_receiver->CreateProcess ("../lib/I2C_Shapes_Receiver", "");
-$R->Spawn();
-
-sleep (1);
-
-print "Start sender\n";
-$S = $tg_sender->CreateProcess ("../lib/I2C_Shapes_Sender", "");
-$S->Spawn ();
-
-
-sleep (80);
-
-$R->Kill ();
-$S->Kill ();
-
-exit 0;
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/.gitignore b/CIAO/connectors/dds4ccm/examples/Large_Deployment/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/.gitignore b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/.gitignore
deleted file mode 100644
index 434fd0a2d00..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/Common.cxx
-/Common.h
-/CommonPlugin.cxx
-/CommonPlugin.h
-/CommonSupport.cxx
-/CommonSupport.h
-/Large_Deployment_Common_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Common.idl b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Common.idl
deleted file mode 100644
index f1228b5852b..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Common.idl
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef LARGE_COMMON_IDL
-#define LARGE_COMMON_IDL
-
-#pragma ndds typesupport "Common/CommonSupport.h"
-#pragma opendds typesupport "Common/CommonTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "LargeType"
-#pragma DCPS_DATA_KEY "LargeType value"
-
-struct LargeType {
-  string value; //@key
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<LargeType> LargeTypeSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Common.mpc b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Common.mpc
deleted file mode 100644
index 5cf821a62c1..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Common.mpc
+++ /dev/null
@@ -1,22 +0,0 @@
-project (Large_Deployment_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = Large_Deployment_stub
-  dynamicflags += LARGE_DEPLOYMENT_COMMON_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -Gxhst \
-              -Wb,export_macro=LARGE_DEPLOYMENT_COMMON_STUB_Export \
-              -Wb,export_include=Large_Deployment_Common_stub_export.h
-
-  IDL_Files {
-    Common.idl
-  }
-
-  opendds_ts_flags += --export=LARGE_DEPLOYMENT_COMMON_STUB_Export
-
-  DDSGenerator_Files {
-    Common.idl
-  }
-
-  Source_Files {
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.idl b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.idl
deleted file mode 100644
index 4d09d57664c..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.idl
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef SINGLE_SERVICE_COMMON_IDL_
-#define SINGLE_SERVICE_COMMON_IDL_
-
-#pragma ciao lem "Common/Single_Service_CommonE.idl"
-
-interface Simple_Service
-{
-  oneway void ping ();
-};
-
-#endif /* SINGLE_SERVICE_COMMON_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.mpc b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.mpc
deleted file mode 100644
index 199292d2aae..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.mpc
+++ /dev/null
@@ -1,104 +0,0 @@
-project(Single_Service_Common_idl_gen) : taoidldefaults {
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SINGLE_SERVICE_COMMON_STUB_Export \
-              -Wb,stub_export_include=Single_Service_Common_stub_export.h \
-              -Wb,skel_export_macro=SINGLE_SERVICE_COMMON_SKEL_Export \
-              -Wb,skel_export_include=Single_Service_Common_skel_export.h \
-              -Gxhst -Gxhsk -Gsv -Glem
-
-  IDL_Files {
-    Single_Service_Common.idl
-  }
-}
-
-project(Single_Service_Common_idl_lem_gen) : ciaoidldefaults {
-  after += Single_Service_Common_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SINGLE_SERVICE_COMMON_LEM_STUB_Export \
-              -Wb,stub_export_include=Single_Service_Common_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    Single_Service_CommonE.idl
-  }
-}
-
-project(Single_Service_Common_lem_stub) : ccm_svnt   {
-  after +=  Single_Service_Common_idl_lem_gen \
-            Single_Service_Common_stub
-  libs  +=  Single_Service_Common_stub
-
-  libpaths += ../lib
-  libout = ../lib
-
-  sharedname = Single_Service_Common_lem_stub
-  dynamicflags += SINGLE_SERVICE_COMMON_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Single_Service_CommonEC.cpp
-  }
-
-  Header_Files {
-    Single_Service_CommonEC.h
-    Single_Service_Common_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Single_Service_CommonEC.inl
-  }
-}
-
-project(Single_Service_Common_stub) : ccm_stub {
-  after += Single_Service_Common_idl_gen
-
-  libpaths += ../lib
-  libout = ../lib
-
-  sharedname = Single_Service_Common_stub
-  dynamicflags += SINGLE_SERVICE_COMMON_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Single_Service_CommonC.cpp
-  }
-
-  Header_Files {
-    Single_Service_CommonC.h
-    Single_Service_Common_stub_export.h
-  }
-
-  Inline_Files {
-    Single_Service_CommonC.inl
-  }
-}
-
-project(Single_Service_Common_skel) : ccm_svnt {
-  after += Single_Service_Common_stub
-  libs += Single_Service_Common_stub
-
-  libpaths += ../lib
-  libout = ../lib
-
-  sharedname = Single_Service_Common_skel
-  dynamicflags += SINGLE_SERVICE_COMMON_SKEL_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Single_Service_CommonS.cpp
-  }
-
-  Header_Files {
-    Single_Service_CommonS.h
-    Single_Service_Common_skel_export.h
-  }
-
-  Inline_Files {
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/.gitignore b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/.gitignore
deleted file mode 100644
index 852b25767b6..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-/LARGE_Connector_conn_export.h
-/Large_ConnectorE.idl
-/Large_Connector_conn.cpp
-/Large_Connector_conn.h
-/Large_Connector_exec_export.h
-/Large_Connector_lem_stub_export.h
-/Large_Connector_stub_export.h
-/Large_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.idl b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.idl
deleted file mode 100644
index 5ebdec65340..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.idl
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef LARGE_CONNECTOR_IDL
-#define LARGE_CONNECTOR_IDL
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Common/Common.idl"
-
-#pragma ciao lem "Connector/Large_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Common/CommonTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::LargeType, ::LargeTypeSeq> LargeTypeConn;
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.mpc b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.mpc
deleted file mode 100644
index 9579a4fe6dc..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.mpc
+++ /dev/null
@@ -1,138 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -l ../lib -o ../lib -b dds4ccm_base -u Large Large_Connector"
-
-project(Large_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen Large_Deployment_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=LARGE_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=Large_Connector_stub_export.h \
-              -Wb,skel_export_macro=LARGE_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=Large_Connector_svnt_export.h \
-              -Wb,exec_export_macro=LARGE_CONNECTOR_EXEC_Export \
-              -Wb,exec_export_include=Large_Connector_exec_export.h \
-              -Wb,conn_export_macro=LARGE_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=LARGE_Connector_conn_export.h \
-              -Gxhex -Gxhsk -Gxhst -I..
-
-  IDL_Files {
-    Large_Connector.idl
-  }
-}
-
-project(Large_Connector_lem_gen) : ciaoidldefaults, dds4ccm_base {
-  after += Large_Connector_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=LARGE_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=Large_Connector_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    Large_ConnectorE.idl
-  }
-}
-
-project(Large_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += Large_Connector_lem_gen Large_Connector_stub Large_Deployment_stub
-  libs  +=  Large_Connector_stub Large_Deployment_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Large_Connector_lem_stub
-  dynamicflags += LARGE_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Large_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    Large_ConnectorEC.h
-    Large_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Large_ConnectorEC.inl
-  }
-}
-
-project(Large_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += Large_Connector_idl_gen Large_Deployment_stub
-  libs  += Large_Deployment_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Large_Connector_stub
-  dynamicflags += LARGE_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Large_ConnectorC.cpp
-  }
-
-  Header_Files {
-    Large_ConnectorC.h
-    Large_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    Large_ConnectorC.inl
-  }
-}
-
-project(Large_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += Large_Connector_lem_stub Large_Connector_stub
-  sharedname = Large_Connector_exec
-  libs += Large_Connector_stub Large_Connector_lem_stub Large_Deployment_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += LARGE_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Large_Connector_conn.cpp
-  }
-
-  Header_Files {
-    Large_Connector_conn.h
-    Large_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(Large_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      +=   Large_Connector_lem_stub Large_Connector_exec Large_Connector_stub
-  sharedname  = Large_Connector_svnt
-  libs       += Large_Connector_stub Large_Connector_lem_stub Large_Connector_exec Large_Deployment_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += LARGE_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Large_ConnectorS.cpp
-    Large_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    Large_ConnectorS.h
-    Large_Connector_svnt.h
-    Large_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/.gitignore b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/.gitignore
deleted file mode 100644
index 259c7437324..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/DDS_PubE.idl
-/DDS_Pub_exec_export.h
-/DDS_Pub_lem_stub_export.h
-/DDS_Pub_stub_export.h
-/DDS_Pub_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.idl b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.idl
deleted file mode 100644
index 2d9312de929..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.idl
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef DDS_PUB_IDL
-#define DDS_PUB_IDL
-
-#include "Common/Single_Service_Common.idl"
-#include "Connector/Large_Connector.idl"
-
-component DDS_Pub
-{
-  port LargeTypeConn::DDS_Write info;
-  uses Simple_Service ping_one;
-  uses Simple_Service ping_two;
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.mpc b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.mpc
deleted file mode 100644
index df88edcce88..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.mpc
+++ /dev/null
@@ -1,138 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -l ../lib -o ../lib -b dds4ccm_base -u Large DDS_Pub"
-
-project(Large_DDS_Pub_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += Large_Deployment_stub
-  idlflags += -Wb,stub_export_macro=DDS_PUB_STUB_Export \
-              -Wb,stub_export_include=DDS_Pub_stub_export.h \
-              -Wb,skel_export_macro=DDS_PUB_SVNT_Export \
-              -Wb,skel_export_include=DDS_Pub_svnt_export.h \
-              -Wb,exec_export_macro=DDS_PUB_EXEC_Export \
-              -Wb,exec_export_include=DDS_Pub_exec_export.h \
-              -Gxhex -Gxhsk -Gxhst -I..
-
-  IDL_Files {
-    DDS_Pub.idl
-  }
-}
-
-project(Large_DDS_Pub_lem_gen) : ciaoidldefaults, dds4ccm {
-  after +=  Large_DDS_Pub_idl_gen Large_Connector_idl_gen \
-            Single_Service_Common_lem_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=DDS_PUB_LEM_STUB_Export \
-              -Wb,stub_export_include=DDS_Pub_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    DDS_PubE.idl
-  }
-}
-
-project(Large_DDS_Pub_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += Large_DDS_Pub_lem_gen Large_DDS_Pub_stub  Large_Deployment_stub
-  libs  +=  DDS_Pub_stub Large_Deployment_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Pub_lem_stub
-  dynamicflags += DDS_PUB_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    DDS_PubEC.cpp
-  }
-
-  Header_Files {
-    DDS_PubEC.h
-    DDS_Pub_lem_stub_export.h
-  }
-
-  Inline_Files {
-    DDS_PubEC.inl
-  }
-}
-
-project(Large_DDS_Pub_stub) : ccm_stub, dds4ccm_base {
-  after += Large_DDS_Pub_idl_gen Large_Deployment_stub Single_Service_Common_stub
-  libs  += Large_Deployment_stub Single_Service_Common_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Pub_stub
-  dynamicflags += DDS_PUB_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    DDS_PubC.cpp
-  }
-
-  Header_Files {
-    DDS_PubC.h
-    DDS_Pub_stub_export.h
-  }
-
-  Inline_Files {
-    DDS_PubC.inl
-  }
-}
-
-project(Large_DDS_Pub_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += Large_DDS_Pub_lem_stub Large_DDS_Pub_stub Large_Connector_stub Large_Connector_lem_stub Single_Service_Common_stub
-  sharedname = DDS_Pub_exec
-  libs += DDS_Pub_stub DDS_Pub_lem_stub Large_Deployment_stub Large_Connector_stub Large_Connector_lem_stub Single_Service_Common_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += DDS_PUB_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    DDS_Pub_exec.cpp
-  }
-
-  Header_Files {
-    DDS_Pub_exec.h
-    DDS_Pub_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(Large_DDS_Pub_svnt) : ciao_servant, dds4ccm_base {
-  after      +=   Large_DDS_Pub_lem_stub Large_Connector_stub Single_Service_Common_stub
-  sharedname  = DDS_Pub_svnt
-  libs       += DDS_Pub_stub DDS_Pub_lem_stub  Large_Deployment_stub Single_Service_Common_stub
-  libs += Large_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += DDS_PUB_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    DDS_PubS.cpp
-    DDS_Pub_svnt.cpp
-  }
-
-  Header_Files {
-    DDS_PubS.h
-    DDS_Pub_svnt.h
-    DDS_Pub_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub_exec.cpp b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub_exec.cpp
deleted file mode 100644
index 4371b10e038..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub_exec.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-// -*- C++ -*-
-#include "DDS_Pub_exec.h"
-
-namespace CIAO_DDS_Pub_Impl
-{
-  //============================================================
-  // Component Executor Implementation Class: DDS_Pub_exec_i
-  //============================================================
-
-  DDS_Pub_exec_i::DDS_Pub_exec_i (void)
-  {
-  }
-
-  DDS_Pub_exec_i::~DDS_Pub_exec_i (void)
-  {
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  DDS_Pub_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::CCM_DDS_Pub_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  DDS_Pub_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  DDS_Pub_exec_i::ccm_activate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  DDS_Pub_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  DDS_Pub_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" DDS_PUB_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_DDS_Pub_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      DDS_Pub_exec_i);
-
-    return retval;
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub_exec.h b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub_exec.h
deleted file mode 100644
index a73f16144fe..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub_exec.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_DDS_PUB_EXEC_MKL1YH_H_
-#define CIAO_DDS_PUB_EXEC_MKL1YH_H_
-
-#include /**/ "ace/pre.h"
-
-#include "DDS_PubEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "DDS_Pub_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_DDS_Pub_Impl
-{
-  class DDS_PUB_EXEC_Export DDS_Pub_exec_i
-    : public virtual DDS_Pub_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    DDS_Pub_exec_i (void);
-    virtual ~DDS_Pub_exec_i (void);
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-
-    virtual void
-    set_session_context (
-      ::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete (void);
-
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-
-  private:
-    ::CCM_DDS_Pub_Context_var context_;
-  };
-
-  extern "C" DDS_PUB_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_DDS_Pub_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/.gitignore b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/.gitignore
deleted file mode 100644
index dc9f40e4d41..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/DDS_SubE.idl
-/DDS_Sub_exec_export.h
-/DDS_Sub_lem_stub_export.h
-/DDS_Sub_stub_export.h
-/DDS_Sub_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.idl b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.idl
deleted file mode 100644
index ca811ce932a..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.idl
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef DDS_SUB_IDL
-#define DDS_SUB_IDL
-
-#include "Common/Single_Service_Common.idl"
-#include "Connector/Large_Connector.idl"
-
-component DDS_Sub
-{
-  port LargeTypeConn::DDS_Listen info_in;
-  port LargeTypeConn::DDS_Get ingo_get;
-  uses Simple_Service ping_port;
-};
-#endif
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.mpc b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.mpc
deleted file mode 100644
index 7a5cb320bb1..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.mpc
+++ /dev/null
@@ -1,136 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -l ../lib -o ../lib -b dds4ccm_base -u Large DDS_Sub"
-
-project(Large_DDS_Sub_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += Large_Deployment_stub
-  idlflags += -Wb,stub_export_macro=DDS_SUB_STUB_Export \
-              -Wb,stub_export_include=DDS_Sub_stub_export.h \
-              -Wb,skel_export_macro=DDS_SUB_SVNT_Export \
-              -Wb,skel_export_include=DDS_Sub_svnt_export.h \
-              -Wb,exec_export_macro=DDS_SUB_EXEC_Export \
-              -Wb,exec_export_include=DDS_Sub_exec_export.h \
-              -Gxhex -Gxhsk -Gxhst -I..
-
-  IDL_Files {
-    DDS_Sub.idl
-  }
-}
-
-project(Large_DDS_Sub_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += Large_DDS_Sub_idl_gen Large_Connector_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=DDS_SUB_LEM_STUB_Export \
-              -Wb,stub_export_include=DDS_Sub_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    DDS_SubE.idl
-  }
-}
-
-project(Large_DDS_Sub_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += Large_DDS_Sub_lem_gen Large_DDS_Sub_stub Large_Deployment_stub
-  libs  +=  DDS_Sub_stub Large_Deployment_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Sub_lem_stub
-  dynamicflags += DDS_SUB_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    DDS_SubEC.cpp
-  }
-
-  Header_Files {
-    DDS_SubEC.h
-    DDS_Sub_lem_stub_export.h
-  }
-
-  Inline_Files {
-    DDS_SubEC.inl
-  }
-}
-
-project(Large_DDS_Sub_stub) : ccm_stub, dds4ccm_base {
-  after += Large_DDS_Sub_idl_gen Large_Deployment_stub Single_Service_Common_stub
-  libs  += Large_Deployment_stub Single_Service_Common_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Sub_stub
-  dynamicflags += DDS_SUB_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    DDS_SubC.cpp
-  }
-
-  Header_Files {
-    DDS_SubC.h
-    DDS_Sub_stub_export.h
-  }
-
-  Inline_Files {
-    DDS_SubC.inl
-  }
-}
-
-project(Large_DDS_Sub_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += Large_DDS_Sub_lem_stub Large_DDS_Sub_stub Large_Connector_stub Large_Connector_lem_stub Single_Service_Common_stub
-  sharedname = DDS_Sub_exec
-  libs += DDS_Sub_stub DDS_Sub_lem_stub Large_Deployment_stub Large_Connector_stub Large_Connector_lem_stub Single_Service_Common_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += DDS_SUB_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    DDS_Sub_exec.cpp
-  }
-
-  Header_Files {
-    DDS_Sub_exec.h
-    DDS_Sub_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(Large_DDS_Sub_svnt) : ciao_servant, dds4ccm_base {
-  after      +=   Large_DDS_Sub_lem_stub Large_Connector_stub Single_Service_Common_stub
-  sharedname  = DDS_Sub_svnt
-  libs       += DDS_Sub_stub DDS_Sub_lem_stub  Large_Deployment_stub Large_Connector_stub Single_Service_Common_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += DDS_SUB_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    DDS_SubS.cpp
-    DDS_Sub_svnt.cpp
-  }
-
-  Header_Files {
-    DDS_SubS.h
-    DDS_Sub_svnt.h
-    DDS_Sub_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub_exec.cpp b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub_exec.cpp
deleted file mode 100644
index ae7b567ead4..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub_exec.cpp
+++ /dev/null
@@ -1,180 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.7.7
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:1277
-
-#include "DDS_Sub_exec.h"
-
-namespace CIAO_DDS_Sub_Impl
-{
-  //============================================================
-  // Facet Executor Implementation Class: Listener_exec_i
-  //============================================================
-
-  Listener_exec_i::Listener_exec_i (void)
-  {
-  }
-
-  Listener_exec_i::~Listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::LargeTypeConn::Listener
-
-  void
-  Listener_exec_i::on_one_data (
-    const ::LargeType & /* datum */,
-    const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Listener_exec_i::on_many_data (
-    const ::LargeTypeSeq & /* data */,
-    const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    /* Your code here. */
-  }
-  //============================================================
-  // Facet Executor Implementation Class: PortStatusListener_exec_i
-  //============================================================
-
-  PortStatusListener_exec_i::PortStatusListener_exec_i (void)
-  {
-  }
-
-  PortStatusListener_exec_i::~PortStatusListener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  PortStatusListener_exec_i::on_requested_deadline_missed (
-    ::DDS::DataReader_ptr /* the_reader */,
-    const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  PortStatusListener_exec_i::on_sample_lost (
-    ::DDS::DataReader_ptr /* the_reader */,
-    const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-  //============================================================
-  // Component Executor Implementation Class: DDS_Sub_exec_i
-  //============================================================
-
-  DDS_Sub_exec_i::DDS_Sub_exec_i (void)
-  {
-  }
-
-  DDS_Sub_exec_i::~DDS_Sub_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-
-  // Component attributes and port operations.
-
-  ::LargeTypeConn::CCM_Listener_ptr
-  DDS_Sub_exec_i::get_info_in_data_listener (void)
-  {
-    /* Your code here. */
-    return ::LargeTypeConn::CCM_Listener::_nil ();
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  DDS_Sub_exec_i::get_info_in_status (void)
-  {
-    /* Your code here. */
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  DDS_Sub_exec_i::get_ingo_get_status (void)
-  {
-    /* Your code here. */
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  DDS_Sub_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::CCM_DDS_Sub_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  DDS_Sub_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  DDS_Sub_exec_i::ccm_activate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  DDS_Sub_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  DDS_Sub_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" DDS_SUB_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_DDS_Sub_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      DDS_Sub_exec_i);
-
-    return retval;
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub_exec.h b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub_exec.h
deleted file mode 100644
index 61cea1dcd92..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub_exec.h
+++ /dev/null
@@ -1,158 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.7.7
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:1216
-
-#ifndef CIAO_DDS_SUB_EXEC_NW9STU_H_
-#define CIAO_DDS_SUB_EXEC_NW9STU_H_
-
-#include /**/ "ace/pre.h"
-
-#include "DDS_SubEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "DDS_Sub_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_DDS_Sub_Impl
-{
-  // TAO_IDL - Generated from
-  // be/be_visitor_component/facet_exh.cpp:53
-
-  class DDS_SUB_EXEC_Export Listener_exec_i
-    : public virtual ::LargeTypeConn::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Listener_exec_i (void);
-    virtual ~Listener_exec_i (void);
-
-    // Operations and attributes from LargeTypeConn::Listener
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:37
-
-    virtual void
-    on_one_data (
-      const ::LargeType & datum,
-      const ::CCM_DDS::ReadInfo & info) = 0;
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:37
-
-    virtual void
-    on_many_data (
-      const ::LargeTypeSeq & data,
-      const ::CCM_DDS::ReadInfoSeq & infos) = 0;
-  };
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_component/facet_exh.cpp:53
-
-  class DDS_SUB_EXEC_Export PortStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    PortStatusListener_exec_i (void);
-    virtual ~PortStatusListener_exec_i (void);
-
-    // Operations and attributes from CCM_DDS::PortStatusListener
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:37
-
-    virtual void
-    on_requested_deadline_missed (
-      ::DDS::DataReader_ptr the_reader,
-      const ::DDS::RequestedDeadlineMissedStatus & status) = 0;
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:37
-
-    virtual void
-    on_sample_lost (
-      ::DDS::DataReader_ptr the_reader,
-      const ::DDS::SampleLostStatus & status) = 0;
-  };
-
-  class DDS_SUB_EXEC_Export DDS_Sub_exec_i
-    : public virtual DDS_Sub_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    DDS_Sub_exec_i (void);
-    virtual ~DDS_Sub_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-
-    virtual ::LargeTypeConn::CCM_Listener_ptr
-    get_info_in_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_in_status (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_ingo_get_status (void);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-
-    virtual void
-    set_session_context (
-      ::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete (void);
-
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-
-  private:
-    ::CCM_DDS_Sub_Context_var context_;
-  };
-
-  extern "C" DDS_SUB_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_DDS_Sub_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/.gitignore b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/.gitignore
deleted file mode 100644
index ac427c54200..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/Single_ServiceE.idl
-/Single_Service_exec_export.h
-/Single_Service_lem_stub_export.h
-/Single_Service_stub_export.h
-/Single_Service_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.idl b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.idl
deleted file mode 100644
index 9fde2b41c5d..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.idl
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef SINGLE_SERVICE_IDL
-#define SINGLE_SERVICE_IDL
-
-#include <Components.idl>
-#include "Common/Single_Service_Common.idl"
-
-component Single_Service
-{
-  provides Simple_Service ping_port;
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.mpc b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.mpc
deleted file mode 100644
index 8292e9267b5..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.mpc
+++ /dev/null
@@ -1,146 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -o ../lib -l ../lib Single_Service"
-
-project(Single_Service_idl_gen) : componentidldefaults   {
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SINGLE_SERVICE_STUB_Export \
-              -Wb,stub_export_include=Single_Service_stub_export.h \
-              -Wb,skel_export_macro=SINGLE_SERVICE_SVNT_Export \
-              -Wb,skel_export_include=Single_Service_svnt_export.h \
-              -Wb,exec_export_macro=SINGLE_SERVICE_EXEC_Export \
-              -Wb,exec_export_include=Single_Service_exec_export.h \
-              -Gxhex -Gxhsk -Gxhst -I.. -Gex
-
-  IDL_Files {
-    Single_Service.idl
-  }
-}
-
-project(Single_Service_lem_gen) : ciaoidldefaults   {
-  after += Single_Service_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SINGLE_SERVICE_LEM_STUB_Export \
-              -Wb,stub_export_include=Single_Service_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    Single_ServiceE.idl
-  }
-}
-
-project(Single_Service_lem_stub) : ccm_svnt   {
-  after += Single_Service_lem_gen Single_Service_stub Single_Service_Common_stub
-  libs  +=  Single_Service_stub Single_Service_Common_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Single_Service_lem_stub
-  dynamicflags += SINGLE_SERVICE_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Single_ServiceEC.cpp
-  }
-
-  Header_Files {
-    Single_ServiceEC.h
-    Single_Service_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Single_ServiceEC.inl
-  }
-}
-
-project(Single_Service_stub) : ccm_stub   {
-  after += Single_Service_idl_gen Single_Service_Common_stub
-  libs  += Single_Service_Common_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Single_Service_stub
-  dynamicflags += SINGLE_SERVICE_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Single_ServiceC.cpp
-  }
-
-  Header_Files {
-    Single_ServiceC.h
-    Single_Service_stub_export.h
-  }
-
-  Inline_Files {
-    Single_ServiceC.inl
-  }
-}
-
-project(Single_Service_exec) : ciao_executor   {
-  after +=  Single_Service_lem_stub \
-            Single_Service_stub \
-            Single_Service_Common_stub \
-            Single_Service_Common_lem_stub
-  sharedname = Single_Service_exec
-  libs += Single_Service_stub \
-          Single_Service_lem_stub \
-          Single_Service_Common_stub \
-          Single_Service_Common_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SINGLE_SERVICE_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Single_Service_exec.cpp
-  }
-
-  Header_Files {
-    Single_Service_exec.h
-    Single_Service_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(Single_Service_svnt) : ciao_servant {
-  after      += Single_Service_lem_stub \
-        Single_Service_Common_skel \
-        Single_Service_Common_stub \
-        Single_Service_Common_lem_stub
-  sharedname  = Single_Service_svnt
-  libs       += Single_Service_stub \
-        Single_Service_lem_stub \
-                Single_Service_Common_skel \
-                Single_Service_Common_stub \
-                Single_Service_Common_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SINGLE_SERVICE_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Single_ServiceS.cpp
-    Single_Service_svnt.cpp
-  }
-
-  Header_Files {
-    Single_ServiceS.h
-    Single_Service_svnt.h
-    Single_Service_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/descriptors/LargePlan.cdp b/CIAO/connectors/dds4ccm/examples/Large_Deployment/descriptors/LargePlan.cdp
deleted file mode 100644
index bde3c3fef10..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/descriptors/LargePlan.cdp
+++ /dev/null
@@ -1,90685 +0,0 @@
-<!--  -->
-<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>Large_Plan</label>
-  <UUID>Large_Plan</UUID>
-
-<implementation xmi:id="Large_ConnectorComponentImplementation">
-  <name>Large_ConnectorComponentImplementation</name>
-  <source/>
-  <artifact xmi:idref="Large_Connector_ExecArtifact" />
-  <artifact xmi:idref="Large_Connector_SvntArtifact" />
-  <execParameter>
-    <!-- entrypoint as exec parameter (see 10.6.1) -->
-    <name>component factory</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>create_LargeTypeConn_DDS_Event_Impl</string>
-      </value>
-    </value>
-  </execParameter>
-  <execParameter>
-    <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>create_LargeTypeConn_DDS_Event_Servant</string>
-      </value>
-    </value>
-  </execParameter>
-  <execParameter>
-    <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>Large_Connector_svnt</string>
-      </value>
-    </value>
-  </execParameter>
-  <execParameter>
-    <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>Large_Connector_exec</string>
-      </value>
-    </value>
-  </execParameter>
-</implementation>
-<implementation xmi:id="Single_ServiceComponentImplementation">
-  <name>Single_ServiceComponentImplementation</name>
-  <source/>
-  <artifact xmi:idref="Single_Service_ExecArtifact" />
-  <artifact xmi:idref="Single_Service_SvntArtifact" />
-  <execParameter>
-    <!-- entrypoint as exec parameter (see 10.6.1) -->
-    <name>component factory</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>create_Single_Service_Impl</string>
-      </value>
-    </value>
-  </execParameter>
-  <execParameter>
-    <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>create_Single_Service_Servant</string>
-      </value>
-    </value>
-  </execParameter>
-  <execParameter>
-    <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>Single_Service_svnt</string>
-      </value>
-    </value>
-  </execParameter>
-  <execParameter>
-    <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>Single_Service_exec</string>
-      </value>
-    </value>
-  </execParameter>
-</implementation>
-<implementation xmi:id="DDS_PubComponentImplementation">
-  <name>DDS_PubComponentImplementation</name>
-  <source/>
-  <artifact xmi:idref="DDS_Pub_ExecArtifact" />
-  <artifact xmi:idref="DDS_Pub_SvntArtifact" />
-  <execParameter>
-    <!-- entrypoint as exec parameter (see 10.6.1) -->
-    <name>component factory</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>create_DDS_Pub_Impl</string>
-      </value>
-    </value>
-  </execParameter>
-  <execParameter>
-    <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>create_DDS_Pub_Servant</string>
-      </value>
-    </value>
-  </execParameter>
-  <execParameter>
-    <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>DDS_Pub_svnt</string>
-      </value>
-    </value>
-  </execParameter>
-  <execParameter>
-    <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>DDS_Pub_exec</string>
-      </value>
-    </value>
-  </execParameter>
-</implementation>
-<implementation xmi:id="DDS_SubComponentImplementation">
-  <name>DDS_SubComponentImplementation</name>
-  <source/>
-  <artifact xmi:idref="DDS_Sub_ExecArtifact" />
-  <artifact xmi:idref="DDS_Sub_SvntArtifact" />
-  <execParameter>
-    <!-- entrypoint as exec parameter (see 10.6.1) -->
-    <name>component factory</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>create_DDS_Sub_Impl</string>
-      </value>
-    </value>
-  </execParameter>
-  <execParameter>
-    <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>create_DDS_Sub_Servant</string>
-      </value>
-    </value>
-  </execParameter>
-  <execParameter>
-    <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>DDS_Sub_svnt</string>
-      </value>
-    </value>
-  </execParameter>
-  <execParameter>
-    <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>DDS_Sub_exec</string>
-      </value>
-    </value>
-  </execParameter>
-</implementation>
-<instance xmi:id="Pub_Node_0_0_0_ComponentInstance">
-  <name>Pub_Node_0_0_0_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_0_0__prov1ComponentInstance">
-  <name>Pub_Node_0_0_0__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_0_0__prov2ComponentInstance">
-  <name>Pub_Node_0_0_0__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_0_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_0_0_0_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_195</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_0_1_ComponentInstance">
-  <name>Pub_Node_0_0_1_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_0_1__prov1ComponentInstance">
-  <name>Pub_Node_0_0_1__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_0_1__prov2ComponentInstance">
-  <name>Pub_Node_0_0_1__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_0_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_0_0_1_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_195</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_0_0_ComponentInstance">
-  <name>Sub_Node_0_0_0_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_0_0__prov1ComponentInstance">
-  <name>Sub_Node_0_0_0__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_0_0__prov2ComponentInstance">
-  <name>Sub_Node_0_0_0__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_0_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_0_0_0_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_171</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_0_1_ComponentInstance">
-  <name>Sub_Node_0_0_1_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_0_1__prov1ComponentInstance">
-  <name>Sub_Node_0_0_1__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_0_1__prov2ComponentInstance">
-  <name>Sub_Node_0_0_1__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_0_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_0_0_1_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_197</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_1_0_ComponentInstance">
-  <name>Pub_Node_0_1_0_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_1_0__prov1ComponentInstance">
-  <name>Pub_Node_0_1_0__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_1_0__prov2ComponentInstance">
-  <name>Pub_Node_0_1_0__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_1_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_0_1_0_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_66</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_1_1_ComponentInstance">
-  <name>Pub_Node_0_1_1_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_1_1__prov1ComponentInstance">
-  <name>Pub_Node_0_1_1__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_1_1__prov2ComponentInstance">
-  <name>Pub_Node_0_1_1__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_1_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_0_1_1_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_14</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_1_0_ComponentInstance">
-  <name>Sub_Node_0_1_0_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_1_0__prov1ComponentInstance">
-  <name>Sub_Node_0_1_0__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_1_0__prov2ComponentInstance">
-  <name>Sub_Node_0_1_0__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_1_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_0_1_0_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_71</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_1_1_ComponentInstance">
-  <name>Sub_Node_0_1_1_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_1_1__prov1ComponentInstance">
-  <name>Sub_Node_0_1_1__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_1_1__prov2ComponentInstance">
-  <name>Sub_Node_0_1_1__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_1_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_0_1_1_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_159</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_2_0_ComponentInstance">
-  <name>Pub_Node_0_2_0_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_2_0__prov1ComponentInstance">
-  <name>Pub_Node_0_2_0__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_2_0__prov2ComponentInstance">
-  <name>Pub_Node_0_2_0__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_2_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_0_2_0_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_118</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_2_1_ComponentInstance">
-  <name>Pub_Node_0_2_1_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_2_1__prov1ComponentInstance">
-  <name>Pub_Node_0_2_1__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_2_1__prov2ComponentInstance">
-  <name>Pub_Node_0_2_1__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_2_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_0_2_1_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_102</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_2_0_ComponentInstance">
-  <name>Sub_Node_0_2_0_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_2_0__prov1ComponentInstance">
-  <name>Sub_Node_0_2_0__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_2_0__prov2ComponentInstance">
-  <name>Sub_Node_0_2_0__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_2_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_0_2_0_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_200</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_2_1_ComponentInstance">
-  <name>Sub_Node_0_2_1_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_2_1__prov1ComponentInstance">
-  <name>Sub_Node_0_2_1__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_2_1__prov2ComponentInstance">
-  <name>Sub_Node_0_2_1__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_2_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_0_2_1_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_95</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_3_0_ComponentInstance">
-  <name>Pub_Node_0_3_0_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_3_0__prov1ComponentInstance">
-  <name>Pub_Node_0_3_0__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_3_0__prov2ComponentInstance">
-  <name>Pub_Node_0_3_0__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_3_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_0_3_0_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_242</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_3_1_ComponentInstance">
-  <name>Pub_Node_0_3_1_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_3_1__prov1ComponentInstance">
-  <name>Pub_Node_0_3_1__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_3_1__prov2ComponentInstance">
-  <name>Pub_Node_0_3_1__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_3_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_0_3_1_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_107</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_3_0_ComponentInstance">
-  <name>Sub_Node_0_3_0_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_3_0__prov1ComponentInstance">
-  <name>Sub_Node_0_3_0__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_3_0__prov2ComponentInstance">
-  <name>Sub_Node_0_3_0__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_3_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_0_3_0_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_41</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_3_1_ComponentInstance">
-  <name>Sub_Node_0_3_1_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_3_1__prov1ComponentInstance">
-  <name>Sub_Node_0_3_1__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_3_1__prov2ComponentInstance">
-  <name>Sub_Node_0_3_1__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_3_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_0_3_1_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_164</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_4_0_ComponentInstance">
-  <name>Pub_Node_0_4_0_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_4_0__prov1ComponentInstance">
-  <name>Pub_Node_0_4_0__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_4_0__prov2ComponentInstance">
-  <name>Pub_Node_0_4_0__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_4_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_0_4_0_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_123</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_4_1_ComponentInstance">
-  <name>Pub_Node_0_4_1_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_4_1__prov1ComponentInstance">
-  <name>Pub_Node_0_4_1__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_4_1__prov2ComponentInstance">
-  <name>Pub_Node_0_4_1__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_4_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_0_4_1_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_160</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_4_0_ComponentInstance">
-  <name>Sub_Node_0_4_0_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_4_0__prov1ComponentInstance">
-  <name>Sub_Node_0_4_0__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_4_0__prov2ComponentInstance">
-  <name>Sub_Node_0_4_0__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_4_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_0_4_0_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_141</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_4_1_ComponentInstance">
-  <name>Sub_Node_0_4_1_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_4_1__prov1ComponentInstance">
-  <name>Sub_Node_0_4_1__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_4_1__prov2ComponentInstance">
-  <name>Sub_Node_0_4_1__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_4_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_0_4_1_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_47</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_5_0_ComponentInstance">
-  <name>Pub_Node_0_5_0_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_5_0__prov1ComponentInstance">
-  <name>Pub_Node_0_5_0__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_5_0__prov2ComponentInstance">
-  <name>Pub_Node_0_5_0__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_5_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_0_5_0_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_137</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_5_1_ComponentInstance">
-  <name>Pub_Node_0_5_1_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_5_1__prov1ComponentInstance">
-  <name>Pub_Node_0_5_1__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_5_1__prov2ComponentInstance">
-  <name>Pub_Node_0_5_1__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_5_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_0_5_1_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_169</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_5_0_ComponentInstance">
-  <name>Sub_Node_0_5_0_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_5_0__prov1ComponentInstance">
-  <name>Sub_Node_0_5_0__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_5_0__prov2ComponentInstance">
-  <name>Sub_Node_0_5_0__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_5_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_0_5_0_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_75</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_5_1_ComponentInstance">
-  <name>Sub_Node_0_5_1_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_5_1__prov1ComponentInstance">
-  <name>Sub_Node_0_5_1__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_5_1__prov2ComponentInstance">
-  <name>Sub_Node_0_5_1__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_5_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_0_5_1_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_91</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_6_0_ComponentInstance">
-  <name>Pub_Node_0_6_0_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_6_0__prov1ComponentInstance">
-  <name>Pub_Node_0_6_0__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_6_0__prov2ComponentInstance">
-  <name>Pub_Node_0_6_0__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_6_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_0_6_0_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_182</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_6_1_ComponentInstance">
-  <name>Pub_Node_0_6_1_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_6_1__prov1ComponentInstance">
-  <name>Pub_Node_0_6_1__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_6_1__prov2ComponentInstance">
-  <name>Pub_Node_0_6_1__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_6_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_0_6_1_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_74</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_6_0_ComponentInstance">
-  <name>Sub_Node_0_6_0_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_6_0__prov1ComponentInstance">
-  <name>Sub_Node_0_6_0__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_6_0__prov2ComponentInstance">
-  <name>Sub_Node_0_6_0__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_6_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_0_6_0_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_46</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_6_1_ComponentInstance">
-  <name>Sub_Node_0_6_1_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_6_1__prov1ComponentInstance">
-  <name>Sub_Node_0_6_1__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_6_1__prov2ComponentInstance">
-  <name>Sub_Node_0_6_1__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_6_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_0_6_1_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_123</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_7_0_ComponentInstance">
-  <name>Pub_Node_0_7_0_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_7_0__prov1ComponentInstance">
-  <name>Pub_Node_0_7_0__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_7_0__prov2ComponentInstance">
-  <name>Pub_Node_0_7_0__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_7_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_0_7_0_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_198</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_7_1_ComponentInstance">
-  <name>Pub_Node_0_7_1_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_7_1__prov1ComponentInstance">
-  <name>Pub_Node_0_7_1__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_7_1__prov2ComponentInstance">
-  <name>Pub_Node_0_7_1__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_7_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_0_7_1_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_140</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_7_0_ComponentInstance">
-  <name>Sub_Node_0_7_0_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_7_0__prov1ComponentInstance">
-  <name>Sub_Node_0_7_0__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_7_0__prov2ComponentInstance">
-  <name>Sub_Node_0_7_0__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_7_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_0_7_0_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_17</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_7_1_ComponentInstance">
-  <name>Sub_Node_0_7_1_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_7_1__prov1ComponentInstance">
-  <name>Sub_Node_0_7_1__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_7_1__prov2ComponentInstance">
-  <name>Sub_Node_0_7_1__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_7_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_0_7_1_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_61</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_8_0_ComponentInstance">
-  <name>Pub_Node_0_8_0_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_8_0__prov1ComponentInstance">
-  <name>Pub_Node_0_8_0__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_8_0__prov2ComponentInstance">
-  <name>Pub_Node_0_8_0__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_8_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_0_8_0_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_166</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_8_1_ComponentInstance">
-  <name>Pub_Node_0_8_1_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_8_1__prov1ComponentInstance">
-  <name>Pub_Node_0_8_1__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_8_1__prov2ComponentInstance">
-  <name>Pub_Node_0_8_1__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_8_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_0_8_1_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_170</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_8_0_ComponentInstance">
-  <name>Sub_Node_0_8_0_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_8_0__prov1ComponentInstance">
-  <name>Sub_Node_0_8_0__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_8_0__prov2ComponentInstance">
-  <name>Sub_Node_0_8_0__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_8_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_0_8_0_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_38</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_8_1_ComponentInstance">
-  <name>Sub_Node_0_8_1_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_8_1__prov1ComponentInstance">
-  <name>Sub_Node_0_8_1__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_8_1__prov2ComponentInstance">
-  <name>Sub_Node_0_8_1__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_8_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_0_8_1_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_155</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_9_0_ComponentInstance">
-  <name>Pub_Node_0_9_0_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_9_0__prov1ComponentInstance">
-  <name>Pub_Node_0_9_0__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_9_0__prov2ComponentInstance">
-  <name>Pub_Node_0_9_0__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_9_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_0_9_0_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_233</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_9_1_ComponentInstance">
-  <name>Pub_Node_0_9_1_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_9_1__prov1ComponentInstance">
-  <name>Pub_Node_0_9_1__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_9_1__prov2ComponentInstance">
-  <name>Pub_Node_0_9_1__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_9_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_0_9_1_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_173</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_9_0_ComponentInstance">
-  <name>Sub_Node_0_9_0_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_9_0__prov1ComponentInstance">
-  <name>Sub_Node_0_9_0__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_9_0__prov2ComponentInstance">
-  <name>Sub_Node_0_9_0__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_9_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_0_9_0_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_221</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_9_1_ComponentInstance">
-  <name>Sub_Node_0_9_1_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_9_1__prov1ComponentInstance">
-  <name>Sub_Node_0_9_1__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_9_1__prov2ComponentInstance">
-  <name>Sub_Node_0_9_1__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_9_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_0_9_1_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_92</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_10_0_ComponentInstance">
-  <name>Pub_Node_0_10_0_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_10_0__prov1ComponentInstance">
-  <name>Pub_Node_0_10_0__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_10_0__prov2ComponentInstance">
-  <name>Pub_Node_0_10_0__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_10_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_0_10_0_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_161</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_10_1_ComponentInstance">
-  <name>Pub_Node_0_10_1_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_10_1__prov1ComponentInstance">
-  <name>Pub_Node_0_10_1__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_10_1__prov2ComponentInstance">
-  <name>Pub_Node_0_10_1__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_10_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_0_10_1_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_182</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_10_0_ComponentInstance">
-  <name>Sub_Node_0_10_0_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_10_0__prov1ComponentInstance">
-  <name>Sub_Node_0_10_0__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_10_0__prov2ComponentInstance">
-  <name>Sub_Node_0_10_0__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_10_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_0_10_0_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_27</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_10_1_ComponentInstance">
-  <name>Sub_Node_0_10_1_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_10_1__prov1ComponentInstance">
-  <name>Sub_Node_0_10_1__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_10_1__prov2ComponentInstance">
-  <name>Sub_Node_0_10_1__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_10_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_0_10_1_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_180</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_11_0_ComponentInstance">
-  <name>Pub_Node_0_11_0_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_11_0__prov1ComponentInstance">
-  <name>Pub_Node_0_11_0__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_11_0__prov2ComponentInstance">
-  <name>Pub_Node_0_11_0__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_11_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_0_11_0_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_219</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_11_1_ComponentInstance">
-  <name>Pub_Node_0_11_1_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_11_1__prov1ComponentInstance">
-  <name>Pub_Node_0_11_1__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_11_1__prov2ComponentInstance">
-  <name>Pub_Node_0_11_1__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_11_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_0_11_1_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_160</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_11_0_ComponentInstance">
-  <name>Sub_Node_0_11_0_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_11_0__prov1ComponentInstance">
-  <name>Sub_Node_0_11_0__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_11_0__prov2ComponentInstance">
-  <name>Sub_Node_0_11_0__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_11_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_0_11_0_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_153</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_11_1_ComponentInstance">
-  <name>Sub_Node_0_11_1_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_11_1__prov1ComponentInstance">
-  <name>Sub_Node_0_11_1__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_11_1__prov2ComponentInstance">
-  <name>Sub_Node_0_11_1__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_11_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_0_11_1_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_185</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_12_0_ComponentInstance">
-  <name>Pub_Node_0_12_0_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_12_0__prov1ComponentInstance">
-  <name>Pub_Node_0_12_0__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_12_0__prov2ComponentInstance">
-  <name>Pub_Node_0_12_0__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_12_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_0_12_0_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_67</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_12_1_ComponentInstance">
-  <name>Pub_Node_0_12_1_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_12_1__prov1ComponentInstance">
-  <name>Pub_Node_0_12_1__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_12_1__prov2ComponentInstance">
-  <name>Pub_Node_0_12_1__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_12_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_0_12_1_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_148</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_12_0_ComponentInstance">
-  <name>Sub_Node_0_12_0_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_12_0__prov1ComponentInstance">
-  <name>Sub_Node_0_12_0__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_12_0__prov2ComponentInstance">
-  <name>Sub_Node_0_12_0__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_12_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_0_12_0_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_163</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_12_1_ComponentInstance">
-  <name>Sub_Node_0_12_1_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_12_1__prov1ComponentInstance">
-  <name>Sub_Node_0_12_1__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_12_1__prov2ComponentInstance">
-  <name>Sub_Node_0_12_1__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_12_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_0_12_1_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_179</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_13_0_ComponentInstance">
-  <name>Pub_Node_0_13_0_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_13_0__prov1ComponentInstance">
-  <name>Pub_Node_0_13_0__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_13_0__prov2ComponentInstance">
-  <name>Pub_Node_0_13_0__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_13_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_0_13_0_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_20</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_13_1_ComponentInstance">
-  <name>Pub_Node_0_13_1_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_13_1__prov1ComponentInstance">
-  <name>Pub_Node_0_13_1__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_13_1__prov2ComponentInstance">
-  <name>Pub_Node_0_13_1__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_13_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_0_13_1_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_210</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_13_0_ComponentInstance">
-  <name>Sub_Node_0_13_0_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_13_0__prov1ComponentInstance">
-  <name>Sub_Node_0_13_0__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_13_0__prov2ComponentInstance">
-  <name>Sub_Node_0_13_0__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_13_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_0_13_0_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_124</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_13_1_ComponentInstance">
-  <name>Sub_Node_0_13_1_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_13_1__prov1ComponentInstance">
-  <name>Sub_Node_0_13_1__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_13_1__prov2ComponentInstance">
-  <name>Sub_Node_0_13_1__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_13_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_0_13_1_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_100</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_14_0_ComponentInstance">
-  <name>Pub_Node_0_14_0_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_14_0__prov1ComponentInstance">
-  <name>Pub_Node_0_14_0__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_14_0__prov2ComponentInstance">
-  <name>Pub_Node_0_14_0__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_14_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_0_14_0_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_140</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_14_1_ComponentInstance">
-  <name>Pub_Node_0_14_1_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_14_1__prov1ComponentInstance">
-  <name>Pub_Node_0_14_1__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_14_1__prov2ComponentInstance">
-  <name>Pub_Node_0_14_1__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_14_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_0_14_1_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_169</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_14_0_ComponentInstance">
-  <name>Sub_Node_0_14_0_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_14_0__prov1ComponentInstance">
-  <name>Sub_Node_0_14_0__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_14_0__prov2ComponentInstance">
-  <name>Sub_Node_0_14_0__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_14_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_0_14_0_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_11</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_14_1_ComponentInstance">
-  <name>Sub_Node_0_14_1_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_14_1__prov1ComponentInstance">
-  <name>Sub_Node_0_14_1__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_14_1__prov2ComponentInstance">
-  <name>Sub_Node_0_14_1__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_14_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_0_14_1_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_166</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_15_0_ComponentInstance">
-  <name>Pub_Node_0_15_0_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_15_0__prov1ComponentInstance">
-  <name>Pub_Node_0_15_0__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_15_0__prov2ComponentInstance">
-  <name>Pub_Node_0_15_0__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_15_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_0_15_0_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_87</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_15_1_ComponentInstance">
-  <name>Pub_Node_0_15_1_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_15_1__prov1ComponentInstance">
-  <name>Pub_Node_0_15_1__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_15_1__prov2ComponentInstance">
-  <name>Pub_Node_0_15_1__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_15_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_0_15_1_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_93</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_15_0_ComponentInstance">
-  <name>Sub_Node_0_15_0_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_15_0__prov1ComponentInstance">
-  <name>Sub_Node_0_15_0__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_15_0__prov2ComponentInstance">
-  <name>Sub_Node_0_15_0__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_15_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_0_15_0_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_87</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_15_1_ComponentInstance">
-  <name>Sub_Node_0_15_1_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_15_1__prov1ComponentInstance">
-  <name>Sub_Node_0_15_1__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_15_1__prov2ComponentInstance">
-  <name>Sub_Node_0_15_1__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_15_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_0_15_1_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_143</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_16_0_ComponentInstance">
-  <name>Pub_Node_0_16_0_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_16_0__prov1ComponentInstance">
-  <name>Pub_Node_0_16_0__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_16_0__prov2ComponentInstance">
-  <name>Pub_Node_0_16_0__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_16_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_0_16_0_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_179</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_16_1_ComponentInstance">
-  <name>Pub_Node_0_16_1_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_16_1__prov1ComponentInstance">
-  <name>Pub_Node_0_16_1__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_16_1__prov2ComponentInstance">
-  <name>Pub_Node_0_16_1__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_16_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_0_16_1_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_204</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_16_0_ComponentInstance">
-  <name>Sub_Node_0_16_0_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_16_0__prov1ComponentInstance">
-  <name>Sub_Node_0_16_0__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_16_0__prov2ComponentInstance">
-  <name>Sub_Node_0_16_0__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_16_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_0_16_0_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_119</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_16_1_ComponentInstance">
-  <name>Sub_Node_0_16_1_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_16_1__prov1ComponentInstance">
-  <name>Sub_Node_0_16_1__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_16_1__prov2ComponentInstance">
-  <name>Sub_Node_0_16_1__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_16_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_0_16_1_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_245</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_17_0_ComponentInstance">
-  <name>Pub_Node_0_17_0_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_17_0__prov1ComponentInstance">
-  <name>Pub_Node_0_17_0__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_17_0__prov2ComponentInstance">
-  <name>Pub_Node_0_17_0__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_17_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_0_17_0_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_159</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_17_1_ComponentInstance">
-  <name>Pub_Node_0_17_1_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_17_1__prov1ComponentInstance">
-  <name>Pub_Node_0_17_1__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_17_1__prov2ComponentInstance">
-  <name>Pub_Node_0_17_1__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_17_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_0_17_1_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_197</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_17_0_ComponentInstance">
-  <name>Sub_Node_0_17_0_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_17_0__prov1ComponentInstance">
-  <name>Sub_Node_0_17_0__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_17_0__prov2ComponentInstance">
-  <name>Sub_Node_0_17_0__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_17_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_0_17_0_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_242</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_17_1_ComponentInstance">
-  <name>Sub_Node_0_17_1_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_17_1__prov1ComponentInstance">
-  <name>Sub_Node_0_17_1__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_17_1__prov2ComponentInstance">
-  <name>Sub_Node_0_17_1__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_17_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_0_17_1_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_185</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_18_0_ComponentInstance">
-  <name>Pub_Node_0_18_0_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_18_0__prov1ComponentInstance">
-  <name>Pub_Node_0_18_0__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_18_0__prov2ComponentInstance">
-  <name>Pub_Node_0_18_0__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_18_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_0_18_0_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_24</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_18_1_ComponentInstance">
-  <name>Pub_Node_0_18_1_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_18_1__prov1ComponentInstance">
-  <name>Pub_Node_0_18_1__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_18_1__prov2ComponentInstance">
-  <name>Pub_Node_0_18_1__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_18_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_0_18_1_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_120</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_18_0_ComponentInstance">
-  <name>Sub_Node_0_18_0_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_18_0__prov1ComponentInstance">
-  <name>Sub_Node_0_18_0__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_18_0__prov2ComponentInstance">
-  <name>Sub_Node_0_18_0__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_18_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_0_18_0_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_75</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_18_1_ComponentInstance">
-  <name>Sub_Node_0_18_1_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_18_1__prov1ComponentInstance">
-  <name>Sub_Node_0_18_1__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_18_1__prov2ComponentInstance">
-  <name>Sub_Node_0_18_1__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_18_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_0_18_1_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_213</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_19_0_ComponentInstance">
-  <name>Pub_Node_0_19_0_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_19_0__prov1ComponentInstance">
-  <name>Pub_Node_0_19_0__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_19_0__prov2ComponentInstance">
-  <name>Pub_Node_0_19_0__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_19_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_0_19_0_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_39</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_19_1_ComponentInstance">
-  <name>Pub_Node_0_19_1_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_19_1__prov1ComponentInstance">
-  <name>Pub_Node_0_19_1__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_19_1__prov2ComponentInstance">
-  <name>Pub_Node_0_19_1__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_0_19_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_0_19_1_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_14</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_19_0_ComponentInstance">
-  <name>Sub_Node_0_19_0_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_19_0__prov1ComponentInstance">
-  <name>Sub_Node_0_19_0__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_19_0__prov2ComponentInstance">
-  <name>Sub_Node_0_19_0__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_19_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_0_19_0_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_106</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_19_1_ComponentInstance">
-  <name>Sub_Node_0_19_1_Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_19_1__prov1ComponentInstance">
-  <name>Sub_Node_0_19_1__prov1Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_19_1__prov2ComponentInstance">
-  <name>Sub_Node_0_19_1__prov2Component</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_0_19_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_0_19_1_DDSConnectorComponent</name>
-  <node>Node_0</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_18</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_0_0_ComponentInstance">
-  <name>Pub_Node_1_0_0_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_0_0__prov1ComponentInstance">
-  <name>Pub_Node_1_0_0__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_0_0__prov2ComponentInstance">
-  <name>Pub_Node_1_0_0__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_0_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_1_0_0_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_38</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_0_1_ComponentInstance">
-  <name>Pub_Node_1_0_1_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_0_1__prov1ComponentInstance">
-  <name>Pub_Node_1_0_1__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_0_1__prov2ComponentInstance">
-  <name>Pub_Node_1_0_1__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_0_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_1_0_1_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_159</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_0_0_ComponentInstance">
-  <name>Sub_Node_1_0_0_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_0_0__prov1ComponentInstance">
-  <name>Sub_Node_1_0_0__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_0_0__prov2ComponentInstance">
-  <name>Sub_Node_1_0_0__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_0_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_1_0_0_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_137</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_0_1_ComponentInstance">
-  <name>Sub_Node_1_0_1_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_0_1__prov1ComponentInstance">
-  <name>Sub_Node_1_0_1__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_0_1__prov2ComponentInstance">
-  <name>Sub_Node_1_0_1__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_0_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_1_0_1_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_74</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_1_0_ComponentInstance">
-  <name>Pub_Node_1_1_0_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_1_0__prov1ComponentInstance">
-  <name>Pub_Node_1_1_0__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_1_0__prov2ComponentInstance">
-  <name>Pub_Node_1_1_0__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_1_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_1_1_0_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_191</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_1_1_ComponentInstance">
-  <name>Pub_Node_1_1_1_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_1_1__prov1ComponentInstance">
-  <name>Pub_Node_1_1_1__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_1_1__prov2ComponentInstance">
-  <name>Pub_Node_1_1_1__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_1_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_1_1_1_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_146</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_1_0_ComponentInstance">
-  <name>Sub_Node_1_1_0_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_1_0__prov1ComponentInstance">
-  <name>Sub_Node_1_1_0__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_1_0__prov2ComponentInstance">
-  <name>Sub_Node_1_1_0__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_1_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_1_1_0_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_69</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_1_1_ComponentInstance">
-  <name>Sub_Node_1_1_1_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_1_1__prov1ComponentInstance">
-  <name>Sub_Node_1_1_1__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_1_1__prov2ComponentInstance">
-  <name>Sub_Node_1_1_1__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_1_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_1_1_1_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_116</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_2_0_ComponentInstance">
-  <name>Pub_Node_1_2_0_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_2_0__prov1ComponentInstance">
-  <name>Pub_Node_1_2_0__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_2_0__prov2ComponentInstance">
-  <name>Pub_Node_1_2_0__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_2_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_1_2_0_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_167</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_2_1_ComponentInstance">
-  <name>Pub_Node_1_2_1_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_2_1__prov1ComponentInstance">
-  <name>Pub_Node_1_2_1__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_2_1__prov2ComponentInstance">
-  <name>Pub_Node_1_2_1__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_2_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_1_2_1_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_238</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_2_0_ComponentInstance">
-  <name>Sub_Node_1_2_0_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_2_0__prov1ComponentInstance">
-  <name>Sub_Node_1_2_0__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_2_0__prov2ComponentInstance">
-  <name>Sub_Node_1_2_0__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_2_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_1_2_0_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_44</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_2_1_ComponentInstance">
-  <name>Sub_Node_1_2_1_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_2_1__prov1ComponentInstance">
-  <name>Sub_Node_1_2_1__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_2_1__prov2ComponentInstance">
-  <name>Sub_Node_1_2_1__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_2_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_1_2_1_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_49</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_3_0_ComponentInstance">
-  <name>Pub_Node_1_3_0_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_3_0__prov1ComponentInstance">
-  <name>Pub_Node_1_3_0__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_3_0__prov2ComponentInstance">
-  <name>Pub_Node_1_3_0__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_3_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_1_3_0_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_10</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_3_1_ComponentInstance">
-  <name>Pub_Node_1_3_1_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_3_1__prov1ComponentInstance">
-  <name>Pub_Node_1_3_1__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_3_1__prov2ComponentInstance">
-  <name>Pub_Node_1_3_1__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_3_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_1_3_1_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_190</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_3_0_ComponentInstance">
-  <name>Sub_Node_1_3_0_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_3_0__prov1ComponentInstance">
-  <name>Sub_Node_1_3_0__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_3_0__prov2ComponentInstance">
-  <name>Sub_Node_1_3_0__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_3_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_1_3_0_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_120</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_3_1_ComponentInstance">
-  <name>Sub_Node_1_3_1_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_3_1__prov1ComponentInstance">
-  <name>Sub_Node_1_3_1__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_3_1__prov2ComponentInstance">
-  <name>Sub_Node_1_3_1__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_3_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_1_3_1_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_245</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_4_0_ComponentInstance">
-  <name>Pub_Node_1_4_0_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_4_0__prov1ComponentInstance">
-  <name>Pub_Node_1_4_0__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_4_0__prov2ComponentInstance">
-  <name>Pub_Node_1_4_0__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_4_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_1_4_0_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_149</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_4_1_ComponentInstance">
-  <name>Pub_Node_1_4_1_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_4_1__prov1ComponentInstance">
-  <name>Pub_Node_1_4_1__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_4_1__prov2ComponentInstance">
-  <name>Pub_Node_1_4_1__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_4_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_1_4_1_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_36</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_4_0_ComponentInstance">
-  <name>Sub_Node_1_4_0_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_4_0__prov1ComponentInstance">
-  <name>Sub_Node_1_4_0__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_4_0__prov2ComponentInstance">
-  <name>Sub_Node_1_4_0__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_4_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_1_4_0_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_174</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_4_1_ComponentInstance">
-  <name>Sub_Node_1_4_1_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_4_1__prov1ComponentInstance">
-  <name>Sub_Node_1_4_1__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_4_1__prov2ComponentInstance">
-  <name>Sub_Node_1_4_1__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_4_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_1_4_1_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_151</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_5_0_ComponentInstance">
-  <name>Pub_Node_1_5_0_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_5_0__prov1ComponentInstance">
-  <name>Pub_Node_1_5_0__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_5_0__prov2ComponentInstance">
-  <name>Pub_Node_1_5_0__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_5_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_1_5_0_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_111</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_5_1_ComponentInstance">
-  <name>Pub_Node_1_5_1_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_5_1__prov1ComponentInstance">
-  <name>Pub_Node_1_5_1__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_5_1__prov2ComponentInstance">
-  <name>Pub_Node_1_5_1__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_5_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_1_5_1_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_173</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_5_0_ComponentInstance">
-  <name>Sub_Node_1_5_0_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_5_0__prov1ComponentInstance">
-  <name>Sub_Node_1_5_0__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_5_0__prov2ComponentInstance">
-  <name>Sub_Node_1_5_0__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_5_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_1_5_0_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_172</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_5_1_ComponentInstance">
-  <name>Sub_Node_1_5_1_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_5_1__prov1ComponentInstance">
-  <name>Sub_Node_1_5_1__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_5_1__prov2ComponentInstance">
-  <name>Sub_Node_1_5_1__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_5_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_1_5_1_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_108</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_6_0_ComponentInstance">
-  <name>Pub_Node_1_6_0_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_6_0__prov1ComponentInstance">
-  <name>Pub_Node_1_6_0__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_6_0__prov2ComponentInstance">
-  <name>Pub_Node_1_6_0__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_6_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_1_6_0_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_38</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_6_1_ComponentInstance">
-  <name>Pub_Node_1_6_1_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_6_1__prov1ComponentInstance">
-  <name>Pub_Node_1_6_1__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_6_1__prov2ComponentInstance">
-  <name>Pub_Node_1_6_1__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_6_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_1_6_1_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_210</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_6_0_ComponentInstance">
-  <name>Sub_Node_1_6_0_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_6_0__prov1ComponentInstance">
-  <name>Sub_Node_1_6_0__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_6_0__prov2ComponentInstance">
-  <name>Sub_Node_1_6_0__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_6_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_1_6_0_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_107</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_6_1_ComponentInstance">
-  <name>Sub_Node_1_6_1_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_6_1__prov1ComponentInstance">
-  <name>Sub_Node_1_6_1__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_6_1__prov2ComponentInstance">
-  <name>Sub_Node_1_6_1__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_6_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_1_6_1_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_232</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_7_0_ComponentInstance">
-  <name>Pub_Node_1_7_0_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_7_0__prov1ComponentInstance">
-  <name>Pub_Node_1_7_0__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_7_0__prov2ComponentInstance">
-  <name>Pub_Node_1_7_0__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_7_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_1_7_0_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_232</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_7_1_ComponentInstance">
-  <name>Pub_Node_1_7_1_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_7_1__prov1ComponentInstance">
-  <name>Pub_Node_1_7_1__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_7_1__prov2ComponentInstance">
-  <name>Pub_Node_1_7_1__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_7_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_1_7_1_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_197</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_7_0_ComponentInstance">
-  <name>Sub_Node_1_7_0_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_7_0__prov1ComponentInstance">
-  <name>Sub_Node_1_7_0__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_7_0__prov2ComponentInstance">
-  <name>Sub_Node_1_7_0__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_7_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_1_7_0_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_18</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_7_1_ComponentInstance">
-  <name>Sub_Node_1_7_1_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_7_1__prov1ComponentInstance">
-  <name>Sub_Node_1_7_1__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_7_1__prov2ComponentInstance">
-  <name>Sub_Node_1_7_1__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_7_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_1_7_1_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_2</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_8_0_ComponentInstance">
-  <name>Pub_Node_1_8_0_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_8_0__prov1ComponentInstance">
-  <name>Pub_Node_1_8_0__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_8_0__prov2ComponentInstance">
-  <name>Pub_Node_1_8_0__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_8_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_1_8_0_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_126</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_8_1_ComponentInstance">
-  <name>Pub_Node_1_8_1_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_8_1__prov1ComponentInstance">
-  <name>Pub_Node_1_8_1__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_8_1__prov2ComponentInstance">
-  <name>Pub_Node_1_8_1__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_8_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_1_8_1_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_30</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_8_0_ComponentInstance">
-  <name>Sub_Node_1_8_0_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_8_0__prov1ComponentInstance">
-  <name>Sub_Node_1_8_0__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_8_0__prov2ComponentInstance">
-  <name>Sub_Node_1_8_0__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_8_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_1_8_0_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_47</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_8_1_ComponentInstance">
-  <name>Sub_Node_1_8_1_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_8_1__prov1ComponentInstance">
-  <name>Sub_Node_1_8_1__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_8_1__prov2ComponentInstance">
-  <name>Sub_Node_1_8_1__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_8_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_1_8_1_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_178</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_9_0_ComponentInstance">
-  <name>Pub_Node_1_9_0_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_9_0__prov1ComponentInstance">
-  <name>Pub_Node_1_9_0__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_9_0__prov2ComponentInstance">
-  <name>Pub_Node_1_9_0__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_9_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_1_9_0_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_183</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_9_1_ComponentInstance">
-  <name>Pub_Node_1_9_1_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_9_1__prov1ComponentInstance">
-  <name>Pub_Node_1_9_1__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_9_1__prov2ComponentInstance">
-  <name>Pub_Node_1_9_1__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_9_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_1_9_1_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_187</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_9_0_ComponentInstance">
-  <name>Sub_Node_1_9_0_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_9_0__prov1ComponentInstance">
-  <name>Sub_Node_1_9_0__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_9_0__prov2ComponentInstance">
-  <name>Sub_Node_1_9_0__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_9_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_1_9_0_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_247</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_9_1_ComponentInstance">
-  <name>Sub_Node_1_9_1_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_9_1__prov1ComponentInstance">
-  <name>Sub_Node_1_9_1__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_9_1__prov2ComponentInstance">
-  <name>Sub_Node_1_9_1__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_9_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_1_9_1_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_101</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_10_0_ComponentInstance">
-  <name>Pub_Node_1_10_0_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_10_0__prov1ComponentInstance">
-  <name>Pub_Node_1_10_0__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_10_0__prov2ComponentInstance">
-  <name>Pub_Node_1_10_0__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_10_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_1_10_0_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_51</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_10_1_ComponentInstance">
-  <name>Pub_Node_1_10_1_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_10_1__prov1ComponentInstance">
-  <name>Pub_Node_1_10_1__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_10_1__prov2ComponentInstance">
-  <name>Pub_Node_1_10_1__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_10_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_1_10_1_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_144</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_10_0_ComponentInstance">
-  <name>Sub_Node_1_10_0_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_10_0__prov1ComponentInstance">
-  <name>Sub_Node_1_10_0__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_10_0__prov2ComponentInstance">
-  <name>Sub_Node_1_10_0__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_10_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_1_10_0_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_55</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_10_1_ComponentInstance">
-  <name>Sub_Node_1_10_1_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_10_1__prov1ComponentInstance">
-  <name>Sub_Node_1_10_1__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_10_1__prov2ComponentInstance">
-  <name>Sub_Node_1_10_1__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_10_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_1_10_1_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_96</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_11_0_ComponentInstance">
-  <name>Pub_Node_1_11_0_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_11_0__prov1ComponentInstance">
-  <name>Pub_Node_1_11_0__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_11_0__prov2ComponentInstance">
-  <name>Pub_Node_1_11_0__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_11_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_1_11_0_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_203</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_11_1_ComponentInstance">
-  <name>Pub_Node_1_11_1_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_11_1__prov1ComponentInstance">
-  <name>Pub_Node_1_11_1__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_11_1__prov2ComponentInstance">
-  <name>Pub_Node_1_11_1__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_11_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_1_11_1_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_238</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_11_0_ComponentInstance">
-  <name>Sub_Node_1_11_0_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_11_0__prov1ComponentInstance">
-  <name>Sub_Node_1_11_0__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_11_0__prov2ComponentInstance">
-  <name>Sub_Node_1_11_0__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_11_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_1_11_0_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_182</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_11_1_ComponentInstance">
-  <name>Sub_Node_1_11_1_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_11_1__prov1ComponentInstance">
-  <name>Sub_Node_1_11_1__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_11_1__prov2ComponentInstance">
-  <name>Sub_Node_1_11_1__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_11_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_1_11_1_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_217</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_12_0_ComponentInstance">
-  <name>Pub_Node_1_12_0_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_12_0__prov1ComponentInstance">
-  <name>Pub_Node_1_12_0__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_12_0__prov2ComponentInstance">
-  <name>Pub_Node_1_12_0__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_12_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_1_12_0_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_187</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_12_1_ComponentInstance">
-  <name>Pub_Node_1_12_1_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_12_1__prov1ComponentInstance">
-  <name>Pub_Node_1_12_1__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_12_1__prov2ComponentInstance">
-  <name>Pub_Node_1_12_1__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_12_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_1_12_1_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_169</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_12_0_ComponentInstance">
-  <name>Sub_Node_1_12_0_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_12_0__prov1ComponentInstance">
-  <name>Sub_Node_1_12_0__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_12_0__prov2ComponentInstance">
-  <name>Sub_Node_1_12_0__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_12_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_1_12_0_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_15</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_12_1_ComponentInstance">
-  <name>Sub_Node_1_12_1_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_12_1__prov1ComponentInstance">
-  <name>Sub_Node_1_12_1__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_12_1__prov2ComponentInstance">
-  <name>Sub_Node_1_12_1__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_12_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_1_12_1_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_87</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_13_0_ComponentInstance">
-  <name>Pub_Node_1_13_0_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_13_0__prov1ComponentInstance">
-  <name>Pub_Node_1_13_0__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_13_0__prov2ComponentInstance">
-  <name>Pub_Node_1_13_0__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_13_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_1_13_0_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_29</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_13_1_ComponentInstance">
-  <name>Pub_Node_1_13_1_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_13_1__prov1ComponentInstance">
-  <name>Pub_Node_1_13_1__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_13_1__prov2ComponentInstance">
-  <name>Pub_Node_1_13_1__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_13_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_1_13_1_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_124</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_13_0_ComponentInstance">
-  <name>Sub_Node_1_13_0_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_13_0__prov1ComponentInstance">
-  <name>Sub_Node_1_13_0__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_13_0__prov2ComponentInstance">
-  <name>Sub_Node_1_13_0__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_13_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_1_13_0_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_28</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_13_1_ComponentInstance">
-  <name>Sub_Node_1_13_1_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_13_1__prov1ComponentInstance">
-  <name>Sub_Node_1_13_1__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_13_1__prov2ComponentInstance">
-  <name>Sub_Node_1_13_1__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_13_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_1_13_1_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_171</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_14_0_ComponentInstance">
-  <name>Pub_Node_1_14_0_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_14_0__prov1ComponentInstance">
-  <name>Pub_Node_1_14_0__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_14_0__prov2ComponentInstance">
-  <name>Pub_Node_1_14_0__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_14_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_1_14_0_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_81</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_14_1_ComponentInstance">
-  <name>Pub_Node_1_14_1_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_14_1__prov1ComponentInstance">
-  <name>Pub_Node_1_14_1__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_14_1__prov2ComponentInstance">
-  <name>Pub_Node_1_14_1__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_14_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_1_14_1_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_60</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_14_0_ComponentInstance">
-  <name>Sub_Node_1_14_0_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_14_0__prov1ComponentInstance">
-  <name>Sub_Node_1_14_0__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_14_0__prov2ComponentInstance">
-  <name>Sub_Node_1_14_0__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_14_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_1_14_0_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_54</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_14_1_ComponentInstance">
-  <name>Sub_Node_1_14_1_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_14_1__prov1ComponentInstance">
-  <name>Sub_Node_1_14_1__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_14_1__prov2ComponentInstance">
-  <name>Sub_Node_1_14_1__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_14_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_1_14_1_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_80</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_15_0_ComponentInstance">
-  <name>Pub_Node_1_15_0_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_15_0__prov1ComponentInstance">
-  <name>Pub_Node_1_15_0__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_15_0__prov2ComponentInstance">
-  <name>Pub_Node_1_15_0__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_15_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_1_15_0_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_208</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_15_1_ComponentInstance">
-  <name>Pub_Node_1_15_1_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_15_1__prov1ComponentInstance">
-  <name>Pub_Node_1_15_1__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_15_1__prov2ComponentInstance">
-  <name>Pub_Node_1_15_1__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_15_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_1_15_1_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_48</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_15_0_ComponentInstance">
-  <name>Sub_Node_1_15_0_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_15_0__prov1ComponentInstance">
-  <name>Sub_Node_1_15_0__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_15_0__prov2ComponentInstance">
-  <name>Sub_Node_1_15_0__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_15_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_1_15_0_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_122</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_15_1_ComponentInstance">
-  <name>Sub_Node_1_15_1_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_15_1__prov1ComponentInstance">
-  <name>Sub_Node_1_15_1__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_15_1__prov2ComponentInstance">
-  <name>Sub_Node_1_15_1__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_15_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_1_15_1_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_180</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_16_0_ComponentInstance">
-  <name>Pub_Node_1_16_0_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_16_0__prov1ComponentInstance">
-  <name>Pub_Node_1_16_0__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_16_0__prov2ComponentInstance">
-  <name>Pub_Node_1_16_0__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_16_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_1_16_0_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_98</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_16_1_ComponentInstance">
-  <name>Pub_Node_1_16_1_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_16_1__prov1ComponentInstance">
-  <name>Pub_Node_1_16_1__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_16_1__prov2ComponentInstance">
-  <name>Pub_Node_1_16_1__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_16_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_1_16_1_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_12</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_16_0_ComponentInstance">
-  <name>Sub_Node_1_16_0_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_16_0__prov1ComponentInstance">
-  <name>Sub_Node_1_16_0__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_16_0__prov2ComponentInstance">
-  <name>Sub_Node_1_16_0__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_16_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_1_16_0_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_117</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_16_1_ComponentInstance">
-  <name>Sub_Node_1_16_1_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_16_1__prov1ComponentInstance">
-  <name>Sub_Node_1_16_1__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_16_1__prov2ComponentInstance">
-  <name>Sub_Node_1_16_1__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_16_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_1_16_1_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_247</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_17_0_ComponentInstance">
-  <name>Pub_Node_1_17_0_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_17_0__prov1ComponentInstance">
-  <name>Pub_Node_1_17_0__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_17_0__prov2ComponentInstance">
-  <name>Pub_Node_1_17_0__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_17_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_1_17_0_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_181</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_17_1_ComponentInstance">
-  <name>Pub_Node_1_17_1_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_17_1__prov1ComponentInstance">
-  <name>Pub_Node_1_17_1__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_17_1__prov2ComponentInstance">
-  <name>Pub_Node_1_17_1__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_17_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_1_17_1_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_19</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_17_0_ComponentInstance">
-  <name>Sub_Node_1_17_0_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_17_0__prov1ComponentInstance">
-  <name>Sub_Node_1_17_0__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_17_0__prov2ComponentInstance">
-  <name>Sub_Node_1_17_0__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_17_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_1_17_0_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_62</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_17_1_ComponentInstance">
-  <name>Sub_Node_1_17_1_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_17_1__prov1ComponentInstance">
-  <name>Sub_Node_1_17_1__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_17_1__prov2ComponentInstance">
-  <name>Sub_Node_1_17_1__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_17_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_1_17_1_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_167</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_18_0_ComponentInstance">
-  <name>Pub_Node_1_18_0_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_18_0__prov1ComponentInstance">
-  <name>Pub_Node_1_18_0__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_18_0__prov2ComponentInstance">
-  <name>Pub_Node_1_18_0__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_18_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_1_18_0_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_199</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_18_1_ComponentInstance">
-  <name>Pub_Node_1_18_1_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_18_1__prov1ComponentInstance">
-  <name>Pub_Node_1_18_1__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_18_1__prov2ComponentInstance">
-  <name>Pub_Node_1_18_1__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_18_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_1_18_1_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_192</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_18_0_ComponentInstance">
-  <name>Sub_Node_1_18_0_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_18_0__prov1ComponentInstance">
-  <name>Sub_Node_1_18_0__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_18_0__prov2ComponentInstance">
-  <name>Sub_Node_1_18_0__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_18_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_1_18_0_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_92</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_18_1_ComponentInstance">
-  <name>Sub_Node_1_18_1_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_18_1__prov1ComponentInstance">
-  <name>Sub_Node_1_18_1__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_18_1__prov2ComponentInstance">
-  <name>Sub_Node_1_18_1__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_18_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_1_18_1_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_36</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_19_0_ComponentInstance">
-  <name>Pub_Node_1_19_0_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_19_0__prov1ComponentInstance">
-  <name>Pub_Node_1_19_0__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_19_0__prov2ComponentInstance">
-  <name>Pub_Node_1_19_0__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_19_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_1_19_0_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_14</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_19_1_ComponentInstance">
-  <name>Pub_Node_1_19_1_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_19_1__prov1ComponentInstance">
-  <name>Pub_Node_1_19_1__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_19_1__prov2ComponentInstance">
-  <name>Pub_Node_1_19_1__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_1_19_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_1_19_1_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_16</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_19_0_ComponentInstance">
-  <name>Sub_Node_1_19_0_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_19_0__prov1ComponentInstance">
-  <name>Sub_Node_1_19_0__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_19_0__prov2ComponentInstance">
-  <name>Sub_Node_1_19_0__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_19_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_1_19_0_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_148</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_19_1_ComponentInstance">
-  <name>Sub_Node_1_19_1_Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_19_1__prov1ComponentInstance">
-  <name>Sub_Node_1_19_1__prov1Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_19_1__prov2ComponentInstance">
-  <name>Sub_Node_1_19_1__prov2Component</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_1_19_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_1_19_1_DDSConnectorComponent</name>
-  <node>Node_1</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_232</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_0_0_ComponentInstance">
-  <name>Pub_Node_2_0_0_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_0_0__prov1ComponentInstance">
-  <name>Pub_Node_2_0_0__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_0_0__prov2ComponentInstance">
-  <name>Pub_Node_2_0_0__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_0_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_2_0_0_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_31</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_0_1_ComponentInstance">
-  <name>Pub_Node_2_0_1_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_0_1__prov1ComponentInstance">
-  <name>Pub_Node_2_0_1__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_0_1__prov2ComponentInstance">
-  <name>Pub_Node_2_0_1__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_0_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_2_0_1_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_85</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_0_0_ComponentInstance">
-  <name>Sub_Node_2_0_0_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_0_0__prov1ComponentInstance">
-  <name>Sub_Node_2_0_0__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_0_0__prov2ComponentInstance">
-  <name>Sub_Node_2_0_0__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_0_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_2_0_0_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_134</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_0_1_ComponentInstance">
-  <name>Sub_Node_2_0_1_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_0_1__prov1ComponentInstance">
-  <name>Sub_Node_2_0_1__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_0_1__prov2ComponentInstance">
-  <name>Sub_Node_2_0_1__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_0_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_2_0_1_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_138</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_1_0_ComponentInstance">
-  <name>Pub_Node_2_1_0_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_1_0__prov1ComponentInstance">
-  <name>Pub_Node_2_1_0__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_1_0__prov2ComponentInstance">
-  <name>Pub_Node_2_1_0__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_1_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_2_1_0_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_40</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_1_1_ComponentInstance">
-  <name>Pub_Node_2_1_1_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_1_1__prov1ComponentInstance">
-  <name>Pub_Node_2_1_1__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_1_1__prov2ComponentInstance">
-  <name>Pub_Node_2_1_1__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_1_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_2_1_1_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_202</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_1_0_ComponentInstance">
-  <name>Sub_Node_2_1_0_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_1_0__prov1ComponentInstance">
-  <name>Sub_Node_2_1_0__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_1_0__prov2ComponentInstance">
-  <name>Sub_Node_2_1_0__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_1_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_2_1_0_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_131</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_1_1_ComponentInstance">
-  <name>Sub_Node_2_1_1_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_1_1__prov1ComponentInstance">
-  <name>Sub_Node_2_1_1__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_1_1__prov2ComponentInstance">
-  <name>Sub_Node_2_1_1__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_1_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_2_1_1_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_123</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_2_0_ComponentInstance">
-  <name>Pub_Node_2_2_0_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_2_0__prov1ComponentInstance">
-  <name>Pub_Node_2_2_0__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_2_0__prov2ComponentInstance">
-  <name>Pub_Node_2_2_0__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_2_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_2_2_0_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_193</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_2_1_ComponentInstance">
-  <name>Pub_Node_2_2_1_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_2_1__prov1ComponentInstance">
-  <name>Pub_Node_2_2_1__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_2_1__prov2ComponentInstance">
-  <name>Pub_Node_2_2_1__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_2_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_2_2_1_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_147</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_2_0_ComponentInstance">
-  <name>Sub_Node_2_2_0_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_2_0__prov1ComponentInstance">
-  <name>Sub_Node_2_2_0__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_2_0__prov2ComponentInstance">
-  <name>Sub_Node_2_2_0__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_2_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_2_2_0_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_142</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_2_1_ComponentInstance">
-  <name>Sub_Node_2_2_1_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_2_1__prov1ComponentInstance">
-  <name>Sub_Node_2_2_1__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_2_1__prov2ComponentInstance">
-  <name>Sub_Node_2_2_1__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_2_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_2_2_1_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_215</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_3_0_ComponentInstance">
-  <name>Pub_Node_2_3_0_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_3_0__prov1ComponentInstance">
-  <name>Pub_Node_2_3_0__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_3_0__prov2ComponentInstance">
-  <name>Pub_Node_2_3_0__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_3_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_2_3_0_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_143</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_3_1_ComponentInstance">
-  <name>Pub_Node_2_3_1_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_3_1__prov1ComponentInstance">
-  <name>Pub_Node_2_3_1__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_3_1__prov2ComponentInstance">
-  <name>Pub_Node_2_3_1__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_3_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_2_3_1_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_5</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_3_0_ComponentInstance">
-  <name>Sub_Node_2_3_0_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_3_0__prov1ComponentInstance">
-  <name>Sub_Node_2_3_0__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_3_0__prov2ComponentInstance">
-  <name>Sub_Node_2_3_0__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_3_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_2_3_0_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_157</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_3_1_ComponentInstance">
-  <name>Sub_Node_2_3_1_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_3_1__prov1ComponentInstance">
-  <name>Sub_Node_2_3_1__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_3_1__prov2ComponentInstance">
-  <name>Sub_Node_2_3_1__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_3_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_2_3_1_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_240</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_4_0_ComponentInstance">
-  <name>Pub_Node_2_4_0_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_4_0__prov1ComponentInstance">
-  <name>Pub_Node_2_4_0__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_4_0__prov2ComponentInstance">
-  <name>Pub_Node_2_4_0__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_4_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_2_4_0_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_200</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_4_1_ComponentInstance">
-  <name>Pub_Node_2_4_1_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_4_1__prov1ComponentInstance">
-  <name>Pub_Node_2_4_1__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_4_1__prov2ComponentInstance">
-  <name>Pub_Node_2_4_1__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_4_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_2_4_1_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_59</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_4_0_ComponentInstance">
-  <name>Sub_Node_2_4_0_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_4_0__prov1ComponentInstance">
-  <name>Sub_Node_2_4_0__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_4_0__prov2ComponentInstance">
-  <name>Sub_Node_2_4_0__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_4_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_2_4_0_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_200</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_4_1_ComponentInstance">
-  <name>Sub_Node_2_4_1_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_4_1__prov1ComponentInstance">
-  <name>Sub_Node_2_4_1__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_4_1__prov2ComponentInstance">
-  <name>Sub_Node_2_4_1__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_4_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_2_4_1_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_123</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_5_0_ComponentInstance">
-  <name>Pub_Node_2_5_0_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_5_0__prov1ComponentInstance">
-  <name>Pub_Node_2_5_0__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_5_0__prov2ComponentInstance">
-  <name>Pub_Node_2_5_0__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_5_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_2_5_0_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_45</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_5_1_ComponentInstance">
-  <name>Pub_Node_2_5_1_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_5_1__prov1ComponentInstance">
-  <name>Pub_Node_2_5_1__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_5_1__prov2ComponentInstance">
-  <name>Pub_Node_2_5_1__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_5_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_2_5_1_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_174</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_5_0_ComponentInstance">
-  <name>Sub_Node_2_5_0_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_5_0__prov1ComponentInstance">
-  <name>Sub_Node_2_5_0__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_5_0__prov2ComponentInstance">
-  <name>Sub_Node_2_5_0__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_5_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_2_5_0_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_0</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_5_1_ComponentInstance">
-  <name>Sub_Node_2_5_1_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_5_1__prov1ComponentInstance">
-  <name>Sub_Node_2_5_1__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_5_1__prov2ComponentInstance">
-  <name>Sub_Node_2_5_1__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_5_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_2_5_1_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_6</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_6_0_ComponentInstance">
-  <name>Pub_Node_2_6_0_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_6_0__prov1ComponentInstance">
-  <name>Pub_Node_2_6_0__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_6_0__prov2ComponentInstance">
-  <name>Pub_Node_2_6_0__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_6_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_2_6_0_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_87</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_6_1_ComponentInstance">
-  <name>Pub_Node_2_6_1_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_6_1__prov1ComponentInstance">
-  <name>Pub_Node_2_6_1__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_6_1__prov2ComponentInstance">
-  <name>Pub_Node_2_6_1__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_6_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_2_6_1_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_249</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_6_0_ComponentInstance">
-  <name>Sub_Node_2_6_0_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_6_0__prov1ComponentInstance">
-  <name>Sub_Node_2_6_0__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_6_0__prov2ComponentInstance">
-  <name>Sub_Node_2_6_0__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_6_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_2_6_0_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_0</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_6_1_ComponentInstance">
-  <name>Sub_Node_2_6_1_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_6_1__prov1ComponentInstance">
-  <name>Sub_Node_2_6_1__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_6_1__prov2ComponentInstance">
-  <name>Sub_Node_2_6_1__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_6_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_2_6_1_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_206</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_7_0_ComponentInstance">
-  <name>Pub_Node_2_7_0_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_7_0__prov1ComponentInstance">
-  <name>Pub_Node_2_7_0__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_7_0__prov2ComponentInstance">
-  <name>Pub_Node_2_7_0__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_7_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_2_7_0_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_191</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_7_1_ComponentInstance">
-  <name>Pub_Node_2_7_1_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_7_1__prov1ComponentInstance">
-  <name>Pub_Node_2_7_1__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_7_1__prov2ComponentInstance">
-  <name>Pub_Node_2_7_1__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_7_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_2_7_1_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_216</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_7_0_ComponentInstance">
-  <name>Sub_Node_2_7_0_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_7_0__prov1ComponentInstance">
-  <name>Sub_Node_2_7_0__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_7_0__prov2ComponentInstance">
-  <name>Sub_Node_2_7_0__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_7_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_2_7_0_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_47</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_7_1_ComponentInstance">
-  <name>Sub_Node_2_7_1_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_7_1__prov1ComponentInstance">
-  <name>Sub_Node_2_7_1__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_7_1__prov2ComponentInstance">
-  <name>Sub_Node_2_7_1__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_7_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_2_7_1_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_51</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_8_0_ComponentInstance">
-  <name>Pub_Node_2_8_0_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_8_0__prov1ComponentInstance">
-  <name>Pub_Node_2_8_0__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_8_0__prov2ComponentInstance">
-  <name>Pub_Node_2_8_0__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_8_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_2_8_0_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_102</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_8_1_ComponentInstance">
-  <name>Pub_Node_2_8_1_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_8_1__prov1ComponentInstance">
-  <name>Pub_Node_2_8_1__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_8_1__prov2ComponentInstance">
-  <name>Pub_Node_2_8_1__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_8_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_2_8_1_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_108</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_8_0_ComponentInstance">
-  <name>Sub_Node_2_8_0_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_8_0__prov1ComponentInstance">
-  <name>Sub_Node_2_8_0__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_8_0__prov2ComponentInstance">
-  <name>Sub_Node_2_8_0__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_8_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_2_8_0_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_10</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_8_1_ComponentInstance">
-  <name>Sub_Node_2_8_1_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_8_1__prov1ComponentInstance">
-  <name>Sub_Node_2_8_1__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_8_1__prov2ComponentInstance">
-  <name>Sub_Node_2_8_1__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_8_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_2_8_1_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_194</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_9_0_ComponentInstance">
-  <name>Pub_Node_2_9_0_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_9_0__prov1ComponentInstance">
-  <name>Pub_Node_2_9_0__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_9_0__prov2ComponentInstance">
-  <name>Pub_Node_2_9_0__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_9_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_2_9_0_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_123</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_9_1_ComponentInstance">
-  <name>Pub_Node_2_9_1_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_9_1__prov1ComponentInstance">
-  <name>Pub_Node_2_9_1__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_9_1__prov2ComponentInstance">
-  <name>Pub_Node_2_9_1__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_9_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_2_9_1_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_159</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_9_0_ComponentInstance">
-  <name>Sub_Node_2_9_0_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_9_0__prov1ComponentInstance">
-  <name>Sub_Node_2_9_0__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_9_0__prov2ComponentInstance">
-  <name>Sub_Node_2_9_0__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_9_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_2_9_0_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_153</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_9_1_ComponentInstance">
-  <name>Sub_Node_2_9_1_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_9_1__prov1ComponentInstance">
-  <name>Sub_Node_2_9_1__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_9_1__prov2ComponentInstance">
-  <name>Sub_Node_2_9_1__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_9_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_2_9_1_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_186</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_10_0_ComponentInstance">
-  <name>Pub_Node_2_10_0_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_10_0__prov1ComponentInstance">
-  <name>Pub_Node_2_10_0__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_10_0__prov2ComponentInstance">
-  <name>Pub_Node_2_10_0__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_10_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_2_10_0_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_61</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_10_1_ComponentInstance">
-  <name>Pub_Node_2_10_1_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_10_1__prov1ComponentInstance">
-  <name>Pub_Node_2_10_1__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_10_1__prov2ComponentInstance">
-  <name>Pub_Node_2_10_1__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_10_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_2_10_1_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_137</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_10_0_ComponentInstance">
-  <name>Sub_Node_2_10_0_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_10_0__prov1ComponentInstance">
-  <name>Sub_Node_2_10_0__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_10_0__prov2ComponentInstance">
-  <name>Sub_Node_2_10_0__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_10_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_2_10_0_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_24</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_10_1_ComponentInstance">
-  <name>Sub_Node_2_10_1_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_10_1__prov1ComponentInstance">
-  <name>Sub_Node_2_10_1__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_10_1__prov2ComponentInstance">
-  <name>Sub_Node_2_10_1__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_10_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_2_10_1_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_15</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_11_0_ComponentInstance">
-  <name>Pub_Node_2_11_0_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_11_0__prov1ComponentInstance">
-  <name>Pub_Node_2_11_0__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_11_0__prov2ComponentInstance">
-  <name>Pub_Node_2_11_0__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_11_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_2_11_0_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_135</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_11_1_ComponentInstance">
-  <name>Pub_Node_2_11_1_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_11_1__prov1ComponentInstance">
-  <name>Pub_Node_2_11_1__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_11_1__prov2ComponentInstance">
-  <name>Pub_Node_2_11_1__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_11_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_2_11_1_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_221</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_11_0_ComponentInstance">
-  <name>Sub_Node_2_11_0_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_11_0__prov1ComponentInstance">
-  <name>Sub_Node_2_11_0__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_11_0__prov2ComponentInstance">
-  <name>Sub_Node_2_11_0__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_11_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_2_11_0_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_2</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_11_1_ComponentInstance">
-  <name>Sub_Node_2_11_1_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_11_1__prov1ComponentInstance">
-  <name>Sub_Node_2_11_1__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_11_1__prov2ComponentInstance">
-  <name>Sub_Node_2_11_1__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_11_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_2_11_1_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_90</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_12_0_ComponentInstance">
-  <name>Pub_Node_2_12_0_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_12_0__prov1ComponentInstance">
-  <name>Pub_Node_2_12_0__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_12_0__prov2ComponentInstance">
-  <name>Pub_Node_2_12_0__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_12_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_2_12_0_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_246</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_12_1_ComponentInstance">
-  <name>Pub_Node_2_12_1_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_12_1__prov1ComponentInstance">
-  <name>Pub_Node_2_12_1__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_12_1__prov2ComponentInstance">
-  <name>Pub_Node_2_12_1__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_12_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_2_12_1_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_124</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_12_0_ComponentInstance">
-  <name>Sub_Node_2_12_0_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_12_0__prov1ComponentInstance">
-  <name>Sub_Node_2_12_0__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_12_0__prov2ComponentInstance">
-  <name>Sub_Node_2_12_0__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_12_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_2_12_0_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_140</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_12_1_ComponentInstance">
-  <name>Sub_Node_2_12_1_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_12_1__prov1ComponentInstance">
-  <name>Sub_Node_2_12_1__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_12_1__prov2ComponentInstance">
-  <name>Sub_Node_2_12_1__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_12_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_2_12_1_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_108</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_13_0_ComponentInstance">
-  <name>Pub_Node_2_13_0_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_13_0__prov1ComponentInstance">
-  <name>Pub_Node_2_13_0__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_13_0__prov2ComponentInstance">
-  <name>Pub_Node_2_13_0__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_13_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_2_13_0_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_44</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_13_1_ComponentInstance">
-  <name>Pub_Node_2_13_1_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_13_1__prov1ComponentInstance">
-  <name>Pub_Node_2_13_1__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_13_1__prov2ComponentInstance">
-  <name>Pub_Node_2_13_1__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_13_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_2_13_1_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_161</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_13_0_ComponentInstance">
-  <name>Sub_Node_2_13_0_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_13_0__prov1ComponentInstance">
-  <name>Sub_Node_2_13_0__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_13_0__prov2ComponentInstance">
-  <name>Sub_Node_2_13_0__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_13_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_2_13_0_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_144</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_13_1_ComponentInstance">
-  <name>Sub_Node_2_13_1_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_13_1__prov1ComponentInstance">
-  <name>Sub_Node_2_13_1__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_13_1__prov2ComponentInstance">
-  <name>Sub_Node_2_13_1__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_13_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_2_13_1_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_164</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_14_0_ComponentInstance">
-  <name>Pub_Node_2_14_0_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_14_0__prov1ComponentInstance">
-  <name>Pub_Node_2_14_0__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_14_0__prov2ComponentInstance">
-  <name>Pub_Node_2_14_0__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_14_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_2_14_0_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_181</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_14_1_ComponentInstance">
-  <name>Pub_Node_2_14_1_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_14_1__prov1ComponentInstance">
-  <name>Pub_Node_2_14_1__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_14_1__prov2ComponentInstance">
-  <name>Pub_Node_2_14_1__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_14_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_2_14_1_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_50</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_14_0_ComponentInstance">
-  <name>Sub_Node_2_14_0_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_14_0__prov1ComponentInstance">
-  <name>Sub_Node_2_14_0__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_14_0__prov2ComponentInstance">
-  <name>Sub_Node_2_14_0__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_14_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_2_14_0_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_74</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_14_1_ComponentInstance">
-  <name>Sub_Node_2_14_1_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_14_1__prov1ComponentInstance">
-  <name>Sub_Node_2_14_1__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_14_1__prov2ComponentInstance">
-  <name>Sub_Node_2_14_1__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_14_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_2_14_1_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_200</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_15_0_ComponentInstance">
-  <name>Pub_Node_2_15_0_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_15_0__prov1ComponentInstance">
-  <name>Pub_Node_2_15_0__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_15_0__prov2ComponentInstance">
-  <name>Pub_Node_2_15_0__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_15_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_2_15_0_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_218</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_15_1_ComponentInstance">
-  <name>Pub_Node_2_15_1_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_15_1__prov1ComponentInstance">
-  <name>Pub_Node_2_15_1__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_15_1__prov2ComponentInstance">
-  <name>Pub_Node_2_15_1__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_15_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_2_15_1_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_63</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_15_0_ComponentInstance">
-  <name>Sub_Node_2_15_0_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_15_0__prov1ComponentInstance">
-  <name>Sub_Node_2_15_0__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_15_0__prov2ComponentInstance">
-  <name>Sub_Node_2_15_0__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_15_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_2_15_0_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_151</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_15_1_ComponentInstance">
-  <name>Sub_Node_2_15_1_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_15_1__prov1ComponentInstance">
-  <name>Sub_Node_2_15_1__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_15_1__prov2ComponentInstance">
-  <name>Sub_Node_2_15_1__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_15_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_2_15_1_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_227</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_16_0_ComponentInstance">
-  <name>Pub_Node_2_16_0_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_16_0__prov1ComponentInstance">
-  <name>Pub_Node_2_16_0__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_16_0__prov2ComponentInstance">
-  <name>Pub_Node_2_16_0__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_16_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_2_16_0_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_105</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_16_1_ComponentInstance">
-  <name>Pub_Node_2_16_1_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_16_1__prov1ComponentInstance">
-  <name>Pub_Node_2_16_1__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_16_1__prov2ComponentInstance">
-  <name>Pub_Node_2_16_1__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_16_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_2_16_1_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_167</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_16_0_ComponentInstance">
-  <name>Sub_Node_2_16_0_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_16_0__prov1ComponentInstance">
-  <name>Sub_Node_2_16_0__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_16_0__prov2ComponentInstance">
-  <name>Sub_Node_2_16_0__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_16_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_2_16_0_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_205</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_16_1_ComponentInstance">
-  <name>Sub_Node_2_16_1_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_16_1__prov1ComponentInstance">
-  <name>Sub_Node_2_16_1__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_16_1__prov2ComponentInstance">
-  <name>Sub_Node_2_16_1__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_16_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_2_16_1_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_145</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_17_0_ComponentInstance">
-  <name>Pub_Node_2_17_0_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_17_0__prov1ComponentInstance">
-  <name>Pub_Node_2_17_0__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_17_0__prov2ComponentInstance">
-  <name>Pub_Node_2_17_0__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_17_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_2_17_0_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_24</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_17_1_ComponentInstance">
-  <name>Pub_Node_2_17_1_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_17_1__prov1ComponentInstance">
-  <name>Pub_Node_2_17_1__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_17_1__prov2ComponentInstance">
-  <name>Pub_Node_2_17_1__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_17_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_2_17_1_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_239</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_17_0_ComponentInstance">
-  <name>Sub_Node_2_17_0_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_17_0__prov1ComponentInstance">
-  <name>Sub_Node_2_17_0__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_17_0__prov2ComponentInstance">
-  <name>Sub_Node_2_17_0__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_17_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_2_17_0_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_19</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_17_1_ComponentInstance">
-  <name>Sub_Node_2_17_1_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_17_1__prov1ComponentInstance">
-  <name>Sub_Node_2_17_1__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_17_1__prov2ComponentInstance">
-  <name>Sub_Node_2_17_1__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_17_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_2_17_1_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_106</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_18_0_ComponentInstance">
-  <name>Pub_Node_2_18_0_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_18_0__prov1ComponentInstance">
-  <name>Pub_Node_2_18_0__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_18_0__prov2ComponentInstance">
-  <name>Pub_Node_2_18_0__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_18_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_2_18_0_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_214</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_18_1_ComponentInstance">
-  <name>Pub_Node_2_18_1_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_18_1__prov1ComponentInstance">
-  <name>Pub_Node_2_18_1__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_18_1__prov2ComponentInstance">
-  <name>Pub_Node_2_18_1__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_18_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_2_18_1_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_184</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_18_0_ComponentInstance">
-  <name>Sub_Node_2_18_0_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_18_0__prov1ComponentInstance">
-  <name>Sub_Node_2_18_0__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_18_0__prov2ComponentInstance">
-  <name>Sub_Node_2_18_0__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_18_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_2_18_0_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_233</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_18_1_ComponentInstance">
-  <name>Sub_Node_2_18_1_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_18_1__prov1ComponentInstance">
-  <name>Sub_Node_2_18_1__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_18_1__prov2ComponentInstance">
-  <name>Sub_Node_2_18_1__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_18_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_2_18_1_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_152</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_19_0_ComponentInstance">
-  <name>Pub_Node_2_19_0_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_19_0__prov1ComponentInstance">
-  <name>Pub_Node_2_19_0__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_19_0__prov2ComponentInstance">
-  <name>Pub_Node_2_19_0__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_19_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_2_19_0_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_113</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_19_1_ComponentInstance">
-  <name>Pub_Node_2_19_1_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_19_1__prov1ComponentInstance">
-  <name>Pub_Node_2_19_1__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_19_1__prov2ComponentInstance">
-  <name>Pub_Node_2_19_1__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_2_19_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_2_19_1_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_107</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_19_0_ComponentInstance">
-  <name>Sub_Node_2_19_0_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_19_0__prov1ComponentInstance">
-  <name>Sub_Node_2_19_0__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_19_0__prov2ComponentInstance">
-  <name>Sub_Node_2_19_0__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_19_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_2_19_0_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_127</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_19_1_ComponentInstance">
-  <name>Sub_Node_2_19_1_Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_19_1__prov1ComponentInstance">
-  <name>Sub_Node_2_19_1__prov1Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_19_1__prov2ComponentInstance">
-  <name>Sub_Node_2_19_1__prov2Component</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_2_19_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_2_19_1_DDSConnectorComponent</name>
-  <node>Node_2</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_89</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_0_0_ComponentInstance">
-  <name>Pub_Node_3_0_0_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_0_0__prov1ComponentInstance">
-  <name>Pub_Node_3_0_0__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_0_0__prov2ComponentInstance">
-  <name>Pub_Node_3_0_0__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_0_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_3_0_0_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_180</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_0_1_ComponentInstance">
-  <name>Pub_Node_3_0_1_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_0_1__prov1ComponentInstance">
-  <name>Pub_Node_3_0_1__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_0_1__prov2ComponentInstance">
-  <name>Pub_Node_3_0_1__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_0_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_3_0_1_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_242</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_0_0_ComponentInstance">
-  <name>Sub_Node_3_0_0_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_0_0__prov1ComponentInstance">
-  <name>Sub_Node_3_0_0__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_0_0__prov2ComponentInstance">
-  <name>Sub_Node_3_0_0__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_0_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_3_0_0_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_100</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_0_1_ComponentInstance">
-  <name>Sub_Node_3_0_1_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_0_1__prov1ComponentInstance">
-  <name>Sub_Node_3_0_1__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_0_1__prov2ComponentInstance">
-  <name>Sub_Node_3_0_1__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_0_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_3_0_1_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_58</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_1_0_ComponentInstance">
-  <name>Pub_Node_3_1_0_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_1_0__prov1ComponentInstance">
-  <name>Pub_Node_3_1_0__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_1_0__prov2ComponentInstance">
-  <name>Pub_Node_3_1_0__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_1_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_3_1_0_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_237</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_1_1_ComponentInstance">
-  <name>Pub_Node_3_1_1_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_1_1__prov1ComponentInstance">
-  <name>Pub_Node_3_1_1__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_1_1__prov2ComponentInstance">
-  <name>Pub_Node_3_1_1__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_1_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_3_1_1_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_56</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_1_0_ComponentInstance">
-  <name>Sub_Node_3_1_0_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_1_0__prov1ComponentInstance">
-  <name>Sub_Node_3_1_0__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_1_0__prov2ComponentInstance">
-  <name>Sub_Node_3_1_0__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_1_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_3_1_0_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_164</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_1_1_ComponentInstance">
-  <name>Sub_Node_3_1_1_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_1_1__prov1ComponentInstance">
-  <name>Sub_Node_3_1_1__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_1_1__prov2ComponentInstance">
-  <name>Sub_Node_3_1_1__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_1_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_3_1_1_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_89</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_2_0_ComponentInstance">
-  <name>Pub_Node_3_2_0_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_2_0__prov1ComponentInstance">
-  <name>Pub_Node_3_2_0__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_2_0__prov2ComponentInstance">
-  <name>Pub_Node_3_2_0__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_2_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_3_2_0_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_58</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_2_1_ComponentInstance">
-  <name>Pub_Node_3_2_1_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_2_1__prov1ComponentInstance">
-  <name>Pub_Node_3_2_1__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_2_1__prov2ComponentInstance">
-  <name>Pub_Node_3_2_1__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_2_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_3_2_1_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_221</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_2_0_ComponentInstance">
-  <name>Sub_Node_3_2_0_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_2_0__prov1ComponentInstance">
-  <name>Sub_Node_3_2_0__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_2_0__prov2ComponentInstance">
-  <name>Sub_Node_3_2_0__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_2_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_3_2_0_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_40</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_2_1_ComponentInstance">
-  <name>Sub_Node_3_2_1_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_2_1__prov1ComponentInstance">
-  <name>Sub_Node_3_2_1__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_2_1__prov2ComponentInstance">
-  <name>Sub_Node_3_2_1__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_2_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_3_2_1_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_23</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_3_0_ComponentInstance">
-  <name>Pub_Node_3_3_0_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_3_0__prov1ComponentInstance">
-  <name>Pub_Node_3_3_0__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_3_0__prov2ComponentInstance">
-  <name>Pub_Node_3_3_0__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_3_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_3_3_0_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_136</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_3_1_ComponentInstance">
-  <name>Pub_Node_3_3_1_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_3_1__prov1ComponentInstance">
-  <name>Pub_Node_3_3_1__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_3_1__prov2ComponentInstance">
-  <name>Pub_Node_3_3_1__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_3_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_3_3_1_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_162</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_3_0_ComponentInstance">
-  <name>Sub_Node_3_3_0_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_3_0__prov1ComponentInstance">
-  <name>Sub_Node_3_3_0__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_3_0__prov2ComponentInstance">
-  <name>Sub_Node_3_3_0__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_3_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_3_3_0_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_72</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_3_1_ComponentInstance">
-  <name>Sub_Node_3_3_1_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_3_1__prov1ComponentInstance">
-  <name>Sub_Node_3_3_1__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_3_1__prov2ComponentInstance">
-  <name>Sub_Node_3_3_1__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_3_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_3_3_1_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_236</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_4_0_ComponentInstance">
-  <name>Pub_Node_3_4_0_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_4_0__prov1ComponentInstance">
-  <name>Pub_Node_3_4_0__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_4_0__prov2ComponentInstance">
-  <name>Pub_Node_3_4_0__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_4_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_3_4_0_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_164</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_4_1_ComponentInstance">
-  <name>Pub_Node_3_4_1_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_4_1__prov1ComponentInstance">
-  <name>Pub_Node_3_4_1__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_4_1__prov2ComponentInstance">
-  <name>Pub_Node_3_4_1__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_4_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_3_4_1_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_113</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_4_0_ComponentInstance">
-  <name>Sub_Node_3_4_0_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_4_0__prov1ComponentInstance">
-  <name>Sub_Node_3_4_0__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_4_0__prov2ComponentInstance">
-  <name>Sub_Node_3_4_0__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_4_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_3_4_0_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_186</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_4_1_ComponentInstance">
-  <name>Sub_Node_3_4_1_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_4_1__prov1ComponentInstance">
-  <name>Sub_Node_3_4_1__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_4_1__prov2ComponentInstance">
-  <name>Sub_Node_3_4_1__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_4_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_3_4_1_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_183</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_5_0_ComponentInstance">
-  <name>Pub_Node_3_5_0_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_5_0__prov1ComponentInstance">
-  <name>Pub_Node_3_5_0__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_5_0__prov2ComponentInstance">
-  <name>Pub_Node_3_5_0__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_5_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_3_5_0_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_93</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_5_1_ComponentInstance">
-  <name>Pub_Node_3_5_1_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_5_1__prov1ComponentInstance">
-  <name>Pub_Node_3_5_1__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_5_1__prov2ComponentInstance">
-  <name>Pub_Node_3_5_1__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_5_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_3_5_1_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_21</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_5_0_ComponentInstance">
-  <name>Sub_Node_3_5_0_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_5_0__prov1ComponentInstance">
-  <name>Sub_Node_3_5_0__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_5_0__prov2ComponentInstance">
-  <name>Sub_Node_3_5_0__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_5_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_3_5_0_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_118</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_5_1_ComponentInstance">
-  <name>Sub_Node_3_5_1_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_5_1__prov1ComponentInstance">
-  <name>Sub_Node_3_5_1__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_5_1__prov2ComponentInstance">
-  <name>Sub_Node_3_5_1__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_5_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_3_5_1_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_99</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_6_0_ComponentInstance">
-  <name>Pub_Node_3_6_0_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_6_0__prov1ComponentInstance">
-  <name>Pub_Node_3_6_0__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_6_0__prov2ComponentInstance">
-  <name>Pub_Node_3_6_0__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_6_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_3_6_0_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_2</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_6_1_ComponentInstance">
-  <name>Pub_Node_3_6_1_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_6_1__prov1ComponentInstance">
-  <name>Pub_Node_3_6_1__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_6_1__prov2ComponentInstance">
-  <name>Pub_Node_3_6_1__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_6_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_3_6_1_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_237</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_6_0_ComponentInstance">
-  <name>Sub_Node_3_6_0_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_6_0__prov1ComponentInstance">
-  <name>Sub_Node_3_6_0__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_6_0__prov2ComponentInstance">
-  <name>Sub_Node_3_6_0__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_6_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_3_6_0_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_140</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_6_1_ComponentInstance">
-  <name>Sub_Node_3_6_1_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_6_1__prov1ComponentInstance">
-  <name>Sub_Node_3_6_1__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_6_1__prov2ComponentInstance">
-  <name>Sub_Node_3_6_1__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_6_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_3_6_1_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_159</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_7_0_ComponentInstance">
-  <name>Pub_Node_3_7_0_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_7_0__prov1ComponentInstance">
-  <name>Pub_Node_3_7_0__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_7_0__prov2ComponentInstance">
-  <name>Pub_Node_3_7_0__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_7_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_3_7_0_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_12</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_7_1_ComponentInstance">
-  <name>Pub_Node_3_7_1_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_7_1__prov1ComponentInstance">
-  <name>Pub_Node_3_7_1__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_7_1__prov2ComponentInstance">
-  <name>Pub_Node_3_7_1__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_7_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_3_7_1_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_242</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_7_0_ComponentInstance">
-  <name>Sub_Node_3_7_0_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_7_0__prov1ComponentInstance">
-  <name>Sub_Node_3_7_0__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_7_0__prov2ComponentInstance">
-  <name>Sub_Node_3_7_0__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_7_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_3_7_0_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_186</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_7_1_ComponentInstance">
-  <name>Sub_Node_3_7_1_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_7_1__prov1ComponentInstance">
-  <name>Sub_Node_3_7_1__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_7_1__prov2ComponentInstance">
-  <name>Sub_Node_3_7_1__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_7_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_3_7_1_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_109</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_8_0_ComponentInstance">
-  <name>Pub_Node_3_8_0_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_8_0__prov1ComponentInstance">
-  <name>Pub_Node_3_8_0__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_8_0__prov2ComponentInstance">
-  <name>Pub_Node_3_8_0__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_8_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_3_8_0_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_155</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_8_1_ComponentInstance">
-  <name>Pub_Node_3_8_1_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_8_1__prov1ComponentInstance">
-  <name>Pub_Node_3_8_1__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_8_1__prov2ComponentInstance">
-  <name>Pub_Node_3_8_1__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_8_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_3_8_1_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_187</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_8_0_ComponentInstance">
-  <name>Sub_Node_3_8_0_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_8_0__prov1ComponentInstance">
-  <name>Sub_Node_3_8_0__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_8_0__prov2ComponentInstance">
-  <name>Sub_Node_3_8_0__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_8_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_3_8_0_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_61</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_8_1_ComponentInstance">
-  <name>Sub_Node_3_8_1_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_8_1__prov1ComponentInstance">
-  <name>Sub_Node_3_8_1__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_8_1__prov2ComponentInstance">
-  <name>Sub_Node_3_8_1__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_8_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_3_8_1_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_218</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_9_0_ComponentInstance">
-  <name>Pub_Node_3_9_0_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_9_0__prov1ComponentInstance">
-  <name>Pub_Node_3_9_0__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_9_0__prov2ComponentInstance">
-  <name>Pub_Node_3_9_0__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_9_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_3_9_0_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_35</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_9_1_ComponentInstance">
-  <name>Pub_Node_3_9_1_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_9_1__prov1ComponentInstance">
-  <name>Pub_Node_3_9_1__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_9_1__prov2ComponentInstance">
-  <name>Pub_Node_3_9_1__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_9_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_3_9_1_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_188</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_9_0_ComponentInstance">
-  <name>Sub_Node_3_9_0_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_9_0__prov1ComponentInstance">
-  <name>Sub_Node_3_9_0__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_9_0__prov2ComponentInstance">
-  <name>Sub_Node_3_9_0__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_9_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_3_9_0_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_42</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_9_1_ComponentInstance">
-  <name>Sub_Node_3_9_1_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_9_1__prov1ComponentInstance">
-  <name>Sub_Node_3_9_1__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_9_1__prov2ComponentInstance">
-  <name>Sub_Node_3_9_1__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_9_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_3_9_1_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_160</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_10_0_ComponentInstance">
-  <name>Pub_Node_3_10_0_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_10_0__prov1ComponentInstance">
-  <name>Pub_Node_3_10_0__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_10_0__prov2ComponentInstance">
-  <name>Pub_Node_3_10_0__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_10_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_3_10_0_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_116</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_10_1_ComponentInstance">
-  <name>Pub_Node_3_10_1_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_10_1__prov1ComponentInstance">
-  <name>Pub_Node_3_10_1__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_10_1__prov2ComponentInstance">
-  <name>Pub_Node_3_10_1__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_10_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_3_10_1_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_244</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_10_0_ComponentInstance">
-  <name>Sub_Node_3_10_0_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_10_0__prov1ComponentInstance">
-  <name>Sub_Node_3_10_0__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_10_0__prov2ComponentInstance">
-  <name>Sub_Node_3_10_0__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_10_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_3_10_0_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_125</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_10_1_ComponentInstance">
-  <name>Sub_Node_3_10_1_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_10_1__prov1ComponentInstance">
-  <name>Sub_Node_3_10_1__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_10_1__prov2ComponentInstance">
-  <name>Sub_Node_3_10_1__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_10_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_3_10_1_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_193</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_11_0_ComponentInstance">
-  <name>Pub_Node_3_11_0_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_11_0__prov1ComponentInstance">
-  <name>Pub_Node_3_11_0__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_11_0__prov2ComponentInstance">
-  <name>Pub_Node_3_11_0__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_11_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_3_11_0_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_188</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_11_1_ComponentInstance">
-  <name>Pub_Node_3_11_1_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_11_1__prov1ComponentInstance">
-  <name>Pub_Node_3_11_1__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_11_1__prov2ComponentInstance">
-  <name>Pub_Node_3_11_1__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_11_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_3_11_1_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_197</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_11_0_ComponentInstance">
-  <name>Sub_Node_3_11_0_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_11_0__prov1ComponentInstance">
-  <name>Sub_Node_3_11_0__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_11_0__prov2ComponentInstance">
-  <name>Sub_Node_3_11_0__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_11_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_3_11_0_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_93</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_11_1_ComponentInstance">
-  <name>Sub_Node_3_11_1_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_11_1__prov1ComponentInstance">
-  <name>Sub_Node_3_11_1__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_11_1__prov2ComponentInstance">
-  <name>Sub_Node_3_11_1__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_11_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_3_11_1_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_94</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_12_0_ComponentInstance">
-  <name>Pub_Node_3_12_0_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_12_0__prov1ComponentInstance">
-  <name>Pub_Node_3_12_0__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_12_0__prov2ComponentInstance">
-  <name>Pub_Node_3_12_0__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_12_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_3_12_0_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_152</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_12_1_ComponentInstance">
-  <name>Pub_Node_3_12_1_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_12_1__prov1ComponentInstance">
-  <name>Pub_Node_3_12_1__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_12_1__prov2ComponentInstance">
-  <name>Pub_Node_3_12_1__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_12_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_3_12_1_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_245</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_12_0_ComponentInstance">
-  <name>Sub_Node_3_12_0_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_12_0__prov1ComponentInstance">
-  <name>Sub_Node_3_12_0__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_12_0__prov2ComponentInstance">
-  <name>Sub_Node_3_12_0__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_12_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_3_12_0_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_76</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_12_1_ComponentInstance">
-  <name>Sub_Node_3_12_1_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_12_1__prov1ComponentInstance">
-  <name>Sub_Node_3_12_1__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_12_1__prov2ComponentInstance">
-  <name>Sub_Node_3_12_1__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_12_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_3_12_1_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_191</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_13_0_ComponentInstance">
-  <name>Pub_Node_3_13_0_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_13_0__prov1ComponentInstance">
-  <name>Pub_Node_3_13_0__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_13_0__prov2ComponentInstance">
-  <name>Pub_Node_3_13_0__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_13_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_3_13_0_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_233</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_13_1_ComponentInstance">
-  <name>Pub_Node_3_13_1_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_13_1__prov1ComponentInstance">
-  <name>Pub_Node_3_13_1__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_13_1__prov2ComponentInstance">
-  <name>Pub_Node_3_13_1__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_13_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_3_13_1_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_242</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_13_0_ComponentInstance">
-  <name>Sub_Node_3_13_0_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_13_0__prov1ComponentInstance">
-  <name>Sub_Node_3_13_0__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_13_0__prov2ComponentInstance">
-  <name>Sub_Node_3_13_0__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_13_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_3_13_0_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_145</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_13_1_ComponentInstance">
-  <name>Sub_Node_3_13_1_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_13_1__prov1ComponentInstance">
-  <name>Sub_Node_3_13_1__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_13_1__prov2ComponentInstance">
-  <name>Sub_Node_3_13_1__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_13_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_3_13_1_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_204</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_14_0_ComponentInstance">
-  <name>Pub_Node_3_14_0_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_14_0__prov1ComponentInstance">
-  <name>Pub_Node_3_14_0__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_14_0__prov2ComponentInstance">
-  <name>Pub_Node_3_14_0__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_14_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_3_14_0_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_182</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_14_1_ComponentInstance">
-  <name>Pub_Node_3_14_1_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_14_1__prov1ComponentInstance">
-  <name>Pub_Node_3_14_1__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_14_1__prov2ComponentInstance">
-  <name>Pub_Node_3_14_1__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_14_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_3_14_1_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_21</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_14_0_ComponentInstance">
-  <name>Sub_Node_3_14_0_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_14_0__prov1ComponentInstance">
-  <name>Sub_Node_3_14_0__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_14_0__prov2ComponentInstance">
-  <name>Sub_Node_3_14_0__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_14_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_3_14_0_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_64</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_14_1_ComponentInstance">
-  <name>Sub_Node_3_14_1_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_14_1__prov1ComponentInstance">
-  <name>Sub_Node_3_14_1__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_14_1__prov2ComponentInstance">
-  <name>Sub_Node_3_14_1__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_14_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_3_14_1_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_230</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_15_0_ComponentInstance">
-  <name>Pub_Node_3_15_0_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_15_0__prov1ComponentInstance">
-  <name>Pub_Node_3_15_0__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_15_0__prov2ComponentInstance">
-  <name>Pub_Node_3_15_0__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_15_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_3_15_0_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_246</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_15_1_ComponentInstance">
-  <name>Pub_Node_3_15_1_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_15_1__prov1ComponentInstance">
-  <name>Pub_Node_3_15_1__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_15_1__prov2ComponentInstance">
-  <name>Pub_Node_3_15_1__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_15_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_3_15_1_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_76</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_15_0_ComponentInstance">
-  <name>Sub_Node_3_15_0_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_15_0__prov1ComponentInstance">
-  <name>Sub_Node_3_15_0__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_15_0__prov2ComponentInstance">
-  <name>Sub_Node_3_15_0__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_15_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_3_15_0_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_204</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_15_1_ComponentInstance">
-  <name>Sub_Node_3_15_1_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_15_1__prov1ComponentInstance">
-  <name>Sub_Node_3_15_1__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_15_1__prov2ComponentInstance">
-  <name>Sub_Node_3_15_1__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_15_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_3_15_1_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_82</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_16_0_ComponentInstance">
-  <name>Pub_Node_3_16_0_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_16_0__prov1ComponentInstance">
-  <name>Pub_Node_3_16_0__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_16_0__prov2ComponentInstance">
-  <name>Pub_Node_3_16_0__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_16_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_3_16_0_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_191</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_16_1_ComponentInstance">
-  <name>Pub_Node_3_16_1_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_16_1__prov1ComponentInstance">
-  <name>Pub_Node_3_16_1__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_16_1__prov2ComponentInstance">
-  <name>Pub_Node_3_16_1__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_16_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_3_16_1_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_193</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_16_0_ComponentInstance">
-  <name>Sub_Node_3_16_0_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_16_0__prov1ComponentInstance">
-  <name>Sub_Node_3_16_0__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_16_0__prov2ComponentInstance">
-  <name>Sub_Node_3_16_0__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_16_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_3_16_0_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_128</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_16_1_ComponentInstance">
-  <name>Sub_Node_3_16_1_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_16_1__prov1ComponentInstance">
-  <name>Sub_Node_3_16_1__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_16_1__prov2ComponentInstance">
-  <name>Sub_Node_3_16_1__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_16_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_3_16_1_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_198</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_17_0_ComponentInstance">
-  <name>Pub_Node_3_17_0_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_17_0__prov1ComponentInstance">
-  <name>Pub_Node_3_17_0__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_17_0__prov2ComponentInstance">
-  <name>Pub_Node_3_17_0__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_17_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_3_17_0_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_5</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_17_1_ComponentInstance">
-  <name>Pub_Node_3_17_1_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_17_1__prov1ComponentInstance">
-  <name>Pub_Node_3_17_1__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_17_1__prov2ComponentInstance">
-  <name>Pub_Node_3_17_1__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_17_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_3_17_1_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_114</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_17_0_ComponentInstance">
-  <name>Sub_Node_3_17_0_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_17_0__prov1ComponentInstance">
-  <name>Sub_Node_3_17_0__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_17_0__prov2ComponentInstance">
-  <name>Sub_Node_3_17_0__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_17_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_3_17_0_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_112</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_17_1_ComponentInstance">
-  <name>Sub_Node_3_17_1_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_17_1__prov1ComponentInstance">
-  <name>Sub_Node_3_17_1__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_17_1__prov2ComponentInstance">
-  <name>Sub_Node_3_17_1__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_17_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_3_17_1_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_71</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_18_0_ComponentInstance">
-  <name>Pub_Node_3_18_0_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_18_0__prov1ComponentInstance">
-  <name>Pub_Node_3_18_0__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_18_0__prov2ComponentInstance">
-  <name>Pub_Node_3_18_0__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_18_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_3_18_0_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_176</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_18_1_ComponentInstance">
-  <name>Pub_Node_3_18_1_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_18_1__prov1ComponentInstance">
-  <name>Pub_Node_3_18_1__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_18_1__prov2ComponentInstance">
-  <name>Pub_Node_3_18_1__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_18_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_3_18_1_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_190</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_18_0_ComponentInstance">
-  <name>Sub_Node_3_18_0_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_18_0__prov1ComponentInstance">
-  <name>Sub_Node_3_18_0__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_18_0__prov2ComponentInstance">
-  <name>Sub_Node_3_18_0__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_18_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_3_18_0_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_191</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_18_1_ComponentInstance">
-  <name>Sub_Node_3_18_1_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_18_1__prov1ComponentInstance">
-  <name>Sub_Node_3_18_1__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_18_1__prov2ComponentInstance">
-  <name>Sub_Node_3_18_1__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_18_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_3_18_1_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_130</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_19_0_ComponentInstance">
-  <name>Pub_Node_3_19_0_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_19_0__prov1ComponentInstance">
-  <name>Pub_Node_3_19_0__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_19_0__prov2ComponentInstance">
-  <name>Pub_Node_3_19_0__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_19_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_3_19_0_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_183</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_19_1_ComponentInstance">
-  <name>Pub_Node_3_19_1_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_19_1__prov1ComponentInstance">
-  <name>Pub_Node_3_19_1__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_19_1__prov2ComponentInstance">
-  <name>Pub_Node_3_19_1__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_3_19_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_3_19_1_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_15</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_19_0_ComponentInstance">
-  <name>Sub_Node_3_19_0_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_19_0__prov1ComponentInstance">
-  <name>Sub_Node_3_19_0__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_19_0__prov2ComponentInstance">
-  <name>Sub_Node_3_19_0__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_19_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_3_19_0_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_187</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_19_1_ComponentInstance">
-  <name>Sub_Node_3_19_1_Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_19_1__prov1ComponentInstance">
-  <name>Sub_Node_3_19_1__prov1Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_19_1__prov2ComponentInstance">
-  <name>Sub_Node_3_19_1__prov2Component</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_3_19_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_3_19_1_DDSConnectorComponent</name>
-  <node>Node_3</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_165</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_0_0_ComponentInstance">
-  <name>Pub_Node_4_0_0_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_0_0__prov1ComponentInstance">
-  <name>Pub_Node_4_0_0__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_0_0__prov2ComponentInstance">
-  <name>Pub_Node_4_0_0__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_0_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_4_0_0_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_195</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_0_1_ComponentInstance">
-  <name>Pub_Node_4_0_1_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_0_1__prov1ComponentInstance">
-  <name>Pub_Node_4_0_1__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_0_1__prov2ComponentInstance">
-  <name>Pub_Node_4_0_1__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_0_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_4_0_1_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_11</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_0_0_ComponentInstance">
-  <name>Sub_Node_4_0_0_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_0_0__prov1ComponentInstance">
-  <name>Sub_Node_4_0_0__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_0_0__prov2ComponentInstance">
-  <name>Sub_Node_4_0_0__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_0_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_4_0_0_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_71</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_0_1_ComponentInstance">
-  <name>Sub_Node_4_0_1_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_0_1__prov1ComponentInstance">
-  <name>Sub_Node_4_0_1__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_0_1__prov2ComponentInstance">
-  <name>Sub_Node_4_0_1__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_0_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_4_0_1_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_34</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_1_0_ComponentInstance">
-  <name>Pub_Node_4_1_0_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_1_0__prov1ComponentInstance">
-  <name>Pub_Node_4_1_0__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_1_0__prov2ComponentInstance">
-  <name>Pub_Node_4_1_0__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_1_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_4_1_0_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_153</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_1_1_ComponentInstance">
-  <name>Pub_Node_4_1_1_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_1_1__prov1ComponentInstance">
-  <name>Pub_Node_4_1_1__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_1_1__prov2ComponentInstance">
-  <name>Pub_Node_4_1_1__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_1_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_4_1_1_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_248</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_1_0_ComponentInstance">
-  <name>Sub_Node_4_1_0_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_1_0__prov1ComponentInstance">
-  <name>Sub_Node_4_1_0__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_1_0__prov2ComponentInstance">
-  <name>Sub_Node_4_1_0__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_1_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_4_1_0_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_72</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_1_1_ComponentInstance">
-  <name>Sub_Node_4_1_1_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_1_1__prov1ComponentInstance">
-  <name>Sub_Node_4_1_1__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_1_1__prov2ComponentInstance">
-  <name>Sub_Node_4_1_1__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_1_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_4_1_1_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_204</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_2_0_ComponentInstance">
-  <name>Pub_Node_4_2_0_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_2_0__prov1ComponentInstance">
-  <name>Pub_Node_4_2_0__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_2_0__prov2ComponentInstance">
-  <name>Pub_Node_4_2_0__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_2_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_4_2_0_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_245</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_2_1_ComponentInstance">
-  <name>Pub_Node_4_2_1_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_2_1__prov1ComponentInstance">
-  <name>Pub_Node_4_2_1__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_2_1__prov2ComponentInstance">
-  <name>Pub_Node_4_2_1__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_2_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_4_2_1_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_145</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_2_0_ComponentInstance">
-  <name>Sub_Node_4_2_0_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_2_0__prov1ComponentInstance">
-  <name>Sub_Node_4_2_0__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_2_0__prov2ComponentInstance">
-  <name>Sub_Node_4_2_0__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_2_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_4_2_0_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_176</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_2_1_ComponentInstance">
-  <name>Sub_Node_4_2_1_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_2_1__prov1ComponentInstance">
-  <name>Sub_Node_4_2_1__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_2_1__prov2ComponentInstance">
-  <name>Sub_Node_4_2_1__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_2_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_4_2_1_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_97</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_3_0_ComponentInstance">
-  <name>Pub_Node_4_3_0_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_3_0__prov1ComponentInstance">
-  <name>Pub_Node_4_3_0__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_3_0__prov2ComponentInstance">
-  <name>Pub_Node_4_3_0__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_3_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_4_3_0_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_193</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_3_1_ComponentInstance">
-  <name>Pub_Node_4_3_1_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_3_1__prov1ComponentInstance">
-  <name>Pub_Node_4_3_1__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_3_1__prov2ComponentInstance">
-  <name>Pub_Node_4_3_1__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_3_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_4_3_1_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_4</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_3_0_ComponentInstance">
-  <name>Sub_Node_4_3_0_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_3_0__prov1ComponentInstance">
-  <name>Sub_Node_4_3_0__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_3_0__prov2ComponentInstance">
-  <name>Sub_Node_4_3_0__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_3_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_4_3_0_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_102</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_3_1_ComponentInstance">
-  <name>Sub_Node_4_3_1_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_3_1__prov1ComponentInstance">
-  <name>Sub_Node_4_3_1__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_3_1__prov2ComponentInstance">
-  <name>Sub_Node_4_3_1__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_3_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_4_3_1_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_182</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_4_0_ComponentInstance">
-  <name>Pub_Node_4_4_0_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_4_0__prov1ComponentInstance">
-  <name>Pub_Node_4_4_0__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_4_0__prov2ComponentInstance">
-  <name>Pub_Node_4_4_0__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_4_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_4_4_0_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_129</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_4_1_ComponentInstance">
-  <name>Pub_Node_4_4_1_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_4_1__prov1ComponentInstance">
-  <name>Pub_Node_4_4_1__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_4_1__prov2ComponentInstance">
-  <name>Pub_Node_4_4_1__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_4_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_4_4_1_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_174</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_4_0_ComponentInstance">
-  <name>Sub_Node_4_4_0_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_4_0__prov1ComponentInstance">
-  <name>Sub_Node_4_4_0__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_4_0__prov2ComponentInstance">
-  <name>Sub_Node_4_4_0__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_4_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_4_4_0_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_174</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_4_1_ComponentInstance">
-  <name>Sub_Node_4_4_1_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_4_1__prov1ComponentInstance">
-  <name>Sub_Node_4_4_1__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_4_1__prov2ComponentInstance">
-  <name>Sub_Node_4_4_1__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_4_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_4_4_1_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_176</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_5_0_ComponentInstance">
-  <name>Pub_Node_4_5_0_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_5_0__prov1ComponentInstance">
-  <name>Pub_Node_4_5_0__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_5_0__prov2ComponentInstance">
-  <name>Pub_Node_4_5_0__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_5_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_4_5_0_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_190</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_5_1_ComponentInstance">
-  <name>Pub_Node_4_5_1_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_5_1__prov1ComponentInstance">
-  <name>Pub_Node_4_5_1__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_5_1__prov2ComponentInstance">
-  <name>Pub_Node_4_5_1__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_5_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_4_5_1_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_76</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_5_0_ComponentInstance">
-  <name>Sub_Node_4_5_0_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_5_0__prov1ComponentInstance">
-  <name>Sub_Node_4_5_0__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_5_0__prov2ComponentInstance">
-  <name>Sub_Node_4_5_0__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_5_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_4_5_0_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_11</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_5_1_ComponentInstance">
-  <name>Sub_Node_4_5_1_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_5_1__prov1ComponentInstance">
-  <name>Sub_Node_4_5_1__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_5_1__prov2ComponentInstance">
-  <name>Sub_Node_4_5_1__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_5_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_4_5_1_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_169</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_6_0_ComponentInstance">
-  <name>Pub_Node_4_6_0_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_6_0__prov1ComponentInstance">
-  <name>Pub_Node_4_6_0__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_6_0__prov2ComponentInstance">
-  <name>Pub_Node_4_6_0__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_6_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_4_6_0_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_155</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_6_1_ComponentInstance">
-  <name>Pub_Node_4_6_1_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_6_1__prov1ComponentInstance">
-  <name>Pub_Node_4_6_1__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_6_1__prov2ComponentInstance">
-  <name>Pub_Node_4_6_1__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_6_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_4_6_1_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_74</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_6_0_ComponentInstance">
-  <name>Sub_Node_4_6_0_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_6_0__prov1ComponentInstance">
-  <name>Sub_Node_4_6_0__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_6_0__prov2ComponentInstance">
-  <name>Sub_Node_4_6_0__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_6_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_4_6_0_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_141</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_6_1_ComponentInstance">
-  <name>Sub_Node_4_6_1_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_6_1__prov1ComponentInstance">
-  <name>Sub_Node_4_6_1__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_6_1__prov2ComponentInstance">
-  <name>Sub_Node_4_6_1__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_6_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_4_6_1_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_227</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_7_0_ComponentInstance">
-  <name>Pub_Node_4_7_0_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_7_0__prov1ComponentInstance">
-  <name>Pub_Node_4_7_0__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_7_0__prov2ComponentInstance">
-  <name>Pub_Node_4_7_0__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_7_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_4_7_0_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_28</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_7_1_ComponentInstance">
-  <name>Pub_Node_4_7_1_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_7_1__prov1ComponentInstance">
-  <name>Pub_Node_4_7_1__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_7_1__prov2ComponentInstance">
-  <name>Pub_Node_4_7_1__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_7_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_4_7_1_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_214</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_7_0_ComponentInstance">
-  <name>Sub_Node_4_7_0_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_7_0__prov1ComponentInstance">
-  <name>Sub_Node_4_7_0__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_7_0__prov2ComponentInstance">
-  <name>Sub_Node_4_7_0__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_7_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_4_7_0_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_160</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_7_1_ComponentInstance">
-  <name>Sub_Node_4_7_1_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_7_1__prov1ComponentInstance">
-  <name>Sub_Node_4_7_1__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_7_1__prov2ComponentInstance">
-  <name>Sub_Node_4_7_1__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_7_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_4_7_1_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_11</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_8_0_ComponentInstance">
-  <name>Pub_Node_4_8_0_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_8_0__prov1ComponentInstance">
-  <name>Pub_Node_4_8_0__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_8_0__prov2ComponentInstance">
-  <name>Pub_Node_4_8_0__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_8_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_4_8_0_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_178</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_8_1_ComponentInstance">
-  <name>Pub_Node_4_8_1_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_8_1__prov1ComponentInstance">
-  <name>Pub_Node_4_8_1__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_8_1__prov2ComponentInstance">
-  <name>Pub_Node_4_8_1__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_8_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_4_8_1_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_207</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_8_0_ComponentInstance">
-  <name>Sub_Node_4_8_0_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_8_0__prov1ComponentInstance">
-  <name>Sub_Node_4_8_0__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_8_0__prov2ComponentInstance">
-  <name>Sub_Node_4_8_0__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_8_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_4_8_0_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_39</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_8_1_ComponentInstance">
-  <name>Sub_Node_4_8_1_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_8_1__prov1ComponentInstance">
-  <name>Sub_Node_4_8_1__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_8_1__prov2ComponentInstance">
-  <name>Sub_Node_4_8_1__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_8_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_4_8_1_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_178</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_9_0_ComponentInstance">
-  <name>Pub_Node_4_9_0_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_9_0__prov1ComponentInstance">
-  <name>Pub_Node_4_9_0__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_9_0__prov2ComponentInstance">
-  <name>Pub_Node_4_9_0__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_9_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_4_9_0_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_140</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_9_1_ComponentInstance">
-  <name>Pub_Node_4_9_1_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_9_1__prov1ComponentInstance">
-  <name>Pub_Node_4_9_1__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_9_1__prov2ComponentInstance">
-  <name>Pub_Node_4_9_1__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_9_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_4_9_1_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_102</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_9_0_ComponentInstance">
-  <name>Sub_Node_4_9_0_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_9_0__prov1ComponentInstance">
-  <name>Sub_Node_4_9_0__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_9_0__prov2ComponentInstance">
-  <name>Sub_Node_4_9_0__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_9_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_4_9_0_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_142</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_9_1_ComponentInstance">
-  <name>Sub_Node_4_9_1_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_9_1__prov1ComponentInstance">
-  <name>Sub_Node_4_9_1__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_9_1__prov2ComponentInstance">
-  <name>Sub_Node_4_9_1__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_9_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_4_9_1_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_158</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_10_0_ComponentInstance">
-  <name>Pub_Node_4_10_0_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_10_0__prov1ComponentInstance">
-  <name>Pub_Node_4_10_0__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_10_0__prov2ComponentInstance">
-  <name>Pub_Node_4_10_0__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_10_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_4_10_0_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_82</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_10_1_ComponentInstance">
-  <name>Pub_Node_4_10_1_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_10_1__prov1ComponentInstance">
-  <name>Pub_Node_4_10_1__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_10_1__prov2ComponentInstance">
-  <name>Pub_Node_4_10_1__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_10_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_4_10_1_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_191</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_10_0_ComponentInstance">
-  <name>Sub_Node_4_10_0_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_10_0__prov1ComponentInstance">
-  <name>Sub_Node_4_10_0__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_10_0__prov2ComponentInstance">
-  <name>Sub_Node_4_10_0__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_10_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_4_10_0_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_232</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_10_1_ComponentInstance">
-  <name>Sub_Node_4_10_1_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_10_1__prov1ComponentInstance">
-  <name>Sub_Node_4_10_1__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_10_1__prov2ComponentInstance">
-  <name>Sub_Node_4_10_1__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_10_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_4_10_1_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_170</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_11_0_ComponentInstance">
-  <name>Pub_Node_4_11_0_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_11_0__prov1ComponentInstance">
-  <name>Pub_Node_4_11_0__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_11_0__prov2ComponentInstance">
-  <name>Pub_Node_4_11_0__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_11_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_4_11_0_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_69</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_11_1_ComponentInstance">
-  <name>Pub_Node_4_11_1_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_11_1__prov1ComponentInstance">
-  <name>Pub_Node_4_11_1__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_11_1__prov2ComponentInstance">
-  <name>Pub_Node_4_11_1__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_11_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_4_11_1_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_115</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_11_0_ComponentInstance">
-  <name>Sub_Node_4_11_0_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_11_0__prov1ComponentInstance">
-  <name>Sub_Node_4_11_0__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_11_0__prov2ComponentInstance">
-  <name>Sub_Node_4_11_0__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_11_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_4_11_0_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_146</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_11_1_ComponentInstance">
-  <name>Sub_Node_4_11_1_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_11_1__prov1ComponentInstance">
-  <name>Sub_Node_4_11_1__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_11_1__prov2ComponentInstance">
-  <name>Sub_Node_4_11_1__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_11_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_4_11_1_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_118</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_12_0_ComponentInstance">
-  <name>Pub_Node_4_12_0_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_12_0__prov1ComponentInstance">
-  <name>Pub_Node_4_12_0__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_12_0__prov2ComponentInstance">
-  <name>Pub_Node_4_12_0__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_12_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_4_12_0_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_226</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_12_1_ComponentInstance">
-  <name>Pub_Node_4_12_1_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_12_1__prov1ComponentInstance">
-  <name>Pub_Node_4_12_1__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_12_1__prov2ComponentInstance">
-  <name>Pub_Node_4_12_1__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_12_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_4_12_1_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_179</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_12_0_ComponentInstance">
-  <name>Sub_Node_4_12_0_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_12_0__prov1ComponentInstance">
-  <name>Sub_Node_4_12_0__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_12_0__prov2ComponentInstance">
-  <name>Sub_Node_4_12_0__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_12_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_4_12_0_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_14</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_12_1_ComponentInstance">
-  <name>Sub_Node_4_12_1_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_12_1__prov1ComponentInstance">
-  <name>Sub_Node_4_12_1__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_12_1__prov2ComponentInstance">
-  <name>Sub_Node_4_12_1__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_12_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_4_12_1_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_218</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_13_0_ComponentInstance">
-  <name>Pub_Node_4_13_0_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_13_0__prov1ComponentInstance">
-  <name>Pub_Node_4_13_0__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_13_0__prov2ComponentInstance">
-  <name>Pub_Node_4_13_0__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_13_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_4_13_0_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_145</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_13_1_ComponentInstance">
-  <name>Pub_Node_4_13_1_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_13_1__prov1ComponentInstance">
-  <name>Pub_Node_4_13_1__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_13_1__prov2ComponentInstance">
-  <name>Pub_Node_4_13_1__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_13_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_4_13_1_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_97</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_13_0_ComponentInstance">
-  <name>Sub_Node_4_13_0_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_13_0__prov1ComponentInstance">
-  <name>Sub_Node_4_13_0__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_13_0__prov2ComponentInstance">
-  <name>Sub_Node_4_13_0__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_13_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_4_13_0_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_119</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_13_1_ComponentInstance">
-  <name>Sub_Node_4_13_1_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_13_1__prov1ComponentInstance">
-  <name>Sub_Node_4_13_1__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_13_1__prov2ComponentInstance">
-  <name>Sub_Node_4_13_1__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_13_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_4_13_1_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_98</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_14_0_ComponentInstance">
-  <name>Pub_Node_4_14_0_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_14_0__prov1ComponentInstance">
-  <name>Pub_Node_4_14_0__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_14_0__prov2ComponentInstance">
-  <name>Pub_Node_4_14_0__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_14_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_4_14_0_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_200</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_14_1_ComponentInstance">
-  <name>Pub_Node_4_14_1_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_14_1__prov1ComponentInstance">
-  <name>Pub_Node_4_14_1__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_14_1__prov2ComponentInstance">
-  <name>Pub_Node_4_14_1__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_14_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_4_14_1_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_119</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_14_0_ComponentInstance">
-  <name>Sub_Node_4_14_0_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_14_0__prov1ComponentInstance">
-  <name>Sub_Node_4_14_0__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_14_0__prov2ComponentInstance">
-  <name>Sub_Node_4_14_0__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_14_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_4_14_0_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_59</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_14_1_ComponentInstance">
-  <name>Sub_Node_4_14_1_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_14_1__prov1ComponentInstance">
-  <name>Sub_Node_4_14_1__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_14_1__prov2ComponentInstance">
-  <name>Sub_Node_4_14_1__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_14_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_4_14_1_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_196</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_15_0_ComponentInstance">
-  <name>Pub_Node_4_15_0_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_15_0__prov1ComponentInstance">
-  <name>Pub_Node_4_15_0__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_15_0__prov2ComponentInstance">
-  <name>Pub_Node_4_15_0__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_15_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_4_15_0_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_157</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_15_1_ComponentInstance">
-  <name>Pub_Node_4_15_1_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_15_1__prov1ComponentInstance">
-  <name>Pub_Node_4_15_1__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_15_1__prov2ComponentInstance">
-  <name>Pub_Node_4_15_1__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_15_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_4_15_1_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_6</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_15_0_ComponentInstance">
-  <name>Sub_Node_4_15_0_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_15_0__prov1ComponentInstance">
-  <name>Sub_Node_4_15_0__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_15_0__prov2ComponentInstance">
-  <name>Sub_Node_4_15_0__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_15_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_4_15_0_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_237</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_15_1_ComponentInstance">
-  <name>Sub_Node_4_15_1_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_15_1__prov1ComponentInstance">
-  <name>Sub_Node_4_15_1__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_15_1__prov2ComponentInstance">
-  <name>Sub_Node_4_15_1__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_15_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_4_15_1_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_130</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_16_0_ComponentInstance">
-  <name>Pub_Node_4_16_0_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_16_0__prov1ComponentInstance">
-  <name>Pub_Node_4_16_0__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_16_0__prov2ComponentInstance">
-  <name>Pub_Node_4_16_0__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_16_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_4_16_0_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_210</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_16_1_ComponentInstance">
-  <name>Pub_Node_4_16_1_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_16_1__prov1ComponentInstance">
-  <name>Pub_Node_4_16_1__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_16_1__prov2ComponentInstance">
-  <name>Pub_Node_4_16_1__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_16_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_4_16_1_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_47</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_16_0_ComponentInstance">
-  <name>Sub_Node_4_16_0_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_16_0__prov1ComponentInstance">
-  <name>Sub_Node_4_16_0__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_16_0__prov2ComponentInstance">
-  <name>Sub_Node_4_16_0__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_16_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_4_16_0_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_128</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_16_1_ComponentInstance">
-  <name>Sub_Node_4_16_1_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_16_1__prov1ComponentInstance">
-  <name>Sub_Node_4_16_1__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_16_1__prov2ComponentInstance">
-  <name>Sub_Node_4_16_1__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_16_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_4_16_1_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_218</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_17_0_ComponentInstance">
-  <name>Pub_Node_4_17_0_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_17_0__prov1ComponentInstance">
-  <name>Pub_Node_4_17_0__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_17_0__prov2ComponentInstance">
-  <name>Pub_Node_4_17_0__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_17_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_4_17_0_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_140</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_17_1_ComponentInstance">
-  <name>Pub_Node_4_17_1_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_17_1__prov1ComponentInstance">
-  <name>Pub_Node_4_17_1__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_17_1__prov2ComponentInstance">
-  <name>Pub_Node_4_17_1__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_17_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_4_17_1_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_156</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_17_0_ComponentInstance">
-  <name>Sub_Node_4_17_0_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_17_0__prov1ComponentInstance">
-  <name>Sub_Node_4_17_0__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_17_0__prov2ComponentInstance">
-  <name>Sub_Node_4_17_0__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_17_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_4_17_0_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_178</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_17_1_ComponentInstance">
-  <name>Sub_Node_4_17_1_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_17_1__prov1ComponentInstance">
-  <name>Sub_Node_4_17_1__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_17_1__prov2ComponentInstance">
-  <name>Sub_Node_4_17_1__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_17_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_4_17_1_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_151</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_18_0_ComponentInstance">
-  <name>Pub_Node_4_18_0_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_18_0__prov1ComponentInstance">
-  <name>Pub_Node_4_18_0__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_18_0__prov2ComponentInstance">
-  <name>Pub_Node_4_18_0__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_18_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_4_18_0_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_161</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_18_1_ComponentInstance">
-  <name>Pub_Node_4_18_1_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_18_1__prov1ComponentInstance">
-  <name>Pub_Node_4_18_1__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_18_1__prov2ComponentInstance">
-  <name>Pub_Node_4_18_1__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_18_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_4_18_1_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_188</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_18_0_ComponentInstance">
-  <name>Sub_Node_4_18_0_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_18_0__prov1ComponentInstance">
-  <name>Sub_Node_4_18_0__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_18_0__prov2ComponentInstance">
-  <name>Sub_Node_4_18_0__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_18_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_4_18_0_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_166</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_18_1_ComponentInstance">
-  <name>Sub_Node_4_18_1_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_18_1__prov1ComponentInstance">
-  <name>Sub_Node_4_18_1__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_18_1__prov2ComponentInstance">
-  <name>Sub_Node_4_18_1__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_18_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_4_18_1_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_229</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_19_0_ComponentInstance">
-  <name>Pub_Node_4_19_0_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_19_0__prov1ComponentInstance">
-  <name>Pub_Node_4_19_0__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_19_0__prov2ComponentInstance">
-  <name>Pub_Node_4_19_0__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_19_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_4_19_0_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_24</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_19_1_ComponentInstance">
-  <name>Pub_Node_4_19_1_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_19_1__prov1ComponentInstance">
-  <name>Pub_Node_4_19_1__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_19_1__prov2ComponentInstance">
-  <name>Pub_Node_4_19_1__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_4_19_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_4_19_1_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_6</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_19_0_ComponentInstance">
-  <name>Sub_Node_4_19_0_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_19_0__prov1ComponentInstance">
-  <name>Sub_Node_4_19_0__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_19_0__prov2ComponentInstance">
-  <name>Sub_Node_4_19_0__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_19_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_4_19_0_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_71</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_19_1_ComponentInstance">
-  <name>Sub_Node_4_19_1_Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_19_1__prov1ComponentInstance">
-  <name>Sub_Node_4_19_1__prov1Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_19_1__prov2ComponentInstance">
-  <name>Sub_Node_4_19_1__prov2Component</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_4_19_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_4_19_1_DDSConnectorComponent</name>
-  <node>Node_4</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_1</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_0_0_ComponentInstance">
-  <name>Pub_Node_5_0_0_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_0_0__prov1ComponentInstance">
-  <name>Pub_Node_5_0_0__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_0_0__prov2ComponentInstance">
-  <name>Pub_Node_5_0_0__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_0_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_5_0_0_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_3</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_0_1_ComponentInstance">
-  <name>Pub_Node_5_0_1_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_0_1__prov1ComponentInstance">
-  <name>Pub_Node_5_0_1__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_0_1__prov2ComponentInstance">
-  <name>Pub_Node_5_0_1__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_0_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_5_0_1_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_23</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_0_0_ComponentInstance">
-  <name>Sub_Node_5_0_0_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_0_0__prov1ComponentInstance">
-  <name>Sub_Node_5_0_0__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_0_0__prov2ComponentInstance">
-  <name>Sub_Node_5_0_0__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_0_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_5_0_0_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_185</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_0_1_ComponentInstance">
-  <name>Sub_Node_5_0_1_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_0_1__prov1ComponentInstance">
-  <name>Sub_Node_5_0_1__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_0_1__prov2ComponentInstance">
-  <name>Sub_Node_5_0_1__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_0_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_5_0_1_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_117</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_1_0_ComponentInstance">
-  <name>Pub_Node_5_1_0_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_1_0__prov1ComponentInstance">
-  <name>Pub_Node_5_1_0__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_1_0__prov2ComponentInstance">
-  <name>Pub_Node_5_1_0__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_1_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_5_1_0_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_21</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_1_1_ComponentInstance">
-  <name>Pub_Node_5_1_1_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_1_1__prov1ComponentInstance">
-  <name>Pub_Node_5_1_1__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_1_1__prov2ComponentInstance">
-  <name>Pub_Node_5_1_1__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_1_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_5_1_1_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_107</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_1_0_ComponentInstance">
-  <name>Sub_Node_5_1_0_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_1_0__prov1ComponentInstance">
-  <name>Sub_Node_5_1_0__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_1_0__prov2ComponentInstance">
-  <name>Sub_Node_5_1_0__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_1_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_5_1_0_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_221</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_1_1_ComponentInstance">
-  <name>Sub_Node_5_1_1_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_1_1__prov1ComponentInstance">
-  <name>Sub_Node_5_1_1__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_1_1__prov2ComponentInstance">
-  <name>Sub_Node_5_1_1__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_1_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_5_1_1_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_150</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_2_0_ComponentInstance">
-  <name>Pub_Node_5_2_0_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_2_0__prov1ComponentInstance">
-  <name>Pub_Node_5_2_0__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_2_0__prov2ComponentInstance">
-  <name>Pub_Node_5_2_0__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_2_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_5_2_0_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_1</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_2_1_ComponentInstance">
-  <name>Pub_Node_5_2_1_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_2_1__prov1ComponentInstance">
-  <name>Pub_Node_5_2_1__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_2_1__prov2ComponentInstance">
-  <name>Pub_Node_5_2_1__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_2_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_5_2_1_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_31</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_2_0_ComponentInstance">
-  <name>Sub_Node_5_2_0_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_2_0__prov1ComponentInstance">
-  <name>Sub_Node_5_2_0__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_2_0__prov2ComponentInstance">
-  <name>Sub_Node_5_2_0__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_2_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_5_2_0_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_149</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_2_1_ComponentInstance">
-  <name>Sub_Node_5_2_1_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_2_1__prov1ComponentInstance">
-  <name>Sub_Node_5_2_1__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_2_1__prov2ComponentInstance">
-  <name>Sub_Node_5_2_1__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_2_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_5_2_1_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_92</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_3_0_ComponentInstance">
-  <name>Pub_Node_5_3_0_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_3_0__prov1ComponentInstance">
-  <name>Pub_Node_5_3_0__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_3_0__prov2ComponentInstance">
-  <name>Pub_Node_5_3_0__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_3_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_5_3_0_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_67</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_3_1_ComponentInstance">
-  <name>Pub_Node_5_3_1_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_3_1__prov1ComponentInstance">
-  <name>Pub_Node_5_3_1__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_3_1__prov2ComponentInstance">
-  <name>Pub_Node_5_3_1__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_3_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_5_3_1_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_201</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_3_0_ComponentInstance">
-  <name>Sub_Node_5_3_0_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_3_0__prov1ComponentInstance">
-  <name>Sub_Node_5_3_0__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_3_0__prov2ComponentInstance">
-  <name>Sub_Node_5_3_0__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_3_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_5_3_0_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_5</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_3_1_ComponentInstance">
-  <name>Sub_Node_5_3_1_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_3_1__prov1ComponentInstance">
-  <name>Sub_Node_5_3_1__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_3_1__prov2ComponentInstance">
-  <name>Sub_Node_5_3_1__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_3_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_5_3_1_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_150</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_4_0_ComponentInstance">
-  <name>Pub_Node_5_4_0_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_4_0__prov1ComponentInstance">
-  <name>Pub_Node_5_4_0__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_4_0__prov2ComponentInstance">
-  <name>Pub_Node_5_4_0__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_4_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_5_4_0_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_242</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_4_1_ComponentInstance">
-  <name>Pub_Node_5_4_1_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_4_1__prov1ComponentInstance">
-  <name>Pub_Node_5_4_1__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_4_1__prov2ComponentInstance">
-  <name>Pub_Node_5_4_1__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_4_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_5_4_1_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_65</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_4_0_ComponentInstance">
-  <name>Sub_Node_5_4_0_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_4_0__prov1ComponentInstance">
-  <name>Sub_Node_5_4_0__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_4_0__prov2ComponentInstance">
-  <name>Sub_Node_5_4_0__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_4_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_5_4_0_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_232</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_4_1_ComponentInstance">
-  <name>Sub_Node_5_4_1_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_4_1__prov1ComponentInstance">
-  <name>Sub_Node_5_4_1__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_4_1__prov2ComponentInstance">
-  <name>Sub_Node_5_4_1__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_4_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_5_4_1_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_65</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_5_0_ComponentInstance">
-  <name>Pub_Node_5_5_0_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_5_0__prov1ComponentInstance">
-  <name>Pub_Node_5_5_0__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_5_0__prov2ComponentInstance">
-  <name>Pub_Node_5_5_0__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_5_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_5_5_0_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_21</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_5_1_ComponentInstance">
-  <name>Pub_Node_5_5_1_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_5_1__prov1ComponentInstance">
-  <name>Pub_Node_5_5_1__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_5_1__prov2ComponentInstance">
-  <name>Pub_Node_5_5_1__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_5_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_5_5_1_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_168</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_5_0_ComponentInstance">
-  <name>Sub_Node_5_5_0_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_5_0__prov1ComponentInstance">
-  <name>Sub_Node_5_5_0__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_5_0__prov2ComponentInstance">
-  <name>Sub_Node_5_5_0__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_5_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_5_5_0_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_160</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_5_1_ComponentInstance">
-  <name>Sub_Node_5_5_1_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_5_1__prov1ComponentInstance">
-  <name>Sub_Node_5_5_1__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_5_1__prov2ComponentInstance">
-  <name>Sub_Node_5_5_1__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_5_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_5_5_1_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_104</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_6_0_ComponentInstance">
-  <name>Pub_Node_5_6_0_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_6_0__prov1ComponentInstance">
-  <name>Pub_Node_5_6_0__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_6_0__prov2ComponentInstance">
-  <name>Pub_Node_5_6_0__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_6_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_5_6_0_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_146</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_6_1_ComponentInstance">
-  <name>Pub_Node_5_6_1_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_6_1__prov1ComponentInstance">
-  <name>Pub_Node_5_6_1__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_6_1__prov2ComponentInstance">
-  <name>Pub_Node_5_6_1__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_6_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_5_6_1_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_23</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_6_0_ComponentInstance">
-  <name>Sub_Node_5_6_0_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_6_0__prov1ComponentInstance">
-  <name>Sub_Node_5_6_0__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_6_0__prov2ComponentInstance">
-  <name>Sub_Node_5_6_0__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_6_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_5_6_0_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_203</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_6_1_ComponentInstance">
-  <name>Sub_Node_5_6_1_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_6_1__prov1ComponentInstance">
-  <name>Sub_Node_5_6_1__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_6_1__prov2ComponentInstance">
-  <name>Sub_Node_5_6_1__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_6_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_5_6_1_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_228</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_7_0_ComponentInstance">
-  <name>Pub_Node_5_7_0_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_7_0__prov1ComponentInstance">
-  <name>Pub_Node_5_7_0__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_7_0__prov2ComponentInstance">
-  <name>Pub_Node_5_7_0__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_7_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_5_7_0_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_207</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_7_1_ComponentInstance">
-  <name>Pub_Node_5_7_1_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_7_1__prov1ComponentInstance">
-  <name>Pub_Node_5_7_1__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_7_1__prov2ComponentInstance">
-  <name>Pub_Node_5_7_1__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_7_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_5_7_1_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_226</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_7_0_ComponentInstance">
-  <name>Sub_Node_5_7_0_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_7_0__prov1ComponentInstance">
-  <name>Sub_Node_5_7_0__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_7_0__prov2ComponentInstance">
-  <name>Sub_Node_5_7_0__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_7_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_5_7_0_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_215</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_7_1_ComponentInstance">
-  <name>Sub_Node_5_7_1_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_7_1__prov1ComponentInstance">
-  <name>Sub_Node_5_7_1__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_7_1__prov2ComponentInstance">
-  <name>Sub_Node_5_7_1__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_7_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_5_7_1_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_165</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_8_0_ComponentInstance">
-  <name>Pub_Node_5_8_0_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_8_0__prov1ComponentInstance">
-  <name>Pub_Node_5_8_0__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_8_0__prov2ComponentInstance">
-  <name>Pub_Node_5_8_0__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_8_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_5_8_0_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_144</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_8_1_ComponentInstance">
-  <name>Pub_Node_5_8_1_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_8_1__prov1ComponentInstance">
-  <name>Pub_Node_5_8_1__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_8_1__prov2ComponentInstance">
-  <name>Pub_Node_5_8_1__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_8_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_5_8_1_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_71</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_8_0_ComponentInstance">
-  <name>Sub_Node_5_8_0_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_8_0__prov1ComponentInstance">
-  <name>Sub_Node_5_8_0__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_8_0__prov2ComponentInstance">
-  <name>Sub_Node_5_8_0__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_8_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_5_8_0_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_99</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_8_1_ComponentInstance">
-  <name>Sub_Node_5_8_1_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_8_1__prov1ComponentInstance">
-  <name>Sub_Node_5_8_1__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_8_1__prov2ComponentInstance">
-  <name>Sub_Node_5_8_1__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_8_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_5_8_1_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_121</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_9_0_ComponentInstance">
-  <name>Pub_Node_5_9_0_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_9_0__prov1ComponentInstance">
-  <name>Pub_Node_5_9_0__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_9_0__prov2ComponentInstance">
-  <name>Pub_Node_5_9_0__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_9_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_5_9_0_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_110</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_9_1_ComponentInstance">
-  <name>Pub_Node_5_9_1_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_9_1__prov1ComponentInstance">
-  <name>Pub_Node_5_9_1__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_9_1__prov2ComponentInstance">
-  <name>Pub_Node_5_9_1__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_9_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_5_9_1_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_116</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_9_0_ComponentInstance">
-  <name>Sub_Node_5_9_0_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_9_0__prov1ComponentInstance">
-  <name>Sub_Node_5_9_0__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_9_0__prov2ComponentInstance">
-  <name>Sub_Node_5_9_0__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_9_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_5_9_0_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_12</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_9_1_ComponentInstance">
-  <name>Sub_Node_5_9_1_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_9_1__prov1ComponentInstance">
-  <name>Sub_Node_5_9_1__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_9_1__prov2ComponentInstance">
-  <name>Sub_Node_5_9_1__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_9_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_5_9_1_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_173</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_10_0_ComponentInstance">
-  <name>Pub_Node_5_10_0_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_10_0__prov1ComponentInstance">
-  <name>Pub_Node_5_10_0__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_10_0__prov2ComponentInstance">
-  <name>Pub_Node_5_10_0__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_10_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_5_10_0_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_80</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_10_1_ComponentInstance">
-  <name>Pub_Node_5_10_1_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_10_1__prov1ComponentInstance">
-  <name>Pub_Node_5_10_1__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_10_1__prov2ComponentInstance">
-  <name>Pub_Node_5_10_1__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_10_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_5_10_1_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_78</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_10_0_ComponentInstance">
-  <name>Sub_Node_5_10_0_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_10_0__prov1ComponentInstance">
-  <name>Sub_Node_5_10_0__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_10_0__prov2ComponentInstance">
-  <name>Sub_Node_5_10_0__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_10_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_5_10_0_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_196</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_10_1_ComponentInstance">
-  <name>Sub_Node_5_10_1_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_10_1__prov1ComponentInstance">
-  <name>Sub_Node_5_10_1__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_10_1__prov2ComponentInstance">
-  <name>Sub_Node_5_10_1__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_10_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_5_10_1_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_115</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_11_0_ComponentInstance">
-  <name>Pub_Node_5_11_0_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_11_0__prov1ComponentInstance">
-  <name>Pub_Node_5_11_0__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_11_0__prov2ComponentInstance">
-  <name>Pub_Node_5_11_0__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_11_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_5_11_0_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_196</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_11_1_ComponentInstance">
-  <name>Pub_Node_5_11_1_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_11_1__prov1ComponentInstance">
-  <name>Pub_Node_5_11_1__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_11_1__prov2ComponentInstance">
-  <name>Pub_Node_5_11_1__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_11_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_5_11_1_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_183</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_11_0_ComponentInstance">
-  <name>Sub_Node_5_11_0_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_11_0__prov1ComponentInstance">
-  <name>Sub_Node_5_11_0__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_11_0__prov2ComponentInstance">
-  <name>Sub_Node_5_11_0__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_11_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_5_11_0_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_230</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_11_1_ComponentInstance">
-  <name>Sub_Node_5_11_1_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_11_1__prov1ComponentInstance">
-  <name>Sub_Node_5_11_1__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_11_1__prov2ComponentInstance">
-  <name>Sub_Node_5_11_1__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_11_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_5_11_1_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_3</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_12_0_ComponentInstance">
-  <name>Pub_Node_5_12_0_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_12_0__prov1ComponentInstance">
-  <name>Pub_Node_5_12_0__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_12_0__prov2ComponentInstance">
-  <name>Pub_Node_5_12_0__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_12_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_5_12_0_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_201</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_12_1_ComponentInstance">
-  <name>Pub_Node_5_12_1_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_12_1__prov1ComponentInstance">
-  <name>Pub_Node_5_12_1__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_12_1__prov2ComponentInstance">
-  <name>Pub_Node_5_12_1__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_12_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_5_12_1_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_162</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_12_0_ComponentInstance">
-  <name>Sub_Node_5_12_0_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_12_0__prov1ComponentInstance">
-  <name>Sub_Node_5_12_0__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_12_0__prov2ComponentInstance">
-  <name>Sub_Node_5_12_0__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_12_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_5_12_0_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_62</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_12_1_ComponentInstance">
-  <name>Sub_Node_5_12_1_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_12_1__prov1ComponentInstance">
-  <name>Sub_Node_5_12_1__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_12_1__prov2ComponentInstance">
-  <name>Sub_Node_5_12_1__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_12_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_5_12_1_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_167</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_13_0_ComponentInstance">
-  <name>Pub_Node_5_13_0_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_13_0__prov1ComponentInstance">
-  <name>Pub_Node_5_13_0__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_13_0__prov2ComponentInstance">
-  <name>Pub_Node_5_13_0__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_13_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_5_13_0_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_56</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_13_1_ComponentInstance">
-  <name>Pub_Node_5_13_1_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_13_1__prov1ComponentInstance">
-  <name>Pub_Node_5_13_1__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_13_1__prov2ComponentInstance">
-  <name>Pub_Node_5_13_1__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_13_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_5_13_1_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_169</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_13_0_ComponentInstance">
-  <name>Sub_Node_5_13_0_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_13_0__prov1ComponentInstance">
-  <name>Sub_Node_5_13_0__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_13_0__prov2ComponentInstance">
-  <name>Sub_Node_5_13_0__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_13_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_5_13_0_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_147</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_13_1_ComponentInstance">
-  <name>Sub_Node_5_13_1_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_13_1__prov1ComponentInstance">
-  <name>Sub_Node_5_13_1__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_13_1__prov2ComponentInstance">
-  <name>Sub_Node_5_13_1__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_13_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_5_13_1_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_132</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_14_0_ComponentInstance">
-  <name>Pub_Node_5_14_0_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_14_0__prov1ComponentInstance">
-  <name>Pub_Node_5_14_0__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_14_0__prov2ComponentInstance">
-  <name>Pub_Node_5_14_0__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_14_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_5_14_0_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_124</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_14_1_ComponentInstance">
-  <name>Pub_Node_5_14_1_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_14_1__prov1ComponentInstance">
-  <name>Pub_Node_5_14_1__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_14_1__prov2ComponentInstance">
-  <name>Pub_Node_5_14_1__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_14_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_5_14_1_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_133</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_14_0_ComponentInstance">
-  <name>Sub_Node_5_14_0_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_14_0__prov1ComponentInstance">
-  <name>Sub_Node_5_14_0__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_14_0__prov2ComponentInstance">
-  <name>Sub_Node_5_14_0__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_14_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_5_14_0_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_122</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_14_1_ComponentInstance">
-  <name>Sub_Node_5_14_1_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_14_1__prov1ComponentInstance">
-  <name>Sub_Node_5_14_1__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_14_1__prov2ComponentInstance">
-  <name>Sub_Node_5_14_1__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_14_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_5_14_1_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_132</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_15_0_ComponentInstance">
-  <name>Pub_Node_5_15_0_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_15_0__prov1ComponentInstance">
-  <name>Pub_Node_5_15_0__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_15_0__prov2ComponentInstance">
-  <name>Pub_Node_5_15_0__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_15_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_5_15_0_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_137</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_15_1_ComponentInstance">
-  <name>Pub_Node_5_15_1_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_15_1__prov1ComponentInstance">
-  <name>Pub_Node_5_15_1__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_15_1__prov2ComponentInstance">
-  <name>Pub_Node_5_15_1__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_15_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_5_15_1_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_200</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_15_0_ComponentInstance">
-  <name>Sub_Node_5_15_0_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_15_0__prov1ComponentInstance">
-  <name>Sub_Node_5_15_0__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_15_0__prov2ComponentInstance">
-  <name>Sub_Node_5_15_0__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_15_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_5_15_0_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_42</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_15_1_ComponentInstance">
-  <name>Sub_Node_5_15_1_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_15_1__prov1ComponentInstance">
-  <name>Sub_Node_5_15_1__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_15_1__prov2ComponentInstance">
-  <name>Sub_Node_5_15_1__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_15_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_5_15_1_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_30</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_16_0_ComponentInstance">
-  <name>Pub_Node_5_16_0_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_16_0__prov1ComponentInstance">
-  <name>Pub_Node_5_16_0__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_16_0__prov2ComponentInstance">
-  <name>Pub_Node_5_16_0__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_16_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_5_16_0_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_202</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_16_1_ComponentInstance">
-  <name>Pub_Node_5_16_1_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_16_1__prov1ComponentInstance">
-  <name>Pub_Node_5_16_1__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_16_1__prov2ComponentInstance">
-  <name>Pub_Node_5_16_1__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_16_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_5_16_1_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_230</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_16_0_ComponentInstance">
-  <name>Sub_Node_5_16_0_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_16_0__prov1ComponentInstance">
-  <name>Sub_Node_5_16_0__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_16_0__prov2ComponentInstance">
-  <name>Sub_Node_5_16_0__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_16_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_5_16_0_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_147</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_16_1_ComponentInstance">
-  <name>Sub_Node_5_16_1_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_16_1__prov1ComponentInstance">
-  <name>Sub_Node_5_16_1__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_16_1__prov2ComponentInstance">
-  <name>Sub_Node_5_16_1__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_16_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_5_16_1_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_107</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_17_0_ComponentInstance">
-  <name>Pub_Node_5_17_0_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_17_0__prov1ComponentInstance">
-  <name>Pub_Node_5_17_0__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_17_0__prov2ComponentInstance">
-  <name>Pub_Node_5_17_0__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_17_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_5_17_0_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_32</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_17_1_ComponentInstance">
-  <name>Pub_Node_5_17_1_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_17_1__prov1ComponentInstance">
-  <name>Pub_Node_5_17_1__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_17_1__prov2ComponentInstance">
-  <name>Pub_Node_5_17_1__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_17_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_5_17_1_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_233</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_17_0_ComponentInstance">
-  <name>Sub_Node_5_17_0_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_17_0__prov1ComponentInstance">
-  <name>Sub_Node_5_17_0__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_17_0__prov2ComponentInstance">
-  <name>Sub_Node_5_17_0__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_17_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_5_17_0_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_53</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_17_1_ComponentInstance">
-  <name>Sub_Node_5_17_1_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_17_1__prov1ComponentInstance">
-  <name>Sub_Node_5_17_1__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_17_1__prov2ComponentInstance">
-  <name>Sub_Node_5_17_1__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_17_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_5_17_1_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_24</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_18_0_ComponentInstance">
-  <name>Pub_Node_5_18_0_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_18_0__prov1ComponentInstance">
-  <name>Pub_Node_5_18_0__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_18_0__prov2ComponentInstance">
-  <name>Pub_Node_5_18_0__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_18_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_5_18_0_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_138</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_18_1_ComponentInstance">
-  <name>Pub_Node_5_18_1_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_18_1__prov1ComponentInstance">
-  <name>Pub_Node_5_18_1__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_18_1__prov2ComponentInstance">
-  <name>Pub_Node_5_18_1__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_18_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_5_18_1_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_118</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_18_0_ComponentInstance">
-  <name>Sub_Node_5_18_0_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_18_0__prov1ComponentInstance">
-  <name>Sub_Node_5_18_0__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_18_0__prov2ComponentInstance">
-  <name>Sub_Node_5_18_0__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_18_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_5_18_0_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_155</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_18_1_ComponentInstance">
-  <name>Sub_Node_5_18_1_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_18_1__prov1ComponentInstance">
-  <name>Sub_Node_5_18_1__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_18_1__prov2ComponentInstance">
-  <name>Sub_Node_5_18_1__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_18_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_5_18_1_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_230</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_19_0_ComponentInstance">
-  <name>Pub_Node_5_19_0_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_19_0__prov1ComponentInstance">
-  <name>Pub_Node_5_19_0__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_19_0__prov2ComponentInstance">
-  <name>Pub_Node_5_19_0__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_19_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_5_19_0_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_75</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_19_1_ComponentInstance">
-  <name>Pub_Node_5_19_1_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_19_1__prov1ComponentInstance">
-  <name>Pub_Node_5_19_1__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_19_1__prov2ComponentInstance">
-  <name>Pub_Node_5_19_1__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_5_19_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_5_19_1_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_9</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_19_0_ComponentInstance">
-  <name>Sub_Node_5_19_0_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_19_0__prov1ComponentInstance">
-  <name>Sub_Node_5_19_0__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_19_0__prov2ComponentInstance">
-  <name>Sub_Node_5_19_0__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_19_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_5_19_0_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_206</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_19_1_ComponentInstance">
-  <name>Sub_Node_5_19_1_Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_19_1__prov1ComponentInstance">
-  <name>Sub_Node_5_19_1__prov1Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_19_1__prov2ComponentInstance">
-  <name>Sub_Node_5_19_1__prov2Component</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_5_19_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_5_19_1_DDSConnectorComponent</name>
-  <node>Node_5</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_125</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_0_0_ComponentInstance">
-  <name>Pub_Node_6_0_0_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_0_0__prov1ComponentInstance">
-  <name>Pub_Node_6_0_0__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_0_0__prov2ComponentInstance">
-  <name>Pub_Node_6_0_0__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_0_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_6_0_0_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_175</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_0_1_ComponentInstance">
-  <name>Pub_Node_6_0_1_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_0_1__prov1ComponentInstance">
-  <name>Pub_Node_6_0_1__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_0_1__prov2ComponentInstance">
-  <name>Pub_Node_6_0_1__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_0_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_6_0_1_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_205</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_0_0_ComponentInstance">
-  <name>Sub_Node_6_0_0_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_0_0__prov1ComponentInstance">
-  <name>Sub_Node_6_0_0__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_0_0__prov2ComponentInstance">
-  <name>Sub_Node_6_0_0__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_0_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_6_0_0_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_10</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_0_1_ComponentInstance">
-  <name>Sub_Node_6_0_1_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_0_1__prov1ComponentInstance">
-  <name>Sub_Node_6_0_1__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_0_1__prov2ComponentInstance">
-  <name>Sub_Node_6_0_1__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_0_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_6_0_1_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_57</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_1_0_ComponentInstance">
-  <name>Pub_Node_6_1_0_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_1_0__prov1ComponentInstance">
-  <name>Pub_Node_6_1_0__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_1_0__prov2ComponentInstance">
-  <name>Pub_Node_6_1_0__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_1_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_6_1_0_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_208</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_1_1_ComponentInstance">
-  <name>Pub_Node_6_1_1_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_1_1__prov1ComponentInstance">
-  <name>Pub_Node_6_1_1__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_1_1__prov2ComponentInstance">
-  <name>Pub_Node_6_1_1__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_1_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_6_1_1_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_172</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_1_0_ComponentInstance">
-  <name>Sub_Node_6_1_0_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_1_0__prov1ComponentInstance">
-  <name>Sub_Node_6_1_0__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_1_0__prov2ComponentInstance">
-  <name>Sub_Node_6_1_0__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_1_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_6_1_0_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_216</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_1_1_ComponentInstance">
-  <name>Sub_Node_6_1_1_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_1_1__prov1ComponentInstance">
-  <name>Sub_Node_6_1_1__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_1_1__prov2ComponentInstance">
-  <name>Sub_Node_6_1_1__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_1_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_6_1_1_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_197</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_2_0_ComponentInstance">
-  <name>Pub_Node_6_2_0_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_2_0__prov1ComponentInstance">
-  <name>Pub_Node_6_2_0__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_2_0__prov2ComponentInstance">
-  <name>Pub_Node_6_2_0__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_2_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_6_2_0_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_244</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_2_1_ComponentInstance">
-  <name>Pub_Node_6_2_1_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_2_1__prov1ComponentInstance">
-  <name>Pub_Node_6_2_1__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_2_1__prov2ComponentInstance">
-  <name>Pub_Node_6_2_1__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_2_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_6_2_1_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_216</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_2_0_ComponentInstance">
-  <name>Sub_Node_6_2_0_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_2_0__prov1ComponentInstance">
-  <name>Sub_Node_6_2_0__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_2_0__prov2ComponentInstance">
-  <name>Sub_Node_6_2_0__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_2_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_6_2_0_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_90</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_2_1_ComponentInstance">
-  <name>Sub_Node_6_2_1_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_2_1__prov1ComponentInstance">
-  <name>Sub_Node_6_2_1__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_2_1__prov2ComponentInstance">
-  <name>Sub_Node_6_2_1__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_2_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_6_2_1_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_241</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_3_0_ComponentInstance">
-  <name>Pub_Node_6_3_0_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_3_0__prov1ComponentInstance">
-  <name>Pub_Node_6_3_0__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_3_0__prov2ComponentInstance">
-  <name>Pub_Node_6_3_0__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_3_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_6_3_0_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_73</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_3_1_ComponentInstance">
-  <name>Pub_Node_6_3_1_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_3_1__prov1ComponentInstance">
-  <name>Pub_Node_6_3_1__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_3_1__prov2ComponentInstance">
-  <name>Pub_Node_6_3_1__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_3_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_6_3_1_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_224</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_3_0_ComponentInstance">
-  <name>Sub_Node_6_3_0_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_3_0__prov1ComponentInstance">
-  <name>Sub_Node_6_3_0__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_3_0__prov2ComponentInstance">
-  <name>Sub_Node_6_3_0__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_3_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_6_3_0_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_38</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_3_1_ComponentInstance">
-  <name>Sub_Node_6_3_1_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_3_1__prov1ComponentInstance">
-  <name>Sub_Node_6_3_1__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_3_1__prov2ComponentInstance">
-  <name>Sub_Node_6_3_1__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_3_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_6_3_1_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_149</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_4_0_ComponentInstance">
-  <name>Pub_Node_6_4_0_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_4_0__prov1ComponentInstance">
-  <name>Pub_Node_6_4_0__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_4_0__prov2ComponentInstance">
-  <name>Pub_Node_6_4_0__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_4_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_6_4_0_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_192</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_4_1_ComponentInstance">
-  <name>Pub_Node_6_4_1_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_4_1__prov1ComponentInstance">
-  <name>Pub_Node_6_4_1__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_4_1__prov2ComponentInstance">
-  <name>Pub_Node_6_4_1__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_4_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_6_4_1_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_128</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_4_0_ComponentInstance">
-  <name>Sub_Node_6_4_0_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_4_0__prov1ComponentInstance">
-  <name>Sub_Node_6_4_0__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_4_0__prov2ComponentInstance">
-  <name>Sub_Node_6_4_0__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_4_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_6_4_0_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_235</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_4_1_ComponentInstance">
-  <name>Sub_Node_6_4_1_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_4_1__prov1ComponentInstance">
-  <name>Sub_Node_6_4_1__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_4_1__prov2ComponentInstance">
-  <name>Sub_Node_6_4_1__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_4_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_6_4_1_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_86</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_5_0_ComponentInstance">
-  <name>Pub_Node_6_5_0_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_5_0__prov1ComponentInstance">
-  <name>Pub_Node_6_5_0__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_5_0__prov2ComponentInstance">
-  <name>Pub_Node_6_5_0__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_5_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_6_5_0_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_183</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_5_1_ComponentInstance">
-  <name>Pub_Node_6_5_1_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_5_1__prov1ComponentInstance">
-  <name>Pub_Node_6_5_1__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_5_1__prov2ComponentInstance">
-  <name>Pub_Node_6_5_1__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_5_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_6_5_1_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_144</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_5_0_ComponentInstance">
-  <name>Sub_Node_6_5_0_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_5_0__prov1ComponentInstance">
-  <name>Sub_Node_6_5_0__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_5_0__prov2ComponentInstance">
-  <name>Sub_Node_6_5_0__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_5_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_6_5_0_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_199</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_5_1_ComponentInstance">
-  <name>Sub_Node_6_5_1_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_5_1__prov1ComponentInstance">
-  <name>Sub_Node_6_5_1__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_5_1__prov2ComponentInstance">
-  <name>Sub_Node_6_5_1__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_5_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_6_5_1_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_186</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_6_0_ComponentInstance">
-  <name>Pub_Node_6_6_0_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_6_0__prov1ComponentInstance">
-  <name>Pub_Node_6_6_0__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_6_0__prov2ComponentInstance">
-  <name>Pub_Node_6_6_0__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_6_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_6_6_0_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_24</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_6_1_ComponentInstance">
-  <name>Pub_Node_6_6_1_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_6_1__prov1ComponentInstance">
-  <name>Pub_Node_6_6_1__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_6_1__prov2ComponentInstance">
-  <name>Pub_Node_6_6_1__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_6_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_6_6_1_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_199</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_6_0_ComponentInstance">
-  <name>Sub_Node_6_6_0_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_6_0__prov1ComponentInstance">
-  <name>Sub_Node_6_6_0__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_6_0__prov2ComponentInstance">
-  <name>Sub_Node_6_6_0__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_6_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_6_6_0_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_180</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_6_1_ComponentInstance">
-  <name>Sub_Node_6_6_1_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_6_1__prov1ComponentInstance">
-  <name>Sub_Node_6_6_1__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_6_1__prov2ComponentInstance">
-  <name>Sub_Node_6_6_1__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_6_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_6_6_1_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_53</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_7_0_ComponentInstance">
-  <name>Pub_Node_6_7_0_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_7_0__prov1ComponentInstance">
-  <name>Pub_Node_6_7_0__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_7_0__prov2ComponentInstance">
-  <name>Pub_Node_6_7_0__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_7_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_6_7_0_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_224</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_7_1_ComponentInstance">
-  <name>Pub_Node_6_7_1_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_7_1__prov1ComponentInstance">
-  <name>Pub_Node_6_7_1__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_7_1__prov2ComponentInstance">
-  <name>Pub_Node_6_7_1__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_7_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_6_7_1_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_221</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_7_0_ComponentInstance">
-  <name>Sub_Node_6_7_0_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_7_0__prov1ComponentInstance">
-  <name>Sub_Node_6_7_0__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_7_0__prov2ComponentInstance">
-  <name>Sub_Node_6_7_0__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_7_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_6_7_0_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_190</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_7_1_ComponentInstance">
-  <name>Sub_Node_6_7_1_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_7_1__prov1ComponentInstance">
-  <name>Sub_Node_6_7_1__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_7_1__prov2ComponentInstance">
-  <name>Sub_Node_6_7_1__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_7_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_6_7_1_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_122</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_8_0_ComponentInstance">
-  <name>Pub_Node_6_8_0_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_8_0__prov1ComponentInstance">
-  <name>Pub_Node_6_8_0__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_8_0__prov2ComponentInstance">
-  <name>Pub_Node_6_8_0__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_8_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_6_8_0_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_78</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_8_1_ComponentInstance">
-  <name>Pub_Node_6_8_1_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_8_1__prov1ComponentInstance">
-  <name>Pub_Node_6_8_1__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_8_1__prov2ComponentInstance">
-  <name>Pub_Node_6_8_1__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_8_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_6_8_1_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_85</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_8_0_ComponentInstance">
-  <name>Sub_Node_6_8_0_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_8_0__prov1ComponentInstance">
-  <name>Sub_Node_6_8_0__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_8_0__prov2ComponentInstance">
-  <name>Sub_Node_6_8_0__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_8_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_6_8_0_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_60</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_8_1_ComponentInstance">
-  <name>Sub_Node_6_8_1_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_8_1__prov1ComponentInstance">
-  <name>Sub_Node_6_8_1__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_8_1__prov2ComponentInstance">
-  <name>Sub_Node_6_8_1__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_8_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_6_8_1_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_84</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_9_0_ComponentInstance">
-  <name>Pub_Node_6_9_0_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_9_0__prov1ComponentInstance">
-  <name>Pub_Node_6_9_0__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_9_0__prov2ComponentInstance">
-  <name>Pub_Node_6_9_0__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_9_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_6_9_0_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_166</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_9_1_ComponentInstance">
-  <name>Pub_Node_6_9_1_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_9_1__prov1ComponentInstance">
-  <name>Pub_Node_6_9_1__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_9_1__prov2ComponentInstance">
-  <name>Pub_Node_6_9_1__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_9_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_6_9_1_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_88</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_9_0_ComponentInstance">
-  <name>Sub_Node_6_9_0_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_9_0__prov1ComponentInstance">
-  <name>Sub_Node_6_9_0__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_9_0__prov2ComponentInstance">
-  <name>Sub_Node_6_9_0__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_9_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_6_9_0_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_193</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_9_1_ComponentInstance">
-  <name>Sub_Node_6_9_1_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_9_1__prov1ComponentInstance">
-  <name>Sub_Node_6_9_1__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_9_1__prov2ComponentInstance">
-  <name>Sub_Node_6_9_1__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_9_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_6_9_1_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_124</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_10_0_ComponentInstance">
-  <name>Pub_Node_6_10_0_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_10_0__prov1ComponentInstance">
-  <name>Pub_Node_6_10_0__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_10_0__prov2ComponentInstance">
-  <name>Pub_Node_6_10_0__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_10_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_6_10_0_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_108</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_10_1_ComponentInstance">
-  <name>Pub_Node_6_10_1_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_10_1__prov1ComponentInstance">
-  <name>Pub_Node_6_10_1__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_10_1__prov2ComponentInstance">
-  <name>Pub_Node_6_10_1__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_10_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_6_10_1_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_229</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_10_0_ComponentInstance">
-  <name>Sub_Node_6_10_0_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_10_0__prov1ComponentInstance">
-  <name>Sub_Node_6_10_0__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_10_0__prov2ComponentInstance">
-  <name>Sub_Node_6_10_0__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_10_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_6_10_0_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_160</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_10_1_ComponentInstance">
-  <name>Sub_Node_6_10_1_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_10_1__prov1ComponentInstance">
-  <name>Sub_Node_6_10_1__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_10_1__prov2ComponentInstance">
-  <name>Sub_Node_6_10_1__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_10_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_6_10_1_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_116</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_11_0_ComponentInstance">
-  <name>Pub_Node_6_11_0_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_11_0__prov1ComponentInstance">
-  <name>Pub_Node_6_11_0__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_11_0__prov2ComponentInstance">
-  <name>Pub_Node_6_11_0__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_11_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_6_11_0_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_135</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_11_1_ComponentInstance">
-  <name>Pub_Node_6_11_1_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_11_1__prov1ComponentInstance">
-  <name>Pub_Node_6_11_1__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_11_1__prov2ComponentInstance">
-  <name>Pub_Node_6_11_1__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_11_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_6_11_1_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_142</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_11_0_ComponentInstance">
-  <name>Sub_Node_6_11_0_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_11_0__prov1ComponentInstance">
-  <name>Sub_Node_6_11_0__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_11_0__prov2ComponentInstance">
-  <name>Sub_Node_6_11_0__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_11_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_6_11_0_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_106</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_11_1_ComponentInstance">
-  <name>Sub_Node_6_11_1_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_11_1__prov1ComponentInstance">
-  <name>Sub_Node_6_11_1__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_11_1__prov2ComponentInstance">
-  <name>Sub_Node_6_11_1__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_11_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_6_11_1_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_214</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_12_0_ComponentInstance">
-  <name>Pub_Node_6_12_0_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_12_0__prov1ComponentInstance">
-  <name>Pub_Node_6_12_0__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_12_0__prov2ComponentInstance">
-  <name>Pub_Node_6_12_0__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_12_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_6_12_0_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_175</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_12_1_ComponentInstance">
-  <name>Pub_Node_6_12_1_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_12_1__prov1ComponentInstance">
-  <name>Pub_Node_6_12_1__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_12_1__prov2ComponentInstance">
-  <name>Pub_Node_6_12_1__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_12_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_6_12_1_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_151</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_12_0_ComponentInstance">
-  <name>Sub_Node_6_12_0_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_12_0__prov1ComponentInstance">
-  <name>Sub_Node_6_12_0__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_12_0__prov2ComponentInstance">
-  <name>Sub_Node_6_12_0__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_12_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_6_12_0_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_165</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_12_1_ComponentInstance">
-  <name>Sub_Node_6_12_1_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_12_1__prov1ComponentInstance">
-  <name>Sub_Node_6_12_1__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_12_1__prov2ComponentInstance">
-  <name>Sub_Node_6_12_1__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_12_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_6_12_1_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_185</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_13_0_ComponentInstance">
-  <name>Pub_Node_6_13_0_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_13_0__prov1ComponentInstance">
-  <name>Pub_Node_6_13_0__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_13_0__prov2ComponentInstance">
-  <name>Pub_Node_6_13_0__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_13_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_6_13_0_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_52</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_13_1_ComponentInstance">
-  <name>Pub_Node_6_13_1_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_13_1__prov1ComponentInstance">
-  <name>Pub_Node_6_13_1__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_13_1__prov2ComponentInstance">
-  <name>Pub_Node_6_13_1__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_13_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_6_13_1_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_59</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_13_0_ComponentInstance">
-  <name>Sub_Node_6_13_0_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_13_0__prov1ComponentInstance">
-  <name>Sub_Node_6_13_0__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_13_0__prov2ComponentInstance">
-  <name>Sub_Node_6_13_0__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_13_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_6_13_0_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_78</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_13_1_ComponentInstance">
-  <name>Sub_Node_6_13_1_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_13_1__prov1ComponentInstance">
-  <name>Sub_Node_6_13_1__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_13_1__prov2ComponentInstance">
-  <name>Sub_Node_6_13_1__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_13_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_6_13_1_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_239</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_14_0_ComponentInstance">
-  <name>Pub_Node_6_14_0_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_14_0__prov1ComponentInstance">
-  <name>Pub_Node_6_14_0__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_14_0__prov2ComponentInstance">
-  <name>Pub_Node_6_14_0__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_14_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_6_14_0_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_225</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_14_1_ComponentInstance">
-  <name>Pub_Node_6_14_1_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_14_1__prov1ComponentInstance">
-  <name>Pub_Node_6_14_1__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_14_1__prov2ComponentInstance">
-  <name>Pub_Node_6_14_1__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_14_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_6_14_1_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_36</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_14_0_ComponentInstance">
-  <name>Sub_Node_6_14_0_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_14_0__prov1ComponentInstance">
-  <name>Sub_Node_6_14_0__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_14_0__prov2ComponentInstance">
-  <name>Sub_Node_6_14_0__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_14_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_6_14_0_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_66</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_14_1_ComponentInstance">
-  <name>Sub_Node_6_14_1_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_14_1__prov1ComponentInstance">
-  <name>Sub_Node_6_14_1__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_14_1__prov2ComponentInstance">
-  <name>Sub_Node_6_14_1__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_14_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_6_14_1_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_163</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_15_0_ComponentInstance">
-  <name>Pub_Node_6_15_0_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_15_0__prov1ComponentInstance">
-  <name>Pub_Node_6_15_0__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_15_0__prov2ComponentInstance">
-  <name>Pub_Node_6_15_0__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_15_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_6_15_0_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_124</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_15_1_ComponentInstance">
-  <name>Pub_Node_6_15_1_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_15_1__prov1ComponentInstance">
-  <name>Pub_Node_6_15_1__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_15_1__prov2ComponentInstance">
-  <name>Pub_Node_6_15_1__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_15_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_6_15_1_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_204</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_15_0_ComponentInstance">
-  <name>Sub_Node_6_15_0_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_15_0__prov1ComponentInstance">
-  <name>Sub_Node_6_15_0__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_15_0__prov2ComponentInstance">
-  <name>Sub_Node_6_15_0__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_15_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_6_15_0_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_217</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_15_1_ComponentInstance">
-  <name>Sub_Node_6_15_1_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_15_1__prov1ComponentInstance">
-  <name>Sub_Node_6_15_1__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_15_1__prov2ComponentInstance">
-  <name>Sub_Node_6_15_1__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_15_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_6_15_1_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_196</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_16_0_ComponentInstance">
-  <name>Pub_Node_6_16_0_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_16_0__prov1ComponentInstance">
-  <name>Pub_Node_6_16_0__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_16_0__prov2ComponentInstance">
-  <name>Pub_Node_6_16_0__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_16_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_6_16_0_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_155</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_16_1_ComponentInstance">
-  <name>Pub_Node_6_16_1_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_16_1__prov1ComponentInstance">
-  <name>Pub_Node_6_16_1__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_16_1__prov2ComponentInstance">
-  <name>Pub_Node_6_16_1__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_16_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_6_16_1_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_7</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_16_0_ComponentInstance">
-  <name>Sub_Node_6_16_0_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_16_0__prov1ComponentInstance">
-  <name>Sub_Node_6_16_0__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_16_0__prov2ComponentInstance">
-  <name>Sub_Node_6_16_0__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_16_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_6_16_0_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_18</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_16_1_ComponentInstance">
-  <name>Sub_Node_6_16_1_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_16_1__prov1ComponentInstance">
-  <name>Sub_Node_6_16_1__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_16_1__prov2ComponentInstance">
-  <name>Sub_Node_6_16_1__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_16_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_6_16_1_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_73</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_17_0_ComponentInstance">
-  <name>Pub_Node_6_17_0_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_17_0__prov1ComponentInstance">
-  <name>Pub_Node_6_17_0__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_17_0__prov2ComponentInstance">
-  <name>Pub_Node_6_17_0__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_17_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_6_17_0_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_151</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_17_1_ComponentInstance">
-  <name>Pub_Node_6_17_1_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_17_1__prov1ComponentInstance">
-  <name>Pub_Node_6_17_1__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_17_1__prov2ComponentInstance">
-  <name>Pub_Node_6_17_1__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_17_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_6_17_1_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_127</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_17_0_ComponentInstance">
-  <name>Sub_Node_6_17_0_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_17_0__prov1ComponentInstance">
-  <name>Sub_Node_6_17_0__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_17_0__prov2ComponentInstance">
-  <name>Sub_Node_6_17_0__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_17_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_6_17_0_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_73</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_17_1_ComponentInstance">
-  <name>Sub_Node_6_17_1_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_17_1__prov1ComponentInstance">
-  <name>Sub_Node_6_17_1__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_17_1__prov2ComponentInstance">
-  <name>Sub_Node_6_17_1__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_17_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_6_17_1_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_87</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_18_0_ComponentInstance">
-  <name>Pub_Node_6_18_0_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_18_0__prov1ComponentInstance">
-  <name>Pub_Node_6_18_0__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_18_0__prov2ComponentInstance">
-  <name>Pub_Node_6_18_0__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_18_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_6_18_0_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_203</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_18_1_ComponentInstance">
-  <name>Pub_Node_6_18_1_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_18_1__prov1ComponentInstance">
-  <name>Pub_Node_6_18_1__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_18_1__prov2ComponentInstance">
-  <name>Pub_Node_6_18_1__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_18_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_6_18_1_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_173</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_18_0_ComponentInstance">
-  <name>Sub_Node_6_18_0_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_18_0__prov1ComponentInstance">
-  <name>Sub_Node_6_18_0__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_18_0__prov2ComponentInstance">
-  <name>Sub_Node_6_18_0__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_18_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_6_18_0_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_151</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_18_1_ComponentInstance">
-  <name>Sub_Node_6_18_1_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_18_1__prov1ComponentInstance">
-  <name>Sub_Node_6_18_1__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_18_1__prov2ComponentInstance">
-  <name>Sub_Node_6_18_1__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_18_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_6_18_1_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_136</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_19_0_ComponentInstance">
-  <name>Pub_Node_6_19_0_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_19_0__prov1ComponentInstance">
-  <name>Pub_Node_6_19_0__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_19_0__prov2ComponentInstance">
-  <name>Pub_Node_6_19_0__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_19_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_6_19_0_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_92</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_19_1_ComponentInstance">
-  <name>Pub_Node_6_19_1_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_19_1__prov1ComponentInstance">
-  <name>Pub_Node_6_19_1__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_19_1__prov2ComponentInstance">
-  <name>Pub_Node_6_19_1__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_6_19_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_6_19_1_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_187</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_19_0_ComponentInstance">
-  <name>Sub_Node_6_19_0_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_19_0__prov1ComponentInstance">
-  <name>Sub_Node_6_19_0__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_19_0__prov2ComponentInstance">
-  <name>Sub_Node_6_19_0__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_19_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_6_19_0_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_164</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_19_1_ComponentInstance">
-  <name>Sub_Node_6_19_1_Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_19_1__prov1ComponentInstance">
-  <name>Sub_Node_6_19_1__prov1Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_19_1__prov2ComponentInstance">
-  <name>Sub_Node_6_19_1__prov2Component</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_6_19_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_6_19_1_DDSConnectorComponent</name>
-  <node>Node_6</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_12</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_0_0_ComponentInstance">
-  <name>Pub_Node_7_0_0_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_0_0__prov1ComponentInstance">
-  <name>Pub_Node_7_0_0__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_0_0__prov2ComponentInstance">
-  <name>Pub_Node_7_0_0__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_0_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_7_0_0_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_110</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_0_1_ComponentInstance">
-  <name>Pub_Node_7_0_1_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_0_1__prov1ComponentInstance">
-  <name>Pub_Node_7_0_1__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_0_1__prov2ComponentInstance">
-  <name>Pub_Node_7_0_1__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_0_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_7_0_1_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_229</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_0_0_ComponentInstance">
-  <name>Sub_Node_7_0_0_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_0_0__prov1ComponentInstance">
-  <name>Sub_Node_7_0_0__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_0_0__prov2ComponentInstance">
-  <name>Sub_Node_7_0_0__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_0_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_7_0_0_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_237</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_0_1_ComponentInstance">
-  <name>Sub_Node_7_0_1_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_0_1__prov1ComponentInstance">
-  <name>Sub_Node_7_0_1__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_0_1__prov2ComponentInstance">
-  <name>Sub_Node_7_0_1__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_0_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_7_0_1_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_91</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_1_0_ComponentInstance">
-  <name>Pub_Node_7_1_0_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_1_0__prov1ComponentInstance">
-  <name>Pub_Node_7_1_0__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_1_0__prov2ComponentInstance">
-  <name>Pub_Node_7_1_0__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_1_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_7_1_0_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_118</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_1_1_ComponentInstance">
-  <name>Pub_Node_7_1_1_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_1_1__prov1ComponentInstance">
-  <name>Pub_Node_7_1_1__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_1_1__prov2ComponentInstance">
-  <name>Pub_Node_7_1_1__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_1_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_7_1_1_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_24</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_1_0_ComponentInstance">
-  <name>Sub_Node_7_1_0_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_1_0__prov1ComponentInstance">
-  <name>Sub_Node_7_1_0__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_1_0__prov2ComponentInstance">
-  <name>Sub_Node_7_1_0__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_1_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_7_1_0_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_187</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_1_1_ComponentInstance">
-  <name>Sub_Node_7_1_1_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_1_1__prov1ComponentInstance">
-  <name>Sub_Node_7_1_1__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_1_1__prov2ComponentInstance">
-  <name>Sub_Node_7_1_1__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_1_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_7_1_1_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_40</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_2_0_ComponentInstance">
-  <name>Pub_Node_7_2_0_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_2_0__prov1ComponentInstance">
-  <name>Pub_Node_7_2_0__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_2_0__prov2ComponentInstance">
-  <name>Pub_Node_7_2_0__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_2_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_7_2_0_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_105</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_2_1_ComponentInstance">
-  <name>Pub_Node_7_2_1_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_2_1__prov1ComponentInstance">
-  <name>Pub_Node_7_2_1__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_2_1__prov2ComponentInstance">
-  <name>Pub_Node_7_2_1__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_2_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_7_2_1_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_160</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_2_0_ComponentInstance">
-  <name>Sub_Node_7_2_0_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_2_0__prov1ComponentInstance">
-  <name>Sub_Node_7_2_0__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_2_0__prov2ComponentInstance">
-  <name>Sub_Node_7_2_0__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_2_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_7_2_0_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_93</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_2_1_ComponentInstance">
-  <name>Sub_Node_7_2_1_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_2_1__prov1ComponentInstance">
-  <name>Sub_Node_7_2_1__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_2_1__prov2ComponentInstance">
-  <name>Sub_Node_7_2_1__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_2_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_7_2_1_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_95</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_3_0_ComponentInstance">
-  <name>Pub_Node_7_3_0_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_3_0__prov1ComponentInstance">
-  <name>Pub_Node_7_3_0__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_3_0__prov2ComponentInstance">
-  <name>Pub_Node_7_3_0__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_3_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_7_3_0_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_99</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_3_1_ComponentInstance">
-  <name>Pub_Node_7_3_1_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_3_1__prov1ComponentInstance">
-  <name>Pub_Node_7_3_1__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_3_1__prov2ComponentInstance">
-  <name>Pub_Node_7_3_1__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_3_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_7_3_1_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_197</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_3_0_ComponentInstance">
-  <name>Sub_Node_7_3_0_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_3_0__prov1ComponentInstance">
-  <name>Sub_Node_7_3_0__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_3_0__prov2ComponentInstance">
-  <name>Sub_Node_7_3_0__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_3_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_7_3_0_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_175</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_3_1_ComponentInstance">
-  <name>Sub_Node_7_3_1_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_3_1__prov1ComponentInstance">
-  <name>Sub_Node_7_3_1__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_3_1__prov2ComponentInstance">
-  <name>Sub_Node_7_3_1__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_3_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_7_3_1_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_4</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_4_0_ComponentInstance">
-  <name>Pub_Node_7_4_0_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_4_0__prov1ComponentInstance">
-  <name>Pub_Node_7_4_0__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_4_0__prov2ComponentInstance">
-  <name>Pub_Node_7_4_0__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_4_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_7_4_0_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_143</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_4_1_ComponentInstance">
-  <name>Pub_Node_7_4_1_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_4_1__prov1ComponentInstance">
-  <name>Pub_Node_7_4_1__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_4_1__prov2ComponentInstance">
-  <name>Pub_Node_7_4_1__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_4_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_7_4_1_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_205</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_4_0_ComponentInstance">
-  <name>Sub_Node_7_4_0_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_4_0__prov1ComponentInstance">
-  <name>Sub_Node_7_4_0__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_4_0__prov2ComponentInstance">
-  <name>Sub_Node_7_4_0__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_4_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_7_4_0_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_152</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_4_1_ComponentInstance">
-  <name>Sub_Node_7_4_1_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_4_1__prov1ComponentInstance">
-  <name>Sub_Node_7_4_1__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_4_1__prov2ComponentInstance">
-  <name>Sub_Node_7_4_1__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_4_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_7_4_1_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_128</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_5_0_ComponentInstance">
-  <name>Pub_Node_7_5_0_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_5_0__prov1ComponentInstance">
-  <name>Pub_Node_7_5_0__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_5_0__prov2ComponentInstance">
-  <name>Pub_Node_7_5_0__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_5_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_7_5_0_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_135</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_5_1_ComponentInstance">
-  <name>Pub_Node_7_5_1_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_5_1__prov1ComponentInstance">
-  <name>Pub_Node_7_5_1__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_5_1__prov2ComponentInstance">
-  <name>Pub_Node_7_5_1__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_5_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_7_5_1_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_173</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_5_0_ComponentInstance">
-  <name>Sub_Node_7_5_0_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_5_0__prov1ComponentInstance">
-  <name>Sub_Node_7_5_0__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_5_0__prov2ComponentInstance">
-  <name>Sub_Node_7_5_0__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_5_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_7_5_0_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_126</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_5_1_ComponentInstance">
-  <name>Sub_Node_7_5_1_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_5_1__prov1ComponentInstance">
-  <name>Sub_Node_7_5_1__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_5_1__prov2ComponentInstance">
-  <name>Sub_Node_7_5_1__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_5_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_7_5_1_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_27</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_6_0_ComponentInstance">
-  <name>Pub_Node_7_6_0_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_6_0__prov1ComponentInstance">
-  <name>Pub_Node_7_6_0__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_6_0__prov2ComponentInstance">
-  <name>Pub_Node_7_6_0__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_6_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_7_6_0_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_245</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_6_1_ComponentInstance">
-  <name>Pub_Node_7_6_1_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_6_1__prov1ComponentInstance">
-  <name>Pub_Node_7_6_1__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_6_1__prov2ComponentInstance">
-  <name>Pub_Node_7_6_1__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_6_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_7_6_1_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_118</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_6_0_ComponentInstance">
-  <name>Sub_Node_7_6_0_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_6_0__prov1ComponentInstance">
-  <name>Sub_Node_7_6_0__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_6_0__prov2ComponentInstance">
-  <name>Sub_Node_7_6_0__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_6_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_7_6_0_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_145</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_6_1_ComponentInstance">
-  <name>Sub_Node_7_6_1_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_6_1__prov1ComponentInstance">
-  <name>Sub_Node_7_6_1__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_6_1__prov2ComponentInstance">
-  <name>Sub_Node_7_6_1__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_6_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_7_6_1_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_101</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_7_0_ComponentInstance">
-  <name>Pub_Node_7_7_0_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_7_0__prov1ComponentInstance">
-  <name>Pub_Node_7_7_0__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_7_0__prov2ComponentInstance">
-  <name>Pub_Node_7_7_0__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_7_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_7_7_0_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_143</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_7_1_ComponentInstance">
-  <name>Pub_Node_7_7_1_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_7_1__prov1ComponentInstance">
-  <name>Pub_Node_7_7_1__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_7_1__prov2ComponentInstance">
-  <name>Pub_Node_7_7_1__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_7_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_7_7_1_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_148</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_7_0_ComponentInstance">
-  <name>Sub_Node_7_7_0_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_7_0__prov1ComponentInstance">
-  <name>Sub_Node_7_7_0__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_7_0__prov2ComponentInstance">
-  <name>Sub_Node_7_7_0__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_7_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_7_7_0_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_22</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_7_1_ComponentInstance">
-  <name>Sub_Node_7_7_1_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_7_1__prov1ComponentInstance">
-  <name>Sub_Node_7_7_1__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_7_1__prov2ComponentInstance">
-  <name>Sub_Node_7_7_1__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_7_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_7_7_1_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_131</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_8_0_ComponentInstance">
-  <name>Pub_Node_7_8_0_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_8_0__prov1ComponentInstance">
-  <name>Pub_Node_7_8_0__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_8_0__prov2ComponentInstance">
-  <name>Pub_Node_7_8_0__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_8_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_7_8_0_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_245</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_8_1_ComponentInstance">
-  <name>Pub_Node_7_8_1_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_8_1__prov1ComponentInstance">
-  <name>Pub_Node_7_8_1__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_8_1__prov2ComponentInstance">
-  <name>Pub_Node_7_8_1__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_8_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_7_8_1_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_206</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_8_0_ComponentInstance">
-  <name>Sub_Node_7_8_0_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_8_0__prov1ComponentInstance">
-  <name>Sub_Node_7_8_0__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_8_0__prov2ComponentInstance">
-  <name>Sub_Node_7_8_0__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_8_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_7_8_0_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_221</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_8_1_ComponentInstance">
-  <name>Sub_Node_7_8_1_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_8_1__prov1ComponentInstance">
-  <name>Sub_Node_7_8_1__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_8_1__prov2ComponentInstance">
-  <name>Sub_Node_7_8_1__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_8_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_7_8_1_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_64</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_9_0_ComponentInstance">
-  <name>Pub_Node_7_9_0_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_9_0__prov1ComponentInstance">
-  <name>Pub_Node_7_9_0__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_9_0__prov2ComponentInstance">
-  <name>Pub_Node_7_9_0__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_9_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_7_9_0_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_167</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_9_1_ComponentInstance">
-  <name>Pub_Node_7_9_1_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_9_1__prov1ComponentInstance">
-  <name>Pub_Node_7_9_1__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_9_1__prov2ComponentInstance">
-  <name>Pub_Node_7_9_1__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_9_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_7_9_1_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_117</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_9_0_ComponentInstance">
-  <name>Sub_Node_7_9_0_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_9_0__prov1ComponentInstance">
-  <name>Sub_Node_7_9_0__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_9_0__prov2ComponentInstance">
-  <name>Sub_Node_7_9_0__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_9_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_7_9_0_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_117</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_9_1_ComponentInstance">
-  <name>Sub_Node_7_9_1_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_9_1__prov1ComponentInstance">
-  <name>Sub_Node_7_9_1__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_9_1__prov2ComponentInstance">
-  <name>Sub_Node_7_9_1__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_9_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_7_9_1_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_27</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_10_0_ComponentInstance">
-  <name>Pub_Node_7_10_0_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_10_0__prov1ComponentInstance">
-  <name>Pub_Node_7_10_0__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_10_0__prov2ComponentInstance">
-  <name>Pub_Node_7_10_0__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_10_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_7_10_0_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_106</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_10_1_ComponentInstance">
-  <name>Pub_Node_7_10_1_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_10_1__prov1ComponentInstance">
-  <name>Pub_Node_7_10_1__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_10_1__prov2ComponentInstance">
-  <name>Pub_Node_7_10_1__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_10_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_7_10_1_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_112</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_10_0_ComponentInstance">
-  <name>Sub_Node_7_10_0_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_10_0__prov1ComponentInstance">
-  <name>Sub_Node_7_10_0__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_10_0__prov2ComponentInstance">
-  <name>Sub_Node_7_10_0__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_10_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_7_10_0_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_47</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_10_1_ComponentInstance">
-  <name>Sub_Node_7_10_1_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_10_1__prov1ComponentInstance">
-  <name>Sub_Node_7_10_1__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_10_1__prov2ComponentInstance">
-  <name>Sub_Node_7_10_1__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_10_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_7_10_1_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_60</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_11_0_ComponentInstance">
-  <name>Pub_Node_7_11_0_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_11_0__prov1ComponentInstance">
-  <name>Pub_Node_7_11_0__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_11_0__prov2ComponentInstance">
-  <name>Pub_Node_7_11_0__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_11_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_7_11_0_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_167</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_11_1_ComponentInstance">
-  <name>Pub_Node_7_11_1_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_11_1__prov1ComponentInstance">
-  <name>Pub_Node_7_11_1__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_11_1__prov2ComponentInstance">
-  <name>Pub_Node_7_11_1__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_11_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_7_11_1_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_224</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_11_0_ComponentInstance">
-  <name>Sub_Node_7_11_0_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_11_0__prov1ComponentInstance">
-  <name>Sub_Node_7_11_0__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_11_0__prov2ComponentInstance">
-  <name>Sub_Node_7_11_0__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_11_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_7_11_0_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_165</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_11_1_ComponentInstance">
-  <name>Sub_Node_7_11_1_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_11_1__prov1ComponentInstance">
-  <name>Sub_Node_7_11_1__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_11_1__prov2ComponentInstance">
-  <name>Sub_Node_7_11_1__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_11_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_7_11_1_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_64</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_12_0_ComponentInstance">
-  <name>Pub_Node_7_12_0_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_12_0__prov1ComponentInstance">
-  <name>Pub_Node_7_12_0__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_12_0__prov2ComponentInstance">
-  <name>Pub_Node_7_12_0__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_12_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_7_12_0_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_137</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_12_1_ComponentInstance">
-  <name>Pub_Node_7_12_1_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_12_1__prov1ComponentInstance">
-  <name>Pub_Node_7_12_1__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_12_1__prov2ComponentInstance">
-  <name>Pub_Node_7_12_1__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_12_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_7_12_1_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_209</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_12_0_ComponentInstance">
-  <name>Sub_Node_7_12_0_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_12_0__prov1ComponentInstance">
-  <name>Sub_Node_7_12_0__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_12_0__prov2ComponentInstance">
-  <name>Sub_Node_7_12_0__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_12_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_7_12_0_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_203</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_12_1_ComponentInstance">
-  <name>Sub_Node_7_12_1_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_12_1__prov1ComponentInstance">
-  <name>Sub_Node_7_12_1__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_12_1__prov2ComponentInstance">
-  <name>Sub_Node_7_12_1__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_12_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_7_12_1_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_200</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_13_0_ComponentInstance">
-  <name>Pub_Node_7_13_0_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_13_0__prov1ComponentInstance">
-  <name>Pub_Node_7_13_0__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_13_0__prov2ComponentInstance">
-  <name>Pub_Node_7_13_0__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_13_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_7_13_0_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_156</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_13_1_ComponentInstance">
-  <name>Pub_Node_7_13_1_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_13_1__prov1ComponentInstance">
-  <name>Pub_Node_7_13_1__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_13_1__prov2ComponentInstance">
-  <name>Pub_Node_7_13_1__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_13_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_7_13_1_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_10</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_13_0_ComponentInstance">
-  <name>Sub_Node_7_13_0_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_13_0__prov1ComponentInstance">
-  <name>Sub_Node_7_13_0__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_13_0__prov2ComponentInstance">
-  <name>Sub_Node_7_13_0__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_13_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_7_13_0_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_235</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_13_1_ComponentInstance">
-  <name>Sub_Node_7_13_1_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_13_1__prov1ComponentInstance">
-  <name>Sub_Node_7_13_1__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_13_1__prov2ComponentInstance">
-  <name>Sub_Node_7_13_1__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_13_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_7_13_1_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_78</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_14_0_ComponentInstance">
-  <name>Pub_Node_7_14_0_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_14_0__prov1ComponentInstance">
-  <name>Pub_Node_7_14_0__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_14_0__prov2ComponentInstance">
-  <name>Pub_Node_7_14_0__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_14_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_7_14_0_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_177</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_14_1_ComponentInstance">
-  <name>Pub_Node_7_14_1_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_14_1__prov1ComponentInstance">
-  <name>Pub_Node_7_14_1__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_14_1__prov2ComponentInstance">
-  <name>Pub_Node_7_14_1__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_14_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_7_14_1_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_115</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_14_0_ComponentInstance">
-  <name>Sub_Node_7_14_0_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_14_0__prov1ComponentInstance">
-  <name>Sub_Node_7_14_0__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_14_0__prov2ComponentInstance">
-  <name>Sub_Node_7_14_0__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_14_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_7_14_0_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_13</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_14_1_ComponentInstance">
-  <name>Sub_Node_7_14_1_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_14_1__prov1ComponentInstance">
-  <name>Sub_Node_7_14_1__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_14_1__prov2ComponentInstance">
-  <name>Sub_Node_7_14_1__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_14_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_7_14_1_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_143</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_15_0_ComponentInstance">
-  <name>Pub_Node_7_15_0_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_15_0__prov1ComponentInstance">
-  <name>Pub_Node_7_15_0__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_15_0__prov2ComponentInstance">
-  <name>Pub_Node_7_15_0__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_15_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_7_15_0_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_154</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_15_1_ComponentInstance">
-  <name>Pub_Node_7_15_1_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_15_1__prov1ComponentInstance">
-  <name>Pub_Node_7_15_1__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_15_1__prov2ComponentInstance">
-  <name>Pub_Node_7_15_1__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_15_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_7_15_1_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_142</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_15_0_ComponentInstance">
-  <name>Sub_Node_7_15_0_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_15_0__prov1ComponentInstance">
-  <name>Sub_Node_7_15_0__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_15_0__prov2ComponentInstance">
-  <name>Sub_Node_7_15_0__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_15_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_7_15_0_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_212</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_15_1_ComponentInstance">
-  <name>Sub_Node_7_15_1_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_15_1__prov1ComponentInstance">
-  <name>Sub_Node_7_15_1__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_15_1__prov2ComponentInstance">
-  <name>Sub_Node_7_15_1__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_15_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_7_15_1_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_156</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_16_0_ComponentInstance">
-  <name>Pub_Node_7_16_0_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_16_0__prov1ComponentInstance">
-  <name>Pub_Node_7_16_0__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_16_0__prov2ComponentInstance">
-  <name>Pub_Node_7_16_0__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_16_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_7_16_0_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_96</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_16_1_ComponentInstance">
-  <name>Pub_Node_7_16_1_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_16_1__prov1ComponentInstance">
-  <name>Pub_Node_7_16_1__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_16_1__prov2ComponentInstance">
-  <name>Pub_Node_7_16_1__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_16_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_7_16_1_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_26</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_16_0_ComponentInstance">
-  <name>Sub_Node_7_16_0_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_16_0__prov1ComponentInstance">
-  <name>Sub_Node_7_16_0__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_16_0__prov2ComponentInstance">
-  <name>Sub_Node_7_16_0__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_16_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_7_16_0_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_48</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_16_1_ComponentInstance">
-  <name>Sub_Node_7_16_1_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_16_1__prov1ComponentInstance">
-  <name>Sub_Node_7_16_1__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_16_1__prov2ComponentInstance">
-  <name>Sub_Node_7_16_1__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_16_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_7_16_1_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_124</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_17_0_ComponentInstance">
-  <name>Pub_Node_7_17_0_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_17_0__prov1ComponentInstance">
-  <name>Pub_Node_7_17_0__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_17_0__prov2ComponentInstance">
-  <name>Pub_Node_7_17_0__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_17_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_7_17_0_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_84</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_17_1_ComponentInstance">
-  <name>Pub_Node_7_17_1_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_17_1__prov1ComponentInstance">
-  <name>Pub_Node_7_17_1__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_17_1__prov2ComponentInstance">
-  <name>Pub_Node_7_17_1__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_17_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_7_17_1_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_99</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_17_0_ComponentInstance">
-  <name>Sub_Node_7_17_0_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_17_0__prov1ComponentInstance">
-  <name>Sub_Node_7_17_0__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_17_0__prov2ComponentInstance">
-  <name>Sub_Node_7_17_0__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_17_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_7_17_0_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_224</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_17_1_ComponentInstance">
-  <name>Sub_Node_7_17_1_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_17_1__prov1ComponentInstance">
-  <name>Sub_Node_7_17_1__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_17_1__prov2ComponentInstance">
-  <name>Sub_Node_7_17_1__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_17_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_7_17_1_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_18</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_18_0_ComponentInstance">
-  <name>Pub_Node_7_18_0_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_18_0__prov1ComponentInstance">
-  <name>Pub_Node_7_18_0__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_18_0__prov2ComponentInstance">
-  <name>Pub_Node_7_18_0__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_18_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_7_18_0_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_78</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_18_1_ComponentInstance">
-  <name>Pub_Node_7_18_1_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_18_1__prov1ComponentInstance">
-  <name>Pub_Node_7_18_1__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_18_1__prov2ComponentInstance">
-  <name>Pub_Node_7_18_1__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_18_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_7_18_1_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_63</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_18_0_ComponentInstance">
-  <name>Sub_Node_7_18_0_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_18_0__prov1ComponentInstance">
-  <name>Sub_Node_7_18_0__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_18_0__prov2ComponentInstance">
-  <name>Sub_Node_7_18_0__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_18_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_7_18_0_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_246</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_18_1_ComponentInstance">
-  <name>Sub_Node_7_18_1_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_18_1__prov1ComponentInstance">
-  <name>Sub_Node_7_18_1__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_18_1__prov2ComponentInstance">
-  <name>Sub_Node_7_18_1__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_18_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_7_18_1_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_49</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_19_0_ComponentInstance">
-  <name>Pub_Node_7_19_0_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_19_0__prov1ComponentInstance">
-  <name>Pub_Node_7_19_0__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_19_0__prov2ComponentInstance">
-  <name>Pub_Node_7_19_0__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_19_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_7_19_0_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_103</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_19_1_ComponentInstance">
-  <name>Pub_Node_7_19_1_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_19_1__prov1ComponentInstance">
-  <name>Pub_Node_7_19_1__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_19_1__prov2ComponentInstance">
-  <name>Pub_Node_7_19_1__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_7_19_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_7_19_1_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_89</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_19_0_ComponentInstance">
-  <name>Sub_Node_7_19_0_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_19_0__prov1ComponentInstance">
-  <name>Sub_Node_7_19_0__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_19_0__prov2ComponentInstance">
-  <name>Sub_Node_7_19_0__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_19_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_7_19_0_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_19</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_19_1_ComponentInstance">
-  <name>Sub_Node_7_19_1_Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_19_1__prov1ComponentInstance">
-  <name>Sub_Node_7_19_1__prov1Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_19_1__prov2ComponentInstance">
-  <name>Sub_Node_7_19_1__prov2Component</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_7_19_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_7_19_1_DDSConnectorComponent</name>
-  <node>Node_7</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_10</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_0_0_ComponentInstance">
-  <name>Pub_Node_8_0_0_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_0_0__prov1ComponentInstance">
-  <name>Pub_Node_8_0_0__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_0_0__prov2ComponentInstance">
-  <name>Pub_Node_8_0_0__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_0_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_8_0_0_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_204</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_0_1_ComponentInstance">
-  <name>Pub_Node_8_0_1_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_0_1__prov1ComponentInstance">
-  <name>Pub_Node_8_0_1__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_0_1__prov2ComponentInstance">
-  <name>Pub_Node_8_0_1__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_0_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_8_0_1_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_107</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_0_0_ComponentInstance">
-  <name>Sub_Node_8_0_0_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_0_0__prov1ComponentInstance">
-  <name>Sub_Node_8_0_0__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_0_0__prov2ComponentInstance">
-  <name>Sub_Node_8_0_0__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_0_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_8_0_0_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_65</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_0_1_ComponentInstance">
-  <name>Sub_Node_8_0_1_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_0_1__prov1ComponentInstance">
-  <name>Sub_Node_8_0_1__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_0_1__prov2ComponentInstance">
-  <name>Sub_Node_8_0_1__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_0_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_8_0_1_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_74</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_1_0_ComponentInstance">
-  <name>Pub_Node_8_1_0_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_1_0__prov1ComponentInstance">
-  <name>Pub_Node_8_1_0__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_1_0__prov2ComponentInstance">
-  <name>Pub_Node_8_1_0__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_1_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_8_1_0_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_0</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_1_1_ComponentInstance">
-  <name>Pub_Node_8_1_1_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_1_1__prov1ComponentInstance">
-  <name>Pub_Node_8_1_1__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_1_1__prov2ComponentInstance">
-  <name>Pub_Node_8_1_1__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_1_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_8_1_1_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_56</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_1_0_ComponentInstance">
-  <name>Sub_Node_8_1_0_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_1_0__prov1ComponentInstance">
-  <name>Sub_Node_8_1_0__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_1_0__prov2ComponentInstance">
-  <name>Sub_Node_8_1_0__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_1_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_8_1_0_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_212</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_1_1_ComponentInstance">
-  <name>Sub_Node_8_1_1_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_1_1__prov1ComponentInstance">
-  <name>Sub_Node_8_1_1__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_1_1__prov2ComponentInstance">
-  <name>Sub_Node_8_1_1__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_1_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_8_1_1_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_245</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_2_0_ComponentInstance">
-  <name>Pub_Node_8_2_0_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_2_0__prov1ComponentInstance">
-  <name>Pub_Node_8_2_0__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_2_0__prov2ComponentInstance">
-  <name>Pub_Node_8_2_0__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_2_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_8_2_0_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_137</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_2_1_ComponentInstance">
-  <name>Pub_Node_8_2_1_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_2_1__prov1ComponentInstance">
-  <name>Pub_Node_8_2_1__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_2_1__prov2ComponentInstance">
-  <name>Pub_Node_8_2_1__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_2_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_8_2_1_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_170</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_2_0_ComponentInstance">
-  <name>Sub_Node_8_2_0_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_2_0__prov1ComponentInstance">
-  <name>Sub_Node_8_2_0__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_2_0__prov2ComponentInstance">
-  <name>Sub_Node_8_2_0__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_2_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_8_2_0_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_211</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_2_1_ComponentInstance">
-  <name>Sub_Node_8_2_1_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_2_1__prov1ComponentInstance">
-  <name>Sub_Node_8_2_1__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_2_1__prov2ComponentInstance">
-  <name>Sub_Node_8_2_1__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_2_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_8_2_1_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_185</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_3_0_ComponentInstance">
-  <name>Pub_Node_8_3_0_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_3_0__prov1ComponentInstance">
-  <name>Pub_Node_8_3_0__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_3_0__prov2ComponentInstance">
-  <name>Pub_Node_8_3_0__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_3_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_8_3_0_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_249</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_3_1_ComponentInstance">
-  <name>Pub_Node_8_3_1_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_3_1__prov1ComponentInstance">
-  <name>Pub_Node_8_3_1__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_3_1__prov2ComponentInstance">
-  <name>Pub_Node_8_3_1__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_3_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_8_3_1_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_219</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_3_0_ComponentInstance">
-  <name>Sub_Node_8_3_0_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_3_0__prov1ComponentInstance">
-  <name>Sub_Node_8_3_0__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_3_0__prov2ComponentInstance">
-  <name>Sub_Node_8_3_0__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_3_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_8_3_0_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_31</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_3_1_ComponentInstance">
-  <name>Sub_Node_8_3_1_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_3_1__prov1ComponentInstance">
-  <name>Sub_Node_8_3_1__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_3_1__prov2ComponentInstance">
-  <name>Sub_Node_8_3_1__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_3_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_8_3_1_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_247</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_4_0_ComponentInstance">
-  <name>Pub_Node_8_4_0_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_4_0__prov1ComponentInstance">
-  <name>Pub_Node_8_4_0__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_4_0__prov2ComponentInstance">
-  <name>Pub_Node_8_4_0__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_4_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_8_4_0_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_170</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_4_1_ComponentInstance">
-  <name>Pub_Node_8_4_1_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_4_1__prov1ComponentInstance">
-  <name>Pub_Node_8_4_1__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_4_1__prov2ComponentInstance">
-  <name>Pub_Node_8_4_1__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_4_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_8_4_1_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_141</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_4_0_ComponentInstance">
-  <name>Sub_Node_8_4_0_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_4_0__prov1ComponentInstance">
-  <name>Sub_Node_8_4_0__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_4_0__prov2ComponentInstance">
-  <name>Sub_Node_8_4_0__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_4_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_8_4_0_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_148</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_4_1_ComponentInstance">
-  <name>Sub_Node_8_4_1_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_4_1__prov1ComponentInstance">
-  <name>Sub_Node_8_4_1__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_4_1__prov2ComponentInstance">
-  <name>Sub_Node_8_4_1__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_4_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_8_4_1_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_75</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_5_0_ComponentInstance">
-  <name>Pub_Node_8_5_0_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_5_0__prov1ComponentInstance">
-  <name>Pub_Node_8_5_0__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_5_0__prov2ComponentInstance">
-  <name>Pub_Node_8_5_0__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_5_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_8_5_0_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_222</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_5_1_ComponentInstance">
-  <name>Pub_Node_8_5_1_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_5_1__prov1ComponentInstance">
-  <name>Pub_Node_8_5_1__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_5_1__prov2ComponentInstance">
-  <name>Pub_Node_8_5_1__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_5_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_8_5_1_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_240</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_5_0_ComponentInstance">
-  <name>Sub_Node_8_5_0_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_5_0__prov1ComponentInstance">
-  <name>Sub_Node_8_5_0__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_5_0__prov2ComponentInstance">
-  <name>Sub_Node_8_5_0__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_5_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_8_5_0_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_173</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_5_1_ComponentInstance">
-  <name>Sub_Node_8_5_1_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_5_1__prov1ComponentInstance">
-  <name>Sub_Node_8_5_1__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_5_1__prov2ComponentInstance">
-  <name>Sub_Node_8_5_1__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_5_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_8_5_1_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_136</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_6_0_ComponentInstance">
-  <name>Pub_Node_8_6_0_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_6_0__prov1ComponentInstance">
-  <name>Pub_Node_8_6_0__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_6_0__prov2ComponentInstance">
-  <name>Pub_Node_8_6_0__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_6_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_8_6_0_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_85</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_6_1_ComponentInstance">
-  <name>Pub_Node_8_6_1_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_6_1__prov1ComponentInstance">
-  <name>Pub_Node_8_6_1__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_6_1__prov2ComponentInstance">
-  <name>Pub_Node_8_6_1__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_6_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_8_6_1_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_217</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_6_0_ComponentInstance">
-  <name>Sub_Node_8_6_0_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_6_0__prov1ComponentInstance">
-  <name>Sub_Node_8_6_0__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_6_0__prov2ComponentInstance">
-  <name>Sub_Node_8_6_0__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_6_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_8_6_0_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_16</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_6_1_ComponentInstance">
-  <name>Sub_Node_8_6_1_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_6_1__prov1ComponentInstance">
-  <name>Sub_Node_8_6_1__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_6_1__prov2ComponentInstance">
-  <name>Sub_Node_8_6_1__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_6_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_8_6_1_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_68</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_7_0_ComponentInstance">
-  <name>Pub_Node_8_7_0_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_7_0__prov1ComponentInstance">
-  <name>Pub_Node_8_7_0__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_7_0__prov2ComponentInstance">
-  <name>Pub_Node_8_7_0__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_7_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_8_7_0_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_19</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_7_1_ComponentInstance">
-  <name>Pub_Node_8_7_1_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_7_1__prov1ComponentInstance">
-  <name>Pub_Node_8_7_1__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_7_1__prov2ComponentInstance">
-  <name>Pub_Node_8_7_1__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_7_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_8_7_1_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_95</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_7_0_ComponentInstance">
-  <name>Sub_Node_8_7_0_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_7_0__prov1ComponentInstance">
-  <name>Sub_Node_8_7_0__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_7_0__prov2ComponentInstance">
-  <name>Sub_Node_8_7_0__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_7_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_8_7_0_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_75</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_7_1_ComponentInstance">
-  <name>Sub_Node_8_7_1_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_7_1__prov1ComponentInstance">
-  <name>Sub_Node_8_7_1__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_7_1__prov2ComponentInstance">
-  <name>Sub_Node_8_7_1__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_7_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_8_7_1_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_32</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_8_0_ComponentInstance">
-  <name>Pub_Node_8_8_0_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_8_0__prov1ComponentInstance">
-  <name>Pub_Node_8_8_0__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_8_0__prov2ComponentInstance">
-  <name>Pub_Node_8_8_0__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_8_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_8_8_0_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_42</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_8_1_ComponentInstance">
-  <name>Pub_Node_8_8_1_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_8_1__prov1ComponentInstance">
-  <name>Pub_Node_8_8_1__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_8_1__prov2ComponentInstance">
-  <name>Pub_Node_8_8_1__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_8_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_8_8_1_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_158</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_8_0_ComponentInstance">
-  <name>Sub_Node_8_8_0_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_8_0__prov1ComponentInstance">
-  <name>Sub_Node_8_8_0__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_8_0__prov2ComponentInstance">
-  <name>Sub_Node_8_8_0__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_8_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_8_8_0_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_148</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_8_1_ComponentInstance">
-  <name>Sub_Node_8_8_1_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_8_1__prov1ComponentInstance">
-  <name>Sub_Node_8_8_1__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_8_1__prov2ComponentInstance">
-  <name>Sub_Node_8_8_1__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_8_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_8_8_1_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_192</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_9_0_ComponentInstance">
-  <name>Pub_Node_8_9_0_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_9_0__prov1ComponentInstance">
-  <name>Pub_Node_8_9_0__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_9_0__prov2ComponentInstance">
-  <name>Pub_Node_8_9_0__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_9_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_8_9_0_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_152</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_9_1_ComponentInstance">
-  <name>Pub_Node_8_9_1_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_9_1__prov1ComponentInstance">
-  <name>Pub_Node_8_9_1__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_9_1__prov2ComponentInstance">
-  <name>Pub_Node_8_9_1__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_9_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_8_9_1_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_238</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_9_0_ComponentInstance">
-  <name>Sub_Node_8_9_0_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_9_0__prov1ComponentInstance">
-  <name>Sub_Node_8_9_0__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_9_0__prov2ComponentInstance">
-  <name>Sub_Node_8_9_0__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_9_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_8_9_0_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_180</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_9_1_ComponentInstance">
-  <name>Sub_Node_8_9_1_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_9_1__prov1ComponentInstance">
-  <name>Sub_Node_8_9_1__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_9_1__prov2ComponentInstance">
-  <name>Sub_Node_8_9_1__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_9_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_8_9_1_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_36</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_10_0_ComponentInstance">
-  <name>Pub_Node_8_10_0_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_10_0__prov1ComponentInstance">
-  <name>Pub_Node_8_10_0__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_10_0__prov2ComponentInstance">
-  <name>Pub_Node_8_10_0__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_10_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_8_10_0_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_122</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_10_1_ComponentInstance">
-  <name>Pub_Node_8_10_1_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_10_1__prov1ComponentInstance">
-  <name>Pub_Node_8_10_1__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_10_1__prov2ComponentInstance">
-  <name>Pub_Node_8_10_1__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_10_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_8_10_1_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_111</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_10_0_ComponentInstance">
-  <name>Sub_Node_8_10_0_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_10_0__prov1ComponentInstance">
-  <name>Sub_Node_8_10_0__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_10_0__prov2ComponentInstance">
-  <name>Sub_Node_8_10_0__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_10_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_8_10_0_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_15</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_10_1_ComponentInstance">
-  <name>Sub_Node_8_10_1_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_10_1__prov1ComponentInstance">
-  <name>Sub_Node_8_10_1__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_10_1__prov2ComponentInstance">
-  <name>Sub_Node_8_10_1__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_10_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_8_10_1_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_138</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_11_0_ComponentInstance">
-  <name>Pub_Node_8_11_0_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_11_0__prov1ComponentInstance">
-  <name>Pub_Node_8_11_0__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_11_0__prov2ComponentInstance">
-  <name>Pub_Node_8_11_0__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_11_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_8_11_0_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_181</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_11_1_ComponentInstance">
-  <name>Pub_Node_8_11_1_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_11_1__prov1ComponentInstance">
-  <name>Pub_Node_8_11_1__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_11_1__prov2ComponentInstance">
-  <name>Pub_Node_8_11_1__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_11_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_8_11_1_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_155</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_11_0_ComponentInstance">
-  <name>Sub_Node_8_11_0_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_11_0__prov1ComponentInstance">
-  <name>Sub_Node_8_11_0__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_11_0__prov2ComponentInstance">
-  <name>Sub_Node_8_11_0__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_11_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_8_11_0_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_179</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_11_1_ComponentInstance">
-  <name>Sub_Node_8_11_1_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_11_1__prov1ComponentInstance">
-  <name>Sub_Node_8_11_1__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_11_1__prov2ComponentInstance">
-  <name>Sub_Node_8_11_1__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_11_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_8_11_1_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_170</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_12_0_ComponentInstance">
-  <name>Pub_Node_8_12_0_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_12_0__prov1ComponentInstance">
-  <name>Pub_Node_8_12_0__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_12_0__prov2ComponentInstance">
-  <name>Pub_Node_8_12_0__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_12_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_8_12_0_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_51</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_12_1_ComponentInstance">
-  <name>Pub_Node_8_12_1_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_12_1__prov1ComponentInstance">
-  <name>Pub_Node_8_12_1__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_12_1__prov2ComponentInstance">
-  <name>Pub_Node_8_12_1__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_12_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_8_12_1_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_108</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_12_0_ComponentInstance">
-  <name>Sub_Node_8_12_0_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_12_0__prov1ComponentInstance">
-  <name>Sub_Node_8_12_0__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_12_0__prov2ComponentInstance">
-  <name>Sub_Node_8_12_0__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_12_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_8_12_0_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_234</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_12_1_ComponentInstance">
-  <name>Sub_Node_8_12_1_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_12_1__prov1ComponentInstance">
-  <name>Sub_Node_8_12_1__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_12_1__prov2ComponentInstance">
-  <name>Sub_Node_8_12_1__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_12_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_8_12_1_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_50</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_13_0_ComponentInstance">
-  <name>Pub_Node_8_13_0_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_13_0__prov1ComponentInstance">
-  <name>Pub_Node_8_13_0__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_13_0__prov2ComponentInstance">
-  <name>Pub_Node_8_13_0__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_13_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_8_13_0_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_245</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_13_1_ComponentInstance">
-  <name>Pub_Node_8_13_1_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_13_1__prov1ComponentInstance">
-  <name>Pub_Node_8_13_1__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_13_1__prov2ComponentInstance">
-  <name>Pub_Node_8_13_1__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_13_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_8_13_1_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_153</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_13_0_ComponentInstance">
-  <name>Sub_Node_8_13_0_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_13_0__prov1ComponentInstance">
-  <name>Sub_Node_8_13_0__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_13_0__prov2ComponentInstance">
-  <name>Sub_Node_8_13_0__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_13_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_8_13_0_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_44</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_13_1_ComponentInstance">
-  <name>Sub_Node_8_13_1_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_13_1__prov1ComponentInstance">
-  <name>Sub_Node_8_13_1__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_13_1__prov2ComponentInstance">
-  <name>Sub_Node_8_13_1__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_13_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_8_13_1_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_100</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_14_0_ComponentInstance">
-  <name>Pub_Node_8_14_0_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_14_0__prov1ComponentInstance">
-  <name>Pub_Node_8_14_0__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_14_0__prov2ComponentInstance">
-  <name>Pub_Node_8_14_0__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_14_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_8_14_0_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_121</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_14_1_ComponentInstance">
-  <name>Pub_Node_8_14_1_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_14_1__prov1ComponentInstance">
-  <name>Pub_Node_8_14_1__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_14_1__prov2ComponentInstance">
-  <name>Pub_Node_8_14_1__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_14_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_8_14_1_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_127</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_14_0_ComponentInstance">
-  <name>Sub_Node_8_14_0_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_14_0__prov1ComponentInstance">
-  <name>Sub_Node_8_14_0__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_14_0__prov2ComponentInstance">
-  <name>Sub_Node_8_14_0__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_14_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_8_14_0_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_49</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_14_1_ComponentInstance">
-  <name>Sub_Node_8_14_1_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_14_1__prov1ComponentInstance">
-  <name>Sub_Node_8_14_1__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_14_1__prov2ComponentInstance">
-  <name>Sub_Node_8_14_1__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_14_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_8_14_1_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_230</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_15_0_ComponentInstance">
-  <name>Pub_Node_8_15_0_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_15_0__prov1ComponentInstance">
-  <name>Pub_Node_8_15_0__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_15_0__prov2ComponentInstance">
-  <name>Pub_Node_8_15_0__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_15_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_8_15_0_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_125</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_15_1_ComponentInstance">
-  <name>Pub_Node_8_15_1_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_15_1__prov1ComponentInstance">
-  <name>Pub_Node_8_15_1__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_15_1__prov2ComponentInstance">
-  <name>Pub_Node_8_15_1__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_15_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_8_15_1_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_181</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_15_0_ComponentInstance">
-  <name>Sub_Node_8_15_0_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_15_0__prov1ComponentInstance">
-  <name>Sub_Node_8_15_0__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_15_0__prov2ComponentInstance">
-  <name>Sub_Node_8_15_0__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_15_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_8_15_0_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_60</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_15_1_ComponentInstance">
-  <name>Sub_Node_8_15_1_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_15_1__prov1ComponentInstance">
-  <name>Sub_Node_8_15_1__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_15_1__prov2ComponentInstance">
-  <name>Sub_Node_8_15_1__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_15_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_8_15_1_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_214</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_16_0_ComponentInstance">
-  <name>Pub_Node_8_16_0_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_16_0__prov1ComponentInstance">
-  <name>Pub_Node_8_16_0__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_16_0__prov2ComponentInstance">
-  <name>Pub_Node_8_16_0__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_16_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_8_16_0_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_38</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_16_1_ComponentInstance">
-  <name>Pub_Node_8_16_1_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_16_1__prov1ComponentInstance">
-  <name>Pub_Node_8_16_1__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_16_1__prov2ComponentInstance">
-  <name>Pub_Node_8_16_1__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_16_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_8_16_1_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_140</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_16_0_ComponentInstance">
-  <name>Sub_Node_8_16_0_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_16_0__prov1ComponentInstance">
-  <name>Sub_Node_8_16_0__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_16_0__prov2ComponentInstance">
-  <name>Sub_Node_8_16_0__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_16_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_8_16_0_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_89</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_16_1_ComponentInstance">
-  <name>Sub_Node_8_16_1_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_16_1__prov1ComponentInstance">
-  <name>Sub_Node_8_16_1__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_16_1__prov2ComponentInstance">
-  <name>Sub_Node_8_16_1__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_16_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_8_16_1_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_186</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_17_0_ComponentInstance">
-  <name>Pub_Node_8_17_0_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_17_0__prov1ComponentInstance">
-  <name>Pub_Node_8_17_0__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_17_0__prov2ComponentInstance">
-  <name>Pub_Node_8_17_0__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_17_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_8_17_0_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_217</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_17_1_ComponentInstance">
-  <name>Pub_Node_8_17_1_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_17_1__prov1ComponentInstance">
-  <name>Pub_Node_8_17_1__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_17_1__prov2ComponentInstance">
-  <name>Pub_Node_8_17_1__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_17_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_8_17_1_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_160</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_17_0_ComponentInstance">
-  <name>Sub_Node_8_17_0_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_17_0__prov1ComponentInstance">
-  <name>Sub_Node_8_17_0__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_17_0__prov2ComponentInstance">
-  <name>Sub_Node_8_17_0__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_17_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_8_17_0_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_82</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_17_1_ComponentInstance">
-  <name>Sub_Node_8_17_1_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_17_1__prov1ComponentInstance">
-  <name>Sub_Node_8_17_1__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_17_1__prov2ComponentInstance">
-  <name>Sub_Node_8_17_1__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_17_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_8_17_1_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_233</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_18_0_ComponentInstance">
-  <name>Pub_Node_8_18_0_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_18_0__prov1ComponentInstance">
-  <name>Pub_Node_8_18_0__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_18_0__prov2ComponentInstance">
-  <name>Pub_Node_8_18_0__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_18_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_8_18_0_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_186</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_18_1_ComponentInstance">
-  <name>Pub_Node_8_18_1_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_18_1__prov1ComponentInstance">
-  <name>Pub_Node_8_18_1__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_18_1__prov2ComponentInstance">
-  <name>Pub_Node_8_18_1__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_18_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_8_18_1_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_212</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_18_0_ComponentInstance">
-  <name>Sub_Node_8_18_0_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_18_0__prov1ComponentInstance">
-  <name>Sub_Node_8_18_0__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_18_0__prov2ComponentInstance">
-  <name>Sub_Node_8_18_0__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_18_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_8_18_0_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_248</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_18_1_ComponentInstance">
-  <name>Sub_Node_8_18_1_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_18_1__prov1ComponentInstance">
-  <name>Sub_Node_8_18_1__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_18_1__prov2ComponentInstance">
-  <name>Sub_Node_8_18_1__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_18_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_8_18_1_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_197</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_19_0_ComponentInstance">
-  <name>Pub_Node_8_19_0_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_19_0__prov1ComponentInstance">
-  <name>Pub_Node_8_19_0__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_19_0__prov2ComponentInstance">
-  <name>Pub_Node_8_19_0__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_19_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_8_19_0_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_120</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_19_1_ComponentInstance">
-  <name>Pub_Node_8_19_1_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_19_1__prov1ComponentInstance">
-  <name>Pub_Node_8_19_1__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_19_1__prov2ComponentInstance">
-  <name>Pub_Node_8_19_1__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_8_19_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_8_19_1_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_178</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_19_0_ComponentInstance">
-  <name>Sub_Node_8_19_0_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_19_0__prov1ComponentInstance">
-  <name>Sub_Node_8_19_0__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_19_0__prov2ComponentInstance">
-  <name>Sub_Node_8_19_0__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_19_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_8_19_0_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_198</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_19_1_ComponentInstance">
-  <name>Sub_Node_8_19_1_Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_19_1__prov1ComponentInstance">
-  <name>Sub_Node_8_19_1__prov1Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_19_1__prov2ComponentInstance">
-  <name>Sub_Node_8_19_1__prov2Component</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_8_19_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_8_19_1_DDSConnectorComponent</name>
-  <node>Node_8</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_76</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_0_0_ComponentInstance">
-  <name>Pub_Node_9_0_0_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_0_0__prov1ComponentInstance">
-  <name>Pub_Node_9_0_0__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_0_0__prov2ComponentInstance">
-  <name>Pub_Node_9_0_0__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_0_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_9_0_0_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_114</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_0_1_ComponentInstance">
-  <name>Pub_Node_9_0_1_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_0_1__prov1ComponentInstance">
-  <name>Pub_Node_9_0_1__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_0_1__prov2ComponentInstance">
-  <name>Pub_Node_9_0_1__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_0_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_9_0_1_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_7</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_0_0_ComponentInstance">
-  <name>Sub_Node_9_0_0_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_0_0__prov1ComponentInstance">
-  <name>Sub_Node_9_0_0__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_0_0__prov2ComponentInstance">
-  <name>Sub_Node_9_0_0__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_0_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_9_0_0_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_129</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_0_1_ComponentInstance">
-  <name>Sub_Node_9_0_1_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_0_1__prov1ComponentInstance">
-  <name>Sub_Node_9_0_1__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_0_1__prov2ComponentInstance">
-  <name>Sub_Node_9_0_1__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_0_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_9_0_1_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_59</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_1_0_ComponentInstance">
-  <name>Pub_Node_9_1_0_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_1_0__prov1ComponentInstance">
-  <name>Pub_Node_9_1_0__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_1_0__prov2ComponentInstance">
-  <name>Pub_Node_9_1_0__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_1_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_9_1_0_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_84</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_1_1_ComponentInstance">
-  <name>Pub_Node_9_1_1_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_1_1__prov1ComponentInstance">
-  <name>Pub_Node_9_1_1__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_1_1__prov2ComponentInstance">
-  <name>Pub_Node_9_1_1__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_1_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_9_1_1_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_247</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_1_0_ComponentInstance">
-  <name>Sub_Node_9_1_0_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_1_0__prov1ComponentInstance">
-  <name>Sub_Node_9_1_0__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_1_0__prov2ComponentInstance">
-  <name>Sub_Node_9_1_0__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_1_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_9_1_0_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_0</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_1_1_ComponentInstance">
-  <name>Sub_Node_9_1_1_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_1_1__prov1ComponentInstance">
-  <name>Sub_Node_9_1_1__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_1_1__prov2ComponentInstance">
-  <name>Sub_Node_9_1_1__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_1_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_9_1_1_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_179</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_2_0_ComponentInstance">
-  <name>Pub_Node_9_2_0_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_2_0__prov1ComponentInstance">
-  <name>Pub_Node_9_2_0__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_2_0__prov2ComponentInstance">
-  <name>Pub_Node_9_2_0__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_2_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_9_2_0_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_210</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_2_1_ComponentInstance">
-  <name>Pub_Node_9_2_1_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_2_1__prov1ComponentInstance">
-  <name>Pub_Node_9_2_1__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_2_1__prov2ComponentInstance">
-  <name>Pub_Node_9_2_1__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_2_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_9_2_1_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_11</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_2_0_ComponentInstance">
-  <name>Sub_Node_9_2_0_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_2_0__prov1ComponentInstance">
-  <name>Sub_Node_9_2_0__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_2_0__prov2ComponentInstance">
-  <name>Sub_Node_9_2_0__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_2_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_9_2_0_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_19</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_2_1_ComponentInstance">
-  <name>Sub_Node_9_2_1_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_2_1__prov1ComponentInstance">
-  <name>Sub_Node_9_2_1__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_2_1__prov2ComponentInstance">
-  <name>Sub_Node_9_2_1__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_2_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_9_2_1_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_72</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_3_0_ComponentInstance">
-  <name>Pub_Node_9_3_0_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_3_0__prov1ComponentInstance">
-  <name>Pub_Node_9_3_0__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_3_0__prov2ComponentInstance">
-  <name>Pub_Node_9_3_0__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_3_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_9_3_0_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_94</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_3_1_ComponentInstance">
-  <name>Pub_Node_9_3_1_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_3_1__prov1ComponentInstance">
-  <name>Pub_Node_9_3_1__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_3_1__prov2ComponentInstance">
-  <name>Pub_Node_9_3_1__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_3_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_9_3_1_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_116</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_3_0_ComponentInstance">
-  <name>Sub_Node_9_3_0_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_3_0__prov1ComponentInstance">
-  <name>Sub_Node_9_3_0__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_3_0__prov2ComponentInstance">
-  <name>Sub_Node_9_3_0__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_3_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_9_3_0_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_182</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_3_1_ComponentInstance">
-  <name>Sub_Node_9_3_1_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_3_1__prov1ComponentInstance">
-  <name>Sub_Node_9_3_1__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_3_1__prov2ComponentInstance">
-  <name>Sub_Node_9_3_1__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_3_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_9_3_1_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_138</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_4_0_ComponentInstance">
-  <name>Pub_Node_9_4_0_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_4_0__prov1ComponentInstance">
-  <name>Pub_Node_9_4_0__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_4_0__prov2ComponentInstance">
-  <name>Pub_Node_9_4_0__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_4_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_9_4_0_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_30</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_4_1_ComponentInstance">
-  <name>Pub_Node_9_4_1_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_4_1__prov1ComponentInstance">
-  <name>Pub_Node_9_4_1__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_4_1__prov2ComponentInstance">
-  <name>Pub_Node_9_4_1__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_4_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_9_4_1_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_83</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_4_0_ComponentInstance">
-  <name>Sub_Node_9_4_0_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_4_0__prov1ComponentInstance">
-  <name>Sub_Node_9_4_0__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_4_0__prov2ComponentInstance">
-  <name>Sub_Node_9_4_0__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_4_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_9_4_0_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_206</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_4_1_ComponentInstance">
-  <name>Sub_Node_9_4_1_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_4_1__prov1ComponentInstance">
-  <name>Sub_Node_9_4_1__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_4_1__prov2ComponentInstance">
-  <name>Sub_Node_9_4_1__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_4_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_9_4_1_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_110</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_5_0_ComponentInstance">
-  <name>Pub_Node_9_5_0_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_5_0__prov1ComponentInstance">
-  <name>Pub_Node_9_5_0__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_5_0__prov2ComponentInstance">
-  <name>Pub_Node_9_5_0__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_5_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_9_5_0_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_37</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_5_1_ComponentInstance">
-  <name>Pub_Node_9_5_1_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_5_1__prov1ComponentInstance">
-  <name>Pub_Node_9_5_1__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_5_1__prov2ComponentInstance">
-  <name>Pub_Node_9_5_1__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_5_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_9_5_1_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_9</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_5_0_ComponentInstance">
-  <name>Sub_Node_9_5_0_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_5_0__prov1ComponentInstance">
-  <name>Sub_Node_9_5_0__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_5_0__prov2ComponentInstance">
-  <name>Sub_Node_9_5_0__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_5_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_9_5_0_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_2</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_5_1_ComponentInstance">
-  <name>Sub_Node_9_5_1_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_5_1__prov1ComponentInstance">
-  <name>Sub_Node_9_5_1__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_5_1__prov2ComponentInstance">
-  <name>Sub_Node_9_5_1__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_5_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_9_5_1_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_50</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_6_0_ComponentInstance">
-  <name>Pub_Node_9_6_0_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_6_0__prov1ComponentInstance">
-  <name>Pub_Node_9_6_0__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_6_0__prov2ComponentInstance">
-  <name>Pub_Node_9_6_0__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_6_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_9_6_0_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_197</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_6_1_ComponentInstance">
-  <name>Pub_Node_9_6_1_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_6_1__prov1ComponentInstance">
-  <name>Pub_Node_9_6_1__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_6_1__prov2ComponentInstance">
-  <name>Pub_Node_9_6_1__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_6_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_9_6_1_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_13</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_6_0_ComponentInstance">
-  <name>Sub_Node_9_6_0_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_6_0__prov1ComponentInstance">
-  <name>Sub_Node_9_6_0__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_6_0__prov2ComponentInstance">
-  <name>Sub_Node_9_6_0__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_6_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_9_6_0_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_52</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_6_1_ComponentInstance">
-  <name>Sub_Node_9_6_1_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_6_1__prov1ComponentInstance">
-  <name>Sub_Node_9_6_1__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_6_1__prov2ComponentInstance">
-  <name>Sub_Node_9_6_1__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_6_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_9_6_1_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_191</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_7_0_ComponentInstance">
-  <name>Pub_Node_9_7_0_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_7_0__prov1ComponentInstance">
-  <name>Pub_Node_9_7_0__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_7_0__prov2ComponentInstance">
-  <name>Pub_Node_9_7_0__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_7_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_9_7_0_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_22</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_7_1_ComponentInstance">
-  <name>Pub_Node_9_7_1_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_7_1__prov1ComponentInstance">
-  <name>Pub_Node_9_7_1__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_7_1__prov2ComponentInstance">
-  <name>Pub_Node_9_7_1__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_7_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_9_7_1_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_33</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_7_0_ComponentInstance">
-  <name>Sub_Node_9_7_0_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_7_0__prov1ComponentInstance">
-  <name>Sub_Node_9_7_0__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_7_0__prov2ComponentInstance">
-  <name>Sub_Node_9_7_0__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_7_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_9_7_0_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_101</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_7_1_ComponentInstance">
-  <name>Sub_Node_9_7_1_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_7_1__prov1ComponentInstance">
-  <name>Sub_Node_9_7_1__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_7_1__prov2ComponentInstance">
-  <name>Sub_Node_9_7_1__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_7_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_9_7_1_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_205</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_8_0_ComponentInstance">
-  <name>Pub_Node_9_8_0_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_8_0__prov1ComponentInstance">
-  <name>Pub_Node_9_8_0__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_8_0__prov2ComponentInstance">
-  <name>Pub_Node_9_8_0__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_8_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_9_8_0_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_243</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_8_1_ComponentInstance">
-  <name>Pub_Node_9_8_1_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_8_1__prov1ComponentInstance">
-  <name>Pub_Node_9_8_1__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_8_1__prov2ComponentInstance">
-  <name>Pub_Node_9_8_1__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_8_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_9_8_1_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_157</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_8_0_ComponentInstance">
-  <name>Sub_Node_9_8_0_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_8_0__prov1ComponentInstance">
-  <name>Sub_Node_9_8_0__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_8_0__prov2ComponentInstance">
-  <name>Sub_Node_9_8_0__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_8_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_9_8_0_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_240</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_8_1_ComponentInstance">
-  <name>Sub_Node_9_8_1_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_8_1__prov1ComponentInstance">
-  <name>Sub_Node_9_8_1__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_8_1__prov2ComponentInstance">
-  <name>Sub_Node_9_8_1__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_8_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_9_8_1_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_60</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_9_0_ComponentInstance">
-  <name>Pub_Node_9_9_0_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_9_0__prov1ComponentInstance">
-  <name>Pub_Node_9_9_0__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_9_0__prov2ComponentInstance">
-  <name>Pub_Node_9_9_0__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_9_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_9_9_0_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_164</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_9_1_ComponentInstance">
-  <name>Pub_Node_9_9_1_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_9_1__prov1ComponentInstance">
-  <name>Pub_Node_9_9_1__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_9_1__prov2ComponentInstance">
-  <name>Pub_Node_9_9_1__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_9_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_9_9_1_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_241</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_9_0_ComponentInstance">
-  <name>Sub_Node_9_9_0_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_9_0__prov1ComponentInstance">
-  <name>Sub_Node_9_9_0__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_9_0__prov2ComponentInstance">
-  <name>Sub_Node_9_9_0__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_9_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_9_9_0_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_129</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_9_1_ComponentInstance">
-  <name>Sub_Node_9_9_1_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_9_1__prov1ComponentInstance">
-  <name>Sub_Node_9_9_1__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_9_1__prov2ComponentInstance">
-  <name>Sub_Node_9_9_1__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_9_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_9_9_1_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_31</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_10_0_ComponentInstance">
-  <name>Pub_Node_9_10_0_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_10_0__prov1ComponentInstance">
-  <name>Pub_Node_9_10_0__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_10_0__prov2ComponentInstance">
-  <name>Pub_Node_9_10_0__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_10_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_9_10_0_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_218</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_10_1_ComponentInstance">
-  <name>Pub_Node_9_10_1_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_10_1__prov1ComponentInstance">
-  <name>Pub_Node_9_10_1__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_10_1__prov2ComponentInstance">
-  <name>Pub_Node_9_10_1__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_10_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_9_10_1_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_168</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_10_0_ComponentInstance">
-  <name>Sub_Node_9_10_0_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_10_0__prov1ComponentInstance">
-  <name>Sub_Node_9_10_0__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_10_0__prov2ComponentInstance">
-  <name>Sub_Node_9_10_0__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_10_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_9_10_0_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_92</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_10_1_ComponentInstance">
-  <name>Sub_Node_9_10_1_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_10_1__prov1ComponentInstance">
-  <name>Sub_Node_9_10_1__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_10_1__prov2ComponentInstance">
-  <name>Sub_Node_9_10_1__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_10_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_9_10_1_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_20</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_11_0_ComponentInstance">
-  <name>Pub_Node_9_11_0_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_11_0__prov1ComponentInstance">
-  <name>Pub_Node_9_11_0__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_11_0__prov2ComponentInstance">
-  <name>Pub_Node_9_11_0__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_11_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_9_11_0_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_6</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_11_1_ComponentInstance">
-  <name>Pub_Node_9_11_1_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_11_1__prov1ComponentInstance">
-  <name>Pub_Node_9_11_1__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_11_1__prov2ComponentInstance">
-  <name>Pub_Node_9_11_1__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_11_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_9_11_1_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_7</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_11_0_ComponentInstance">
-  <name>Sub_Node_9_11_0_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_11_0__prov1ComponentInstance">
-  <name>Sub_Node_9_11_0__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_11_0__prov2ComponentInstance">
-  <name>Sub_Node_9_11_0__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_11_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_9_11_0_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_49</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_11_1_ComponentInstance">
-  <name>Sub_Node_9_11_1_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_11_1__prov1ComponentInstance">
-  <name>Sub_Node_9_11_1__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_11_1__prov2ComponentInstance">
-  <name>Sub_Node_9_11_1__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_11_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_9_11_1_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_186</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_12_0_ComponentInstance">
-  <name>Pub_Node_9_12_0_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_12_0__prov1ComponentInstance">
-  <name>Pub_Node_9_12_0__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_12_0__prov2ComponentInstance">
-  <name>Pub_Node_9_12_0__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_12_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_9_12_0_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_162</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_12_1_ComponentInstance">
-  <name>Pub_Node_9_12_1_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_12_1__prov1ComponentInstance">
-  <name>Pub_Node_9_12_1__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_12_1__prov2ComponentInstance">
-  <name>Pub_Node_9_12_1__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_12_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_9_12_1_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_89</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_12_0_ComponentInstance">
-  <name>Sub_Node_9_12_0_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_12_0__prov1ComponentInstance">
-  <name>Sub_Node_9_12_0__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_12_0__prov2ComponentInstance">
-  <name>Sub_Node_9_12_0__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_12_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_9_12_0_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_96</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_12_1_ComponentInstance">
-  <name>Sub_Node_9_12_1_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_12_1__prov1ComponentInstance">
-  <name>Sub_Node_9_12_1__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_12_1__prov2ComponentInstance">
-  <name>Sub_Node_9_12_1__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_12_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_9_12_1_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_47</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_13_0_ComponentInstance">
-  <name>Pub_Node_9_13_0_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_13_0__prov1ComponentInstance">
-  <name>Pub_Node_9_13_0__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_13_0__prov2ComponentInstance">
-  <name>Pub_Node_9_13_0__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_13_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_9_13_0_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_238</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_13_1_ComponentInstance">
-  <name>Pub_Node_9_13_1_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_13_1__prov1ComponentInstance">
-  <name>Pub_Node_9_13_1__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_13_1__prov2ComponentInstance">
-  <name>Pub_Node_9_13_1__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_13_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_9_13_1_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_137</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_13_0_ComponentInstance">
-  <name>Sub_Node_9_13_0_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_13_0__prov1ComponentInstance">
-  <name>Sub_Node_9_13_0__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_13_0__prov2ComponentInstance">
-  <name>Sub_Node_9_13_0__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_13_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_9_13_0_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_238</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_13_1_ComponentInstance">
-  <name>Sub_Node_9_13_1_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_13_1__prov1ComponentInstance">
-  <name>Sub_Node_9_13_1__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_13_1__prov2ComponentInstance">
-  <name>Sub_Node_9_13_1__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_13_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_9_13_1_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_8</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_14_0_ComponentInstance">
-  <name>Pub_Node_9_14_0_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_14_0__prov1ComponentInstance">
-  <name>Pub_Node_9_14_0__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_14_0__prov2ComponentInstance">
-  <name>Pub_Node_9_14_0__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_14_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_9_14_0_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_222</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_14_1_ComponentInstance">
-  <name>Pub_Node_9_14_1_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_14_1__prov1ComponentInstance">
-  <name>Pub_Node_9_14_1__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_14_1__prov2ComponentInstance">
-  <name>Pub_Node_9_14_1__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_14_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_9_14_1_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_135</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_14_0_ComponentInstance">
-  <name>Sub_Node_9_14_0_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_14_0__prov1ComponentInstance">
-  <name>Sub_Node_9_14_0__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_14_0__prov2ComponentInstance">
-  <name>Sub_Node_9_14_0__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_14_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_9_14_0_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_232</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_14_1_ComponentInstance">
-  <name>Sub_Node_9_14_1_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_14_1__prov1ComponentInstance">
-  <name>Sub_Node_9_14_1__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_14_1__prov2ComponentInstance">
-  <name>Sub_Node_9_14_1__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_14_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_9_14_1_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_202</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_15_0_ComponentInstance">
-  <name>Pub_Node_9_15_0_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_15_0__prov1ComponentInstance">
-  <name>Pub_Node_9_15_0__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_15_0__prov2ComponentInstance">
-  <name>Pub_Node_9_15_0__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_15_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_9_15_0_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_180</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_15_1_ComponentInstance">
-  <name>Pub_Node_9_15_1_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_15_1__prov1ComponentInstance">
-  <name>Pub_Node_9_15_1__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_15_1__prov2ComponentInstance">
-  <name>Pub_Node_9_15_1__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_15_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_9_15_1_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_132</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_15_0_ComponentInstance">
-  <name>Sub_Node_9_15_0_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_15_0__prov1ComponentInstance">
-  <name>Sub_Node_9_15_0__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_15_0__prov2ComponentInstance">
-  <name>Sub_Node_9_15_0__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_15_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_9_15_0_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_88</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_15_1_ComponentInstance">
-  <name>Sub_Node_9_15_1_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_15_1__prov1ComponentInstance">
-  <name>Sub_Node_9_15_1__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_15_1__prov2ComponentInstance">
-  <name>Sub_Node_9_15_1__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_15_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_9_15_1_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_213</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_16_0_ComponentInstance">
-  <name>Pub_Node_9_16_0_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_16_0__prov1ComponentInstance">
-  <name>Pub_Node_9_16_0__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_16_0__prov2ComponentInstance">
-  <name>Pub_Node_9_16_0__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_16_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_9_16_0_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_229</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_16_1_ComponentInstance">
-  <name>Pub_Node_9_16_1_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_16_1__prov1ComponentInstance">
-  <name>Pub_Node_9_16_1__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_16_1__prov2ComponentInstance">
-  <name>Pub_Node_9_16_1__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_16_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_9_16_1_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_108</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_16_0_ComponentInstance">
-  <name>Sub_Node_9_16_0_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_16_0__prov1ComponentInstance">
-  <name>Sub_Node_9_16_0__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_16_0__prov2ComponentInstance">
-  <name>Sub_Node_9_16_0__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_16_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_9_16_0_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_59</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_16_1_ComponentInstance">
-  <name>Sub_Node_9_16_1_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_16_1__prov1ComponentInstance">
-  <name>Sub_Node_9_16_1__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_16_1__prov2ComponentInstance">
-  <name>Sub_Node_9_16_1__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_16_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_9_16_1_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_174</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_17_0_ComponentInstance">
-  <name>Pub_Node_9_17_0_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_17_0__prov1ComponentInstance">
-  <name>Pub_Node_9_17_0__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_17_0__prov2ComponentInstance">
-  <name>Pub_Node_9_17_0__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_17_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_9_17_0_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_191</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_17_1_ComponentInstance">
-  <name>Pub_Node_9_17_1_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_17_1__prov1ComponentInstance">
-  <name>Pub_Node_9_17_1__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_17_1__prov2ComponentInstance">
-  <name>Pub_Node_9_17_1__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_17_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_9_17_1_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_168</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_17_0_ComponentInstance">
-  <name>Sub_Node_9_17_0_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_17_0__prov1ComponentInstance">
-  <name>Sub_Node_9_17_0__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_17_0__prov2ComponentInstance">
-  <name>Sub_Node_9_17_0__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_17_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_9_17_0_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_175</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_17_1_ComponentInstance">
-  <name>Sub_Node_9_17_1_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_17_1__prov1ComponentInstance">
-  <name>Sub_Node_9_17_1__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_17_1__prov2ComponentInstance">
-  <name>Sub_Node_9_17_1__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_17_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_9_17_1_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_49</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_18_0_ComponentInstance">
-  <name>Pub_Node_9_18_0_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_18_0__prov1ComponentInstance">
-  <name>Pub_Node_9_18_0__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_18_0__prov2ComponentInstance">
-  <name>Pub_Node_9_18_0__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_18_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_9_18_0_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_93</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_18_1_ComponentInstance">
-  <name>Pub_Node_9_18_1_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_18_1__prov1ComponentInstance">
-  <name>Pub_Node_9_18_1__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_18_1__prov2ComponentInstance">
-  <name>Pub_Node_9_18_1__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_18_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_9_18_1_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_68</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_18_0_ComponentInstance">
-  <name>Sub_Node_9_18_0_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_18_0__prov1ComponentInstance">
-  <name>Sub_Node_9_18_0__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_18_0__prov2ComponentInstance">
-  <name>Sub_Node_9_18_0__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_18_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_9_18_0_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_217</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_18_1_ComponentInstance">
-  <name>Sub_Node_9_18_1_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_18_1__prov1ComponentInstance">
-  <name>Sub_Node_9_18_1__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_18_1__prov2ComponentInstance">
-  <name>Sub_Node_9_18_1__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_18_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_9_18_1_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_140</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_19_0_ComponentInstance">
-  <name>Pub_Node_9_19_0_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_19_0__prov1ComponentInstance">
-  <name>Pub_Node_9_19_0__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_19_0__prov2ComponentInstance">
-  <name>Pub_Node_9_19_0__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_19_0_DDSConnectorComponentInstance">
-  <name>Pub_Node_9_19_0_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_18</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_19_1_ComponentInstance">
-  <name>Pub_Node_9_19_1_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_19_1__prov1ComponentInstance">
-  <name>Pub_Node_9_19_1__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_19_1__prov2ComponentInstance">
-  <name>Pub_Node_9_19_1__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Pub_Node_9_19_1_DDSConnectorComponentInstance">
-  <name>Pub_Node_9_19_1_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_120</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_19_0_ComponentInstance">
-  <name>Sub_Node_9_19_0_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_19_0__prov1ComponentInstance">
-  <name>Sub_Node_9_19_0__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_19_0__prov2ComponentInstance">
-  <name>Sub_Node_9_19_0__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_19_0_DDSConnectorComponentInstance">
-  <name>Sub_Node_9_19_0_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_65</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_19_1_ComponentInstance">
-  <name>Sub_Node_9_19_1_Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="DDS_PubComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_19_1__prov1ComponentInstance">
-  <name>Sub_Node_9_19_1__prov1Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_19_1__prov2ComponentInstance">
-  <name>Sub_Node_9_19_1__prov2Component</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Single_ServiceComponentImplementation" />
-
-
-</instance>
-
-
-<instance xmi:id="Sub_Node_9_19_1_DDSConnectorComponentInstance">
-  <name>Sub_Node_9_19_1_DDSConnectorComponent</name>
-  <node>Node_9</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Large_ConnectorComponentImplementation" />
-
-  <configProperty>
-  <name>topic_name</name>
-  <value>
-    <type>
-      <kind>tk_string</kind>
-    </type>
-    <value>
-      <string>Topic_9</string>
-    </value>
-  </value>
-</configProperty>
-
-</instance>
-
-<connection>
-  <name>Pub_Node_0_0_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_0_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_0_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_0_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_0_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_0_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_0_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_0_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_0_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_0_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_0_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_0_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_0_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_0_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_0_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_0_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_0_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_0_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_0_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_0_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_0_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_0_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_0_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_0_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_0_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_0_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_0_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_0_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_0_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_0_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_0_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_0_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_0_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_0_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_0_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_0_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_1_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_1_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_1_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_1_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_1_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_1_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_1_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_1_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_1_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_1_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_1_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_1_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_1_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_1_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_1_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_1_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_1_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_1_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_1_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_1_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_1_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_1_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_1_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_1_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_1_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_1_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_1_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_1_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_1_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_1_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_1_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_1_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_1_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_1_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_1_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_1_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_2_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_2_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_2_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_2_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_2_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_2_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_2_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_2_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_2_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_2_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_2_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_2_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_2_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_2_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_2_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_2_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_2_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_2_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_2_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_2_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_2_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_2_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_2_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_2_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_2_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_2_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_2_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_2_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_2_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_2_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_2_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_2_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_2_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_2_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_2_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_2_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_3_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_3_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_3_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_3_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_3_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_3_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_3_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_3_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_3_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_3_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_3_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_3_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_3_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_3_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_3_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_3_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_3_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_3_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_3_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_3_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_3_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_3_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_3_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_3_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_3_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_3_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_3_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_3_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_3_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_3_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_3_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_3_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_3_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_3_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_3_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_3_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_4_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_4_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_4_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_4_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_4_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_4_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_4_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_4_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_4_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_4_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_4_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_4_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_4_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_4_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_4_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_4_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_4_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_4_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_4_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_4_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_4_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_4_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_4_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_4_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_4_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_4_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_4_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_4_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_4_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_4_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_4_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_4_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_4_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_4_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_4_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_4_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_5_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_5_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_5_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_5_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_5_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_5_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_5_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_5_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_5_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_5_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_5_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_5_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_5_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_5_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_5_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_5_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_5_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_5_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_5_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_5_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_5_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_5_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_5_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_5_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_5_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_5_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_5_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_5_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_5_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_5_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_5_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_5_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_5_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_5_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_5_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_5_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_6_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_6_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_6_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_6_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_6_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_6_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_6_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_6_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_6_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_6_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_6_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_6_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_6_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_6_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_6_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_6_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_6_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_6_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_6_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_6_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_6_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_6_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_6_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_6_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_6_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_6_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_6_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_6_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_6_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_6_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_6_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_6_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_6_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_6_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_6_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_6_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_7_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_7_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_7_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_7_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_7_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_7_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_7_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_7_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_7_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_7_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_7_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_7_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_7_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_7_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_7_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_7_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_7_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_7_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_7_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_7_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_7_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_7_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_7_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_7_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_7_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_7_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_7_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_7_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_7_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_7_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_7_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_7_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_7_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_7_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_7_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_7_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_8_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_8_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_8_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_8_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_8_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_8_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_8_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_8_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_8_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_8_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_8_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_8_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_8_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_8_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_8_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_8_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_8_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_8_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_8_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_8_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_8_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_8_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_8_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_8_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_8_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_8_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_8_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_8_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_8_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_8_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_8_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_8_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_8_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_8_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_8_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_8_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_9_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_9_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_9_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_9_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_9_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_9_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_9_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_9_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_9_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_9_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_9_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_9_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_9_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_9_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_9_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_9_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_9_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_9_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_9_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_9_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_9_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_9_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_9_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_9_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_9_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_9_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_9_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_9_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_9_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_9_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_9_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_9_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_9_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_9_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_9_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_9_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_10_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_10_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_10_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_10_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_10_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_10_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_10_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_10_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_10_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_10_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_10_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_10_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_10_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_10_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_10_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_10_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_10_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_10_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_10_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_10_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_10_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_10_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_10_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_10_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_10_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_10_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_10_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_10_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_10_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_10_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_10_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_10_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_10_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_10_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_10_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_10_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_11_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_11_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_11_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_11_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_11_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_11_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_11_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_11_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_11_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_11_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_11_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_11_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_11_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_11_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_11_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_11_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_11_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_11_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_11_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_11_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_11_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_11_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_11_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_11_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_11_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_11_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_11_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_11_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_11_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_11_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_11_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_11_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_11_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_11_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_11_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_11_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_12_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_12_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_12_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_12_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_12_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_12_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_12_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_12_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_12_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_12_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_12_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_12_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_12_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_12_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_12_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_12_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_12_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_12_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_12_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_12_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_12_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_12_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_12_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_12_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_12_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_12_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_12_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_12_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_12_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_12_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_12_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_12_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_12_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_12_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_12_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_12_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_13_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_13_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_13_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_13_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_13_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_13_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_13_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_13_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_13_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_13_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_13_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_13_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_13_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_13_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_13_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_13_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_13_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_13_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_13_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_13_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_13_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_13_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_13_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_13_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_13_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_13_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_13_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_13_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_13_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_13_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_13_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_13_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_13_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_13_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_13_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_13_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_14_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_14_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_14_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_14_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_14_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_14_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_14_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_14_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_14_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_14_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_14_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_14_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_14_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_14_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_14_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_14_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_14_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_14_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_14_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_14_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_14_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_14_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_14_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_14_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_14_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_14_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_14_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_14_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_14_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_14_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_14_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_14_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_14_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_14_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_14_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_14_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_15_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_15_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_15_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_15_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_15_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_15_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_15_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_15_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_15_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_15_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_15_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_15_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_15_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_15_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_15_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_15_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_15_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_15_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_15_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_15_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_15_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_15_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_15_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_15_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_15_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_15_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_15_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_15_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_15_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_15_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_15_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_15_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_15_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_15_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_15_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_15_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_16_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_16_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_16_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_16_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_16_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_16_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_16_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_16_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_16_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_16_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_16_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_16_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_16_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_16_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_16_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_16_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_16_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_16_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_16_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_16_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_16_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_16_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_16_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_16_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_16_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_16_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_16_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_16_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_16_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_16_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_16_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_16_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_16_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_16_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_16_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_16_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_17_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_17_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_17_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_17_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_17_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_17_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_17_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_17_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_17_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_17_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_17_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_17_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_17_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_17_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_17_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_17_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_17_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_17_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_17_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_17_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_17_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_17_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_17_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_17_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_17_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_17_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_17_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_17_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_17_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_17_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_17_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_17_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_17_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_17_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_17_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_17_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_18_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_18_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_18_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_18_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_18_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_18_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_18_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_18_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_18_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_18_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_18_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_18_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_18_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_18_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_18_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_18_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_18_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_18_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_18_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_18_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_18_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_18_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_18_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_18_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_18_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_18_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_18_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_18_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_18_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_18_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_18_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_18_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_18_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_18_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_18_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_18_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_19_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_19_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_19_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_19_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_19_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_19_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_19_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_19_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_19_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_19_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_19_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_19_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_19_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_19_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_19_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_0_19_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_0_19_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_0_19_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_19_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_19_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_19_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_19_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_19_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_19_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_19_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_19_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_19_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_19_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_19_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_19_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_19_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_19_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_19_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_0_19_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_0_19_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_0_19_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_0_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_0_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_0_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_0_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_0_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_0_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_0_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_0_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_0_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_0_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_0_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_0_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_0_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_0_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_0_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_0_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_0_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_0_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_0_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_0_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_0_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_0_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_0_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_0_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_0_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_0_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_0_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_0_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_0_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_0_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_0_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_0_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_0_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_0_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_0_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_0_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_1_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_1_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_1_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_1_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_1_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_1_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_1_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_1_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_1_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_1_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_1_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_1_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_1_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_1_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_1_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_1_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_1_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_1_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_1_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_1_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_1_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_1_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_1_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_1_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_1_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_1_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_1_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_1_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_1_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_1_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_1_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_1_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_1_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_1_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_1_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_1_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_2_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_2_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_2_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_2_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_2_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_2_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_2_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_2_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_2_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_2_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_2_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_2_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_2_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_2_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_2_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_2_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_2_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_2_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_2_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_2_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_2_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_2_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_2_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_2_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_2_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_2_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_2_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_2_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_2_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_2_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_2_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_2_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_2_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_2_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_2_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_2_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_3_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_3_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_3_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_3_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_3_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_3_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_3_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_3_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_3_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_3_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_3_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_3_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_3_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_3_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_3_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_3_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_3_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_3_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_3_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_3_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_3_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_3_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_3_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_3_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_3_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_3_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_3_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_3_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_3_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_3_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_3_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_3_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_3_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_3_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_3_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_3_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_4_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_4_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_4_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_4_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_4_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_4_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_4_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_4_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_4_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_4_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_4_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_4_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_4_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_4_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_4_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_4_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_4_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_4_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_4_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_4_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_4_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_4_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_4_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_4_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_4_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_4_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_4_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_4_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_4_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_4_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_4_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_4_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_4_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_4_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_4_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_4_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_5_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_5_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_5_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_5_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_5_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_5_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_5_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_5_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_5_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_5_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_5_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_5_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_5_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_5_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_5_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_5_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_5_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_5_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_5_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_5_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_5_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_5_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_5_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_5_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_5_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_5_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_5_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_5_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_5_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_5_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_5_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_5_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_5_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_5_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_5_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_5_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_6_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_6_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_6_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_6_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_6_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_6_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_6_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_6_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_6_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_6_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_6_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_6_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_6_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_6_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_6_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_6_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_6_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_6_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_6_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_6_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_6_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_6_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_6_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_6_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_6_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_6_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_6_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_6_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_6_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_6_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_6_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_6_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_6_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_6_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_6_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_6_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_7_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_7_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_7_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_7_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_7_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_7_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_7_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_7_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_7_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_7_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_7_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_7_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_7_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_7_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_7_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_7_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_7_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_7_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_7_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_7_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_7_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_7_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_7_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_7_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_7_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_7_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_7_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_7_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_7_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_7_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_7_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_7_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_7_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_7_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_7_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_7_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_8_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_8_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_8_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_8_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_8_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_8_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_8_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_8_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_8_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_8_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_8_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_8_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_8_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_8_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_8_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_8_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_8_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_8_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_8_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_8_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_8_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_8_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_8_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_8_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_8_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_8_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_8_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_8_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_8_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_8_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_8_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_8_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_8_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_8_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_8_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_8_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_9_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_9_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_9_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_9_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_9_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_9_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_9_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_9_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_9_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_9_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_9_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_9_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_9_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_9_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_9_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_9_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_9_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_9_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_9_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_9_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_9_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_9_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_9_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_9_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_9_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_9_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_9_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_9_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_9_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_9_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_9_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_9_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_9_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_9_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_9_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_9_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_10_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_10_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_10_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_10_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_10_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_10_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_10_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_10_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_10_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_10_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_10_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_10_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_10_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_10_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_10_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_10_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_10_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_10_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_10_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_10_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_10_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_10_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_10_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_10_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_10_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_10_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_10_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_10_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_10_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_10_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_10_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_10_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_10_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_10_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_10_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_10_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_11_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_11_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_11_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_11_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_11_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_11_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_11_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_11_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_11_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_11_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_11_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_11_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_11_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_11_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_11_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_11_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_11_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_11_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_11_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_11_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_11_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_11_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_11_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_11_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_11_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_11_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_11_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_11_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_11_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_11_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_11_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_11_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_11_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_11_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_11_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_11_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_12_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_12_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_12_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_12_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_12_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_12_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_12_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_12_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_12_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_12_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_12_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_12_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_12_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_12_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_12_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_12_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_12_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_12_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_12_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_12_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_12_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_12_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_12_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_12_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_12_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_12_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_12_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_12_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_12_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_12_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_12_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_12_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_12_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_12_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_12_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_12_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_13_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_13_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_13_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_13_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_13_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_13_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_13_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_13_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_13_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_13_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_13_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_13_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_13_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_13_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_13_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_13_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_13_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_13_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_13_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_13_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_13_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_13_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_13_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_13_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_13_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_13_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_13_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_13_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_13_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_13_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_13_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_13_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_13_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_13_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_13_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_13_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_14_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_14_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_14_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_14_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_14_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_14_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_14_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_14_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_14_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_14_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_14_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_14_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_14_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_14_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_14_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_14_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_14_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_14_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_14_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_14_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_14_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_14_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_14_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_14_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_14_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_14_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_14_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_14_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_14_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_14_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_14_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_14_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_14_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_14_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_14_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_14_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_15_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_15_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_15_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_15_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_15_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_15_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_15_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_15_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_15_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_15_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_15_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_15_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_15_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_15_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_15_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_15_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_15_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_15_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_15_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_15_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_15_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_15_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_15_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_15_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_15_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_15_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_15_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_15_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_15_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_15_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_15_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_15_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_15_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_15_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_15_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_15_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_16_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_16_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_16_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_16_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_16_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_16_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_16_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_16_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_16_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_16_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_16_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_16_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_16_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_16_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_16_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_16_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_16_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_16_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_16_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_16_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_16_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_16_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_16_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_16_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_16_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_16_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_16_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_16_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_16_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_16_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_16_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_16_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_16_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_16_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_16_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_16_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_17_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_17_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_17_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_17_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_17_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_17_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_17_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_17_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_17_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_17_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_17_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_17_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_17_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_17_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_17_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_17_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_17_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_17_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_17_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_17_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_17_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_17_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_17_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_17_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_17_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_17_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_17_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_17_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_17_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_17_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_17_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_17_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_17_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_17_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_17_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_17_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_18_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_18_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_18_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_18_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_18_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_18_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_18_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_18_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_18_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_18_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_18_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_18_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_18_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_18_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_18_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_18_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_18_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_18_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_18_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_18_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_18_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_18_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_18_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_18_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_18_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_18_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_18_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_18_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_18_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_18_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_18_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_18_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_18_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_18_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_18_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_18_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_19_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_19_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_19_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_19_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_19_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_19_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_19_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_19_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_19_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_19_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_19_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_19_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_19_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_19_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_19_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_1_19_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_1_19_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_1_19_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_19_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_19_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_19_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_19_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_19_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_19_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_19_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_19_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_19_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_19_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_19_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_19_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_19_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_19_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_19_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_1_19_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_1_19_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_1_19_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_0_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_0_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_0_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_0_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_0_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_0_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_0_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_0_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_0_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_0_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_0_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_0_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_0_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_0_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_0_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_0_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_0_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_0_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_0_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_0_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_0_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_0_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_0_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_0_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_0_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_0_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_0_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_0_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_0_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_0_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_0_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_0_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_0_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_0_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_0_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_0_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_1_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_1_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_1_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_1_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_1_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_1_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_1_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_1_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_1_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_1_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_1_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_1_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_1_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_1_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_1_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_1_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_1_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_1_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_1_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_1_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_1_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_1_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_1_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_1_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_1_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_1_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_1_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_1_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_1_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_1_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_1_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_1_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_1_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_1_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_1_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_1_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_2_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_2_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_2_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_2_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_2_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_2_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_2_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_2_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_2_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_2_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_2_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_2_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_2_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_2_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_2_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_2_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_2_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_2_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_2_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_2_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_2_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_2_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_2_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_2_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_2_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_2_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_2_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_2_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_2_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_2_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_2_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_2_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_2_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_2_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_2_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_2_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_3_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_3_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_3_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_3_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_3_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_3_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_3_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_3_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_3_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_3_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_3_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_3_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_3_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_3_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_3_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_3_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_3_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_3_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_3_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_3_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_3_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_3_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_3_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_3_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_3_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_3_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_3_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_3_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_3_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_3_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_3_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_3_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_3_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_3_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_3_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_3_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_4_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_4_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_4_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_4_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_4_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_4_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_4_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_4_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_4_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_4_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_4_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_4_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_4_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_4_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_4_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_4_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_4_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_4_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_4_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_4_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_4_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_4_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_4_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_4_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_4_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_4_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_4_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_4_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_4_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_4_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_4_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_4_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_4_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_4_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_4_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_4_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_5_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_5_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_5_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_5_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_5_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_5_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_5_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_5_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_5_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_5_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_5_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_5_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_5_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_5_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_5_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_5_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_5_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_5_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_5_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_5_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_5_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_5_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_5_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_5_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_5_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_5_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_5_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_5_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_5_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_5_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_5_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_5_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_5_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_5_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_5_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_5_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_6_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_6_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_6_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_6_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_6_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_6_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_6_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_6_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_6_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_6_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_6_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_6_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_6_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_6_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_6_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_6_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_6_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_6_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_6_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_6_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_6_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_6_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_6_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_6_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_6_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_6_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_6_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_6_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_6_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_6_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_6_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_6_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_6_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_6_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_6_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_6_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_7_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_7_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_7_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_7_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_7_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_7_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_7_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_7_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_7_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_7_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_7_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_7_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_7_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_7_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_7_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_7_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_7_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_7_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_7_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_7_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_7_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_7_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_7_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_7_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_7_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_7_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_7_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_7_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_7_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_7_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_7_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_7_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_7_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_7_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_7_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_7_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_8_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_8_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_8_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_8_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_8_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_8_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_8_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_8_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_8_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_8_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_8_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_8_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_8_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_8_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_8_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_8_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_8_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_8_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_8_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_8_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_8_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_8_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_8_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_8_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_8_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_8_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_8_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_8_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_8_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_8_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_8_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_8_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_8_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_8_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_8_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_8_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_9_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_9_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_9_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_9_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_9_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_9_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_9_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_9_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_9_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_9_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_9_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_9_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_9_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_9_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_9_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_9_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_9_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_9_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_9_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_9_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_9_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_9_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_9_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_9_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_9_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_9_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_9_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_9_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_9_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_9_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_9_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_9_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_9_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_9_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_9_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_9_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_10_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_10_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_10_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_10_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_10_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_10_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_10_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_10_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_10_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_10_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_10_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_10_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_10_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_10_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_10_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_10_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_10_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_10_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_10_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_10_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_10_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_10_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_10_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_10_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_10_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_10_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_10_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_10_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_10_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_10_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_10_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_10_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_10_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_10_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_10_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_10_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_11_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_11_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_11_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_11_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_11_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_11_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_11_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_11_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_11_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_11_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_11_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_11_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_11_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_11_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_11_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_11_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_11_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_11_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_11_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_11_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_11_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_11_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_11_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_11_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_11_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_11_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_11_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_11_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_11_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_11_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_11_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_11_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_11_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_11_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_11_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_11_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_12_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_12_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_12_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_12_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_12_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_12_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_12_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_12_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_12_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_12_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_12_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_12_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_12_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_12_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_12_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_12_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_12_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_12_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_12_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_12_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_12_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_12_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_12_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_12_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_12_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_12_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_12_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_12_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_12_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_12_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_12_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_12_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_12_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_12_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_12_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_12_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_13_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_13_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_13_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_13_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_13_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_13_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_13_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_13_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_13_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_13_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_13_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_13_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_13_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_13_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_13_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_13_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_13_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_13_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_13_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_13_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_13_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_13_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_13_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_13_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_13_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_13_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_13_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_13_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_13_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_13_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_13_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_13_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_13_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_13_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_13_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_13_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_14_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_14_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_14_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_14_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_14_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_14_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_14_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_14_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_14_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_14_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_14_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_14_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_14_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_14_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_14_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_14_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_14_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_14_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_14_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_14_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_14_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_14_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_14_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_14_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_14_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_14_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_14_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_14_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_14_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_14_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_14_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_14_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_14_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_14_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_14_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_14_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_15_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_15_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_15_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_15_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_15_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_15_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_15_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_15_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_15_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_15_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_15_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_15_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_15_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_15_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_15_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_15_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_15_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_15_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_15_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_15_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_15_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_15_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_15_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_15_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_15_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_15_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_15_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_15_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_15_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_15_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_15_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_15_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_15_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_15_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_15_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_15_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_16_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_16_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_16_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_16_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_16_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_16_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_16_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_16_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_16_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_16_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_16_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_16_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_16_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_16_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_16_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_16_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_16_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_16_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_16_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_16_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_16_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_16_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_16_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_16_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_16_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_16_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_16_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_16_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_16_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_16_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_16_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_16_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_16_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_16_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_16_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_16_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_17_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_17_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_17_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_17_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_17_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_17_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_17_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_17_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_17_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_17_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_17_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_17_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_17_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_17_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_17_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_17_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_17_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_17_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_17_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_17_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_17_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_17_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_17_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_17_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_17_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_17_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_17_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_17_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_17_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_17_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_17_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_17_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_17_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_17_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_17_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_17_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_18_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_18_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_18_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_18_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_18_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_18_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_18_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_18_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_18_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_18_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_18_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_18_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_18_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_18_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_18_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_18_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_18_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_18_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_18_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_18_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_18_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_18_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_18_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_18_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_18_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_18_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_18_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_18_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_18_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_18_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_18_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_18_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_18_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_18_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_18_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_18_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_19_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_19_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_19_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_19_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_19_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_19_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_19_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_19_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_19_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_19_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_19_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_19_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_19_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_19_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_19_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_2_19_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_2_19_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_2_19_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_19_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_19_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_19_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_19_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_19_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_19_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_19_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_19_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_19_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_19_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_19_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_19_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_19_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_19_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_19_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_2_19_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_2_19_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_2_19_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_0_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_0_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_0_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_0_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_0_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_0_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_0_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_0_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_0_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_0_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_0_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_0_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_0_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_0_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_0_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_0_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_0_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_0_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_0_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_0_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_0_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_0_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_0_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_0_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_0_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_0_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_0_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_0_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_0_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_0_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_0_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_0_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_0_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_0_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_0_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_0_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_1_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_1_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_1_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_1_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_1_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_1_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_1_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_1_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_1_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_1_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_1_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_1_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_1_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_1_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_1_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_1_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_1_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_1_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_1_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_1_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_1_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_1_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_1_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_1_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_1_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_1_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_1_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_1_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_1_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_1_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_1_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_1_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_1_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_1_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_1_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_1_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_2_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_2_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_2_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_2_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_2_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_2_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_2_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_2_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_2_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_2_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_2_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_2_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_2_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_2_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_2_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_2_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_2_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_2_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_2_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_2_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_2_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_2_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_2_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_2_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_2_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_2_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_2_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_2_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_2_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_2_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_2_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_2_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_2_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_2_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_2_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_2_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_3_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_3_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_3_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_3_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_3_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_3_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_3_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_3_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_3_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_3_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_3_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_3_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_3_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_3_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_3_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_3_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_3_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_3_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_3_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_3_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_3_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_3_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_3_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_3_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_3_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_3_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_3_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_3_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_3_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_3_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_3_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_3_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_3_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_3_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_3_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_3_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_4_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_4_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_4_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_4_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_4_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_4_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_4_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_4_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_4_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_4_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_4_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_4_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_4_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_4_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_4_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_4_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_4_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_4_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_4_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_4_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_4_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_4_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_4_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_4_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_4_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_4_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_4_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_4_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_4_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_4_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_4_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_4_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_4_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_4_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_4_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_4_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_5_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_5_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_5_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_5_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_5_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_5_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_5_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_5_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_5_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_5_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_5_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_5_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_5_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_5_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_5_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_5_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_5_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_5_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_5_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_5_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_5_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_5_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_5_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_5_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_5_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_5_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_5_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_5_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_5_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_5_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_5_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_5_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_5_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_5_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_5_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_5_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_6_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_6_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_6_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_6_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_6_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_6_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_6_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_6_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_6_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_6_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_6_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_6_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_6_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_6_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_6_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_6_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_6_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_6_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_6_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_6_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_6_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_6_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_6_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_6_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_6_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_6_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_6_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_6_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_6_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_6_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_6_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_6_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_6_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_6_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_6_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_6_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_7_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_7_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_7_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_7_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_7_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_7_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_7_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_7_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_7_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_7_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_7_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_7_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_7_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_7_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_7_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_7_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_7_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_7_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_7_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_7_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_7_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_7_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_7_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_7_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_7_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_7_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_7_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_7_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_7_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_7_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_7_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_7_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_7_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_7_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_7_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_7_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_8_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_8_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_8_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_8_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_8_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_8_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_8_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_8_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_8_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_8_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_8_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_8_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_8_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_8_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_8_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_8_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_8_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_8_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_8_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_8_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_8_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_8_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_8_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_8_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_8_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_8_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_8_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_8_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_8_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_8_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_8_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_8_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_8_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_8_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_8_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_8_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_9_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_9_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_9_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_9_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_9_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_9_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_9_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_9_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_9_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_9_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_9_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_9_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_9_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_9_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_9_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_9_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_9_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_9_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_9_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_9_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_9_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_9_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_9_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_9_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_9_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_9_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_9_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_9_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_9_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_9_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_9_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_9_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_9_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_9_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_9_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_9_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_10_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_10_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_10_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_10_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_10_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_10_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_10_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_10_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_10_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_10_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_10_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_10_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_10_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_10_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_10_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_10_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_10_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_10_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_10_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_10_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_10_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_10_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_10_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_10_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_10_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_10_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_10_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_10_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_10_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_10_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_10_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_10_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_10_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_10_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_10_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_10_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_11_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_11_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_11_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_11_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_11_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_11_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_11_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_11_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_11_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_11_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_11_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_11_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_11_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_11_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_11_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_11_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_11_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_11_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_11_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_11_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_11_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_11_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_11_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_11_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_11_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_11_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_11_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_11_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_11_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_11_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_11_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_11_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_11_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_11_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_11_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_11_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_12_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_12_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_12_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_12_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_12_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_12_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_12_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_12_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_12_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_12_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_12_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_12_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_12_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_12_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_12_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_12_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_12_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_12_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_12_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_12_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_12_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_12_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_12_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_12_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_12_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_12_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_12_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_12_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_12_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_12_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_12_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_12_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_12_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_12_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_12_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_12_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_13_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_13_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_13_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_13_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_13_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_13_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_13_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_13_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_13_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_13_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_13_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_13_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_13_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_13_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_13_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_13_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_13_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_13_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_13_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_13_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_13_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_13_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_13_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_13_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_13_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_13_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_13_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_13_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_13_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_13_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_13_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_13_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_13_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_13_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_13_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_13_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_14_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_14_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_14_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_14_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_14_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_14_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_14_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_14_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_14_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_14_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_14_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_14_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_14_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_14_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_14_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_14_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_14_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_14_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_14_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_14_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_14_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_14_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_14_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_14_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_14_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_14_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_14_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_14_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_14_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_14_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_14_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_14_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_14_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_14_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_14_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_14_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_15_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_15_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_15_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_15_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_15_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_15_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_15_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_15_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_15_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_15_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_15_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_15_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_15_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_15_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_15_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_15_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_15_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_15_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_15_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_15_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_15_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_15_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_15_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_15_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_15_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_15_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_15_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_15_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_15_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_15_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_15_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_15_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_15_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_15_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_15_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_15_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_16_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_16_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_16_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_16_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_16_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_16_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_16_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_16_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_16_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_16_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_16_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_16_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_16_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_16_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_16_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_16_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_16_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_16_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_16_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_16_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_16_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_16_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_16_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_16_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_16_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_16_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_16_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_16_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_16_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_16_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_16_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_16_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_16_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_16_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_16_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_16_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_17_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_17_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_17_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_17_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_17_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_17_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_17_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_17_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_17_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_17_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_17_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_17_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_17_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_17_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_17_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_17_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_17_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_17_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_17_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_17_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_17_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_17_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_17_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_17_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_17_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_17_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_17_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_17_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_17_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_17_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_17_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_17_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_17_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_17_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_17_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_17_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_18_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_18_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_18_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_18_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_18_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_18_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_18_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_18_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_18_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_18_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_18_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_18_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_18_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_18_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_18_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_18_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_18_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_18_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_18_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_18_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_18_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_18_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_18_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_18_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_18_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_18_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_18_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_18_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_18_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_18_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_18_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_18_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_18_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_18_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_18_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_18_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_19_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_19_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_19_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_19_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_19_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_19_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_19_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_19_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_19_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_19_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_19_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_19_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_19_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_19_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_19_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_3_19_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_3_19_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_3_19_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_19_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_19_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_19_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_19_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_19_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_19_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_19_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_19_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_19_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_19_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_19_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_19_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_19_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_19_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_19_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_3_19_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_3_19_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_3_19_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_0_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_0_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_0_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_0_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_0_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_0_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_0_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_0_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_0_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_0_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_0_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_0_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_0_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_0_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_0_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_0_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_0_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_0_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_0_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_0_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_0_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_0_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_0_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_0_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_0_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_0_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_0_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_0_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_0_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_0_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_0_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_0_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_0_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_0_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_0_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_0_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_1_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_1_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_1_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_1_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_1_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_1_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_1_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_1_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_1_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_1_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_1_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_1_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_1_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_1_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_1_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_1_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_1_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_1_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_1_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_1_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_1_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_1_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_1_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_1_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_1_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_1_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_1_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_1_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_1_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_1_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_1_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_1_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_1_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_1_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_1_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_1_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_2_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_2_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_2_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_2_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_2_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_2_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_2_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_2_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_2_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_2_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_2_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_2_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_2_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_2_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_2_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_2_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_2_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_2_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_2_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_2_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_2_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_2_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_2_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_2_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_2_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_2_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_2_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_2_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_2_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_2_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_2_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_2_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_2_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_2_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_2_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_2_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_3_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_3_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_3_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_3_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_3_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_3_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_3_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_3_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_3_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_3_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_3_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_3_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_3_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_3_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_3_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_3_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_3_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_3_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_3_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_3_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_3_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_3_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_3_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_3_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_3_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_3_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_3_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_3_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_3_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_3_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_3_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_3_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_3_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_3_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_3_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_3_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_4_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_4_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_4_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_4_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_4_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_4_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_4_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_4_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_4_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_4_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_4_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_4_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_4_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_4_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_4_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_4_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_4_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_4_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_4_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_4_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_4_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_4_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_4_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_4_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_4_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_4_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_4_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_4_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_4_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_4_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_4_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_4_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_4_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_4_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_4_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_4_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_5_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_5_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_5_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_5_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_5_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_5_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_5_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_5_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_5_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_5_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_5_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_5_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_5_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_5_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_5_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_5_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_5_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_5_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_5_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_5_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_5_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_5_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_5_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_5_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_5_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_5_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_5_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_5_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_5_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_5_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_5_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_5_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_5_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_5_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_5_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_5_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_6_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_6_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_6_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_6_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_6_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_6_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_6_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_6_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_6_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_6_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_6_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_6_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_6_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_6_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_6_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_6_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_6_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_6_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_6_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_6_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_6_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_6_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_6_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_6_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_6_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_6_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_6_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_6_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_6_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_6_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_6_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_6_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_6_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_6_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_6_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_6_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_7_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_7_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_7_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_7_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_7_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_7_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_7_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_7_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_7_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_7_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_7_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_7_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_7_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_7_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_7_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_7_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_7_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_7_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_7_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_7_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_7_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_7_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_7_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_7_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_7_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_7_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_7_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_7_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_7_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_7_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_7_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_7_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_7_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_7_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_7_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_7_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_8_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_8_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_8_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_8_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_8_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_8_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_8_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_8_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_8_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_8_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_8_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_8_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_8_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_8_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_8_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_8_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_8_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_8_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_8_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_8_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_8_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_8_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_8_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_8_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_8_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_8_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_8_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_8_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_8_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_8_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_8_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_8_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_8_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_8_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_8_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_8_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_9_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_9_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_9_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_9_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_9_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_9_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_9_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_9_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_9_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_9_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_9_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_9_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_9_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_9_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_9_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_9_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_9_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_9_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_9_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_9_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_9_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_9_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_9_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_9_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_9_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_9_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_9_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_9_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_9_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_9_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_9_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_9_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_9_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_9_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_9_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_9_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_10_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_10_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_10_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_10_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_10_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_10_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_10_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_10_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_10_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_10_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_10_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_10_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_10_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_10_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_10_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_10_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_10_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_10_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_10_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_10_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_10_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_10_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_10_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_10_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_10_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_10_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_10_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_10_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_10_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_10_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_10_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_10_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_10_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_10_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_10_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_10_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_11_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_11_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_11_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_11_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_11_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_11_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_11_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_11_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_11_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_11_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_11_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_11_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_11_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_11_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_11_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_11_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_11_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_11_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_11_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_11_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_11_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_11_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_11_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_11_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_11_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_11_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_11_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_11_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_11_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_11_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_11_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_11_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_11_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_11_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_11_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_11_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_12_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_12_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_12_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_12_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_12_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_12_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_12_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_12_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_12_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_12_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_12_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_12_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_12_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_12_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_12_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_12_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_12_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_12_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_12_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_12_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_12_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_12_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_12_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_12_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_12_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_12_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_12_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_12_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_12_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_12_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_12_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_12_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_12_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_12_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_12_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_12_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_13_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_13_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_13_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_13_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_13_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_13_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_13_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_13_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_13_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_13_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_13_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_13_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_13_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_13_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_13_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_13_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_13_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_13_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_13_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_13_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_13_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_13_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_13_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_13_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_13_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_13_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_13_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_13_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_13_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_13_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_13_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_13_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_13_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_13_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_13_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_13_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_14_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_14_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_14_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_14_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_14_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_14_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_14_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_14_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_14_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_14_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_14_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_14_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_14_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_14_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_14_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_14_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_14_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_14_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_14_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_14_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_14_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_14_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_14_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_14_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_14_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_14_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_14_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_14_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_14_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_14_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_14_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_14_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_14_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_14_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_14_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_14_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_15_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_15_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_15_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_15_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_15_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_15_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_15_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_15_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_15_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_15_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_15_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_15_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_15_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_15_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_15_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_15_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_15_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_15_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_15_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_15_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_15_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_15_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_15_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_15_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_15_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_15_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_15_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_15_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_15_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_15_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_15_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_15_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_15_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_15_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_15_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_15_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_16_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_16_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_16_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_16_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_16_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_16_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_16_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_16_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_16_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_16_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_16_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_16_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_16_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_16_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_16_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_16_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_16_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_16_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_16_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_16_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_16_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_16_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_16_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_16_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_16_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_16_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_16_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_16_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_16_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_16_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_16_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_16_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_16_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_16_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_16_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_16_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_17_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_17_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_17_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_17_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_17_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_17_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_17_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_17_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_17_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_17_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_17_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_17_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_17_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_17_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_17_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_17_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_17_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_17_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_17_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_17_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_17_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_17_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_17_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_17_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_17_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_17_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_17_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_17_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_17_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_17_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_17_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_17_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_17_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_17_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_17_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_17_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_18_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_18_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_18_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_18_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_18_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_18_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_18_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_18_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_18_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_18_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_18_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_18_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_18_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_18_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_18_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_18_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_18_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_18_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_18_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_18_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_18_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_18_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_18_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_18_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_18_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_18_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_18_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_18_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_18_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_18_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_18_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_18_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_18_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_18_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_18_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_18_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_19_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_19_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_19_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_19_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_19_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_19_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_19_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_19_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_19_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_19_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_19_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_19_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_19_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_19_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_19_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_4_19_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_4_19_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_4_19_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_19_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_19_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_19_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_19_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_19_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_19_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_19_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_19_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_19_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_19_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_19_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_19_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_19_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_19_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_19_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_4_19_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_4_19_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_4_19_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_0_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_0_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_0_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_0_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_0_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_0_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_0_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_0_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_0_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_0_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_0_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_0_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_0_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_0_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_0_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_0_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_0_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_0_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_0_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_0_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_0_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_0_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_0_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_0_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_0_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_0_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_0_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_0_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_0_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_0_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_0_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_0_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_0_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_0_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_0_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_0_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_1_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_1_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_1_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_1_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_1_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_1_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_1_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_1_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_1_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_1_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_1_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_1_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_1_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_1_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_1_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_1_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_1_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_1_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_1_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_1_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_1_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_1_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_1_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_1_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_1_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_1_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_1_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_1_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_1_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_1_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_1_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_1_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_1_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_1_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_1_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_1_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_2_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_2_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_2_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_2_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_2_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_2_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_2_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_2_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_2_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_2_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_2_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_2_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_2_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_2_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_2_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_2_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_2_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_2_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_2_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_2_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_2_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_2_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_2_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_2_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_2_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_2_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_2_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_2_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_2_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_2_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_2_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_2_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_2_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_2_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_2_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_2_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_3_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_3_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_3_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_3_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_3_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_3_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_3_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_3_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_3_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_3_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_3_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_3_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_3_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_3_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_3_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_3_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_3_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_3_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_3_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_3_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_3_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_3_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_3_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_3_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_3_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_3_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_3_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_3_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_3_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_3_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_3_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_3_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_3_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_3_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_3_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_3_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_4_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_4_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_4_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_4_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_4_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_4_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_4_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_4_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_4_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_4_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_4_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_4_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_4_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_4_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_4_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_4_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_4_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_4_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_4_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_4_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_4_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_4_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_4_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_4_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_4_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_4_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_4_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_4_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_4_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_4_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_4_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_4_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_4_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_4_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_4_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_4_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_5_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_5_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_5_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_5_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_5_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_5_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_5_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_5_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_5_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_5_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_5_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_5_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_5_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_5_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_5_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_5_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_5_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_5_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_5_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_5_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_5_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_5_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_5_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_5_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_5_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_5_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_5_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_5_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_5_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_5_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_5_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_5_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_5_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_5_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_5_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_5_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_6_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_6_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_6_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_6_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_6_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_6_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_6_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_6_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_6_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_6_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_6_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_6_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_6_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_6_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_6_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_6_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_6_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_6_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_6_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_6_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_6_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_6_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_6_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_6_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_6_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_6_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_6_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_6_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_6_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_6_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_6_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_6_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_6_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_6_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_6_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_6_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_7_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_7_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_7_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_7_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_7_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_7_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_7_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_7_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_7_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_7_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_7_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_7_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_7_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_7_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_7_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_7_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_7_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_7_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_7_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_7_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_7_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_7_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_7_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_7_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_7_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_7_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_7_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_7_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_7_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_7_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_7_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_7_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_7_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_7_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_7_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_7_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_8_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_8_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_8_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_8_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_8_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_8_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_8_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_8_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_8_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_8_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_8_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_8_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_8_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_8_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_8_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_8_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_8_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_8_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_8_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_8_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_8_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_8_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_8_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_8_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_8_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_8_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_8_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_8_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_8_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_8_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_8_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_8_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_8_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_8_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_8_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_8_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_9_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_9_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_9_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_9_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_9_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_9_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_9_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_9_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_9_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_9_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_9_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_9_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_9_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_9_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_9_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_9_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_9_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_9_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_9_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_9_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_9_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_9_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_9_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_9_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_9_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_9_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_9_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_9_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_9_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_9_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_9_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_9_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_9_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_9_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_9_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_9_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_10_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_10_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_10_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_10_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_10_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_10_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_10_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_10_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_10_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_10_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_10_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_10_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_10_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_10_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_10_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_10_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_10_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_10_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_10_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_10_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_10_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_10_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_10_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_10_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_10_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_10_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_10_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_10_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_10_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_10_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_10_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_10_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_10_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_10_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_10_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_10_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_11_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_11_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_11_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_11_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_11_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_11_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_11_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_11_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_11_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_11_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_11_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_11_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_11_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_11_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_11_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_11_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_11_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_11_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_11_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_11_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_11_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_11_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_11_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_11_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_11_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_11_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_11_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_11_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_11_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_11_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_11_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_11_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_11_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_11_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_11_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_11_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_12_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_12_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_12_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_12_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_12_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_12_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_12_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_12_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_12_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_12_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_12_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_12_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_12_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_12_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_12_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_12_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_12_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_12_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_12_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_12_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_12_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_12_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_12_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_12_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_12_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_12_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_12_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_12_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_12_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_12_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_12_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_12_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_12_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_12_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_12_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_12_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_13_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_13_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_13_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_13_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_13_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_13_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_13_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_13_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_13_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_13_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_13_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_13_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_13_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_13_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_13_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_13_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_13_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_13_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_13_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_13_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_13_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_13_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_13_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_13_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_13_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_13_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_13_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_13_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_13_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_13_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_13_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_13_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_13_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_13_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_13_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_13_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_14_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_14_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_14_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_14_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_14_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_14_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_14_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_14_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_14_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_14_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_14_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_14_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_14_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_14_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_14_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_14_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_14_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_14_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_14_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_14_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_14_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_14_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_14_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_14_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_14_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_14_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_14_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_14_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_14_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_14_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_14_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_14_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_14_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_14_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_14_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_14_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_15_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_15_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_15_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_15_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_15_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_15_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_15_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_15_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_15_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_15_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_15_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_15_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_15_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_15_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_15_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_15_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_15_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_15_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_15_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_15_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_15_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_15_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_15_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_15_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_15_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_15_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_15_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_15_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_15_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_15_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_15_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_15_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_15_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_15_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_15_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_15_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_16_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_16_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_16_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_16_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_16_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_16_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_16_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_16_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_16_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_16_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_16_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_16_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_16_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_16_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_16_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_16_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_16_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_16_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_16_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_16_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_16_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_16_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_16_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_16_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_16_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_16_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_16_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_16_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_16_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_16_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_16_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_16_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_16_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_16_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_16_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_16_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_17_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_17_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_17_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_17_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_17_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_17_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_17_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_17_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_17_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_17_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_17_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_17_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_17_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_17_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_17_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_17_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_17_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_17_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_17_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_17_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_17_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_17_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_17_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_17_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_17_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_17_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_17_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_17_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_17_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_17_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_17_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_17_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_17_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_17_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_17_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_17_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_18_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_18_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_18_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_18_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_18_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_18_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_18_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_18_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_18_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_18_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_18_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_18_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_18_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_18_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_18_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_18_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_18_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_18_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_18_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_18_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_18_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_18_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_18_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_18_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_18_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_18_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_18_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_18_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_18_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_18_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_18_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_18_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_18_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_18_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_18_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_18_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_19_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_19_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_19_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_19_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_19_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_19_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_19_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_19_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_19_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_19_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_19_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_19_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_19_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_19_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_19_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_5_19_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_5_19_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_5_19_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_19_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_19_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_19_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_19_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_19_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_19_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_19_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_19_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_19_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_19_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_19_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_19_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_19_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_19_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_19_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_5_19_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_5_19_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_5_19_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_0_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_0_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_0_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_0_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_0_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_0_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_0_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_0_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_0_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_0_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_0_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_0_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_0_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_0_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_0_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_0_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_0_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_0_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_0_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_0_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_0_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_0_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_0_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_0_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_0_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_0_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_0_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_0_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_0_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_0_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_0_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_0_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_0_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_0_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_0_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_0_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_1_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_1_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_1_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_1_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_1_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_1_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_1_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_1_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_1_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_1_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_1_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_1_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_1_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_1_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_1_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_1_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_1_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_1_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_1_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_1_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_1_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_1_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_1_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_1_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_1_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_1_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_1_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_1_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_1_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_1_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_1_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_1_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_1_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_1_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_1_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_1_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_2_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_2_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_2_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_2_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_2_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_2_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_2_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_2_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_2_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_2_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_2_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_2_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_2_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_2_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_2_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_2_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_2_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_2_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_2_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_2_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_2_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_2_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_2_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_2_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_2_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_2_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_2_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_2_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_2_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_2_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_2_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_2_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_2_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_2_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_2_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_2_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_3_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_3_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_3_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_3_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_3_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_3_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_3_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_3_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_3_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_3_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_3_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_3_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_3_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_3_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_3_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_3_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_3_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_3_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_3_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_3_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_3_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_3_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_3_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_3_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_3_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_3_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_3_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_3_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_3_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_3_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_3_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_3_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_3_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_3_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_3_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_3_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_4_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_4_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_4_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_4_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_4_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_4_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_4_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_4_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_4_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_4_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_4_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_4_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_4_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_4_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_4_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_4_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_4_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_4_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_4_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_4_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_4_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_4_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_4_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_4_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_4_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_4_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_4_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_4_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_4_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_4_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_4_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_4_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_4_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_4_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_4_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_4_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_5_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_5_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_5_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_5_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_5_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_5_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_5_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_5_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_5_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_5_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_5_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_5_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_5_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_5_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_5_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_5_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_5_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_5_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_5_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_5_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_5_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_5_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_5_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_5_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_5_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_5_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_5_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_5_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_5_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_5_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_5_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_5_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_5_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_5_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_5_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_5_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_6_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_6_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_6_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_6_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_6_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_6_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_6_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_6_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_6_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_6_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_6_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_6_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_6_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_6_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_6_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_6_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_6_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_6_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_6_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_6_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_6_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_6_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_6_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_6_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_6_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_6_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_6_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_6_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_6_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_6_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_6_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_6_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_6_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_6_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_6_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_6_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_7_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_7_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_7_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_7_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_7_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_7_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_7_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_7_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_7_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_7_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_7_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_7_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_7_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_7_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_7_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_7_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_7_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_7_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_7_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_7_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_7_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_7_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_7_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_7_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_7_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_7_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_7_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_7_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_7_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_7_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_7_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_7_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_7_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_7_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_7_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_7_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_8_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_8_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_8_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_8_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_8_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_8_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_8_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_8_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_8_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_8_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_8_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_8_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_8_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_8_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_8_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_8_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_8_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_8_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_8_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_8_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_8_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_8_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_8_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_8_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_8_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_8_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_8_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_8_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_8_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_8_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_8_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_8_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_8_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_8_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_8_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_8_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_9_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_9_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_9_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_9_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_9_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_9_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_9_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_9_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_9_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_9_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_9_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_9_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_9_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_9_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_9_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_9_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_9_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_9_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_9_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_9_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_9_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_9_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_9_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_9_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_9_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_9_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_9_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_9_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_9_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_9_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_9_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_9_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_9_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_9_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_9_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_9_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_10_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_10_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_10_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_10_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_10_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_10_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_10_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_10_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_10_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_10_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_10_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_10_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_10_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_10_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_10_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_10_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_10_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_10_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_10_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_10_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_10_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_10_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_10_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_10_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_10_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_10_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_10_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_10_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_10_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_10_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_10_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_10_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_10_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_10_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_10_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_10_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_11_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_11_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_11_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_11_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_11_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_11_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_11_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_11_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_11_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_11_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_11_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_11_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_11_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_11_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_11_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_11_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_11_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_11_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_11_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_11_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_11_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_11_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_11_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_11_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_11_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_11_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_11_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_11_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_11_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_11_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_11_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_11_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_11_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_11_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_11_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_11_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_12_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_12_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_12_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_12_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_12_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_12_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_12_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_12_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_12_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_12_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_12_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_12_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_12_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_12_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_12_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_12_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_12_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_12_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_12_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_12_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_12_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_12_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_12_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_12_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_12_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_12_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_12_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_12_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_12_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_12_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_12_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_12_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_12_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_12_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_12_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_12_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_13_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_13_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_13_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_13_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_13_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_13_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_13_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_13_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_13_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_13_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_13_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_13_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_13_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_13_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_13_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_13_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_13_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_13_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_13_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_13_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_13_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_13_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_13_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_13_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_13_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_13_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_13_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_13_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_13_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_13_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_13_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_13_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_13_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_13_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_13_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_13_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_14_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_14_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_14_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_14_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_14_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_14_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_14_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_14_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_14_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_14_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_14_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_14_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_14_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_14_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_14_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_14_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_14_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_14_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_14_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_14_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_14_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_14_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_14_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_14_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_14_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_14_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_14_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_14_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_14_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_14_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_14_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_14_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_14_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_14_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_14_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_14_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_15_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_15_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_15_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_15_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_15_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_15_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_15_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_15_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_15_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_15_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_15_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_15_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_15_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_15_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_15_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_15_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_15_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_15_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_15_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_15_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_15_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_15_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_15_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_15_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_15_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_15_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_15_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_15_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_15_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_15_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_15_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_15_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_15_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_15_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_15_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_15_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_16_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_16_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_16_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_16_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_16_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_16_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_16_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_16_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_16_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_16_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_16_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_16_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_16_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_16_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_16_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_16_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_16_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_16_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_16_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_16_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_16_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_16_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_16_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_16_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_16_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_16_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_16_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_16_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_16_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_16_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_16_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_16_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_16_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_16_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_16_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_16_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_17_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_17_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_17_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_17_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_17_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_17_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_17_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_17_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_17_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_17_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_17_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_17_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_17_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_17_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_17_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_17_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_17_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_17_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_17_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_17_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_17_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_17_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_17_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_17_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_17_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_17_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_17_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_17_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_17_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_17_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_17_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_17_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_17_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_17_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_17_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_17_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_18_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_18_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_18_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_18_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_18_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_18_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_18_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_18_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_18_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_18_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_18_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_18_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_18_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_18_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_18_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_18_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_18_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_18_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_18_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_18_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_18_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_18_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_18_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_18_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_18_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_18_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_18_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_18_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_18_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_18_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_18_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_18_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_18_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_18_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_18_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_18_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_19_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_19_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_19_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_19_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_19_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_19_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_19_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_19_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_19_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_19_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_19_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_19_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_19_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_19_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_19_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_6_19_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_6_19_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_6_19_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_19_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_19_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_19_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_19_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_19_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_19_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_19_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_19_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_19_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_19_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_19_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_19_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_19_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_19_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_19_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_6_19_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_6_19_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_6_19_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_0_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_0_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_0_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_0_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_0_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_0_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_0_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_0_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_0_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_0_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_0_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_0_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_0_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_0_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_0_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_0_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_0_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_0_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_0_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_0_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_0_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_0_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_0_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_0_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_0_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_0_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_0_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_0_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_0_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_0_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_0_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_0_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_0_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_0_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_0_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_0_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_1_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_1_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_1_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_1_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_1_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_1_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_1_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_1_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_1_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_1_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_1_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_1_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_1_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_1_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_1_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_1_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_1_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_1_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_1_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_1_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_1_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_1_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_1_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_1_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_1_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_1_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_1_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_1_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_1_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_1_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_1_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_1_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_1_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_1_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_1_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_1_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_2_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_2_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_2_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_2_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_2_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_2_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_2_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_2_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_2_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_2_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_2_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_2_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_2_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_2_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_2_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_2_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_2_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_2_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_2_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_2_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_2_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_2_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_2_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_2_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_2_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_2_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_2_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_2_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_2_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_2_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_2_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_2_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_2_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_2_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_2_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_2_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_3_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_3_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_3_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_3_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_3_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_3_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_3_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_3_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_3_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_3_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_3_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_3_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_3_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_3_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_3_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_3_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_3_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_3_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_3_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_3_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_3_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_3_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_3_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_3_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_3_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_3_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_3_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_3_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_3_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_3_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_3_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_3_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_3_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_3_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_3_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_3_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_4_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_4_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_4_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_4_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_4_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_4_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_4_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_4_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_4_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_4_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_4_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_4_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_4_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_4_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_4_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_4_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_4_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_4_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_4_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_4_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_4_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_4_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_4_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_4_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_4_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_4_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_4_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_4_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_4_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_4_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_4_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_4_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_4_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_4_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_4_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_4_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_5_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_5_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_5_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_5_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_5_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_5_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_5_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_5_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_5_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_5_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_5_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_5_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_5_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_5_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_5_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_5_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_5_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_5_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_5_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_5_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_5_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_5_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_5_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_5_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_5_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_5_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_5_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_5_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_5_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_5_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_5_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_5_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_5_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_5_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_5_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_5_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_6_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_6_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_6_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_6_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_6_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_6_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_6_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_6_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_6_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_6_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_6_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_6_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_6_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_6_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_6_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_6_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_6_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_6_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_6_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_6_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_6_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_6_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_6_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_6_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_6_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_6_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_6_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_6_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_6_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_6_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_6_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_6_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_6_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_6_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_6_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_6_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_7_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_7_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_7_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_7_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_7_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_7_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_7_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_7_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_7_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_7_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_7_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_7_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_7_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_7_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_7_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_7_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_7_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_7_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_7_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_7_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_7_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_7_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_7_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_7_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_7_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_7_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_7_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_7_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_7_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_7_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_7_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_7_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_7_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_7_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_7_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_7_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_8_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_8_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_8_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_8_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_8_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_8_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_8_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_8_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_8_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_8_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_8_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_8_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_8_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_8_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_8_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_8_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_8_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_8_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_8_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_8_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_8_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_8_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_8_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_8_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_8_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_8_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_8_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_8_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_8_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_8_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_8_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_8_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_8_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_8_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_8_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_8_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_9_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_9_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_9_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_9_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_9_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_9_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_9_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_9_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_9_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_9_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_9_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_9_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_9_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_9_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_9_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_9_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_9_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_9_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_9_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_9_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_9_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_9_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_9_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_9_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_9_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_9_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_9_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_9_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_9_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_9_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_9_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_9_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_9_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_9_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_9_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_9_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_10_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_10_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_10_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_10_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_10_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_10_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_10_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_10_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_10_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_10_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_10_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_10_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_10_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_10_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_10_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_10_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_10_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_10_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_10_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_10_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_10_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_10_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_10_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_10_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_10_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_10_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_10_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_10_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_10_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_10_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_10_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_10_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_10_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_10_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_10_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_10_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_11_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_11_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_11_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_11_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_11_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_11_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_11_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_11_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_11_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_11_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_11_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_11_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_11_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_11_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_11_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_11_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_11_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_11_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_11_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_11_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_11_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_11_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_11_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_11_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_11_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_11_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_11_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_11_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_11_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_11_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_11_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_11_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_11_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_11_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_11_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_11_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_12_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_12_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_12_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_12_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_12_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_12_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_12_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_12_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_12_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_12_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_12_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_12_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_12_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_12_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_12_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_12_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_12_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_12_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_12_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_12_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_12_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_12_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_12_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_12_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_12_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_12_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_12_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_12_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_12_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_12_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_12_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_12_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_12_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_12_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_12_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_12_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_13_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_13_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_13_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_13_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_13_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_13_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_13_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_13_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_13_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_13_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_13_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_13_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_13_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_13_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_13_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_13_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_13_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_13_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_13_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_13_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_13_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_13_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_13_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_13_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_13_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_13_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_13_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_13_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_13_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_13_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_13_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_13_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_13_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_13_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_13_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_13_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_14_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_14_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_14_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_14_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_14_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_14_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_14_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_14_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_14_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_14_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_14_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_14_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_14_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_14_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_14_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_14_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_14_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_14_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_14_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_14_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_14_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_14_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_14_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_14_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_14_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_14_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_14_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_14_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_14_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_14_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_14_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_14_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_14_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_14_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_14_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_14_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_15_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_15_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_15_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_15_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_15_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_15_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_15_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_15_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_15_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_15_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_15_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_15_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_15_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_15_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_15_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_15_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_15_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_15_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_15_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_15_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_15_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_15_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_15_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_15_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_15_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_15_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_15_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_15_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_15_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_15_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_15_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_15_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_15_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_15_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_15_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_15_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_16_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_16_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_16_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_16_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_16_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_16_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_16_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_16_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_16_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_16_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_16_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_16_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_16_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_16_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_16_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_16_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_16_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_16_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_16_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_16_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_16_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_16_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_16_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_16_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_16_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_16_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_16_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_16_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_16_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_16_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_16_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_16_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_16_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_16_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_16_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_16_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_17_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_17_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_17_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_17_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_17_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_17_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_17_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_17_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_17_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_17_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_17_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_17_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_17_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_17_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_17_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_17_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_17_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_17_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_17_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_17_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_17_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_17_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_17_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_17_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_17_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_17_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_17_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_17_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_17_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_17_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_17_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_17_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_17_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_17_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_17_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_17_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_18_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_18_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_18_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_18_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_18_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_18_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_18_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_18_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_18_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_18_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_18_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_18_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_18_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_18_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_18_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_18_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_18_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_18_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_18_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_18_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_18_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_18_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_18_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_18_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_18_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_18_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_18_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_18_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_18_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_18_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_18_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_18_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_18_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_18_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_18_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_18_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_19_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_19_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_19_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_19_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_19_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_19_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_19_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_19_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_19_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_19_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_19_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_19_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_19_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_19_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_19_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_7_19_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_7_19_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_7_19_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_19_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_19_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_19_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_19_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_19_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_19_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_19_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_19_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_19_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_19_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_19_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_19_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_19_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_19_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_19_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_7_19_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_7_19_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_7_19_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_0_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_0_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_0_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_0_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_0_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_0_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_0_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_0_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_0_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_0_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_0_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_0_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_0_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_0_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_0_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_0_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_0_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_0_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_0_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_0_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_0_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_0_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_0_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_0_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_0_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_0_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_0_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_0_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_0_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_0_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_0_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_0_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_0_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_0_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_0_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_0_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_1_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_1_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_1_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_1_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_1_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_1_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_1_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_1_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_1_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_1_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_1_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_1_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_1_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_1_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_1_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_1_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_1_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_1_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_1_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_1_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_1_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_1_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_1_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_1_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_1_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_1_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_1_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_1_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_1_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_1_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_1_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_1_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_1_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_1_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_1_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_1_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_2_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_2_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_2_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_2_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_2_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_2_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_2_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_2_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_2_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_2_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_2_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_2_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_2_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_2_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_2_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_2_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_2_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_2_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_2_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_2_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_2_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_2_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_2_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_2_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_2_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_2_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_2_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_2_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_2_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_2_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_2_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_2_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_2_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_2_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_2_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_2_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_3_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_3_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_3_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_3_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_3_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_3_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_3_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_3_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_3_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_3_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_3_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_3_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_3_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_3_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_3_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_3_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_3_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_3_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_3_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_3_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_3_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_3_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_3_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_3_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_3_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_3_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_3_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_3_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_3_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_3_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_3_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_3_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_3_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_3_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_3_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_3_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_4_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_4_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_4_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_4_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_4_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_4_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_4_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_4_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_4_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_4_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_4_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_4_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_4_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_4_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_4_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_4_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_4_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_4_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_4_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_4_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_4_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_4_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_4_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_4_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_4_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_4_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_4_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_4_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_4_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_4_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_4_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_4_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_4_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_4_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_4_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_4_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_5_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_5_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_5_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_5_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_5_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_5_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_5_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_5_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_5_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_5_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_5_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_5_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_5_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_5_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_5_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_5_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_5_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_5_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_5_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_5_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_5_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_5_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_5_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_5_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_5_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_5_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_5_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_5_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_5_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_5_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_5_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_5_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_5_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_5_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_5_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_5_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_6_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_6_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_6_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_6_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_6_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_6_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_6_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_6_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_6_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_6_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_6_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_6_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_6_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_6_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_6_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_6_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_6_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_6_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_6_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_6_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_6_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_6_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_6_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_6_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_6_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_6_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_6_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_6_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_6_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_6_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_6_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_6_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_6_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_6_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_6_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_6_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_7_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_7_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_7_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_7_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_7_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_7_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_7_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_7_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_7_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_7_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_7_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_7_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_7_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_7_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_7_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_7_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_7_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_7_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_7_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_7_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_7_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_7_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_7_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_7_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_7_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_7_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_7_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_7_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_7_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_7_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_7_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_7_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_7_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_7_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_7_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_7_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_8_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_8_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_8_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_8_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_8_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_8_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_8_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_8_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_8_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_8_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_8_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_8_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_8_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_8_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_8_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_8_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_8_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_8_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_8_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_8_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_8_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_8_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_8_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_8_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_8_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_8_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_8_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_8_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_8_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_8_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_8_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_8_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_8_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_8_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_8_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_8_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_9_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_9_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_9_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_9_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_9_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_9_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_9_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_9_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_9_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_9_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_9_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_9_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_9_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_9_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_9_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_9_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_9_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_9_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_9_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_9_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_9_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_9_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_9_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_9_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_9_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_9_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_9_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_9_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_9_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_9_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_9_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_9_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_9_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_9_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_9_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_9_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_10_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_10_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_10_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_10_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_10_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_10_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_10_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_10_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_10_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_10_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_10_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_10_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_10_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_10_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_10_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_10_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_10_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_10_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_10_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_10_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_10_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_10_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_10_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_10_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_10_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_10_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_10_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_10_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_10_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_10_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_10_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_10_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_10_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_10_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_10_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_10_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_11_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_11_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_11_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_11_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_11_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_11_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_11_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_11_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_11_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_11_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_11_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_11_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_11_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_11_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_11_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_11_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_11_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_11_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_11_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_11_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_11_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_11_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_11_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_11_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_11_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_11_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_11_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_11_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_11_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_11_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_11_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_11_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_11_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_11_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_11_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_11_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_12_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_12_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_12_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_12_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_12_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_12_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_12_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_12_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_12_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_12_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_12_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_12_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_12_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_12_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_12_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_12_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_12_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_12_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_12_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_12_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_12_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_12_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_12_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_12_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_12_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_12_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_12_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_12_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_12_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_12_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_12_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_12_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_12_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_12_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_12_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_12_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_13_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_13_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_13_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_13_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_13_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_13_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_13_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_13_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_13_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_13_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_13_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_13_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_13_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_13_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_13_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_13_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_13_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_13_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_13_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_13_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_13_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_13_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_13_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_13_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_13_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_13_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_13_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_13_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_13_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_13_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_13_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_13_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_13_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_13_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_13_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_13_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_14_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_14_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_14_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_14_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_14_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_14_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_14_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_14_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_14_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_14_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_14_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_14_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_14_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_14_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_14_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_14_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_14_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_14_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_14_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_14_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_14_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_14_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_14_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_14_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_14_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_14_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_14_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_14_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_14_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_14_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_14_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_14_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_14_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_14_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_14_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_14_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_15_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_15_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_15_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_15_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_15_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_15_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_15_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_15_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_15_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_15_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_15_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_15_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_15_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_15_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_15_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_15_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_15_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_15_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_15_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_15_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_15_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_15_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_15_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_15_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_15_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_15_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_15_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_15_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_15_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_15_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_15_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_15_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_15_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_15_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_15_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_15_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_16_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_16_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_16_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_16_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_16_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_16_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_16_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_16_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_16_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_16_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_16_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_16_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_16_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_16_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_16_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_16_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_16_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_16_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_16_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_16_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_16_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_16_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_16_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_16_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_16_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_16_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_16_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_16_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_16_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_16_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_16_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_16_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_16_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_16_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_16_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_16_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_17_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_17_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_17_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_17_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_17_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_17_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_17_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_17_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_17_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_17_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_17_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_17_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_17_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_17_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_17_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_17_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_17_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_17_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_17_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_17_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_17_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_17_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_17_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_17_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_17_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_17_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_17_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_17_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_17_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_17_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_17_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_17_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_17_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_17_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_17_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_17_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_18_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_18_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_18_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_18_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_18_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_18_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_18_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_18_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_18_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_18_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_18_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_18_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_18_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_18_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_18_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_18_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_18_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_18_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_18_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_18_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_18_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_18_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_18_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_18_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_18_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_18_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_18_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_18_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_18_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_18_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_18_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_18_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_18_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_18_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_18_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_18_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_19_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_19_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_19_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_19_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_19_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_19_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_19_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_19_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_19_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_19_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_19_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_19_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_19_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_19_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_19_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_8_19_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_8_19_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_8_19_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_19_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_19_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_19_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_19_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_19_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_19_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_19_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_19_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_19_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_19_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_19_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_19_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_19_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_19_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_19_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_8_19_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_8_19_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_8_19_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_0_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_0_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_0_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_0_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_0_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_0_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_0_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_0_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_0_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_0_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_0_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_0_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_0_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_0_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_0_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_0_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_0_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_0_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_0_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_0_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_0_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_0_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_0_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_0_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_0_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_0_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_0_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_0_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_0_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_0_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_0_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_0_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_0_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_0_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_0_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_0_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_1_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_1_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_1_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_1_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_1_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_1_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_1_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_1_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_1_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_1_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_1_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_1_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_1_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_1_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_1_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_1_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_1_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_1_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_1_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_1_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_1_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_1_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_1_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_1_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_1_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_1_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_1_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_1_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_1_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_1_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_1_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_1_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_1_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_1_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_1_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_1_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_2_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_2_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_2_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_2_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_2_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_2_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_2_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_2_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_2_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_2_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_2_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_2_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_2_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_2_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_2_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_2_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_2_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_2_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_2_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_2_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_2_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_2_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_2_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_2_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_2_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_2_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_2_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_2_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_2_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_2_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_2_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_2_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_2_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_2_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_2_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_2_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_3_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_3_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_3_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_3_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_3_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_3_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_3_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_3_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_3_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_3_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_3_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_3_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_3_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_3_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_3_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_3_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_3_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_3_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_3_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_3_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_3_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_3_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_3_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_3_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_3_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_3_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_3_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_3_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_3_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_3_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_3_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_3_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_3_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_3_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_3_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_3_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_4_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_4_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_4_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_4_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_4_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_4_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_4_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_4_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_4_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_4_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_4_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_4_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_4_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_4_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_4_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_4_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_4_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_4_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_4_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_4_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_4_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_4_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_4_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_4_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_4_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_4_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_4_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_4_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_4_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_4_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_4_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_4_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_4_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_4_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_4_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_4_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_5_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_5_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_5_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_5_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_5_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_5_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_5_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_5_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_5_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_5_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_5_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_5_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_5_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_5_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_5_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_5_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_5_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_5_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_5_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_5_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_5_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_5_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_5_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_5_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_5_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_5_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_5_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_5_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_5_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_5_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_5_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_5_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_5_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_5_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_5_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_5_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_6_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_6_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_6_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_6_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_6_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_6_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_6_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_6_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_6_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_6_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_6_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_6_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_6_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_6_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_6_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_6_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_6_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_6_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_6_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_6_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_6_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_6_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_6_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_6_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_6_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_6_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_6_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_6_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_6_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_6_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_6_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_6_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_6_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_6_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_6_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_6_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_7_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_7_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_7_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_7_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_7_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_7_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_7_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_7_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_7_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_7_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_7_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_7_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_7_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_7_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_7_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_7_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_7_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_7_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_7_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_7_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_7_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_7_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_7_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_7_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_7_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_7_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_7_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_7_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_7_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_7_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_7_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_7_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_7_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_7_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_7_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_7_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_8_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_8_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_8_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_8_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_8_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_8_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_8_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_8_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_8_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_8_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_8_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_8_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_8_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_8_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_8_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_8_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_8_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_8_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_8_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_8_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_8_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_8_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_8_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_8_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_8_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_8_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_8_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_8_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_8_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_8_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_8_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_8_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_8_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_8_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_8_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_8_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_9_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_9_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_9_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_9_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_9_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_9_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_9_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_9_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_9_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_9_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_9_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_9_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_9_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_9_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_9_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_9_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_9_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_9_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_9_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_9_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_9_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_9_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_9_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_9_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_9_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_9_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_9_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_9_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_9_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_9_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_9_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_9_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_9_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_9_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_9_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_9_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_10_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_10_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_10_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_10_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_10_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_10_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_10_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_10_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_10_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_10_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_10_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_10_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_10_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_10_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_10_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_10_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_10_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_10_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_10_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_10_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_10_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_10_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_10_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_10_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_10_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_10_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_10_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_10_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_10_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_10_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_10_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_10_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_10_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_10_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_10_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_10_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_11_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_11_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_11_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_11_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_11_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_11_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_11_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_11_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_11_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_11_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_11_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_11_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_11_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_11_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_11_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_11_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_11_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_11_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_11_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_11_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_11_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_11_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_11_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_11_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_11_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_11_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_11_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_11_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_11_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_11_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_11_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_11_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_11_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_11_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_11_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_11_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_12_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_12_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_12_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_12_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_12_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_12_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_12_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_12_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_12_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_12_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_12_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_12_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_12_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_12_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_12_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_12_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_12_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_12_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_12_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_12_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_12_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_12_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_12_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_12_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_12_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_12_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_12_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_12_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_12_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_12_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_12_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_12_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_12_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_12_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_12_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_12_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_13_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_13_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_13_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_13_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_13_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_13_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_13_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_13_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_13_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_13_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_13_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_13_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_13_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_13_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_13_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_13_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_13_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_13_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_13_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_13_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_13_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_13_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_13_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_13_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_13_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_13_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_13_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_13_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_13_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_13_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_13_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_13_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_13_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_13_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_13_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_13_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_14_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_14_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_14_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_14_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_14_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_14_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_14_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_14_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_14_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_14_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_14_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_14_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_14_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_14_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_14_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_14_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_14_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_14_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_14_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_14_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_14_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_14_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_14_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_14_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_14_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_14_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_14_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_14_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_14_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_14_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_14_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_14_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_14_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_14_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_14_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_14_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_15_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_15_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_15_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_15_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_15_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_15_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_15_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_15_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_15_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_15_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_15_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_15_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_15_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_15_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_15_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_15_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_15_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_15_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_15_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_15_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_15_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_15_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_15_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_15_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_15_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_15_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_15_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_15_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_15_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_15_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_15_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_15_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_15_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_15_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_15_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_15_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_16_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_16_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_16_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_16_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_16_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_16_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_16_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_16_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_16_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_16_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_16_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_16_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_16_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_16_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_16_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_16_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_16_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_16_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_16_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_16_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_16_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_16_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_16_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_16_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_16_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_16_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_16_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_16_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_16_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_16_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_16_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_16_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_16_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_16_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_16_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_16_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_17_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_17_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_17_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_17_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_17_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_17_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_17_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_17_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_17_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_17_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_17_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_17_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_17_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_17_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_17_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_17_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_17_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_17_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_17_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_17_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_17_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_17_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_17_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_17_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_17_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_17_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_17_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_17_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_17_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_17_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_17_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_17_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_17_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_17_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_17_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_17_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_18_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_18_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_18_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_18_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_18_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_18_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_18_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_18_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_18_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_18_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_18_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_18_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_18_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_18_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_18_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_18_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_18_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_18_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_18_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_18_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_18_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_18_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_18_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_18_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_18_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_18_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_18_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_18_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_18_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_18_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_18_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_18_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_18_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_18_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_18_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_18_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_19_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_19_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_19_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_19_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_19_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_19_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_19_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_19_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_19_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_19_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_19_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_19_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_19_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_19_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_19_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Pub_Node_9_19_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Pub_Node_9_19_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Pub_Node_9_19_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_19_0_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_19_0__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_19_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_19_0_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_19_0__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_19_0_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_19_0_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_19_0_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_19_0_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_19_1_service1</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_19_1__prov1ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_one</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_19_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_19_1_service2</name>
-
-  <internalEndpoint>
-  <portName>ping_port</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_19_1__prov2ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>ping_two</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_19_1_ComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<connection>
-  <name>Sub_Node_9_19_1_writer</name>
-  <deployRequirement>
-  <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-  <resourceType>Local_Interface</resourceType>
-</deployRequirement>
-
-  <internalEndpoint>
-  <portName>info_data</portName>
-  <provider>false</provider>
-  <kind>SimplexReceptacle</kind>
-  <instance xmi:idref="Sub_Node_9_19_1_ComponentInstance" />
-</internalEndpoint>
-
-  <internalEndpoint>
-  <portName>supplier_data</portName>
-  <provider>true</provider>
-  <kind>Facet</kind>
-  <instance xmi:idref="Sub_Node_9_19_1_DDSConnectorComponentInstance" />
-</internalEndpoint>
-
-</connection>
-<artifact xmi:id="Large_Connector_ExecArtifact">
-  <name>Large_Connector_exec</name>
-  <source/>
-  <node/>
-  <location>Large_Connector_exec</location>
-</artifact>
-<artifact xmi:id="Large_Connector_SvntArtifact">
-  <name>Large_Connector_svnt</name>
-  <source/>
-  <node/>
-  <location>Large_Connector_svnt</location>
-</artifact>
-<artifact xmi:id="Large_Connector_StubArtifact">
-  <name>Large_Connector_stub</name>
-  <source/>
-  <node/>
-  <location>Large_Connector_stub</location>
-</artifact>
-<artifact xmi:id="Single_Service_ExecArtifact">
-  <name>Single_Service_exec</name>
-  <source/>
-  <node/>
-  <location>Single_Service_exec</location>
-</artifact>
-<artifact xmi:id="Single_Service_SvntArtifact">
-  <name>Single_Service_svnt</name>
-  <source/>
-  <node/>
-  <location>Single_Service_svnt</location>
-</artifact>
-<artifact xmi:id="Single_Service_StubArtifact">
-  <name>Single_Service_stub</name>
-  <source/>
-  <node/>
-  <location>Single_Service_stub</location>
-</artifact>
-<artifact xmi:id="DDS_Pub_ExecArtifact">
-  <name>DDS_Pub_exec</name>
-  <source/>
-  <node/>
-  <location>DDS_Pub_exec</location>
-</artifact>
-<artifact xmi:id="DDS_Pub_SvntArtifact">
-  <name>DDS_Pub_svnt</name>
-  <source/>
-  <node/>
-  <location>DDS_Pub_svnt</location>
-</artifact>
-<artifact xmi:id="DDS_Pub_StubArtifact">
-  <name>DDS_Pub_stub</name>
-  <source/>
-  <node/>
-  <location>DDS_Pub_stub</location>
-</artifact>
-<artifact xmi:id="DDS_Sub_ExecArtifact">
-  <name>DDS_Sub_exec</name>
-  <source/>
-  <node/>
-  <location>DDS_Sub_exec</location>
-</artifact>
-<artifact xmi:id="DDS_Sub_SvntArtifact">
-  <name>DDS_Sub_svnt</name>
-  <source/>
-  <node/>
-  <location>DDS_Sub_svnt</location>
-</artifact>
-<artifact xmi:id="DDS_Sub_StubArtifact">
-  <name>DDS_Sub_stub</name>
-  <source/>
-  <node/>
-  <location>DDS_Sub_stub</location>
-</artifact>
-</Deployment:DeploymentPlan>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/descriptors/generate_large_plan.py b/CIAO/connectors/dds4ccm/examples/Large_Deployment/descriptors/generate_large_plan.py
deleted file mode 100755
index 5cb30f832ff..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/descriptors/generate_large_plan.py
+++ /dev/null
@@ -1,247 +0,0 @@
-#!/usr/bin/python
-import sys, os, math
-
-sys.path.append (os.getenv ("DANCE_ROOT") + "/bin")
-
-from PythonDAnCE import generator
-
-nodes = 10
-processes = 200
-proc_per_node = processes / 10
-single_service_components = 1000
-dds_pub_components = 250
-dds_pub_per_proc = 2
-dds_sub_components = 375
-dds_sub_per_proc = 2
-topics = 250
-
-namespace = ""
-
-
-def create_names (prefix, number):
-    retval = []
-    
-    for x in range(number):
-        retval.append (prefix + "_" + str(x))
-    return retval
-
-def add_sub_connector (name, topic, node) :
-    comp = ""
-    conn = ""
-    
-    config_prop = ""
-    config_prop += generator.config_prop ("topic_name", "string", topic)
-    
-    comp += generator.comp_inst (name + "DDSConnector", config_prop, )
-    
-    deploy_req = generator.deploy_requirement ("edu.dre.vanderbilt.DAnCE.ConnectionType",
-                                               "Local_Interface")
-    conn += generator.connection (name + "info_out_data",
-                                  deploy_req,
-                                  generator.internal_endpoint ("info_out_data",
-                                                               "false",
-                                                               "SimplexReceptacle",
-                                                               name + "ComponentInstance"),
-                                  generator.internal_endpoint ("push_consumer_data",
-                                                               "true",
-                                                               "Facet",
-                                                               name + "DDSConnector" + "ComponentInstance"))
-    
-    conn += generator.connection (name + "listenercontrol",
-                                  deploy_req,
-                                  generator.internal_endpoint ("info_out_data_control",
-                                                               "false",
-                                                               "SimplexReceptacle",
-                                                               name + "ComponentInstance"),
-                                  generator.internal_endpoint ("push_consumer_data_control",
-                                                               "true",
-                                                               "Facet",
-                                                               name + "DDSConnector" + "ComponentInstance"))
-
-    conn += generator.connection (name + "portstatuslistener",
-                                  deploy_req,
-                                  generator.internal_endpoint ("info_out_status",
-                                                               "false",
-                                                               "SimplexReceptacle",
-                                                               name + "ComponentInstance"),
-                                  generator.internal_endpoint ("push_consumer_status",
-                                                               "true",
-                                                               "Facet",
-                                                               name + "DDSConnector" + "ComponentInstance"))
-
-    conn += generator.connection (name + "listener",
-                                  deploy_req,
-                                  generator.internal_endpoint ("info_out_data_listener",
-                                                               "false",
-                                                               "SimplexReceptacle",
-                                                               name + "ComponentInstance"),
-                                  generator.internal_endpoint ("push_consumer_data_listener",
-                                                               "true",
-                                                               "Facet",
-                                                               name + "DDSConnector" + "ComponentInstance"))
-    return (comp, conn)
-
-def add_pub_connector (name, topic, node) :
-    comp = ""
-    conn = ""
-    
-    config_prop = ""
-    config_prop += generator.config_prop.template ("topic_name", "string", topic)
-
-    comp += generator.comp_inst.template (name + "DDSConnector", config_prop, "Large_ConnectorComponentImplementation", node)
-    
-    deploy_req = generator.deploy_requirement.template ("edu.dre.vanderbilt.DAnCE.ConnectionType",
-                                                        "Local_Interface")
-
-    conn += generator.connection.template (name + "writer",
-                                           deploy_req,
-                                           generator.internal_endpoint.template ("info_data",
-                                                                                 "false",
-                                                                                 "SimplexReceptacle",
-                                                                                 name + "ComponentInstance"),
-                                           generator.internal_endpoint.template ("supplier_data",
-                                                                                 "true",
-                                                                                 "Facet",
-                                                                                 name + "DDSConnector" + "ComponentInstance"))
-    
-    return (comp, conn)
-
-def add_provide_component (name, node) :
-    retval = ""
-    
-    retval += generator.comp_inst.template (name, "", "Single_ServiceComponentImplementation", node)
-    
-    return retval
-
-def add_dds_pub_component (name, topic, node) :
-    comps = ""
-    conns = ""
-    
-    comps += generator.comp_inst.template (name, "", "DDS_PubComponentImplementation", node)
-
-    compname = name + "_prov1"
-    comps += add_provide_component (compname, node)
-    conns += generator.connection.template (name + "service1",
-                                   "",
-                                   generator.internal_endpoint.template ("ping_port",
-                                                                "true",
-                                                                "Facet",
-                                                                compname+ "ComponentInstance"),
-                                   generator.internal_endpoint.template ("ping_one",
-                                                                "false",
-                                                                "SimplexReceptacle",
-                                                                name + "ComponentInstance"))
-    compname = name + "_prov2"
-    comps += add_provide_component (compname, node)
-    conns += generator.connection.template (name + "service2",
-                                   "",
-                                   generator.internal_endpoint.template ("ping_port",
-                                                                "true",
-                                                                "Facet",
-                                                                compname+ "ComponentInstance"),
-                                   generator.internal_endpoint.template ("ping_two",
-                                                                "false",
-                                                                "SimplexReceptacle",
-                                                                name + "ComponentInstance" ))
-    
-                                                                
-    (tmpcomp, tmpconn) = add_pub_connector (name, topic, node)
-    
-    comps += tmpcomp
-    conns += tmpconn
-
-    return (comps, conns)
-
-def add_dds_sub_component (name, topic, node) :
-    comps = ""
-    conns = ""
-    
-    comps += generator.comp_inst (name, "", "DDS_PubComponentImplementation", node)
-
-    compname = name + "_prov"
-    comps += add_provide_component (compname, node)
-    conns += generator.connection (name + "service",
-                                   "",
-                                   generator.internal_endpoint ("ping_port",
-                                                                "true",
-                                                                "Facet",
-                                                                compname + "ComponentInstance"),
-                                   generator.internal_endpoint ("ping_one",
-                                                                "false",
-                                                                "SimplexReceptacle",
-                                                                name + "ComponentInstance"))    
-    
-    (tmpcomp, tmpconn) = add_sub_connector (name, topic, node)
-    
-    comps += tmpcomp
-    conns += tmpconn
-    
-    return (comps, conns)
-
-def main ():
-    
-    import random
-
-    retval = ""
-    
-    retval += generator.header.template ("Large_Plan")
-    
-    retval += generator.comp_impl.template ("Large_Connector", "")
-    retval += generator.comp_impl.template ("Single_Service", "")
-    retval += generator.comp_impl.template ("DDS_Pub", "")
-    retval += generator.comp_impl.template ("DDS_Sub", "")
-    
-    conns = ""
-    comps = ""
-    
-    nodenames = create_names ("Node", nodes)
-    print nodenames
-    topicnames = create_names ("Topic", topics)
-    print topicnames
-
-    pub_count = 0
-    sub_count = 0
-    service_count = 0
-
-    for name in nodenames:
-        for proc in range (proc_per_node):
-            for comp in range (dds_pub_per_proc):
-                (tmpcomp, tmpconn) = add_dds_pub_component ('Pub' + '_' + name + '_' + str(proc) + '_' + str(comp) + '_',
-                                                            random.choice (topicnames),
-                                                            name)
-                conns += tmpconn
-                comps += tmpcomp
-                pub_count += 1
-                service_count += 2
-
-            for comp in range (dds_sub_per_proc):
-                (tmpcomp, tmpconn) = add_dds_pub_component ('Sub' + '_' + name + '_' + str(proc) + '_' + str(comp) + '_',
-                                                            random.choice (topicnames),
-                                                            name)
-                
-                conns += tmpconn
-                comps += tmpcomp
-                
-                sub_count += 1
-                service_count += 1
-    
-    retval += comps
-    retval += conns
-    
-    retval += generator.artifact.template ("Large_Connector")
-    retval += generator.artifact.template ("Single_Service")
-    retval += generator.artifact.template ("DDS_Pub")
-    retval += generator.artifact.template ("DDS_Sub")
-    retval += generator.footer.template ()
-    
-    print "Writing a plan with " + str(pub_count) + " publish components, " + str (sub_count) + " subscribe components, and " + str(service_count) + " service components."
-
-    outfile = open ("LargePlan.cdp", 'w')
-    outfile.write (retval)
-    outfile.close ()
-    
-if __name__ == "__main__":
-    main ()
-
-            
-                
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/examples/Large_Deployment/descriptors/run_test.pl
deleted file mode 100755
index 1a1128aec3f..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/descriptors/run_test.pl
+++ /dev/null
@@ -1,235 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 10;
-@ports = ( 60001, 60002, 60003, 60004, 60005, 60006, 60007, 60008, 60009, 60010);
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior", "NodeApp3.ior", "NodeApp4.ior", "NodeApp5.ior", "NodeApp6.ior", "NodeApp7.ior", "NodeApp8.ior", "NodeApp9.ior", "NodeApp10.ior" );
-@iorfiles = 0;
-@nodenames = ( "Node_0", "Node_1", "Node_2", "Node_3", "Node_4", "Node_5", "Node_6", "Node_7", "Node_8", "Node_9", "Node_10");
-
-$status = 0;
-$cdp_file = "LargePlan.cdp";
-
-$controller_exec = "$CIAO_ROOT/examples/Hello/Sender/starter";
-
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --instance-nc corbaloc:rir:/NameService --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-              "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", "-m 0 -ORBEndpoint iiop://localhost:60013 -o $ior_nsfile");
-
-print STDERR "Starting Naming Service with -m 0 -ORBEndpoint iiop://localhost:60013 -o ns.ior\n";
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60013/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\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 (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$EM->Spawn ();
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile -l\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                                  "-x $cdp_file -k file://$ior_emfile -l");
-$E->SpawnWaitKill (600);
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-# print "Invoking the controller ($controller_exec -k file://Sender.ior)\n";
-# $CTRL = $tg_executor->CreateProcess ("$controller_exec", "-k file://Sender.ior");
-# $result = $CTRL->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-# if ($result != 0) {
-#     print STDERR "ERROR: The controller returned $result\n";
-#     $status = 1;
-# }
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -s\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                                  "-k file://$ior_emfile -x $cdp_file -s");
-$E->SpawnWaitKill (600);
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/.gitignore b/CIAO/connectors/dds4ccm/examples/Quoter/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Quoter/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Base/.gitignore b/CIAO/connectors/dds4ccm/examples/Quoter/Base/.gitignore
deleted file mode 100644
index b3680ac0a10..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Base/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/Quoter_Base.cxx
-/Quoter_Base.h
-/Quoter_BasePlugin.cxx
-/Quoter_BasePlugin.h
-/Quoter_BaseSupport.cxx
-/Quoter_BaseSupport.h
-/Quoter_Base_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl b/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl
deleted file mode 100644
index d1090b3c338..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * @file Quoter_Base.idl
- * @author William R. Otte <wotte@dre.vanderbilt.edu>
- */
-
-#ifndef QUOTER_BASE_IDL
-#define QUOTER_BASE_IDL
-
-#pragma ndds typesupport "Base/Quoter_BaseSupport.h"
-#pragma opendds typesupport "Base/Quoter_BaseTypeSupportImpl.h"
-#pragma coredx typesupport "Base/Quoter_BaseTypeSupport.hh"
-
-#pragma DCPS_DATA_TYPE "Quoter::Stock_Info"
-#pragma DCPS_DATA_KEY "Quoter::Stock_Info symbol"
-
-module Quoter
-{
-  struct Stock_Info
-  {
-    unsigned long low;
-    unsigned long high;
-    unsigned long current;
-    string symbol; //@key
-  };
-  #if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-  typedef sequence<Stock_Info> Stock_InfoSeq;
-  #endif
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc b/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc
deleted file mode 100644
index 34749fe2c06..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_Quoter_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_Quoter_Base_stub
-  dynamicflags += QUOTER_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=QUOTER_BASE_STUB_Export \
-              -Wb,stub_export_include=Quoter_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    Quoter_Base.idl
-  }
-
-  opendds_ts_flags += --export=QUOTER_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    Quoter_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/.gitignore b/CIAO/connectors/dds4ccm/examples/Quoter/Broker/.gitignore
deleted file mode 100644
index e8f702114ed..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/BrokerE.idl
-/Broker_exec_export.h
-/Broker_lem_stub_export.h
-/Broker_stub_export.h
-/Broker_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.idl b/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.idl
deleted file mode 100644
index 5f2082f60fb..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @file Broker.idl
- * @author William R. Otte <wotte@dre.vanderbilt.edu>
- */
-
-#ifndef BROKER_IDL
-#define BROKER_IDL
-
-#include "Connector/Quoter_Connector.idl"
-
-module Quoter
-{
-  component Broker
-  {
-    port ::Quoter::DDS_Listen info_out;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc b/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc
deleted file mode 100644
index da2e9084a36..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc
+++ /dev/null
@@ -1,138 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -l ../lib -o ../lib -u DDS -b dds4ccm_base Broker"
-
-project(DDS_Broker_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_Quoter_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=BROKER_STUB_Export \
-              -Wb,stub_export_include=Broker_stub_export.h \
-              -Wb,skel_export_macro=BROKER_SVNT_Export \
-              -Wb,skel_export_include=Broker_svnt_export.h \
-              -Wb,svnt_export_macro=BROKER_SVNT_Export \
-              -Wb,svnt_export_include=Broker_svnt_export.h \
-              -Wb,exec_export_macro=BROKER_EXEC_Export \
-              -Wb,exec_export_include=Broker_exec_export.h \
-              -I..
-
-  IDL_Files {
-    Broker.idl
-  }
-}
-
-project(DDS_Broker_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_Broker_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=BROKER_LEM_STUB_Export \
-              -Wb,stub_export_include=Broker_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    BrokerE.idl
-  }
-}
-
-project(DDS_Broker_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_Broker_lem_gen DDS_Broker_stub  DDS_Quoter_Connector_stub DDS_Quoter_Base_stub
-  libs  +=  Broker_stub DDS_Quoter_Connector_stub DDS_Quoter_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Broker_lem_stub
-  dynamicflags += BROKER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    BrokerEC.cpp
-  }
-
-  Header_Files {
-    BrokerEC.h
-    Broker_lem_stub_export.h
-  }
-
-  Inline_Files {
-    BrokerEC.inl
-  }
-}
-
-project(DDS_Broker_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_Broker_idl_gen  DDS_Quoter_Connector_stub DDS_Quoter_Base_stub DDS_Quoter_Connector_lem_gen
-  libs  += DDS_Quoter_Connector_stub DDS_Quoter_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Broker_stub
-  dynamicflags += BROKER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    BrokerC.cpp
-  }
-
-  Header_Files {
-    BrokerC.h
-    Broker_stub_export.h
-  }
-
-  Inline_Files {
-    BrokerC.inl
-  }
-}
-
-project(DDS_Broker_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_Broker_lem_stub DDS_Broker_stub DDS_Quoter_Base_stub DDS_Quoter_Connector_stub DDS_Quoter_Connector_lem_stub
-  sharedname = Broker_exec
-  libs += Broker_stub Broker_lem_stub DDS_Quoter_Base_stub DDS_Quoter_Connector_stub DDS_Quoter_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += BROKER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Broker_exec.cpp
-  }
-
-  Header_Files {
-    Broker_exec.h
-    Broker_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_Broker_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_Broker_lem_stub DDS_Quoter_Base_stub DDS_Quoter_Connector_stub DDS_Quoter_Connector_svnt DDS_Broker_exec DDS_Quoter_Connector_lem_stub
-  sharedname  = Broker_svnt
-  libs       += Broker_stub Broker_lem_stub DDS_Quoter_Base_stub DDS_Quoter_Connector_stub DDS_Quoter_Connector_svnt Broker_exec DDS_Quoter_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += BROKER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    BrokerS.cpp
-    Broker_svnt.cpp
-  }
-
-  Header_Files {
-    BrokerS.h
-    Broker_svnt.h
-    Broker_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp b/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp
deleted file mode 100644
index 32bbd9aa010..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp
+++ /dev/null
@@ -1,218 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "Broker_exec.h"
-#include "ace/OS_NS_time.h"
-
-namespace CIAO_Quoter_Broker_Impl
-{
-
-  /**
-   * Facet Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  info_out_data_listener_exec_i::info_out_data_listener_exec_i (
-        ::Quoter::CCM_Broker_Context_ptr ctx)
-    : ciao_context_ (
-        ::Quoter::CCM_Broker_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::Quoter::Listener
-
-  void
-  info_out_data_listener_exec_i::on_one_data (const ::Quoter::Stock_Info & datum,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Stock_Info_Listener: received a stock_info for <%C> at %u:%u:%u\n",
-            datum.symbol.in (),
-            datum.low,
-            datum.current,
-            datum.high));
-  }
-
-  void
-  info_out_data_listener_exec_i::on_many_data (const ::Quoter::Stock_InfoSeq & /* data */,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_status_exec_i
-   */
-
-  info_out_status_exec_i::info_out_status_exec_i (
-        ::Quoter::CCM_Broker_Context_ptr ctx)
-    : ciao_context_ (
-        ::Quoter::CCM_Broker_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_status_exec_i::~info_out_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    ACE_DEBUG ((LM_DEBUG, "####### deadline missed ######\n"));
-  }
-
-  void
-  info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & status)
-  {
-    ACE_DEBUG ((LM_DEBUG, "####### sample lost ######\n"));
-    ACE_DEBUG ((LM_DEBUG, " status.total_count = %d\n", status.total_count));
-    ACE_DEBUG ((LM_DEBUG, " status.total_count_change = %d\n", status.total_count_change));
-  }
-
-  /**
-   * Component Executor Implementation Class: Broker_exec_i
-   */
-
-  Broker_exec_i::Broker_exec_i (void)
-  {
-    ACE_OS::srand (static_cast <u_int> (ACE_OS::time ()));
-  }
-
-  Broker_exec_i::~Broker_exec_i (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Broker_exec_i::~Broker_exec_i\n"));
-  }
-
-  // Supported operations and attributes.
-
-  // Component attributes and port operations.
-
-  ::Quoter::CCM_Listener_ptr
-  Broker_exec_i::get_info_out_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ()))
-      {
-        info_out_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_data_listener_exec_i (
-            this->ciao_context_.in ()),
-            ::Quoter::CCM_Listener::_nil ());
-
-          this->ciao_info_out_data_listener_ = tmp;
-      }
-
-    return
-      ::Quoter::CCM_Listener::_duplicate (
-        this->ciao_info_out_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Broker_exec_i::get_info_out_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ()))
-      {
-        info_out_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_out_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_out_status_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Broker_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Quoter::CCM_Broker_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Broker_exec_i::configuration_complete (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, ">>> Broker_exec_i::configuration_complete\n"));
-  }
-
-  void
-  Broker_exec_i::ccm_activate (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, ">>> Broker_exec_i::ccm_activate\n"));
-    ::CCM_DDS::DataListenerControl_var lc =
-    this->ciao_context_->get_connection_info_out_data_control ();
-
-    if (::CORBA::is_nil (lc.in ()))
-      {
-        ACE_DEBUG ((LM_DEBUG, "Error:  Listener control receptacle is null!\n"));
-        throw ::CORBA::INTERNAL ();
-      }
-    lc->mode ( ::CCM_DDS::ONE_BY_ONE);
-  }
-
-  void
-  Broker_exec_i::ccm_passivate (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, ">>> Broker_exec_i::ccm_passivate\n"));
-  }
-
-  void
-  Broker_exec_i::ccm_remove (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, ">>> Broker_exec_i::ccm_remove\n"));
-  }
-
-  extern "C" BROKER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Quoter_Broker_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Broker_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.h b/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.h
deleted file mode 100644
index ea11e9a2173..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.h
+++ /dev/null
@@ -1,167 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_BROKER_EXEC_ULWEAH_H_
-#define CIAO_BROKER_EXEC_ULWEAH_H_
-
-#include /**/ "ace/pre.h"
-
-#include "BrokerEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Broker_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_Quoter_Broker_Impl
-{
-
-  /**
-   * Provider Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  class info_out_data_listener_exec_i
-    : public virtual ::Quoter::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_data_listener_exec_i (
-      ::Quoter::CCM_Broker_Context_ptr ctx);
-    virtual ~info_out_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from Quoter::Listener. */
-
-    virtual
-    void on_one_data (const ::Quoter::Stock_Info & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (const ::Quoter::Stock_InfoSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    ::Quoter::CCM_Broker_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_status_exec_i
-   */
-
-  class info_out_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_status_exec_i (
-      ::Quoter::CCM_Broker_Context_ptr ctx);
-    virtual ~info_out_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::Quoter::CCM_Broker_Context_var ciao_context_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Broker_exec_i
-   */
-
-  class Broker_exec_i
-    : public virtual Broker_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Broker_exec_i (void);
-    virtual ~Broker_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::Quoter::CCM_Listener_ptr
-    get_info_out_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_status (void);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-
-    //@}
-
-  private:
-    ::Quoter::CCM_Broker_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::Quoter::CCM_Listener_var ciao_info_out_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_;
-    //@}
-
-    //@{
-    /** User defined members. */
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-  };
-
-  extern "C" BROKER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Quoter_Broker_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Connector/.gitignore b/CIAO/connectors/dds4ccm/examples/Quoter/Connector/.gitignore
deleted file mode 100644
index 81c98544e51..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Connector/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/Quoter_ConnectorE.idl
-/Quoter_Connector_conn.cpp
-/Quoter_Connector_conn.h
-/Quoter_Connector_conn_export.h
-/Quoter_Connector_lem_stub_export.h
-/Quoter_Connector_stub_export.h
-/Quoter_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.idl b/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.idl
deleted file mode 100644
index a09fe6a0bee..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file Quoter_Connector.idl
- * @author William R. Otte <wotte@dre.vanderbilt.edu>
- */
-
-#ifndef QUOTER_CONNECTOR_IDL_
-#define QUOTER_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Quoter_Base.idl"
-
-#pragma ciao lem "Connector/Quoter_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/Quoter_BaseTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::Quoter::Stock_Info, ::Quoter::Stock_InfoSeq> Quoter;
-
-#endif /* QUOTER_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc b/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc
deleted file mode 100644
index 12ca1d082aa..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_Quoter_Base -l .. -o ../lib -u DDS Quoter_Connector"
-
-project(DDS_Quoter_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_Quoter_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=QUOTER_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=Quoter_Connector_stub_export.h \
-              -Wb,skel_export_macro=QUOTER_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=Quoter_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=QUOTER_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=Quoter_Connector_svnt_export.h \
-              -Wb,conn_export_macro=QUOTER_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Quoter_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Quoter_Connector.idl
-  }
-}
-
-project(DDS_Quoter_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_Quoter_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=QUOTER_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=Quoter_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    Quoter_ConnectorE.idl
-  }
-}
-
-project(DDS_Quoter_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_Quoter_Connector_lem_gen DDS_Quoter_Connector_stub DDS_Quoter_Base_stub
-  libs  += DDS_Quoter_Base_stub DDS_Quoter_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Quoter_Connector_lem_stub
-  dynamicflags += QUOTER_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Quoter_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    Quoter_ConnectorEC.h
-    Quoter_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Quoter_ConnectorEC.inl
-  }
-}
-
-project(DDS_Quoter_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_Quoter_Connector_idl_gen DDS_Quoter_Base_stub
-  libs  += DDS_Quoter_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Quoter_Connector_stub
-  dynamicflags += QUOTER_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Quoter_ConnectorC.cpp
-  }
-
-  Header_Files {
-    Quoter_ConnectorC.h
-    Quoter_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    Quoter_ConnectorC.inl
-  }
-}
-
-project(DDS_Quoter_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_Quoter_Connector_lem_stub DDS_Quoter_Connector_stub
-  sharedname = DDS_Quoter_Connector_exec
-  libs += DDS_Quoter_Connector_stub DDS_Quoter_Connector_lem_stub DDS_Quoter_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += QUOTER_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Quoter_Connector_conn.cpp
-  }
-
-  Header_Files {
-    Quoter_Connector_conn.h
-    Quoter_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_Quoter_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_Quoter_Connector_lem_stub DDS_Quoter_Connector_exec DDS_Quoter_Connector_stub
-  sharedname  = DDS_Quoter_Connector_svnt
-  libs       += DDS_Quoter_Connector_stub \
-                DDS_Quoter_Connector_lem_stub  \
-                DDS_Quoter_Base_stub \
-                DDS_Quoter_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += QUOTER_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Quoter_ConnectorS.cpp
-    Quoter_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    Quoter_ConnectorS.h
-    Quoter_Connector_svnt.h
-    Quoter_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/.gitignore b/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/.gitignore
deleted file mode 100644
index 79a9a6501cb..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/DistributorE.idl
-/Distributor_exec_export.h
-/Distributor_lem_stub_export.h
-/Distributor_stub_export.h
-/Distributor_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.idl b/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.idl
deleted file mode 100644
index 5b693131598..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.idl
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * @file Distributor.idl
- * @author William R. Otte <wotte@dre.vanderbilt.edu>
- */
-
-#ifndef DDS_DISTRIBUTOR_IDL
-#define DDS_DISTRIBUTOR_IDL
-
-#include "Connector/Quoter_Connector.idl"
-
-module Quoter
-{
-  interface Trigger
-  {
-    void add_stock (in string stock);
-    void del_stock (in string stock);
-    void start ();
-    void stop ();
-  };
-
-  component Distributor supports Trigger
-  {
-    port Quoter::DDS_Write info_in;
-    provides CCM_DDS::ConnectorStatusListener info_out_connector_status;
-    attribute unsigned long rate;
-  };
-};
-
-#endif
-
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc b/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc
deleted file mode 100644
index 1d7809a7bd1..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc
+++ /dev/null
@@ -1,138 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_Quoter_Base -l ../lib -o ../lib -c controller -u DDS Distributor"
-
-project(DDS_Distributor_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_Quoter_Connector_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=DISTRIBUTOR_STUB_Export \
-              -Wb,stub_export_include=Distributor_stub_export.h \
-              -Wb,skel_export_macro=DISTRIBUTOR_SVNT_Export \
-              -Wb,skel_export_include=Distributor_svnt_export.h \
-              -Wb,svnt_export_macro=DISTRIBUTOR_SVNT_Export \
-              -Wb,svnt_export_include=Distributor_svnt_export.h \
-              -Wb,exec_export_macro=DISTRIBUTOR_EXEC_Export \
-              -Wb,exec_export_include=Distributor_exec_export.h \
-              -I..
-
-  IDL_Files {
-    Distributor.idl
-  }
-}
-
-project(DDS_Distributor_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_Distributor_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=DISTRIBUTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=Distributor_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    DistributorE.idl
-  }
-}
-
-project(DDS_Distributor_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_Distributor_lem_gen DDS_Distributor_stub DDS_Quoter_Base_stub
-  libs  += DDS_Quoter_Base_stub Distributor_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Distributor_lem_stub
-  dynamicflags += DISTRIBUTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    DistributorEC.cpp
-  }
-
-  Header_Files {
-    DistributorEC.h
-    Distributor_lem_stub_export.h
-  }
-
-  Inline_Files {
-    DistributorEC.inl
-  }
-}
-
-project(DDS_Distributor_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_Distributor_idl_gen DDS_Quoter_Base_stub DDS_Quoter_Connector_stub
-  libs  += DDS_Quoter_Base_stub DDS_Quoter_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Distributor_stub
-  dynamicflags += DISTRIBUTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    DistributorC.cpp
-  }
-
-  Header_Files {
-    DistributorC.h
-    Distributor_stub_export.h
-  }
-
-  Inline_Files {
-    DistributorC.inl
-  }
-}
-
-project(DDS_Distributor_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_Distributor_lem_stub DDS_Distributor_stub DDS_Quoter_Connector_lem_stub DDS_Quoter_Connector_stub
-  sharedname = Distributor_exec
-  libs += Distributor_stub Distributor_lem_stub DDS_Quoter_Base_stub DDS_Quoter_Connector_lem_stub DDS_Quoter_Connector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += DISTRIBUTOR_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Distributor_exec.cpp
-  }
-
-  Header_Files {
-    Distributor_exec.h
-    Distributor_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_Distributor_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_Quoter_Base_stub  DDS_Distributor_lem_stub DDS_Quoter_Connector_stub DDS_Quoter_Connector_svnt  DDS_Quoter_Connector_lem_stub
-  sharedname  = Distributor_svnt
-  libs       += Distributor_stub Distributor_lem_stub  \
-                DDS_Quoter_Base_stub DDS_Quoter_Connector_stub DDS_Quoter_Connector_svnt DDS_Quoter_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += DISTRIBUTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    DistributorS.cpp
-    Distributor_svnt.cpp
-  }
-
-  Header_Files {
-    DistributorS.h
-    Distributor_svnt.h
-    Distributor_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp b/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp
deleted file mode 100644
index 9554eaaa413..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp
+++ /dev/null
@@ -1,354 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "Distributor_exec.h"
-#include "ace/OS_NS_time.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_Quoter_Distributor_Impl
-{
-  /**
-   * Write action generator
-   */
-
-  pulse_Generator::pulse_Generator (Distributor_exec_i &callback)
-    : pulse_callback_ (callback)
-  {
-  }
-
-  pulse_Generator::~pulse_Generator ()
-  {
-  }
-
-  int
-  pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    // Trigger the write action
-    this->pulse_callback_.tick ();
-    return 0;
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_connector_status_exec_i
-   */
-
-  info_out_connector_status_exec_i::info_out_connector_status_exec_i (
-        ::Quoter::CCM_Distributor_Context_ptr ctx)
-    : ciao_context_ (
-        ::Quoter::CCM_Distributor_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_connector_status_exec_i::~info_out_connector_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-
-  void
-  info_out_connector_status_exec_i::on_inconsistent_topic (::DDS::Topic_ptr /* the_topic */,
-  const ::DDS::InconsistentTopicStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_requested_incompatible_qos (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedIncompatibleQosStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_sample_rejected (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleRejectedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_offered_deadline_missed (::DDS::DataWriter_ptr /* the_writer */,
-  const ::DDS::OfferedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_offered_incompatible_qos (::DDS::DataWriter_ptr /* the_writer */,
-  const ::DDS::OfferedIncompatibleQosStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_unexpected_status (::DDS::Entity_ptr /* the_entity */,
-  ::DDS::StatusKind /* status_kind */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Component Executor Implementation Class: Distributor_exec_i
-   */
-
-  Distributor_exec_i::Distributor_exec_i (void)
-    : rate_ (1)
-  {
-    ACE_OS::srand (static_cast <u_int> (ACE_OS::time ()));
-    ACE_NEW_THROW_EX (this->ticker_,
-                      pulse_Generator (*this),
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Distributor_exec_i::~Distributor_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Distributor_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Distributor_exec_i::tick (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Ticking\n"));
-
-    for (Stock_Table::iterator i = this->stocks_.begin ();
-         i != this->stocks_.end ();
-         ++i)
-      {
-        if (ACE_OS::rand () % 2)
-          {
-            int const delta = (ACE_OS::rand () % 10) - 2;
-
-            i->second->current += delta;
-
-            if (i->second->current > i->second->high)
-              i->second->high = i->second->current;
-
-            if (i->second->current < i->second->low)
-              i->second->low = i->second->current;
-
-            ::Quoter::Writer_var writer =
-              this->ciao_context_->get_connection_info_in_data ();
-
-            if (! ::CORBA::is_nil (writer.in ())) {
-              ACE_DEBUG ((LM_DEBUG, "WRITE AND CREATE stock_info for <%C> %u:%u:%u\n",
-                            i->first.c_str (),
-                            i->second->low,
-                            i->second->current,
-                            i->second->high));
-              try
-                {
-                  writer->write_one (i->second, ::DDS::HANDLE_NIL);
-                }
-              catch (const CCM_DDS::InternalError& )
-                {
-                  ACE_ERROR ((LM_ERROR, "Internal Error while writing Stock_info for <%C>.\n",
-                                i->first.c_str ()));
-                }
-            }
-            else
-              ACE_ERROR ((LM_ERROR, "Writer reference is nil!\n"));
-          }
-      }
-  }
-
-  void
-  Distributor_exec_i::add_stock (const char * stock)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Distributor_exec_i::add_stock - Adding stock: %C\n", stock));
-
-    ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard,
-                        this->mutex_, CORBA::INTERNAL ());
-
-    Quoter::Stock_Info *new_stock = new Quoter::Stock_Info;
-
-    new_stock->low = 50;
-    new_stock->high = 50;
-    new_stock->current = 50;
-    new_stock->symbol = stock;
-
-    this->stocks_[stock] = new_stock;
-  }
-
-  void
-  Distributor_exec_i::del_stock (const char * stock)
-  {
-    ACE_DEBUG ((LM_DEBUG,
-                "Distributor_exec_i::del_stock - Removing stock: %C\n", stock));
-
-    ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard,
-                        this->mutex_, CORBA::INTERNAL ());
-
-    Stock_Table::iterator pos = this->stocks_.find (stock);
-
-    if (pos != this->stocks_.end ())
-      {
-        this->stocks_.erase (pos);
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR,
-                   "Distributor_exec_i::del_stock - Stock not present: %C\n",
-                    stock));
-      }
-  }
-
-  void
-  Distributor_exec_i::start (void)
-  {
-    // calculate the interval time
-    long const usec = 1000000 / this->rate_;
-    if (this->reactor ()->schedule_timer (
-                this->ticker_,
-                0,
-                ACE_Time_Value (0, usec),
-                ACE_Time_Value (0, usec)) == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "Distributor_exec_i::start : error scheduling timer\n"));
-    }
-  }
-
-  void
-  Distributor_exec_i::stop (void)
-  {
-    this->reactor ()->cancel_timer (this->ticker_);
-    ACE_DEBUG ((LM_DEBUG, "Distributor_exec_i::stop\n"));
-  }
-
-  // Component attributes and port operations.
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Distributor_exec_i::get_info_out_connector_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_connector_status_.in ()))
-      {
-        info_out_connector_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_connector_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_ConnectorStatusListener::_nil ());
-
-          this->ciao_info_out_connector_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_ConnectorStatusListener::_duplicate (
-        this->ciao_info_out_connector_status_.in ());
-  }
-
-  ::CORBA::ULong
-  Distributor_exec_i::rate (void)
-  {
-    return this->rate_;
-  }
-
-  void
-  Distributor_exec_i::rate (
-    const ::CORBA::ULong rate)
-  {
-    this->rate_ = rate;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Distributor_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Quoter::CCM_Distributor_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Distributor_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Distributor_exec_i::ccm_activate (void)
-  {
-    this->start ();
-    this->add_stock ("MSFT");
-    this->add_stock ("IBM");
-    this->add_stock ("HP");
-    this->add_stock ("DELL");
-    this->add_stock ("ACER");
-    this->add_stock ("ASUS");
-  }
-
-  void
-  Distributor_exec_i::ccm_passivate (void)
-  {
-    this->stop ();
-  }
-
-  void
-  Distributor_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" DISTRIBUTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Quoter_Distributor_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Distributor_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.h b/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.h
deleted file mode 100644
index 9e4e2fb5bce..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.h
+++ /dev/null
@@ -1,196 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_DISTRIBUTOR_EXEC_SBNFU0_H_
-#define CIAO_DISTRIBUTOR_EXEC_SBNFU0_H_
-
-#include /**/ "ace/pre.h"
-
-#include "DistributorEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Distributor_exec_export.h"
-#include "tao/LocalObject.h"
-
-#include <map>
-
-namespace CIAO_Quoter_Distributor_Impl
-{
-  class Distributor_exec_i;
-
-  /**
-  * @class pulse generator
-  *
-  * @brief An active object used by StockDistributor to perform periodical
-  * write action to DDS
-  *
-  */
-  class pulse_Generator : public ACE_Event_Handler
-  {
-  public:
-    pulse_Generator (Distributor_exec_i &callback);
-
-    virtual ~pulse_Generator ();
-
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    Distributor_exec_i &pulse_callback_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_connector_status_exec_i
-   */
-
-  class info_out_connector_status_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_connector_status_exec_i (
-      ::Quoter::CCM_Distributor_Context_ptr ctx);
-    virtual ~info_out_connector_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-    const ::DDS::InconsistentTopicStatus & status);
-
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedIncompatibleQosStatus & status);
-
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleRejectedStatus & status);
-
-    virtual
-    void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-    const ::DDS::OfferedDeadlineMissedStatus & status);
-
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-    const ::DDS::OfferedIncompatibleQosStatus & status);
-
-    virtual
-    void on_unexpected_status (::DDS::Entity_ptr the_entity,
-    ::DDS::StatusKind status_kind);
-    //@}
-
-  private:
-    ::Quoter::CCM_Distributor_Context_var ciao_context_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Distributor_exec_i
-   */
-
-  class Distributor_exec_i
-    : public virtual Distributor_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Distributor_exec_i (void);
-    virtual ~Distributor_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    virtual void add_stock (const char * stock);
-
-    virtual void del_stock (const char * stock);
-
-    virtual void start (void);
-
-    virtual void stop (void);
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_info_out_connector_status (void);
-
-    virtual ::CORBA::ULong rate (void);
-
-    virtual void rate (::CORBA::ULong rate);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void tick (void);
-
-    //@}
-
-  private:
-    ::Quoter::CCM_Distributor_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::CCM_DDS::CCM_ConnectorStatusListener_var ciao_info_out_connector_status_;
-
-    ::CORBA::ULong rate_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    pulse_Generator * ticker_;
-
-    TAO_SYNCH_MUTEX mutex_;
-    typedef std::map<ACE_CString, Quoter::Stock_Info_var> Stock_Table;
-    Stock_Table stocks_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" DISTRIBUTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Quoter_Distributor_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/examples/Quoter/descriptors/Plan.cdp
deleted file mode 100644
index 26c8216ada8..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Quoter/descriptors/Plan.cdp
+++ /dev/null
@@ -1,426 +0,0 @@
-<!--  -->
-<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>Quoter_Depl_1</label>
-  <UUID>Quoter_Depl_1</UUID>
-
-  <implementation xmi:id="BrokerComponentImplementation">
-    <name>BrokerComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Broker_ExecArtifact" />
-    <artifact xmi:idref="Broker_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Quoter_Broker_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Quoter_Broker_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Broker_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Broker_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Quoter_ConnectorComponentImplementation">
-    <name>Quoter_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Quoter_Connector_ExecArtifact" />
-    <artifact xmi:idref="Quoter_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Quoter_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Quoter_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Quoter_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Quoter_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="DistributorComponentImplementation">
-    <name>DistributorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Distributor_ExecArtifact" />
-    <artifact xmi:idref="Distributor_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Quoter_Distributor_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Quoter_Distributor_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Distributor_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Distributor_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="BrokerComponentInstance">
-    <name>BrokerComponent</name>
-    <node>BrokerNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="BrokerComponentImplementation" />
-  </instance>
-  <instance xmi:id="Quoter_ConnectorComponentInstance">
-    <name>Quoter_ConnectorComponent</name>
-    <node>DistributorNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Quoter_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Quoter</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="Quoter_ConnectorComponentInstance2">
-    <name>Quoter_ConnectorComponent2</name>
-    <node>BrokerNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Quoter_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Quoter</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="DistributorComponentInstance">
-    <name>DistributorComponent</name>
-    <node>DistributorNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="DistributorComponentImplementation" />
-  </instance>
-
-
-  <connection>
-    <name>info_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="BrokerComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Quoter_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>_listenercontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="BrokerComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Quoter_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="BrokerComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Quoter_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>_datareader</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="BrokerComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Quoter_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>_portstatuslistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="BrokerComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Quoter_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>_connectorstatuslistener_distributor</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="DistributorComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Quoter_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_in_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="DistributorComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Quoter_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <!--connection>
-    <name>updater_connection</name>
-    <internalEndpoint>
-      <portName>info_update_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="DistributorComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>info_update_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Quoter_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection-->
-
-  <artifact xmi:id="Distributor_ExecArtifact">
-    <name>Distributor_exec</name>
-    <source/>
-    <node/>
-    <location>Distributor_exec</location>
-  </artifact>
-  <artifact xmi:id="Distributor_SvntArtifact">
-    <name>Distributor_svnt</name>
-    <source/>
-    <node/>
-    <location>Distributor_svnt</location>
-  </artifact>
-  <artifact xmi:id="Distributor_StubArtifact">
-    <name>Distributor_stub</name>
-    <source/>
-    <node/>
-    <location>Distributor_stub</location>
-  </artifact>
-  <artifact xmi:id="Quoter_Connector_ExecArtifact">
-    <name>Quoter_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Quoter_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Quoter_Connector_SvntArtifact">
-    <name>Quoter_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Quoter_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Quoter_Connector_StubArtifact">
-    <name>Quoter_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Quoter_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Broker_ExecArtifact">
-    <name>Broker_exec</name>
-    <source/>
-    <node/>
-    <location>Broker_exec</location>
-  </artifact>
-  <artifact xmi:id="Broker_SvntArtifact">
-    <name>Broker_svnt</name>
-    <source/>
-    <node/>
-    <location>Broker_svnt</location>
-  </artifact>
-  <artifact xmi:id="Broker_StubArtifact">
-    <name>Broker_stub</name>
-    <source/>
-    <node/>
-    <location>Broker_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl
deleted file mode 100755
index 7abf104c710..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "DistributorNode", "BrokerNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 30 seconds to allow task to complete\n";
-sleep (30);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/.gitignore b/CIAO/connectors/dds4ccm/examples/Shapes/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Shapes/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Base/.gitignore b/CIAO/connectors/dds4ccm/examples/Shapes/Base/.gitignore
deleted file mode 100644
index d7628eb7cc6..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Base/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/Shapes_Base.cxx
-/Shapes_Base.h
-/Shapes_BasePlugin.cxx
-/Shapes_BasePlugin.h
-/Shapes_BaseSupport.cxx
-/Shapes_BaseSupport.h
-/Shapes_Base_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl b/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl
deleted file mode 100644
index 49f178f6d4e..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * @file Shapes_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef SHAPES_BASE_IDL
-#define SHAPES_BASE_IDL
-
-#pragma ndds typesupport "Base/Shapes_BaseSupport.h"
-#pragma opendds typesupport "Base/Shapes_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "org::omg::dds::demo::ShapeType"
-#pragma DCPS_DATA_KEY "org::omg::dds::demo::ShapeType color"
-
-module org {
-  module omg {
-    module dds {
-      module demo {
-        struct ShapeType {
-          string color; //@key
-          long x;
-          long y;
-          long shapesize;
-        };
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-        typedef sequence<ShapeType> ShapeTypeSeq;
-#endif
-      };
-    };
-  };
-};
-
-
-#pragma keylist ShapeType color
-
-#pragma DCPS_DATA_TYPE "org::omg::dds::demo::Attributes"
-#pragma DCPS_DATA_KEY "org::omg::dds::demo::Attributes shape"
-#pragma DCPS_DATA_KEY "org::omg::dds::demo::Attributes color"
-
-module org {
-  module omg {
-    module dds {
-      module demo {
-        struct Attributes {
-          string shape; //@key
-          string color; //@key
-          float speed;
-        };
-      };
-    };
-  };
-};
-
-// #pragma DCPS_DATA_SEQUENCE_TYPE "AttributesSeq"
-// typedef sequence<Attributes> AttributesSeq;
-
-#pragma keylist Attributes shape color
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc b/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc
deleted file mode 100644
index c370655b160..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_Shapes_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_Shapes_Base_stub
-  dynamicflags += SHAPES_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=SHAPES_BASE_STUB_Export \
-              -Wb,stub_export_include=Shapes_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    Shapes_Base.idl
-  }
-
-  opendds_ts_flags += --export=SHAPES_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    Shapes_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Connector/.gitignore b/CIAO/connectors/dds4ccm/examples/Shapes/Connector/.gitignore
deleted file mode 100644
index b4bfd04182c..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Connector/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/Shapes_ConnectorE.idl
-/Shapes_Connector_conn.cpp
-/Shapes_Connector_conn.h
-/Shapes_Connector_conn_export.h
-/Shapes_Connector_lem_stub_export.h
-/Shapes_Connector_stub_export.h
-/Shapes_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl b/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl
deleted file mode 100644
index 9669a787727..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file Shapes_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef SHAPES_CONNECTOR_IDL_
-#define SHAPES_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Shapes_Base.idl"
-
-#pragma ciao lem "Connector/Shapes_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/Shapes_BaseTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::org::omg::dds::demo::ShapeType, ::org::omg::dds::demo::ShapeTypeSeq> Shapes;
-
-#endif /* SHAPES_CONNECTOR_IDL_ */
-
-
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc b/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc
deleted file mode 100644
index c0f218bea41..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_Shapes_Base -l .. -o ../lib -u DDS Shapes_Connector"
-
-project(DDS_Shapes_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_Shapes_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SHAPES_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=Shapes_Connector_stub_export.h \
-              -Wb,skel_export_macro=SHAPES_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=Shapes_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=SHAPES_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=Shapes_Connector_svnt_export.h \
-              -Wb,conn_export_macro=SHAPES_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Shapes_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Shapes_Connector.idl
-  }
-}
-
-project(DDS_Shapes_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_Shapes_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=SHAPES_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=Shapes_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    Shapes_ConnectorE.idl
-  }
-}
-
-project(DDS_Shapes_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_Shapes_Connector_lem_gen DDS_Shapes_Connector_stub DDS_Shapes_Base_stub
-  libs  += DDS_Shapes_Base_stub DDS_Shapes_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Shapes_Connector_lem_stub
-  dynamicflags += SHAPES_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Shapes_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    Shapes_ConnectorEC.h
-    Shapes_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Shapes_ConnectorEC.inl
-  }
-}
-
-project(DDS_Shapes_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_Shapes_Connector_idl_gen DDS_Shapes_Base_stub
-  libs  += DDS_Shapes_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Shapes_Connector_stub
-  dynamicflags += SHAPES_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Shapes_ConnectorC.cpp
-  }
-
-  Header_Files {
-    Shapes_ConnectorC.h
-    Shapes_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    Shapes_ConnectorC.inl
-  }
-}
-
-project(DDS_Shapes_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_Shapes_Connector_lem_stub DDS_Shapes_Connector_stub
-  sharedname = DDS_Shapes_Connector_exec
-  libs += DDS_Shapes_Connector_stub DDS_Shapes_Connector_lem_stub DDS_Shapes_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SHAPES_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Shapes_Connector_conn.cpp
-  }
-
-  Header_Files {
-    Shapes_Connector_conn.h
-    Shapes_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_Shapes_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_Shapes_Connector_lem_stub DDS_Shapes_Connector_exec DDS_Shapes_Connector_stub
-  sharedname  = DDS_Shapes_Connector_svnt
-  libs       += DDS_Shapes_Connector_stub \
-                DDS_Shapes_Connector_lem_stub  \
-                DDS_Shapes_Base_stub \
-                DDS_Shapes_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SHAPES_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Shapes_ConnectorS.cpp
-    Shapes_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    Shapes_ConnectorS.h
-    Shapes_Connector_svnt.h
-    Shapes_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/.gitignore b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/.gitignore
deleted file mode 100644
index 23750473699..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/Receiver_exec_export.h
-/Receiver_lem_stub_export.h
-/Receiver_stub_export.h
-/Receiver_svnt_export.h
-/Shapes_ReceiverE.idl
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.idl b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.idl
deleted file mode 100644
index b152d0228d4..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/Shapes_Connector.idl"
-
-module Shapes
-{
-  component Receiver
-  {
-    port Shapes::DDS_Listen info_out;
-    port Shapes::DDS_Get info_get;
-    attribute unsigned long rate;
-    attribute boolean get_data; //if true, get_one and get_all are invoked
-    attribute boolean read_data;//if true, read_one and read_all are invoked.
-    attribute boolean raw_listen; //if true, raw listen port is enabled.
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc
deleted file mode 100644
index 87c757c3463..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc
+++ /dev/null
@@ -1,138 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -l ../lib -o ../lib -u DDS -b dds4ccm_base Receiver"
-
-project(DDS_Shapes_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_Shapes_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h \
-              -I..
-
-  IDL_Files {
-    Shapes_Receiver.idl
-  }
-}
-
-project(DDS_Shapes_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_Shapes_Receiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    Shapes_ReceiverE.idl
-  }
-}
-
-project(DDS_Shapes_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_Shapes_Receiver_lem_gen DDS_Shapes_Receiver_stub  DDS_Shapes_Connector_stub DDS_Shapes_Base_stub
-  libs  +=  Receiver_stub DDS_Shapes_Connector_stub DDS_Shapes_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Shapes_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    Shapes_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Shapes_ReceiverEC.inl
-  }
-}
-
-project(DDS_Shapes_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_Shapes_Receiver_idl_gen  DDS_Shapes_Connector_stub DDS_Shapes_Base_stub DDS_Shapes_Connector_lem_gen
-  libs  += DDS_Shapes_Connector_stub DDS_Shapes_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Shapes_ReceiverC.cpp
-  }
-
-  Header_Files {
-    Shapes_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    Shapes_ReceiverC.inl
-  }
-}
-
-project(DDS_Shapes_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_Shapes_Receiver_lem_stub DDS_Shapes_Receiver_stub DDS_Shapes_Base_stub DDS_Shapes_Connector_stub DDS_Shapes_Connector_lem_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_Shapes_Base_stub DDS_Shapes_Connector_stub DDS_Shapes_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Shapes_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    Shapes_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_Shapes_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_Shapes_Receiver_lem_stub DDS_Shapes_Base_stub DDS_Shapes_Connector_stub DDS_Shapes_Connector_svnt DDS_Shapes_Receiver_exec DDS_Shapes_Connector_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_Shapes_Base_stub DDS_Shapes_Connector_stub DDS_Shapes_Connector_svnt Receiver_exec DDS_Shapes_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Shapes_ReceiverS.cpp
-    Shapes_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    Shapes_ReceiverS.h
-    Shapes_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp
deleted file mode 100644
index f64d740e019..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp
+++ /dev/null
@@ -1,577 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.0
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "Shapes_Receiver_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-#include "ace/OS_NS_time.h"
-#include "dds4ccm/impl/TimeUtilities.h"
-
-namespace CIAO_Shapes_Receiver_Impl
-{
-
-  /**
-   * Read action generator
-   */
-
-  read_action_Generator::read_action_Generator (Receiver_exec_i &callback)
-    : pulse_callback_ (callback)
-  {
-  }
-
-  read_action_Generator::~read_action_Generator ()
-  {
-  }
-
-  int
-  read_action_Generator::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    if (pulse_callback_.read_data ())
-      {
-        this->pulse_callback_.read_one();
-        this->pulse_callback_.read_all();
-      }
-    if (pulse_callback_.get_data ())
-      {
-        this->pulse_callback_.get_one ();
-      }
-    return 0;
-  }
-
-
-  /**
-   * Facet Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  info_out_data_listener_exec_i::info_out_data_listener_exec_i (
-        ::Shapes::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::Shapes::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::Shapes::Listener
-
-  void
-  info_out_data_listener_exec_i::on_one_data (const ::ShapeType & datum,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    ::Shapes::Reader_var reader =
-      this->ciao_context_->get_connection_info_out_data ();
-    ::CORBA::Object_var cmp = reader->_get_component ();
-    if (::CORBA::is_nil (cmp.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: info_out_data_listener_exec_i::on_one_data - "
-                              "Unable to get component interface\n"));
-        throw ::CORBA::INTERNAL ();
-      }
-    ::Shapes::CCM_DDS_Event_var conn =
-      ::Shapes::CCM_DDS_Event::_narrow (cmp.in ());
-    if (::CORBA::is_nil (conn.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: info_out_data_listener_exec_i::on_one_data - "
-                              "Unable to narrow connector interface\n"));
-        throw ::CORBA::INTERNAL ();
-      }
-    CORBA::String_var topic = conn->topic_name ();
-
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ShapeType_Listener: ")
-            ACE_TEXT ("received shape_info <%C> for <%C> at X <%u> Y <%u> size <%u>\n"),
-            topic.in (),
-            datum.color.in (),
-            datum.x,
-            datum.y,
-            datum.shapesize));
-  }
-
-  void
-  info_out_data_listener_exec_i::on_many_data (const ::ShapeTypeSeq & /* data */,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_status_exec_i
-   */
-
-  info_out_status_exec_i::info_out_status_exec_i (
-        ::Shapes::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::Shapes::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_status_exec_i::~info_out_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_get_status_exec_i
-   */
-
-  info_get_status_exec_i::info_get_status_exec_i (
-        ::Shapes::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::Shapes::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_get_status_exec_i::~info_get_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_get_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_get_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : rate_ (0)
-      , get_data_ (true)
-      , read_data_ (true)
-      , raw_listen_ (false)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      read_action_Generator (*this),
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Receiver_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Receiver_exec_i::read_one (void)
-  {
-    ShapeType  shape_info;
-    shape_info.color = "GREEN";
-    ::CCM_DDS::ReadInfo readinfo;
-
-    try
-      {
-        ::Shapes::Reader_var reader =
-          this->ciao_context_->get_connection_info_out_data ();
-        if (! ::CORBA::is_nil (reader.in ()))
-          {
-            ::CORBA::Object_var cmp = reader->_get_component ();
-            if (::CORBA::is_nil (cmp.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::read_one - "
-                                      "Unable to get component interface\n"));
-                throw ::CORBA::INTERNAL ();
-              }
-            ::Shapes::CCM_DDS_Event_var conn =
-              ::Shapes::CCM_DDS_Event::_narrow (cmp.in ());
-            if (::CORBA::is_nil (conn.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::read_one - "
-                                      "Unable to narrow connector interface\n"));
-                throw ::CORBA::INTERNAL ();
-              }
-            CORBA::String_var topic = conn->topic_name ();
-
-            reader->read_one_last (shape_info, readinfo, ::DDS::HANDLE_NIL);
-            ACE_Time_Value time;
-            time <<= readinfo.source_timestamp;
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ONE Read_Info ")
-                      ACE_TEXT (" -> date = %#T\n"), &time));
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ ON shape info : ")
-                ACE_TEXT ("received shape_info <%C> for <%C> at X <%u> Y <%u> size <%u>\n"),
-                topic.in (),
-                shape_info.color.in (),
-                shape_info.x,
-                shape_info.y,
-                shape_info.shapesize));
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "Receiver_exec_i::read_one - "
-                      "ERROR: reader seems to be nil.\n"));
-          }
-      }
-    catch(const CCM_DDS::NonExistent& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ShapeType_Read_One: ")
-                  ACE_TEXT ("no shape_info received\n")));
-      }
-  }
-
-  void
-  Receiver_exec_i::read_all (void)
-  {
-    ShapeTypeSeq shape_infos;
-    ::CCM_DDS::ReadInfoSeq readinfoseq;
-    ::Shapes::Reader_var reader =
-      this->ciao_context_->get_connection_info_out_data ();
-    if (! ::CORBA::is_nil (reader.in ()))
-      {
-        ::CORBA::Object_var cmp = reader->_get_component ();
-        if (::CORBA::is_nil (cmp.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::read_all - "
-                                  "Unable to get component interface\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-        ::Shapes::CCM_DDS_Event_var conn =
-          ::Shapes::CCM_DDS_Event::_narrow (cmp.in ());
-        if (::CORBA::is_nil (conn.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::read_all - "
-                                  "Unable to narrow connector interface\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-        CORBA::String_var topic = conn->topic_name ();
-
-        reader->read_all(shape_infos, readinfoseq);
-        for(CORBA::ULong i = 0; i < readinfoseq.length(); ++i)
-          {
-            ACE_Time_Value time;
-            time <<= readinfoseq[i].source_timestamp;
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL ReadInfo ")
-                ACE_TEXT ("-> UTC date = %#T\n"), &time));
-          }
-        for(CORBA::ULong i = 0; i < shape_infos.length(); ++i)
-          {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL Shape Info : ")
-                ACE_TEXT ("received shape_info <%C> for <%C> at X <%u> Y <%u> size <%u>\n"),
-                topic.in (),
-                shape_infos[i].color.in (),
-                shape_infos[i].x,
-                shape_infos[i].y,
-                shape_infos[i].shapesize));
-          }
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::read_all - "
-                  "ERROR: reader seems to be nil.\n"));
-      }
-  }
-
-  void
-  Receiver_exec_i::get_one (void)
-  {
-    ShapeType_var shape_info;
-    ::CCM_DDS::ReadInfo_var readinfo;
-
-    try
-      {
-        ::Shapes::Getter_var getter =
-          this->ciao_context_->get_connection_info_get_fresh_data ();
-        if (! ::CORBA::is_nil (getter.in ()))
-          {
-            ::CORBA::Object_var cmp = getter->_get_component ();
-            if (::CORBA::is_nil (cmp.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::get_one - "
-                                      "Unable to get component interface\n"));
-                throw ::CORBA::INTERNAL ();
-              }
-            ::Shapes::CCM_DDS_Event_var conn =
-              ::Shapes::CCM_DDS_Event::_narrow (cmp.in ());
-            if (::CORBA::is_nil (conn.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::get_one - "
-                                      "Unable to narrow connector interface\n"));
-                throw ::CORBA::INTERNAL ();
-              }
-            CORBA::String_var topic = conn->topic_name ();
-
-            if (getter->get_one (shape_info.out (), readinfo.out ()))
-              {
-                ACE_Time_Value time;
-                time <<= readinfo->source_timestamp;
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("GET_ONE ReadInfo -> ")
-                                      ACE_TEXT ("date = %#T\n"), &time));
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("GET_ONE ShapeType : ")
-                    ACE_TEXT ("received shape_info <%C> for <%C> at X <%u> Y <%u> size <%u>\n"),
-                    topic.in (),
-                    shape_info->color.in (),
-                    shape_info->x,
-                    shape_info->y,
-                    shape_info->shapesize));
-              }
-            else
-              {
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("GET_ONE No data available for <%C>\n"),
-                        shape_info->color.in ()));
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_one - "
-                      "ERROR: Getter seems nil\n"));
-          }
-      }
-    catch(const CCM_DDS::NonExistent& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ShapeType_Read_One: no shape_info receieved\n")));
-      }
-  }
-
-  // Component attributes and port operations.
-
-  ::Shapes::CCM_Listener_ptr
-  Receiver_exec_i::get_info_out_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ()))
-      {
-        info_out_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_data_listener_exec_i (
-            this->ciao_context_.in ()),
-            ::Shapes::CCM_Listener::_nil ());
-
-          this->ciao_info_out_data_listener_ = tmp;
-      }
-
-    return
-      ::Shapes::CCM_Listener::_duplicate (
-        this->ciao_info_out_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ()))
-      {
-        info_out_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_out_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_out_status_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_get_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_get_status_.in ()))
-      {
-        info_get_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_get_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_get_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_get_status_.in ());
-  }
-
-  ::CORBA::ULong
-  Receiver_exec_i::rate (void)
-  {
-    return this->rate_;
-  }
-
-  void
-  Receiver_exec_i::rate (
-    const ::CORBA::ULong rate)
-  {
-    this->rate_ = rate;
-  }
-
-  ::CORBA::Boolean
-  Receiver_exec_i::get_data (void)
-  {
-    return this->get_data_;
-  }
-
-  void
-  Receiver_exec_i::get_data (
-    const ::CORBA::Boolean get_data)
-  {
-    this->get_data_ = get_data;
-  }
-
-  ::CORBA::Boolean
-  Receiver_exec_i::read_data (void)
-  {
-    return this->read_data_;
-  }
-
-  void
-  Receiver_exec_i::read_data (
-    const ::CORBA::Boolean read_data)
-  {
-    this->read_data_ = read_data;
-  }
-
-  ::CORBA::Boolean
-  Receiver_exec_i::raw_listen (void)
-  {
-    return this->raw_listen_;
-  }
-
-  void
-  Receiver_exec_i::raw_listen (
-    const ::CORBA::Boolean raw_listen)
-  {
-    this->raw_listen_ = raw_listen;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Shapes::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    ::CCM_DDS::DataListenerControl_var lc =
-      this->ciao_context_->get_connection_info_out_data_control ();
-
-    if (::CORBA::is_nil (lc.in ()))
-      {
-        ACE_ERROR ((LM_INFO, ACE_TEXT ("Error:  Listener control receptacle is null!\n")));
-        throw ::CORBA::INTERNAL ();
-      }
-
-    lc->mode (this->raw_listen_ ? ::CCM_DDS::ONE_BY_ONE : ::CCM_DDS::NOT_ENABLED);
-
-    // calculate the interval time
-    long const usec = 1000000 / this->rate_;
-    if (this->reactor ()->schedule_timer (this->ticker_,
-                                          0,
-                                          ACE_Time_Value(0, usec),
-                                          ACE_Time_Value(0, usec)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, "Unable to schedule Timer\n"));
-      }
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    this->reactor ()->cancel_timer (this->ticker_);
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Shapes_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.h b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.h
deleted file mode 100644
index 5b4ee0068f5..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.h
+++ /dev/null
@@ -1,260 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.0
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_SHAPES_RECEIVER_EXEC_4YQX0E_H_
-#define CIAO_SHAPES_RECEIVER_EXEC_4YQX0E_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Shapes_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-// 2013 version of the DDS shapes example moves
-// the ShapeType to a nested module
-using org::omg::dds::demo::ShapeType;
-using org::omg::dds::demo::ShapeTypeSeq;
-using org::omg::dds::demo::ShapeType_var;
-
-namespace CIAO_Shapes_Receiver_Impl
-{
-  class Receiver_exec_i;
-
-  /**
-  * @class reader activity generator
-  *
-  * @brief an active object used by Receiver to perform a periodical read action
-  *
-  */
-  class read_action_Generator
-    : public ACE_Event_Handler
-  {
-  public:
-    read_action_Generator (Receiver_exec_i &callback);
-
-    ~read_action_Generator ();
-
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-
-  private:
-    Receiver_exec_i &pulse_callback_;
-
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  class info_out_data_listener_exec_i
-    : public virtual ::Shapes::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_data_listener_exec_i (
-      ::Shapes::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from Shapes::Listener. */
-
-    virtual
-    void on_one_data (const ::ShapeType & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (const ::ShapeTypeSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    ::Shapes::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_status_exec_i
-   */
-
-  class info_out_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_status_exec_i (
-      ::Shapes::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::Shapes::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_get_status_exec_i
-   */
-
-  class info_get_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_get_status_exec_i (
-      ::Shapes::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_get_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::Shapes::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::Shapes::CCM_Listener_ptr
-    get_info_out_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_status (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_get_status (void);
-
-    virtual ::CORBA::ULong rate (void);
-
-    virtual void rate (::CORBA::ULong rate);
-
-    virtual ::CORBA::Boolean get_data (void);
-
-    virtual void get_data (::CORBA::Boolean get_data);
-
-    virtual ::CORBA::Boolean read_data (void);
-
-    virtual void read_data (::CORBA::Boolean read_data);
-
-    virtual ::CORBA::Boolean raw_listen (void);
-
-    virtual void raw_listen (::CORBA::Boolean raw_listen);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void read_one (void);
-    void read_all (void);
-    void get_one (void);
-
-    //@}
-
-  private:
-    ::Shapes::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::Shapes::CCM_Listener_var ciao_info_out_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_get_status_;
-
-    ::CORBA::ULong rate_;
-
-    ::CORBA::Boolean get_data_;
-
-    ::CORBA::Boolean read_data_;
-
-    ::CORBA::Boolean raw_listen_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    read_action_Generator * ticker_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Shapes_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/.gitignore b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/.gitignore
deleted file mode 100644
index 8df0b59631f..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/Sender_exec_export.h
-/Sender_lem_stub_export.h
-/Sender_stub_export.h
-/Sender_svnt_export.h
-/Shapes_SenderE.idl
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.idl b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.idl
deleted file mode 100644
index d0ea6a9c8a1..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_SHAPES_SENDER_IDL
-#define DDS_SHAPES_SENDER_IDL
-
-#include "Connector/Shapes_Connector.idl"
-
-module Shapes
-{
-  component Sender
-  {
-    port Shapes::DDS_Write info_write;
-    attribute unsigned long rate;
-    attribute unsigned short max_x;
-    attribute unsigned short max_y;
-    attribute unsigned short max_size;
-    attribute boolean resize_shape;
-    attribute string color;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc
deleted file mode 100644
index fadc1c3c0e9..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc
+++ /dev/null
@@ -1,138 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_Shapes_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_Shapes_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_Shapes_Connector_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I..
-
-  IDL_Files {
-    Shapes_Sender.idl
-  }
-}
-
-project(DDS_Shapes_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_Shapes_Sender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    Shapes_SenderE.idl
-  }
-}
-
-project(DDS_Shapes_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_Shapes_Sender_lem_gen DDS_Shapes_Sender_stub DDS_Shapes_Base_stub
-  libs  += DDS_Shapes_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Shapes_SenderEC.cpp
-  }
-
-  Header_Files {
-    Shapes_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Shapes_SenderEC.inl
-  }
-}
-
-project(DDS_Shapes_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_Shapes_Sender_idl_gen DDS_Shapes_Base_stub DDS_Shapes_Connector_stub
-  libs  += DDS_Shapes_Base_stub DDS_Shapes_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Shapes_SenderC.cpp
-  }
-
-  Header_Files {
-    Shapes_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    Shapes_SenderC.inl
-  }
-}
-
-project(DDS_Shapes_Sender_exec) : ciao_executor, dds4ccm_base {
-  after   += DDS_Shapes_Sender_lem_stub DDS_Shapes_Sender_stub DDS_Shapes_Connector_lem_stub DDS_Shapes_Connector_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub DDS_Shapes_Base_stub DDS_Shapes_Connector_lem_stub DDS_Shapes_Connector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Shapes_Sender_exec.cpp
-  }
-
-  Header_Files {
-    Shapes_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_Shapes_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_Shapes_Base_stub  DDS_Shapes_Sender_lem_stub DDS_Shapes_Connector_stub DDS_Shapes_Connector_svnt  DDS_Shapes_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                DDS_Shapes_Base_stub DDS_Shapes_Connector_stub DDS_Shapes_Connector_svnt DDS_Shapes_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Shapes_SenderS.cpp
-    Shapes_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    Shapes_SenderS.h
-    Shapes_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.cpp b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.cpp
deleted file mode 100644
index 22da2de39d9..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.cpp
+++ /dev/null
@@ -1,407 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.0
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "Shapes_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_Shapes_Sender_Impl
-{
-
-  /**
-   * Write action generator
-   */
-
-  pulse_Generator::pulse_Generator (Sender_exec_i &callback)
-    : pulse_callback_ (callback)
-  {
-  }
-
-  pulse_Generator::~pulse_Generator ()
-  {
-  }
-
-  int
-  pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    this->pulse_callback_.tick ();
-    return 0;
-  }
-
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : rate_ (1)
-      , max_x_ (100)
-      , max_y_ (100)
-      , max_size_ (25)
-      , resize_shape_ (false)
-      , color_ ("CYAN")
-      , x_increasing_ (false)
-      , y_increasing_ (false)
-      , size_increasing_ (false)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      pulse_Generator (*this),
-                      ::CORBA::NO_MEMORY ());
-    ACE_NEW_THROW_EX (this->square_,
-                      ShapeType,
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->ticker_;
-    delete this->square_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Sender_exec_i::tick ()
-  {
-    if (this->x_increasing_)
-      {
-        ++this->square_->x;
-        this->x_increasing_ = this->square_->x + 1 <= this->max_x_;
-      }
-    else
-      {
-        --this->square_->x;
-        this->x_increasing_ = this->square_->x - 1 < 0;
-      }
-    if (this->y_increasing_)
-      {
-        ++this->square_->y;
-        this->y_increasing_ = this->square_->y + 1 <= this->max_y_;
-      }
-    else
-      {
-        --this->square_->y;
-        this->y_increasing_ = this->square_->y - 1 < 0;
-      }
-    if (resize_shape ())
-      {
-        if (this->size_increasing_)
-          {
-            ++this->square_->shapesize;
-            this->size_increasing_ = this->square_->shapesize + 1 <= this->max_size_;
-          }
-        else
-          {
-            --this->square_->shapesize;
-            this->size_increasing_ = this->square_->shapesize - 1 < 0;
-          }
-      }
-    try
-      {
-        Shapes::Writer_var writer =
-          this->ciao_context_->get_connection_info_write_data ();
-        if (! ::CORBA::is_nil (writer.in ()))
-          {
-            ::CORBA::Object_var cmp = writer->_get_component ();
-            if (::CORBA::is_nil (cmp.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::tick - "
-                                      "Unable to get component interface\n"));
-                throw ::CORBA::INTERNAL ();
-              }
-            ::Shapes::CCM_DDS_Event_var conn =
-              ::Shapes::CCM_DDS_Event::_narrow (cmp.in ());
-            if (::CORBA::is_nil (conn.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::tick - "
-                                      "Unable to narrow connector interface\n"));
-                throw ::CORBA::INTERNAL ();
-              }
-            CORBA::String_var topic = conn->topic_name ();
-
-            writer->write_one (*this->square_, this->instance_handle_);
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("UPDATED Shape_info <%C> for <%C> %u:%u:%u\n"),
-                      topic.in (),
-                      this->square_->color.in (),
-                      this->square_->x,
-                      this->square_->y,
-                      this->square_->shapesize));
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "Sender_exec_i::tick - "
-                      "ERROR: Writer seems nil.\n"));
-          }
-      }
-    catch (const CCM_DDS::NonExistent& )
-      {
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("Shape_info for <%C> not updated: didn't exist.\n"),
-                    this->square_->color.in ()));
-      }
-    catch (const CCM_DDS::InternalError& )
-      {
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("Internal Error while updating Shape_info for <%C>.\n"),
-                    this->square_->color.in ()));
-      }
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    // calculate the interval time
-    long const usec = 1000000 / this->rate_;
-    if (this->reactor ()->schedule_timer (
-                this->ticker_,
-                0,
-                ACE_Time_Value (0, usec),
-                ACE_Time_Value (0, usec)) == -1)
-    {
-      ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                             ACE_TEXT ("Error scheduling timer")));
-    }
-  }
-
-  void
-  Sender_exec_i::stop (void)
-  {
-    this->reactor ()->cancel_timer (this->ticker_);
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n")));
-    try
-      {
-        Shapes::Writer_var writer =
-          this->ciao_context_->get_connection_info_write_data ();
-        if (! ::CORBA::is_nil (writer.in ()))
-          {
-            writer->unregister_instance (*this->square_,
-                                         this->instance_handle_);
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "Sender_exec_i::stop - "
-                      "ERROR: Writer seems nil.\n"));
-          }
-      }
-    catch (const CCM_DDS::NonExistent& )
-      {
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("Shape_info for <%C> not deleted: <%C> didn't exist.\n"),
-                    this->square_->color.in (), this->square_->color.in ()));
-      }
-    catch (const CCM_DDS::InternalError& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while deleting Shape_info for <%C>.\n"),
-                    this->square_->color.in ()));
-      }
-  }
-
-  // Component attributes and port operations.
-
-  ::CORBA::ULong
-  Sender_exec_i::rate (void)
-  {
-    return this->rate_;
-  }
-
-  void
-  Sender_exec_i::rate (
-    const ::CORBA::ULong rate)
-  {
-    this->rate_ = rate;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::max_x (void)
-  {
-    return this->max_x_;
-  }
-
-  void
-  Sender_exec_i::max_x (
-    const ::CORBA::UShort max_x)
-  {
-    this->max_x_ = max_x;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::max_y (void)
-  {
-    return this->max_y_;
-  }
-
-  void
-  Sender_exec_i::max_y (
-    const ::CORBA::UShort max_y)
-  {
-    this->max_y_ = max_y;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::max_size (void)
-  {
-    return this->max_size_;
-  }
-
-  void
-  Sender_exec_i::max_size (
-    const ::CORBA::UShort max_size)
-  {
-    this->max_size_ = max_size;
-  }
-
-  ::CORBA::Boolean
-  Sender_exec_i::resize_shape (void)
-  {
-    return this->resize_shape_;
-  }
-
-  void
-  Sender_exec_i::resize_shape (
-    const ::CORBA::Boolean resize_shape)
-  {
-    this->resize_shape_ = resize_shape;
-  }
-
-  char*
-  Sender_exec_i::color (void)
-  {
-    return ::CORBA::string_dup (this->color_);
-  }
-
-  void
-  Sender_exec_i::color (const char* color)
-  {
-    this->color_ = ::CORBA::string_dup (color);
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Shapes::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    // Set the square properties right now
-    this->square_->x = ACE_OS::rand () % this->max_x_;
-    this->square_->y = ACE_OS::rand () % this->max_y_;
-    this->square_->shapesize = this->max_size_;
-    this->square_->color = CORBA::string_dup(this->color_);
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-    this->start ();
-
-    // Register shape with dds.
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("REGISTER Shape_info for <%C> %u:%u:%u\n"),
-                  this->square_->color.in (),
-                  this->square_->x,
-                  this->square_->y,
-                  this->square_->shapesize));
-    try
-      {
-        Shapes::Writer_var writer =
-          this->ciao_context_->get_connection_info_write_data ();
-        if (! ::CORBA::is_nil (writer.in ()))
-          {
-            this->instance_handle_ =
-              writer->register_instance (*this->square_);
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "Sender_exec_i::ccm_activate - "
-                      "ERROR: Writer seems nil.\n"));
-          }
-      }
-    catch (const CCM_DDS::AlreadyCreated& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Shape_info for <%C> already created.\n"),
-                    this->square_->color.in ()));
-      }
-    catch (const CCM_DDS::InternalError& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while creating Shape_info for <%C>.\n"),
-                      this->square_->color.in ()));
-      }
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    this->stop ();
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Shapes_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.h b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.h
deleted file mode 100644
index fdbc6bef248..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.h
+++ /dev/null
@@ -1,177 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.0
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_SHAPES_SENDER_EXEC_ETSDUL_H_
-#define CIAO_SHAPES_SENDER_EXEC_ETSDUL_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Shapes_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-// 2013 version of the DDS shapes example moves
-// the ShapeType to a nested module
-using org::omg::dds::demo::ShapeType;
-using org::omg::dds::demo::ShapeTypeSeq;
-using org::omg::dds::demo::ShapeType_var;
-
-namespace CIAO_Shapes_Sender_Impl
-{
-  class Sender_exec_i;
-
-  /**
-   * Write action generator
-   */
-
-  class pulse_Generator : public ACE_Event_Handler
-  {
-  public:
-    pulse_Generator (Sender_exec_i &callback);
-
-    virtual ~pulse_Generator ();
-
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    Sender_exec_i &pulse_callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CORBA::ULong rate (void);
-
-    virtual void rate (::CORBA::ULong rate);
-
-    virtual ::CORBA::UShort max_x (void);
-
-    virtual void max_x (::CORBA::UShort max_x);
-
-    virtual ::CORBA::UShort max_y (void);
-
-    virtual void max_y (::CORBA::UShort max_y);
-
-    virtual ::CORBA::UShort max_size (void);
-
-    virtual void max_size (::CORBA::UShort max_size);
-
-    virtual ::CORBA::Boolean resize_shape (void);
-
-    virtual void resize_shape (::CORBA::Boolean resize_shape);
-
-    virtual char *color (void);
-
-    virtual void color (const char* color);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void tick (void);
-
-    //@}
-
-  private:
-    ::Shapes::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-
-    ::CORBA::ULong rate_;
-
-    ::CORBA::UShort max_x_;
-
-    ::CORBA::UShort max_y_;
-
-    ::CORBA::UShort max_size_;
-
-    ::CORBA::Boolean resize_shape_;
-
-    ::CORBA::String_var color_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    void start (void);
-    void stop (void);
-
-    pulse_Generator * ticker_;
-
-    bool x_increasing_;
-    bool y_increasing_;
-    bool size_increasing_;
-
-    ShapeType* square_;
-
-    ::DDS::InstanceHandle_t instance_handle_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Shapes_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_1.cdp b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_1.cdp
deleted file mode 100644
index 88ef3a83c34..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_1.cdp
+++ /dev/null
@@ -1,498 +0,0 @@
-<!--  -->
-<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>Shapes_Depl_1</label>
-  <UUID>Shapes_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Shapes_ConnectorComponentImplementation">
-    <name>Shapes_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Shapes_Connector_ExecArtifact" />
-    <artifact xmi:idref="Shapes_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shapes_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shapes_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>1</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>get_data</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>read_data</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>raw_listen</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>true</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="Shapes_ConnectorComponentInstance">
-    <name>Shapes_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Shapes_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Square</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>type_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ShapeType</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="Shapes_ConnectorComponentInstance2">
-    <name>Shapes_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Shapes_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Square</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>type_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ShapeType</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>color</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ORANGE</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>10</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_x</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>225</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_y</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>250</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_size</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>50</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>resize_shape</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>true</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>info_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Shapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_listenercontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Shapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_portstatuslistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Shapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Shapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Shapes_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="Shapes_Connector_ExecArtifact">
-    <name>Shapes_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Shapes_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Shapes_Connector_SvntArtifact">
-    <name>Shapes_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Shapes_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Shapes_Connector_StubArtifact">
-    <name>Shapes_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Shapes_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_1.pl b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_1.pl
deleted file mode 100755
index 3c66fb771f8..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_1.pl
+++ /dev/null
@@ -1,244 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-$DDS_ROOT = "$ENV{'DDS_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "run_1.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 60 seconds to allow task to complete\n";
-sleep (60);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_2.cdp b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_2.cdp
deleted file mode 100644
index 49379039587..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_2.cdp
+++ /dev/null
@@ -1,1123 +0,0 @@
-<!--  -->
-<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>Shapes_Depl_1</label>
-  <UUID>Shapes_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Shapes_ConnectorComponentImplementation">
-    <name>Shapes_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Shapes_Connector_ExecArtifact" />
-    <artifact xmi:idref="Shapes_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shapes_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shapes_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="SquareReceiverComponentInstance">
-    <name>SquareReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>1</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>get_data</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>read_data</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>raw_listen</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>true</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="CircleReceiverComponentInstance">
-    <name>CircleReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>1</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>get_data</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>read_data</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>raw_listen</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>true</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="TriangleReceiverComponentInstance">
-    <name>TriangleReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>1</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>get_data</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>read_data</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>raw_listen</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>true</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="SquareShapes_ConnectorComponentInstance">
-    <name>SquareShapes_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Shapes_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>run_2#square</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Square</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>type_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ShapeType</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="CircleShapes_ConnectorComponentInstance">
-    <name>CircleShapes_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Shapes_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>run_2#circle</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Circle</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>type_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ShapeType</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="TriangleShapes_ConnectorComponentInstance">
-    <name>TriangleShapes_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Shapes_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>run_2#triangle</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Triangle</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>type_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ShapeType</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SquareShapes_ConnectorComponentInstance2">
-    <name>SquareShapes_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Shapes_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>run_2#square</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Square</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>type_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ShapeType</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="CircleShapes_ConnectorComponentInstance2">
-    <name>CircleShapes_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Shapes_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>run_2#circle</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Circle</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>type_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ShapeType</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="TriangleShapes_ConnectorComponentInstance2">
-    <name>TriangleShapes_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Shapes_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>run_2#triangle</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Triangle</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>type_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ShapeType</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SquareSenderComponentInstance">
-    <name>SquareSenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>color</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ORANGE</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>10</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_x</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>225</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_y</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>250</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_size</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>50</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>resize_shape</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="CircleSenderComponentInstance">
-    <name>CircleSenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>color</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ORANGE</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>10</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_x</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>225</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_y</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>250</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_size</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>50</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>resize_shape</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="TriangleSenderComponentInstance">
-    <name>TriangleSenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>color</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ORANGE</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>10</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_x</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>225</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_y</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>250</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_size</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>50</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>resize_shape</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>square_info_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SquareReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SquareShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>square_listenercontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SquareReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SquareShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>square_portstatuslistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SquareReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SquareShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>square_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SquareReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SquareShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>circle_info_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CircleReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CircleShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>circle_listenercontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CircleReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CircleShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>circle_portstatuslistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CircleReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CircleShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>circle_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CircleReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CircleShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>triangle_info_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="TriangleReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="TriangleShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>triangle_listenercontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="TriangleReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="TriangleShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>triangle_portstatuslistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="TriangleReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="TriangleShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>triangle_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="TriangleReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="TriangleShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>square_writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SquareSenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SquareShapes_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>circle_writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CircleSenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CircleShapes_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>triangle_writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="TriangleSenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="TriangleShapes_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="Shapes_Connector_ExecArtifact">
-    <name>Shapes_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Shapes_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Shapes_Connector_SvntArtifact">
-    <name>Shapes_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Shapes_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Shapes_Connector_StubArtifact">
-    <name>Shapes_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Shapes_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_2.pl b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_2.pl
deleted file mode 100755
index ce146787830..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_2.pl
+++ /dev/null
@@ -1,244 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-$DDS_ROOT = "$ENV{'DDS_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "run_2.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 60 seconds to allow task to complete\n";
-sleep (60);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_2.xml b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_2.xml
deleted file mode 100644
index d4fb8fcce40..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_2.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-  <qos_profile name="square">
-     <datawriter_qos>
-          <reliability>
-               <kind>RELIABLE_RELIABILITY_QOS</kind>
-         </reliability>
-     </datawriter_qos>
-    <datareader_qos>
-          <reliability>
-               <kind>RELIABLE_RELIABILITY_QOS</kind>
-          </reliability>
-     </datareader_qos>
-  </qos_profile>
-  <qos_profile name="circle">
-     <datawriter_qos>
-          <reliability>
-               <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-         </reliability>
-     </datawriter_qos>
-    <datareader_qos>
-          <reliability>
-               <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-          </reliability>
-     </datareader_qos>
-  </qos_profile>
-  <qos_profile name="triangle">
-     <datawriter_qos>
-          <reliability>
-               <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-         </reliability>
-     </datawriter_qos>
-    <datareader_qos>
-          <reliability>
-               <kind>RELIABLE_RELIABILITY_QOS</kind>
-          </reliability>
-     </datareader_qos>
-  </qos_profile>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_3.cdp b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_3.cdp
deleted file mode 100644
index d3e6b58e216..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_3.cdp
+++ /dev/null
@@ -1,1123 +0,0 @@
-<!--  -->
-<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>Shapes_Depl_1</label>
-  <UUID>Shapes_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Shapes_ConnectorComponentImplementation">
-    <name>Shapes_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Shapes_Connector_ExecArtifact" />
-    <artifact xmi:idref="Shapes_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shapes_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shapes_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="SquareReceiverComponentInstance">
-    <name>SquareReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>1</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>get_data</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>read_data</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>raw_listen</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>true</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="CircleReceiverComponentInstance">
-    <name>CircleReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>1</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>get_data</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>read_data</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>raw_listen</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>true</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="TriangleReceiverComponentInstance">
-    <name>TriangleReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>1</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>get_data</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>read_data</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>raw_listen</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>true</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="SquareShapes_ConnectorComponentInstance">
-    <name>SquareShapes_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Shapes_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>run_3#square</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Square</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>type_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ShapeType</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="CircleShapes_ConnectorComponentInstance">
-    <name>CircleShapes_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Shapes_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>run_3#circle</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Circle</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>type_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ShapeType</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="TriangleShapes_ConnectorComponentInstance">
-    <name>TriangleShapes_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Shapes_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>run_3#triangle</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Triangle</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>type_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ShapeType</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SquareShapes_ConnectorComponentInstance2">
-    <name>SquareShapes_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Shapes_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>run_3#square</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Square</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>type_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ShapeType</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="CircleShapes_ConnectorComponentInstance2">
-    <name>CircleShapes_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Shapes_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>run_3#circle</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Circle</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>type_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ShapeType</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="TriangleShapes_ConnectorComponentInstance2">
-    <name>TriangleShapes_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Shapes_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>run_3#triangle</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Triangle</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>type_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ShapeType</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SquareSenderComponentInstance">
-    <name>SquareSenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>color</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ORANGE</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>10</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_x</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>225</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_y</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>250</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_size</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>50</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>resize_shape</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="CircleSenderComponentInstance">
-    <name>CircleSenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>color</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ORANGE</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>10</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_x</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>225</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_y</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>250</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_size</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>50</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>resize_shape</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="TriangleSenderComponentInstance">
-    <name>TriangleSenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>color</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ORANGE</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>10</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_x</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>225</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_y</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>250</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_size</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>50</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>resize_shape</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>square_info_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SquareReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SquareShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>square_listenercontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SquareReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SquareShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>square_portstatuslistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SquareReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SquareShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>square_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SquareReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SquareShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>circle_info_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CircleReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CircleShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>circle_listenercontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CircleReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CircleShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>circle_portstatuslistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CircleReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CircleShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>circle_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CircleReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CircleShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>triangle_info_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="TriangleReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="TriangleShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>triangle_listenercontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="TriangleReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="TriangleShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>triangle_portstatuslistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="TriangleReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="TriangleShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>triangle_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="TriangleReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="TriangleShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>square_writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SquareSenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SquareShapes_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>circle_writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CircleSenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CircleShapes_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>triangle_writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="TriangleSenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="TriangleShapes_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="Shapes_Connector_ExecArtifact">
-    <name>Shapes_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Shapes_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Shapes_Connector_SvntArtifact">
-    <name>Shapes_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Shapes_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Shapes_Connector_StubArtifact">
-    <name>Shapes_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Shapes_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_3.pl b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_3.pl
deleted file mode 100755
index 41b8d20a33b..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_3.pl
+++ /dev/null
@@ -1,244 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-$DDS_ROOT = "$ENV{'DDS_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "run_3.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 60 seconds to allow task to complete\n";
-sleep (60);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_3.xml b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_3.xml
deleted file mode 100644
index 18bcdceb388..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_3.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-  <qos_profile name="square">
-     <datawriter_qos>
-          <ownership>
-               <kind>SHARED_OWNERSHIP_QOS</kind>
-         </ownership>
-     </datawriter_qos>
-    <datareader_qos>
-          <ownership>
-               <kind>SHARED_OWNERSHIP_QOS</kind>
-          </ownership>
-     </datareader_qos>
-  </qos_profile>
-  <qos_profile name="circle">
-     <datawriter_qos>
-          <ownership>
-               <kind>EXCLUSIVE_OWNERSHIP_QOS</kind>
-         </ownership>
-     </datawriter_qos>
-    <datareader_qos>
-          <ownership>
-               <kind>EXCLUSIVE_OWNERSHIP_QOS</kind>
-          </ownership>
-     </datareader_qos>
-  </qos_profile>
-  <qos_profile name="triangle">
-     <datawriter_qos>
-          <ownership>
-               <kind>EXCLUSIVE_OWNERSHIP_QOS</kind>
-         </ownership>
-     </datawriter_qos>
-    <datareader_qos>
-          <ownership>
-               <kind>SHARED_OWNERSHIP_QOS</kind>
-          </ownership>
-     </datareader_qos>
-  </qos_profile>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_4.cdp b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_4.cdp
deleted file mode 100644
index 6924e4745ae..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_4.cdp
+++ /dev/null
@@ -1,520 +0,0 @@
-<!--  -->
-<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>Shapes_Depl_1</label>
-  <UUID>Shapes_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Shapes_ConnectorComponentImplementation">
-    <name>Shapes_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Shapes_Connector_ExecArtifact" />
-    <artifact xmi:idref="Shapes_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shapes_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shapes_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>1</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>get_data</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>read_data</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>raw_listen</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>true</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="Shapes_ConnectorComponentInstance">
-    <name>Shapes_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Shapes_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>run_4#square</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Square</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>type_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ShapeType</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="Shapes_ConnectorComponentInstance2">
-    <name>Shapes_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Shapes_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>run_4#square</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Square</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>type_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ShapeType</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>color</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CYAN</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>10</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_x</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>225</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_y</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>250</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_size</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>50</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>resize_shape</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>true</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>info_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Shapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_listenercontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Shapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_portstatuslistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Shapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Shapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Shapes_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="Shapes_Connector_ExecArtifact">
-    <name>Shapes_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Shapes_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Shapes_Connector_SvntArtifact">
-    <name>Shapes_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Shapes_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Shapes_Connector_StubArtifact">
-    <name>Shapes_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Shapes_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_4.pl b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_4.pl
deleted file mode 100755
index c473392791b..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_4.pl
+++ /dev/null
@@ -1,244 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-$DDS_ROOT = "$ENV{'DDS_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "run_4.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 60 seconds to allow task to complete\n";
-sleep (60);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_4.xml b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_4.xml
deleted file mode 100644
index 8840d92ca72..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_4.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-  <qos_profile name="square">
-     <datawriter_qos>
-          <durability>
-               <kind>TRANSIENT_DURABILITY_QOS</kind>
-          </durability>
-          <history>
-               <kind>KEEP_LAST_HISTORY_QOS</kind>
-               <depth>100</depth>
-          </history>
-     </datawriter_qos>
-    <datareader_qos>
-          <durability>
-               <kind>TRANSIENT_DURABILITY_QOS</kind>
-          </durability>
-          <history>
-               <kind>KEEP_LAST_HISTORY_QOS</kind>
-               <depth>100</depth>
-          </history>
-     </datareader_qos>
-  </qos_profile>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_6.cdp b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_6.cdp
deleted file mode 100644
index 1d9e102818e..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_6.cdp
+++ /dev/null
@@ -1,1123 +0,0 @@
-<!--  -->
-<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>Shapes_Depl_1</label>
-  <UUID>Shapes_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Shapes_ConnectorComponentImplementation">
-    <name>Shapes_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Shapes_Connector_ExecArtifact" />
-    <artifact xmi:idref="Shapes_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shapes_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shapes_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="SquareReceiverComponentInstance">
-    <name>SquareReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>1</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>get_data</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>read_data</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>raw_listen</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>true</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="CircleReceiverComponentInstance">
-    <name>CircleReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>1</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>get_data</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>read_data</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>raw_listen</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>true</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="TriangleReceiverComponentInstance">
-    <name>TriangleReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>1</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>get_data</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>read_data</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>raw_listen</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>true</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="SquareShapes_ConnectorComponentInstance">
-    <name>SquareShapes_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Shapes_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>run_6#square</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Square</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>type_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ShapeType</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="CircleShapes_ConnectorComponentInstance">
-    <name>CircleShapes_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Shapes_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>run_6#circle</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Circle</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>type_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ShapeType</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="TriangleShapes_ConnectorComponentInstance">
-    <name>TriangleShapes_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Shapes_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>run_6#triangle</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Triangle</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>type_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ShapeType</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SquareShapes_ConnectorComponentInstance2">
-    <name>SquareShapes_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Shapes_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>run_6#square</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Square</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>type_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ShapeType</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="CircleShapes_ConnectorComponentInstance2">
-    <name>CircleShapes_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Shapes_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>run_6#circle</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Circle</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>type_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ShapeType</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="TriangleShapes_ConnectorComponentInstance2">
-    <name>TriangleShapes_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Shapes_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>run_6#triangle</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Triangle</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>type_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ShapeType</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SquareSenderComponentInstance">
-    <name>SquareSenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>color</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ORANGE</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>10</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_x</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>225</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_y</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>250</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_size</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>50</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>resize_shape</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="CircleSenderComponentInstance">
-    <name>CircleSenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>color</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ORANGE</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>10</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_x</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>225</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_y</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>250</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_size</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>50</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>resize_shape</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="TriangleSenderComponentInstance">
-    <name>TriangleSenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>color</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ORANGE</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>10</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_x</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>225</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_y</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>250</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_size</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>50</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>resize_shape</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>square_info_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SquareReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SquareShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>square_listenercontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SquareReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SquareShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>square_portstatuslistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SquareReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SquareShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>square_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SquareReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SquareShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>circle_info_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CircleReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CircleShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>circle_listenercontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CircleReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CircleShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>circle_portstatuslistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CircleReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CircleShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>circle_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CircleReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CircleShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>triangle_info_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="TriangleReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="TriangleShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>triangle_listenercontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="TriangleReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="TriangleShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>triangle_portstatuslistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="TriangleReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="TriangleShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>triangle_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="TriangleReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="TriangleShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>square_writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SquareSenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SquareShapes_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>circle_writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CircleSenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CircleShapes_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>triangle_writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="TriangleSenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="TriangleShapes_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="Shapes_Connector_ExecArtifact">
-    <name>Shapes_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Shapes_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Shapes_Connector_SvntArtifact">
-    <name>Shapes_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Shapes_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Shapes_Connector_StubArtifact">
-    <name>Shapes_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Shapes_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_6.pl b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_6.pl
deleted file mode 100755
index 96d90a577dc..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_6.pl
+++ /dev/null
@@ -1,244 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-$DDS_ROOT = "$ENV{'DDS_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "run_6.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 60 seconds to allow task to complete\n";
-sleep (60);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_6.xml b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_6.xml
deleted file mode 100644
index d526f8785fd..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_6.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-  <qos_profile name="square">
-     <publisher_qos>
-          <partition>
-            <name>
-               <element>A</element>
-            </name>
-         </partition>
-     </publisher_qos>
-    <subscriber_qos>
-          <partition>
-            <name>
-               <element>A</element>
-            </name>
-         </partition>
-     </subscriber_qos>
-  </qos_profile>
-  <qos_profile name="circle">
-     <publisher_qos>
-          <partition>
-            <name>
-               <element>B</element>
-            </name>
-         </partition>
-     </publisher_qos>
-    <subscriber_qos>
-          <partition>
-            <name>
-               <element>A</element>
-            </name>
-         </partition>
-     </subscriber_qos>
-  </qos_profile>
-  <qos_profile name="triangle">
-     <publisher_qos>
-          <partition>
-            <name>
-               <element>*</element>
-            </name>
-         </partition>
-     </publisher_qos>
-    <subscriber_qos>
-          <partition>
-            <name>
-               <element>A</element>
-            </name>
-         </partition>
-     </subscriber_qos>
-  </qos_profile>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_7.cdp b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_7.cdp
deleted file mode 100644
index 6856a4bbdc7..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_7.cdp
+++ /dev/null
@@ -1,520 +0,0 @@
-<!--  -->
-<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>Shapes_Depl_1</label>
-  <UUID>Shapes_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Shapes_ConnectorComponentImplementation">
-    <name>Shapes_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Shapes_Connector_ExecArtifact" />
-    <artifact xmi:idref="Shapes_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shapes_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shapes_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>1</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>get_data</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>read_data</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>raw_listen</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>true</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="Shapes_ConnectorComponentInstance">
-    <name>Shapes_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Shapes_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>run_7#square</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Square</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>type_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ShapeType</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="Shapes_ConnectorComponentInstance2">
-    <name>Shapes_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Shapes_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>run_7#square</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Square</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>type_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ShapeType</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>color</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>MAGENTA</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>10</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_x</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>225</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_y</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>250</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_size</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>50</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>resize_shape</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>true</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>info_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Shapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_listenercontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Shapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_portstatuslistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Shapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Shapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Shapes_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="Shapes_Connector_ExecArtifact">
-    <name>Shapes_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Shapes_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Shapes_Connector_SvntArtifact">
-    <name>Shapes_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Shapes_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Shapes_Connector_StubArtifact">
-    <name>Shapes_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Shapes_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_7.pl b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_7.pl
deleted file mode 100755
index 636abccd514..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_7.pl
+++ /dev/null
@@ -1,244 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-$DDS_ROOT = "$ENV{'DDS_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "run_7.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 60 seconds to allow task to complete\n";
-sleep (60);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_7.xml b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_7.xml
deleted file mode 100644
index 584fa8abc5e..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_7.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-  <qos_profile name="square">
-     <datawriter_qos>
-          <ownership_strength>
-               <value>10</value>
-          </ownership_strength>
-          <ownership>
-               <kind>EXCLUSIVE_OWNERSHIP_QOS</kind>
-          </ownership>
-     </datawriter_qos>
-    <datareader_qos>
-          <ownership>
-               <kind>EXCLUSIVE_OWNERSHIP_QOS</kind>
-          </ownership>
-     </datareader_qos>
-  </qos_profile>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_8.cdp b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_8.cdp
deleted file mode 100644
index 4627540e501..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_8.cdp
+++ /dev/null
@@ -1,840 +0,0 @@
-<!--  -->
-<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>Shapes_Depl_1</label>
-  <UUID>Shapes_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Shapes_ConnectorComponentImplementation">
-    <name>Shapes_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Shapes_Connector_ExecArtifact" />
-    <artifact xmi:idref="Shapes_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shapes_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shapes_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="SquareReceiverComponentInstance">
-    <name>SquareReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>1</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>get_data</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>read_data</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>raw_listen</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>true</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="CircleReceiverComponentInstance">
-    <name>CircleReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>1</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>get_data</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>read_data</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>raw_listen</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>true</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SquareShapes_ConnectorComponentInstance">
-    <name>SquareShapes_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Shapes_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>run_6#square</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Square</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>type_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ShapeType</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="CircleShapes_ConnectorComponentInstance">
-    <name>CircleShapes_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Shapes_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>run_6#circle</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Circle</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>type_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ShapeType</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SquareShapes_ConnectorComponentInstance2">
-    <name>SquareShapes_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Shapes_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>run_6#square</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Square</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>type_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ShapeType</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="CircleShapes_ConnectorComponentInstance2">
-    <name>CircleShapes_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Shapes_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>run_6#circle</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Circle</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>type_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ShapeType</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SquareSenderComponentInstance">
-    <name>SquareSenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>color</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ORANGE</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>10</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_x</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>225</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_y</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>250</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_size</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>50</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>resize_shape</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="CircleSenderComponentInstance">
-    <name>CircleSenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>color</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ORANGE</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>10</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_x</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>225</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_y</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>250</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_size</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>50</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>resize_shape</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <connection>
-    <name>square_info_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SquareReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SquareShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>square_listenercontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SquareReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SquareShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>square_portstatuslistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SquareReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SquareShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>square_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SquareReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SquareShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>circle_info_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CircleReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CircleShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>circle_listenercontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CircleReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CircleShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>circle_portstatuslistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CircleReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CircleShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>circle_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CircleReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CircleShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>square_writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SquareSenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SquareShapes_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>circle_writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CircleSenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CircleShapes_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>triangle_writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="TriangleSenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="TriangleShapes_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="Shapes_Connector_ExecArtifact">
-    <name>Shapes_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Shapes_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Shapes_Connector_SvntArtifact">
-    <name>Shapes_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Shapes_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Shapes_Connector_StubArtifact">
-    <name>Shapes_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Shapes_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_8.pl b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_8.pl
deleted file mode 100755
index 951988bf471..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_8.pl
+++ /dev/null
@@ -1,244 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-$DDS_ROOT = "$ENV{'DDS_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "run_8.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 60 seconds to allow task to complete\n";
-sleep (60);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_8.xml b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_8.xml
deleted file mode 100644
index 584fa8abc5e..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_8.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-  <qos_profile name="square">
-     <datawriter_qos>
-          <ownership_strength>
-               <value>10</value>
-          </ownership_strength>
-          <ownership>
-               <kind>EXCLUSIVE_OWNERSHIP_QOS</kind>
-          </ownership>
-     </datawriter_qos>
-    <datareader_qos>
-          <ownership>
-               <kind>EXCLUSIVE_OWNERSHIP_QOS</kind>
-          </ownership>
-     </datareader_qos>
-  </qos_profile>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_9.cdp b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_9.cdp
deleted file mode 100644
index 6924e4745ae..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_9.cdp
+++ /dev/null
@@ -1,520 +0,0 @@
-<!--  -->
-<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>Shapes_Depl_1</label>
-  <UUID>Shapes_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Shapes_ConnectorComponentImplementation">
-    <name>Shapes_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Shapes_Connector_ExecArtifact" />
-    <artifact xmi:idref="Shapes_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shapes_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shapes_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>1</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>get_data</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>read_data</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>raw_listen</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>true</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="Shapes_ConnectorComponentInstance">
-    <name>Shapes_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Shapes_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>run_4#square</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Square</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>type_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ShapeType</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="Shapes_ConnectorComponentInstance2">
-    <name>Shapes_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Shapes_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>run_4#square</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Square</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>type_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ShapeType</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>color</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CYAN</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>10</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_x</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>225</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_y</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>250</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_size</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>50</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>resize_shape</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>true</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>info_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Shapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_listenercontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Shapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_portstatuslistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Shapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Shapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Shapes_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="Shapes_Connector_ExecArtifact">
-    <name>Shapes_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Shapes_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Shapes_Connector_SvntArtifact">
-    <name>Shapes_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Shapes_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Shapes_Connector_StubArtifact">
-    <name>Shapes_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Shapes_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_9.pl b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_9.pl
deleted file mode 100755
index 80d69fd0310..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_9.pl
+++ /dev/null
@@ -1,244 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-$DDS_ROOT = "$ENV{'DDS_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "run_9.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 60 seconds to allow task to complete\n";
-sleep (60);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_9.xml b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_9.xml
deleted file mode 100644
index c1cde9f28eb..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_9.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-  <qos_profile name="square">
-     <datawriter_qos>
-     </datawriter_qos>
-    <datareader_qos>
-     </datareader_qos>
-  </qos_profile>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/Plan.cdp
deleted file mode 100644
index b9af4bbfb65..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/Plan.cdp
+++ /dev/null
@@ -1,498 +0,0 @@
-<!--  -->
-<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>Shapes_Depl_1</label>
-  <UUID>Shapes_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Shapes_ConnectorComponentImplementation">
-    <name>Shapes_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Shapes_Connector_ExecArtifact" />
-    <artifact xmi:idref="Shapes_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shapes_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shapes_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>1</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>get_data</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>read_data</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>raw_listen</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>true</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="Shapes_ConnectorComponentInstance">
-    <name>Shapes_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Shapes_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Square</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>type_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ShapeType</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="Shapes_ConnectorComponentInstance2">
-    <name>Shapes_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Shapes_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Square</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>type_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ShapeType</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>color</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CYAN</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>10</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_x</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>225</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_y</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>250</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_size</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>50</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>resize_shape</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>true</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>info_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Shapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_listenercontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Shapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_portstatuslistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Shapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Shapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Shapes_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="Shapes_Connector_ExecArtifact">
-    <name>Shapes_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Shapes_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Shapes_Connector_SvntArtifact">
-    <name>Shapes_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Shapes_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Shapes_Connector_StubArtifact">
-    <name>Shapes_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Shapes_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl
deleted file mode 100755
index 0d05a1c364d..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl
+++ /dev/null
@@ -1,244 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-$DDS_ROOT = "$ENV{'DDS_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 60 seconds to allow task to complete\n";
-sleep (60);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/models/README b/CIAO/connectors/dds4ccm/examples/Shapes/models/README
deleted file mode 100644
index ced33c4cdad..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Shapes/models/README
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-The follow steps is how you import IDL input PICML for the Shapes
-example so that the IDL generator works properly.
-
-%> idl_to_picml -x Shapes -l $CIAO_ROOT/connectors/dds4ccm/models/dds4ccm -r .
-
-Please notice the -l command-line option, which is something new
-to idl_to_picml. If you type --help, the -l option will be listed.
-
-What this will do is not only import the IDL in the Shapes directory,
-but also attach the dds4ccm.xme file as a GME library to the Shapes
-example. Furthermore, it will search the attached library to resolve
-any references that it cannot find based on parsing IDL files located
-in the Shapes subdirectories (or the one specified at the command-line).
-
-After doing this, you should be able to import the Shapes example
-and generate the IDL files, which there original location retained,
-which is also something new to idl_to_picml and the IDL generator. ;-)
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/models/Shapes-complete-delegation.xme b/CIAO/connectors/dds4ccm/examples/Shapes/models/Shapes-complete-delegation.xme
deleted file mode 100644
index 5b258b4121e..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Shapes/models/Shapes-complete-delegation.xme
+++ /dev/null
@@ -1,19753 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE project SYSTEM "mga.dtd">
-
-<project guid="{BB0AD972-12D3-4A2D-95E0-814724245194}" cdate="Fri Aug 13 11:43:39 2010" mdate="Fri Aug 13 11:43:39 2010" version="" metaguid="{0CB544EE-3EC1-46C2-8A47-6FD31F0563A1}" metaversion="" metaname="PICML">
-	<name>Shapes</name>
-	<comment></comment>
-	<author></author>
-	<folder id="id-006a-00000001" relid="0x1" childrelidcntr="0x8" kind="RootFolder" guid="{49be9b2d-e47f-4d48-9a57-6e1d40d20df8}">
-		<name>Shapes</name>
-		<folder id="id-006a-00000002" relid="0x0" childrelidcntr="0x4" kind="InterfaceDefinitions" guid="{b05aa06c-b4e0-44a2-9a34-f54ddb09e96a}">
-			<name>InterfaceDefinitions</name>
-			<model id="id-0065-00000001" kind="File" guid="{c4170cbd-3f84-4a64-9339-62892638e540}" relid="0x0" childrelidcntr="0x3">
-				<name>Shapes_Base</name>
-				<attribute kind="Path">
-					<value>Base</value>
-				</attribute>
-				<attribute kind="PostPreprocessorDirectives" status="meta">
-					<value></value>
-				</attribute>
-				<attribute kind="PrePreprocessorDirectives" status="meta">
-					<value></value>
-				</attribute>
-				<attribute kind="PrefixTag" status="meta">
-					<value></value>
-				</attribute>
-				<model id="id-0065-00000002" kind="Aggregate" role="Aggregate" guid="{2c677724-9ced-405b-bc67-15def1bc1e5e}" relid="0x0" childrelidcntr="0x3">
-					<name>ShapeType</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="InterfaceDefinition" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>55,13</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="PostPreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="PrePreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="SpecifyIdTag" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="VersionTag" status="meta">
-						<value></value>
-					</attribute>
-					<atom id="id-0066-00000001" kind="Key" role="Key" guid="{bb793c55-d931-45e9-a33e-5bfe29496354}" relid="0x1">
-						<name>Key</name>
-					</atom>
-					<reference id="id-0067-000001af" kind="Member" role="Member" guid="{0ab29862-b41a-4829-aee4-5730b4051b50}" relid="0x0" referred="id-0066-0000001f">
-						<name>color</name>
-						<regnode name="PartRegs" isopaque="yes">
-							<value></value>
-							<regnode name="InterfaceDefinition" isopaque="yes">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>60,60</value>
-								</regnode>
-							</regnode>
-						</regnode>
-					</reference>
-					<reference id="id-0067-000001b0" kind="Member" role="Member" guid="{bcea1633-a2e9-4e08-be58-027eac1ff634}" relid="0x0" referred="id-0066-00000014">
-						<name>x</name>
-						<regnode name="PartRegs" isopaque="yes">
-							<value></value>
-							<regnode name="InterfaceDefinition" isopaque="yes">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>60,160</value>
-								</regnode>
-							</regnode>
-						</regnode>
-					</reference>
-					<reference id="id-0067-000001b1" kind="Member" role="Member" guid="{9f25a66c-3437-41e8-be08-1216c328d76c}" relid="0x0" referred="id-0066-00000014">
-						<name>y</name>
-						<regnode name="PartRegs" isopaque="yes">
-							<value></value>
-							<regnode name="InterfaceDefinition" isopaque="yes">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>60,260</value>
-								</regnode>
-							</regnode>
-						</regnode>
-					</reference>
-					<reference id="id-0067-000001b2" kind="Member" role="Member" guid="{001275b8-c026-431a-9888-12b9f33b7e0a}" relid="0x0" referred="id-0066-00000014">
-						<name>shapesize</name>
-						<regnode name="PartRegs" isopaque="yes">
-							<value></value>
-							<regnode name="InterfaceDefinition" isopaque="yes">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>60,360</value>
-								</regnode>
-							</regnode>
-						</regnode>
-					</reference>
-					<connection id="id-0068-00000001" kind="KeyMember" role="KeyMember" guid="{8c83c3cc-a1cb-4a4d-b48d-5e109f891a27}" relid="0x2">
-						<name></name>
-						<connpoint role="src" target="id-0066-00000001"/>
-						<connpoint role="dst" target="id-0067-000001af"/>
-					</connection>
-				</model>
-				<model id="id-0065-00000003" kind="Aggregate" role="Aggregate" guid="{0e77c5f0-0aba-4f5b-aa7e-2bb4033f3014}" relid="0x1" childrelidcntr="0x4">
-					<name>Attributes</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="InterfaceDefinition" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>13,13</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="PostPreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="PrePreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="SpecifyIdTag" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="VersionTag" status="meta">
-						<value></value>
-					</attribute>
-					<atom id="id-0066-00000002" kind="Key" role="Key" guid="{f21575f0-de87-40e8-914a-fa732dc928ae}" relid="0x1">
-						<name>Key</name>
-					</atom>
-					<reference id="id-0067-000001b3" kind="Member" role="Member" guid="{ce0f13a8-95d7-4e81-9635-24db534a7a6f}" relid="0x0" referred="id-0066-0000001f">
-						<name>shape</name>
-						<regnode name="PartRegs" isopaque="yes">
-							<value></value>
-							<regnode name="InterfaceDefinition" isopaque="yes">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>60,60</value>
-								</regnode>
-							</regnode>
-						</regnode>
-					</reference>
-					<reference id="id-0067-000001b4" kind="Member" role="Member" guid="{8cdb9bc6-3c14-4d99-85a4-5b7d8dc25f8f}" relid="0x0" referred="id-0066-0000001f">
-						<name>color</name>
-						<regnode name="PartRegs" isopaque="yes">
-							<value></value>
-							<regnode name="InterfaceDefinition" isopaque="yes">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>60,160</value>
-								</regnode>
-							</regnode>
-						</regnode>
-					</reference>
-					<reference id="id-0067-000001b5" kind="Member" role="Member" guid="{05be6c88-767f-459d-9d8e-b468540741cf}" relid="0x0" referred="id-0066-00000019">
-						<name>speed</name>
-						<regnode name="PartRegs" isopaque="yes">
-							<value></value>
-							<regnode name="InterfaceDefinition" isopaque="yes">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>60,260</value>
-								</regnode>
-							</regnode>
-						</regnode>
-					</reference>
-					<connection id="id-0068-00000002" kind="KeyMember" role="KeyMember" guid="{043fe3e2-eb3a-4458-b279-4b1fd95e91ef}" relid="0x2">
-						<name></name>
-						<connpoint role="src" target="id-0066-00000002"/>
-						<connpoint role="dst" target="id-0067-000001b3"/>
-					</connection>
-					<connection id="id-0068-00000003" kind="KeyMember" role="KeyMember" guid="{5708e4e1-61b5-4445-91fa-2d7aa483c8de}" relid="0x3">
-						<name></name>
-						<connpoint role="src" target="id-0066-00000002"/>
-						<connpoint role="dst" target="id-0067-000001b4"/>
-					</connection>
-				</model>
-				<reference id="id-0067-00000001" kind="Collection" role="Collection" guid="{580e0b9d-134b-4096-96de-fa65dc681c48}" relid="0x2" referred="id-0065-00000002">
-					<name>ShapeTypeSeq</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="InterfaceDefinition" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>55,55</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="PostPreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="PrePreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="SpecifyIdTag" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="VersionTag" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="bound" status="meta">
-						<value></value>
-					</attribute>
-				</reference>
-			</model>
-			<model id="id-0065-00000004" kind="File" guid="{ee8de3d8-c95c-4797-ae4c-3ce1ab410021}" relid="0x1" childrelidcntr="0x1">
-				<name>Shapes_Connector</name>
-				<attribute kind="Path">
-					<value>Connector</value>
-				</attribute>
-				<attribute kind="PostPreprocessorDirectives" status="meta">
-					<value></value>
-				</attribute>
-				<attribute kind="PrePreprocessorDirectives" status="meta">
-					<value></value>
-				</attribute>
-				<attribute kind="PrefixTag" status="meta">
-					<value></value>
-				</attribute>
-				<model id="id-0065-00000005" kind="TemplatePackageInstance" role="TemplatePackageInstance" guid="{9e99a607-a98a-437a-b209-327ec241449b}" relid="0x0" childrelidcntr="0x1">
-					<name>Shapes</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="InterfaceDefinition" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>14,14</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<reference id="id-0067-00000002" kind="TemplateParameterValue" role="TemplateParameterValue" guid="{39425d37-8b87-4546-a6cc-b8d07181c30e}" relid="0x0" referred="id-0065-00000002">
-						<name>TemplateParameterValue</name>
-						<regnode name="PartRegs" isopaque="yes">
-							<value></value>
-							<regnode name="TemplateParameters" isopaque="yes">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>160,60</value>
-								</regnode>
-							</regnode>
-						</regnode>
-					</reference>
-					<reference id="id-0067-00000003" kind="TemplateParameterValue" role="TemplateParameterValue" guid="{7bc6d55c-c934-4f8e-a93d-254dd95cb414}" relid="0x0" referred="id-0067-00000001">
-						<name>TemplateParameterValue</name>
-						<regnode name="PartRegs" isopaque="yes">
-							<value></value>
-							<regnode name="TemplateParameters" isopaque="yes">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>260,60</value>
-								</regnode>
-							</regnode>
-						</regnode>
-					</reference>
-					<reference id="id-0067-000001b6" kind="PackageType" role="PackageType" guid="{0d831506-6efa-41bb-9fe2-838e12e9ffdd}" relid="0x0" referred="id-0065-0000015d">
-						<name>PackageType</name>
-						<regnode name="PartRegs" isopaque="yes">
-							<value></value>
-							<regnode name="TemplateParameters" isopaque="yes">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>60,60</value>
-								</regnode>
-							</regnode>
-						</regnode>
-					</reference>
-				</model>
-			</model>
-			<model id="id-0065-00000006" kind="File" guid="{c484e75a-5d7b-4819-981e-62c78998175a}" relid="0x2" childrelidcntr="0x1">
-				<name>Shapes_Receiver</name>
-				<attribute kind="Path">
-					<value>Receiver</value>
-				</attribute>
-				<attribute kind="PostPreprocessorDirectives" status="meta">
-					<value></value>
-				</attribute>
-				<attribute kind="PrePreprocessorDirectives" status="meta">
-					<value></value>
-				</attribute>
-				<attribute kind="PrefixTag" status="meta">
-					<value></value>
-				</attribute>
-				<model id="id-0065-00000007" kind="Package" role="Package" guid="{34217b02-3360-4f2a-abed-449cb2c7076b}" relid="0x0" childrelidcntr="0x2">
-					<name>Shapes</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="InterfaceDefinition" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>13,13</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="PostPreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="PrePreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="PrefixTag" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="SpecifyIdTag" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="VersionTag" status="meta">
-						<value></value>
-					</attribute>
-					<model id="id-0065-00000008" kind="Component" role="Component" guid="{3d2d3968-c963-40bc-b14d-68809ef1ff49}" relid="0x0" childrelidcntr="0x9">
-						<name>GenericComponent</name>
-						<regnode name="PartRegs" status="undefined">
-							<value></value>
-							<regnode name="InterfaceDefinition" status="undefined">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>13,11</value>
-								</regnode>
-							</regnode>
-						</regnode>
-						<attribute kind="PostPreprocessorDirectives" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="PrePreprocessorDirectives" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="SpecifyIdTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="UUID">
-							<value>8E6D53FA-A6F1-11DF-8DCF-000C2958D27B</value>
-						</attribute>
-						<attribute kind="VersionTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="label" status="meta">
-							<value></value>
-						</attribute>
-						<model id="id-0065-00000009" kind="Attribute" role="Attribute" guid="{2c8f3297-a1bc-43ed-b048-d29e2f64d313}" relid="0x0" childrelidcntr="0x1">
-							<name>rate</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="Behavior" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>13,13</value>
-									</regnode>
-								</regnode>
-								<regnode name="InterfaceDefinition" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>97,13</value>
-									</regnode>
-								</regnode>
-							</regnode>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000001b7" kind="AttributeMember" role="AttributeMember" guid="{2c0b5daa-ed58-43ad-ba99-3dbf78b9c68b}" relid="0x0" referred="id-0066-00000017">
-								<name></name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-0000000a" kind="Attribute" role="Attribute" guid="{634c750e-73e8-4cca-a9f4-899d025ab106}" relid="0x1" childrelidcntr="0x1">
-							<name>get_data</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="Behavior" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>55,13</value>
-									</regnode>
-								</regnode>
-								<regnode name="InterfaceDefinition" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>55,13</value>
-									</regnode>
-								</regnode>
-							</regnode>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000001b8" kind="AttributeMember" role="AttributeMember" guid="{b4d173b3-b4f3-494c-a204-35f8d4656d88}" relid="0x0" referred="id-0066-0000000f">
-								<name></name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-0000000b" kind="Attribute" role="Attribute" guid="{5061ec64-a010-4489-9b61-796ae3bb7fc1}" relid="0x2" childrelidcntr="0x1">
-							<name>read_data</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="Behavior" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>55,55</value>
-									</regnode>
-								</regnode>
-								<regnode name="InterfaceDefinition" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>13,13</value>
-									</regnode>
-								</regnode>
-							</regnode>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000001b9" kind="AttributeMember" role="AttributeMember" guid="{3cafd14a-92c4-4578-9758-4889e5367377}" relid="0x0" referred="id-0066-0000000f">
-								<name></name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-0000000c" kind="Attribute" role="Attribute" guid="{9c080d06-7189-42c6-9ab2-3f83304bf231}" relid="0x3" childrelidcntr="0x1">
-							<name>raw_listen</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="Behavior" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>13,55</value>
-									</regnode>
-								</regnode>
-								<regnode name="InterfaceDefinition" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>97,55</value>
-									</regnode>
-								</regnode>
-							</regnode>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000001ba" kind="AttributeMember" role="AttributeMember" guid="{7fdf72de-09dc-4ca4-99d8-72b1207492db}" relid="0x0" referred="id-0066-0000000f">
-								<name></name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<reference id="id-0067-00000004" kind="TemplatePackageInstanceRef" role="TemplatePackageInstanceRef" guid="{31629fa3-2657-4e5d-92fb-a2db8c620639}" relid="0x4" referred="id-0065-00000005">
-							<name></name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="TemplatePackageType" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>12,11</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-						<reference id="id-0067-000001bb" kind="ExtendedPort" role="ExtendedPort" guid="{788be180-c1ce-4a9a-896e-775bce201091}" relid="0x0" referred="id-0065-00000162">
-							<name>listen</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="InterfaceDefinition" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>62,223</value>
-									</regnode>
-								</regnode>
-								<regnode name="TemplatePackageType" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>226,16</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-						<reference id="id-0067-000001bc" kind="ExtendedPort" role="ExtendedPort" guid="{d25ddd9b-e56f-4c2d-b463-fee0c7835163}" relid="0x7" referred="id-0065-00000169">
-							<name>write</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="InterfaceDefinition" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>58,156</value>
-									</regnode>
-								</regnode>
-								<regnode name="TemplatePackageType" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>226,121</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-						<connection id="id-0068-00000004" kind="TemplatePackageInstanceDecl" role="TemplatePackageInstanceDecl" guid="{426e0593-775f-4c8f-bcbc-8cedec9a1dfa}" relid="0x8">
-							<name>TemplatePackageInstanceDecl</name>
-							<regnode name="autorouterPref" isopaque="yes">
-								<value>Ew</value>
-							</regnode>
-							<connpoint role="src" target="id-0067-00000004"/>
-							<connpoint role="dst" target="id-0067-000001bb"/>
-						</connection>
-						<connection id="id-0068-00000005" kind="TemplatePackageInstanceDecl" role="TemplatePackageInstanceDecl" guid="{4316d2d4-e579-499d-a37c-5197e63a75c5}" relid="0x9">
-							<name>TemplatePackageInstanceDecl</name>
-							<regnode name="autorouterPref" isopaque="yes">
-								<value>Ew</value>
-							</regnode>
-							<connpoint role="src" target="id-0067-00000004"/>
-							<connpoint role="dst" target="id-0067-000001bc"/>
-						</connection>
-					</model>
-				</model>
-			</model>
-			<model id="id-0065-0000000d" kind="File" guid="{a7be3b5e-ff2d-4a8f-ab5b-86b495b4acb1}" relid="0x3" childrelidcntr="0x1">
-				<name>Shapes_Sender</name>
-				<attribute kind="Path">
-					<value>Sender</value>
-				</attribute>
-				<attribute kind="PostPreprocessorDirectives" status="meta">
-					<value></value>
-				</attribute>
-				<attribute kind="PrePreprocessorDirectives" status="meta">
-					<value></value>
-				</attribute>
-				<attribute kind="PrefixTag" status="meta">
-					<value></value>
-				</attribute>
-				<model id="id-0065-0000000e" kind="Package" role="Package" guid="{577535f0-2ded-4f58-ac3b-022dc629751f}" relid="0x0" childrelidcntr="0x1">
-					<name>Shapes</name>
-					<attribute kind="PostPreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="PrePreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="PrefixTag" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="SpecifyIdTag" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="VersionTag" status="meta">
-						<value></value>
-					</attribute>
-					<model id="id-0065-0000000f" kind="Component" role="Component" guid="{d328a900-ed31-4710-b05c-5276f519cf70}" relid="0x0" childrelidcntr="0x6">
-						<name>Sender</name>
-						<regnode name="PartRegs" status="undefined">
-							<value></value>
-							<regnode name="InterfaceDefinition" status="undefined">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>13,11</value>
-								</regnode>
-							</regnode>
-						</regnode>
-						<attribute kind="PostPreprocessorDirectives" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="PrePreprocessorDirectives" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="SpecifyIdTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="UUID">
-							<value>8E6FB64A-A6F1-11DF-8000-000C2958D27B</value>
-						</attribute>
-						<attribute kind="VersionTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="label" status="meta">
-							<value></value>
-						</attribute>
-						<model id="id-0065-00000010" kind="Attribute" role="Attribute" guid="{fca6d27d-9a0b-43fd-b18d-a6cdee3910c1}" relid="0x0" childrelidcntr="0x1">
-							<name>rate</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="Behavior" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>97,13</value>
-									</regnode>
-								</regnode>
-								<regnode name="InterfaceDefinition" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>97,13</value>
-									</regnode>
-								</regnode>
-							</regnode>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000001bd" kind="AttributeMember" role="AttributeMember" guid="{45aa7c74-5412-4d0a-b02e-d7faab1ebb75}" relid="0x0" referred="id-0066-00000017">
-								<name></name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000011" kind="Attribute" role="Attribute" guid="{23144f21-9fe9-42fc-954b-092274452a81}" relid="0x1" childrelidcntr="0x1">
-							<name>max_x</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="Behavior" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>13,13</value>
-									</regnode>
-								</regnode>
-								<regnode name="InterfaceDefinition" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>13,55</value>
-									</regnode>
-								</regnode>
-							</regnode>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000001be" kind="AttributeMember" role="AttributeMember" guid="{009c6f7b-d5ff-4752-9448-f9423d2351c2}" relid="0x0" referred="id-0066-00000016">
-								<name></name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000012" kind="Attribute" role="Attribute" guid="{eeee1124-c8cd-4f0f-85d7-41f45bbaba06}" relid="0x2" childrelidcntr="0x1">
-							<name>max_y</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="Behavior" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>55,55</value>
-									</regnode>
-								</regnode>
-								<regnode name="InterfaceDefinition" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>55,55</value>
-									</regnode>
-								</regnode>
-							</regnode>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000001bf" kind="AttributeMember" role="AttributeMember" guid="{d6bf3d7a-b34d-4521-ae5a-293a6e955342}" relid="0x0" referred="id-0066-00000016">
-								<name></name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000013" kind="Attribute" role="Attribute" guid="{166cb68c-38a9-4d36-a37b-d25bfb765a8a}" relid="0x3" childrelidcntr="0x1">
-							<name>max_size</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="Behavior" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>55,13</value>
-									</regnode>
-								</regnode>
-								<regnode name="InterfaceDefinition" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>13,13</value>
-									</regnode>
-								</regnode>
-							</regnode>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000001c0" kind="AttributeMember" role="AttributeMember" guid="{529db421-1d05-4acc-ad16-875b5d36ce4b}" relid="0x0" referred="id-0066-00000016">
-								<name></name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000014" kind="Attribute" role="Attribute" guid="{19480211-2314-4cd0-940f-4c3a14883852}" relid="0x4" childrelidcntr="0x1">
-							<name>resize_shape</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="Behavior" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>13,55</value>
-									</regnode>
-								</regnode>
-								<regnode name="InterfaceDefinition" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>55,13</value>
-									</regnode>
-								</regnode>
-							</regnode>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000001c1" kind="AttributeMember" role="AttributeMember" guid="{f1b289ee-7f90-47c7-9dd7-97f9a3047b91}" relid="0x0" referred="id-0066-0000000f">
-								<name></name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<reference id="id-0067-00000005" kind="TemplatePackageInstanceRef" role="TemplatePackageInstanceRef" guid="{035280d6-cc89-4f8b-95c3-cae9c8be9ba4}" relid="0x5" referred="id-0065-00000005">
-							<name></name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="TemplatePackageType" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>12,12</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-						<reference id="id-0067-000001c2" kind="ExtendedPort" role="ExtendedPort" guid="{5f9a3f74-0fd6-4afe-b1b4-f68abab7a3ce}" relid="0x0" referred="id-0065-00000169">
-							<name>info_write</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="InterfaceDefinition" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>104,160</value>
-									</regnode>
-								</regnode>
-								<regnode name="TemplatePackageType" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>97,97</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-						<connection id="id-0068-00000006" kind="TemplatePackageInstanceDecl" role="TemplatePackageInstanceDecl" guid="{67366c1e-36ef-4972-9ad9-0d2a796087c9}" relid="0x5">
-							<name></name>
-							<connpoint role="src" target="id-0067-00000005"/>
-							<connpoint role="dst" target="id-0067-000001c2"/>
-						</connection>
-					</model>
-				</model>
-			</model>
-		</folder>
-		<folder id="id-006a-00000003" relid="0x1" childrelidcntr="0x3" kind="ImplementationArtifacts" guid="{6dca98d0-09e7-4d6b-894b-955e2fe0a27c}">
-			<name>ImplementationArtifacts</name>
-			<model id="id-0065-00000015" kind="ArtifactContainer" guid="{bd61a69b-9d36-44f7-a7d7-1307cccd35d1}" relid="0x0" childrelidcntr="0x2">
-				<name>Shapes_ReceiverArtifacts</name>
-				<atom id="id-0066-00000003" kind="ImplementationArtifact" role="ImplementationArtifact" guid="{bf211cd8-d04d-418a-8259-e741bc35d964}" relid="0x0">
-					<name>Shapes_Receiver_svnt</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>150,150</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="UUID">
-						<value>8E6FB64A-A6F1-11DF-8001-000C2958D27B</value>
-					</attribute>
-					<attribute kind="architecture" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="artifactVersion" status="meta">
-						<value>0.0.0.0</value>
-					</attribute>
-					<attribute kind="configuration" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="label" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="location">
-						<value>Receiver_svnt</value>
-					</attribute>
-					<attribute kind="operatingSystem" status="meta">
-						<value></value>
-					</attribute>
-				</atom>
-				<atom id="id-0066-00000004" kind="ImplementationArtifact" role="ImplementationArtifact" guid="{b07b18d0-4e95-47a5-b68c-d622b240f5e1}" relid="0x1">
-					<name>Shapes_Receiver_exec</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>450,150</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="UUID">
-						<value>8E6FB64A-A6F1-11DF-8002-000C2958D27B</value>
-					</attribute>
-					<attribute kind="architecture" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="artifactVersion" status="meta">
-						<value>0.0.0.0</value>
-					</attribute>
-					<attribute kind="configuration" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="label" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="location">
-						<value>Receiver_exec</value>
-					</attribute>
-					<attribute kind="operatingSystem" status="meta">
-						<value></value>
-					</attribute>
-				</atom>
-			</model>
-			<model id="id-0065-00000016" kind="ArtifactContainer" guid="{4e1adde7-4470-45a6-b941-bb3256ac19ff}" relid="0x1" childrelidcntr="0x2">
-				<name>Shapes_SenderArtifacts</name>
-				<atom id="id-0066-00000005" kind="ImplementationArtifact" role="ImplementationArtifact" guid="{a7c658cb-5835-4c05-924b-674d49d0d261}" relid="0x0">
-					<name>Shapes_Sender_svnt</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>150,150</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="UUID">
-						<value>8E6FB64A-A6F1-11DF-8003-000C2958D27B</value>
-					</attribute>
-					<attribute kind="architecture" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="artifactVersion" status="meta">
-						<value>0.0.0.0</value>
-					</attribute>
-					<attribute kind="configuration" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="label" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="location">
-						<value>Sender_svnt</value>
-					</attribute>
-					<attribute kind="operatingSystem" status="meta">
-						<value></value>
-					</attribute>
-				</atom>
-				<atom id="id-0066-00000006" kind="ImplementationArtifact" role="ImplementationArtifact" guid="{c170cde2-f995-4f51-b0e6-11b949f09bc0}" relid="0x1">
-					<name>Shapes_Sender_exec</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>450,150</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="UUID">
-						<value>8E6FB64A-A6F1-11DF-8004-000C2958D27B</value>
-					</attribute>
-					<attribute kind="architecture" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="artifactVersion" status="meta">
-						<value>0.0.0.0</value>
-					</attribute>
-					<attribute kind="configuration" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="label" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="location">
-						<value>Sender_exec</value>
-					</attribute>
-					<attribute kind="operatingSystem" status="meta">
-						<value></value>
-					</attribute>
-				</atom>
-			</model>
-			<model id="id-0065-00000017" kind="ArtifactContainer" guid="{8971658b-9a54-4900-a499-347c345b7431}" relid="0x3" childrelidcntr="0x2">
-				<name>DDS_Shapes_ConnectorArtifacts</name>
-				<atom id="id-0066-00000007" kind="ImplementationArtifact" role="ImplementationArtifact" guid="{9a54fb98-c78c-47f9-a8bc-7e5c8854a0b5}" relid="0x1">
-					<name>Shapes_Connector_exec</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Packaging" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>13,13</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="UUID">
-						<value>8E6FB64A-A6F1-11DF-8005-000C2958D27B</value>
-					</attribute>
-					<attribute kind="architecture" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="artifactVersion" status="meta">
-						<value>0.0.0.0</value>
-					</attribute>
-					<attribute kind="configuration" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="label" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="location">
-						<value>DDS_Shapes_Connector_exec</value>
-					</attribute>
-					<attribute kind="operatingSystem" status="meta">
-						<value></value>
-					</attribute>
-				</atom>
-				<atom id="id-0066-00000008" kind="ImplementationArtifact" role="ImplementationArtifact" guid="{4e003332-fac9-4392-ac35-e6ba1c3016a9}" relid="0x2">
-					<name>Shapes_Connector_svnt</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Packaging" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>55,13</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="UUID">
-						<value>8E6FB64A-A6F1-11DF-8006-000C2958D27B</value>
-					</attribute>
-					<attribute kind="architecture" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="artifactVersion" status="meta">
-						<value>0.0.0.0</value>
-					</attribute>
-					<attribute kind="configuration" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="label" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="location">
-						<value>DDS_Shapes_Connector_svnt</value>
-					</attribute>
-					<attribute kind="operatingSystem" status="meta">
-						<value></value>
-					</attribute>
-				</atom>
-			</model>
-		</folder>
-		<folder id="id-006a-00000004" relid="0x2" childrelidcntr="0x6" kind="ComponentImplementations" guid="{366e4113-df59-40f3-a43f-6ba74a2ac952}">
-			<name>ComponentImplementations</name>
-			<model id="id-0065-00000018" kind="ComponentImplementationContainer" guid="{89016009-f7a2-4292-a090-6fb10650f9cc}" relid="0x0" childrelidcntr="0x4">
-				<name>Shapes_GenericComponent_Impl</name>
-				<atom id="id-0066-00000009" kind="MonolithicImplementation" role="MonolithicImplementation" guid="{b0a429c3-f81a-48f1-a1e1-0bacb332f5e0}" relid="0x0">
-					<name>Shapes_GenericComponent_Impl</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>250,250</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="UUID">
-						<value>8E6FB64A-A6F1-11DF-8007-000C2958D27B</value>
-					</attribute>
-					<attribute kind="defaultVersion" status="meta">
-						<value>0.0.0.0</value>
-					</attribute>
-					<attribute kind="label" status="meta">
-						<value></value>
-					</attribute>
-				</atom>
-				<reference id="id-0067-00000006" kind="ComponentRef" role="ComponentRef" guid="{8903b096-df80-427c-a769-00915e001a78}" relid="0x1" referred="id-0065-00000008">
-					<name>Receiver</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>188,71</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-				<reference id="id-0067-00000007" kind="ComponentServantArtifact" role="ComponentServantArtifact" guid="{59776363-2021-4a67-bb87-92f39e615e18}" relid="0x2" referred="id-0066-00000003">
-					<name>Shapes_Receiver_svnt</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>506,347</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="EntryPoint">
-						<value>create_Shapes_Receiver_Servant</value>
-					</attribute>
-				</reference>
-				<reference id="id-0067-00000008" kind="ComponentImplementationArtifact" role="ComponentImplementationArtifact" guid="{192dc1a9-3c2e-447a-902a-70f554331efa}" relid="0x3" referred="id-0066-00000004">
-					<name>Shapes_Receiver_exec</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>506,151</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="EntryPoint">
-						<value>create_Shapes_Receiver_Impl</value>
-					</attribute>
-				</reference>
-				<connection id="id-0068-00000007" kind="Implements" role="Implements" guid="{8163a0d4-e75f-496e-b3df-240e716a4649}" relid="0x1">
-					<name></name>
-					<connpoint role="src" target="id-0066-00000009"/>
-					<connpoint role="dst" target="id-0067-00000006"/>
-				</connection>
-				<connection id="id-0068-00000008" kind="MonolithprimaryArtifact" role="MonolithprimaryArtifact" guid="{22275400-7b26-438e-a61b-1abf55c81d45}" relid="0x2">
-					<name></name>
-					<connpoint role="src" target="id-0066-00000009"/>
-					<connpoint role="dst" target="id-0067-00000007"/>
-				</connection>
-				<connection id="id-0068-00000009" kind="MonolithprimaryArtifact" role="MonolithprimaryArtifact" guid="{65a703c5-a579-40a7-80b6-f6187f1374fe}" relid="0x3">
-					<name></name>
-					<connpoint role="src" target="id-0066-00000009"/>
-					<connpoint role="dst" target="id-0067-00000008"/>
-				</connection>
-			</model>
-			<model id="id-0065-00000019" kind="ComponentImplementationContainer" guid="{dfeee7a5-3686-450c-ab18-2a857b6b7938}" relid="0x1" childrelidcntr="0x4">
-				<name>Shapes_SenderImpl</name>
-				<atom id="id-0066-0000000a" kind="MonolithicImplementation" role="MonolithicImplementation" guid="{11980425-4885-48fc-b653-9267ab632d93}" relid="0x0">
-					<name>Shapes_SenderImpl</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>250,250</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="UUID">
-						<value>8E6FB64A-A6F1-11DF-8008-000C2958D27B</value>
-					</attribute>
-					<attribute kind="defaultVersion" status="meta">
-						<value>0.0.0.0</value>
-					</attribute>
-					<attribute kind="label" status="meta">
-						<value></value>
-					</attribute>
-				</atom>
-				<reference id="id-0067-00000009" kind="ComponentRef" role="ComponentRef" guid="{af117e75-db1d-4fcf-bf6a-ba4e0b12f5e6}" relid="0x1" referred="id-0065-0000000f">
-					<name>Sender</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>187,75</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-				<reference id="id-0067-0000000a" kind="ComponentServantArtifact" role="ComponentServantArtifact" guid="{1852bef0-6e90-46e9-a2be-2c5dae76a875}" relid="0x2" referred="id-0066-00000005">
-					<name>Shapes_Sender_svnt</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>506,347</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="EntryPoint">
-						<value>create_Shapes_Sender_Servant</value>
-					</attribute>
-				</reference>
-				<reference id="id-0067-0000000b" kind="ComponentImplementationArtifact" role="ComponentImplementationArtifact" guid="{785d5f76-9086-46c9-9072-babbab3b21c4}" relid="0x3" referred="id-0066-00000006">
-					<name>Shapes_Sender_exec</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>506,151</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="EntryPoint">
-						<value>create_Shape_Sender_Impl</value>
-					</attribute>
-				</reference>
-				<connection id="id-0068-0000000a" kind="Implements" role="Implements" guid="{3ec8909b-549c-4e97-bd6b-8ab059709a70}" relid="0x1">
-					<name></name>
-					<connpoint role="src" target="id-0066-0000000a"/>
-					<connpoint role="dst" target="id-0067-00000009"/>
-				</connection>
-				<connection id="id-0068-0000000b" kind="MonolithprimaryArtifact" role="MonolithprimaryArtifact" guid="{66f2a3c8-5797-465f-9d43-2b1c24a353eb}" relid="0x2">
-					<name></name>
-					<connpoint role="src" target="id-0066-0000000a"/>
-					<connpoint role="dst" target="id-0067-0000000a"/>
-				</connection>
-				<connection id="id-0068-0000000c" kind="MonolithprimaryArtifact" role="MonolithprimaryArtifact" guid="{287013ed-1e36-416b-ae90-bc4c55fa29cb}" relid="0x3">
-					<name></name>
-					<connpoint role="src" target="id-0066-0000000a"/>
-					<connpoint role="dst" target="id-0067-0000000b"/>
-				</connection>
-			</model>
-			<model id="id-0065-0000001a" kind="ComponentImplementationContainer" guid="{4363b461-a138-4fd8-86d9-3ded3d0d8414}" relid="0x3" childrelidcntr="0x2">
-				<name>ShapesImpl</name>
-				<model id="id-0065-0000001b" kind="ComponentAssembly" role="ComponentAssembly" guid="{9706e7c0-1c99-429a-9f53-231d6f84273b}" relid="0x1" childrelidcntr="0x3b">
-					<name>ShapesImpl</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Packaging" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>376,152</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="UUID">
-						<value>8E6FB64A-A6F1-11DF-8009-000C2958D27B</value>
-					</attribute>
-					<attribute kind="label" status="meta">
-						<value></value>
-					</attribute>
-					<model id="id-0065-0000001c" kind="ConnectorInstance" role="ConnectorInstance" guid="{94cf78f6-2fc6-49a1-a5c9-8c90ba6d4b38}" relid="0x8" childrelidcntr="0x1">
-						<name>ConnectorInstance</name>
-						<regnode name="PartRegs" status="undefined">
-							<value></value>
-							<regnode name="Packaging" status="undefined">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>469,91</value>
-								</regnode>
-							</regnode>
-						</regnode>
-						<attribute kind="UUID">
-							<value>8E6FB64A-A6F1-11DF-800A-000C2958D27B</value>
-						</attribute>
-						<reference id="id-0067-000001c3" kind="ConnectorImplementationType" role="ConnectorImplementationType" guid="{d25b00b4-6af9-4f34-b276-065ca402a922}" relid="0x1" referred="id-0066-00000021">
-							<name>ConnectorImplementation</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="ConnectorImplAspect" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>367,171</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-					</model>
-					<model id="id-0065-0000001d" kind="Property" role="Property" guid="{2c510c84-e50f-4c01-98ba-3148bcb05c12}" relid="0xb" childrelidcntr="0x1">
-						<name>topic_name</name>
-						<regnode name="PartRegs" status="undefined">
-							<value></value>
-							<regnode name="Packaging" status="undefined">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>461,13</value>
-								</regnode>
-							</regnode>
-						</regnode>
-						<reference id="id-0067-000001c4" kind="DataValue" role="DataValue" guid="{ccce4e67-6079-4d8b-b321-d0367156b90e}" relid="0x1" referred="id-0066-0000001f">
-							<name>topic_name</name>
-							<attribute kind="Value">
-								<value>Square</value>
-							</attribute>
-						</reference>
-					</model>
-					<model id="id-0065-0000001e" kind="ConnectorInstance" role="ConnectorInstance" guid="{b77d4171-49c0-41b6-a775-0b706dcb368a}" relid="0x33" childrelidcntr="0x1">
-						<name>ConnectorInstance</name>
-						<regnode name="PartRegs" status="undefined">
-							<value></value>
-							<regnode name="Packaging" status="undefined">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>469,189</value>
-								</regnode>
-							</regnode>
-						</regnode>
-						<attribute kind="UUID">
-							<value>8E6FB64A-A6F1-11DF-800B-000C2958D27B</value>
-						</attribute>
-						<reference id="id-0067-000001c5" kind="ConnectorImplementationType" role="ConnectorImplementationType" guid="{8cea0513-60e0-45c1-a03f-6208f46167bd}" relid="0x1" referred="id-0066-00000021">
-							<name>ConnectorImplementation</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="ConnectorImplAspect" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>367,171</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-					</model>
-					<model id="id-0065-0000001f" kind="Property" role="Property" guid="{88caee65-c7e0-4707-a1e5-440b559fb310}" relid="0x34" childrelidcntr="0x1">
-						<name>topic_name</name>
-						<regnode name="PartRegs" status="undefined">
-							<value></value>
-							<regnode name="Packaging" status="undefined">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>461,265</value>
-								</regnode>
-							</regnode>
-						</regnode>
-						<reference id="id-0067-000001c6" kind="DataValue" role="DataValue" guid="{23872b7c-39aa-44d6-a07d-63df014e51b8}" relid="0x1" referred="id-0066-0000001f">
-							<name>topic_name</name>
-							<attribute kind="Value">
-								<value>Square</value>
-							</attribute>
-						</reference>
-					</model>
-					<model id="id-0065-0000018d" kind="ComponentAssembly" role="ComponentAssembly" guid="{bf51bfc3-81c5-4753-9c5a-c748d4eb3af5}" derivedfrom="id-0065-00000021" isinstance="yes" isprimary="yes" relid="0x36" childrelidcntr="0x0">
-						<name>Shapes_AssemblyOne_Impl</name>
-						<regnode name="PartRegs" status="undefined">
-							<value></value>
-							<regnode name="Packaging" status="undefined">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>182,112</value>
-								</regnode>
-							</regnode>
-						</regnode>
-						<attribute kind="UUID">
-							<value>8E8EB446-A6F1-11DF-8000-000C2958D27B</value>
-						</attribute>
-						<attribute kind="label" status="meta">
-							<value></value>
-						</attribute>
-						<model id="id-0065-0000018e" kind="ComponentInstance" role="ComponentInstance" guid="{9647fd9b-b312-4d56-ae2d-dc3cec802fe1}" derivedfrom="id-0065-00000022" isinstance="yes" isprimary="no" childrelidcntr="0x0">
-							<name>InstanceA</name>
-							<attribute kind="UUID">
-								<value>8E8EB446-A6F1-11DF-8001-000C2958D27B</value>
-							</attribute>
-							<reference id="id-0067-000001c7" kind="ComponentInstanceType" role="ComponentInstanceType" guid="{05b924f4-2c13-47fe-b058-d6af2980d127}" derivedfrom="id-0067-0000000c" isinstance="yes" isprimary="no" referred="id-0066-00000009" isbound="yes">
-								<name>Shapes_GenericComponent_Impl</name>
-							</reference>
-							<reference id="id-0067-000001c8" kind="AttributeInstance" role="AttributeInstance" guid="{7a4a0654-2b48-47f9-adb0-271d9be670ce}" derivedfrom="id-0067-0000000d" isinstance="yes" isprimary="no" referred="id-0065-00000009" isbound="yes">
-								<name>rate</name>
-							</reference>
-							<reference id="id-0067-000001c9" kind="AttributeInstance" role="AttributeInstance" guid="{f5f1d43d-d89b-4770-96f8-b280e1273780}" derivedfrom="id-0067-0000000e" isinstance="yes" isprimary="no" referred="id-0065-0000000a" isbound="yes">
-								<name>get_data</name>
-							</reference>
-							<reference id="id-0067-000001ca" kind="AttributeInstance" role="AttributeInstance" guid="{1df45912-8cae-4cca-bb0a-0273af5d5e44}" derivedfrom="id-0067-0000000f" isinstance="yes" isprimary="no" referred="id-0065-0000000b" isbound="yes">
-								<name>read_data</name>
-							</reference>
-							<reference id="id-0067-000001cb" kind="AttributeInstance" role="AttributeInstance" guid="{0cdeba0e-df50-4ef2-ac8d-46fe2aa01ab6}" derivedfrom="id-0067-00000010" isinstance="yes" isprimary="no" referred="id-0065-0000000c" isbound="yes">
-								<name>raw_listen</name>
-							</reference>
-							<reference id="id-0067-000001dc" kind="ExtendedPortInstance" role="ExtendedPortInstance" guid="{86c7795c-0819-4e83-9986-81c34b9f3c23}" derivedfrom="id-0067-000001db" isinstance="yes" isprimary="no" referred="id-0067-000001bb" isbound="yes">
-								<name>listen</name>
-							</reference>
-							<reference id="id-0067-000001de" kind="ExtendedPortInstance" role="ExtendedPortInstance" guid="{ade58591-e86a-413d-a6a2-15a3c6ecce93}" derivedfrom="id-0067-000001dd" isinstance="yes" isprimary="no" referred="id-0067-000001bc" isbound="yes">
-								<name>write</name>
-							</reference>
-						</model>
-						<model id="id-0065-0000018f" kind="ComponentInstance" role="ComponentInstance" guid="{3538a0aa-7abf-4c45-aba4-8384b9ab8b0b}" derivedfrom="id-0065-00000023" isinstance="yes" isprimary="no" childrelidcntr="0x0">
-							<name>InstanceB</name>
-							<attribute kind="UUID">
-								<value>8E8EB446-A6F1-11DF-8002-000C2958D27B</value>
-							</attribute>
-							<reference id="id-0067-000001cc" kind="ComponentInstanceType" role="ComponentInstanceType" guid="{e634a4e3-405b-4e79-9305-fb81867242d0}" derivedfrom="id-0067-00000011" isinstance="yes" isprimary="no" referred="id-0066-00000009" isbound="yes">
-								<name>Shapes_GenericComponent_Impl</name>
-							</reference>
-							<reference id="id-0067-000001cd" kind="AttributeInstance" role="AttributeInstance" guid="{8fcf9ee3-3711-4d1a-ba37-9df9844c8eef}" derivedfrom="id-0067-00000012" isinstance="yes" isprimary="no" referred="id-0065-00000009" isbound="yes">
-								<name>rate</name>
-							</reference>
-							<reference id="id-0067-000001ce" kind="AttributeInstance" role="AttributeInstance" guid="{cd86f30c-3b8f-47fc-be36-c07377608c47}" derivedfrom="id-0067-00000013" isinstance="yes" isprimary="no" referred="id-0065-0000000a" isbound="yes">
-								<name>get_data</name>
-							</reference>
-							<reference id="id-0067-000001cf" kind="AttributeInstance" role="AttributeInstance" guid="{8b816d67-23e8-4094-a7c6-116006dd79d8}" derivedfrom="id-0067-00000014" isinstance="yes" isprimary="no" referred="id-0065-0000000b" isbound="yes">
-								<name>read_data</name>
-							</reference>
-							<reference id="id-0067-000001d0" kind="AttributeInstance" role="AttributeInstance" guid="{0587411f-c12a-431f-9536-e96c6d3583db}" derivedfrom="id-0067-00000015" isinstance="yes" isprimary="no" referred="id-0065-0000000c" isbound="yes">
-								<name>raw_listen</name>
-							</reference>
-							<reference id="id-0067-000001e0" kind="ExtendedPortInstance" role="ExtendedPortInstance" guid="{9e6e65b6-c9d2-4a68-8bb2-41512a5181e7}" derivedfrom="id-0067-000001df" isinstance="yes" isprimary="no" referred="id-0067-000001bb" isbound="yes">
-								<name>listen</name>
-							</reference>
-							<reference id="id-0067-000001e2" kind="ExtendedPortInstance" role="ExtendedPortInstance" guid="{4c10a0e0-e563-4f24-8a1b-2808ceca08f4}" derivedfrom="id-0067-000001e1" isinstance="yes" isprimary="no" referred="id-0067-000001bc" isbound="yes">
-								<name>write</name>
-							</reference>
-						</model>
-						<atom id="id-0066-00000056" kind="ExtendedPortDelegate" role="ExtendedPortDelegate" guid="{95c90cfc-3105-42e3-938c-2ee8587a3390}" derivedfrom="id-0066-0000000b" isinstance="yes" isprimary="no">
-							<name>write</name>
-						</atom>
-						<atom id="id-0066-00000057" kind="ExtendedPortDelegate" role="ExtendedPortDelegate" guid="{8d88d8ec-1a5f-4df1-9e36-684944a4ee14}" derivedfrom="id-0066-0000000c" isinstance="yes" isprimary="no">
-							<name>listen</name>
-						</atom>
-						<connection isbound="yes" id="id-0068-00000020" kind="ExtendedDelegate" role="ExtendedDelegate" guid="{8f7bff92-6190-49bb-9ed8-3e44489ee24a}" derivedfrom="id-0068-00000013" isinstance="yes" isprimary="no">
-							<name>ExtendedDelegate</name>
-						</connection>
-						<connection isbound="yes" id="id-0068-00000021" kind="ExtendedDelegate" role="ExtendedDelegate" guid="{74ff4fff-aa31-4dff-b85c-ddce19ec8cb3}" derivedfrom="id-0068-00000014" isinstance="yes" isprimary="no">
-							<name>ExtendedDelegate</name>
-						</connection>
-						<connection isbound="yes" id="id-0068-00000022" kind="ExtendedDelegate" role="ExtendedDelegate" guid="{1f89dd12-90ea-4540-920f-e1943c652e89}" derivedfrom="id-0068-00000015" isinstance="yes" isprimary="no">
-							<name>ExtendedDelegate</name>
-						</connection>
-						<connection isbound="yes" id="id-0068-00000023" kind="ExtendedDelegate" role="ExtendedDelegate" guid="{4e29b193-9cc6-46f3-a306-d3f173021141}" derivedfrom="id-0068-00000016" isinstance="yes" isprimary="no">
-							<name>ExtendedDelegate</name>
-						</connection>
-					</model>
-					<model id="id-0065-00000190" kind="ComponentAssembly" role="ComponentAssembly" guid="{a714853c-241e-450e-ae89-a3b086c0b6ce}" derivedfrom="id-0065-00000025" isinstance="yes" isprimary="yes" relid="0x37" childrelidcntr="0x0">
-						<name>Shapes_AssemblyTwo_Impl</name>
-						<regnode name="PartRegs" status="undefined">
-							<value></value>
-							<regnode name="Packaging" status="undefined">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>651,112</value>
-								</regnode>
-							</regnode>
-						</regnode>
-						<attribute kind="UUID">
-							<value>8E8EB446-A6F1-11DF-8003-000C2958D27B</value>
-						</attribute>
-						<attribute kind="label" status="meta">
-							<value></value>
-						</attribute>
-						<model id="id-0065-00000191" kind="ComponentInstance" role="ComponentInstance" guid="{1fcdebeb-2abc-44cc-a542-2196ee4396e3}" derivedfrom="id-0065-00000026" isinstance="yes" isprimary="no" childrelidcntr="0x0">
-							<name>InstanceC</name>
-							<attribute kind="UUID">
-								<value>8E8EB446-A6F1-11DF-8004-000C2958D27B</value>
-							</attribute>
-							<reference id="id-0067-000001d1" kind="ComponentInstanceType" role="ComponentInstanceType" guid="{a2419111-9cb5-4d51-bebc-8d3becfb3545}" derivedfrom="id-0067-00000016" isinstance="yes" isprimary="no" referred="id-0066-00000009" isbound="yes">
-								<name>Shapes_GenericComponent_Impl</name>
-							</reference>
-							<reference id="id-0067-000001d2" kind="AttributeInstance" role="AttributeInstance" guid="{b93630f2-00e9-4b0a-8c6d-519a766756bd}" derivedfrom="id-0067-00000017" isinstance="yes" isprimary="no" referred="id-0065-0000000a" isbound="yes">
-								<name>get_data</name>
-							</reference>
-							<reference id="id-0067-000001d3" kind="AttributeInstance" role="AttributeInstance" guid="{14c34a3c-b8fc-460a-820c-2e5fd4e4bc62}" derivedfrom="id-0067-00000018" isinstance="yes" isprimary="no" referred="id-0065-00000009" isbound="yes">
-								<name>rate</name>
-							</reference>
-							<reference id="id-0067-000001d4" kind="AttributeInstance" role="AttributeInstance" guid="{2f931881-8b5e-410f-8d83-ce09e4491faa}" derivedfrom="id-0067-00000019" isinstance="yes" isprimary="no" referred="id-0065-0000000b" isbound="yes">
-								<name>read_data</name>
-							</reference>
-							<reference id="id-0067-000001d5" kind="AttributeInstance" role="AttributeInstance" guid="{72a2f52f-88c8-4831-bcc7-a6723e0e811e}" derivedfrom="id-0067-0000001a" isinstance="yes" isprimary="no" referred="id-0065-0000000c" isbound="yes">
-								<name>raw_listen</name>
-							</reference>
-							<reference id="id-0067-000001e4" kind="ExtendedPortInstance" role="ExtendedPortInstance" guid="{0bf4a227-09ea-41b6-8219-dfdc22dce99a}" derivedfrom="id-0067-000001e3" isinstance="yes" isprimary="no" referred="id-0067-000001bb" isbound="yes">
-								<name>listen</name>
-							</reference>
-							<reference id="id-0067-000001e6" kind="ExtendedPortInstance" role="ExtendedPortInstance" guid="{9b4ce78f-df76-4b24-bc90-8bf1953af74c}" derivedfrom="id-0067-000001e5" isinstance="yes" isprimary="no" referred="id-0067-000001bc" isbound="yes">
-								<name>write</name>
-							</reference>
-						</model>
-						<model id="id-0065-00000192" kind="ComponentInstance" role="ComponentInstance" guid="{1443fb8a-a771-4cd0-a257-a5e9dac1b3f1}" derivedfrom="id-0065-00000027" isinstance="yes" isprimary="no" childrelidcntr="0x0">
-							<name>InstanceD</name>
-							<attribute kind="UUID">
-								<value>8E8EB446-A6F1-11DF-8005-000C2958D27B</value>
-							</attribute>
-							<reference id="id-0067-000001d6" kind="ComponentInstanceType" role="ComponentInstanceType" guid="{b373b587-9f96-44a4-bf23-6d12ca427482}" derivedfrom="id-0067-0000001b" isinstance="yes" isprimary="no" referred="id-0066-00000009" isbound="yes">
-								<name>Shapes_GenericComponent_Impl</name>
-							</reference>
-							<reference id="id-0067-000001d7" kind="AttributeInstance" role="AttributeInstance" guid="{7d6c631d-a40e-4eca-bdbb-49e8eb5c84ca}" derivedfrom="id-0067-0000001c" isinstance="yes" isprimary="no" referred="id-0065-0000000a" isbound="yes">
-								<name>get_data</name>
-							</reference>
-							<reference id="id-0067-000001d8" kind="AttributeInstance" role="AttributeInstance" guid="{2a1def0c-54ae-4e78-a5d9-6e579c7f08c7}" derivedfrom="id-0067-0000001d" isinstance="yes" isprimary="no" referred="id-0065-00000009" isbound="yes">
-								<name>rate</name>
-							</reference>
-							<reference id="id-0067-000001d9" kind="AttributeInstance" role="AttributeInstance" guid="{44b4dca1-a7f2-445a-9a83-aef829ff1fba}" derivedfrom="id-0067-0000001e" isinstance="yes" isprimary="no" referred="id-0065-0000000b" isbound="yes">
-								<name>read_data</name>
-							</reference>
-							<reference id="id-0067-000001da" kind="AttributeInstance" role="AttributeInstance" guid="{1df85fc8-d30c-4b7e-9632-1b19f66eebf4}" derivedfrom="id-0067-0000001f" isinstance="yes" isprimary="no" referred="id-0065-0000000c" isbound="yes">
-								<name>raw_listen</name>
-							</reference>
-							<reference id="id-0067-000001e8" kind="ExtendedPortInstance" role="ExtendedPortInstance" guid="{fb6d117c-a176-4e53-8dfc-4ab445ba471f}" derivedfrom="id-0067-000001e7" isinstance="yes" isprimary="no" referred="id-0067-000001bb" isbound="yes">
-								<name>listen</name>
-							</reference>
-							<reference id="id-0067-000001ea" kind="ExtendedPortInstance" role="ExtendedPortInstance" guid="{79a1ddc0-4758-4d69-a33a-cbe6e9687861}" derivedfrom="id-0067-000001e9" isinstance="yes" isprimary="no" referred="id-0067-000001bc" isbound="yes">
-								<name>write</name>
-							</reference>
-						</model>
-						<atom id="id-0066-00000058" kind="ExtendedPortDelegate" role="ExtendedPortDelegate" guid="{a0e61de6-77cd-4fde-acef-76e5048412ac}" derivedfrom="id-0066-0000000d" isinstance="yes" isprimary="no">
-							<name>listen</name>
-						</atom>
-						<atom id="id-0066-00000059" kind="ExtendedPortDelegate" role="ExtendedPortDelegate" guid="{3198137e-4553-41f0-9436-f7a543763b7a}" derivedfrom="id-0066-0000000e" isinstance="yes" isprimary="no">
-							<name>write</name>
-						</atom>
-						<connection isbound="yes" id="id-0068-00000024" kind="ExtendedDelegate" role="ExtendedDelegate" guid="{81f5e740-b6ca-4ba7-b599-fce00eafa54b}" derivedfrom="id-0068-00000017" isinstance="yes" isprimary="no">
-							<name>ExtendedDelegate</name>
-						</connection>
-						<connection isbound="yes" id="id-0068-00000025" kind="ExtendedDelegate" role="ExtendedDelegate" guid="{6da02bce-53ae-46cb-ad0a-f3850ae3adc6}" derivedfrom="id-0068-00000018" isinstance="yes" isprimary="no">
-							<name>ExtendedDelegate</name>
-						</connection>
-						<connection isbound="yes" id="id-0068-00000026" kind="ExtendedDelegate" role="ExtendedDelegate" guid="{453f4e52-170a-486a-967e-fcfc82e566b5}" derivedfrom="id-0068-00000019" isinstance="yes" isprimary="no">
-							<name>ExtendedDelegate</name>
-						</connection>
-						<connection isbound="yes" id="id-0068-00000027" kind="ExtendedDelegate" role="ExtendedDelegate" guid="{3039d452-3294-4fe5-90f9-0cc5bbea01aa}" derivedfrom="id-0068-0000001a" isinstance="yes" isprimary="no">
-							<name>ExtendedDelegate</name>
-						</connection>
-					</model>
-					<connection id="id-0068-0000000d" kind="AssemblyConfigProperty" role="AssemblyConfigProperty" guid="{1678fee4-9ba4-427b-b44e-31cda6ca0dac}" relid="0x32">
-						<name>AssemblyConfigProperty</name>
-						<regnode name="autorouterPref" isopaque="yes">
-							<value>Ns</value>
-						</regnode>
-						<connpoint role="src" target="id-0065-0000001c"/>
-						<connpoint role="dst" target="id-0065-0000001d"/>
-					</connection>
-					<connection id="id-0068-0000000e" kind="AssemblyConfigProperty" role="AssemblyConfigProperty" guid="{8e51c2c6-8e26-43bb-8e30-33d8f85b2580}" relid="0x35">
-						<name>AssemblyConfigProperty</name>
-						<regnode name="autorouterPref" isopaque="yes">
-							<value>Sn</value>
-						</regnode>
-						<connpoint role="src" target="id-0065-0000001e"/>
-						<connpoint role="dst" target="id-0065-0000001f"/>
-					</connection>
-					<connection id="id-0068-0000000f" kind="Publish" role="Publish" guid="{04a3e7e8-31c7-4279-bb77-d6bf9a23f2e9}" relid="0x38">
-						<name>supplier</name>
-						<regnode name="autorouterPref" isopaque="yes">
-							<value>w</value>
-						</regnode>
-						<connpoint role="dst" target="id-0065-0000001c"/>
-						<connpoint role="src" target="id-0066-00000056"/>
-					</connection>
-					<connection id="id-0068-00000010" kind="Consume" role="Consume" guid="{43b4674a-2c84-4cd8-a565-e384a11497bd}" relid="0x39">
-						<name>push_consumer</name>
-						<regnode name="autorouterPref" isopaque="yes">
-							<value>W</value>
-						</regnode>
-						<connpoint role="src" target="id-0065-0000001e"/>
-						<connpoint role="dst" target="id-0066-00000057"/>
-					</connection>
-					<connection id="id-0068-00000011" kind="Consume" role="Consume" guid="{2c3c61ba-7ad9-4cc8-ad4d-fbfa0169816a}" relid="0x3a">
-						<name>push_consumer</name>
-						<regnode name="autorouterPref" isopaque="yes">
-							<value>E</value>
-						</regnode>
-						<connpoint role="src" target="id-0065-0000001c"/>
-						<connpoint role="dst" target="id-0066-00000058"/>
-					</connection>
-					<connection id="id-0068-00000012" kind="Publish" role="Publish" guid="{fac98622-e281-4e33-b7af-926bcb6b0a69}" relid="0x3b">
-						<name>supplier</name>
-						<regnode name="autorouterPref" isopaque="yes">
-							<value>e</value>
-						</regnode>
-						<connpoint role="dst" target="id-0065-0000001e"/>
-						<connpoint role="src" target="id-0066-00000059"/>
-					</connection>
-				</model>
-			</model>
-			<model id="id-0065-00000020" kind="ComponentImplementationContainer" guid="{1408d7b8-e910-4bd9-9efc-651cb3a2cdf2}" relid="0x5" childrelidcntr="0x1">
-				<name>Shapes_AssemblyOne_Impl</name>
-				<model id="id-0065-00000021" kind="ComponentAssembly" role="ComponentAssembly" guid="{03fe0bef-c755-4d75-8107-6b97c30ea9e3}" relid="0x1" childrelidcntr="0x10">
-					<name>Shapes_AssemblyOne_Impl</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Packaging" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>404,208</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="UUID">
-						<value>8E72189A-A6F1-11DF-8000-000C2958D27B</value>
-					</attribute>
-					<attribute kind="label" status="meta">
-						<value></value>
-					</attribute>
-					<model id="id-0065-00000022" kind="ComponentInstance" role="ComponentInstance" guid="{74081b57-c1dc-4448-a970-ed54e99412fe}" relid="0x1" childrelidcntr="0x7">
-						<name>InstanceA</name>
-						<regnode name="PartRegs" status="undefined">
-							<value></value>
-							<regnode name="Packaging" status="undefined">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>230,120</value>
-								</regnode>
-							</regnode>
-						</regnode>
-						<attribute kind="UUID">
-							<value>8E747AEA-A6F1-11DF-8000-000C2958D27B</value>
-						</attribute>
-						<reference id="id-0067-0000000c" kind="ComponentInstanceType" role="ComponentInstanceType" guid="{7eaaf5fc-d165-4fce-9051-0ddef6e4cbc8}" relid="0x1" referred="id-0066-00000009">
-							<name>Shapes_GenericComponent_Impl</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="ComponentImplementationAspect" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>305,172</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-						<reference id="id-0067-0000000d" kind="AttributeInstance" role="AttributeInstance" guid="{0c85630c-df46-4277-8648-6fb5683bec4d}" relid="0x2" referred="id-0065-00000009">
-							<name>rate</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="ComponentInterface" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>97,55</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-						<reference id="id-0067-0000000e" kind="AttributeInstance" role="AttributeInstance" guid="{2f5468de-e16e-429a-b0b3-33ebf4b5fa38}" relid="0x3" referred="id-0065-0000000a">
-							<name>get_data</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="ComponentInterface" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>97,97</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-						<reference id="id-0067-0000000f" kind="AttributeInstance" role="AttributeInstance" guid="{ece548fe-3f7c-4ae4-ab20-45b2221e9cd4}" relid="0x4" referred="id-0065-0000000b">
-							<name>read_data</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="ComponentInterface" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>55,111</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-						<reference id="id-0067-00000010" kind="AttributeInstance" role="AttributeInstance" guid="{23879e2e-c265-4563-872a-c29b4c621456}" relid="0x5" referred="id-0065-0000000c">
-							<name>raw_listen</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="ComponentInterface" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>97,13</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-						<reference id="id-0067-000001db" kind="ExtendedPortInstance" role="ExtendedPortInstance" guid="{5c813e64-504c-4b11-a25c-0d1917b0c827}" relid="0x6" referred="id-0067-000001bb">
-							<name>listen</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="ComponentInterface" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>387,156</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-						<reference id="id-0067-000001dd" kind="ExtendedPortInstance" role="ExtendedPortInstance" guid="{56589c2b-55e0-4f91-b474-d67d54175b7f}" relid="0x7" referred="id-0067-000001bc">
-							<name>write</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="ComponentInterface" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>387,79</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-					</model>
-					<model id="id-0065-00000023" kind="ComponentInstance" role="ComponentInstance" guid="{9d4c2a88-236d-44a8-9d74-f55b84dfe42d}" relid="0x2" childrelidcntr="0x7">
-						<name>InstanceB</name>
-						<regnode name="PartRegs" status="undefined">
-							<value></value>
-							<regnode name="Packaging" status="undefined">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>230,323</value>
-								</regnode>
-							</regnode>
-						</regnode>
-						<attribute kind="UUID">
-							<value>8E747AEA-A6F1-11DF-8001-000C2958D27B</value>
-						</attribute>
-						<reference id="id-0067-00000011" kind="ComponentInstanceType" role="ComponentInstanceType" guid="{eede9e0c-22be-4a71-a681-19f8a47d2dfe}" relid="0x1" referred="id-0066-00000009">
-							<name>Shapes_GenericComponent_Impl</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="ComponentImplementationAspect" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>347,221</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-						<reference id="id-0067-00000012" kind="AttributeInstance" role="AttributeInstance" guid="{f6d1b689-92ad-4921-ada5-98047d6df76b}" relid="0x2" referred="id-0065-00000009">
-							<name>rate</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="ComponentInterface" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>55,55</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-						<reference id="id-0067-00000013" kind="AttributeInstance" role="AttributeInstance" guid="{2c22b01f-7c44-4686-81e1-d73d0734aa1a}" relid="0x3" referred="id-0065-0000000a">
-							<name>get_data</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="ComponentInterface" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>55,13</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-						<reference id="id-0067-00000014" kind="AttributeInstance" role="AttributeInstance" guid="{0968c270-399d-4ada-9a75-26d9c4a04a08}" relid="0x4" referred="id-0065-0000000b">
-							<name>read_data</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="ComponentInterface" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>97,13</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-						<reference id="id-0067-00000015" kind="AttributeInstance" role="AttributeInstance" guid="{77a3a03a-9ebb-4072-b082-c5cedac098b6}" relid="0x5" referred="id-0065-0000000c">
-							<name>raw_listen</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="ComponentInterface" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>97,55</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-						<reference id="id-0067-000001df" kind="ExtendedPortInstance" role="ExtendedPortInstance" guid="{3780a4d0-d6b7-427e-a285-2288a3cae952}" relid="0x6" referred="id-0067-000001bb">
-							<name>listen</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="ComponentInterface" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>331,177</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-						<reference id="id-0067-000001e1" kind="ExtendedPortInstance" role="ExtendedPortInstance" guid="{cf0bfe3c-58b3-4be6-a12e-eb84924a5957}" relid="0x7" referred="id-0067-000001bc">
-							<name>write</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="ComponentInterface" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>331,219</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-					</model>
-					<atom id="id-0066-0000000b" kind="ExtendedPortDelegate" role="ExtendedPortDelegate" guid="{0d3bf646-1366-4e9d-8341-570e4b1b9c8e}" relid="0x6">
-						<name>write</name>
-						<regnode name="PartRegs" status="undefined">
-							<value></value>
-							<regnode name="Packaging" status="undefined">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>604,114</value>
-								</regnode>
-							</regnode>
-						</regnode>
-					</atom>
-					<atom id="id-0066-0000000c" kind="ExtendedPortDelegate" role="ExtendedPortDelegate" guid="{ffff6a3c-f215-4128-a8ee-79f1e54310b7}" relid="0xe">
-						<name>listen</name>
-						<regnode name="PartRegs" status="undefined">
-							<value></value>
-							<regnode name="Packaging" status="undefined">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>604,198</value>
-								</regnode>
-							</regnode>
-						</regnode>
-					</atom>
-					<connection id="id-0068-00000013" kind="ExtendedDelegate" role="ExtendedDelegate" guid="{b90a1729-a820-4a4f-ba2e-5a67bc2c5505}" relid="0xc">
-						<name>ExtendedDelegate</name>
-						<regnode name="autorouterPref" isopaque="yes">
-							<value>w</value>
-						</regnode>
-						<connpoint role="dst" target="id-0066-0000000b"/>
-						<connpoint role="src" target="id-0067-000001dd"/>
-					</connection>
-					<connection id="id-0068-00000014" kind="ExtendedDelegate" role="ExtendedDelegate" guid="{893dd2b2-6b34-4881-afa2-3c060f2051cc}" relid="0xd">
-						<name>ExtendedDelegate</name>
-						<regnode name="autorouterPref" isopaque="yes">
-							<value>w</value>
-						</regnode>
-						<connpoint role="dst" target="id-0066-0000000b"/>
-						<connpoint role="src" target="id-0067-000001e1"/>
-					</connection>
-					<connection id="id-0068-00000015" kind="ExtendedDelegate" role="ExtendedDelegate" guid="{dd831c9f-6871-42ba-b0b9-ed4c73357372}" relid="0xf">
-						<name>ExtendedDelegate</name>
-						<regnode name="autorouterPref" isopaque="yes">
-							<value>w</value>
-						</regnode>
-						<connpoint role="dst" target="id-0066-0000000c"/>
-						<connpoint role="src" target="id-0067-000001df"/>
-					</connection>
-					<connection id="id-0068-00000016" kind="ExtendedDelegate" role="ExtendedDelegate" guid="{7739189b-0f6f-4401-8095-c9fb184fc4de}" relid="0x10">
-						<name>ExtendedDelegate</name>
-						<regnode name="autorouterPref" isopaque="yes">
-							<value>w</value>
-						</regnode>
-						<connpoint role="dst" target="id-0066-0000000c"/>
-						<connpoint role="src" target="id-0067-000001db"/>
-					</connection>
-				</model>
-			</model>
-			<model id="id-0065-00000024" kind="ComponentImplementationContainer" guid="{3f55a5bd-61c4-477f-bae4-983ab0322c7d}" relid="0x6" childrelidcntr="0x1">
-				<name>Shapes_AssemblyTwoImpl</name>
-				<model id="id-0065-00000025" kind="ComponentAssembly" role="ComponentAssembly" guid="{bd3dacc1-9df5-4ae5-909e-78cfdd9606e0}" relid="0x1" childrelidcntr="0x8">
-					<name>Shapes_AssemblyTwo_Impl</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Packaging" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>404,159</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="UUID">
-						<value>8E747AEA-A6F1-11DF-8002-000C2958D27B</value>
-					</attribute>
-					<attribute kind="label" status="meta">
-						<value></value>
-					</attribute>
-					<model id="id-0065-00000026" kind="ComponentInstance" role="ComponentInstance" guid="{c4f4327a-c806-451a-b17e-fc99fc432447}" relid="0x1" childrelidcntr="0x7">
-						<name>InstanceC</name>
-						<regnode name="PartRegs" status="undefined">
-							<value></value>
-							<regnode name="Packaging" status="undefined">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>531,120</value>
-								</regnode>
-							</regnode>
-						</regnode>
-						<attribute kind="UUID">
-							<value>8E747AEA-A6F1-11DF-8003-000C2958D27B</value>
-						</attribute>
-						<reference id="id-0067-00000016" kind="ComponentInstanceType" role="ComponentInstanceType" guid="{e173f19d-be40-4ce6-891e-a0869dcf07d0}" relid="0x1" referred="id-0066-00000009">
-							<name>Shapes_GenericComponent_Impl</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="ComponentImplementationAspect" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>473,165</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-						<reference id="id-0067-00000017" kind="AttributeInstance" role="AttributeInstance" guid="{bced1c97-8db6-46c9-849a-f0f5d107d581}" relid="0x2" referred="id-0065-0000000a">
-							<name>get_data</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="ComponentInterface" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>447,118</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-						<reference id="id-0067-00000018" kind="AttributeInstance" role="AttributeInstance" guid="{7fbbf858-b86d-40fa-a8bd-caaa826cd35b}" relid="0x3" referred="id-0065-00000009">
-							<name>rate</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="ComponentInterface" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>489,118</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-						<reference id="id-0067-00000019" kind="AttributeInstance" role="AttributeInstance" guid="{52347552-1133-4118-9fbc-36addcff0954}" relid="0x4" referred="id-0065-0000000b">
-							<name>read_data</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="ComponentInterface" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>503,48</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-						<reference id="id-0067-0000001a" kind="AttributeInstance" role="AttributeInstance" guid="{d0ddab23-7035-42df-b437-c9ba232d2d88}" relid="0x5" referred="id-0065-0000000c">
-							<name>raw_listen</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="ComponentInterface" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>531,118</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-						<reference id="id-0067-000001e3" kind="ExtendedPortInstance" role="ExtendedPortInstance" guid="{9218ee5f-e4c7-4360-a572-295e8430a42c}" relid="0x6" referred="id-0067-000001bb">
-							<name>listen</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="ComponentInterface" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>9,9</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-						<reference id="id-0067-000001e5" kind="ExtendedPortInstance" role="ExtendedPortInstance" guid="{bcf9e5c8-0d4f-412c-8fce-3faf1e11a87a}" relid="0x7" referred="id-0067-000001bc">
-							<name>write</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="ComponentInterface" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>9,86</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-					</model>
-					<model id="id-0065-00000027" kind="ComponentInstance" role="ComponentInstance" guid="{0d034b19-4faa-46ff-b474-3c044dd7b60e}" relid="0x2" childrelidcntr="0x7">
-						<name>InstanceD</name>
-						<regnode name="PartRegs" status="undefined">
-							<value></value>
-							<regnode name="Packaging" status="undefined">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>531,288</value>
-								</regnode>
-							</regnode>
-						</regnode>
-						<attribute kind="UUID">
-							<value>8E747AEA-A6F1-11DF-8004-000C2958D27B</value>
-						</attribute>
-						<reference id="id-0067-0000001b" kind="ComponentInstanceType" role="ComponentInstanceType" guid="{4b6f408e-3d4b-4894-a767-10b95b411d52}" relid="0x1" referred="id-0066-00000009">
-							<name>Shapes_GenericComponent_Impl</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="ComponentImplementationAspect" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>410,193</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-						<reference id="id-0067-0000001c" kind="AttributeInstance" role="AttributeInstance" guid="{863024ab-45b6-4180-a6ed-8c94a97e453a}" relid="0x2" referred="id-0065-0000000a">
-							<name>get_data</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="ComponentInterface" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>601,90</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-						<reference id="id-0067-0000001d" kind="AttributeInstance" role="AttributeInstance" guid="{8e9a02e2-9919-4552-893a-e99179629df7}" relid="0x3" referred="id-0065-00000009">
-							<name>rate</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="ComponentInterface" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>643,90</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-						<reference id="id-0067-0000001e" kind="AttributeInstance" role="AttributeInstance" guid="{ee9c7f6f-405c-4d25-bb25-3984c05efa22}" relid="0x4" referred="id-0065-0000000b">
-							<name>read_data</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="ComponentInterface" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>559,90</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-						<reference id="id-0067-0000001f" kind="AttributeInstance" role="AttributeInstance" guid="{2c7c894f-3d96-433c-b234-04a5b99e5c27}" relid="0x5" referred="id-0065-0000000c">
-							<name>raw_listen</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="ComponentInterface" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>559,132</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-						<reference id="id-0067-000001e7" kind="ExtendedPortInstance" role="ExtendedPortInstance" guid="{8a13ca07-29b0-4c48-bf11-cfa7c45a38bb}" relid="0x6" referred="id-0067-000001bb">
-							<name>listen</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="ComponentInterface" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>44,142</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-						<reference id="id-0067-000001e9" kind="ExtendedPortInstance" role="ExtendedPortInstance" guid="{66cffb43-c1d6-4053-a4ff-a028c8576d4d}" relid="0x7" referred="id-0067-000001bc">
-							<name>write</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="ComponentInterface" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>44,219</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-					</model>
-					<atom id="id-0066-0000000d" kind="ExtendedPortDelegate" role="ExtendedPortDelegate" guid="{03069d5d-a5b7-431e-9fd5-f0cf79af3716}" relid="0x3">
-						<name>listen</name>
-						<regnode name="PartRegs" status="undefined">
-							<value></value>
-							<regnode name="Packaging" status="undefined">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>65,114</value>
-								</regnode>
-							</regnode>
-						</regnode>
-					</atom>
-					<atom id="id-0066-0000000e" kind="ExtendedPortDelegate" role="ExtendedPortDelegate" guid="{67ffdf19-1b2b-4cd5-8675-6582c997b8ce}" relid="0x4">
-						<name>write</name>
-						<regnode name="PartRegs" status="undefined">
-							<value></value>
-							<regnode name="Packaging" status="undefined">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>65,275</value>
-								</regnode>
-							</regnode>
-						</regnode>
-					</atom>
-					<connection id="id-0068-00000017" kind="ExtendedDelegate" role="ExtendedDelegate" guid="{747f27ac-47dd-4a45-bf36-3e535a884e3c}" relid="0x5">
-						<name>ExtendedDelegate</name>
-						<regnode name="autorouterPref" isopaque="yes">
-							<value>e</value>
-						</regnode>
-						<connpoint role="dst" target="id-0066-0000000d"/>
-						<connpoint role="src" target="id-0067-000001e3"/>
-					</connection>
-					<connection id="id-0068-00000018" kind="ExtendedDelegate" role="ExtendedDelegate" guid="{a2b4d271-5d1f-4ef1-8dea-34748f68e8ed}" relid="0x6">
-						<name>ExtendedDelegate</name>
-						<regnode name="autorouterPref" isopaque="yes">
-							<value>e</value>
-						</regnode>
-						<connpoint role="dst" target="id-0066-0000000e"/>
-						<connpoint role="src" target="id-0067-000001e5"/>
-					</connection>
-					<connection id="id-0068-00000019" kind="ExtendedDelegate" role="ExtendedDelegate" guid="{470cdbcc-55a3-4a38-9ac0-39e2b6de647d}" relid="0x7">
-						<name>ExtendedDelegate</name>
-						<regnode name="autorouterPref" isopaque="yes">
-							<value>e</value>
-						</regnode>
-						<connpoint role="dst" target="id-0066-0000000e"/>
-						<connpoint role="src" target="id-0067-000001e9"/>
-					</connection>
-					<connection id="id-0068-0000001a" kind="ExtendedDelegate" role="ExtendedDelegate" guid="{8d834603-bf33-45e5-9aed-7d3d55987f3f}" relid="0x8">
-						<name>ExtendedDelegate</name>
-						<regnode name="autorouterPref" isopaque="yes">
-							<value>e</value>
-						</regnode>
-						<connpoint role="dst" target="id-0066-0000000d"/>
-						<connpoint role="src" target="id-0067-000001e7"/>
-					</connection>
-				</model>
-			</model>
-		</folder>
-		<folder id="id-006a-00000005" relid="0x3" childrelidcntr="0x12" kind="PredefinedTypes" guid="{cbe1298b-1473-4753-9726-de8b263b513a}">
-			<name>PredefinedTypes</name>
-			<atom id="id-0066-0000000f" kind="Boolean" guid="{53acb444-c5b1-432c-9ec5-a3f3795f593f}" relid="0x0">
-				<name>Boolean</name>
-			</atom>
-			<atom id="id-0066-00000010" kind="Byte" guid="{9ff0da18-0ef7-4def-ba0d-fbf3df2a19fe}" relid="0x1">
-				<name>Byte</name>
-			</atom>
-			<atom id="id-0066-00000011" kind="Char" guid="{1079e57a-3842-4d6a-93e0-1b4a6eac360b}" relid="0x2">
-				<name>Char</name>
-			</atom>
-			<atom id="id-0066-00000012" kind="WideChar" guid="{662f0832-2548-43eb-8d4e-1210b2cc9a66}" relid="0x3">
-				<name>WideChar</name>
-			</atom>
-			<atom id="id-0066-00000013" kind="ShortInteger" guid="{3fd3f39f-382b-44cc-b726-514e338adb75}" relid="0x4">
-				<name>ShortInteger</name>
-			</atom>
-			<atom id="id-0066-00000014" kind="LongInteger" guid="{e3aa3cd1-5dae-4aa4-b32b-18843ea6a191}" relid="0x5">
-				<name>LongInteger</name>
-			</atom>
-			<atom id="id-0066-00000015" kind="LongLongInteger" guid="{42d7014a-48ca-4f1b-8668-5f2cdf2dee86}" relid="0x6">
-				<name>LongLongInteger</name>
-			</atom>
-			<atom id="id-0066-00000016" kind="UnsignedShortInteger" guid="{83f74784-35cf-4183-9ed3-395d43053a5a}" relid="0x7">
-				<name>UnsignedShortInteger</name>
-			</atom>
-			<atom id="id-0066-00000017" kind="UnsignedLongInteger" guid="{617bcb0e-13ec-43c2-8ed2-04e19e2a158e}" relid="0x8">
-				<name>UnsignedLongInteger</name>
-			</atom>
-			<atom id="id-0066-00000018" kind="UnsignedLongLongInteger" guid="{bf1a91e0-07d8-4870-a226-23d07a39a1ae}" relid="0x9">
-				<name>UnsignedLongLongInteger</name>
-			</atom>
-			<atom id="id-0066-00000019" kind="FloatNumber" guid="{c2670960-8b24-4518-bb67-784066aeb47e}" relid="0xa">
-				<name>FloatNumber</name>
-			</atom>
-			<atom id="id-0066-0000001a" kind="DoubleNumber" guid="{eee443b7-2a99-45f5-85aa-358bfcd3307b}" relid="0xb">
-				<name>DoubleNumber</name>
-			</atom>
-			<atom id="id-0066-0000001b" kind="LongDoubleNumber" guid="{55949982-aa0f-486b-8166-d36f6549f0c9}" relid="0xc">
-				<name>LongDoubleNumber</name>
-			</atom>
-			<atom id="id-0066-0000001c" kind="GenericObject" guid="{59ea3bde-0a44-4550-b57f-6dc4ee1129bc}" relid="0xd">
-				<name>GenericObject</name>
-			</atom>
-			<atom id="id-0066-0000001d" kind="GenericValue" guid="{6df923df-c4f7-4b8f-8314-ff3f0de581b0}" relid="0xe">
-				<name>GenericValue</name>
-			</atom>
-			<atom id="id-0066-0000001e" kind="GenericValueObject" guid="{855ab75c-94ac-489a-a979-89b83a0d1630}" relid="0xf">
-				<name>GenericValueObject</name>
-			</atom>
-			<atom id="id-0066-0000001f" kind="String" guid="{157c2583-10df-4ed3-b830-60777aaf41f2}" relid="0x10">
-				<name>String</name>
-			</atom>
-			<atom id="id-0066-00000020" kind="WideString" guid="{75ebce03-65f9-406c-b954-7cb7bf6604ba}" relid="0x11">
-				<name>WideString</name>
-			</atom>
-		</folder>
-		<folder id="id-006a-00000006" relid="0x5" childrelidcntr="0x1" kind="ConnectorImplementations" guid="{1bb94077-88e0-4f3b-80a2-7e64df8df4f5}">
-			<name>Connector Implementations</name>
-			<model id="id-0065-00000028" kind="ConnectorImplementationContainer" guid="{d1b41cea-3979-4b1b-8192-bc9f0eeee967}" relid="0x1" childrelidcntr="0x7">
-				<name>DDS_Shapes_Connector</name>
-				<atom id="id-0066-00000021" kind="ConnectorImplementation" role="ConnectorImplementation" guid="{f171bd99-d282-4bf9-a55c-ea985640b87a}" relid="0x1">
-					<name>DDS_Shapes_Connector_Impl</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Packaging" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>495,320</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="UUID">
-						<value>8E747AEA-A6F1-11DF-8005-000C2958D27B</value>
-					</attribute>
-					<attribute kind="label" status="meta">
-						<value></value>
-					</attribute>
-				</atom>
-				<reference id="id-0067-00000020" kind="ComponentImplementationArtifact" role="ComponentImplementationArtifact" guid="{c1ae9ec4-8990-457c-8a9d-72725b1ad0da}" relid="0x4" referred="id-0066-00000007">
-					<name>Shapes_Connector_exec</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Packaging" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>702,270</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="EntryPoint">
-						<value>create_Shapes_DDS_Event_Impl</value>
-					</attribute>
-				</reference>
-				<reference id="id-0067-00000021" kind="ComponentServantArtifact" role="ComponentServantArtifact" guid="{0ee932e9-2e4c-4cd5-9ac0-f8f09191b43f}" relid="0x5" referred="id-0066-00000008">
-					<name>Shapes_Connector_svnt</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Packaging" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>702,368</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="EntryPoint">
-						<value>create_Shapes_DDS_Event_Servant</value>
-					</attribute>
-				</reference>
-				<reference id="id-0067-000001eb" kind="ConnectorType" role="ConnectorType" guid="{7ee9b774-cd3d-4062-befd-a3407b1f0d25}" relid="0x2" referred="id-0065-0000015e">
-					<name>ConnectorType</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Packaging" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>460,110</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-				<connection id="id-0068-0000001b" kind="ConnectorImplements" role="ConnectorImplements" guid="{f4ab173d-0c67-4038-bd8b-23ba9ba75314}" relid="0x3">
-					<name>ConnectorImplements</name>
-					<regnode name="autorouterPref" isopaque="yes">
-						<value>Ns</value>
-					</regnode>
-					<connpoint role="src" target="id-0066-00000021"/>
-					<connpoint role="dst" target="id-0067-000001eb"/>
-				</connection>
-				<connection id="id-0068-0000001c" kind="MonolithprimaryArtifact" role="MonolithprimaryArtifact" guid="{a2ea556e-8fa7-4a74-b770-5e1f88b59a98}" relid="0x6">
-					<name>MonolithprimaryArtifact</name>
-					<regnode name="autorouterPref" isopaque="yes">
-						<value>Ew</value>
-					</regnode>
-					<connpoint role="src" target="id-0066-00000021"/>
-					<connpoint role="dst" target="id-0067-00000020"/>
-				</connection>
-				<connection id="id-0068-0000001d" kind="MonolithprimaryArtifact" role="MonolithprimaryArtifact" guid="{382b4753-7f9f-4d84-8342-82da6da7e692}" relid="0x7">
-					<name>MonolithprimaryArtifact</name>
-					<regnode name="autorouterPref" isopaque="yes">
-						<value>Ew</value>
-					</regnode>
-					<connpoint role="src" target="id-0066-00000021"/>
-					<connpoint role="dst" target="id-0067-00000021"/>
-				</connection>
-			</model>
-		</folder>
-		<folder id="id-006a-00000007" relid="0x7" childrelidcntr="0x1" kind="Targets" guid="{bd9d5937-1c73-44e8-b516-7c7b5202464c}">
-			<name>Targets</name>
-			<model id="id-0065-00000029" kind="Domain" guid="{2c0c57aa-823b-4b80-8a12-a70b46789e13}" relid="0x1" childrelidcntr="0x2">
-				<name>TestDomain</name>
-				<attribute kind="UUID">
-					<value>8E747AEA-A6F1-11DF-8006-000C2958D27B</value>
-				</attribute>
-				<attribute kind="label" status="meta">
-					<value></value>
-				</attribute>
-				<model id="id-0065-0000002a" kind="Node" role="Node" guid="{c12377bb-fb78-4bff-b639-a7126403200f}" relid="0x1" childrelidcntr="0x0">
-					<name>ReceiverNode</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Target" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>300,237</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="architecture" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="label" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="operatingSystem" status="meta">
-						<value></value>
-					</attribute>
-				</model>
-				<model id="id-0065-0000002b" kind="Node" role="Node" guid="{44bd27bf-0272-410f-aa84-a89a1054f835}" relid="0x2" childrelidcntr="0x0">
-					<name>SenderNode</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Target" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>510,244</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="architecture" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="label" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="operatingSystem" status="meta">
-						<value></value>
-					</attribute>
-				</model>
-			</model>
-		</folder>
-		<folder id="id-006a-00000008" relid="0x8" childrelidcntr="0x1" kind="DeploymentPlans" guid="{62f8e528-4668-49cc-9376-811d48cbb5cd}">
-			<name>DeploymentPlans</name>
-			<model id="id-0065-0000002c" kind="DeploymentPlan" guid="{16eec04c-d3e9-49e0-a6aa-aed6b7121a7d}" relid="0x1" childrelidcntr="0xa">
-				<name>SimpleDeployment</name>
-				<attribute kind="UUID">
-					<value>8E747AEA-A6F1-11DF-8007-000C2958D27B</value>
-				</attribute>
-				<attribute kind="label" status="meta">
-					<value></value>
-				</attribute>
-				<reference id="id-0067-00000022" kind="NodeReference" role="NodeReference" guid="{41aa0c77-8844-4f37-8323-bbab98bb8067}" relid="0x1" referred="id-0065-0000002a">
-					<name>ReceiverNode</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="NodeMapping" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>522,60</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-				<reference id="id-0067-00000023" kind="NodeReference" role="NodeReference" guid="{18fdb1e9-6506-498b-ad03-49c673f12f0d}" relid="0x2" referred="id-0065-0000002b">
-					<name>SenderNode</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="NodeMapping" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>242,46</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-				<reference id="id-0067-000003c2" kind="ComponentAssemblyReference" role="ComponentAssemblyReference" guid="{c29d5a6f-74a0-452b-a0d8-3d6470b1c14b}" relid="0x9" referred="id-0065-0000018d">
-					<name>Shapes_AssemblyOne_Impl</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="NodeMapping" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>196,280</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-				<reference id="id-0067-000003c3" kind="ComponentAssemblyReference" role="ComponentAssemblyReference" guid="{9e6f0c3c-1f9d-49bc-822f-f568cb341206}" relid="0xa" referred="id-0065-00000190">
-					<name>Shapes_AssemblyTwo_Impl</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="NodeMapping" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>497,280</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-				<connection id="id-0068-0000001e" kind="InstanceMapping" role="InstanceMapping" guid="{2728d436-990b-4de9-a706-3d2a8979e0ab}" relid="0x4">
-					<name></name>
-					<connpoint role="dst" target="id-0067-00000022"/>
-					<connpoint role="src" target="id-0069-00000001"/>
-				</connection>
-				<connection id="id-0068-0000001f" kind="InstanceMapping" role="InstanceMapping" guid="{0775b537-df69-4427-9fdf-1b16ee8fb12a}" relid="0x6">
-					<name></name>
-					<connpoint role="dst" target="id-0067-00000023"/>
-					<connpoint role="src" target="id-0069-00000002"/>
-				</connection>
-				<set id="id-0069-00000001" kind="CollocationGroup" role="CollocationGroup" guid="{6d5e7eda-5099-406b-b98f-dbf8cdb17694}" relid="0x3" members="id-0067-000003c2">
-					<name>DefaultGroup</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="NodeMapping" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>524,188</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</set>
-				<set id="id-0069-00000002" kind="CollocationGroup" role="CollocationGroup" guid="{4b620afb-ec57-4d39-a9f6-6147f8c72bbd}" relid="0x5" members="id-0067-000003c3">
-					<name>DefaultGroup</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="NodeMapping" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>244,174</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</set>
-			</model>
-		</folder>
-		<folder id="id-006a-00000009" relid="0x1" childrelidcntr="0x4" libref="MGA=E:/proj/vc9/ACE_TAO_CIAO/CIAO/connectors/dds4ccm/models/dds4ccm.mga" kind="RootFolder" guid="{dcf2ae2f-94b5-41a4-8798-28318fff8fb8}">
-			<name>MGA=E:/proj/vc9/ACE_TAO_CIAO/CIAO/connectors/dds4ccm/models/dds4ccm.mga</name>
-			<folder id="id-006a-0000000a" relid="0x2" childrelidcntr="0x0" kind="ComponentImplementations" guid="{761a1f97-c812-44a4-95d4-bedbffef5e88}">
-				<name>ComponentImplementations</name>
-			</folder>
-			<folder id="id-006a-0000000b" relid="0x3" childrelidcntr="0x12" kind="PredefinedTypes" guid="{dddb800b-cb2d-44c1-8565-04c55466865d}">
-				<name>PredefinedTypes</name>
-				<atom id="id-0066-00000022" kind="WideString" guid="{e783ca74-1607-4282-996b-f76573af40f4}" relid="0x11">
-					<name>WideString</name>
-				</atom>
-				<atom id="id-0066-00000023" kind="String" guid="{27e3d44c-6193-4866-b3af-e20dff54bbab}" relid="0x10">
-					<name>String</name>
-				</atom>
-				<atom id="id-0066-00000024" kind="GenericValueObject" guid="{78214cf5-c763-4757-8021-1f4048f149db}" relid="0xf">
-					<name>GenericValueObject</name>
-				</atom>
-				<atom id="id-0066-00000025" kind="GenericValue" guid="{f8a3717c-66ac-4036-82ca-cd1ae722f2f5}" relid="0xe">
-					<name>GenericValue</name>
-				</atom>
-				<atom id="id-0066-00000026" kind="GenericObject" guid="{9febfeb2-0029-4e17-863a-95ce95fc96c8}" relid="0xd">
-					<name>GenericObject</name>
-				</atom>
-				<atom id="id-0066-00000027" kind="LongDoubleNumber" guid="{2ff7e056-4843-4aa2-92b3-7a63d5f05f7e}" relid="0xc">
-					<name>LongDoubleNumber</name>
-				</atom>
-				<atom id="id-0066-00000028" kind="DoubleNumber" guid="{31da4bfa-4cdd-4aa3-a2b2-ca4565fe6c5e}" relid="0xb">
-					<name>DoubleNumber</name>
-				</atom>
-				<atom id="id-0066-00000029" kind="FloatNumber" guid="{86abaec4-275b-4557-b7fc-3c37162e4c88}" relid="0xa">
-					<name>FloatNumber</name>
-				</atom>
-				<atom id="id-0066-0000002a" kind="UnsignedLongLongInteger" guid="{4088faaa-acb3-4f25-8e02-facd710cffc6}" relid="0x9">
-					<name>UnsignedLongLongInteger</name>
-				</atom>
-				<atom id="id-0066-0000002b" kind="UnsignedLongInteger" guid="{9007bf15-29fc-4b32-a84a-7b7d37391b84}" relid="0x8">
-					<name>UnsignedLongInteger</name>
-				</atom>
-				<atom id="id-0066-0000002c" kind="UnsignedShortInteger" guid="{db80209c-37a2-4682-b082-c7e6c836e85a}" relid="0x7">
-					<name>UnsignedShortInteger</name>
-				</atom>
-				<atom id="id-0066-0000002d" kind="LongLongInteger" guid="{74476a32-4e8e-4476-9386-c18ca08b7169}" relid="0x6">
-					<name>LongLongInteger</name>
-				</atom>
-				<atom id="id-0066-0000002e" kind="LongInteger" guid="{82e9b301-b8d9-4ed6-adde-3f6fa870a4e1}" relid="0x5">
-					<name>LongInteger</name>
-				</atom>
-				<atom id="id-0066-0000002f" kind="ShortInteger" guid="{5bded188-b1f8-4aad-b46f-44c70302479c}" relid="0x4">
-					<name>ShortInteger</name>
-				</atom>
-				<atom id="id-0066-00000030" kind="WideChar" guid="{05b11570-71e1-448c-828f-834dfe5843da}" relid="0x3">
-					<name>WideChar</name>
-				</atom>
-				<atom id="id-0066-00000031" kind="Char" guid="{8193fe8f-a5af-40a1-b393-de6c5d54c352}" relid="0x2">
-					<name>Char</name>
-				</atom>
-				<atom id="id-0066-00000032" kind="Byte" guid="{e4f7be2e-25d8-4a0b-9645-28580fe6b533}" relid="0x1">
-					<name>Byte</name>
-				</atom>
-				<atom id="id-0066-00000033" kind="Boolean" guid="{fb202a59-8bd9-4a7e-aada-1816868d4387}" relid="0x0">
-					<name>Boolean</name>
-				</atom>
-			</folder>
-			<folder id="id-006a-0000000c" relid="0x1" childrelidcntr="0x0" kind="ImplementationArtifacts" guid="{69574031-9f39-4d8e-823d-d29fd48aa072}">
-				<name>ImplementationArtifacts</name>
-			</folder>
-			<folder id="id-006a-0000000d" relid="0x0" childrelidcntr="0x12" kind="InterfaceDefinitions" guid="{6d852a9e-1977-4a6a-8943-64c549a2db8b}">
-				<name>InterfaceDefinitions</name>
-				<model id="id-0065-0000002d" kind="File" guid="{5f33e8ef-85f4-49ef-bcbb-a2ef7ac61eb3}" relid="0x10" childrelidcntr="0x1">
-					<name>dds_rtf2_dcps_i_handle</name>
-					<attribute kind="Path">
-						<value>connectors/dds4ccm/idl</value>
-					</attribute>
-					<attribute kind="PostPreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="PrePreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="PrefixTag" status="meta">
-						<value></value>
-					</attribute>
-					<model id="id-0065-0000002e" kind="Package" role="Package" guid="{38efb2d6-c5ac-47be-ae87-cb4afe74bdeb}" relid="0x0" childrelidcntr="0x2">
-						<name>DDS</name>
-						<attribute kind="PostPreprocessorDirectives" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="PrePreprocessorDirectives" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="PrefixTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="SpecifyIdTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="VersionTag" status="meta">
-							<value></value>
-						</attribute>
-						<model id="id-0065-0000002f" kind="Aggregate" role="Aggregate" guid="{d669c2b7-7879-4d7c-953d-5e3241428e92}" relid="0x0" childrelidcntr="0x1">
-							<name>NativeInstanceHandle_t</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-00000026" kind="Member" role="Member" guid="{5a1128c6-a81c-48e0-bb50-5a582a1cd3ba}" relid="0x0" referred="id-0066-0000002b">
-								<name>isValid</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000027" kind="Member" role="Member" guid="{8136fdb0-7dbb-4225-8755-2577a3e773db}" relid="0x0" referred="id-0066-0000002b">
-								<name>length</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000028" kind="ArrayMember" role="ArrayMember" guid="{8bac54ad-db49-4c71-8611-018b48d10830}" relid="0x0" referred="id-0066-00000032">
-								<name>value</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="Size">
-									<value>16</value>
-								</attribute>
-							</reference>
-						</model>
-						<reference id="id-0067-00000029" kind="Alias" role="Alias" guid="{ff971609-3de5-4dfd-92d3-5c05a80afaa9}" relid="0x1" referred="id-0065-0000002f">
-							<name>InstanceHandle_t</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-0000002a" kind="Collection" role="Collection" guid="{d18bc8f7-a45e-4fbb-a5f2-d48f872f7ecd}" relid="0x1" referred="id-0067-00000029">
-							<name>InstanceHandleSeq</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="bound" status="meta">
-								<value></value>
-							</attribute>
-						</reference>
-					</model>
-				</model>
-				<model id="id-0065-00000030" kind="File" guid="{ab5b259b-a53c-4e92-a982-85860248d4ce}" relid="0xf" childrelidcntr="0x1">
-					<name>dds_rtf2_dcps_instance_handle</name>
-					<attribute kind="Path">
-						<value>connectors/dds4ccm/idl</value>
-					</attribute>
-					<attribute kind="PostPreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="PrePreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="PrefixTag" status="meta">
-						<value></value>
-					</attribute>
-					<model id="id-0065-00000031" kind="Package" role="Package" guid="{639af11c-9d1e-4f6e-bb6f-90cfd4a688e1}" relid="0x0" childrelidcntr="0x1">
-						<name>DDS</name>
-						<attribute kind="PostPreprocessorDirectives" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="PrePreprocessorDirectives" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="PrefixTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="SpecifyIdTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="VersionTag" status="meta">
-							<value></value>
-						</attribute>
-						<atom id="id-0066-00000034" kind="NativeValue" role="NativeValue" guid="{d0de930c-c067-42ed-b568-847c0dcbde68}" relid="0x0">
-							<name>HANDLE_NIL</name>
-						</atom>
-					</model>
-				</model>
-				<model id="id-0065-00000032" kind="File" guid="{b752d754-9e41-4e14-a36e-919b1ee7cd89}" relid="0xd" childrelidcntr="0x1">
-					<name>dds_rtf2_dcps</name>
-					<attribute kind="Path">
-						<value>connectors/dds4ccm/idl</value>
-					</attribute>
-					<attribute kind="PostPreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="PrePreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="PrefixTag" status="meta">
-						<value></value>
-					</attribute>
-					<model id="id-0065-00000033" kind="Package" role="Package" guid="{6159b4d6-7d7b-4f62-acbd-b40c9258f224}" relid="0x0" childrelidcntr="0x56">
-						<name>DDS</name>
-						<attribute kind="PostPreprocessorDirectives" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="PrePreprocessorDirectives" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="PrefixTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="SpecifyIdTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="VersionTag" status="meta">
-							<value></value>
-						</attribute>
-						<model id="id-0065-00000034" kind="Aggregate" role="Aggregate" guid="{2c714200-d641-462c-bf26-2293aad854a7}" relid="0x54" childrelidcntr="0x1">
-							<name>SampleInfo</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-0000002b" kind="Member" role="Member" guid="{fba1a42c-2a85-44e3-ad4d-c04e21f2d664}" relid="0x0" referred="id-0066-00000033">
-								<name>valid_data</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000002c" kind="Member" role="Member" guid="{81356fa4-ada4-4164-af68-95365767a870}" relid="0x0" referred="id-0066-0000002e">
-								<name>absolute_generation_rank</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1060</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000002d" kind="Member" role="Member" guid="{c6d029fb-0fa0-448a-bdf0-31a9450202e2}" relid="0x0" referred="id-0066-0000002e">
-								<name>generation_rank</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,960</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000002e" kind="Member" role="Member" guid="{290e16f9-124e-496c-8f46-7ed2a438b312}" relid="0x0" referred="id-0066-0000002e">
-								<name>sample_rank</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,860</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000002f" kind="Member" role="Member" guid="{3b58615b-6cc1-463d-972c-98a94d2e01c3}" relid="0x0" referred="id-0066-0000002e">
-								<name>no_writers_generation_count</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,760</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000030" kind="Member" role="Member" guid="{e74fea75-90c0-448f-9b58-9b3e905bbb87}" relid="0x0" referred="id-0066-0000002e">
-								<name>disposed_generation_count</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,660</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000031" kind="Member" role="Member" guid="{4fa5bb5e-3329-4877-848d-a26582bf4d50}" relid="0x0" referred="id-0067-00000029">
-								<name>publication_handle</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,560</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000032" kind="Member" role="Member" guid="{4c8d1441-a5a8-424f-baf6-707dbd0a9d24}" relid="0x0" referred="id-0067-00000029">
-								<name>instance_handle</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000001ec" kind="Member" role="Member" guid="{a8c50a2d-d410-473c-8c24-e229b970d707}" relid="0x0" referred="id-0067-0000010a">
-								<name>instance_state</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000001ed" kind="Member" role="Member" guid="{614b0fc2-c0a3-46e2-8b48-d11929ebc612}" relid="0x0" referred="id-0067-0000010f">
-								<name>view_state</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000001ee" kind="Member" role="Member" guid="{16ccd183-b53b-4bd7-bc3c-490516d85f39}" relid="0x0" referred="id-0067-00000114">
-								<name>sample_state</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000001ef" kind="Member" role="Member" guid="{ee88b06b-cd8b-4a5a-9b8a-0d8af3e25b6a}" relid="0x0" referred="id-0065-0000012c">
-								<name>source_timestamp</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000035" kind="Object" role="Object" guid="{14b976f7-962c-418e-b344-dd2ff78462cd}" relid="0x53" childrelidcntr="0x0">
-							<name>TypeSupport</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SupportsAsync" status="meta">
-								<value>false</value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-						</model>
-						<model id="id-0065-00000036" kind="Object" role="Object" guid="{8618bd5c-69d6-4ba3-9b56-ad662f7efe94}" relid="0x52" childrelidcntr="0x9">
-							<name>DomainParticipantFactory</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SupportsAsync" status="meta">
-								<value>false</value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-00000037" kind="TwowayOperation" role="TwowayOperation" guid="{674d12cb-927b-4e2e-9770-92d5788c2abc}" relid="0x8" childrelidcntr="0x1">
-								<name>get_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,860</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000001f0" kind="ReturnType" role="ReturnType" guid="{57addb8d-c750-4a11-9680-b0db3239335d}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000001f1" kind="InoutParameter" role="InoutParameter" guid="{8afd2ce7-31f6-4acf-86be-8847b772f8b8}" relid="0x0" referred="id-0065-00000072">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000038" kind="TwowayOperation" role="TwowayOperation" guid="{f5e360dc-04db-4a5d-8763-82164e537ef1}" relid="0x7" childrelidcntr="0x1">
-								<name>set_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,760</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000001f2" kind="ReturnType" role="ReturnType" guid="{36031c37-c807-4caf-9b94-69ed4cc7b275}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000001f3" kind="InParameter" role="InParameter" guid="{daa9299a-6902-49b4-9244-ee9be3197668}" relid="0x0" referred="id-0065-00000072">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000039" kind="TwowayOperation" role="TwowayOperation" guid="{0ca98cb8-df82-4713-8767-0bb3a70335e7}" relid="0x6" childrelidcntr="0x1">
-								<name>get_default_participant_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,660</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000001f4" kind="ReturnType" role="ReturnType" guid="{12cb18d4-431c-4808-8689-361558ef34d1}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000001f5" kind="InoutParameter" role="InoutParameter" guid="{125224c3-3b1a-46b1-80ee-ca9d65cc2425}" relid="0x0" referred="id-0065-00000071">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000003a" kind="TwowayOperation" role="TwowayOperation" guid="{411a66ab-799d-4a25-8996-fc2bda71ebf7}" relid="0x5" childrelidcntr="0x1">
-								<name>set_default_participant_qos_with_profile</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,560</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000033" kind="InParameter" role="InParameter" guid="{ead2634b-0cd4-4dfb-abb4-4d369c8a7c6e}" relid="0x0" referred="id-0066-00000023">
-									<name>profile_name</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000034" kind="InParameter" role="InParameter" guid="{b9e19955-7e65-4d6f-a400-f031912cc998}" relid="0x0" referred="id-0066-00000023">
-									<name>library_name</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000001f6" kind="ReturnType" role="ReturnType" guid="{6bbf23f6-fa96-4c5e-a493-fe60cb292c6f}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000003b" kind="TwowayOperation" role="TwowayOperation" guid="{f54757de-ad62-481e-9a37-ab5a8dcdef9f}" relid="0x4" childrelidcntr="0x1">
-								<name>set_default_participant_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000001f7" kind="ReturnType" role="ReturnType" guid="{8635d377-08f8-4219-86fb-c93d98d8e7f4}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000001f8" kind="InParameter" role="InParameter" guid="{173433a3-cb80-465d-9960-3fd457352d60}" relid="0x0" referred="id-0065-00000071">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000003c" kind="TwowayOperation" role="TwowayOperation" guid="{4130315a-e18a-4551-b141-8cb58641b1c6}" relid="0x3" childrelidcntr="0x1">
-								<name>lookup_participant</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000001f9" kind="InParameter" role="InParameter" guid="{776b9098-3954-4614-8e54-c79f85797d68}" relid="0x0" referred="id-0067-0000013d">
-									<name>domain_id</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000001fa" kind="ReturnType" role="ReturnType" guid="{4bfd6543-86f1-400b-aab8-40cb3faffc6a}" relid="0x0" referred="id-0065-00000040">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000003d" kind="TwowayOperation" role="TwowayOperation" guid="{5e9db718-7dd8-4b78-8f29-7afce0c9ec81}" relid="0x2" childrelidcntr="0x1">
-								<name>delete_participant</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000001fb" kind="ReturnType" role="ReturnType" guid="{e390220e-a3ec-402e-b292-84a90c4589b7}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000001fc" kind="InParameter" role="InParameter" guid="{763b8624-0475-4e4e-98f5-b6c3211e6928}" relid="0x0" referred="id-0065-00000040">
-									<name>a_participant</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000003e" kind="TwowayOperation" role="TwowayOperation" guid="{0472a690-d2e1-4737-856e-3f411a1d5ea3}" relid="0x1" childrelidcntr="0x1">
-								<name>create_participant_with_profile</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000035" kind="InParameter" role="InParameter" guid="{f8d0ed9a-fecd-4389-9300-6d95c6b41898}" relid="0x0" referred="id-0066-00000023">
-									<name>profile_name</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>360,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000036" kind="InParameter" role="InParameter" guid="{d32f5a3a-5ae8-481f-8585-f526ad1440d0}" relid="0x0" referred="id-0066-00000023">
-									<name>library_name</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000001fd" kind="InParameter" role="InParameter" guid="{65e6a89e-3878-4fbe-8c1a-c3ff03037e12}" relid="0x0" referred="id-0067-00000124">
-									<name>mask</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>560,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000001fe" kind="InParameter" role="InParameter" guid="{675917ad-7652-4f74-bad1-e2090aea6706}" relid="0x0" referred="id-0067-0000013d">
-									<name>domain_id</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000001ff" kind="InParameter" role="InParameter" guid="{467268db-03b5-4e0c-985f-8594f6f662b7}" relid="0x0" referred="id-0065-000000a6">
-									<name>a_listener</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>460,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000200" kind="ReturnType" role="ReturnType" guid="{4082c988-87e8-4fa0-97b6-60d63ee3b35f}" relid="0x0" referred="id-0065-00000040">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000003f" kind="TwowayOperation" role="TwowayOperation" guid="{3ce1c5ab-14fe-4956-91a4-d6c6abea5d8b}" relid="0x0" childrelidcntr="0x1">
-								<name>create_participant</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000201" kind="InParameter" role="InParameter" guid="{2149a187-35d4-4345-84a1-1fe0acc7a272}" relid="0x0" referred="id-0067-00000124">
-									<name>mask</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>460,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000202" kind="InParameter" role="InParameter" guid="{3f515376-3a1e-4294-ba80-168a2da40038}" relid="0x0" referred="id-0067-0000013d">
-									<name>domain_id</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000203" kind="InParameter" role="InParameter" guid="{c5c06cfb-1ba1-4cf7-b3a1-2e6b2da7421d}" relid="0x0" referred="id-0065-000000a6">
-									<name>a_listener</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>360,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000204" kind="InParameter" role="InParameter" guid="{b05cc2ff-337c-498f-8f1b-05cf478b5396}" relid="0x0" referred="id-0065-00000071">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000205" kind="ReturnType" role="ReturnType" guid="{a12326d2-f203-471b-92a1-11b422f87581}" relid="0x0" referred="id-0065-00000040">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-						</model>
-						<model id="id-0065-00000040" kind="Object" role="Object" guid="{adbad2ab-fe31-4027-b268-34d81e9b40bb}" relid="0x51" childrelidcntr="0x28">
-							<name>DomainParticipant</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SupportsAsync" status="meta">
-								<value>false</value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-00000041" kind="TwowayOperation" role="TwowayOperation" guid="{6fce6d4c-c837-4b60-b354-26410f70df8a}" relid="0x26" childrelidcntr="0x1">
-								<name>get_current_time</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,3860</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000206" kind="ReturnType" role="ReturnType" guid="{05b63672-5cab-439b-9400-582bff97a774}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000207" kind="InoutParameter" role="InoutParameter" guid="{bddfcd19-94cf-4091-aea2-f7cd16871403}" relid="0x0" referred="id-0065-0000012c">
-									<name>current_time</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000042" kind="TwowayOperation" role="TwowayOperation" guid="{4dd82f0f-51b8-4b5a-a8dd-e48f8597365e}" relid="0x25" childrelidcntr="0x1">
-								<name>contains_entity</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,3760</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000037" kind="InParameter" role="InParameter" guid="{ba1641bc-ee64-4012-b384-24463440f654}" relid="0x0" referred="id-0067-00000029">
-									<name>a_handle</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000038" kind="ReturnType" role="ReturnType" guid="{8ac61c0e-6fc7-4c14-9f8c-00fd2e7d6148}" relid="0x0" referred="id-0066-00000033">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000043" kind="TwowayOperation" role="TwowayOperation" guid="{c27b14e7-4a67-4be7-a03c-66666c054971}" relid="0x24" childrelidcntr="0x1">
-								<name>get_discovered_topic_data</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,3660</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000039" kind="InParameter" role="InParameter" guid="{49bfc992-f5df-4d43-b303-99633d71ed51}" relid="0x0" referred="id-0067-00000029">
-									<name>topic_handle</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000208" kind="ReturnType" role="ReturnType" guid="{a97f7013-a8dd-4c41-8f26-1926fdebe300}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000209" kind="InoutParameter" role="InoutParameter" guid="{f34c8437-0275-4ecc-92f6-5a0584fe5598}" relid="0x0" referred="id-0065-0000006a">
-									<name>topic_data</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000044" kind="TwowayOperation" role="TwowayOperation" guid="{3dc43948-20e5-4a27-a2fb-6b4bbdf3cfa6}" relid="0x23" childrelidcntr="0x1">
-								<name>get_discovered_topics</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,3560</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000003a" kind="InoutParameter" role="InoutParameter" guid="{c1f37e6b-4fa9-4f5a-afa7-2345eb1b60ae}" relid="0x0" referred="id-0067-0000002a">
-									<name>topic_handles</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000020a" kind="ReturnType" role="ReturnType" guid="{84876e6a-42a0-4d03-94aa-b308db0742b9}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000045" kind="TwowayOperation" role="TwowayOperation" guid="{e0495d7e-8cd3-48d5-819c-a59fe3c40c04}" relid="0x22" childrelidcntr="0x1">
-								<name>get_discovered_participant_data</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,3460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000003b" kind="InParameter" role="InParameter" guid="{4e2a47e0-e14e-44c2-a00d-63ff9a58ac0f}" relid="0x0" referred="id-0067-00000029">
-									<name>participant_handle</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000020b" kind="ReturnType" role="ReturnType" guid="{de9dfffb-6b06-4193-8ee1-f5fd9feb18ba}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000020c" kind="InoutParameter" role="InoutParameter" guid="{6b74548a-e564-43dc-9444-efd3bd2d7969}" relid="0x0" referred="id-0065-0000006b">
-									<name>participant_data</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000046" kind="TwowayOperation" role="TwowayOperation" guid="{4e754f33-3463-4d8b-962a-a18fae66410d}" relid="0x21" childrelidcntr="0x1">
-								<name>get_discovered_participants</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,3360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000003c" kind="InoutParameter" role="InoutParameter" guid="{4b89bc26-a2b4-4934-a1dd-e1981eb2b099}" relid="0x0" referred="id-0067-0000002a">
-									<name>participant_handles</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000020d" kind="ReturnType" role="ReturnType" guid="{a419422a-9344-4313-a4c4-14d24caab8ec}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000047" kind="TwowayOperation" role="TwowayOperation" guid="{758fb5e5-b06c-4329-a90f-18960491b1b7}" relid="0x20" childrelidcntr="0x1">
-								<name>get_default_topic_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,3260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000020e" kind="ReturnType" role="ReturnType" guid="{fd2d8d09-c6b8-49c9-a0f8-cc292b81ce21}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000020f" kind="InoutParameter" role="InoutParameter" guid="{8837687d-ef75-465d-8257-b78fbab6bf91}" relid="0x0" referred="id-0065-00000070">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000048" kind="TwowayOperation" role="TwowayOperation" guid="{b416ad7f-4714-4a7d-a7c7-4ce5dfc70110}" relid="0x1f" childrelidcntr="0x1">
-								<name>set_default_topic_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,3160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000210" kind="ReturnType" role="ReturnType" guid="{edbb3b4c-ad4b-40f6-b3f8-67d78a69610c}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000211" kind="InParameter" role="InParameter" guid="{fa1b9032-40e6-4b97-9732-924fd0d42d07}" relid="0x0" referred="id-0065-00000070">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000049" kind="TwowayOperation" role="TwowayOperation" guid="{0cd5146d-a815-490c-b917-ddc9de5432aa}" relid="0x1e" childrelidcntr="0x1">
-								<name>get_default_subscriber_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,3060</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000212" kind="ReturnType" role="ReturnType" guid="{7a3120e1-df05-4389-a7cf-71c6d6e8ccb3}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000213" kind="InoutParameter" role="InoutParameter" guid="{41a3db01-6842-49e4-8ec4-d6842b2013ff}" relid="0x0" referred="id-0065-0000006c">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000004a" kind="TwowayOperation" role="TwowayOperation" guid="{128b56ba-1d89-4305-88b1-a64ecb787178}" relid="0x1d" childrelidcntr="0x1">
-								<name>set_default_subscriber_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,2960</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000214" kind="ReturnType" role="ReturnType" guid="{490eed98-b30a-4ac1-8e9e-07533ab9f1d8}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000215" kind="InParameter" role="InParameter" guid="{115f6d99-04e5-48cd-95a3-32dcf2e70109}" relid="0x0" referred="id-0065-0000006c">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000004b" kind="TwowayOperation" role="TwowayOperation" guid="{c3bf1dff-8bb1-410a-8306-cd80c6fca52d}" relid="0x1c" childrelidcntr="0x1">
-								<name>get_default_publisher_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,2860</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000216" kind="ReturnType" role="ReturnType" guid="{32c5dd66-4144-4216-bd29-21c675888334}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000217" kind="InoutParameter" role="InoutParameter" guid="{0cfd0280-a5c3-4552-9cc2-7058cde5fdbf}" relid="0x0" referred="id-0065-0000006e">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000004c" kind="TwowayOperation" role="TwowayOperation" guid="{c329253d-b985-4bd5-b4ea-17bf5724fe00}" relid="0x1b" childrelidcntr="0x1">
-								<name>set_default_publisher_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,2760</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000218" kind="ReturnType" role="ReturnType" guid="{09d296d1-2f3c-4d49-9ab6-8e28716c9890}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000219" kind="InParameter" role="InParameter" guid="{ff28657c-0e9b-4625-bf2f-d347fd2f7015}" relid="0x0" referred="id-0065-0000006e">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000004d" kind="TwowayOperation" role="TwowayOperation" guid="{89d187b7-6e2d-4021-bf50-9299fc2fa4d3}" relid="0x1a" childrelidcntr="0x1">
-								<name>assert_liveliness</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,2660</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000021a" kind="ReturnType" role="ReturnType" guid="{5fc1cbc0-8c47-42fc-a970-4e162834344c}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000004e" kind="TwowayOperation" role="TwowayOperation" guid="{6c8fdbcd-9398-4275-b9bc-6f0fc879c3ea}" relid="0x19" childrelidcntr="0x1">
-								<name>get_domain_id</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,2560</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000021b" kind="ReturnType" role="ReturnType" guid="{9049c76f-05d4-4c5a-a9fd-8be554036db4}" relid="0x0" referred="id-0067-0000013d">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000004f" kind="TwowayOperation" role="TwowayOperation" guid="{6337f55e-fc7f-4e61-8caa-5ee7ab8d7ba9}" relid="0x18" childrelidcntr="0x1">
-								<name>ignore_subscription</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,2460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000003d" kind="InParameter" role="InParameter" guid="{4c616eea-1ab0-409e-b8eb-fe8697cef426}" relid="0x0" referred="id-0067-00000029">
-									<name>handle</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000021c" kind="ReturnType" role="ReturnType" guid="{7912ab17-7fb8-47ae-a2ea-d2dbc93e3887}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000050" kind="TwowayOperation" role="TwowayOperation" guid="{7d2a36ce-29c2-430a-ac9c-7cdd65155b21}" relid="0x17" childrelidcntr="0x1">
-								<name>ignore_publication</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,2360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000003e" kind="InParameter" role="InParameter" guid="{f479077b-2018-4917-945a-5ef5303baa57}" relid="0x0" referred="id-0067-00000029">
-									<name>handle</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000021d" kind="ReturnType" role="ReturnType" guid="{14a39626-16e8-42c2-bd35-5337c6d0fbb8}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000051" kind="TwowayOperation" role="TwowayOperation" guid="{d5bb24d4-d4e4-4876-b5f6-7508240446d9}" relid="0x16" childrelidcntr="0x1">
-								<name>ignore_topic</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,2260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000003f" kind="InParameter" role="InParameter" guid="{394d409f-bdc7-4f59-9831-6617430cb682}" relid="0x0" referred="id-0067-00000029">
-									<name>handle</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000021e" kind="ReturnType" role="ReturnType" guid="{0b124489-8800-48fd-b332-de8667926465}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000052" kind="TwowayOperation" role="TwowayOperation" guid="{4d4b8f5f-cf81-449b-b2f6-872bd32bd5db}" relid="0x15" childrelidcntr="0x1">
-								<name>ignore_participant</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,2160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000040" kind="InParameter" role="InParameter" guid="{01539cc7-a2c2-42bb-92a6-3fd2203d0e41}" relid="0x0" referred="id-0067-00000029">
-									<name>handle</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000021f" kind="ReturnType" role="ReturnType" guid="{59b7b008-db35-42c3-b56f-d8d68dfcbdef}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000053" kind="TwowayOperation" role="TwowayOperation" guid="{dc55a1b3-396d-4ac4-9847-90bfd30093d2}" relid="0x14" childrelidcntr="0x1">
-								<name>get_listener</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,2060</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000220" kind="ReturnType" role="ReturnType" guid="{d15e7d8d-9d46-4ae1-9ac2-2e8c499e1ee2}" relid="0x0" referred="id-0065-000000a6">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000054" kind="TwowayOperation" role="TwowayOperation" guid="{12fc8be7-116f-46ec-b564-9d18d897a11a}" relid="0x13" childrelidcntr="0x1">
-								<name>set_listener</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1960</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000221" kind="InParameter" role="InParameter" guid="{e54d1be9-7537-4c5c-b740-9b889e9a7e76}" relid="0x0" referred="id-0067-00000124">
-									<name>mask</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000222" kind="ReturnType" role="ReturnType" guid="{938c4114-7ac8-4790-b4a6-8e7c5b2ebe7e}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000223" kind="InParameter" role="InParameter" guid="{251691d4-8b12-4fa6-b684-d8cfdbb80282}" relid="0x0" referred="id-0065-000000a6">
-									<name>a_listener</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000055" kind="TwowayOperation" role="TwowayOperation" guid="{543868eb-2b6e-496c-b4c2-176c5c7970a3}" relid="0x12" childrelidcntr="0x1">
-								<name>get_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1860</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000224" kind="ReturnType" role="ReturnType" guid="{45196a75-f961-415c-a9a7-b08bd15bbe5c}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000225" kind="InoutParameter" role="InoutParameter" guid="{9b1a4dab-78a5-4685-9cbc-c0c42e948804}" relid="0x0" referred="id-0065-00000071">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000056" kind="TwowayOperation" role="TwowayOperation" guid="{086f4f5f-e13c-4513-9f2d-7de2e3d30ec5}" relid="0x11" childrelidcntr="0x1">
-								<name>set_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1760</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000226" kind="ReturnType" role="ReturnType" guid="{1fa31447-a789-41ce-a73e-fb616592267f}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000227" kind="InParameter" role="InParameter" guid="{13199f31-14a6-49b0-86c9-486ef7c4b832}" relid="0x0" referred="id-0065-00000071">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000057" kind="TwowayOperation" role="TwowayOperation" guid="{c2f044a0-dc38-42fd-9a91-55ebf9acccde}" relid="0x10" childrelidcntr="0x1">
-								<name>delete_contained_entities</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1660</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000228" kind="ReturnType" role="ReturnType" guid="{e40a1f57-fd01-420a-b3fd-305b4ad47113}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000058" kind="TwowayOperation" role="TwowayOperation" guid="{db0538ac-f8b4-44e9-baa3-6e574059167b}" relid="0xf" childrelidcntr="0x1">
-								<name>delete_multitopic</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1560</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000229" kind="ReturnType" role="ReturnType" guid="{a8516b15-6769-456d-ae17-2c5ee99c8871}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000022a" kind="InParameter" role="InParameter" guid="{7d35df1b-d557-41f3-ba90-0248bff6defe}" relid="0x0" referred="id-0065-00000103">
-									<name>a_multitopic</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000059" kind="TwowayOperation" role="TwowayOperation" guid="{2dc11291-40d1-4b2c-ae97-2594c9096575}" relid="0xe" childrelidcntr="0x1">
-								<name>create_multitopic</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000041" kind="InParameter" role="InParameter" guid="{b553f4ca-68fe-42ea-9f52-dad935a546f5}" relid="0x0" referred="id-0066-00000023">
-									<name>subscription_expression</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>360,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000042" kind="InParameter" role="InParameter" guid="{ca454e0f-bcbc-4862-9c41-0bdf6e7a3ed2}" relid="0x0" referred="id-0066-00000023">
-									<name>type_name</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000043" kind="InParameter" role="InParameter" guid="{f700a488-b10c-4821-8977-3c0ecd98c844}" relid="0x0" referred="id-0066-00000023">
-									<name>name</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000022b" kind="InParameter" role="InParameter" guid="{89695eec-c9da-4338-8666-7bee3106ff37}" relid="0x0" referred="id-0067-0000013a">
-									<name>expression_parameters</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>460,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000022c" kind="ReturnType" role="ReturnType" guid="{3d5b5a6b-2c10-40ec-a45d-e4f97399ff98}" relid="0x0" referred="id-0065-00000103">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000005a" kind="TwowayOperation" role="TwowayOperation" guid="{1338efef-c90f-45bf-a65b-b25776d9bd99}" relid="0xd" childrelidcntr="0x1">
-								<name>delete_contentfilteredtopic</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000022d" kind="ReturnType" role="ReturnType" guid="{3674aaaa-5fd1-4c05-98c4-c99689e3e1df}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000022e" kind="InParameter" role="InParameter" guid="{31fae1fa-5c38-4f82-9ac7-c798999fa6fa}" relid="0x0" referred="id-0065-00000107">
-									<name>a_contentfilteredtopic</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000005b" kind="TwowayOperation" role="TwowayOperation" guid="{12d37d0c-69c4-4aa0-9213-7af9034e957d}" relid="0xc" childrelidcntr="0x1">
-								<name>create_contentfilteredtopic</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000044" kind="InParameter" role="InParameter" guid="{d9ad90ee-d6b8-403d-bbc4-5455880a6be6}" relid="0x0" referred="id-0066-00000023">
-									<name>filter_expression</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>360,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000045" kind="InParameter" role="InParameter" guid="{17b7cf4a-2a8e-413b-915c-57a94636138d}" relid="0x0" referred="id-0066-00000023">
-									<name>name</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000022f" kind="InParameter" role="InParameter" guid="{1a23c6bb-ab8d-4230-91ba-4e9690a3e514}" relid="0x0" referred="id-0067-0000013a">
-									<name>expression_parameters</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>460,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000230" kind="InParameter" role="InParameter" guid="{24750656-187f-4b50-8341-8d821758acdf}" relid="0x0" referred="id-0065-0000010c">
-									<name>related_topic</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000231" kind="ReturnType" role="ReturnType" guid="{21a67334-ad16-4f72-b547-cccc13ab10fa}" relid="0x0" referred="id-0065-00000107">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000005c" kind="TwowayOperation" role="TwowayOperation" guid="{91c52ba0-87a4-44bd-983e-8bb82915a40d}" relid="0xb" childrelidcntr="0x1">
-								<name>lookup_topicdescription</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000046" kind="InParameter" role="InParameter" guid="{16006c5d-9f58-4ae2-8ed0-2a29932677f9}" relid="0x0" referred="id-0066-00000023">
-									<name>name</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000232" kind="ReturnType" role="ReturnType" guid="{a99b4bd1-fed9-4b6f-b30a-1a6873368964}" relid="0x0" referred="id-0065-00000112">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000005d" kind="TwowayOperation" role="TwowayOperation" guid="{58160d02-77ed-4143-a960-ecce9f570018}" relid="0xa" childrelidcntr="0x1">
-								<name>find_topic</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1060</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000047" kind="InParameter" role="InParameter" guid="{d859af0b-492b-4ced-bfab-cd360c038fe2}" relid="0x0" referred="id-0066-00000023">
-									<name>topic_name</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000233" kind="InParameter" role="InParameter" guid="{f3c31cc8-7f69-4310-9c3d-ee0aafb573f5}" relid="0x0" referred="id-0065-0000012d">
-									<name>timeout</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000234" kind="ReturnType" role="ReturnType" guid="{884e3058-2897-4e00-8a29-01ef193d4e08}" relid="0x0" referred="id-0065-0000010c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000005e" kind="TwowayOperation" role="TwowayOperation" guid="{e640ed42-df31-4f81-93d6-aaee63fdceb4}" relid="0x9" childrelidcntr="0x1">
-								<name>delete_topic</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,960</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000235" kind="ReturnType" role="ReturnType" guid="{38dff28f-ed5a-45d8-89cc-edfc6581f0dd}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000236" kind="InParameter" role="InParameter" guid="{905ab556-9e6b-4425-b83c-bc83aff9a7d1}" relid="0x0" referred="id-0065-0000010c">
-									<name>a_topic</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000005f" kind="TwowayOperation" role="TwowayOperation" guid="{0f940ffb-b482-4581-baed-cc7a1b0bf9a1}" relid="0x8" childrelidcntr="0x1">
-								<name>create_topic_with_profile</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,860</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000048" kind="InParameter" role="InParameter" guid="{28c9cfdd-3e8a-4a1a-b74a-1e31de095c8e}" relid="0x0" referred="id-0066-00000023">
-									<name>profile_name</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>460,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000049" kind="InParameter" role="InParameter" guid="{ad625c85-07d5-4bdf-8943-3efec1ca7b49}" relid="0x0" referred="id-0066-00000023">
-									<name>library_name</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>360,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000004a" kind="InParameter" role="InParameter" guid="{da0571fb-0964-48ec-b26e-5dcd45a14581}" relid="0x0" referred="id-0066-00000023">
-									<name>type_name</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000004b" kind="InParameter" role="InParameter" guid="{029f4052-ee01-4d95-9ad2-444fc1d30603}" relid="0x0" referred="id-0066-00000023">
-									<name>topic_name</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000237" kind="InParameter" role="InParameter" guid="{a6419720-dba3-428b-9dbb-120f57066c87}" relid="0x0" referred="id-0067-00000124">
-									<name>mask</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>660,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000238" kind="InParameter" role="InParameter" guid="{73475718-4991-4669-a54e-5205f10de2c6}" relid="0x0" referred="id-0065-000000b9">
-									<name>a_listener</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>560,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000239" kind="ReturnType" role="ReturnType" guid="{83c05f2e-78aa-4e93-8e62-64fb7b698c7b}" relid="0x0" referred="id-0065-0000010c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000060" kind="TwowayOperation" role="TwowayOperation" guid="{5af04129-2734-46d2-babf-d6a6b4316fad}" relid="0x7" childrelidcntr="0x1">
-								<name>create_topic</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,760</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000004c" kind="InParameter" role="InParameter" guid="{56602453-5cac-4a29-bf15-7361b730be6d}" relid="0x0" referred="id-0066-00000023">
-									<name>type_name</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000004d" kind="InParameter" role="InParameter" guid="{c62c0c58-6204-473b-b78f-5719d007aa4e}" relid="0x0" referred="id-0066-00000023">
-									<name>topic_name</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000023a" kind="InParameter" role="InParameter" guid="{e74035a6-c8c4-405a-8051-8c4d11735cc8}" relid="0x0" referred="id-0067-00000124">
-									<name>mask</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>560,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000023b" kind="InParameter" role="InParameter" guid="{0ab3874c-d2bf-4462-8000-ab8b4f3b02ce}" relid="0x0" referred="id-0065-000000b9">
-									<name>a_listener</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>460,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000023c" kind="InParameter" role="InParameter" guid="{907b5437-39ce-4fc4-974d-41e00266b640}" relid="0x0" referred="id-0065-00000070">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>360,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000023d" kind="ReturnType" role="ReturnType" guid="{6cd0a48f-b5af-4db6-9c63-a79ba779a488}" relid="0x0" referred="id-0065-0000010c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000061" kind="TwowayOperation" role="TwowayOperation" guid="{088936e8-802f-48cc-8fb8-704514d1ff74}" relid="0x6" childrelidcntr="0x1">
-								<name>get_builtin_subscriber</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,660</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000023e" kind="ReturnType" role="ReturnType" guid="{20169755-3c31-4477-967c-e0b7ad76a87e}" relid="0x0" referred="id-0065-000000ce">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000062" kind="TwowayOperation" role="TwowayOperation" guid="{b3f885a3-5f06-4f80-ac51-76e2354a5f71}" relid="0x5" childrelidcntr="0x1">
-								<name>delete_subscriber</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,560</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000023f" kind="ReturnType" role="ReturnType" guid="{491fe4b7-1197-4b25-aa39-d73d9289d017}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000240" kind="InParameter" role="InParameter" guid="{ffed51e2-201b-4634-b99a-274d9fafe3b8}" relid="0x0" referred="id-0065-000000ce">
-									<name>s</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000063" kind="TwowayOperation" role="TwowayOperation" guid="{4a0f5f77-add2-4a39-b8f2-5914531b73a8}" relid="0x4" childrelidcntr="0x1">
-								<name>create_subscriber_with_profile</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000004e" kind="InParameter" role="InParameter" guid="{c902f4b3-5c28-496c-8445-ee3c8dd28a2d}" relid="0x0" referred="id-0066-00000023">
-									<name>profile_name</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000004f" kind="InParameter" role="InParameter" guid="{f6e61b84-c21d-4753-a82d-62a5c43c832a}" relid="0x0" referred="id-0066-00000023">
-									<name>library_name</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000241" kind="InParameter" role="InParameter" guid="{4b5e21cb-a0a4-4d52-b411-9178b9559637}" relid="0x0" referred="id-0067-00000124">
-									<name>mask</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>460,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000242" kind="InParameter" role="InParameter" guid="{ff25f43b-1477-40b9-819b-3601b505e3a8}" relid="0x0" referred="id-0065-000000a7">
-									<name>a_listener</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>360,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000243" kind="ReturnType" role="ReturnType" guid="{9f1b2807-bc7b-42ea-8fcc-c6f8d54c496e}" relid="0x0" referred="id-0065-000000ce">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000064" kind="TwowayOperation" role="TwowayOperation" guid="{92f68ffe-d20d-4e41-b4f3-fa409878e14a}" relid="0x3" childrelidcntr="0x1">
-								<name>create_subscriber</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000244" kind="InParameter" role="InParameter" guid="{92ada6e9-5fda-40d4-b92d-af48cd36dc53}" relid="0x0" referred="id-0067-00000124">
-									<name>mask</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>360,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000245" kind="InParameter" role="InParameter" guid="{f34ba127-eb23-4977-9469-007cc1d5d551}" relid="0x0" referred="id-0065-000000a7">
-									<name>a_listener</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000246" kind="InParameter" role="InParameter" guid="{6f2085f7-30ab-48ef-be30-25d267d1486c}" relid="0x0" referred="id-0065-0000006c">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000247" kind="ReturnType" role="ReturnType" guid="{c3f95a33-4686-4aef-8310-034e358030ca}" relid="0x0" referred="id-0065-000000ce">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000065" kind="TwowayOperation" role="TwowayOperation" guid="{514c959c-2e91-47d1-93aa-727d7655aea5}" relid="0x2" childrelidcntr="0x1">
-								<name>delete_publisher</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000248" kind="ReturnType" role="ReturnType" guid="{28a89f80-e0be-4ff1-bb5b-6bb6f42fd1b3}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000249" kind="InParameter" role="InParameter" guid="{1dbd09f1-2033-4370-b145-384ed4240df7}" relid="0x0" referred="id-0065-000000bb">
-									<name>p</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000066" kind="TwowayOperation" role="TwowayOperation" guid="{97adace4-5ab0-4f2c-be4a-54f3e413816d}" relid="0x1" childrelidcntr="0x1">
-								<name>create_publisher_with_profile</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000050" kind="InParameter" role="InParameter" guid="{afdac122-bee2-484c-9a50-099abadbbbfa}" relid="0x0" referred="id-0066-00000023">
-									<name>profile_name</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000051" kind="InParameter" role="InParameter" guid="{a84cdc29-91b8-4e23-925d-31eee31bd934}" relid="0x0" referred="id-0066-00000023">
-									<name>library_name</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000024a" kind="InParameter" role="InParameter" guid="{534a2637-1b2a-42ec-ba93-ef97cddaee5f}" relid="0x0" referred="id-0067-00000124">
-									<name>mask</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>460,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000024b" kind="InParameter" role="InParameter" guid="{d2b69164-88fd-487f-bbf6-801ace2a21cb}" relid="0x0" referred="id-0065-000000b1">
-									<name>a_listener</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>360,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000024c" kind="ReturnType" role="ReturnType" guid="{fa3c8080-819f-40b6-a9b9-07982de8837a}" relid="0x0" referred="id-0065-000000bb">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000067" kind="TwowayOperation" role="TwowayOperation" guid="{c8fde55c-1bc5-43ee-a1ad-d0128c992d70}" relid="0x0" childrelidcntr="0x1">
-								<name>create_publisher</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000024d" kind="InParameter" role="InParameter" guid="{27367b8e-01b0-46a8-9601-bd17713a19e1}" relid="0x0" referred="id-0067-00000124">
-									<name>mask</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>360,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000024e" kind="InParameter" role="InParameter" guid="{87e3fc46-8293-489c-afac-d5b63f899fe4}" relid="0x0" referred="id-0065-000000b1">
-									<name>a_listener</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000024f" kind="InParameter" role="InParameter" guid="{4f7cb5a1-4b55-4990-8cb7-30805bdcbaf8}" relid="0x0" referred="id-0065-0000006e">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000250" kind="ReturnType" role="ReturnType" guid="{3a6369f1-9ffa-42af-abf1-17d0cecb3264}" relid="0x0" referred="id-0065-000000bb">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<reference id="id-0067-00000251" kind="Inherits" role="Inherits" guid="{5863ff9d-d433-44ba-a111-feabffd00e26}" relid="0x27" referred="id-0065-00000116">
-								<name>Inherits</name>
-							</reference>
-						</model>
-						<model id="id-0065-00000068" kind="Aggregate" role="Aggregate" guid="{c26aeb2a-96c1-4b36-940d-42eec8123db6}" relid="0x50" childrelidcntr="0x1">
-							<name>SubscriptionBuiltinTopicData</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-00000052" kind="Member" role="Member" guid="{9342c04a-4f17-4418-a928-08406abad35a}" relid="0x0" referred="id-0066-00000023">
-								<name>type_name</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000053" kind="Member" role="Member" guid="{62f7f8e6-0422-4dc9-a981-62585849a9c3}" relid="0x0" referred="id-0066-00000023">
-								<name>topic_name</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000252" kind="Member" role="Member" guid="{3a2f2a70-a965-4044-8ac7-4198d7b7b45e}" relid="0x0" referred="id-0065-0000008d">
-								<name>group_data</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1660</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000253" kind="Member" role="Member" guid="{f5d49385-2094-4b5f-b689-6f486d9434f5}" relid="0x0" referred="id-0065-0000008e">
-								<name>topic_data</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1560</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000254" kind="Member" role="Member" guid="{812b0b1d-cf37-4f78-80fb-1a5082067c90}" relid="0x0" referred="id-0065-0000007e">
-								<name>partition</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000255" kind="Member" role="Member" guid="{29d7e235-fe4b-40ce-8377-d2dc327847be}" relid="0x0" referred="id-0065-00000087">
-								<name>presentation</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000256" kind="Member" role="Member" guid="{268b0ea6-c4c9-439f-bc05-663169532974}" relid="0x0" referred="id-0065-0000007f">
-								<name>time_based_filter</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000257" kind="Member" role="Member" guid="{7ae8363a-13a0-4c1e-be9a-3e5923dbe1c3}" relid="0x0" referred="id-0065-0000008f">
-								<name>user_data</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000258" kind="Member" role="Member" guid="{8d2c75aa-031c-4a8e-8bc9-5771fa5198ee}" relid="0x0" referred="id-0065-0000007a">
-								<name>destination_order</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1060</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000259" kind="Member" role="Member" guid="{1cc8aa76-8048-4119-97f8-b591845ad95a}" relid="0x0" referred="id-0065-00000083">
-								<name>ownership</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,960</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000025a" kind="Member" role="Member" guid="{49bad0fb-0561-4ce2-9689-8ecfdcc4866f}" relid="0x0" referred="id-0065-0000007c">
-								<name>reliability</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,860</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000025b" kind="Member" role="Member" guid="{99ec8a4b-f7f8-460e-b8e0-9a5708343f4e}" relid="0x0" referred="id-0065-00000080">
-								<name>liveliness</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,760</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000025c" kind="Member" role="Member" guid="{1647c2c4-22bb-42a7-bec7-d3e24031bc32}" relid="0x0" referred="id-0065-00000085">
-								<name>latency_budget</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,660</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000025d" kind="Member" role="Member" guid="{309c21a6-5f73-40e0-a332-97718d42617f}" relid="0x0" referred="id-0065-00000086">
-								<name>deadline</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,560</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000025e" kind="Member" role="Member" guid="{6402f6f6-6348-4450-b54f-0c546cfa5b8f}" relid="0x0" referred="id-0065-00000089">
-								<name>durability</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000025f" kind="Member" role="Member" guid="{ec72bb7a-e715-4ccd-a5e5-52582cdd4beb}" relid="0x0" referred="id-0065-0000012e">
-								<name>participant_key</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000260" kind="Member" role="Member" guid="{4e51c86b-f1e9-4739-8438-076ef6b1e16e}" relid="0x0" referred="id-0065-0000012e">
-								<name>key</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000069" kind="Aggregate" role="Aggregate" guid="{d6a2cf29-0b4f-4e8c-aea7-874f14043462}" relid="0x4f" childrelidcntr="0x1">
-							<name>PublicationBuiltinTopicData</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-00000054" kind="Member" role="Member" guid="{0a141642-e12e-4ac5-a872-a970a8ffbe4c}" relid="0x0" referred="id-0066-00000023">
-								<name>type_name</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000055" kind="Member" role="Member" guid="{94428c6c-cef2-4092-b960-b153c7e4dea8}" relid="0x0" referred="id-0066-00000023">
-								<name>topic_name</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000261" kind="Member" role="Member" guid="{fb4beee6-479d-4b40-9156-a995c06774f1}" relid="0x0" referred="id-0065-0000008d">
-								<name>group_data</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1860</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000262" kind="Member" role="Member" guid="{55315601-9b0b-4c16-99f9-bf75b54b075e}" relid="0x0" referred="id-0065-0000008e">
-								<name>topic_data</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1760</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000263" kind="Member" role="Member" guid="{04d93761-36bc-46f7-9181-c18877c2fc8c}" relid="0x0" referred="id-0065-0000007e">
-								<name>partition</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1660</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000264" kind="Member" role="Member" guid="{df1cc389-715b-49b5-a3da-fa14045eb638}" relid="0x0" referred="id-0065-00000087">
-								<name>presentation</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1560</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000265" kind="Member" role="Member" guid="{caf54c3f-127a-42a0-9284-51e89cb34f2a}" relid="0x0" referred="id-0065-0000007a">
-								<name>destination_order</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000266" kind="Member" role="Member" guid="{e654a5f6-b0bf-4d6b-9488-04ea35ba6172}" relid="0x0" referred="id-0065-00000082">
-								<name>ownership_strength</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000267" kind="Member" role="Member" guid="{3e571104-51ea-42fb-9d97-5cac48a97bd7}" relid="0x0" referred="id-0065-00000083">
-								<name>ownership</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000268" kind="Member" role="Member" guid="{6f0f0e3e-ca32-4c18-9147-e2fb6ba365d6}" relid="0x0" referred="id-0065-0000008f">
-								<name>user_data</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000269" kind="Member" role="Member" guid="{5acc1014-0f9c-4aaa-b162-3d464fd6ab4a}" relid="0x0" referred="id-0065-0000008b">
-								<name>lifespan</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1060</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000026a" kind="Member" role="Member" guid="{e1164fd0-8a8d-4a14-a558-a43e92a7535c}" relid="0x0" referred="id-0065-0000007c">
-								<name>reliability</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,960</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000026b" kind="Member" role="Member" guid="{098876d8-a496-4f36-910d-bd4ae426180a}" relid="0x0" referred="id-0065-00000080">
-								<name>liveliness</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,860</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000026c" kind="Member" role="Member" guid="{18d212a7-81d6-493e-a187-2f2269007044}" relid="0x0" referred="id-0065-00000085">
-								<name>latency_budget</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,760</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000026d" kind="Member" role="Member" guid="{f66233b3-97f0-4183-97a5-1f5fc9a7744f}" relid="0x0" referred="id-0065-00000086">
-								<name>deadline</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,660</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000026e" kind="Member" role="Member" guid="{435a2530-9905-4a2a-9dc0-8293d3f1f658}" relid="0x0" referred="id-0065-00000073">
-								<name>durability_service</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,560</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000026f" kind="Member" role="Member" guid="{19aee622-60df-40f6-8434-979ee6000124}" relid="0x0" referred="id-0065-00000089">
-								<name>durability</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000270" kind="Member" role="Member" guid="{b0007b0a-29e8-48c6-a7dd-83b56c723775}" relid="0x0" referred="id-0065-0000012e">
-								<name>participant_key</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000271" kind="Member" role="Member" guid="{322986af-0d46-44fa-93fc-edc57452abe6}" relid="0x0" referred="id-0065-0000012e">
-								<name>key</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-0000006a" kind="Aggregate" role="Aggregate" guid="{2bd37d3a-9a67-4ef1-a1f8-fbbc2b51723f}" relid="0x4e" childrelidcntr="0x1">
-							<name>TopicBuiltinTopicData</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-00000056" kind="Member" role="Member" guid="{6e203ff9-56a2-4e0d-b13b-46eb029b618d}" relid="0x0" referred="id-0066-00000023">
-								<name>type_name</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000057" kind="Member" role="Member" guid="{be5ded00-6080-42ca-a729-ef08939b5bef}" relid="0x0" referred="id-0066-00000023">
-								<name>name</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000272" kind="Member" role="Member" guid="{f19a9151-2614-4a85-bd89-66e0ff11416d}" relid="0x0" referred="id-0065-0000008e">
-								<name>topic_data</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1560</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000273" kind="Member" role="Member" guid="{737fb5c5-07d8-4862-8519-c1299ddcb421}" relid="0x0" referred="id-0065-00000083">
-								<name>ownership</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000274" kind="Member" role="Member" guid="{8ac6eb4f-2f26-4ed0-a667-133233092ea1}" relid="0x0" referred="id-0065-00000077">
-								<name>resource_limits</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000275" kind="Member" role="Member" guid="{10465536-fc3b-4701-9d0a-3159e43be578}" relid="0x0" referred="id-0065-00000078">
-								<name>history</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000276" kind="Member" role="Member" guid="{89f2277c-d997-4259-a91e-a752f9d9aaf4}" relid="0x0" referred="id-0065-0000007a">
-								<name>destination_order</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000277" kind="Member" role="Member" guid="{6ec7265a-72e8-4982-bd02-c55a2d5d9c00}" relid="0x0" referred="id-0065-0000008b">
-								<name>lifespan</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1060</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000278" kind="Member" role="Member" guid="{76c22efb-eda4-4f76-8c13-a79d5ca4cb9b}" relid="0x0" referred="id-0065-0000008c">
-								<name>transport_priority</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,960</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000279" kind="Member" role="Member" guid="{fa16155c-7949-4ba1-b8aa-0fc8d9f4e491}" relid="0x0" referred="id-0065-0000007c">
-								<name>reliability</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,860</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000027a" kind="Member" role="Member" guid="{237cc5ca-046d-45c1-929f-1ae92e859ecc}" relid="0x0" referred="id-0065-00000080">
-								<name>liveliness</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,760</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000027b" kind="Member" role="Member" guid="{b3976ba1-0d26-4df7-a64e-0a564b1ed436}" relid="0x0" referred="id-0065-00000085">
-								<name>latency_budget</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,660</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000027c" kind="Member" role="Member" guid="{640eeb42-3323-4378-8704-f8cfebb5d9e4}" relid="0x0" referred="id-0065-00000086">
-								<name>deadline</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,560</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000027d" kind="Member" role="Member" guid="{d7753d28-9a6d-4df6-bb22-2f8b2de38c2c}" relid="0x0" referred="id-0065-00000073">
-								<name>durability_service</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000027e" kind="Member" role="Member" guid="{86c5afa3-a1be-41eb-b069-e380608e8e48}" relid="0x0" referred="id-0065-00000089">
-								<name>durability</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000027f" kind="Member" role="Member" guid="{6b3ce870-f78f-4fd2-a63e-797f9e6a650e}" relid="0x0" referred="id-0065-0000012e">
-								<name>key</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-0000006b" kind="Aggregate" role="Aggregate" guid="{6d7fa318-c5c6-452d-9ece-ca1ab5aef753}" relid="0x4d" childrelidcntr="0x1">
-							<name>ParticipantBuiltinTopicData</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-00000280" kind="Member" role="Member" guid="{0647706a-1b80-4ef7-b901-cb14181598ee}" relid="0x0" referred="id-0065-0000008f">
-								<name>user_data</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000281" kind="Member" role="Member" guid="{fbeff137-5e5f-40ec-a672-6a2bbcce8923}" relid="0x0" referred="id-0065-0000012e">
-								<name>key</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-0000006c" kind="Aggregate" role="Aggregate" guid="{ad48c95c-f86c-4bd5-b12c-c7eba6432e44}" relid="0x4c" childrelidcntr="0x1">
-							<name>SubscriberQos</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-00000282" kind="Member" role="Member" guid="{beecdcab-928f-4f06-baeb-b36efa54fb4f}" relid="0x0" referred="id-0065-00000076">
-								<name>entity_factory</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000283" kind="Member" role="Member" guid="{1eceadee-ea1a-4f28-b95e-da8b38db62eb}" relid="0x0" referred="id-0065-0000008d">
-								<name>group_data</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000284" kind="Member" role="Member" guid="{a8cd770b-55e5-4041-a5cd-fdacf4c2ed66}" relid="0x0" referred="id-0065-0000007e">
-								<name>partition</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000285" kind="Member" role="Member" guid="{aa9100b8-993a-44c6-8a8b-60e102804fdf}" relid="0x0" referred="id-0065-00000087">
-								<name>presentation</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-0000006d" kind="Aggregate" role="Aggregate" guid="{5d8504b8-9924-4d9f-8454-057da8c34ac6}" relid="0x4b" childrelidcntr="0x1">
-							<name>DataReaderQos</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-00000286" kind="Member" role="Member" guid="{066817f2-148d-4524-a7dc-03864e563b7c}" relid="0x0" referred="id-0065-00000074">
-								<name>reader_data_lifecycle</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000287" kind="Member" role="Member" guid="{ae2ac85f-4ca8-4719-9b75-d1eb2f8d6d64}" relid="0x0" referred="id-0065-0000007f">
-								<name>time_based_filter</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1060</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000288" kind="Member" role="Member" guid="{8d486a1b-fc87-44bd-a0dd-43269adae313}" relid="0x0" referred="id-0065-00000083">
-								<name>ownership</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,960</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000289" kind="Member" role="Member" guid="{75038eb6-12d7-4b05-a3ca-0b56c09289de}" relid="0x0" referred="id-0065-0000008f">
-								<name>user_data</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,860</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000028a" kind="Member" role="Member" guid="{9ea85702-c298-499e-b8d5-a3a5119c6ad8}" relid="0x0" referred="id-0065-00000077">
-								<name>resource_limits</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,760</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000028b" kind="Member" role="Member" guid="{1af79dc4-80df-44b4-b755-b78c130504c9}" relid="0x0" referred="id-0065-00000078">
-								<name>history</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,660</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000028c" kind="Member" role="Member" guid="{d06b2587-7836-47a3-8db4-0fd9b1a35cc4}" relid="0x0" referred="id-0065-0000007a">
-								<name>destination_order</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,560</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000028d" kind="Member" role="Member" guid="{c598c25e-4b38-40ac-9481-73d226446408}" relid="0x0" referred="id-0065-0000007c">
-								<name>reliability</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000028e" kind="Member" role="Member" guid="{2748857a-a261-47a7-8697-43989a3016c9}" relid="0x0" referred="id-0065-00000080">
-								<name>liveliness</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000028f" kind="Member" role="Member" guid="{16d3543d-99da-4ab2-982e-b307a74938c7}" relid="0x0" referred="id-0065-00000085">
-								<name>latency_budget</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000290" kind="Member" role="Member" guid="{2e3cb73e-6c5b-4166-8d8d-80586358ce71}" relid="0x0" referred="id-0065-00000086">
-								<name>deadline</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000291" kind="Member" role="Member" guid="{a8a7970b-a25c-45af-9e9e-65d1d36f8b25}" relid="0x0" referred="id-0065-00000089">
-								<name>durability</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-0000006e" kind="Aggregate" role="Aggregate" guid="{05f323d2-bea1-4cd9-97d2-9d2d15244fbc}" relid="0x4a" childrelidcntr="0x1">
-							<name>PublisherQos</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-00000292" kind="Member" role="Member" guid="{95c00a23-9a51-4bbd-b7b2-8b10a62bb323}" relid="0x0" referred="id-0065-00000076">
-								<name>entity_factory</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000293" kind="Member" role="Member" guid="{96603f31-1a32-43d3-955c-7de1350608af}" relid="0x0" referred="id-0065-0000008d">
-								<name>group_data</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000294" kind="Member" role="Member" guid="{6fa8ae61-0ba5-4fcd-b0dc-0f3f94fb0903}" relid="0x0" referred="id-0065-0000007e">
-								<name>partition</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000295" kind="Member" role="Member" guid="{507c41be-ceb6-4a51-960b-f79f086b46e9}" relid="0x0" referred="id-0065-00000087">
-								<name>presentation</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-0000006f" kind="Aggregate" role="Aggregate" guid="{142090e7-4afa-40f9-a7b7-acca45b58f89}" relid="0x49" childrelidcntr="0x1">
-							<name>DataWriterQos</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-00000296" kind="Member" role="Member" guid="{2a7f428e-f781-4d5a-8614-6fbab50ec1f9}" relid="0x0" referred="id-0065-00000075">
-								<name>writer_data_lifecycle</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000297" kind="Member" role="Member" guid="{6eb4257c-6a47-42dd-9585-971b6f1e591b}" relid="0x0" referred="id-0065-00000082">
-								<name>ownership_strength</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000298" kind="Member" role="Member" guid="{82ac8d4d-96de-401e-9a0d-09f02332e7ca}" relid="0x0" referred="id-0065-00000083">
-								<name>ownership</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000299" kind="Member" role="Member" guid="{5323a935-6a62-44c5-9149-ccabb2ee80ba}" relid="0x0" referred="id-0065-0000008f">
-								<name>user_data</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000029a" kind="Member" role="Member" guid="{43b72f95-f755-4253-9693-34052ad1b3dc}" relid="0x0" referred="id-0065-0000008b">
-								<name>lifespan</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1060</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000029b" kind="Member" role="Member" guid="{74fdb0e3-5d0e-481f-9985-f8d33b72b238}" relid="0x0" referred="id-0065-0000008c">
-								<name>transport_priority</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,960</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000029c" kind="Member" role="Member" guid="{2f93bc29-54a3-41cc-adb4-f54c99330b5a}" relid="0x0" referred="id-0065-00000077">
-								<name>resource_limits</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,860</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000029d" kind="Member" role="Member" guid="{cae97f14-b966-4b09-852d-3f3112b8a57e}" relid="0x0" referred="id-0065-00000078">
-								<name>history</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,760</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000029e" kind="Member" role="Member" guid="{318a73ee-29f7-4651-b9b7-654d6b956ac9}" relid="0x0" referred="id-0065-0000007a">
-								<name>destination_order</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,660</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000029f" kind="Member" role="Member" guid="{872e8c21-6318-4ab5-a1d4-890ee96fc4ce}" relid="0x0" referred="id-0065-0000007c">
-								<name>reliability</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,560</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000002a0" kind="Member" role="Member" guid="{dd5d7b74-74d4-4f7f-8110-a098f5052b14}" relid="0x0" referred="id-0065-00000080">
-								<name>liveliness</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000002a1" kind="Member" role="Member" guid="{9d9aa4a9-e988-4b14-b328-862ee8be23e3}" relid="0x0" referred="id-0065-00000085">
-								<name>latency_budget</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000002a2" kind="Member" role="Member" guid="{161dce72-3f95-4cc7-9a75-da9564ca3aea}" relid="0x0" referred="id-0065-00000086">
-								<name>deadline</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000002a3" kind="Member" role="Member" guid="{40bb7cad-1c21-4c1c-97d5-74e80222eb35}" relid="0x0" referred="id-0065-00000073">
-								<name>durability_service</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000002a4" kind="Member" role="Member" guid="{dbc6fe81-1bc3-4cac-acd0-8d819637963a}" relid="0x0" referred="id-0065-00000089">
-								<name>durability</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000070" kind="Aggregate" role="Aggregate" guid="{d3a0c983-29d0-43c8-8bd8-29d44ba1f655}" relid="0x48" childrelidcntr="0x1">
-							<name>TopicQos</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000002a5" kind="Member" role="Member" guid="{94a5ca2d-6006-413c-9599-7b78c7ae6318}" relid="0x0" referred="id-0065-00000083">
-								<name>ownership</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000002a6" kind="Member" role="Member" guid="{a1a4d783-fc7d-4b24-b6c5-7dd4ceb8f78d}" relid="0x0" referred="id-0065-0000008b">
-								<name>lifespan</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000002a7" kind="Member" role="Member" guid="{1621cc44-b1e0-4e97-a19c-4d8cffdb85a8}" relid="0x0" referred="id-0065-0000008c">
-								<name>transport_priority</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1060</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000002a8" kind="Member" role="Member" guid="{fc6db77a-da19-4c24-9b38-f4adaf495ea0}" relid="0x0" referred="id-0065-00000077">
-								<name>resource_limits</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,960</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000002a9" kind="Member" role="Member" guid="{7061f8ed-86da-493c-a821-871b8b50983d}" relid="0x0" referred="id-0065-00000078">
-								<name>history</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,860</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000002aa" kind="Member" role="Member" guid="{65e2a28d-1333-461f-8fce-fc49b1255cc3}" relid="0x0" referred="id-0065-0000007a">
-								<name>destination_order</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,760</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000002ab" kind="Member" role="Member" guid="{9070def0-791b-4252-ba41-0fe9742ff8fd}" relid="0x0" referred="id-0065-0000007c">
-								<name>reliability</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,660</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000002ac" kind="Member" role="Member" guid="{2c72abea-95b5-48ba-8778-92dcf8ea5212}" relid="0x0" referred="id-0065-00000080">
-								<name>liveliness</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,560</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000002ad" kind="Member" role="Member" guid="{fce43b52-4868-4e1f-a9b0-d113954a6e1e}" relid="0x0" referred="id-0065-00000085">
-								<name>latency_budget</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000002ae" kind="Member" role="Member" guid="{ceea4172-e125-48b6-af32-c92321bcb497}" relid="0x0" referred="id-0065-00000086">
-								<name>deadline</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000002af" kind="Member" role="Member" guid="{ef026d4c-df93-4537-862c-1f6d6e96f209}" relid="0x0" referred="id-0065-00000073">
-								<name>durability_service</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000002b0" kind="Member" role="Member" guid="{8cd8f79d-6a29-471e-b0bb-cc5d6b7ffe34}" relid="0x0" referred="id-0065-00000089">
-								<name>durability</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000002b1" kind="Member" role="Member" guid="{d104f47a-95f8-4d58-aad8-19e32111c9f1}" relid="0x0" referred="id-0065-0000008e">
-								<name>topic_data</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000071" kind="Aggregate" role="Aggregate" guid="{80880e1a-6bf3-4fad-8983-6703f02306de}" relid="0x47" childrelidcntr="0x1">
-							<name>DomainParticipantQos</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000002b2" kind="Member" role="Member" guid="{ae9c7b4c-817a-4eeb-9ac6-442d42d6ac8c}" relid="0x0" referred="id-0065-00000076">
-								<name>entity_factory</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000002b3" kind="Member" role="Member" guid="{38a14857-e704-4a13-ad7b-d54be2b3ae21}" relid="0x0" referred="id-0065-0000008f">
-								<name>user_data</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000072" kind="Aggregate" role="Aggregate" guid="{e01cafd0-be06-4610-bff3-cf897ea84212}" relid="0x46" childrelidcntr="0x1">
-							<name>DomainParticipantFactoryQos</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000002b4" kind="Member" role="Member" guid="{7adb24c4-6ca5-4543-85ac-a114f06ef16a}" relid="0x0" referred="id-0065-00000076">
-								<name>entity_factory</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000073" kind="Aggregate" role="Aggregate" guid="{66cb25d0-4e81-4929-a939-d2e4008a3c0d}" relid="0x45" childrelidcntr="0x1">
-							<name>DurabilityServiceQosPolicy</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-00000058" kind="Member" role="Member" guid="{7cf79540-2e2c-4b32-a441-9c6f0448d7e2}" relid="0x0" referred="id-0066-0000002e">
-								<name>max_samples_per_instance</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,560</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000059" kind="Member" role="Member" guid="{443d629e-763c-4995-9222-0aa69f824604}" relid="0x0" referred="id-0066-0000002e">
-								<name>max_instances</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000005a" kind="Member" role="Member" guid="{028068fb-4140-47a0-82a3-7481a1fd5f55}" relid="0x0" referred="id-0066-0000002e">
-								<name>max_samples</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000005b" kind="Member" role="Member" guid="{9a11855b-e433-47b7-bc08-05028dd0d5ab}" relid="0x0" referred="id-0066-0000002e">
-								<name>history_depth</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000002b5" kind="Member" role="Member" guid="{2822bd5d-8275-416a-916e-fb16379386a8}" relid="0x0" referred="id-0065-00000079">
-								<name>history_kind</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000002b6" kind="Member" role="Member" guid="{975eed39-aa06-4b1c-b3a3-5981dac1db8a}" relid="0x0" referred="id-0065-0000012d">
-								<name>service_cleanup_delay</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000074" kind="Aggregate" role="Aggregate" guid="{dd3409b2-3697-4a11-bdf1-8678ac54106b}" relid="0x44" childrelidcntr="0x1">
-							<name>ReaderDataLifecycleQosPolicy</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000002b7" kind="Member" role="Member" guid="{cfde8b31-af5b-4977-8087-860ff997669b}" relid="0x0" referred="id-0065-0000012d">
-								<name>autopurge_disposed_samples_delay</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000002b8" kind="Member" role="Member" guid="{1ddfb830-8f41-4f6f-b977-7338cd722230}" relid="0x0" referred="id-0065-0000012d">
-								<name>autopurge_nowriter_samples_delay</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000075" kind="Aggregate" role="Aggregate" guid="{a6461d6d-7852-4fc0-9ae7-e5d889df27f7}" relid="0x43" childrelidcntr="0x1">
-							<name>WriterDataLifecycleQosPolicy</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-0000005c" kind="Member" role="Member" guid="{10690b87-d46c-433c-9f98-8840fe0ba8d9}" relid="0x0" referred="id-0066-00000033">
-								<name>autodispose_unregistered_instances</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000076" kind="Aggregate" role="Aggregate" guid="{fb47bdf9-902a-4e57-8f13-c418ec0265c6}" relid="0x42" childrelidcntr="0x1">
-							<name>EntityFactoryQosPolicy</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-0000005d" kind="Member" role="Member" guid="{3b58eef4-8165-466a-afbb-5560964f1031}" relid="0x0" referred="id-0066-00000033">
-								<name>autoenable_created_entities</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000077" kind="Aggregate" role="Aggregate" guid="{f8a00190-2a75-41c2-b5a0-682d61568931}" relid="0x41" childrelidcntr="0x1">
-							<name>ResourceLimitsQosPolicy</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-0000005e" kind="Member" role="Member" guid="{f744660b-bf6d-4b72-a07f-857e5f8fce68}" relid="0x0" referred="id-0066-0000002e">
-								<name>max_samples_per_instance</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000005f" kind="Member" role="Member" guid="{ca3c745f-ba26-4d08-b621-951177cb1687}" relid="0x0" referred="id-0066-0000002e">
-								<name>max_instances</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000060" kind="Member" role="Member" guid="{cc496538-8bd6-43a0-9c79-36cb89801e41}" relid="0x0" referred="id-0066-0000002e">
-								<name>max_samples</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000078" kind="Aggregate" role="Aggregate" guid="{0ac088b7-d4d1-45e3-b138-3de5e5f8ca51}" relid="0x40" childrelidcntr="0x1">
-							<name>HistoryQosPolicy</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-00000061" kind="Member" role="Member" guid="{433081f8-8617-42fd-9abe-b688bbcf98ce}" relid="0x0" referred="id-0066-0000002e">
-								<name>depth</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000002b9" kind="Member" role="Member" guid="{7217533c-d1f2-4c3b-b3d9-61d2045ea106}" relid="0x0" referred="id-0065-00000079">
-								<name>kind</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000079" kind="Enum" role="Enum" guid="{08af6c5f-caa3-4ca1-a4d1-b9d54310c697}" relid="0x3f" childrelidcntr="0x2">
-							<name>HistoryQosPolicyKind</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<atom id="id-0066-00000035" kind="EnumValue" role="EnumValue" guid="{ed898fc4-b4d7-4d8b-9ec7-4e18b78f8d47}" relid="0x1">
-								<name>KEEP_ALL_HISTORY_QOS</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-							<atom id="id-0066-00000036" kind="EnumValue" role="EnumValue" guid="{7fc1b160-a621-440a-a680-dcb03426eda0}" relid="0x0">
-								<name>KEEP_LAST_HISTORY_QOS</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-						</model>
-						<model id="id-0065-0000007a" kind="Aggregate" role="Aggregate" guid="{196945c2-043f-4a8f-bfb1-7d05a359ed03}" relid="0x3e" childrelidcntr="0x1">
-							<name>DestinationOrderQosPolicy</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000002ba" kind="Member" role="Member" guid="{9bde85a2-fd0a-4bf3-978c-4673d1e5e12c}" relid="0x0" referred="id-0065-0000007b">
-								<name>kind</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-0000007b" kind="Enum" role="Enum" guid="{8591eaca-32e4-44e4-bebb-b3e52d458ce1}" relid="0x3d" childrelidcntr="0x2">
-							<name>DestinationOrderQosPolicyKind</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<atom id="id-0066-00000037" kind="EnumValue" role="EnumValue" guid="{0c071810-7892-4c4c-bdb8-a77fafb75faf}" relid="0x1">
-								<name>BY_SOURCE_TIMESTAMP_DESTINATIONORDER_QOS</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-							<atom id="id-0066-00000038" kind="EnumValue" role="EnumValue" guid="{80c44981-7092-43c8-9e6f-34e5e0dd7506}" relid="0x0">
-								<name>BY_RECEPTION_TIMESTAMP_DESTINATIONORDER_QOS</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-						</model>
-						<model id="id-0065-0000007c" kind="Aggregate" role="Aggregate" guid="{23dcaea5-1b19-4696-9f88-59597b375aea}" relid="0x3c" childrelidcntr="0x1">
-							<name>ReliabilityQosPolicy</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000002bb" kind="Member" role="Member" guid="{48e76418-260b-4186-b8f5-b58fe85f0efd}" relid="0x0" referred="id-0065-0000012d">
-								<name>max_blocking_time</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000002bc" kind="Member" role="Member" guid="{2d463ec8-1f8b-413d-b901-2877be67a0d9}" relid="0x0" referred="id-0065-0000007d">
-								<name>kind</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-0000007d" kind="Enum" role="Enum" guid="{58736bb3-17e7-4d63-94c9-6fbdcf891236}" relid="0x3b" childrelidcntr="0x2">
-							<name>ReliabilityQosPolicyKind</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<atom id="id-0066-00000039" kind="EnumValue" role="EnumValue" guid="{415114cd-5195-489f-bd3d-62da3c346ce5}" relid="0x1">
-								<name>RELIABLE_RELIABILITY_QOS</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-							<atom id="id-0066-0000003a" kind="EnumValue" role="EnumValue" guid="{67c74094-0213-40ca-95a5-944d3ec6bbe1}" relid="0x0">
-								<name>BEST_EFFORT_RELIABILITY_QOS</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-						</model>
-						<model id="id-0065-0000007e" kind="Aggregate" role="Aggregate" guid="{9d41c454-c99c-437c-adba-ad1734d0de96}" relid="0x3a" childrelidcntr="0x1">
-							<name>PartitionQosPolicy</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000002bd" kind="Member" role="Member" guid="{6bdaee44-0810-4fac-b0d7-83d06edf56b1}" relid="0x0" referred="id-0067-0000013a">
-								<name>name</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-0000007f" kind="Aggregate" role="Aggregate" guid="{b6a1a384-bb33-4f77-8481-c99115ff8f75}" relid="0x39" childrelidcntr="0x1">
-							<name>TimeBasedFilterQosPolicy</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000002be" kind="Member" role="Member" guid="{bdba4cf2-1773-454f-9848-e77539c6047d}" relid="0x0" referred="id-0065-0000012d">
-								<name>minimum_separation</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000080" kind="Aggregate" role="Aggregate" guid="{9edb5275-ff34-4335-8293-ffbff6839c8a}" relid="0x38" childrelidcntr="0x1">
-							<name>LivelinessQosPolicy</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000002bf" kind="Member" role="Member" guid="{290d189e-21d9-4a89-bc2d-c146e577531a}" relid="0x0" referred="id-0065-0000012d">
-								<name>lease_duration</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000002c0" kind="Member" role="Member" guid="{47b83650-1752-455a-819e-af36e2a02141}" relid="0x0" referred="id-0065-00000081">
-								<name>kind</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000081" kind="Enum" role="Enum" guid="{7038e581-f25e-4142-bd4c-60e4dde8a414}" relid="0x37" childrelidcntr="0x3">
-							<name>LivelinessQosPolicyKind</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<atom id="id-0066-0000003b" kind="EnumValue" role="EnumValue" guid="{09db2b95-ea2f-4c62-aee6-38106f64e4c5}" relid="0x2">
-								<name>MANUAL_BY_TOPIC_LIVELINESS_QOS</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-							<atom id="id-0066-0000003c" kind="EnumValue" role="EnumValue" guid="{327f4ac0-ec1a-4eb9-a118-3af2a9076ed5}" relid="0x1">
-								<name>MANUAL_BY_PARTICIPANT_LIVELINESS_QOS</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-							<atom id="id-0066-0000003d" kind="EnumValue" role="EnumValue" guid="{eeb954a4-8770-4151-a626-e4adc5aa10a6}" relid="0x0">
-								<name>AUTOMATIC_LIVELINESS_QOS</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-						</model>
-						<model id="id-0065-00000082" kind="Aggregate" role="Aggregate" guid="{44e1dafc-c12e-486c-9196-a18a5e346bbf}" relid="0x36" childrelidcntr="0x1">
-							<name>OwnershipStrengthQosPolicy</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-00000062" kind="Member" role="Member" guid="{99a7f461-8cbe-4576-b104-37bc31847fa6}" relid="0x0" referred="id-0066-0000002e">
-								<name>value</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000083" kind="Aggregate" role="Aggregate" guid="{40c1b881-6f39-4bf5-9073-bea84cfcae9a}" relid="0x35" childrelidcntr="0x1">
-							<name>OwnershipQosPolicy</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000002c1" kind="Member" role="Member" guid="{7c40efef-88c4-4943-a5c1-f2bf1669fbf8}" relid="0x0" referred="id-0065-00000084">
-								<name>kind</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000084" kind="Enum" role="Enum" guid="{13267686-3ead-49f5-9b7d-db38a7ba7d6c}" relid="0x34" childrelidcntr="0x2">
-							<name>OwnershipQosPolicyKind</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<atom id="id-0066-0000003e" kind="EnumValue" role="EnumValue" guid="{f66082d0-4e9f-4361-a26d-6d6050d83b9c}" relid="0x1">
-								<name>EXCLUSIVE_OWNERSHIP_QOS</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-							<atom id="id-0066-0000003f" kind="EnumValue" role="EnumValue" guid="{35bbee33-3cfb-4100-9f13-2089c07e8708}" relid="0x0">
-								<name>SHARED_OWNERSHIP_QOS</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-						</model>
-						<model id="id-0065-00000085" kind="Aggregate" role="Aggregate" guid="{cf2d355a-ac71-42e8-974e-2991e17d4819}" relid="0x33" childrelidcntr="0x1">
-							<name>LatencyBudgetQosPolicy</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000002c2" kind="Member" role="Member" guid="{9497318d-e203-47fc-8222-76fee855c609}" relid="0x0" referred="id-0065-0000012d">
-								<name>duration</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000086" kind="Aggregate" role="Aggregate" guid="{7d1121ef-12bb-4158-8d1c-c83e92792f6a}" relid="0x32" childrelidcntr="0x1">
-							<name>DeadlineQosPolicy</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000002c3" kind="Member" role="Member" guid="{973f4fac-415a-4c29-99ee-0c8cff77b894}" relid="0x0" referred="id-0065-0000012d">
-								<name>period</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000087" kind="Aggregate" role="Aggregate" guid="{ca630852-9aea-4553-8cb2-041012ae8aec}" relid="0x31" childrelidcntr="0x1">
-							<name>PresentationQosPolicy</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-00000063" kind="Member" role="Member" guid="{95f21377-62b7-4462-a043-98094379ebb7}" relid="0x0" referred="id-0066-00000033">
-								<name>ordered_access</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000064" kind="Member" role="Member" guid="{1a77a076-e8af-4a83-bdc7-e3dbe8e6079e}" relid="0x0" referred="id-0066-00000033">
-								<name>coherent_access</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000002c4" kind="Member" role="Member" guid="{d481933b-86f0-492a-b029-8288e8a6b97c}" relid="0x0" referred="id-0065-00000088">
-								<name>access_scope</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000088" kind="Enum" role="Enum" guid="{6bfe912d-b9e1-4a25-93a0-b44eb90e129d}" relid="0x30" childrelidcntr="0x3">
-							<name>PresentationQosPolicyAccessScopeKind</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<atom id="id-0066-00000040" kind="EnumValue" role="EnumValue" guid="{90f403f0-3368-4050-aef9-2ae0da24c2c9}" relid="0x2">
-								<name>GROUP_PRESENTATION_QOS</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-							<atom id="id-0066-00000041" kind="EnumValue" role="EnumValue" guid="{ce53e6e7-5e3b-46f5-b79f-795c4b48e0ad}" relid="0x1">
-								<name>TOPIC_PRESENTATION_QOS</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-							<atom id="id-0066-00000042" kind="EnumValue" role="EnumValue" guid="{9673971f-2e34-46de-8ec8-73798197d0bd}" relid="0x0">
-								<name>INSTANCE_PRESENTATION_QOS</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-						</model>
-						<model id="id-0065-00000089" kind="Aggregate" role="Aggregate" guid="{5af9d5af-d54e-482b-8e8c-c8bbcbf3b030}" relid="0x2f" childrelidcntr="0x1">
-							<name>DurabilityQosPolicy</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000002c5" kind="Member" role="Member" guid="{6cb4e11e-f909-43c8-af97-acddef43abf8}" relid="0x0" referred="id-0065-0000008a">
-								<name>kind</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-0000008a" kind="Enum" role="Enum" guid="{640d2a39-4edc-4d30-84c1-3015943c36c1}" relid="0x2e" childrelidcntr="0x4">
-							<name>DurabilityQosPolicyKind</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<atom id="id-0066-00000043" kind="EnumValue" role="EnumValue" guid="{cc39bfcd-d61c-466e-8320-328d1c9f05c3}" relid="0x3">
-								<name>PERSISTENT_DURABILITY_QOS</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-							<atom id="id-0066-00000044" kind="EnumValue" role="EnumValue" guid="{72b79f7c-e86f-4718-9a41-00be9c925290}" relid="0x2">
-								<name>TRANSIENT_DURABILITY_QOS</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-							<atom id="id-0066-00000045" kind="EnumValue" role="EnumValue" guid="{6ec098c3-f16b-43c0-b632-3e6f83d4fd72}" relid="0x1">
-								<name>TRANSIENT_LOCAL_DURABILITY_QOS</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-							<atom id="id-0066-00000046" kind="EnumValue" role="EnumValue" guid="{e250443e-7189-42c1-af22-aa7e3e62bf4b}" relid="0x0">
-								<name>VOLATILE_DURABILITY_QOS</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-						</model>
-						<model id="id-0065-0000008b" kind="Aggregate" role="Aggregate" guid="{d0473b4d-657b-4a9a-9b78-6119c51060ea}" relid="0x2d" childrelidcntr="0x1">
-							<name>LifespanQosPolicy</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000002c6" kind="Member" role="Member" guid="{92a37816-156e-4678-b977-791074f4683c}" relid="0x0" referred="id-0065-0000012d">
-								<name>duration</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-0000008c" kind="Aggregate" role="Aggregate" guid="{8f8dfe08-4063-42d2-a314-927a6aba1826}" relid="0x2c" childrelidcntr="0x1">
-							<name>TransportPriorityQosPolicy</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-00000065" kind="Member" role="Member" guid="{09ac6238-520c-4c56-9ec6-8a4afc0f4357}" relid="0x0" referred="id-0066-0000002e">
-								<name>value</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-0000008d" kind="Aggregate" role="Aggregate" guid="{a1453d77-ab8f-49f1-854f-53aca2b29f30}" relid="0x2b" childrelidcntr="0x1">
-							<name>GroupDataQosPolicy</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000002c7" kind="Member" role="Member" guid="{cc6206d6-92db-42f9-ae85-1f10fc8fcc5a}" relid="0x0" referred="id-0067-000000d7">
-								<name>value</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-0000008e" kind="Aggregate" role="Aggregate" guid="{31e7ed51-9481-4d36-8b4c-1143ae45140b}" relid="0x2a" childrelidcntr="0x1">
-							<name>TopicDataQosPolicy</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000002c8" kind="Member" role="Member" guid="{0d4a3355-a817-412a-8ea7-9cd4192fe166}" relid="0x0" referred="id-0067-000000d7">
-								<name>value</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-0000008f" kind="Aggregate" role="Aggregate" guid="{5d0b0d21-0174-4a3f-a4b1-4810b9b03867}" relid="0x29" childrelidcntr="0x1">
-							<name>UserDataQosPolicy</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000002c9" kind="Member" role="Member" guid="{cd833cb5-c474-4de6-82bd-f5813899e78a}" relid="0x0" referred="id-0067-000000d7">
-								<name>value</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000090" kind="Object" role="Object" guid="{fb4c57c7-0d18-4743-873b-9f444650dd32}" relid="0x28" childrelidcntr="0x4">
-							<name>QueryCondition</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SupportsAsync" status="meta">
-								<value>false</value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-00000091" kind="TwowayOperation" role="TwowayOperation" guid="{0a953f9e-5d4c-4249-b695-e32385783cbf}" relid="0x2" childrelidcntr="0x1">
-								<name>set_query_parameters</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002ca" kind="InParameter" role="InParameter" guid="{ae451663-d878-4598-a1df-6d0c6546cfd0}" relid="0x0" referred="id-0067-0000013a">
-									<name>query_parameters</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002cb" kind="ReturnType" role="ReturnType" guid="{af4a8656-a5fa-4d09-b08d-7e51d3320c6c}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000092" kind="TwowayOperation" role="TwowayOperation" guid="{0fb3b601-7e6c-4f02-9178-624d03577090}" relid="0x1" childrelidcntr="0x1">
-								<name>get_query_parameters</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002cc" kind="InoutParameter" role="InoutParameter" guid="{aa2e4b34-ec63-4eeb-a430-e191519b6275}" relid="0x0" referred="id-0067-0000013a">
-									<name>query_parameters</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002cd" kind="ReturnType" role="ReturnType" guid="{522fcbb6-90c7-40e2-af2e-f550658b2792}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000093" kind="TwowayOperation" role="TwowayOperation" guid="{834abc4d-407d-40e2-93a6-6411f0a7e826}" relid="0x0" childrelidcntr="0x1">
-								<name>get_query_expression</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000066" kind="ReturnType" role="ReturnType" guid="{5983d075-b2ce-4cf5-b567-1cf4936a7486}" relid="0x0" referred="id-0066-00000023">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<reference id="id-0067-000002ce" kind="Inherits" role="Inherits" guid="{c9fce9c4-515f-47f1-a2ed-3238a98e6e7e}" relid="0x3" referred="id-0065-00000094">
-								<name>Inherits</name>
-							</reference>
-						</model>
-						<model id="id-0065-00000094" kind="Object" role="Object" guid="{64561bb2-bbd1-4a4c-90c7-d4e94b5b0c86}" relid="0x27" childrelidcntr="0x5">
-							<name>ReadCondition</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SupportsAsync" status="meta">
-								<value>false</value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-00000095" kind="TwowayOperation" role="TwowayOperation" guid="{7dfd7c28-b9d7-47b3-9156-e7402dfc6424}" relid="0x3" childrelidcntr="0x1">
-								<name>get_datareader</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002cf" kind="ReturnType" role="ReturnType" guid="{9d0a0fce-db19-4a2a-bc5d-aa07a31d7d45}" relid="0x0" referred="id-0065-000000e0">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000096" kind="TwowayOperation" role="TwowayOperation" guid="{597df2bf-444d-4ef5-9016-790a7c639e41}" relid="0x2" childrelidcntr="0x1">
-								<name>get_instance_state_mask</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002d0" kind="ReturnType" role="ReturnType" guid="{83dc1818-b6aa-413e-9966-4a62cf8d9aba}" relid="0x0" referred="id-0067-00000106">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000097" kind="TwowayOperation" role="TwowayOperation" guid="{35102179-2176-4e02-a59a-012ea18cd27b}" relid="0x1" childrelidcntr="0x1">
-								<name>get_view_state_mask</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002d1" kind="ReturnType" role="ReturnType" guid="{331a9701-847d-4307-900a-71d242fdbe19}" relid="0x0" referred="id-0067-0000010c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000098" kind="TwowayOperation" role="TwowayOperation" guid="{08ef321e-fe40-447f-9bc6-8cd61417375b}" relid="0x0" childrelidcntr="0x1">
-								<name>get_sample_state_mask</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002d2" kind="ReturnType" role="ReturnType" guid="{61ec1fe6-5488-4dcd-9de0-7d9650927c6a}" relid="0x0" referred="id-0067-00000111">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<reference id="id-0067-000002d3" kind="Inherits" role="Inherits" guid="{4ac38eff-3932-4e71-a37c-20baa0295035}" relid="0x4" referred="id-0065-000000a4">
-								<name>Inherits</name>
-							</reference>
-						</model>
-						<model id="id-0065-00000099" kind="Object" role="Object" guid="{ad67a803-70ff-4d6e-967b-990b5e6c9e7f}" relid="0x26" childrelidcntr="0x4">
-							<name>StatusCondition</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SupportsAsync" status="meta">
-								<value>false</value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-0000009a" kind="TwowayOperation" role="TwowayOperation" guid="{70d00df7-c473-441d-a716-cb05b29a4cf2}" relid="0x2" childrelidcntr="0x1">
-								<name>get_entity</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002d4" kind="ReturnType" role="ReturnType" guid="{99718575-6fb6-4a21-8e8e-cbfd521c869e}" relid="0x0" referred="id-0065-00000116">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000009b" kind="TwowayOperation" role="TwowayOperation" guid="{4706f066-fb65-49ce-9f68-f7c41a719ac1}" relid="0x1" childrelidcntr="0x1">
-								<name>set_enabled_statuses</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002d5" kind="InParameter" role="InParameter" guid="{3b21d514-9639-48b5-9416-b388ca4ca93e}" relid="0x0" referred="id-0067-00000124">
-									<name>mask</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002d6" kind="ReturnType" role="ReturnType" guid="{6de57292-4752-4277-b663-859fb467b851}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000009c" kind="TwowayOperation" role="TwowayOperation" guid="{b7a09a16-8c83-4c45-b89b-2e323d17198b}" relid="0x0" childrelidcntr="0x1">
-								<name>get_enabled_statuses</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002d7" kind="ReturnType" role="ReturnType" guid="{4a0b2011-450f-48de-977e-a6bf358aff39}" relid="0x0" referred="id-0067-00000124">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<reference id="id-0067-000002d8" kind="Inherits" role="Inherits" guid="{8f2a90d9-5b79-4c30-b0a4-9a152fda0bff}" relid="0x3" referred="id-0065-000000a4">
-								<name>Inherits</name>
-							</reference>
-						</model>
-						<model id="id-0065-0000009d" kind="Object" role="Object" guid="{80afdb19-9426-44ec-a1e6-d7d81b6ec892}" relid="0x25" childrelidcntr="0x2">
-							<name>GuardCondition</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SupportsAsync" status="meta">
-								<value>false</value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-0000009e" kind="TwowayOperation" role="TwowayOperation" guid="{ca4365c0-7848-43e7-815b-cda458caf3e2}" relid="0x0" childrelidcntr="0x1">
-								<name>set_trigger_value</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000067" kind="InParameter" role="InParameter" guid="{316e1617-c876-4c5d-85a1-4c42b205e7d5}" relid="0x0" referred="id-0066-00000033">
-									<name>value</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002d9" kind="ReturnType" role="ReturnType" guid="{adfa5c45-4218-405c-a892-35ea698c8f7d}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<reference id="id-0067-000002da" kind="Inherits" role="Inherits" guid="{38506d9c-3d34-4866-a783-f75d14a7a74f}" relid="0x1" referred="id-0065-000000a4">
-								<name>Inherits</name>
-							</reference>
-						</model>
-						<model id="id-0065-0000009f" kind="Object" role="Object" guid="{963ea670-e2d4-4b71-b455-a310e1a8c32e}" relid="0x24" childrelidcntr="0x4">
-							<name>WaitSet</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SupportsAsync" status="meta">
-								<value>false</value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-000000a0" kind="TwowayOperation" role="TwowayOperation" guid="{1444279c-ee95-4c33-9e1d-b4adde514038}" relid="0x3" childrelidcntr="0x1">
-								<name>get_conditions</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002db" kind="ReturnType" role="ReturnType" guid="{3bb459d2-17c8-48c9-980b-29187643ed0d}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002dc" kind="InoutParameter" role="InoutParameter" guid="{e27cb3cf-160d-440b-97c9-0e779c719ae6}" relid="0x0" referred="id-0067-0000013f">
-									<name>attached_conditions</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000a1" kind="TwowayOperation" role="TwowayOperation" guid="{f111c931-37a1-4b4b-a8ab-1b1d21ebe53f}" relid="0x2" childrelidcntr="0x1">
-								<name>detach_condition</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002dd" kind="ReturnType" role="ReturnType" guid="{a1cec342-59b0-48ca-9fcd-e36a8ac60acf}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002de" kind="InParameter" role="InParameter" guid="{f718c48d-f98d-4e3b-9b3b-17abd3d1998c}" relid="0x0" referred="id-0065-000000a4">
-									<name>cond</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000a2" kind="TwowayOperation" role="TwowayOperation" guid="{180796f6-b238-4fb1-b53d-95a62d74c7c7}" relid="0x1" childrelidcntr="0x1">
-								<name>attach_condition</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002df" kind="ReturnType" role="ReturnType" guid="{be03b66e-ce78-4793-9760-502027a66357}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002e0" kind="InParameter" role="InParameter" guid="{cc5892e9-6b25-4a8f-be23-b23185a8fed5}" relid="0x0" referred="id-0065-000000a4">
-									<name>cond</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000a3" kind="TwowayOperation" role="TwowayOperation" guid="{2bec1971-a06d-49a1-b11f-dd4583830a2e}" relid="0x0" childrelidcntr="0x1">
-								<name>wait</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002e1" kind="ReturnType" role="ReturnType" guid="{87bff5ae-af9c-4ae1-8671-cdb4258dc924}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002e2" kind="InParameter" role="InParameter" guid="{d9d9632b-67bf-4cc4-81f6-3e56f1537b3d}" relid="0x0" referred="id-0065-0000012d">
-									<name>timeout</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002e3" kind="InoutParameter" role="InoutParameter" guid="{79266214-f81a-421a-bdb5-7e8e3203a7f0}" relid="0x0" referred="id-0067-0000013f">
-									<name>active_conditions</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-						</model>
-						<model id="id-0065-000000a4" kind="Object" role="Object" guid="{20c8b739-65af-41ec-8d86-d821626a2a0e}" relid="0x23" childrelidcntr="0x1">
-							<name>Condition</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SupportsAsync" status="meta">
-								<value>false</value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-000000a5" kind="TwowayOperation" role="TwowayOperation" guid="{90f43f6f-85b5-4226-ad3e-affd7916af2b}" relid="0x0" childrelidcntr="0x1">
-								<name>get_trigger_value</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000068" kind="ReturnType" role="ReturnType" guid="{7090f7d6-516d-4f5a-b12e-3c2a0aaf1b4f}" relid="0x0" referred="id-0066-00000033">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-						</model>
-						<model id="id-0065-000000a6" kind="Object" role="Object" guid="{f9d59fe3-9616-4806-833d-2a15868c3cae}" relid="0x22" childrelidcntr="0x1">
-							<name>DomainParticipantListener</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SupportsAsync" status="meta">
-								<value>false</value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000002e4" kind="Inherits" role="Inherits" guid="{a56eb686-b35a-4881-a923-f6aff8c00ba7}" relid="0x0" referred="id-0065-000000b1">
-								<name>Inherits</name>
-							</reference>
-							<reference id="id-0067-000002e5" kind="Inherits" role="Inherits" guid="{02f1a8ab-9785-494b-8445-ec77f5cdbcf7}" relid="0x0" referred="id-0065-0000011b">
-								<name>Inherits</name>
-							</reference>
-							<reference id="id-0067-000002e6" kind="Inherits" role="Inherits" guid="{f2584eaf-ef06-4ad5-87ba-810c016187da}" relid="0x0" referred="id-0065-000000b9">
-								<name>Inherits</name>
-							</reference>
-						</model>
-						<model id="id-0065-000000a7" kind="Object" role="Object" guid="{4c9f54ce-366e-4d5b-8e0c-d733f62e3b94}" relid="0x21" childrelidcntr="0x2">
-							<name>SubscriberListener</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SupportsAsync" status="meta">
-								<value>false</value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-000000a8" kind="TwowayOperation" role="TwowayOperation" guid="{77606d1b-4d11-4ffa-a143-6eaffb7108e4}" relid="0x0" childrelidcntr="0x1">
-								<name>on_data_on_readers</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002e7" kind="InParameter" role="InParameter" guid="{a84e3704-da57-47b7-81ad-9ca5d3083444}" relid="0x0" referred="id-0065-000000ce">
-									<name>the_subscriber</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<reference id="id-0067-000002e8" kind="Inherits" role="Inherits" guid="{3df2b316-f31a-4c9f-ba84-3a93a8eb0f8d}" relid="0x1" referred="id-0065-000000a9">
-								<name>Inherits</name>
-							</reference>
-						</model>
-						<model id="id-0065-000000a9" kind="Object" role="Object" guid="{21482efd-7490-4df3-bd59-af5c783e3468}" relid="0x20" childrelidcntr="0x8">
-							<name>DataReaderListener</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SupportsAsync" status="meta">
-								<value>false</value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-000000aa" kind="TwowayOperation" role="TwowayOperation" guid="{ef0ed577-2fe7-41e2-9d84-01b3a7ac5ac2}" relid="0x6" childrelidcntr="0x1">
-								<name>on_sample_lost</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,660</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002e9" kind="InParameter" role="InParameter" guid="{3a2275ba-2b65-4f7c-9b49-5d93a4b4916e}" relid="0x0" referred="id-0065-0000012a">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002ea" kind="InParameter" role="InParameter" guid="{99dfc069-394a-4586-8af3-f6b8d1ae62e9}" relid="0x0" referred="id-0065-000000e0">
-									<name>the_reader</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000ab" kind="TwowayOperation" role="TwowayOperation" guid="{5d373a8d-d337-44cc-a28e-c3822dc7719a}" relid="0x5" childrelidcntr="0x1">
-								<name>on_subscription_matched</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,560</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002eb" kind="InParameter" role="InParameter" guid="{22bbcafe-f6a8-43b0-b9ec-da82617a9034}" relid="0x0" referred="id-0065-0000011f">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002ec" kind="InParameter" role="InParameter" guid="{5339ea05-93ed-42f3-bf5a-e650aa6386cf}" relid="0x0" referred="id-0065-000000e0">
-									<name>the_reader</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000ac" kind="TwowayOperation" role="TwowayOperation" guid="{707b7440-d471-4b40-9cea-01a2d07993e9}" relid="0x4" childrelidcntr="0x1">
-								<name>on_data_available</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002ed" kind="InParameter" role="InParameter" guid="{5fcc73b8-51c8-4f68-a130-67d9ee8ff7e3}" relid="0x0" referred="id-0065-000000e0">
-									<name>the_reader</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000ad" kind="TwowayOperation" role="TwowayOperation" guid="{0163a50f-8169-4ccf-b200-89dbb6e3da85}" relid="0x3" childrelidcntr="0x1">
-								<name>on_liveliness_changed</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002ee" kind="InParameter" role="InParameter" guid="{94ddd20b-f16b-4ee6-895b-ad9c5bb5070b}" relid="0x0" referred="id-0065-00000126">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002ef" kind="InParameter" role="InParameter" guid="{72986913-c2cd-4987-b638-a01efe9cfb7a}" relid="0x0" referred="id-0065-000000e0">
-									<name>the_reader</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000ae" kind="TwowayOperation" role="TwowayOperation" guid="{ab1169ab-0f50-4b35-bbb1-da177461bec7}" relid="0x2" childrelidcntr="0x1">
-								<name>on_sample_rejected</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002f0" kind="InParameter" role="InParameter" guid="{1fa64424-331f-4dc3-8801-cae23da11c7c}" relid="0x0" referred="id-0065-00000128">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002f1" kind="InParameter" role="InParameter" guid="{2e19fa4e-30af-4a38-8a07-83c6e50e848f}" relid="0x0" referred="id-0065-000000e0">
-									<name>the_reader</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000af" kind="TwowayOperation" role="TwowayOperation" guid="{92c9b989-c372-49c2-a59f-5324d7779a4a}" relid="0x1" childrelidcntr="0x1">
-								<name>on_requested_incompatible_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002f2" kind="InParameter" role="InParameter" guid="{f496b174-7bc3-43c7-8bd6-b8d7c02a40e8}" relid="0x0" referred="id-0065-00000121">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002f3" kind="InParameter" role="InParameter" guid="{bd247fbc-54fa-4eb9-92da-2bff562cd95f}" relid="0x0" referred="id-0065-000000e0">
-									<name>the_reader</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000b0" kind="TwowayOperation" role="TwowayOperation" guid="{f152534c-add7-4f9d-91a6-ad53cb298618}" relid="0x0" childrelidcntr="0x1">
-								<name>on_requested_deadline_missed</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002f4" kind="InParameter" role="InParameter" guid="{7693b0f3-2e6a-4190-b460-1537d2b25b04}" relid="0x0" referred="id-0065-00000124">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002f5" kind="InParameter" role="InParameter" guid="{3a3ec0f6-3bed-4f2a-b03f-ab31f579d132}" relid="0x0" referred="id-0065-000000e0">
-									<name>the_reader</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<reference id="id-0067-000002f6" kind="Inherits" role="Inherits" guid="{f6a27cc0-3122-4857-8022-6391beb021c3}" relid="0x7" referred="id-0065-0000011b">
-								<name>Inherits</name>
-							</reference>
-						</model>
-						<model id="id-0065-000000b1" kind="Object" role="Object" guid="{e4699243-959f-4fce-8308-d6fb2a3ba60c}" relid="0x1f" childrelidcntr="0x1">
-							<name>PublisherListener</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SupportsAsync" status="meta">
-								<value>false</value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000002f7" kind="Inherits" role="Inherits" guid="{b19e72bd-4670-4fe6-b0f4-b571561e68f0}" relid="0x0" referred="id-0065-000000b2">
-								<name>Inherits</name>
-							</reference>
-						</model>
-						<model id="id-0065-000000b2" kind="Object" role="Object" guid="{6ec642f5-e2c2-4b1b-ad6b-c7589f6124ab}" relid="0x1e" childrelidcntr="0x7">
-							<name>DataWriterListener</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SupportsAsync" status="meta">
-								<value>false</value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-000000b3" kind="TwowayOperation" role="TwowayOperation" guid="{32206b40-6314-4acb-a78f-f0aeb4218877}" relid="0x5" childrelidcntr="0x1">
-								<name>on_reliable_reader_activity_changed</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,560</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002f8" kind="InParameter" role="InParameter" guid="{2c9ad149-a03c-452e-ab6e-9b7e9336968b}" relid="0x0" referred="id-0065-0000011e">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002f9" kind="InParameter" role="InParameter" guid="{2974bfbf-5852-4460-8473-e59140fd694f}" relid="0x0" referred="id-0065-000000f4">
-									<name>writer</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000b4" kind="TwowayOperation" role="TwowayOperation" guid="{b11529b5-a0d8-4003-9974-51497c3abaab}" relid="0x4" childrelidcntr="0x1">
-								<name>on_reliable_writer_cache_changed</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002fa" kind="InParameter" role="InParameter" guid="{bb850eb5-7830-4ce9-88cb-a8344d424b5d}" relid="0x0" referred="id-0065-0000011c">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002fb" kind="InParameter" role="InParameter" guid="{73023405-7e9b-4a0b-ad70-78c4aa8d80d2}" relid="0x0" referred="id-0065-000000f4">
-									<name>writer</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000b5" kind="TwowayOperation" role="TwowayOperation" guid="{296dafd2-3702-44d9-ab7a-f929d72fbf65}" relid="0x3" childrelidcntr="0x1">
-								<name>on_publication_matched</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002fc" kind="InParameter" role="InParameter" guid="{ce1e5a71-12f7-406e-94b7-4b3ac2a2ef42}" relid="0x0" referred="id-0065-00000120">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002fd" kind="InParameter" role="InParameter" guid="{c2e910b4-b861-4d01-a709-989a53a053f3}" relid="0x0" referred="id-0065-000000f4">
-									<name>writer</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000b6" kind="TwowayOperation" role="TwowayOperation" guid="{65ac6074-64e3-4b24-92a0-d7f90c511e4e}" relid="0x2" childrelidcntr="0x1">
-								<name>on_liveliness_lost</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002fe" kind="InParameter" role="InParameter" guid="{4b722d31-7fa2-415d-83c7-39a18d7ae812}" relid="0x0" referred="id-0065-00000127">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002ff" kind="InParameter" role="InParameter" guid="{1132162b-706b-4e7e-bb43-3bdf83c4c761}" relid="0x0" referred="id-0065-000000f4">
-									<name>writer</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000b7" kind="TwowayOperation" role="TwowayOperation" guid="{8ddaf5b7-f2a4-4bce-b2aa-62afaaf4a8fd}" relid="0x1" childrelidcntr="0x1">
-								<name>on_offered_incompatible_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000300" kind="InParameter" role="InParameter" guid="{30780cf3-8476-44da-bc3a-8dd199c42853}" relid="0x0" referred="id-0065-00000122">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000301" kind="InParameter" role="InParameter" guid="{826506ef-7504-4bf7-86c4-1a909979cced}" relid="0x0" referred="id-0065-000000f4">
-									<name>writer</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000b8" kind="TwowayOperation" role="TwowayOperation" guid="{4853b54d-7248-433c-ad29-dfaa7a701549}" relid="0x0" childrelidcntr="0x1">
-								<name>on_offered_deadline_missed</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000302" kind="InParameter" role="InParameter" guid="{1d4cc92e-9eff-41d3-a609-80026f5123df}" relid="0x0" referred="id-0065-00000125">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000303" kind="InParameter" role="InParameter" guid="{74c70e9f-b9ff-4924-95a1-d325adec0f18}" relid="0x0" referred="id-0065-000000f4">
-									<name>writer</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<reference id="id-0067-00000304" kind="Inherits" role="Inherits" guid="{d6f48dce-0393-45a5-af20-3d76bab7e49a}" relid="0x6" referred="id-0065-0000011b">
-								<name>Inherits</name>
-							</reference>
-						</model>
-						<model id="id-0065-000000b9" kind="Object" role="Object" guid="{b96f7fda-6a45-47d2-b103-11ad5bd524d4}" relid="0x1d" childrelidcntr="0x2">
-							<name>TopicListener</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SupportsAsync" status="meta">
-								<value>false</value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-000000ba" kind="TwowayOperation" role="TwowayOperation" guid="{251c4042-ea65-4042-b536-b8a43990aa0c}" relid="0x0" childrelidcntr="0x1">
-								<name>on_inconsistent_topic</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000305" kind="InParameter" role="InParameter" guid="{667f44e5-472d-4fa2-b9ef-b4cbfab49c8d}" relid="0x0" referred="id-0065-0000012b">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000306" kind="InParameter" role="InParameter" guid="{8e0de7d7-b5b0-49bf-a8c1-32ee4dca0cd2}" relid="0x0" referred="id-0065-0000010c">
-									<name>the_topic</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<reference id="id-0067-00000307" kind="Inherits" role="Inherits" guid="{e1aef13f-a614-4c9b-82f6-d23fcbf62ffb}" relid="0x1" referred="id-0065-0000011b">
-								<name>Inherits</name>
-							</reference>
-						</model>
-						<model id="id-0065-000000bb" kind="Object" role="Object" guid="{4f5eebbb-cf9a-4547-88c3-68b4139798b5}" relid="0x1c" childrelidcntr="0x13">
-							<name>Publisher</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SupportsAsync" status="meta">
-								<value>false</value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-000000bc" kind="TwowayOperation" role="TwowayOperation" guid="{bac79da3-694b-4630-b0e8-b0e1c6588d5a}" relid="0x11" childrelidcntr="0x1">
-								<name>copy_from_topic_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1760</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000069" kind="InParameter" role="InParameter" guid="{5d3895b6-c2d6-4015-af00-5465948508ef}" relid="0x0" referred="id-0065-00000070">
-									<name>a_topic_qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000006a" kind="InoutParameter" role="InoutParameter" guid="{c7f99d7f-4ff0-43d6-9549-5e4f0fe584e7}" relid="0x0" referred="id-0065-0000006f">
-									<name>a_datawriter_qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000308" kind="ReturnType" role="ReturnType" guid="{1577cab5-647c-4da4-84cf-4126946ffae7}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000bd" kind="TwowayOperation" role="TwowayOperation" guid="{f75d0811-ff01-4500-8125-4fc76004c532}" relid="0x10" childrelidcntr="0x1">
-								<name>get_default_datawriter_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1660</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000006b" kind="InoutParameter" role="InoutParameter" guid="{d4685544-1f06-459b-81a5-c618cce73903}" relid="0x0" referred="id-0065-0000006f">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000309" kind="ReturnType" role="ReturnType" guid="{74d27c57-f92d-4af0-a090-c3acdb17ff21}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000be" kind="TwowayOperation" role="TwowayOperation" guid="{c122be64-e057-4bce-b70e-c911a0ef18d3}" relid="0xf" childrelidcntr="0x1">
-								<name>set_default_datawriter_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1560</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000006c" kind="InParameter" role="InParameter" guid="{e201161b-3245-4c3e-87ff-54935e71b731}" relid="0x0" referred="id-0065-0000006f">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000030a" kind="ReturnType" role="ReturnType" guid="{ebcedb62-f5f4-4dd3-b652-5f8f6ae28093}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000bf" kind="TwowayOperation" role="TwowayOperation" guid="{c9f8ec8f-69a9-4c5b-885c-974b20297674}" relid="0xe" childrelidcntr="0x1">
-								<name>get_participant</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000006d" kind="ReturnType" role="ReturnType" guid="{9d3b8308-1b73-45f2-8b20-b0c0d7105af5}" relid="0x0" referred="id-0065-00000040">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000c0" kind="TwowayOperation" role="TwowayOperation" guid="{d5293866-6ed6-4f2d-b42b-22fbca744fd4}" relid="0xd" childrelidcntr="0x1">
-								<name>wait_for_acknowledgments</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000030b" kind="ReturnType" role="ReturnType" guid="{641d952c-266b-4a75-95ab-77dd3f516a57}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000030c" kind="InParameter" role="InParameter" guid="{c9e98644-418c-4f72-bbf0-55362ec76bcd}" relid="0x0" referred="id-0065-0000012d">
-									<name>max_wait</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000c1" kind="TwowayOperation" role="TwowayOperation" guid="{66214d0a-29a9-4bf1-a24e-eddd7d3b4398}" relid="0xc" childrelidcntr="0x1">
-								<name>end_coherent_changes</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000030d" kind="ReturnType" role="ReturnType" guid="{325fcbf1-6cb7-4152-a8fe-ad543c4d6f11}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000c2" kind="TwowayOperation" role="TwowayOperation" guid="{09792629-4fdb-4c0e-b596-718cfbb74571}" relid="0xb" childrelidcntr="0x1">
-								<name>begin_coherent_changes</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000030e" kind="ReturnType" role="ReturnType" guid="{dcc3bae7-db81-4fd1-8540-b8892c32513e}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000c3" kind="TwowayOperation" role="TwowayOperation" guid="{0f6efba4-a689-4d3f-b7e9-cef7fa4bbd8c}" relid="0xa" childrelidcntr="0x1">
-								<name>resume_publications</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1060</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000030f" kind="ReturnType" role="ReturnType" guid="{040979b6-4257-4fd0-b06c-2a9f887c4ec6}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000c4" kind="TwowayOperation" role="TwowayOperation" guid="{e7385d87-75fc-461e-b864-015eec341af5}" relid="0x9" childrelidcntr="0x1">
-								<name>suspend_publications</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,960</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000310" kind="ReturnType" role="ReturnType" guid="{60dc06b1-7275-4cd8-98be-9c7632266e9e}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000c5" kind="TwowayOperation" role="TwowayOperation" guid="{f4d17e9a-58fd-4fa5-9749-2161c13877e9}" relid="0x8" childrelidcntr="0x1">
-								<name>get_listener</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,860</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000006e" kind="ReturnType" role="ReturnType" guid="{4418ea4f-36c0-44b2-96cc-928bfac92f54}" relid="0x0" referred="id-0065-000000b1">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000c6" kind="TwowayOperation" role="TwowayOperation" guid="{cda3d7c2-d517-4ebc-bbba-88e79be7d0d0}" relid="0x7" childrelidcntr="0x1">
-								<name>set_listener</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,760</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000006f" kind="InParameter" role="InParameter" guid="{5736a6b7-874a-4338-bc81-75ee9a951225}" relid="0x0" referred="id-0065-000000b1">
-									<name>a_listener</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000311" kind="InParameter" role="InParameter" guid="{64528804-81a9-4bce-9624-c344e1b7516a}" relid="0x0" referred="id-0067-00000124">
-									<name>mask</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000312" kind="ReturnType" role="ReturnType" guid="{4cae743d-7e86-4885-8090-0e47849879cb}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000c7" kind="TwowayOperation" role="TwowayOperation" guid="{fb86cfc0-06ba-4804-8150-bf09edab5a9b}" relid="0x6" childrelidcntr="0x1">
-								<name>get_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,660</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000070" kind="InoutParameter" role="InoutParameter" guid="{733a97ee-941d-4148-9821-c0f89a193f3b}" relid="0x0" referred="id-0065-0000006e">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000313" kind="ReturnType" role="ReturnType" guid="{945ebf05-6a30-41f7-834d-e10b1d75060f}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000c8" kind="TwowayOperation" role="TwowayOperation" guid="{179d9a18-c488-4307-88d2-9f57797fb88d}" relid="0x5" childrelidcntr="0x1">
-								<name>set_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,560</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000071" kind="InParameter" role="InParameter" guid="{12663ac4-c11d-46e2-b1b7-fb490b1011db}" relid="0x0" referred="id-0065-0000006e">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000314" kind="ReturnType" role="ReturnType" guid="{dfd9f22b-b22f-4f6b-bb06-103200df3b51}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000c9" kind="TwowayOperation" role="TwowayOperation" guid="{8d2971dc-bd0f-450c-a657-8e7d55ad7bd4}" relid="0x4" childrelidcntr="0x1">
-								<name>delete_contained_entities</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000315" kind="ReturnType" role="ReturnType" guid="{3be19ff5-37af-4fe5-8a39-baabcc2fd8cf}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000ca" kind="TwowayOperation" role="TwowayOperation" guid="{d7ddfcd8-0fb8-4bba-bed4-87b098e094a9}" relid="0x3" childrelidcntr="0x1">
-								<name>lookup_datawriter</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000072" kind="InParameter" role="InParameter" guid="{44de8d28-5be1-4cf7-aefb-43ad2397a6fe}" relid="0x0" referred="id-0066-00000023">
-									<name>topic_name</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000316" kind="ReturnType" role="ReturnType" guid="{00e37ecc-0ea0-4d8b-9235-fa67204c2a02}" relid="0x0" referred="id-0065-000000f4">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000cb" kind="TwowayOperation" role="TwowayOperation" guid="{b90ffda6-2051-4a0a-95ab-37a59a19edf9}" relid="0x2" childrelidcntr="0x1">
-								<name>delete_datawriter</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000317" kind="ReturnType" role="ReturnType" guid="{8e4d973b-95e8-4308-8793-2e3a6cdb5fb3}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000318" kind="InParameter" role="InParameter" guid="{02aa4e05-ae68-4033-9419-74c767cdafad}" relid="0x0" referred="id-0065-000000f4">
-									<name>a_datawriter</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000cc" kind="TwowayOperation" role="TwowayOperation" guid="{afa7274d-6817-4601-9deb-d710d43e40d0}" relid="0x1" childrelidcntr="0x1">
-								<name>create_datawriter_with_profile</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000073" kind="InParameter" role="InParameter" guid="{79540497-9b9e-48a9-89e3-58c7e8d86aa4}" relid="0x0" referred="id-0065-000000b2">
-									<name>a_listener</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>460,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000074" kind="InParameter" role="InParameter" guid="{2421b119-5e27-4379-86f6-308f67a223c2}" relid="0x0" referred="id-0066-00000023">
-									<name>probile_name</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>360,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000075" kind="InParameter" role="InParameter" guid="{6981d70d-ddbb-4140-8259-ed8ba6c74c34}" relid="0x0" referred="id-0066-00000023">
-									<name>library_name</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000319" kind="InParameter" role="InParameter" guid="{e46386b3-7971-4061-b9d9-e6aa0ae129af}" relid="0x0" referred="id-0067-00000124">
-									<name>mask</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>560,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000031a" kind="InParameter" role="InParameter" guid="{a918d624-2e7b-4cc8-83a2-7368cc29ef3c}" relid="0x0" referred="id-0065-0000010c">
-									<name>a_topic</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000031b" kind="ReturnType" role="ReturnType" guid="{0e08f6b6-76ad-4b40-82d3-b3024f8e751e}" relid="0x0" referred="id-0065-000000f4">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000cd" kind="TwowayOperation" role="TwowayOperation" guid="{d4a98d8d-7f33-41b7-98b5-4cc3572f0731}" relid="0x0" childrelidcntr="0x1">
-								<name>create_datawriter</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000076" kind="InParameter" role="InParameter" guid="{ea51d174-903a-43f3-9023-e38848c4d448}" relid="0x0" referred="id-0065-000000b2">
-									<name>a_listener</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>360,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000077" kind="InParameter" role="InParameter" guid="{bf0a5c44-eb8a-41f4-869b-f7bf96c77dec}" relid="0x0" referred="id-0065-0000006f">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000031c" kind="InParameter" role="InParameter" guid="{188b0667-16f2-4bcd-bc77-964e2366d0fe}" relid="0x0" referred="id-0067-00000124">
-									<name>mask</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>460,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000031d" kind="InParameter" role="InParameter" guid="{34f51ff6-670d-4eff-8ed6-e811c6b38717}" relid="0x0" referred="id-0065-0000010c">
-									<name>a_topic</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000031e" kind="ReturnType" role="ReturnType" guid="{cdd7167e-c07c-4afe-b134-209d53aabd6e}" relid="0x0" referred="id-0065-000000f4">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<reference id="id-0067-0000031f" kind="Inherits" role="Inherits" guid="{e4183a64-c3c8-4f7f-8d5c-cb8d262353a7}" relid="0x12" referred="id-0065-00000116">
-								<name>Inherits</name>
-							</reference>
-						</model>
-						<model id="id-0065-000000ce" kind="Object" role="Object" guid="{a113f8ff-f511-492e-8f3e-73fbfa24baef}" relid="0x1b" childrelidcntr="0x12">
-							<name>Subscriber</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SupportsAsync" status="meta">
-								<value>false</value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-000000cf" kind="TwowayOperation" role="TwowayOperation" guid="{6f1547e5-e8de-4537-80e4-a53bed927dbf}" relid="0x10" childrelidcntr="0x1">
-								<name>copy_from_topic_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1660</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000078" kind="InParameter" role="InParameter" guid="{0664ad23-1a72-45d3-9c08-0ad871bf29a3}" relid="0x0" referred="id-0065-00000070">
-									<name>a_topic_qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000079" kind="InoutParameter" role="InoutParameter" guid="{5b5f3cad-0276-4fd1-a5a8-3e025a696bd2}" relid="0x0" referred="id-0065-0000006d">
-									<name>a_datareader_qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000320" kind="ReturnType" role="ReturnType" guid="{7bc581f7-89fd-4916-8939-3b9e01f3dbd1}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000d0" kind="TwowayOperation" role="TwowayOperation" guid="{10a13d5c-af2a-4a99-960b-6ce6b033b957}" relid="0xf" childrelidcntr="0x1">
-								<name>get_default_datareader_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1560</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000007a" kind="InoutParameter" role="InoutParameter" guid="{c134bb48-d9e8-44fc-8e1e-f3f78406833c}" relid="0x0" referred="id-0065-0000006d">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000321" kind="ReturnType" role="ReturnType" guid="{716daca9-9c40-4155-a00d-be826b5cfc4e}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000d1" kind="TwowayOperation" role="TwowayOperation" guid="{f3371ab8-af13-44e8-b0a5-dd29f3e977c6}" relid="0xe" childrelidcntr="0x1">
-								<name>set_default_datareader_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000007b" kind="InParameter" role="InParameter" guid="{401654fe-a2f6-459b-b6c0-0113e70be839}" relid="0x0" referred="id-0065-0000006d">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000322" kind="ReturnType" role="ReturnType" guid="{171e9191-5944-4e5f-b7b8-84234331f3d9}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000d2" kind="TwowayOperation" role="TwowayOperation" guid="{8335259a-d72c-4c44-811f-3f9df0e84b6e}" relid="0xd" childrelidcntr="0x1">
-								<name>get_participant</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000007c" kind="ReturnType" role="ReturnType" guid="{65f9d75e-ccc8-4abc-b161-d4d609fbe1c6}" relid="0x0" referred="id-0065-00000040">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000d3" kind="TwowayOperation" role="TwowayOperation" guid="{ca070b7c-2035-4501-a173-913adb2de7af}" relid="0xc" childrelidcntr="0x1">
-								<name>end_access</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000323" kind="ReturnType" role="ReturnType" guid="{a13f205e-d755-4713-a9a9-ab01cc26f656}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000d4" kind="TwowayOperation" role="TwowayOperation" guid="{10f5ae9e-1189-4942-b4fe-b4d8bfc8834c}" relid="0xb" childrelidcntr="0x1">
-								<name>begin_access</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000324" kind="ReturnType" role="ReturnType" guid="{737ddcc9-63ef-4dd6-89e2-9692ae6d55e8}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000d5" kind="TwowayOperation" role="TwowayOperation" guid="{68723394-e823-4e51-abdf-6be53b7cdf9a}" relid="0xa" childrelidcntr="0x1">
-								<name>get_listener</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1060</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000007d" kind="ReturnType" role="ReturnType" guid="{453c2c55-363e-44fe-afc8-dd4c27456b65}" relid="0x0" referred="id-0065-000000a7">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000d6" kind="TwowayOperation" role="TwowayOperation" guid="{f80fee9e-c13c-4c8a-bf9d-e3f6516ccf93}" relid="0x9" childrelidcntr="0x1">
-								<name>set_listener</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,960</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000007e" kind="InParameter" role="InParameter" guid="{f4c07ebd-16e2-4e17-b5d9-0c65b175de31}" relid="0x0" referred="id-0065-000000a7">
-									<name>a_listener</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000325" kind="InParameter" role="InParameter" guid="{26414354-b5c6-422d-882b-2c217fdb3e65}" relid="0x0" referred="id-0067-00000124">
-									<name>mask</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000326" kind="ReturnType" role="ReturnType" guid="{4b24d435-ed88-4ef3-a254-7f9fbd7ba88c}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000d7" kind="TwowayOperation" role="TwowayOperation" guid="{214ee0c6-04bd-4bcf-8cda-9b9e748a5964}" relid="0x8" childrelidcntr="0x1">
-								<name>get_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,860</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000007f" kind="InoutParameter" role="InoutParameter" guid="{1d17d063-a724-4aef-b623-d5210eac0d53}" relid="0x0" referred="id-0065-0000006c">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000327" kind="ReturnType" role="ReturnType" guid="{617ac9bb-8e8f-4723-9042-66937b916c6f}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000d8" kind="TwowayOperation" role="TwowayOperation" guid="{2b8f29ad-5481-4930-b64c-458a7cb68b79}" relid="0x7" childrelidcntr="0x1">
-								<name>set_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,760</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000080" kind="InParameter" role="InParameter" guid="{08fe8b5f-56af-4a23-a7e8-43186b10525c}" relid="0x0" referred="id-0065-0000006c">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000328" kind="ReturnType" role="ReturnType" guid="{badc2a99-847c-4197-8328-11cfc16bb01e}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000d9" kind="TwowayOperation" role="TwowayOperation" guid="{48db7971-bd50-43f9-84e0-26d3e3798b40}" relid="0x6" childrelidcntr="0x1">
-								<name>notify_datareaders</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,660</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000329" kind="ReturnType" role="ReturnType" guid="{a979f694-aa7d-426e-b4ac-083295d17694}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000da" kind="TwowayOperation" role="TwowayOperation" guid="{5ae59d40-bd26-405e-9e83-97614689543e}" relid="0x5" childrelidcntr="0x1">
-								<name>get_datareaders</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,560</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000032a" kind="InParameter" role="InParameter" guid="{2a80dc59-0e77-42cb-8a13-024122aafdb0}" relid="0x0" referred="id-0067-00000106">
-									<name>instance_states</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>460,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000032b" kind="InParameter" role="InParameter" guid="{5b0c5ed6-21a3-40cb-b017-6c4ce9ece9c5}" relid="0x0" referred="id-0067-0000010c">
-									<name>view_states</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>360,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000032c" kind="InParameter" role="InParameter" guid="{028f06b5-ed5e-444e-acf1-dfdf163f5850}" relid="0x0" referred="id-0067-00000111">
-									<name>sample_states</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000032d" kind="InoutParameter" role="InoutParameter" guid="{3d3b90a6-59ba-4b88-b424-e2bc6f1517e3}" relid="0x0" referred="id-0067-00000140">
-									<name>readers</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000032e" kind="ReturnType" role="ReturnType" guid="{b5899b66-4d78-4072-85e9-164f8db37ed8}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000db" kind="TwowayOperation" role="TwowayOperation" guid="{36b1e64f-1d4b-4503-b025-65f4d3c0f093}" relid="0x4" childrelidcntr="0x1">
-								<name>lookup_datareader</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000081" kind="InParameter" role="InParameter" guid="{640f5837-4ffe-4a5d-b2c7-6a8b5c68060e}" relid="0x0" referred="id-0066-00000023">
-									<name>topic_name</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000032f" kind="ReturnType" role="ReturnType" guid="{37c3f4e8-20bd-4f6a-ae4e-aeec521ab3b2}" relid="0x0" referred="id-0065-000000e0">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000dc" kind="TwowayOperation" role="TwowayOperation" guid="{218763d2-572d-4185-a2f8-b96b6ba1edc1}" relid="0x3" childrelidcntr="0x1">
-								<name>delete_contained_entities</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000330" kind="ReturnType" role="ReturnType" guid="{cb5cdb85-f31f-449a-874b-12745dedeca7}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000dd" kind="TwowayOperation" role="TwowayOperation" guid="{56a03b42-9fad-4041-8a90-0c653e30677d}" relid="0x2" childrelidcntr="0x1">
-								<name>delete_datareader</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000331" kind="ReturnType" role="ReturnType" guid="{39555b40-9e6a-428c-91df-8ba60a80b0fa}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000332" kind="InParameter" role="InParameter" guid="{d823a347-0491-469b-a106-c455478bb667}" relid="0x0" referred="id-0065-000000e0">
-									<name>a_datareader</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000de" kind="TwowayOperation" role="TwowayOperation" guid="{a832090b-f734-4b0b-b203-71aad2fadae9}" relid="0x1" childrelidcntr="0x1">
-								<name>create_datareader_with_profile</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000082" kind="InParameter" role="InParameter" guid="{903a65c7-0c8d-49ed-a4e6-af4481a3f7e1}" relid="0x0" referred="id-0065-000000a9">
-									<name>a_listener</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>460,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000083" kind="InParameter" role="InParameter" guid="{962da721-9691-4709-afaa-c515be44a833}" relid="0x0" referred="id-0066-00000023">
-									<name>profile_name</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>360,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000084" kind="InParameter" role="InParameter" guid="{fa32da6b-e51b-42d7-a141-f2ee67c52780}" relid="0x0" referred="id-0066-00000023">
-									<name>library_name</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000333" kind="InParameter" role="InParameter" guid="{b5733249-8332-4dc6-85ba-97c59fd37ac4}" relid="0x0" referred="id-0067-00000124">
-									<name>mask</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>560,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000334" kind="InParameter" role="InParameter" guid="{1dcde549-a8e2-4dda-8ee8-09b6cc9f0640}" relid="0x0" referred="id-0065-00000112">
-									<name>a_topic</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000335" kind="ReturnType" role="ReturnType" guid="{38be5418-98f9-434a-9d16-d83296d16c3c}" relid="0x0" referred="id-0065-000000e0">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000df" kind="TwowayOperation" role="TwowayOperation" guid="{bbf7de78-8d06-4ea2-9c05-f229f25c2db0}" relid="0x0" childrelidcntr="0x1">
-								<name>create_datareader</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000085" kind="InParameter" role="InParameter" guid="{a88d13a8-95b4-43a2-b336-6e9389267b0c}" relid="0x0" referred="id-0065-000000a9">
-									<name>a_listener</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>360,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000086" kind="InParameter" role="InParameter" guid="{f2e089d5-e473-457d-80fc-66d8bea290b3}" relid="0x0" referred="id-0065-0000006d">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000336" kind="InParameter" role="InParameter" guid="{31fcbf32-00a5-4877-bdfa-0381fb4a38a9}" relid="0x0" referred="id-0067-00000124">
-									<name>mask</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>460,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000337" kind="InParameter" role="InParameter" guid="{eb1c9be3-ab4b-40e3-913d-cce3d47abccb}" relid="0x0" referred="id-0065-00000112">
-									<name>a_topic</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000338" kind="ReturnType" role="ReturnType" guid="{a24c2fc7-3ec8-42e7-98ec-0437cbc8ddcd}" relid="0x0" referred="id-0065-000000e0">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<reference id="id-0067-00000339" kind="Inherits" role="Inherits" guid="{4a00ae57-4ab2-4cff-b63f-0116e1ca0432}" relid="0x11" referred="id-0065-00000116">
-								<name>Inherits</name>
-							</reference>
-						</model>
-						<model id="id-0065-000000e0" kind="Object" role="Object" guid="{fdc8bf1e-e6c9-414a-aae8-714cae79f77d}" relid="0x1a" childrelidcntr="0x14">
-							<name>DataReader</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SupportsAsync" status="meta">
-								<value>false</value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-000000e1" kind="TwowayOperation" role="TwowayOperation" guid="{0f133d49-abcd-45ba-9745-f48be5734e60}" relid="0x12" childrelidcntr="0x1">
-								<name>get_matched_publication_data</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1860</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000087" kind="InParameter" role="InParameter" guid="{b5649232-92e1-4d70-a805-8bff7b23cd18}" relid="0x0" referred="id-0067-00000029">
-									<name>publication_handle</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000088" kind="InoutParameter" role="InoutParameter" guid="{70174954-be47-435a-9205-a9490ea902c8}" relid="0x0" referred="id-0065-00000069">
-									<name>publication_data</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000033a" kind="ReturnType" role="ReturnType" guid="{1ac6aab5-ab51-4304-af34-64a5ba64ba97}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000e2" kind="TwowayOperation" role="TwowayOperation" guid="{f7385d65-dd28-4743-8666-44afdc0129b1}" relid="0x11" childrelidcntr="0x1">
-								<name>get_matched_publications</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1760</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000089" kind="InoutParameter" role="InoutParameter" guid="{20acc5d7-554a-4dec-b47f-3bedea1bd78b}" relid="0x0" referred="id-0067-0000002a">
-									<name>publication_handles</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000033b" kind="ReturnType" role="ReturnType" guid="{7d346b0a-c905-4a28-849e-fc2b86d70de4}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000e3" kind="TwowayOperation" role="TwowayOperation" guid="{be4f3287-cd07-4eb7-b6c7-b6896851149d}" relid="0x10" childrelidcntr="0x1">
-								<name>wait_for_historical_data</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1660</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000033c" kind="ReturnType" role="ReturnType" guid="{f1748b53-c1f1-4fdd-9202-bf3388f88eee}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000033d" kind="InParameter" role="InParameter" guid="{e3586331-a04c-48d6-96b6-fea0ce63a58b}" relid="0x0" referred="id-0065-0000012d">
-									<name>max_wait</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000e4" kind="TwowayOperation" role="TwowayOperation" guid="{88c6b525-6df9-413a-b781-9bc5393b5977}" relid="0xf" childrelidcntr="0x1">
-								<name>get_sample_lost_status</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1560</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000033e" kind="ReturnType" role="ReturnType" guid="{7a9a3452-d0c6-4893-8c1f-1e796ba00329}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000033f" kind="InoutParameter" role="InoutParameter" guid="{5cbe2df3-9bc6-4df7-a410-43ab45db51e9}" relid="0x0" referred="id-0065-0000012a">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000e5" kind="TwowayOperation" role="TwowayOperation" guid="{2ca658fc-8e90-4e7d-ab2d-2690f5298858}" relid="0xe" childrelidcntr="0x1">
-								<name>get_subscription_matched_status</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000340" kind="ReturnType" role="ReturnType" guid="{b3915b89-c92a-4982-9188-3484fe4784eb}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000341" kind="InoutParameter" role="InoutParameter" guid="{29026bb4-fe9d-444d-887e-ae6562a04e82}" relid="0x0" referred="id-0065-0000011f">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000e6" kind="TwowayOperation" role="TwowayOperation" guid="{8fbc76bf-a8dc-41d1-bbbd-d950354e7fad}" relid="0xd" childrelidcntr="0x1">
-								<name>get_requested_incompatible_qos_status</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000342" kind="ReturnType" role="ReturnType" guid="{17a44ee7-0ea9-401d-898d-2bdc0e33f7b2}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000343" kind="InoutParameter" role="InoutParameter" guid="{8ea78cd1-84d0-414a-9a39-280656bae196}" relid="0x0" referred="id-0065-00000121">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000e7" kind="TwowayOperation" role="TwowayOperation" guid="{e07c8a90-1bb4-415d-a61f-e84d832cde82}" relid="0xc" childrelidcntr="0x1">
-								<name>get_requested_deadline_missed_status</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000344" kind="ReturnType" role="ReturnType" guid="{3325465b-0890-48b6-9e0f-30e321a8a143}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000345" kind="InoutParameter" role="InoutParameter" guid="{b8b86714-2293-424e-b89c-638dc177aba7}" relid="0x0" referred="id-0065-00000124">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000e8" kind="TwowayOperation" role="TwowayOperation" guid="{20d01bb3-85db-4f54-91c8-e86d17646904}" relid="0xb" childrelidcntr="0x1">
-								<name>get_liveliness_changed_status</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000346" kind="ReturnType" role="ReturnType" guid="{b3ca04b8-3317-4a38-b73f-7bc61ef0b153}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000347" kind="InoutParameter" role="InoutParameter" guid="{d7f892f0-21d5-4859-9740-eeb548de58ee}" relid="0x0" referred="id-0065-00000126">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000e9" kind="TwowayOperation" role="TwowayOperation" guid="{908884b0-ec2f-4f93-9d92-35676ec68618}" relid="0xa" childrelidcntr="0x1">
-								<name>get_sample_rejected_status</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1060</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000348" kind="ReturnType" role="ReturnType" guid="{f9a9e169-86e9-4445-8806-62d620053a24}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000349" kind="InoutParameter" role="InoutParameter" guid="{83bc4080-3dd2-4fc0-ab27-1b165be5d9d7}" relid="0x0" referred="id-0065-00000128">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000ea" kind="TwowayOperation" role="TwowayOperation" guid="{8a7e2afe-5ab1-4cfe-b674-aacd0fd4c738}" relid="0x9" childrelidcntr="0x1">
-								<name>get_subscriber</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,960</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000008a" kind="ReturnType" role="ReturnType" guid="{9ce8b5ad-c5a6-4ca0-aea6-360d84a46e7b}" relid="0x0" referred="id-0065-000000ce">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000eb" kind="TwowayOperation" role="TwowayOperation" guid="{d2af0371-d9d1-428f-8bfb-802afdf9359e}" relid="0x8" childrelidcntr="0x1">
-								<name>get_topicdescription</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,860</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000034a" kind="ReturnType" role="ReturnType" guid="{a268a2b0-c39d-4647-a1ce-efabc5dcf561}" relid="0x0" referred="id-0065-00000112">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000ec" kind="TwowayOperation" role="TwowayOperation" guid="{7baa6334-727a-45eb-8bc8-acdb0ad2b540}" relid="0x7" childrelidcntr="0x1">
-								<name>get_listener</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,760</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000008b" kind="ReturnType" role="ReturnType" guid="{f502b17e-d2b7-464e-bd39-9412dd43606b}" relid="0x0" referred="id-0065-000000a9">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000ed" kind="TwowayOperation" role="TwowayOperation" guid="{850308ef-c9a2-479c-9f4c-8351d2622eee}" relid="0x6" childrelidcntr="0x1">
-								<name>set_listener</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,660</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000008c" kind="InParameter" role="InParameter" guid="{865b5c00-d3fa-49e0-911b-8693599905c5}" relid="0x0" referred="id-0065-000000a9">
-									<name>a_listener</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000034b" kind="InParameter" role="InParameter" guid="{a821d230-c7d8-4f84-b429-de12810f0dcc}" relid="0x0" referred="id-0067-00000124">
-									<name>mask</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000034c" kind="ReturnType" role="ReturnType" guid="{0c8d5a79-55fe-423d-a93d-407f1521af88}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000ee" kind="TwowayOperation" role="TwowayOperation" guid="{1226b0b4-f9a7-48e6-a60f-90d18d32fb6b}" relid="0x5" childrelidcntr="0x1">
-								<name>get_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,560</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000008d" kind="InoutParameter" role="InoutParameter" guid="{0c1e6def-dd0d-4ff9-9c39-bb4ca7affbb6}" relid="0x0" referred="id-0065-0000006d">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000034d" kind="ReturnType" role="ReturnType" guid="{88a30702-5c90-4a78-b8f9-fbb64efe5c6d}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000ef" kind="TwowayOperation" role="TwowayOperation" guid="{78a49b0e-0668-48ae-bb70-f1c739f5d501}" relid="0x4" childrelidcntr="0x1">
-								<name>set_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000008e" kind="InParameter" role="InParameter" guid="{b4c2cd01-c6c5-4803-9652-27e44b271449}" relid="0x0" referred="id-0065-0000006d">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000034e" kind="ReturnType" role="ReturnType" guid="{85583779-1ee1-42a2-b29c-d17d41a90ba5}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000f0" kind="TwowayOperation" role="TwowayOperation" guid="{bbe5c7d5-792e-4c19-839f-26a79eb0ea3a}" relid="0x3" childrelidcntr="0x1">
-								<name>delete_contained_entities</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000034f" kind="ReturnType" role="ReturnType" guid="{98589b6b-47c5-424a-8325-88b6c6b8ddf9}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000f1" kind="TwowayOperation" role="TwowayOperation" guid="{ca9b0360-b989-4013-9ce5-1cf10de5e498}" relid="0x2" childrelidcntr="0x1">
-								<name>delete_readcondition</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000008f" kind="InParameter" role="InParameter" guid="{ef05c440-391f-405a-a776-ce9f2a730c8b}" relid="0x0" referred="id-0065-00000094">
-									<name>a_condition</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000350" kind="ReturnType" role="ReturnType" guid="{282d5486-b054-42f4-8780-375153252f41}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000f2" kind="TwowayOperation" role="TwowayOperation" guid="{366fb55c-2487-452e-9b75-cb3b4f59e662}" relid="0x1" childrelidcntr="0x1">
-								<name>create_querycondition</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000090" kind="InParameter" role="InParameter" guid="{a145acb8-6446-4d02-8797-cf7254ce6ab7}" relid="0x0" referred="id-0066-00000023">
-									<name>query_expression</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>460,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000091" kind="ReturnType" role="ReturnType" guid="{52e4d1ae-1206-4481-a20f-102fa6dfea60}" relid="0x0" referred="id-0065-00000090">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000351" kind="InParameter" role="InParameter" guid="{df2c621c-a512-41e6-a5a6-d595bd8a0622}" relid="0x0" referred="id-0067-00000106">
-									<name>instance_states</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>360,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000352" kind="InParameter" role="InParameter" guid="{a606eec2-53b4-450d-8e33-fcba20eaef10}" relid="0x0" referred="id-0067-0000010c">
-									<name>view_states</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000353" kind="InParameter" role="InParameter" guid="{c1095bab-1aca-4140-b46a-e3709a6e4da3}" relid="0x0" referred="id-0067-00000111">
-									<name>sample_states</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000354" kind="InParameter" role="InParameter" guid="{b06736dc-9e54-41fc-afac-4e99bb3223b2}" relid="0x0" referred="id-0067-0000013a">
-									<name>query_parameters</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>560,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000f3" kind="TwowayOperation" role="TwowayOperation" guid="{8364c0c8-5ebe-4e07-a39b-f421840d182b}" relid="0x0" childrelidcntr="0x1">
-								<name>create_readcondition</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000092" kind="ReturnType" role="ReturnType" guid="{4f24a7ec-5131-4418-addf-5e0196357674}" relid="0x0" referred="id-0065-00000094">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000355" kind="InParameter" role="InParameter" guid="{f6fa2b6d-c993-42db-9dec-0fc8c2b72b6d}" relid="0x0" referred="id-0067-00000106">
-									<name>instance_states</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>360,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000356" kind="InParameter" role="InParameter" guid="{da663271-0415-4a50-a029-882464ba26f1}" relid="0x0" referred="id-0067-0000010c">
-									<name>view_states</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000357" kind="InParameter" role="InParameter" guid="{2510d978-6f92-4dff-abb6-17f3f5cff5f7}" relid="0x0" referred="id-0067-00000111">
-									<name>sample_states</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<reference id="id-0067-00000358" kind="Inherits" role="Inherits" guid="{862fa6bf-24a5-468a-aab3-85bb4ea3344c}" relid="0x13" referred="id-0065-00000116">
-								<name>Inherits</name>
-							</reference>
-						</model>
-						<model id="id-0065-000000f4" kind="Object" role="Object" guid="{b06f71dd-0286-4ae8-af83-414fd2f115e1}" relid="0x19" childrelidcntr="0xf">
-							<name>DataWriter</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SupportsAsync" status="meta">
-								<value>false</value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-000000f5" kind="TwowayOperation" role="TwowayOperation" guid="{3180ae88-c33d-4ad9-8eb5-e12f78ff97f4}" relid="0xd" childrelidcntr="0x1">
-								<name>get_matched_subscription_data</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000093" kind="InParameter" role="InParameter" guid="{3e4fe32d-6220-4369-9f62-bfffbf45b2f1}" relid="0x0" referred="id-0067-00000029">
-									<name>subscription_handle</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000094" kind="InoutParameter" role="InoutParameter" guid="{07f081be-d49c-453a-a416-c9104a68f015}" relid="0x0" referred="id-0065-00000068">
-									<name>subscription_data</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000359" kind="ReturnType" role="ReturnType" guid="{80b2092b-af96-4601-9823-3990c3aa0577}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000f6" kind="TwowayOperation" role="TwowayOperation" guid="{51711f31-8793-4171-ad92-715c15b342a7}" relid="0xc" childrelidcntr="0x1">
-								<name>get_matched_subscriptions</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000095" kind="InoutParameter" role="InoutParameter" guid="{376a6c69-0e21-40b6-96d9-5126c4983691}" relid="0x0" referred="id-0067-0000002a">
-									<name>subscription_handles</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000035a" kind="ReturnType" role="ReturnType" guid="{d1a4d556-9a9c-42a3-a693-a04cd53e0a6f}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000f7" kind="TwowayOperation" role="TwowayOperation" guid="{d508c7f9-ce6f-480f-981c-9ae6984b38b0}" relid="0xb" childrelidcntr="0x1">
-								<name>assert_liveliness</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000035b" kind="ReturnType" role="ReturnType" guid="{402cfdd7-adf7-44f5-aeeb-69c088ce010f}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000f8" kind="TwowayOperation" role="TwowayOperation" guid="{b7413953-2322-422b-b920-ac083e2e442f}" relid="0xa" childrelidcntr="0x1">
-								<name>get_publication_matched_status</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1060</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000035c" kind="ReturnType" role="ReturnType" guid="{5478d02f-8641-4493-801c-72f72e3d7513}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000035d" kind="InoutParameter" role="InoutParameter" guid="{3cd41ec7-c494-43d7-b9e2-f13e0e008c9d}" relid="0x0" referred="id-0065-00000120">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000f9" kind="TwowayOperation" role="TwowayOperation" guid="{0c5e9011-e170-44b4-ac2e-450219040898}" relid="0x9" childrelidcntr="0x1">
-								<name>get_offered_incompatible_qos_status</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,960</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000035e" kind="ReturnType" role="ReturnType" guid="{58d3582f-037b-4be8-aa65-f39993307301}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000035f" kind="InoutParameter" role="InoutParameter" guid="{8bbe6930-9292-46d7-a01e-60f8c6ac69fe}" relid="0x0" referred="id-0065-00000122">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000fa" kind="TwowayOperation" role="TwowayOperation" guid="{9546b16e-5df7-40fc-b2f9-5710df09a4da}" relid="0x8" childrelidcntr="0x1">
-								<name>get_offered_deadline_missed_status</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,860</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000360" kind="ReturnType" role="ReturnType" guid="{1212d1c6-f9c6-4d27-8461-e5b06ba811bd}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000361" kind="InoutParameter" role="InoutParameter" guid="{3285d48a-a6ba-4c99-880b-c0563ed2da97}" relid="0x0" referred="id-0065-00000125">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000fb" kind="TwowayOperation" role="TwowayOperation" guid="{54cadb57-5f14-41e7-9f7c-b0af1097dc14}" relid="0x7" childrelidcntr="0x1">
-								<name>get_liveliness_lost_status</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,760</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000362" kind="ReturnType" role="ReturnType" guid="{588ee479-1971-4d22-99b4-fda31545c49a}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000363" kind="InoutParameter" role="InoutParameter" guid="{07cf7dba-714b-48cf-a8c5-599ae57c3941}" relid="0x0" referred="id-0065-00000127">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000fc" kind="TwowayOperation" role="TwowayOperation" guid="{c98e7e74-8fcf-415f-bd37-c97cd4f7182f}" relid="0x6" childrelidcntr="0x1">
-								<name>wait_for_acknowledgments</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,660</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000364" kind="ReturnType" role="ReturnType" guid="{e3f34ddd-cefd-409c-8a37-080012a60cd2}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000365" kind="InParameter" role="InParameter" guid="{27a2f532-fede-463a-a5dc-f8cbb9fde023}" relid="0x0" referred="id-0065-0000012d">
-									<name>max_wait</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000fd" kind="TwowayOperation" role="TwowayOperation" guid="{11d1d9c9-263c-4cfd-a6f7-33b47dcb8736}" relid="0x5" childrelidcntr="0x1">
-								<name>get_publisher</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,560</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000096" kind="ReturnType" role="ReturnType" guid="{6a12959c-234a-46b8-89ea-923efc30c87d}" relid="0x0" referred="id-0065-000000bb">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000fe" kind="TwowayOperation" role="TwowayOperation" guid="{21be9e68-5bbb-4898-8d96-cff5e882597c}" relid="0x4" childrelidcntr="0x1">
-								<name>get_topic</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000366" kind="ReturnType" role="ReturnType" guid="{88cf4104-533a-42e2-9532-14ade65ada92}" relid="0x0" referred="id-0065-0000010c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000ff" kind="TwowayOperation" role="TwowayOperation" guid="{e960875e-f4de-4dbe-807f-96ff38898542}" relid="0x3" childrelidcntr="0x1">
-								<name>get_listener</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000097" kind="ReturnType" role="ReturnType" guid="{3f1e29b1-c420-4588-b32b-8b176bb7625c}" relid="0x0" referred="id-0065-000000b2">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000100" kind="TwowayOperation" role="TwowayOperation" guid="{d541075f-8cad-4036-869d-47204ccd947d}" relid="0x2" childrelidcntr="0x1">
-								<name>set_listener</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000098" kind="InParameter" role="InParameter" guid="{0a53e61f-3a3f-4a58-a868-df00a3ef2a13}" relid="0x0" referred="id-0065-000000b2">
-									<name>a_listener</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000367" kind="InParameter" role="InParameter" guid="{86f347c1-0283-4d58-bd0b-eb50215dfaf8}" relid="0x0" referred="id-0067-00000124">
-									<name>mask</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000368" kind="ReturnType" role="ReturnType" guid="{8aca85ab-f235-4a2d-88ca-fa93c53483d0}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000101" kind="TwowayOperation" role="TwowayOperation" guid="{1be41d0f-9bea-4f28-afe8-fd0f97234fed}" relid="0x1" childrelidcntr="0x1">
-								<name>get_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000099" kind="InoutParameter" role="InoutParameter" guid="{a260f328-f446-4d9c-9704-d68f156d3d50}" relid="0x0" referred="id-0065-0000006f">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000369" kind="ReturnType" role="ReturnType" guid="{a172233d-bf1e-4669-821d-f80937375164}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000102" kind="TwowayOperation" role="TwowayOperation" guid="{03e60fae-d7ec-4096-a3e0-308a9ac0684e}" relid="0x0" childrelidcntr="0x1">
-								<name>set_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000009a" kind="InParameter" role="InParameter" guid="{40be1f9d-d188-4b06-b3d8-d019165a2031}" relid="0x0" referred="id-0065-0000006f">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000036a" kind="ReturnType" role="ReturnType" guid="{66921089-3b93-420d-9d09-e983d0c3fccb}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<reference id="id-0067-0000036b" kind="Inherits" role="Inherits" guid="{235fc104-2ce5-4b65-af6c-7b6925c8eef2}" relid="0xe" referred="id-0065-00000116">
-								<name>Inherits</name>
-							</reference>
-						</model>
-						<model id="id-0065-00000103" kind="Object" role="Object" guid="{0f4b4aa3-418d-424e-8be1-2311617dcbf2}" relid="0x18" childrelidcntr="0x4">
-							<name>MultiTopic</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SupportsAsync" status="meta">
-								<value>false</value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-00000104" kind="TwowayOperation" role="TwowayOperation" guid="{d90029a3-0ce6-4b5a-a5f0-6b35cf55adcf}" relid="0x2" childrelidcntr="0x1">
-								<name>set_expression_parameters</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000036c" kind="InParameter" role="InParameter" guid="{34737b11-e434-4d96-a3d8-c09985a95ff7}" relid="0x0" referred="id-0067-0000013a">
-									<name>expression_parameters</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000036d" kind="ReturnType" role="ReturnType" guid="{87dd0a91-9db6-4325-b320-5aec593dd698}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000105" kind="TwowayOperation" role="TwowayOperation" guid="{614b535e-aaa3-4539-b615-6e4818bad6f0}" relid="0x1" childrelidcntr="0x1">
-								<name>get_expression_parameters</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000036e" kind="InoutParameter" role="InoutParameter" guid="{8743fd10-4d33-4f47-8e99-29a35214f615}" relid="0x0" referred="id-0067-0000013a">
-									<name>expression_parameters</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000036f" kind="ReturnType" role="ReturnType" guid="{c174c042-2ead-46b5-812e-f933a9e431f8}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000106" kind="TwowayOperation" role="TwowayOperation" guid="{98bec281-8398-46f9-af91-4f4220b9fd80}" relid="0x0" childrelidcntr="0x1">
-								<name>get_subscription_expression</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000009b" kind="ReturnType" role="ReturnType" guid="{35c1f5b1-72f9-4651-8a22-2f79041ddc4e}" relid="0x0" referred="id-0066-00000023">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<reference id="id-0067-00000370" kind="Inherits" role="Inherits" guid="{cf64023a-355c-4206-970d-78254da32458}" relid="0x3" referred="id-0065-00000112">
-								<name>Inherits</name>
-							</reference>
-						</model>
-						<model id="id-0065-00000107" kind="Object" role="Object" guid="{4519d714-cb1e-4ecb-bfad-1efad7a5148e}" relid="0x17" childrelidcntr="0x5">
-							<name>ContentFilteredTopic</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SupportsAsync" status="meta">
-								<value>false</value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-00000108" kind="TwowayOperation" role="TwowayOperation" guid="{f89c4835-6002-4e00-b33d-02ecddfe8b71}" relid="0x3" childrelidcntr="0x1">
-								<name>get_related_topic</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000371" kind="ReturnType" role="ReturnType" guid="{cc3d38e3-2e8a-4b95-9159-a408db3f4cf8}" relid="0x0" referred="id-0065-0000010c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000109" kind="TwowayOperation" role="TwowayOperation" guid="{62800662-7ae4-48a1-837e-07a83ab4d863}" relid="0x2" childrelidcntr="0x1">
-								<name>set_expression_parameters</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000372" kind="InParameter" role="InParameter" guid="{6ba3e11c-de03-49cb-98c8-0b732bbda9ef}" relid="0x0" referred="id-0067-0000013a">
-									<name>expression_parameters</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000373" kind="ReturnType" role="ReturnType" guid="{29f41b68-9d52-47ad-a07c-3c227fe54954}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000010a" kind="TwowayOperation" role="TwowayOperation" guid="{ced05860-39f6-4a16-a2ae-04fc3bb5015a}" relid="0x1" childrelidcntr="0x1">
-								<name>get_expression_parameters</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000374" kind="InoutParameter" role="InoutParameter" guid="{be1a771a-f6ad-49ca-8d37-b5ba85078272}" relid="0x0" referred="id-0067-0000013a">
-									<name>expression_parameters</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000375" kind="ReturnType" role="ReturnType" guid="{f9164bd9-18e0-4f3c-bb91-f57d1727a055}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000010b" kind="TwowayOperation" role="TwowayOperation" guid="{f74964a8-b61b-437c-a1d8-3092e88c392b}" relid="0x0" childrelidcntr="0x1">
-								<name>get_filter_expression</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000009c" kind="ReturnType" role="ReturnType" guid="{5b987a95-3d0b-418c-8ca8-f2e65ee355d8}" relid="0x0" referred="id-0066-00000023">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<reference id="id-0067-00000376" kind="Inherits" role="Inherits" guid="{6227c533-9113-45c3-bac0-550d056c3c9e}" relid="0x4" referred="id-0065-00000112">
-								<name>Inherits</name>
-							</reference>
-						</model>
-						<model id="id-0065-0000010c" kind="Object" role="Object" guid="{1513a26f-41cf-4f33-bc0d-453acf586e69}" relid="0x16" childrelidcntr="0x6">
-							<name>Topic</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SupportsAsync" status="meta">
-								<value>false</value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-0000010d" kind="TwowayOperation" role="TwowayOperation" guid="{b2ffb576-5688-4807-b934-4f44f570d63c}" relid="0x4" childrelidcntr="0x1">
-								<name>get_inconsistent_topic_status</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000377" kind="ReturnType" role="ReturnType" guid="{c36ce585-f418-43ac-8890-d430daa2c078}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000378" kind="InoutParameter" role="InoutParameter" guid="{f4c39c16-4506-45c0-9c24-c51267f78f51}" relid="0x0" referred="id-0065-0000012b">
-									<name>a_status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000010e" kind="TwowayOperation" role="TwowayOperation" guid="{9537ee1d-3a24-4448-95a7-362da20940ce}" relid="0x3" childrelidcntr="0x1">
-								<name>get_listener</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000009d" kind="ReturnType" role="ReturnType" guid="{e482526c-2533-49e4-8a38-9a899057428f}" relid="0x0" referred="id-0065-000000b9">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000010f" kind="TwowayOperation" role="TwowayOperation" guid="{9cdc4a9b-cdce-42d3-b440-b803850fa319}" relid="0x2" childrelidcntr="0x1">
-								<name>set_listener</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000009e" kind="InParameter" role="InParameter" guid="{f4c3cae0-5b5c-4238-9f7b-6ecdcf5b8b89}" relid="0x0" referred="id-0065-000000b9">
-									<name>a_listener</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000379" kind="InParameter" role="InParameter" guid="{64a2df6d-e0a0-4d65-9c33-ec2da6f921a1}" relid="0x0" referred="id-0067-00000124">
-									<name>mask</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000037a" kind="ReturnType" role="ReturnType" guid="{07bcd3c9-f216-418f-99c3-86b56c601eae}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000110" kind="TwowayOperation" role="TwowayOperation" guid="{2c8512d5-aef0-4292-8ec3-5578e9bd97c0}" relid="0x1" childrelidcntr="0x1">
-								<name>get_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000009f" kind="InoutParameter" role="InoutParameter" guid="{7e95ac3b-ad35-4e30-b741-4d2029bc1153}" relid="0x0" referred="id-0065-00000070">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000037b" kind="ReturnType" role="ReturnType" guid="{52a9e0ae-f407-4e21-b24c-0f27102fce7d}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000111" kind="TwowayOperation" role="TwowayOperation" guid="{7c385dbf-8514-4e9f-9b8d-e4036f71b57a}" relid="0x0" childrelidcntr="0x1">
-								<name>set_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000000a0" kind="InParameter" role="InParameter" guid="{d4e3d371-a644-4ed5-a1ba-8801ce340a9d}" relid="0x0" referred="id-0065-00000070">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000037c" kind="ReturnType" role="ReturnType" guid="{7e8c5d5a-8861-430d-b509-5cafd8118cc3}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<reference id="id-0067-0000037d" kind="Inherits" role="Inherits" guid="{0b7b4c65-7f41-4aee-9f49-d1cb418ed5bd}" relid="0x5" referred="id-0065-00000112">
-								<name>Inherits</name>
-							</reference>
-							<reference id="id-0067-0000037e" kind="Inherits" role="Inherits" guid="{05ff6b9f-53a9-4836-a396-33ca2d536404}" relid="0x5" referred="id-0065-00000116">
-								<name>Inherits</name>
-							</reference>
-						</model>
-						<model id="id-0065-00000112" kind="Object" role="Object" guid="{7acee41b-3015-491c-a696-bfedaa9963e1}" relid="0x15" childrelidcntr="0x3">
-							<name>TopicDescription</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SupportsAsync" status="meta">
-								<value>false</value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-00000113" kind="TwowayOperation" role="TwowayOperation" guid="{aebbe005-9458-4808-a804-68743be3b8da}" relid="0x2" childrelidcntr="0x1">
-								<name>get_participant</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000000a1" kind="ReturnType" role="ReturnType" guid="{0afcd804-47fe-4c8c-bfbd-16b81cf907b3}" relid="0x0" referred="id-0065-00000040">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000114" kind="TwowayOperation" role="TwowayOperation" guid="{ce550fbe-44e3-4d1f-8a83-36113be0bf40}" relid="0x1" childrelidcntr="0x1">
-								<name>get_name</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000000a2" kind="ReturnType" role="ReturnType" guid="{8f7e62ff-51c5-4125-9aeb-e9f40044a1f3}" relid="0x0" referred="id-0066-00000023">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000115" kind="TwowayOperation" role="TwowayOperation" guid="{47f9ef74-bb3c-44c2-a901-5b67615f168c}" relid="0x0" childrelidcntr="0x1">
-								<name>get_type_name</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000000a3" kind="ReturnType" role="ReturnType" guid="{f4b8d2dc-c32d-4112-b4a3-c7c3a3f0e69d}" relid="0x0" referred="id-0066-00000023">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-						</model>
-						<model id="id-0065-00000116" kind="Object" role="Object" guid="{3fc48051-8ef3-4e8f-a50f-aca9fa66774d}" relid="0x14" childrelidcntr="0x4">
-							<name>Entity</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SupportsAsync" status="meta">
-								<value>false</value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-00000117" kind="TwowayOperation" role="TwowayOperation" guid="{77725c52-dc35-4efe-a66c-633af883860a}" relid="0x3" childrelidcntr="0x1">
-								<name>get_instance_handle</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000000a4" kind="ReturnType" role="ReturnType" guid="{b8866053-8666-4021-815c-e623148034dd}" relid="0x0" referred="id-0067-00000029">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000118" kind="TwowayOperation" role="TwowayOperation" guid="{79239a78-be48-45db-8ae8-0592dca31355}" relid="0x2" childrelidcntr="0x1">
-								<name>get_status_changes</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000037f" kind="ReturnType" role="ReturnType" guid="{6acfc95d-65f9-4cda-a0ed-62dd3f2374c5}" relid="0x0" referred="id-0067-00000124">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000119" kind="TwowayOperation" role="TwowayOperation" guid="{4fdecb27-0c35-4eb8-8286-947bb4e0fe5b}" relid="0x1" childrelidcntr="0x1">
-								<name>get_statuscondition</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000000a5" kind="ReturnType" role="ReturnType" guid="{14c67b3e-0e96-453f-9a16-a69ed9615ffe}" relid="0x0" referred="id-0065-00000099">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000011a" kind="TwowayOperation" role="TwowayOperation" guid="{37f77090-3e8c-4924-a64a-378829cdbf7b}" relid="0x0" childrelidcntr="0x1">
-								<name>enable</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000380" kind="ReturnType" role="ReturnType" guid="{c38bcd20-1e89-4657-94cc-5efa85b9c2f8}" relid="0x0" referred="id-0067-0000013c">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-						</model>
-						<model id="id-0065-0000011b" kind="Object" role="Object" guid="{f8027bdb-3f5e-42e8-8ab5-09488c655dda}" relid="0x13" childrelidcntr="0x0">
-							<name>Listener</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SupportsAsync" status="meta">
-								<value>false</value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-						</model>
-						<model id="id-0065-0000011c" kind="Aggregate" role="Aggregate" guid="{438dc305-e48b-42eb-b104-295744b3b57b}" relid="0x12" childrelidcntr="0x1">
-							<name>ReliableWriterCacheChangedStatus</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000000a6" kind="Member" role="Member" guid="{9ac5831c-f9bd-4d4b-9963-f7e01fc0b141}" relid="0x0" referred="id-0066-0000002e">
-								<name>unacknowledged_sample_count_peak</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,560</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000a7" kind="Member" role="Member" guid="{c93d2194-f2e8-4024-8318-cae098b46aca}" relid="0x0" referred="id-0066-0000002e">
-								<name>unacknowledged_sample_count</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000381" kind="Member" role="Member" guid="{f7f2e72d-9d9d-453b-be78-79fb5f5c4744}" relid="0x0" referred="id-0065-0000011d">
-								<name>high_watermark_reliable_writer_cache</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000382" kind="Member" role="Member" guid="{928fd414-705b-4bd9-82fa-62db0e7c2a62}" relid="0x0" referred="id-0065-0000011d">
-								<name>low_watermark_reliable_writer_cache</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000383" kind="Member" role="Member" guid="{12c63f1a-c9aa-4b27-9e7d-b78a381183e5}" relid="0x0" referred="id-0065-0000011d">
-								<name>full_reliable_writer_cache</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000384" kind="Member" role="Member" guid="{254a14d0-36de-4b30-bfe5-3e6b1e383613}" relid="0x0" referred="id-0065-0000011d">
-								<name>empty_reliable_writer_cache</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-0000011d" kind="Aggregate" role="Aggregate" guid="{189a004d-1843-4899-8fa7-10a12c89fcab}" relid="0x11" childrelidcntr="0x1">
-							<name>ReliableWriterCacheEventCount</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000000a8" kind="Member" role="Member" guid="{222fb828-d06c-47d4-9db6-adaad3a0ba3a}" relid="0x0" referred="id-0066-0000002e">
-								<name>total_count_change</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000a9" kind="Member" role="Member" guid="{5eb39167-0ac1-4736-bd26-c155bcd56a85}" relid="0x0" referred="id-0066-0000002e">
-								<name>total_count</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-0000011e" kind="Aggregate" role="Aggregate" guid="{763fd3a6-9b56-4284-93d5-1544fb78a6c2}" relid="0x10" childrelidcntr="0x1">
-							<name>ReliableReaderActivityChangedStatus</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000000aa" kind="Member" role="Member" guid="{3e56fe6b-bf13-4dcc-9296-42a5b6e0f6b4}" relid="0x0" referred="id-0067-00000029">
-								<name>last_instance_handle</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000ab" kind="Member" role="Member" guid="{c39f1a60-aacc-4450-b3f2-7786959cf62b}" relid="0x0" referred="id-0066-0000002e">
-								<name>inactive_count_change</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000ac" kind="Member" role="Member" guid="{4f05037b-b956-4b09-9c52-30f891dd4849}" relid="0x0" referred="id-0066-0000002e">
-								<name>active_count_change</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000ad" kind="Member" role="Member" guid="{13945772-0a96-4cba-ae2e-e5b168075ee3}" relid="0x0" referred="id-0066-0000002e">
-								<name>inactive_count</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000ae" kind="Member" role="Member" guid="{6d73f6f0-4b2a-4d36-85e3-37f3c0ded980}" relid="0x0" referred="id-0066-0000002e">
-								<name>active_count</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-0000011f" kind="Aggregate" role="Aggregate" guid="{a3904686-138a-4a85-83ec-0d91c721912a}" relid="0xf" childrelidcntr="0x1">
-							<name>SubscriptionMatchedStatus</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000000af" kind="Member" role="Member" guid="{601d70a5-e20d-4ec6-b055-4f91a6c89285}" relid="0x0" referred="id-0067-00000029">
-								<name>last_publication_handle</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000b0" kind="Member" role="Member" guid="{dbf559ef-9da3-4929-89c9-7d3a4d9f46eb}" relid="0x0" referred="id-0066-0000002e">
-								<name>current_count_change</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000b1" kind="Member" role="Member" guid="{cb21e320-eb39-49dd-aea1-a456bea93be6}" relid="0x0" referred="id-0066-0000002e">
-								<name>current_count</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000b2" kind="Member" role="Member" guid="{7b6a054b-ecf3-4dfa-ba59-14dfbe089576}" relid="0x0" referred="id-0066-0000002e">
-								<name>total_count_change</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000b3" kind="Member" role="Member" guid="{37a0d63c-fcc2-4ec0-bd04-0445d48c120e}" relid="0x0" referred="id-0066-0000002e">
-								<name>total_count</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000120" kind="Aggregate" role="Aggregate" guid="{2c2c71b4-dddf-4f35-bfd1-50b65509ebdd}" relid="0xe" childrelidcntr="0x1">
-							<name>PublicationMatchedStatus</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000000b4" kind="Member" role="Member" guid="{74cd297f-c4c3-48b1-9ef0-784b0e30c5d6}" relid="0x0" referred="id-0067-00000029">
-								<name>last_subscription_handle</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000b5" kind="Member" role="Member" guid="{501da5cb-155e-4954-94e2-4cefec1109d6}" relid="0x0" referred="id-0066-0000002e">
-								<name>current_count_change</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000b6" kind="Member" role="Member" guid="{62c7e48b-ae99-43fa-8218-d054c79f6dcd}" relid="0x0" referred="id-0066-0000002e">
-								<name>current_count</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000b7" kind="Member" role="Member" guid="{f12a6ed0-8be3-4aaa-93b0-b1ed1cf009c2}" relid="0x0" referred="id-0066-0000002e">
-								<name>total_count_change</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000b8" kind="Member" role="Member" guid="{eb99edd9-bcd8-483a-b588-ae830734ed0e}" relid="0x0" referred="id-0066-0000002e">
-								<name>total_count</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000121" kind="Aggregate" role="Aggregate" guid="{56377413-92e4-472a-90a9-71c28539f15b}" relid="0xd" childrelidcntr="0x1">
-							<name>RequestedIncompatibleQosStatus</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000000b9" kind="Member" role="Member" guid="{2d002650-9d63-48d5-a296-bf41ee91abf2}" relid="0x0" referred="id-0066-0000002e">
-								<name>total_count_change</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000ba" kind="Member" role="Member" guid="{ec6e0a1c-f3b4-4152-8c0f-cf1688878463}" relid="0x0" referred="id-0066-0000002e">
-								<name>total_count</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000385" kind="Member" role="Member" guid="{5ed8833c-ac09-4483-9ed2-01c8b0d0a39d}" relid="0x0" referred="id-0067-0000013b">
-								<name>last_policy_id</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000386" kind="Member" role="Member" guid="{ddf0bbc1-8477-4303-b7ca-0d358c381535}" relid="0x0" referred="id-0067-00000141">
-								<name>policies</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000122" kind="Aggregate" role="Aggregate" guid="{c88e3a59-17ff-4108-875b-7535cb293858}" relid="0xc" childrelidcntr="0x1">
-							<name>OfferedIncompatibleQosStatus</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000000bb" kind="Member" role="Member" guid="{e52be414-0737-4bb8-9ee1-fe8f17cae070}" relid="0x0" referred="id-0066-0000002e">
-								<name>total_count_change</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000bc" kind="Member" role="Member" guid="{01aafd7d-429f-495a-ae47-fd37ed99122a}" relid="0x0" referred="id-0066-0000002e">
-								<name>total_count</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000387" kind="Member" role="Member" guid="{f8707b10-8d0c-4add-90ea-a4fd6422cf04}" relid="0x0" referred="id-0067-0000013b">
-								<name>last_policy_id</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000388" kind="Member" role="Member" guid="{53f69b13-a147-47af-8558-f9b6c3129f9d}" relid="0x0" referred="id-0067-00000141">
-								<name>policies</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000123" kind="Aggregate" role="Aggregate" guid="{e89fea34-133b-4b0c-bce3-7d283cd5af96}" relid="0xb" childrelidcntr="0x1">
-							<name>QosPolicyCount</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000000bd" kind="Member" role="Member" guid="{680f80fb-bf72-4d79-8897-d35a225f9368}" relid="0x0" referred="id-0066-0000002e">
-								<name>count</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000389" kind="Member" role="Member" guid="{a78c98e1-d747-463c-a1d7-af5d695e1e0e}" relid="0x0" referred="id-0067-0000013b">
-								<name>policy_id</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000124" kind="Aggregate" role="Aggregate" guid="{43d167dc-af08-4dcb-ad53-82442cb9eed9}" relid="0xa" childrelidcntr="0x1">
-							<name>RequestedDeadlineMissedStatus</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000000be" kind="Member" role="Member" guid="{2c893c41-ac52-4ddc-993f-fbee4caa1603}" relid="0x0" referred="id-0067-00000029">
-								<name>last_instance_handle</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000bf" kind="Member" role="Member" guid="{cc844a3b-91d3-45bc-8534-71a9b174f452}" relid="0x0" referred="id-0066-0000002e">
-								<name>total_count_change</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000c0" kind="Member" role="Member" guid="{659375ea-d3d6-4a59-8176-671dac36def7}" relid="0x0" referred="id-0066-0000002e">
-								<name>total_count</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000125" kind="Aggregate" role="Aggregate" guid="{ff404a73-66eb-4bb8-a94e-b11c999b79ee}" relid="0x9" childrelidcntr="0x1">
-							<name>OfferedDeadlineMissedStatus</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000000c1" kind="Member" role="Member" guid="{9e7ec43a-270d-4403-aece-470e6f84c159}" relid="0x0" referred="id-0067-00000029">
-								<name>last_instance_handle</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000c2" kind="Member" role="Member" guid="{b5e7ff62-6ad1-4ea3-a1ad-4be218ba0a75}" relid="0x0" referred="id-0066-0000002e">
-								<name>total_count_change</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000c3" kind="Member" role="Member" guid="{40978a0e-e00b-42e5-bc09-e565784b221c}" relid="0x0" referred="id-0066-0000002e">
-								<name>total_count</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000126" kind="Aggregate" role="Aggregate" guid="{9254f504-2700-4569-93f3-c03d9b61ed81}" relid="0x8" childrelidcntr="0x1">
-							<name>LivelinessChangedStatus</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000000c4" kind="Member" role="Member" guid="{4d321c30-dccc-4f1f-9f5b-666417af0d1b}" relid="0x0" referred="id-0067-00000029">
-								<name>last_publication_handle</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000c5" kind="Member" role="Member" guid="{11957c4f-c294-456e-be08-9677f4370e81}" relid="0x0" referred="id-0066-0000002e">
-								<name>not_alive_count_change</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000c6" kind="Member" role="Member" guid="{c30d7c42-fb36-4109-bad2-91bd904173bf}" relid="0x0" referred="id-0066-0000002e">
-								<name>alive_count_change</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000c7" kind="Member" role="Member" guid="{49bd96aa-52e4-4912-91ef-dda97895c3a3}" relid="0x0" referred="id-0066-0000002e">
-								<name>not_alive_count</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000c8" kind="Member" role="Member" guid="{4b14f82d-bb06-42fd-8162-787055f30596}" relid="0x0" referred="id-0066-0000002e">
-								<name>alive_count</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000127" kind="Aggregate" role="Aggregate" guid="{d0dc1307-a10d-4a65-b01f-aa1a0d6ed20a}" relid="0x7" childrelidcntr="0x1">
-							<name>LivelinessLostStatus</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000000c9" kind="Member" role="Member" guid="{3d412127-8425-48d4-8dc5-a5e739d3c7cc}" relid="0x0" referred="id-0066-0000002e">
-								<name>total_count_change</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000ca" kind="Member" role="Member" guid="{9453bb3b-d71a-425c-9c15-cc87630f5c4e}" relid="0x0" referred="id-0066-0000002e">
-								<name>total_count</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000128" kind="Aggregate" role="Aggregate" guid="{f2a168c3-4719-4d0a-b560-b46dac88b5be}" relid="0x6" childrelidcntr="0x1">
-							<name>SampleRejectedStatus</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000000cb" kind="Member" role="Member" guid="{14c0ee38-4c2f-43bf-9124-563e0abc2b0b}" relid="0x0" referred="id-0067-00000029">
-								<name>last_instance_handle</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000cc" kind="Member" role="Member" guid="{5654f0f9-6fbf-4f0e-a540-63987c47380e}" relid="0x0" referred="id-0066-0000002e">
-								<name>total_count_change</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000cd" kind="Member" role="Member" guid="{d0e39512-4e45-435e-8284-7a7233e5a757}" relid="0x0" referred="id-0066-0000002e">
-								<name>total_count</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000038a" kind="Member" role="Member" guid="{2747eab6-65b3-48f8-bdc2-07a15a0da61b}" relid="0x0" referred="id-0065-00000129">
-								<name>last_reason</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000129" kind="Enum" role="Enum" guid="{41e84200-639f-4863-9cc4-525be2ee68fe}" relid="0x5" childrelidcntr="0x4">
-							<name>SampleRejectedStatusKind</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<atom id="id-0066-00000047" kind="EnumValue" role="EnumValue" guid="{fac2dfa4-72a9-4188-8bab-56473e6dec96}" relid="0x3">
-								<name>REJECTED_BY_SAMPLES_PER_INSTANCE_LIMIT</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-							<atom id="id-0066-00000048" kind="EnumValue" role="EnumValue" guid="{2fd82d72-0967-419a-851b-512f4fb4386f}" relid="0x2">
-								<name>REJECTED_BY_SAMPLES_LIMIT</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-							<atom id="id-0066-00000049" kind="EnumValue" role="EnumValue" guid="{5c62b917-c1a5-44c4-bf43-a62d8fc5ed69}" relid="0x1">
-								<name>REJECTED_BY_INSTANCES_LIMIT</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-							<atom id="id-0066-0000004a" kind="EnumValue" role="EnumValue" guid="{1ca8c1cc-a038-44a2-8fe6-8012da8f2d3b}" relid="0x0">
-								<name>NOT_REJECTED</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-						</model>
-						<model id="id-0065-0000012a" kind="Aggregate" role="Aggregate" guid="{477c1c4d-6625-4047-ad1b-049f98ea2c66}" relid="0x4" childrelidcntr="0x1">
-							<name>SampleLostStatus</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000000ce" kind="Member" role="Member" guid="{47b47e09-61d7-49ac-a95c-3e31690da56c}" relid="0x0" referred="id-0066-0000002e">
-								<name>total_count_change</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000cf" kind="Member" role="Member" guid="{a26d5d65-edb9-4f2d-8c1a-fc92878f82c3}" relid="0x0" referred="id-0066-0000002e">
-								<name>total_count</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-0000012b" kind="Aggregate" role="Aggregate" guid="{8d4c6c71-0536-4c64-9850-775867425145}" relid="0x3" childrelidcntr="0x1">
-							<name>InconsistentTopicStatus</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000000d0" kind="Member" role="Member" guid="{81bac9f7-c709-43bd-8a49-66513505d5a7}" relid="0x0" referred="id-0066-0000002e">
-								<name>total_count_change</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000d1" kind="Member" role="Member" guid="{e184c237-4a17-48c5-8959-4114ffcbd4ad}" relid="0x0" referred="id-0066-0000002e">
-								<name>total_count</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-0000012c" kind="Aggregate" role="Aggregate" guid="{d7b87f17-977a-4be0-9091-944d13e2abef}" relid="0x2" childrelidcntr="0x1">
-							<name>Time_t</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000000d2" kind="Member" role="Member" guid="{dbaf34cb-cfac-42d4-aaed-03350e4224e3}" relid="0x0" referred="id-0066-0000002b">
-								<name>nanosec</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000d3" kind="Member" role="Member" guid="{a0263a6d-9891-4948-be8c-8b143eb61ebc}" relid="0x0" referred="id-0066-0000002e">
-								<name>sec</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-0000012d" kind="Aggregate" role="Aggregate" guid="{c25f412d-47d0-4004-82a1-97aca23f80c2}" relid="0x1" childrelidcntr="0x1">
-							<name>Duration_t</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000000d4" kind="Member" role="Member" guid="{1f465721-a2e5-4476-85c8-187f26c707b0}" relid="0x0" referred="id-0066-0000002b">
-								<name>nanosec</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000d5" kind="Member" role="Member" guid="{4249a059-015c-4349-9139-c647a1fa2d40}" relid="0x0" referred="id-0066-0000002e">
-								<name>sec</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-0000012e" kind="Aggregate" role="Aggregate" guid="{a5b03cad-ef21-4083-922b-2ab35bb09683}" relid="0x0" childrelidcntr="0x1">
-							<name>BuiltinTopicKey_t</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000000d6" kind="ArrayMember" role="ArrayMember" guid="{963202a2-5e3c-498c-b606-79df39a64df7}" relid="0x0" referred="id-0066-0000002e">
-								<name>value</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="Size">
-									<value>3</value>
-								</attribute>
-							</reference>
-						</model>
-						<reference id="id-0067-000000d7" kind="Collection" role="Collection" guid="{3d739258-d430-4f96-965e-b0712419b322}" relid="0x29" referred="id-0066-00000032">
-							<name>OctetSeq</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="bound" status="meta">
-								<value></value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000d8" kind="Constant" role="Constant" guid="{9a3f8cd3-6297-4271-bff0-5df4d6ef4e86}" relid="0x29" referred="id-0066-0000002e">
-							<name>DURABILITYSERVICE_QOS_POLICY_ID</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>22</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000d9" kind="Constant" role="Constant" guid="{6ea3d1b9-4d9c-422d-b840-dd7dbdc687c1}" relid="0x29" referred="id-0066-0000002e">
-							<name>LIFESPAN_QOS_POLICY_ID</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>21</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000da" kind="Constant" role="Constant" guid="{d4477e99-5985-489d-9609-b8f294c8a149}" relid="0x29" referred="id-0066-0000002e">
-							<name>TRANSPORTPRIORITY_QOS_POLICY_ID</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>20</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000db" kind="Constant" role="Constant" guid="{c40ef8d5-414f-463b-b547-477523ea9ac7}" relid="0x29" referred="id-0066-0000002e">
-							<name>GROUPDATA_QOS_POLICY_ID</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>19</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000dc" kind="Constant" role="Constant" guid="{a62f9110-3577-4424-8204-d55f86b042fd}" relid="0x29" referred="id-0066-0000002e">
-							<name>TOPICDATA_QOS_POLICY_ID</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>18</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000dd" kind="Constant" role="Constant" guid="{6444c694-b5c1-4f80-a898-3be27fb49b8e}" relid="0x29" referred="id-0066-0000002e">
-							<name>READERDATALIFECYCLE_QOS_POLICY_ID</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>17</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000de" kind="Constant" role="Constant" guid="{b47ce178-3002-41e4-b156-cd2859716e21}" relid="0x29" referred="id-0066-0000002e">
-							<name>WRITERDATALIFECYCLE_QOS_POLICY_ID</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>16</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000df" kind="Constant" role="Constant" guid="{22c87c9f-59d2-4208-ac27-bf4e7ed3a26a}" relid="0x29" referred="id-0066-0000002e">
-							<name>ENTITYFACTORY_QOS_POLICY_ID</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>15</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000e0" kind="Constant" role="Constant" guid="{20e774b6-a766-4159-b9a5-ddf2694e6819}" relid="0x29" referred="id-0066-0000002e">
-							<name>RESOURCELIMITS_QOS_POLICY_ID</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>14</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000e1" kind="Constant" role="Constant" guid="{fa43c7d0-05ed-41f8-8209-b62c8275fafe}" relid="0x29" referred="id-0066-0000002e">
-							<name>HISTORY_QOS_POLICY_ID</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>13</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000e2" kind="Constant" role="Constant" guid="{3d1b86b5-e1ef-44eb-a0a0-0a68b139696d}" relid="0x29" referred="id-0066-0000002e">
-							<name>DESTINATIONORDER_QOS_POLICY_ID</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>12</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000e3" kind="Constant" role="Constant" guid="{6fe0af61-4983-4eaf-a0e4-2f95c0e61ae4}" relid="0x29" referred="id-0066-0000002e">
-							<name>RELIABILITY_QOS_POLICY_ID</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>11</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000e4" kind="Constant" role="Constant" guid="{8cc80712-a728-439a-97e9-01656d5f0798}" relid="0x29" referred="id-0066-0000002e">
-							<name>PARTITION_QOS_POLICY_ID</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>10</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000e5" kind="Constant" role="Constant" guid="{6cc25795-4a61-42b0-92ee-b178311f6685}" relid="0x29" referred="id-0066-0000002e">
-							<name>TIMEBASEDFILTER_QOS_POLICY_ID</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>9</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000e6" kind="Constant" role="Constant" guid="{3e13fcc4-1376-45ec-a75d-1fe3e3a21b32}" relid="0x29" referred="id-0066-0000002e">
-							<name>LIVELINESS_QOS_POLICY_ID</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>8</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000e7" kind="Constant" role="Constant" guid="{73353c2c-8b07-47b5-b1d2-bf8488a53abd}" relid="0x29" referred="id-0066-0000002e">
-							<name>OWNERSHIPSTRENGTH_QOS_POLICY_ID</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>7</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000e8" kind="Constant" role="Constant" guid="{04c3ccdd-029a-42b9-966c-03a39649c434}" relid="0x29" referred="id-0066-0000002e">
-							<name>OWNERSHIP_QOS_POLICY_ID</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>6</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000e9" kind="Constant" role="Constant" guid="{5e24adef-84f2-4217-935c-7919ca41349f}" relid="0x29" referred="id-0066-0000002e">
-							<name>LATENCYBUDGET_QOS_POLICY_ID</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>5</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000ea" kind="Constant" role="Constant" guid="{f1351792-cb5c-420d-87ef-9a382e601e0f}" relid="0x29" referred="id-0066-0000002e">
-							<name>DEADLINE_QOS_POLICY_ID</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>4</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000eb" kind="Constant" role="Constant" guid="{5f9654da-90dd-4c64-bdf9-b54f9c22cee3}" relid="0x29" referred="id-0066-0000002e">
-							<name>PRESENTATION_QOS_POLICY_ID</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>3</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000ec" kind="Constant" role="Constant" guid="{90cff5dc-65c5-4439-87f4-9ffe7c471ec3}" relid="0x29" referred="id-0066-0000002e">
-							<name>DURABILITY_QOS_POLICY_ID</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>2</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000ed" kind="Constant" role="Constant" guid="{900018cf-41d6-4dd2-bc12-5519f7fa71af}" relid="0x29" referred="id-0066-0000002e">
-							<name>USERDATA_QOS_POLICY_ID</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>1</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000ee" kind="Constant" role="Constant" guid="{a5583f66-b4fd-41cb-bf8a-93f5a3ad592d}" relid="0x29" referred="id-0066-0000002e">
-							<name>INVALID_QOS_POLICY_ID</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>0</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000ef" kind="Constant" role="Constant" guid="{25e9c88b-ecc3-49b5-856b-ce68ed556005}" relid="0x29" referred="id-0066-00000023">
-							<name>DURABILITYSERVICE_POLICY_NAME</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>DurabilityService</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000f0" kind="Constant" role="Constant" guid="{84431488-0616-42bb-b041-ff04f04afd4a}" relid="0x29" referred="id-0066-00000023">
-							<name>LIFESPAN_QOS_POLICY_NAME</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>Lifespan</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000f1" kind="Constant" role="Constant" guid="{2f74cd87-7056-411e-8df5-ec3fde12f838}" relid="0x29" referred="id-0066-00000023">
-							<name>GROUPDATA_QOS_POLICY_NAME</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>TransportPriority</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000f2" kind="Constant" role="Constant" guid="{9e8145d3-32fd-469c-9ba2-5e1b37d28950}" relid="0x29" referred="id-0066-00000023">
-							<name>TOPICDATA_QOS_POLICY_NAME</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>TopicData</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000f3" kind="Constant" role="Constant" guid="{686913f1-452e-43e0-ab32-5586c0f0fed6}" relid="0x29" referred="id-0066-00000023">
-							<name>READERDATALIFECYCLE_QOS_POLICY_NAME</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>ReaderDataLifecycle</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000f4" kind="Constant" role="Constant" guid="{70754b78-bddf-4f69-9867-dfd284250706}" relid="0x29" referred="id-0066-00000023">
-							<name>WRITERDATALIFECYCLE_QOS_POLICY_NAME</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>WriterDataLifecycle</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000f5" kind="Constant" role="Constant" guid="{987c7a77-32a3-405e-b79c-0e4ffa535e83}" relid="0x29" referred="id-0066-00000023">
-							<name>ENTITYFACTORY_QOS_POLICY_NAME</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>EntityFactory</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000f6" kind="Constant" role="Constant" guid="{b59b8a19-89a4-4848-a844-14233b466053}" relid="0x29" referred="id-0066-00000023">
-							<name>RESOURCELIMITS_QOS_POLICY_NAME</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>ResourceLimits</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000f7" kind="Constant" role="Constant" guid="{cfd2bd41-b9af-417b-8354-94a13b32eed0}" relid="0x29" referred="id-0066-00000023">
-							<name>HISTORY_QOS_POLICY_NAME</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>History</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000f8" kind="Constant" role="Constant" guid="{70bd1a60-33c8-4a8a-9b17-38334ebddb3c}" relid="0x29" referred="id-0066-00000023">
-							<name>DESTINATIONORDER_QOS_POLICY_NAME</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>DestinationOrder</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000f9" kind="Constant" role="Constant" guid="{4b7d207f-8a78-4551-8aa7-02e74dc6f675}" relid="0x29" referred="id-0066-00000023">
-							<name>RELIABILITY_QOS_POLICY_NAME</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>Reliability</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000fa" kind="Constant" role="Constant" guid="{b354cef1-9129-4ca3-8c48-258b0d804a5e}" relid="0x29" referred="id-0066-00000023">
-							<name>PARTITION_QOS_POLICY_NAME</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>Partition</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000fb" kind="Constant" role="Constant" guid="{07e31c0c-3231-42b3-98dc-a388ae679ae2}" relid="0x29" referred="id-0066-00000023">
-							<name>TIMEBASEDFILTER_QOS_POLICY_NAME</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>TimeBasedFilter</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000fc" kind="Constant" role="Constant" guid="{2d6cb837-6e20-4313-a165-c586617b6349}" relid="0x29" referred="id-0066-00000023">
-							<name>LIVELINESS_QOS_POLICY_NAME</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>Liveliness</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000fd" kind="Constant" role="Constant" guid="{d595fd88-30b2-4603-aa2c-a57f65e22357}" relid="0x29" referred="id-0066-00000023">
-							<name>OWNERSHIPSTRENGTH_QOS_POLICY_NAME</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>OwnershipStrength</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000fe" kind="Constant" role="Constant" guid="{fc9eff9b-593b-45dd-84f6-3cdf5fc55aad}" relid="0x29" referred="id-0066-00000023">
-							<name>OWNERSHIP_QOS_POLICY_NAME</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>Ownership</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000ff" kind="Constant" role="Constant" guid="{885dfeed-2652-4be0-900f-abf60f93e712}" relid="0x29" referred="id-0066-00000023">
-							<name>LATENCYBUDGET_QOS_POLICY_NAME</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>LatencyBudget</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000100" kind="Constant" role="Constant" guid="{960a135a-7067-4dd8-9729-9a36abcce18c}" relid="0x29" referred="id-0066-00000023">
-							<name>DEADLINE_QOS_POLICY_NAME</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>Deadline</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000101" kind="Constant" role="Constant" guid="{e865df56-22dc-4c6a-be4a-b1d323b7b4e5}" relid="0x29" referred="id-0066-00000023">
-							<name>PRESENTATION_QOS_POLICY_NAME</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>Presentation</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000102" kind="Constant" role="Constant" guid="{342bfbee-3001-4713-a5ea-dddfca9b01cd}" relid="0x29" referred="id-0066-00000023">
-							<name>DURABILITY_QOS_POLICY_NAME</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>Durability</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000103" kind="Constant" role="Constant" guid="{5f2172a2-f0a7-4b0c-8e2c-05302321d0bf}" relid="0x29" referred="id-0066-00000023">
-							<name>USERDATA_QOS_POLICY_NAME</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>UserData</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000104" kind="Constant" role="Constant" guid="{e8c6d22f-e0e5-434f-a299-a99ea6cfa987}" relid="0x27" referred="id-0066-0000002b">
-							<name>NOT_ALIVE_INSTANCE_STATE</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>6</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000105" kind="Constant" role="Constant" guid="{23d82ced-1d06-4d87-8fbe-6d1670269ac4}" relid="0x27" referred="id-0066-0000002b">
-							<name>ANY_INSTANCE_STATE</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>65535</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000106" kind="Alias" role="Alias" guid="{84c665d4-308d-4399-b82c-2c563536cc8d}" relid="0x27" referred="id-0066-0000002b">
-							<name>InstanceStateMask</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000107" kind="Constant" role="Constant" guid="{e0060c39-9494-44ff-a214-2f7921141c80}" relid="0x27" referred="id-0066-0000002b">
-							<name>NOT_ALIVE_NO_WRITERS_INSTANCE_STATE</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>4</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000108" kind="Constant" role="Constant" guid="{e1c6fd6c-781c-49ff-8fde-9fabae35ea93}" relid="0x27" referred="id-0066-0000002b">
-							<name>NOT_ALIVE_DISPOSED_INSTANCE_STATE</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>2</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000109" kind="Constant" role="Constant" guid="{bcc2e328-cbeb-4833-bf50-1df5d7434084}" relid="0x27" referred="id-0066-0000002b">
-							<name>ALIVE_INSTANCE_STATE</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>1</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-0000010a" kind="Alias" role="Alias" guid="{5c99fed6-c066-42b9-86ac-4a97f68bbf97}" relid="0x27" referred="id-0066-0000002b">
-							<name>InstanceStateKind</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-0000010b" kind="Constant" role="Constant" guid="{627de5a1-3601-468b-b810-aa7558271c89}" relid="0x27" referred="id-0066-0000002b">
-							<name>ANY_VIEW_STATE</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>65535</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-0000010c" kind="Alias" role="Alias" guid="{04fab75a-961a-447b-bd69-c034886db852}" relid="0x27" referred="id-0066-0000002b">
-							<name>ViewStateMask</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-0000010d" kind="Constant" role="Constant" guid="{dc6609b3-65aa-4a80-957f-b95df0b784c8}" relid="0x27" referred="id-0066-0000002b">
-							<name>NOT_NEW_VIEW_STATE</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>2</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-0000010e" kind="Constant" role="Constant" guid="{30af0b37-bb5b-44e3-ab35-5edf7b82f369}" relid="0x27" referred="id-0066-0000002b">
-							<name>NEW_VIEW_STATE</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>1</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-0000010f" kind="Alias" role="Alias" guid="{eae82e38-e6f6-4063-b0ef-b4fa45834f07}" relid="0x27" referred="id-0066-0000002b">
-							<name>ViewStateKind</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000110" kind="Constant" role="Constant" guid="{9f6561a8-db66-4e2a-b809-e12d7d79f22e}" relid="0x27" referred="id-0066-0000002b">
-							<name>ANY_SAMPLE_STATE</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>65535</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000111" kind="Alias" role="Alias" guid="{e52a7097-2f47-4e71-8fbb-25708a6329ca}" relid="0x27" referred="id-0066-0000002b">
-							<name>SampleStateMask</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000112" kind="Constant" role="Constant" guid="{c6c1b717-4293-4ea5-8888-73283f554469}" relid="0x27" referred="id-0066-0000002b">
-							<name>NOT_READ_SAMPLE_STATE</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>2</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000113" kind="Constant" role="Constant" guid="{5c97dd5c-e30a-4e5e-982b-5941ea736d23}" relid="0x27" referred="id-0066-0000002b">
-							<name>READ_SAMPLE_STATE</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>1</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000114" kind="Alias" role="Alias" guid="{5ac8c882-8da5-48d1-8a51-8664de6b73d9}" relid="0x27" referred="id-0066-0000002b">
-							<name>SampleStateKind</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000115" kind="Constant" role="Constant" guid="{2f13072f-80e4-4fce-a346-016fc43f8e04}" relid="0x3" referred="id-0066-0000002b">
-							<name>RELIABLE_READER_ACTIVITY_CHANGED_STATUS</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>33554432</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000116" kind="Constant" role="Constant" guid="{c385cc93-bf7c-4209-8588-a989d7a6041f}" relid="0x3" referred="id-0066-0000002b">
-							<name>RELIABLE_WRITER_CACHE_CHANGED_STATUS</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>16777216</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000117" kind="Constant" role="Constant" guid="{7f72eea7-bb4f-4cb1-8ca1-05481e4fefc0}" relid="0x3" referred="id-0066-0000002b">
-							<name>SUBSCRIPTION_MATCHED_STATUS</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>16384</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000118" kind="Constant" role="Constant" guid="{15265a69-3a8f-4070-a446-f4b7cb4ff669}" relid="0x3" referred="id-0066-0000002b">
-							<name>PUBLICATION_MATCHED_STATUS</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>8192</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000119" kind="Constant" role="Constant" guid="{366574bb-4b22-43ec-b6c8-66eb202422b7}" relid="0x3" referred="id-0066-0000002b">
-							<name>LIVELINESS_CHANGED_STATUS</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>4096</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-0000011a" kind="Constant" role="Constant" guid="{d5a8e220-5da9-48c0-b855-3da19c65a356}" relid="0x3" referred="id-0066-0000002b">
-							<name>LIVELINESS_LOST_STATUS</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>2048</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-0000011b" kind="Constant" role="Constant" guid="{0921cb80-552a-47d5-88ee-210c46ba266c}" relid="0x3" referred="id-0066-0000002b">
-							<name>DATA_AVAILABLE_STATUS</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>1024</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-0000011c" kind="Constant" role="Constant" guid="{983b235d-e54e-48c8-8c2f-97a936501285}" relid="0x3" referred="id-0066-0000002b">
-							<name>DATA_ON_READERS_STATUS</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>512</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-0000011d" kind="Constant" role="Constant" guid="{2fee8117-c460-4931-abef-c01bfde44c49}" relid="0x3" referred="id-0066-0000002b">
-							<name>SAMPLE_REJECTED_STATUS</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>256</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-0000011e" kind="Constant" role="Constant" guid="{15e2b955-f873-4cad-b6c6-d94cce3f9685}" relid="0x3" referred="id-0066-0000002b">
-							<name>SAMPLE_LOST_STATUS</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>128</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-0000011f" kind="Constant" role="Constant" guid="{37e18cc5-9bbc-450b-bad4-0ff02873a212}" relid="0x3" referred="id-0066-0000002b">
-							<name>REQUESTED_INCOMPATIBLE_QOS_STATUS</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>64</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000120" kind="Constant" role="Constant" guid="{10b14bda-e0e1-4eeb-ba07-2a92fb7bfb07}" relid="0x3" referred="id-0066-0000002b">
-							<name>OFFERED_INCOMPATIBLE_QOS_STATUS</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>32</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000121" kind="Constant" role="Constant" guid="{405c4afe-1866-4a0b-8468-b66f108c2ebd}" relid="0x3" referred="id-0066-0000002b">
-							<name>REQUESTED_DEADLINE_MISSED_STATUS</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>4</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000122" kind="Constant" role="Constant" guid="{3d3d20d7-9b0d-4cc5-8ffd-1a9731baedda}" relid="0x3" referred="id-0066-0000002b">
-							<name>OFFERED_DEADLINE_MISSED_STATUS</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>2</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000123" kind="Constant" role="Constant" guid="{390c8e3d-7a61-4cb1-ab0c-97cbb3fd7a30}" relid="0x3" referred="id-0066-0000002b">
-							<name>INCONSISTENT_TOPIC_STATUS</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>1</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000124" kind="Alias" role="Alias" guid="{992d1d26-1d82-4eea-8c98-6c3dd6a5a37b}" relid="0x3" referred="id-0066-0000002b">
-							<name>StatusMask</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000125" kind="Alias" role="Alias" guid="{88ce6fba-c5b2-4c03-8df0-b6a327ebcba2}" relid="0x3" referred="id-0066-0000002b">
-							<name>StatusKind</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000126" kind="Constant" role="Constant" guid="{23a28218-3ff5-4be4-8295-01e195640efd}" relid="0x3" referred="id-0066-0000002e">
-							<name>RETCODE_ILLEGAL_OPERATION</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>12</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000127" kind="Constant" role="Constant" guid="{6de3ed4b-7ab1-4753-acfa-0f1114945d6b}" relid="0x3" referred="id-0066-0000002e">
-							<name>RETCODE_NO_DATA</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>11</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000128" kind="Constant" role="Constant" guid="{7b36e470-9dfe-4cc5-a389-b4d0e30e0a9c}" relid="0x3" referred="id-0066-0000002e">
-							<name>RETCODE_TIMEOUT</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>10</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000129" kind="Constant" role="Constant" guid="{e4ce1290-b724-4824-bb76-56ebc69ec16b}" relid="0x3" referred="id-0066-0000002e">
-							<name>RETCODE_ALREADY_DELETED</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>9</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-0000012a" kind="Constant" role="Constant" guid="{a52e4168-636b-44a7-8ba3-a11e22f9fb5a}" relid="0x3" referred="id-0066-0000002e">
-							<name>RETCODE_INCONSISTENT_POLICY</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>8</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-0000012b" kind="Constant" role="Constant" guid="{f5f7a86f-d94f-438b-96d7-b6df65ba24a8}" relid="0x3" referred="id-0066-0000002e">
-							<name>RETCODE_IMMUTABLE_POLICY</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>7</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-0000012c" kind="Constant" role="Constant" guid="{5c987617-b4c4-4971-943b-d34fd0f19847}" relid="0x3" referred="id-0066-0000002e">
-							<name>RETCODE_NOT_ENABLED</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>6</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-0000012d" kind="Constant" role="Constant" guid="{88a50b74-c817-4b16-820d-3631a6292452}" relid="0x3" referred="id-0066-0000002e">
-							<name>RETCODE_OUT_OF_RESOURCES</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>5</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-0000012e" kind="Constant" role="Constant" guid="{a8d4855f-fe24-4c25-b0de-a4beeb6f2925}" relid="0x3" referred="id-0066-0000002e">
-							<name>RETCODE_PRECONDITION_NOT_MET</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>4</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-0000012f" kind="Constant" role="Constant" guid="{f9ee7160-a3d9-4953-91bd-06a551332950}" relid="0x3" referred="id-0066-0000002e">
-							<name>RETCODE_BAD_PARAMETER</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>3</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000130" kind="Constant" role="Constant" guid="{365e41c5-8103-423a-a0f1-7bcade5636c5}" relid="0x3" referred="id-0066-0000002e">
-							<name>RETCODE_UNSUPPORTED</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>2</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000131" kind="Constant" role="Constant" guid="{86342260-9134-4388-9af2-d239afc7dcbb}" relid="0x3" referred="id-0066-0000002e">
-							<name>RETCODE_ERROR</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>1</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000132" kind="Constant" role="Constant" guid="{e7b59fbc-7ad2-4f0d-8d89-1b0318de9ed1}" relid="0x3" referred="id-0066-0000002e">
-							<name>RETCODE_OK</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>0</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000133" kind="Constant" role="Constant" guid="{2b5c66eb-aac9-4e0e-bc66-7c7e2bf3fbc4}" relid="0x3" referred="id-0066-0000002b">
-							<name>TIME_INVALID_NSEC</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>4294967295</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000134" kind="Constant" role="Constant" guid="{822e18b5-55fe-484f-a1d7-d0b77d14be1d}" relid="0x3" referred="id-0066-0000002e">
-							<name>TIME_INVALID_SEC</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>-1</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000135" kind="Constant" role="Constant" guid="{a8512bf6-3e19-47a5-8c2a-4520e2b49e9c}" relid="0x3" referred="id-0066-0000002b">
-							<name>DURATION_ZERO_NSEC</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>0</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000136" kind="Constant" role="Constant" guid="{c00cbe0c-59f9-48bb-8ecb-0cc857d64131}" relid="0x3" referred="id-0066-0000002e">
-							<name>DURATION_ZERO_SEC</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>0</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000137" kind="Constant" role="Constant" guid="{9f13e94e-e632-43e6-8845-35ae7a316311}" relid="0x3" referred="id-0066-0000002b">
-							<name>DURATION_INFINITE_NSEC</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>2147483647</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000138" kind="Constant" role="Constant" guid="{71b0533d-dfa0-4c38-aef2-bbd79356393c}" relid="0x3" referred="id-0066-0000002e">
-							<name>DURATION_INFINITE_SEC</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>2147483647</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000139" kind="Constant" role="Constant" guid="{47cb98dd-3048-4658-ba09-708cac3e5ee1}" relid="0x3" referred="id-0066-0000002e">
-							<name>LENGTH_UNLIMITED</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>-1</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-0000013a" kind="Collection" role="Collection" guid="{66e4851c-b1a2-4d81-b012-8e022cc217a6}" relid="0x1" referred="id-0066-00000023">
-							<name>StringSeq</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="bound" status="meta">
-								<value></value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-0000013b" kind="Alias" role="Alias" guid="{63648047-b328-4109-a598-d73b5c303abf}" relid="0x1" referred="id-0066-0000002e">
-							<name>QosPolicyId_t</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-0000013c" kind="Alias" role="Alias" guid="{7af80fb7-37be-44c8-b3be-fb071b3f8b98}" relid="0x1" referred="id-0066-0000002e">
-							<name>ReturnCode_t</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-0000013d" kind="Alias" role="Alias" guid="{2fe5da52-96b2-4647-8938-ebb93f03845d}" relid="0x0" referred="id-0066-0000002e">
-							<name>DomainId_t</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-0000013e" kind="Collection" role="Collection" guid="{bd00d3e2-536b-428c-9e03-cb8db4187959}" relid="0x55" referred="id-0065-00000034">
-							<name>SampleInfoSeq</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="bound" status="meta">
-								<value></value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-0000013f" kind="Collection" role="Collection" guid="{ea4d831c-0b5d-4558-86cb-a1dbecede78d}" relid="0x24" referred="id-0065-000000a4">
-							<name>ConditionSeq</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="bound" status="meta">
-								<value></value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000140" kind="Collection" role="Collection" guid="{78e9e4ce-0c16-4926-9cab-98fca7f42340}" relid="0x1d" referred="id-0065-000000e0">
-							<name>DataReaderSeq</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="bound" status="meta">
-								<value></value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000141" kind="Collection" role="Collection" guid="{6d8fb54a-e172-4f46-a98a-abc0ec6e11d8}" relid="0xc" referred="id-0065-00000123">
-							<name>QosPolicyCountSeq</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="bound" status="meta">
-								<value></value>
-							</attribute>
-						</reference>
-					</model>
-				</model>
-				<model id="id-0065-0000012f" kind="File" guid="{768e2924-97d0-49e4-b182-d580695d585b}" relid="0xb" childrelidcntr="0x1">
-					<name>dds4ccm_StateListenerControl</name>
-					<attribute kind="Path">
-						<value>connectors/dds4ccm/idl</value>
-					</attribute>
-					<attribute kind="PostPreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="PrePreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="PrefixTag" status="meta">
-						<value></value>
-					</attribute>
-					<model id="id-0065-00000130" kind="Package" role="Package" guid="{af3c382b-cfef-4c8e-872b-6784d3580514}" relid="0x0" childrelidcntr="0x1">
-						<name>CCM_DDS</name>
-						<attribute kind="PostPreprocessorDirectives" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="PrePreprocessorDirectives" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="PrefixTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="SpecifyIdTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="VersionTag" status="meta">
-							<value></value>
-						</attribute>
-						<model id="id-0065-00000131" kind="Object" role="Object" guid="{c5c6d8fb-caaa-4e16-a1d2-46560b3ba292}" relid="0x0" childrelidcntr="0x2">
-							<name>StateListenerControl</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SupportsAsync" status="meta">
-								<value>false</value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-00000132" kind="Attribute" role="Attribute" guid="{cb32524d-b746-4462-9a83-47bc84c72aba}" relid="0x0" childrelidcntr="0x1">
-								<name>is_filter_interpreted</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000142" kind="AttributeMember" role="AttributeMember" guid="{cd30567b-74f9-4aae-97a1-9f58e29f2b23}" relid="0x0" referred="id-0066-00000033">
-									<name></name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<reference id="id-0067-0000038b" kind="Inherits" role="Inherits" guid="{a73c26e3-7c5f-4e12-97e7-c1aa98be57f2}" relid="0x1" referred="id-0065-0000013a">
-								<name>Inherits</name>
-							</reference>
-						</model>
-					</model>
-				</model>
-				<model id="id-0065-00000133" kind="File" guid="{2a99f802-8c2c-4a0c-be0f-f323a7f359f2}" relid="0x9" childrelidcntr="0x1">
-					<name>dds4ccm_PortStatusListener</name>
-					<attribute kind="Path">
-						<value>connectors/dds4ccm/idl</value>
-					</attribute>
-					<attribute kind="PostPreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="PrePreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="PrefixTag" status="meta">
-						<value></value>
-					</attribute>
-					<model id="id-0065-00000134" kind="Package" role="Package" guid="{9c2ac504-a781-4b30-a43b-9820a96d033d}" relid="0x0" childrelidcntr="0x1">
-						<name>CCM_DDS</name>
-						<attribute kind="PostPreprocessorDirectives" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="PrePreprocessorDirectives" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="PrefixTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="SpecifyIdTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="VersionTag" status="meta">
-							<value></value>
-						</attribute>
-						<model id="id-0065-00000135" kind="Object" role="Object" guid="{846970af-1676-4855-a75f-38bea43c18b4}" relid="0x0" childrelidcntr="0x2">
-							<name>PortStatusListener</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SupportsAsync" status="meta">
-								<value>false</value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-00000136" kind="TwowayOperation" role="TwowayOperation" guid="{64478210-d18a-471b-be3f-3ace98685c27}" relid="0x1" childrelidcntr="0x1">
-								<name>on_sample_lost</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000143" kind="InParameter" role="InParameter" guid="{2a95c9d6-ab99-4f97-a742-55189ecfbb55}" relid="0x0" referred="id-0065-0000012a">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000144" kind="InParameter" role="InParameter" guid="{04b72909-7452-4933-b6cd-b90efe528b3e}" relid="0x0" referred="id-0065-000000e0">
-									<name>the_reader</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000137" kind="TwowayOperation" role="TwowayOperation" guid="{e2aba88a-e59a-4a1d-a740-caf533037a94}" relid="0x0" childrelidcntr="0x1">
-								<name>on_requested_deadline_missed</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000145" kind="InParameter" role="InParameter" guid="{8b892cb7-97f5-4e8e-bd50-f9f3abf4aa33}" relid="0x0" referred="id-0065-00000124">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000146" kind="InParameter" role="InParameter" guid="{495fcba1-fa62-49a3-9d80-9f186311b9b3}" relid="0x0" referred="id-0065-000000e0">
-									<name>the_reader</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-						</model>
-					</model>
-				</model>
-				<model id="id-0065-00000138" kind="File" guid="{4f3adb2a-cc9a-4398-8540-a53bd472e5df}" relid="0x7" childrelidcntr="0x1">
-					<name>dds4ccm_DataListenerControl</name>
-					<attribute kind="Path">
-						<value>connectors/dds4ccm/idl</value>
-					</attribute>
-					<attribute kind="PostPreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="PrePreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="PrefixTag" status="meta">
-						<value></value>
-					</attribute>
-					<model id="id-0065-00000139" kind="Package" role="Package" guid="{dff4a2e0-25d9-412d-b2b7-82ceebb363e4}" relid="0x0" childrelidcntr="0x1">
-						<name>CCM_DDS</name>
-						<attribute kind="PostPreprocessorDirectives" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="PrePreprocessorDirectives" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="PrefixTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="SpecifyIdTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="VersionTag" status="meta">
-							<value></value>
-						</attribute>
-						<model id="id-0065-0000013a" kind="Object" role="Object" guid="{090ff77c-89cb-41d6-a927-b6aa4bc482b6}" relid="0x0" childrelidcntr="0x2">
-							<name>DataListenerControl</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SupportsAsync" status="meta">
-								<value>false</value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-0000013b" kind="Attribute" role="Attribute" guid="{c6536dfa-cc90-4e97-98ac-174c6892deab}" relid="0x1" childrelidcntr="0x1">
-								<name>max_delivered_data</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000038c" kind="AttributeMember" role="AttributeMember" guid="{f9fc391e-7816-4e7d-b8e3-2b463077dbc3}" relid="0x0" referred="id-0067-0000015f">
-									<name></name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000013c" kind="Attribute" role="Attribute" guid="{7b1a3436-61c1-48d3-a3f1-536487457d81}" relid="0x0" childrelidcntr="0x1">
-								<name>mode</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000038d" kind="AttributeMember" role="AttributeMember" guid="{9f8f84d9-8d4e-4739-959a-8a4c61ab4387}" relid="0x0" referred="id-0065-00000156">
-									<name></name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-						</model>
-					</model>
-				</model>
-				<model id="id-0065-0000013d" kind="File" guid="{f6ec2990-716f-4726-bd1a-49dce16c903e}" relid="0x5" childrelidcntr="0x1">
-					<name>dds4ccm_ConnectorStatusListener</name>
-					<attribute kind="Path">
-						<value>connectors/dds4ccm/idl</value>
-					</attribute>
-					<attribute kind="PostPreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="PrePreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="PrefixTag" status="meta">
-						<value></value>
-					</attribute>
-					<model id="id-0065-0000013e" kind="Package" role="Package" guid="{633dfb10-2b6b-45bb-8d08-638ab70494bd}" relid="0x0" childrelidcntr="0x1">
-						<name>CCM_DDS</name>
-						<attribute kind="PostPreprocessorDirectives" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="PrePreprocessorDirectives" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="PrefixTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="SpecifyIdTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="VersionTag" status="meta">
-							<value></value>
-						</attribute>
-						<model id="id-0065-0000013f" kind="Object" role="Object" guid="{da8dd74e-a925-4f3e-a1fa-cac45ace8b9d}" relid="0x0" childrelidcntr="0x6">
-							<name>ConnectorStatusListener</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SupportsAsync" status="meta">
-								<value>false</value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-00000140" kind="TwowayOperation" role="TwowayOperation" guid="{ae770844-b851-4227-94ad-e215a124851e}" relid="0x5" childrelidcntr="0x1">
-								<name>on_unexpected_status</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,560</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000147" kind="InParameter" role="InParameter" guid="{957ae072-6620-4b92-91aa-18ad29d341a3}" relid="0x0" referred="id-0067-00000125">
-									<name>status_kind</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000148" kind="InParameter" role="InParameter" guid="{3348c215-8940-4e9e-980f-5cc34bede3b1}" relid="0x0" referred="id-0065-00000116">
-									<name>the_entity</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000141" kind="TwowayOperation" role="TwowayOperation" guid="{e693cdd9-32f6-426f-86b8-b28388d10d68}" relid="0x4" childrelidcntr="0x1">
-								<name>on_offered_incompatible_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000149" kind="InParameter" role="InParameter" guid="{538bd74f-1d95-4dc5-8e5c-17151a92b55e}" relid="0x0" referred="id-0065-00000122">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000014a" kind="InParameter" role="InParameter" guid="{3d43c29a-58bd-42c4-ba24-f57332333d20}" relid="0x0" referred="id-0065-000000f4">
-									<name>the_writer</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000142" kind="TwowayOperation" role="TwowayOperation" guid="{7d1c8df9-94c6-4eef-aa87-94732c3629e8}" relid="0x3" childrelidcntr="0x1">
-								<name>on_offered_deadline_missed</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000014b" kind="InParameter" role="InParameter" guid="{75bd9949-8a22-49a5-8455-4d68126de471}" relid="0x0" referred="id-0065-00000125">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000014c" kind="InParameter" role="InParameter" guid="{42a71a0c-224d-434a-b72a-3bda842434c9}" relid="0x0" referred="id-0065-000000f4">
-									<name>the_writer</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000143" kind="TwowayOperation" role="TwowayOperation" guid="{258f94e3-04b2-4921-87b3-413d9ab90951}" relid="0x2" childrelidcntr="0x1">
-								<name>on_sample_rejected</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000014d" kind="InParameter" role="InParameter" guid="{5a4bd54e-b7b6-4f90-9e81-c2586c53e138}" relid="0x0" referred="id-0065-00000128">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000014e" kind="InParameter" role="InParameter" guid="{79345a69-2280-4a78-9056-afe5ad2416a5}" relid="0x0" referred="id-0065-000000e0">
-									<name>the_reader</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000144" kind="TwowayOperation" role="TwowayOperation" guid="{82972328-0c93-4fb1-ad63-4e57650477da}" relid="0x1" childrelidcntr="0x1">
-								<name>on_requested_incompatible_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000014f" kind="InParameter" role="InParameter" guid="{f5f6cd3b-d3c6-47ea-b77c-9ed5e65d28fe}" relid="0x0" referred="id-0065-00000121">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000150" kind="InParameter" role="InParameter" guid="{1c10e95c-e083-470e-be27-e77b278f0824}" relid="0x0" referred="id-0065-000000e0">
-									<name>the_reader</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000145" kind="TwowayOperation" role="TwowayOperation" guid="{7882cc5e-046d-4ae3-b649-6a2cfbf01fee}" relid="0x0" childrelidcntr="0x1">
-								<name>on_inconsistent_topic</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000151" kind="InParameter" role="InParameter" guid="{1d815fc2-2786-4e43-9ff3-a28d51deb9c1}" relid="0x0" referred="id-0065-0000012b">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000152" kind="InParameter" role="InParameter" guid="{29b91f00-b74a-4af2-aa2d-42926cff9580}" relid="0x0" referred="id-0065-0000010c">
-									<name>the_topic</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-						</model>
-					</model>
-				</model>
-				<model id="id-0065-00000146" kind="File" guid="{829aaff6-dcd8-4f11-827b-7d212e9a904b}" relid="0x3" childrelidcntr="0x1">
-					<name>dds4ccm_Connector</name>
-					<attribute kind="Path">
-						<value>connectors/dds4ccm/idl</value>
-					</attribute>
-					<attribute kind="PostPreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="PrePreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="PrefixTag" status="meta">
-						<value></value>
-					</attribute>
-					<model id="id-0065-00000147" kind="Package" role="Package" guid="{cd22e550-5212-470e-a781-7bb0ff31444f}" relid="0x0" childrelidcntr="0x2">
-						<name>CCM_DDS</name>
-						<attribute kind="PostPreprocessorDirectives" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="PrePreprocessorDirectives" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="PrefixTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="SpecifyIdTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="VersionTag" status="meta">
-							<value></value>
-						</attribute>
-						<model id="id-0065-00000148" kind="ConnectorObject" role="ConnectorObject" guid="{929df5a6-7abe-4e80-854e-d7eb0e88a1a1}" relid="0x1" childrelidcntr="0x2">
-							<name>DDS_TopicBase</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="UUID">
-								<value>C61798A6-7C26-11DF-8003-000C2958D27B</value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-00000149" kind="Attribute" role="Attribute" guid="{c8f93226-f80b-4012-af94-2bf47910895c}" relid="0x1" childrelidcntr="0x1">
-								<name>key_fields</name>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000153" kind="AttributeMember" role="AttributeMember" guid="{bbb0cd1e-b990-4ae0-b1a0-625c26dfb166}" relid="0x0" referred="id-0067-0000013a">
-									<name></name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000038e" kind="SetException" role="SetException" guid="{79cecbcd-2c05-49ff-a801-658b232ceecd}" relid="0x0" referred="id-0065-00000152">
-									<name></name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000014a" kind="Attribute" role="Attribute" guid="{ad843b0c-e8eb-4ed6-b132-436f53ff200b}" relid="0x0" childrelidcntr="0x1">
-								<name>topic_name</name>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000154" kind="AttributeMember" role="AttributeMember" guid="{d6f8da99-e195-4c2f-bebf-8a3ddeb926ac}" relid="0x0" referred="id-0066-00000023">
-									<name></name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000038f" kind="SetException" role="SetException" guid="{a5efd038-e5a5-49b1-8ea2-8db89abe9df8}" relid="0x0" referred="id-0065-00000152">
-									<name></name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-						</model>
-						<model id="id-0065-0000014b" kind="ConnectorObject" role="ConnectorObject" guid="{b29cc787-8b26-4d1b-9b29-d80ec94e1613}" relid="0x0" childrelidcntr="0x2">
-							<name>DDS_Base</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="UUID">
-								<value>C61798A6-7C26-11DF-8002-000C2958D27B</value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-0000014c" kind="Attribute" role="Attribute" guid="{41269dd5-2c55-459c-9016-7fed7a1052fb}" relid="0x1" childrelidcntr="0x1">
-								<name>qos_profile</name>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000155" kind="AttributeMember" role="AttributeMember" guid="{70efda93-3154-472d-8f61-921da307c5b9}" relid="0x0" referred="id-0066-00000023">
-									<name></name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000390" kind="SetException" role="SetException" guid="{e2f5b0fc-ccb0-4ad8-9844-98230252382c}" relid="0x0" referred="id-0065-00000152">
-									<name></name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000014d" kind="Attribute" role="Attribute" guid="{93fde27e-0d57-4d0e-8200-f5236f0e8dd4}" relid="0x0" childrelidcntr="0x1">
-								<name>domain_id</name>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000156" kind="AttributeMember" role="AttributeMember" guid="{0118c12e-990e-4960-a783-f07bf3baa3b3}" relid="0x0" referred="id-0067-0000013d">
-									<name></name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000391" kind="SetException" role="SetException" guid="{b3efb2e0-0e56-4b69-a959-99b4768435a8}" relid="0x0" referred="id-0065-00000152">
-									<name></name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<reference id="id-0067-00000157" kind="RequiredRequestPort" role="RequiredRequestPort" guid="{9eaa85f3-f263-4b31-9982-c0f9092ea95c}" relid="0x0" referred="id-0065-0000013f">
-								<name>error_listener</name>
-								<attribute kind="AsyncCommunication" status="meta">
-									<value>false</value>
-								</attribute>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="exclusiveProvider" status="meta">
-									<value>false</value>
-								</attribute>
-								<attribute kind="exclusiveUser" status="meta">
-									<value>false</value>
-								</attribute>
-								<attribute kind="multiple_connections">
-									<value>true</value>
-								</attribute>
-								<attribute kind="optional" status="meta">
-									<value>false</value>
-								</attribute>
-							</reference>
-						</model>
-					</model>
-				</model>
-				<model id="id-0065-0000014e" kind="File" guid="{efa14826-304a-4575-8733-94aaa271dfd6}" relid="0x1" childrelidcntr="0x1">
-					<name>dds4ccm_Base</name>
-					<attribute kind="Path">
-						<value>connectors/dds4ccm/idl</value>
-					</attribute>
-					<attribute kind="PostPreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="PrePreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="PrefixTag" status="meta">
-						<value></value>
-					</attribute>
-					<model id="id-0065-0000014f" kind="Package" role="Package" guid="{4591f46e-5f2b-484f-a218-955942cb37ea}" relid="0x0" childrelidcntr="0xa">
-						<name>CCM_DDS</name>
-						<attribute kind="PostPreprocessorDirectives" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="PrePreprocessorDirectives" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="PrefixTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="SpecifyIdTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="VersionTag" status="meta">
-							<value></value>
-						</attribute>
-						<model id="id-0065-00000150" kind="Object" role="Object" guid="{db1f229a-c7d8-4b0a-8ba5-18dd8c151409}" relid="0x9" childrelidcntr="0x1">
-							<name>ContentFilterSetting</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SupportsAsync" status="meta">
-								<value>false</value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-00000151" kind="TwowayOperation" role="TwowayOperation" guid="{0f5be5ce-59fc-4b43-9379-00bfa3b1c732}" relid="0x0" childrelidcntr="0x1">
-								<name>set_filter_parameters</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000158" kind="InParameter" role="InParameter" guid="{b7f67965-829b-430e-8998-f274bff8993b}" relid="0x0" referred="id-0067-0000013a">
-									<name>parameters</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000392" kind="ExceptionRef" role="ExceptionRef" guid="{fa19a987-a133-40e6-b6f0-47ec09d31075}" relid="0x0" referred="id-0065-00000153">
-									<name></name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-						</model>
-						<model id="id-0065-00000152" kind="Exception" role="Exception" guid="{dab7a9cd-b69c-4cf3-ac7e-599d6ecb5ff1}" relid="0x8" childrelidcntr="0x0">
-							<name>NonChangeable</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-						</model>
-						<model id="id-0065-00000153" kind="Exception" role="Exception" guid="{2acfcd50-3fae-47a3-8fef-cb659f920f4a}" relid="0x7" childrelidcntr="0x1">
-							<name>InternalError</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-00000159" kind="Member" role="Member" guid="{4730d586-61aa-4f85-b670-e8271bfd2931}" relid="0x0" referred="id-0067-0000013c">
-								<name>error_code</name>
-							</reference>
-							<reference id="id-0067-00000393" kind="Member" role="Member" guid="{f78229fc-61d5-4fd3-a9a2-5a9cba818528}" relid="0x0" referred="id-0067-0000015f">
-								<name>index</name>
-							</reference>
-						</model>
-						<model id="id-0065-00000154" kind="Exception" role="Exception" guid="{8b15e311-1ddc-4f0f-9542-3532990fe642}" relid="0x6" childrelidcntr="0x1">
-							<name>NonExistent</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-00000394" kind="Member" role="Member" guid="{73592d82-e3ff-4933-983a-d97298f6de1c}" relid="0x0" referred="id-0067-00000161">
-								<name>indexes</name>
-							</reference>
-						</model>
-						<model id="id-0065-00000155" kind="Exception" role="Exception" guid="{3efaef2a-246b-4597-8332-e21a55903433}" relid="0x5" childrelidcntr="0x1">
-							<name>AlreadyCreated</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-00000395" kind="Member" role="Member" guid="{451b5926-5f07-4742-ab1e-75050787ab46}" relid="0x0" referred="id-0067-00000161">
-								<name>indexes</name>
-							</reference>
-						</model>
-						<model id="id-0065-00000156" kind="Enum" role="Enum" guid="{65805011-4422-4420-a30d-c077f21e0757}" relid="0x4" childrelidcntr="0x3">
-							<name>ListenerMode</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<atom id="id-0066-0000004b" kind="EnumValue" role="EnumValue" guid="{86aa0e66-ffc2-4fc1-a48d-19bb13bdb106}" relid="0x2">
-								<name>MANY_BY_MANY</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-							<atom id="id-0066-0000004c" kind="EnumValue" role="EnumValue" guid="{e0d9ffaf-1236-40bd-96d6-6378d3c1c763}" relid="0x1">
-								<name>ONE_BY_ONE</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-							<atom id="id-0066-0000004d" kind="EnumValue" role="EnumValue" guid="{9f0cb3a2-eaf5-4e36-a2c2-3cddd6efba01}" relid="0x0">
-								<name>NOT_ENABLED</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-						</model>
-						<model id="id-0065-00000157" kind="Aggregate" role="Aggregate" guid="{0361de1d-4c0e-4a9d-a52b-a1ce50fb2994}" relid="0x3" childrelidcntr="0x1">
-							<name>QueryFilter</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-0000015a" kind="Member" role="Member" guid="{fae65ed4-c5fc-42b8-a3bc-09fb7b14c4f1}" relid="0x0" referred="id-0067-0000013a">
-								<name>parameters</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000015b" kind="Member" role="Member" guid="{ec7a4b7b-1534-4911-927a-856d030d3486}" relid="0x0" referred="id-0066-00000023">
-								<name>expression</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000158" kind="Aggregate" role="Aggregate" guid="{f0154a87-3f3a-40e5-86ca-9b2391830453}" relid="0x2" childrelidcntr="0x1">
-							<name>ReadInfo</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-0000015c" kind="Member" role="Member" guid="{df90510b-d2e5-4813-95a8-8bb0d03fb27f}" relid="0x0" referred="id-0065-0000012c">
-								<name>source_timestamp</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000015d" kind="Member" role="Member" guid="{6c2866c9-c87c-4407-ab26-4766db5a4901}" relid="0x0" referred="id-0067-00000029">
-								<name>instance_handle</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000396" kind="Member" role="Member" guid="{a5d48ef3-faf3-45b2-ba9e-53dc324eab36}" relid="0x0" referred="id-0065-00000159">
-								<name>instance_status</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000397" kind="Member" role="Member" guid="{d9028ef2-afdc-4373-8888-a8b497a5c11a}" relid="0x0" referred="id-0065-0000015a">
-								<name>access_status</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000159" kind="Enum" role="Enum" guid="{dea334c6-b3b5-4676-97a4-897ea6fe6f79}" relid="0x1" childrelidcntr="0x5">
-							<name>InstanceStatus</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<atom id="id-0066-0000004e" kind="EnumValue" role="EnumValue" guid="{096fd7f6-203b-4001-ac47-8e5beafc141c}" relid="0x4">
-								<name>INSTANCE_DELETED</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-							<atom id="id-0066-0000004f" kind="EnumValue" role="EnumValue" guid="{a683b070-f079-4d71-a397-02f96217692d}" relid="0x3">
-								<name>INSTANCE_FILTERED_OUT</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-							<atom id="id-0066-00000050" kind="EnumValue" role="EnumValue" guid="{ae72f4b8-1e2a-4dbe-af7a-63d6ea4db75d}" relid="0x2">
-								<name>INSTANCE_UPDATED</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-							<atom id="id-0066-00000051" kind="EnumValue" role="EnumValue" guid="{3fe5e3c0-9b4c-4120-95b8-1a04abedbb8f}" relid="0x1">
-								<name>INSTANCE_FILTERED_IN</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-							<atom id="id-0066-00000052" kind="EnumValue" role="EnumValue" guid="{8b04876e-8fed-4a1e-ac7a-416ccd590f7a}" relid="0x0">
-								<name>INSTANCE_CREATED</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-						</model>
-						<model id="id-0065-0000015a" kind="Enum" role="Enum" guid="{8e40374e-5636-44e4-b1c5-8b9582a20307}" relid="0x0" childrelidcntr="0x2">
-							<name>AccessStatus</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<atom id="id-0066-00000053" kind="EnumValue" role="EnumValue" guid="{b3796768-7a7a-4e15-83f0-f7771da88f6b}" relid="0x1">
-								<name>ALREADY_SEEN</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-							<atom id="id-0066-00000054" kind="EnumValue" role="EnumValue" guid="{56069827-6a1a-40dc-be8d-25077dd54f1d}" relid="0x0">
-								<name>FRESH_INFO</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-						</model>
-						<reference id="id-0067-0000015e" kind="Constant" role="Constant" guid="{91bde20c-4789-4717-9d53-80b7beb0491a}" relid="0x0" referred="id-0066-0000002b">
-							<name>UNLIMITED</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>0</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-0000015f" kind="Alias" role="Alias" guid="{ebc3aec5-b0aa-4ea9-9a6f-63fb408599e7}" relid="0x0" referred="id-0066-0000002b">
-							<name>DataNumber_t</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000160" kind="Collection" role="Collection" guid="{18679629-7b2e-42c7-ba12-ee4d4f0c3111}" relid="0x3" referred="id-0065-00000158">
-							<name>ReadInfoSeq</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="bound" status="meta">
-								<value></value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000161" kind="Collection" role="Collection" guid="{8becee46-56cf-4276-9592-0da89f0c64b0}" relid="0x0" referred="id-0067-0000015f">
-							<name>DataNumberSeq</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="bound" status="meta">
-								<value></value>
-							</attribute>
-						</reference>
-					</model>
-				</model>
-				<model id="id-0065-0000015b" kind="File" guid="{c15ffee3-4e42-4415-b8d3-2c6eb6f273bb}" relid="0x0" childrelidcntr="0x1">
-					<name>ccm_dds</name>
-					<attribute kind="Path">
-						<value>connectors/dds4ccm/idl</value>
-					</attribute>
-					<attribute kind="PostPreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="PrePreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="PrefixTag" status="meta">
-						<value></value>
-					</attribute>
-					<model id="id-0065-0000015c" kind="Package" role="Package" guid="{34a2a80d-dd8a-4ebf-9e5d-3eedeef2764d}" relid="0x0" childrelidcntr="0x1">
-						<name>CCM_DDS</name>
-						<attribute kind="PostPreprocessorDirectives" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="PrePreprocessorDirectives" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="PrefixTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="SpecifyIdTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="VersionTag" status="meta">
-							<value></value>
-						</attribute>
-						<model id="id-0065-0000015d" kind="Package" role="Package" guid="{973858e2-a3a5-47b4-84b6-7dccd553eafe}" relid="0x0" childrelidcntr="0x10">
-							<name>Typed</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-0000015e" kind="ConnectorObject" role="ConnectorObject" guid="{a748a69a-9c98-4a2e-ae64-c98b9f684f0d}" relid="0xf" childrelidcntr="0x1">
-								<name>DDS_Event</name>
-								<attribute kind="PostPreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="PrePreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="UUID">
-									<value>C61798A6-7C26-11DF-8001-000C2958D27B</value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000398" kind="MirrorPort" role="MirrorPort" guid="{ac9efffe-2746-401f-8e5f-d87a31348854}" relid="0x0" referred="id-0065-00000162">
-									<name>push_consumer</name>
-								</reference>
-								<reference id="id-0067-00000399" kind="MirrorPort" role="MirrorPort" guid="{a9eda479-9be6-4d13-bfe1-d48d8793a55b}" relid="0x0" referred="id-0065-00000164">
-									<name>pull_consumer</name>
-								</reference>
-								<reference id="id-0067-0000039a" kind="MirrorPort" role="MirrorPort" guid="{97bf7da7-c669-4858-84bd-a5e0d55f03c9}" relid="0x0" referred="id-0065-00000169">
-									<name>supplier</name>
-								</reference>
-							</model>
-							<model id="id-0065-0000015f" kind="ConnectorObject" role="ConnectorObject" guid="{9ba0875d-02f6-46a4-b15c-0ec933b459e0}" relid="0xe" childrelidcntr="0x1">
-								<name>DDS_State</name>
-								<attribute kind="PostPreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="PrePreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="UUID">
-									<value>C61798A6-7C26-11DF-8000-000C2958D27B</value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000039b" kind="MirrorPort" role="MirrorPort" guid="{85a0a8e1-d5b2-4c4f-8363-ae8abcd39b00}" relid="0x0" referred="id-0065-00000160">
-									<name>push_state_observer</name>
-								</reference>
-								<reference id="id-0067-0000039c" kind="MirrorPort" role="MirrorPort" guid="{fec38694-fe28-4669-be83-d7142ece8d92}" relid="0x0" referred="id-0065-00000162">
-									<name>push_observer</name>
-								</reference>
-								<reference id="id-0067-0000039d" kind="MirrorPort" role="MirrorPort" guid="{f8de4b83-cc7c-45f7-aa09-c444b91f1945}" relid="0x0" referred="id-0065-00000164">
-									<name>pull_observer</name>
-								</reference>
-								<reference id="id-0067-0000039e" kind="MirrorPort" role="MirrorPort" guid="{e09832c6-f7fb-436c-91fb-b89d677a9261}" relid="0x0" referred="id-0065-00000166">
-									<name>passive_observer</name>
-								</reference>
-								<reference id="id-0067-0000039f" kind="MirrorPort" role="MirrorPort" guid="{f37bfb4b-b88a-4815-94f7-8cd699d13e8c}" relid="0x0" referred="id-0065-00000168">
-									<name>observable</name>
-								</reference>
-							</model>
-							<model id="id-0065-00000160" kind="PortType" role="PortType" guid="{824566cf-5c31-4bc4-b7f0-08f3e194df43}" relid="0xd" childrelidcntr="0x2">
-								<name>DDS_StateListen</name>
-								<attribute kind="PostPreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="PrePreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<model id="id-0065-00000161" kind="Attribute" role="Attribute" guid="{8037acb0-12ad-40b1-94bb-69c1bee6b6b9}" relid="0x0" childrelidcntr="0x1">
-									<name>filter</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,560</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-00000162" kind="SetException" role="SetException" guid="{eed9c788-7b5a-4c1f-9795-21704f2d8d96}" relid="0x0" referred="id-0065-00000152">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>160,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-00000163" kind="AttributeMember" role="AttributeMember" guid="{6b8ae559-da9a-4a03-95b7-fcc3996051dc}" relid="0x0" referred="id-0065-00000157">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-								<reference id="id-0067-00000164" kind="RequiredRequestPort" role="RequiredRequestPort" guid="{b462f37c-4f66-4b08-84a6-59c2abe46a4a}" relid="0x1" referred="id-0065-00000150">
-									<name>filter_config</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,660</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="AsyncCommunication" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="exclusiveProvider" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="exclusiveUser" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="multiple_connections">
-										<value>true</value>
-									</attribute>
-									<attribute kind="optional" status="meta">
-										<value>false</value>
-									</attribute>
-								</reference>
-								<reference id="id-0067-00000165" kind="ProvidedRequestPort" role="ProvidedRequestPort" guid="{6b1da435-fdcc-4081-a454-a6e227c098b3}" relid="0x0" referred="id-0065-00000135">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,460</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="exclusiveProvider" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="exclusiveUser" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="optional" status="meta">
-										<value>false</value>
-									</attribute>
-								</reference>
-								<reference id="id-0067-00000166" kind="RequiredRequestPort" role="RequiredRequestPort" guid="{e3f7233f-8283-4539-9f9d-df4eac67aafe}" relid="0x0" referred="id-0065-000000e0">
-									<name>dds_entity</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,360</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="AsyncCommunication" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="exclusiveProvider" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="exclusiveUser" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="multiple_connections">
-										<value>true</value>
-									</attribute>
-									<attribute kind="optional" status="meta">
-										<value>false</value>
-									</attribute>
-								</reference>
-								<reference id="id-0067-00000167" kind="RequiredRequestPort" role="RequiredRequestPort" guid="{11b899d0-7064-4e27-b20e-b8a5e24f3548}" relid="0x0" referred="id-0065-00000131">
-									<name>data_control</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,160</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="AsyncCommunication" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="exclusiveProvider" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="exclusiveUser" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="multiple_connections">
-										<value>true</value>
-									</attribute>
-									<attribute kind="optional" status="meta">
-										<value>false</value>
-									</attribute>
-								</reference>
-								<reference id="id-0067-000003a0" kind="ProvidedRequestPort" role="ProvidedRequestPort" guid="{b7888fd0-b0c0-4ca4-8013-70d865278be2}" relid="0x0" referred="id-0065-0000016a">
-									<name>data_listener</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,260</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="exclusiveProvider" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="exclusiveUser" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="optional" status="meta">
-										<value>false</value>
-									</attribute>
-								</reference>
-								<reference id="id-0067-000003a1" kind="RequiredRequestPort" role="RequiredRequestPort" guid="{c6ee3ff0-c5b4-4ef5-990a-4c47dcc5b655}" relid="0x0" referred="id-0065-00000177">
-									<name>data</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="AsyncCommunication" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="exclusiveProvider" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="exclusiveUser" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="multiple_connections">
-										<value>true</value>
-									</attribute>
-									<attribute kind="optional" status="meta">
-										<value>false</value>
-									</attribute>
-								</reference>
-							</model>
-							<model id="id-0065-00000162" kind="PortType" role="PortType" guid="{aea302e1-40ee-45b5-91e4-5b78deb209e5}" relid="0xc" childrelidcntr="0x2">
-								<name>DDS_Listen</name>
-								<attribute kind="PostPreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="PrePreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<model id="id-0065-00000163" kind="Attribute" role="Attribute" guid="{3266e8d4-569a-479c-b9a8-9cc5b04e4f0c}" relid="0x0" childrelidcntr="0x1">
-									<name>filter</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,560</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-00000168" kind="SetException" role="SetException" guid="{106b5a2c-d7e6-4cea-9a93-df7bd5ce260d}" relid="0x0" referred="id-0065-00000152">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>160,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-00000169" kind="AttributeMember" role="AttributeMember" guid="{c71df672-bb1c-4913-8ed6-e0ddafb2d3bd}" relid="0x0" referred="id-0065-00000157">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-								<reference id="id-0067-0000016a" kind="RequiredRequestPort" role="RequiredRequestPort" guid="{3833a4bb-b7ac-4a39-aa65-c4c0e8bd36a3}" relid="0x1" referred="id-0065-00000150">
-									<name>filter_config</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,660</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="AsyncCommunication" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="exclusiveProvider" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="exclusiveUser" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="multiple_connections">
-										<value>true</value>
-									</attribute>
-									<attribute kind="optional" status="meta">
-										<value>false</value>
-									</attribute>
-								</reference>
-								<reference id="id-0067-0000016b" kind="ProvidedRequestPort" role="ProvidedRequestPort" guid="{6c42a3a9-66e9-4e7c-9b8d-e9134cbc6f56}" relid="0x0" referred="id-0065-00000135">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,460</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="exclusiveProvider" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="exclusiveUser" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="optional" status="meta">
-										<value>false</value>
-									</attribute>
-								</reference>
-								<reference id="id-0067-0000016c" kind="RequiredRequestPort" role="RequiredRequestPort" guid="{a79437df-5339-40f8-854b-b46af2edaa40}" relid="0x0" referred="id-0065-000000e0">
-									<name>dds_entity</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,360</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="AsyncCommunication" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="exclusiveProvider" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="exclusiveUser" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="multiple_connections">
-										<value>true</value>
-									</attribute>
-									<attribute kind="optional" status="meta">
-										<value>false</value>
-									</attribute>
-								</reference>
-								<reference id="id-0067-0000016d" kind="RequiredRequestPort" role="RequiredRequestPort" guid="{a1c754a8-c82b-44ad-b713-92e20eec5675}" relid="0x0" referred="id-0065-0000013a">
-									<name>data_control</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,160</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="AsyncCommunication" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="exclusiveProvider" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="exclusiveUser" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="multiple_connections">
-										<value>true</value>
-									</attribute>
-									<attribute kind="optional" status="meta">
-										<value>false</value>
-									</attribute>
-								</reference>
-								<reference id="id-0067-000003a2" kind="ProvidedRequestPort" role="ProvidedRequestPort" guid="{394c2257-6520-4469-92e3-8d0f4f74fc01}" relid="0x0" referred="id-0065-0000016f">
-									<name>data_listener</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,260</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="exclusiveProvider" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="exclusiveUser" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="optional" status="meta">
-										<value>false</value>
-									</attribute>
-								</reference>
-								<reference id="id-0067-000003a3" kind="RequiredRequestPort" role="RequiredRequestPort" guid="{61e2a992-3538-4606-a1d1-24a25f88ca5d}" relid="0x0" referred="id-0065-00000177">
-									<name>data</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="AsyncCommunication" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="exclusiveProvider" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="exclusiveUser" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="multiple_connections">
-										<value>true</value>
-									</attribute>
-									<attribute kind="optional" status="meta">
-										<value>false</value>
-									</attribute>
-								</reference>
-							</model>
-							<model id="id-0065-00000164" kind="PortType" role="PortType" guid="{eec68a9a-758a-45d3-833f-c088cb078876}" relid="0xb" childrelidcntr="0x2">
-								<name>DDS_Get</name>
-								<attribute kind="PostPreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="PrePreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<model id="id-0065-00000165" kind="Attribute" role="Attribute" guid="{0f78654e-eb44-499d-9350-0839b4e63858}" relid="0x0" childrelidcntr="0x1">
-									<name>filter</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,460</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-0000016e" kind="SetException" role="SetException" guid="{af5c09aa-0e28-4795-b9ea-3279f4ed9630}" relid="0x0" referred="id-0065-00000152">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>160,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-0000016f" kind="AttributeMember" role="AttributeMember" guid="{b0f3941f-2b7b-4b50-89bc-c464e1075e64}" relid="0x0" referred="id-0065-00000157">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-								<reference id="id-0067-00000170" kind="RequiredRequestPort" role="RequiredRequestPort" guid="{ac904120-1317-4dbb-b291-8fe317fa5f13}" relid="0x1" referred="id-0065-00000150">
-									<name>filter_config</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,560</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="AsyncCommunication" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="exclusiveProvider" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="exclusiveUser" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="multiple_connections">
-										<value>true</value>
-									</attribute>
-									<attribute kind="optional" status="meta">
-										<value>false</value>
-									</attribute>
-								</reference>
-								<reference id="id-0067-00000171" kind="ProvidedRequestPort" role="ProvidedRequestPort" guid="{76519d1d-5f12-44f2-bb37-44aef358bf08}" relid="0x0" referred="id-0065-00000135">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,360</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="exclusiveProvider" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="exclusiveUser" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="optional" status="meta">
-										<value>false</value>
-									</attribute>
-								</reference>
-								<reference id="id-0067-00000172" kind="RequiredRequestPort" role="RequiredRequestPort" guid="{e04cbec6-6cd6-4218-990f-a887e7c3d456}" relid="0x0" referred="id-0065-000000e0">
-									<name>dds_entity</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,260</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="AsyncCommunication" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="exclusiveProvider" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="exclusiveUser" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="multiple_connections">
-										<value>true</value>
-									</attribute>
-									<attribute kind="optional" status="meta">
-										<value>false</value>
-									</attribute>
-								</reference>
-								<reference id="id-0067-000003a4" kind="RequiredRequestPort" role="RequiredRequestPort" guid="{7f9aae18-cc60-49ac-9c64-e8677dc82db1}" relid="0x0" referred="id-0065-00000172">
-									<name>fresh_data</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,160</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="AsyncCommunication" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="exclusiveProvider" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="exclusiveUser" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="multiple_connections">
-										<value>true</value>
-									</attribute>
-									<attribute kind="optional" status="meta">
-										<value>false</value>
-									</attribute>
-								</reference>
-								<reference id="id-0067-000003a5" kind="RequiredRequestPort" role="RequiredRequestPort" guid="{5e75a6e7-bfbe-4d84-ac64-bbbdb4597a3a}" relid="0x0" referred="id-0065-00000177">
-									<name>data</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="AsyncCommunication" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="exclusiveProvider" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="exclusiveUser" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="multiple_connections">
-										<value>true</value>
-									</attribute>
-									<attribute kind="optional" status="meta">
-										<value>false</value>
-									</attribute>
-								</reference>
-							</model>
-							<model id="id-0065-00000166" kind="PortType" role="PortType" guid="{3dddee43-c914-43c0-810a-ebcc47971a9d}" relid="0xa" childrelidcntr="0x2">
-								<name>DDS_Read</name>
-								<attribute kind="PostPreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="PrePreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<model id="id-0065-00000167" kind="Attribute" role="Attribute" guid="{5bf211cb-da7e-481a-a999-bc5c6c65993c}" relid="0x0" childrelidcntr="0x1">
-									<name>filter</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,360</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-00000173" kind="SetException" role="SetException" guid="{e4350f70-6dce-4fd6-a3ef-6b5df46e16fe}" relid="0x0" referred="id-0065-00000152">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>160,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-00000174" kind="AttributeMember" role="AttributeMember" guid="{aaf5cbf1-3594-4a38-b409-95bb4ad994ad}" relid="0x0" referred="id-0065-00000157">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-								<reference id="id-0067-00000175" kind="RequiredRequestPort" role="RequiredRequestPort" guid="{bb4a7c18-32e6-4393-b5ad-cbbdc1af1d08}" relid="0x1" referred="id-0065-00000150">
-									<name>filter_config</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,460</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="AsyncCommunication" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="exclusiveProvider" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="exclusiveUser" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="multiple_connections">
-										<value>true</value>
-									</attribute>
-									<attribute kind="optional" status="meta">
-										<value>false</value>
-									</attribute>
-								</reference>
-								<reference id="id-0067-00000176" kind="ProvidedRequestPort" role="ProvidedRequestPort" guid="{96e30ab7-5c98-41ab-ae48-48d3c443c5e1}" relid="0x0" referred="id-0065-00000135">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,260</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="exclusiveProvider" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="exclusiveUser" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="optional" status="meta">
-										<value>false</value>
-									</attribute>
-								</reference>
-								<reference id="id-0067-00000177" kind="RequiredRequestPort" role="RequiredRequestPort" guid="{1525c918-c01b-482f-a278-b466237da990}" relid="0x0" referred="id-0065-000000e0">
-									<name>dds_entity</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,160</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="AsyncCommunication" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="exclusiveProvider" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="exclusiveUser" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="multiple_connections">
-										<value>true</value>
-									</attribute>
-									<attribute kind="optional" status="meta">
-										<value>false</value>
-									</attribute>
-								</reference>
-								<reference id="id-0067-000003a6" kind="RequiredRequestPort" role="RequiredRequestPort" guid="{4812a509-ba1f-4611-aa3b-1d20d3315187}" relid="0x0" referred="id-0065-00000177">
-									<name>data</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="AsyncCommunication" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="exclusiveProvider" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="exclusiveUser" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="multiple_connections">
-										<value>true</value>
-									</attribute>
-									<attribute kind="optional" status="meta">
-										<value>false</value>
-									</attribute>
-								</reference>
-							</model>
-							<model id="id-0065-00000168" kind="PortType" role="PortType" guid="{619861da-4c85-4e91-b5fb-93ecabbb6911}" relid="0x9" childrelidcntr="0x1">
-								<name>DDS_Update</name>
-								<attribute kind="PostPreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="PrePreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000178" kind="RequiredRequestPort" role="RequiredRequestPort" guid="{3b2998ec-5de6-45bb-8c02-39d49bceee9d}" relid="0x0" referred="id-0065-000000f4">
-									<name>dds_entity</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,160</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="AsyncCommunication" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="exclusiveProvider" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="exclusiveUser" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="multiple_connections">
-										<value>true</value>
-									</attribute>
-									<attribute kind="optional" status="meta">
-										<value>false</value>
-									</attribute>
-								</reference>
-								<reference id="id-0067-000003a7" kind="RequiredRequestPort" role="RequiredRequestPort" guid="{6334db56-7834-4a77-9551-8e78c0fb870c}" relid="0x0" referred="id-0065-0000017d">
-									<name>data</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="AsyncCommunication" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="exclusiveProvider" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="exclusiveUser" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="multiple_connections">
-										<value>true</value>
-									</attribute>
-									<attribute kind="optional" status="meta">
-										<value>false</value>
-									</attribute>
-								</reference>
-							</model>
-							<model id="id-0065-00000169" kind="PortType" role="PortType" guid="{bf7f6820-3670-48c1-a350-fe275461d999}" relid="0x8" childrelidcntr="0x1">
-								<name>DDS_Write</name>
-								<attribute kind="PostPreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="PrePreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000179" kind="RequiredRequestPort" role="RequiredRequestPort" guid="{b8a368fc-cdb8-4419-9284-e9f121fd368c}" relid="0x0" referred="id-0065-000000f4">
-									<name>dds_entity</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,160</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="AsyncCommunication" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="exclusiveProvider" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="exclusiveUser" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="multiple_connections">
-										<value>true</value>
-									</attribute>
-									<attribute kind="optional" status="meta">
-										<value>false</value>
-									</attribute>
-								</reference>
-								<reference id="id-0067-000003a8" kind="RequiredRequestPort" role="RequiredRequestPort" guid="{cbd3c158-008a-494f-ae24-f5f3666759b9}" relid="0x0" referred="id-0065-00000186">
-									<name>data</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="AsyncCommunication" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="exclusiveProvider" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="exclusiveUser" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="multiple_connections">
-										<value>true</value>
-									</attribute>
-									<attribute kind="optional" status="meta">
-										<value>false</value>
-									</attribute>
-								</reference>
-							</model>
-							<model id="id-0065-0000016a" kind="Object" role="Object" guid="{25604677-e315-48da-a2b8-1b382b98f532}" relid="0x7" childrelidcntr="0x4">
-								<name>StateListener</name>
-								<attribute kind="InterfaceSemantics">
-									<value>local</value>
-								</attribute>
-								<attribute kind="PostPreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="PrePreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="PrefixTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="SupportsAsync" status="meta">
-									<value>false</value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<model id="id-0065-0000016b" kind="TwowayOperation" role="TwowayOperation" guid="{d013b562-3c78-426d-bce0-b6b180150028}" relid="0x3" childrelidcntr="0x1">
-									<name>on_deletion</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,360</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-0000017a" kind="InParameter" role="InParameter" guid="{3602e7ae-be1e-4ba2-b7a0-2cdad7239406}" relid="0x0" referred="id-0065-00000158">
-										<name>info</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>160,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-000003a9" kind="InParameter" role="InParameter" guid="{65ac5876-8892-407c-accf-fd563e016a58}" relid="0x0" referred="id-0066-00000055">
-										<name>datum</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-								<model id="id-0065-0000016c" kind="TwowayOperation" role="TwowayOperation" guid="{cf530e97-b8da-4cd7-aa64-1361f9f7054e}" relid="0x2" childrelidcntr="0x1">
-									<name>on_many_updates</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,260</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-0000017b" kind="InParameter" role="InParameter" guid="{76d2a292-1e27-47f0-b329-db0d1c3d7d63}" relid="0x0" referred="id-0067-00000160">
-										<name>infos</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>160,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-000003aa" kind="InParameter" role="InParameter" guid="{c7fcbef5-e941-4acb-8abd-3d5a8395e6fb}" relid="0x0" referred="id-0067-000001ae">
-										<name>data</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-								<model id="id-0065-0000016d" kind="TwowayOperation" role="TwowayOperation" guid="{de2eea24-bfb6-4b50-a248-71049b862d6f}" relid="0x1" childrelidcntr="0x1">
-									<name>on_one_update</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,160</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-0000017c" kind="InParameter" role="InParameter" guid="{57b4b0a1-44c5-41d2-aca7-a2f50070eead}" relid="0x0" referred="id-0065-00000158">
-										<name>info</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>160,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-000003ab" kind="InParameter" role="InParameter" guid="{cb2395ef-477c-44c6-92b1-91c2b4b223f7}" relid="0x0" referred="id-0066-00000055">
-										<name>datum</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-								<model id="id-0065-0000016e" kind="TwowayOperation" role="TwowayOperation" guid="{028d00f7-5b8e-461b-8284-98e662135fe4}" relid="0x0" childrelidcntr="0x1">
-									<name>on_creation</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-0000017d" kind="InParameter" role="InParameter" guid="{ca1a067d-37e4-4f0b-8a49-529b420f6ee9}" relid="0x0" referred="id-0065-00000158">
-										<name>info</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>160,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-000003ac" kind="InParameter" role="InParameter" guid="{e4c1f87d-4c5c-4a5d-8ebc-a93908c6e7a5}" relid="0x0" referred="id-0066-00000055">
-										<name>datum</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-							</model>
-							<model id="id-0065-0000016f" kind="Object" role="Object" guid="{6250051f-0f23-46a4-84b2-6b44fc5782db}" relid="0x6" childrelidcntr="0x2">
-								<name>Listener</name>
-								<attribute kind="InterfaceSemantics">
-									<value>local</value>
-								</attribute>
-								<attribute kind="PostPreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="PrePreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="PrefixTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="SupportsAsync" status="meta">
-									<value>false</value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<model id="id-0065-00000170" kind="TwowayOperation" role="TwowayOperation" guid="{21fbe98c-805b-41dc-a052-c2e5b6bce679}" relid="0x1" childrelidcntr="0x1">
-									<name>on_many_data</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,160</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-0000017e" kind="InParameter" role="InParameter" guid="{84537cd4-be78-4b29-9e66-98e28837a6ea}" relid="0x0" referred="id-0067-00000160">
-										<name>infos</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>160,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-000003ad" kind="InParameter" role="InParameter" guid="{dbfd6cdc-9219-4b29-bb1a-e91da13dc31a}" relid="0x0" referred="id-0067-000001ae">
-										<name>data</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-								<model id="id-0065-00000171" kind="TwowayOperation" role="TwowayOperation" guid="{ccd1e971-4e02-49f3-ae51-fd2cc9c351ed}" relid="0x0" childrelidcntr="0x1">
-									<name>on_one_data</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-0000017f" kind="InParameter" role="InParameter" guid="{41dcc038-4baa-45af-b5ff-e2ca817eb149}" relid="0x0" referred="id-0065-00000158">
-										<name>info</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>160,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-000003ae" kind="InParameter" role="InParameter" guid="{7a78080c-3b7c-46e2-8cbc-f5bd78abdb0e}" relid="0x0" referred="id-0066-00000055">
-										<name>datum</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-							</model>
-							<model id="id-0065-00000172" kind="Object" role="Object" guid="{4e697921-f915-4dcc-91fc-489f76ea9a82}" relid="0x5" childrelidcntr="0x4">
-								<name>Getter</name>
-								<attribute kind="InterfaceSemantics">
-									<value>local</value>
-								</attribute>
-								<attribute kind="PostPreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="PrePreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="PrefixTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="SupportsAsync" status="meta">
-									<value>false</value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<model id="id-0065-00000173" kind="Attribute" role="Attribute" guid="{06f018e7-9d1a-49ed-acb5-f28f1b79f1c7}" relid="0x3" childrelidcntr="0x1">
-									<name>max_delivered_data</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,360</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-00000180" kind="AttributeMember" role="AttributeMember" guid="{b689cc61-d959-414b-9307-709982762a1d}" relid="0x0" referred="id-0067-0000015f">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-								<model id="id-0065-00000174" kind="Attribute" role="Attribute" guid="{1e6a1ff3-f4d2-4e19-966b-d94e9d7d91db}" relid="0x2" childrelidcntr="0x1">
-									<name>time_out</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,260</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-00000181" kind="AttributeMember" role="AttributeMember" guid="{8bb061eb-7eb2-422e-8970-0328d48c7286}" relid="0x0" referred="id-0065-0000012d">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-								<model id="id-0065-00000175" kind="TwowayOperation" role="TwowayOperation" guid="{24b3532a-b438-49bc-a36b-40b6d0bb3e7a}" relid="0x1" childrelidcntr="0x1">
-									<name>get_many</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,160</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-00000182" kind="ExceptionRef" role="ExceptionRef" guid="{e4c3692f-190e-4f31-8e9f-00d740adb36a}" relid="0x0" referred="id-0065-00000153">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>360,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-00000183" kind="InoutParameter" role="InoutParameter" guid="{7a774978-975a-4ad0-9a75-f6b75fb58374}" relid="0x0" referred="id-0067-00000160">
-										<name>infos</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>260,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-00000184" kind="ReturnType" role="ReturnType" guid="{bee572a0-8c5f-47a5-8b5a-541311ce3bdf}" relid="0x0" referred="id-0066-00000033">
-										<name>ReturnType</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-000003af" kind="InoutParameter" role="InoutParameter" guid="{b3b72284-6df7-4267-9ed5-2733b7035e46}" relid="0x0" referred="id-0067-000001ae">
-										<name>data</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>160,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-								<model id="id-0065-00000176" kind="TwowayOperation" role="TwowayOperation" guid="{bf64b05a-ab7e-4060-bc7c-af69eee2c826}" relid="0x0" childrelidcntr="0x1">
-									<name>get_one</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-00000185" kind="ExceptionRef" role="ExceptionRef" guid="{caef1103-880d-4e62-8dc3-dbb59d376a2c}" relid="0x0" referred="id-0065-00000153">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>360,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-00000186" kind="OutParameter" role="OutParameter" guid="{08ee158f-0d69-4c00-bcfd-eecdf17e21c4}" relid="0x0" referred="id-0065-00000158">
-										<name>info</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>260,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-00000187" kind="ReturnType" role="ReturnType" guid="{339639f5-9e87-4fb1-931d-bb0d1b40c3e7}" relid="0x0" referred="id-0066-00000033">
-										<name>ReturnType</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-000003b0" kind="OutParameter" role="OutParameter" guid="{c5253db0-34fd-4107-966a-2a36bad3fc2b}" relid="0x0" referred="id-0066-00000055">
-										<name>datum</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>160,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-							</model>
-							<model id="id-0065-00000177" kind="Object" role="Object" guid="{fbaae8e6-f7e9-44c0-a2d8-23c772e7e80f}" relid="0x4" childrelidcntr="0x5">
-								<name>Reader</name>
-								<attribute kind="InterfaceSemantics">
-									<value>local</value>
-								</attribute>
-								<attribute kind="PostPreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="PrePreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="PrefixTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="SupportsAsync" status="meta">
-									<value>false</value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<model id="id-0065-00000178" kind="Attribute" role="Attribute" guid="{4e4d040f-210e-4478-a09c-0e616a3cbb37}" relid="0x4" childrelidcntr="0x1">
-									<name>query</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,460</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-00000188" kind="SetException" role="SetException" guid="{e7510491-305f-4e28-83de-378dd549b65e}" relid="0x0" referred="id-0065-00000153">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>160,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-00000189" kind="AttributeMember" role="AttributeMember" guid="{e52d1685-755d-4ad3-9983-6c33af87848e}" relid="0x0" referred="id-0065-00000157">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-								<model id="id-0065-00000179" kind="TwowayOperation" role="TwowayOperation" guid="{9d4c9094-2e65-4998-837d-853704667ed7}" relid="0x3" childrelidcntr="0x1">
-									<name>read_one_all</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,360</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-0000018a" kind="ExceptionRef" role="ExceptionRef" guid="{0267af8d-e264-4a6b-b8ef-93af18391f02}" relid="0x0" referred="id-0065-00000153">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>560,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-0000018b" kind="ExceptionRef" role="ExceptionRef" guid="{05dcdca9-f31c-4606-b538-c93caf965ba2}" relid="0x0" referred="id-0065-00000154">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>460,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-0000018c" kind="InParameter" role="InParameter" guid="{7e0af45b-784f-4c63-9f38-bc5b076d395e}" relid="0x0" referred="id-0067-00000029">
-										<name>instance_handle</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>360,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-0000018d" kind="InoutParameter" role="InoutParameter" guid="{7c0fb1d1-b030-4a03-bd3c-cdf2cd1cd5a5}" relid="0x0" referred="id-0067-00000160">
-										<name>infos</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>260,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-000003b1" kind="InoutParameter" role="InoutParameter" guid="{51e5a25b-df5e-4ac0-87e3-ec768a239f35}" relid="0x0" referred="id-0067-000001ae">
-										<name>data</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>160,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-000003b2" kind="InParameter" role="InParameter" guid="{bef80ff6-3ee7-440a-ab11-b28cb887ba9c}" relid="0x0" referred="id-0066-00000055">
-										<name>datum</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-								<model id="id-0065-0000017a" kind="TwowayOperation" role="TwowayOperation" guid="{962a6c2b-4d26-4297-955b-f5fe7ce399ec}" relid="0x2" childrelidcntr="0x1">
-									<name>read_one_last</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,260</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-0000018e" kind="ExceptionRef" role="ExceptionRef" guid="{5b88a936-0604-4801-84a1-9af6bac59f5a}" relid="0x0" referred="id-0065-00000153">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>460,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-0000018f" kind="ExceptionRef" role="ExceptionRef" guid="{10b9d7e0-3a2c-4373-a218-8d82a3d20af2}" relid="0x0" referred="id-0065-00000154">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>360,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-00000190" kind="InParameter" role="InParameter" guid="{485e3452-096b-45cd-aed9-17b92c1d2418}" relid="0x0" referred="id-0067-00000029">
-										<name>instance_handle</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>260,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-00000191" kind="OutParameter" role="OutParameter" guid="{0cbc06f2-3bd6-4dac-9375-c6fc7fb0bacc}" relid="0x0" referred="id-0065-00000158">
-										<name>info</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>160,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-000003b3" kind="InoutParameter" role="InoutParameter" guid="{bf72e9ae-e767-4a3f-9b71-25d90d3347e5}" relid="0x0" referred="id-0066-00000055">
-										<name>datum</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-								<model id="id-0065-0000017b" kind="TwowayOperation" role="TwowayOperation" guid="{d5f05976-af23-4514-8d05-cb38cf76944c}" relid="0x1" childrelidcntr="0x1">
-									<name>read_all</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,160</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-00000192" kind="ExceptionRef" role="ExceptionRef" guid="{5debda2b-712e-4ac1-9802-7c7fddd419a3}" relid="0x0" referred="id-0065-00000153">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>260,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-00000193" kind="InoutParameter" role="InoutParameter" guid="{b92ab869-0388-49dc-9a84-f093613a8098}" relid="0x0" referred="id-0067-00000160">
-										<name>infos</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>160,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-000003b4" kind="InoutParameter" role="InoutParameter" guid="{ea094b3f-dd2f-4827-ae5e-5e6e0144ee8c}" relid="0x0" referred="id-0067-000001ae">
-										<name>data</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-								<model id="id-0065-0000017c" kind="TwowayOperation" role="TwowayOperation" guid="{9c80ff59-7621-4f27-8b70-09686b72e054}" relid="0x0" childrelidcntr="0x1">
-									<name>read_last</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-00000194" kind="ExceptionRef" role="ExceptionRef" guid="{10375f16-b46e-4ff3-895d-8b43cf7e4c22}" relid="0x0" referred="id-0065-00000153">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>260,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-00000195" kind="InoutParameter" role="InoutParameter" guid="{93632f7b-130a-420b-8dbb-b2ae03eda7dd}" relid="0x0" referred="id-0067-00000160">
-										<name>infos</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>160,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-000003b5" kind="InoutParameter" role="InoutParameter" guid="{9c922906-3e03-4154-bc7c-130c56a1f5fb}" relid="0x0" referred="id-0067-000001ae">
-										<name>data</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-							</model>
-							<model id="id-0065-0000017d" kind="Object" role="Object" guid="{66f2b8ec-262f-4de9-8f85-47d751509c36}" relid="0x3" childrelidcntr="0x9">
-								<name>Updater</name>
-								<attribute kind="InterfaceSemantics">
-									<value>local</value>
-								</attribute>
-								<attribute kind="PostPreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="PrePreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="PrefixTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="SupportsAsync" status="meta">
-									<value>false</value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<model id="id-0065-0000017e" kind="Attribute" role="Attribute" guid="{94b21c7e-dfd6-4f18-97d2-6441336af003}" relid="0x7" childrelidcntr="0x1">
-									<name>is_coherent_write</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,760</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-00000196" kind="AttributeMember" role="AttributeMember" guid="{9e483357-6b07-4e20-b357-efb37fcd53e3}" relid="0x0" referred="id-0066-00000033">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-								<model id="id-0065-0000017f" kind="ReadonlyAttribute" role="ReadonlyAttribute" guid="{10fafe01-6de0-4ece-b0d3-fe89ef7f4835}" relid="0x6" childrelidcntr="0x1">
-									<name>is_global_scope</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,660</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-00000197" kind="AttributeMember" role="AttributeMember" guid="{87a9c6ed-1501-4c88-a20d-2feae9cde5b1}" relid="0x0" referred="id-0066-00000033">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-								<model id="id-0065-00000180" kind="TwowayOperation" role="TwowayOperation" guid="{813df944-1459-43e8-bbc8-88acc57a1fa5}" relid="0x5" childrelidcntr="0x1">
-									<name>delete_many</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,560</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-00000198" kind="ExceptionRef" role="ExceptionRef" guid="{b524aac1-b976-40f9-a64f-2d4ddfa61438}" relid="0x0" referred="id-0065-00000153">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>260,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-00000199" kind="ExceptionRef" role="ExceptionRef" guid="{5e770cfe-e15a-4a80-99fa-3e0406d7acf9}" relid="0x0" referred="id-0065-00000154">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>160,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-000003b6" kind="InParameter" role="InParameter" guid="{e8ca1bc7-caab-440e-b1fa-3201e467791e}" relid="0x0" referred="id-0067-000001ae">
-										<name>data</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-								<model id="id-0065-00000181" kind="TwowayOperation" role="TwowayOperation" guid="{95bde85e-e757-49b2-a908-a83f2c188fbd}" relid="0x4" childrelidcntr="0x1">
-									<name>update_many</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,460</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-0000019a" kind="ExceptionRef" role="ExceptionRef" guid="{d06d9371-0088-4dd8-9752-a18b3063c69b}" relid="0x0" referred="id-0065-00000153">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>260,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-0000019b" kind="ExceptionRef" role="ExceptionRef" guid="{379470f8-0040-4e10-b8a6-8fa2b34fddf9}" relid="0x0" referred="id-0065-00000154">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>160,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-000003b7" kind="InParameter" role="InParameter" guid="{8caec0b7-d5fe-4556-9b87-15dc20896ff8}" relid="0x0" referred="id-0067-000001ae">
-										<name>data</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-								<model id="id-0065-00000182" kind="TwowayOperation" role="TwowayOperation" guid="{cb8e328d-38a4-4f2a-b717-8d8374d68daf}" relid="0x3" childrelidcntr="0x1">
-									<name>create_many</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,360</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-0000019c" kind="ExceptionRef" role="ExceptionRef" guid="{b7b7c6d5-bc8e-4fd3-bd58-45cbf201756e}" relid="0x0" referred="id-0065-00000153">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>260,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-0000019d" kind="ExceptionRef" role="ExceptionRef" guid="{02de4bb7-fa93-4aa6-ab0e-d1e6286f4dec}" relid="0x0" referred="id-0065-00000155">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>160,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-000003b8" kind="InParameter" role="InParameter" guid="{7256c665-bf07-4a9c-ab2a-256e4f3c50f2}" relid="0x0" referred="id-0067-000001ae">
-										<name>data</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-								<model id="id-0065-00000183" kind="TwowayOperation" role="TwowayOperation" guid="{f537077f-f387-4192-8a26-5596277a3f2a}" relid="0x2" childrelidcntr="0x1">
-									<name>delete_one</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,260</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-0000019e" kind="ExceptionRef" role="ExceptionRef" guid="{f530443c-3e1b-4ad5-95ed-cd0eb0573d2a}" relid="0x0" referred="id-0065-00000153">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>360,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-0000019f" kind="ExceptionRef" role="ExceptionRef" guid="{c27b475f-efca-4407-9a21-7f4285994efb}" relid="0x0" referred="id-0065-00000154">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>260,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-000001a0" kind="InParameter" role="InParameter" guid="{5b50bc69-f23a-4111-9846-c32dd6f9815a}" relid="0x0" referred="id-0067-00000029">
-										<name>instance_handle</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>160,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-000003b9" kind="InParameter" role="InParameter" guid="{4a256ca6-114e-400d-8770-c41736da19d8}" relid="0x0" referred="id-0066-00000055">
-										<name>datum</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-								<model id="id-0065-00000184" kind="TwowayOperation" role="TwowayOperation" guid="{f66c8596-6cc6-4cbf-ae36-721f1bf0480e}" relid="0x1" childrelidcntr="0x1">
-									<name>update_one</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,160</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-000001a1" kind="ExceptionRef" role="ExceptionRef" guid="{1943cc4b-c1e0-44c4-abda-6e7414de060f}" relid="0x0" referred="id-0065-00000153">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>360,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-000001a2" kind="ExceptionRef" role="ExceptionRef" guid="{ef9152da-cdfc-4865-a315-ed95202698fe}" relid="0x0" referred="id-0065-00000154">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>260,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-000001a3" kind="InParameter" role="InParameter" guid="{7df5fc97-60cf-4d88-8700-f566ecbcc8bb}" relid="0x0" referred="id-0067-00000029">
-										<name>instance_handle</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>160,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-000003ba" kind="InParameter" role="InParameter" guid="{5d7dad55-48e4-4a8a-bf93-a2f306a04cdb}" relid="0x0" referred="id-0066-00000055">
-										<name>datum</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-								<model id="id-0065-00000185" kind="TwowayOperation" role="TwowayOperation" guid="{6cb43fd0-0169-4d67-b9c6-824a1f499f8e}" relid="0x0" childrelidcntr="0x1">
-									<name>create_one</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-000001a4" kind="ExceptionRef" role="ExceptionRef" guid="{7864288f-9093-48f9-bb10-60ebe95e73ca}" relid="0x0" referred="id-0065-00000153">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>260,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-000001a5" kind="ExceptionRef" role="ExceptionRef" guid="{1cd4fb1d-7e9b-48c2-b941-cd533753fc27}" relid="0x0" referred="id-0065-00000155">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>160,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-000003bb" kind="InParameter" role="InParameter" guid="{38e44026-f094-4559-9f59-4866d65c2e57}" relid="0x0" referred="id-0066-00000055">
-										<name>datum</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-								<reference id="id-0067-000003bc" kind="Inherits" role="Inherits" guid="{43974de2-add7-4185-afb2-14c0c6ce5460}" relid="0x8" referred="id-0065-0000018a">
-									<name>Inherits</name>
-								</reference>
-							</model>
-							<model id="id-0065-00000186" kind="Object" role="Object" guid="{6354d461-c223-4732-a44a-6994bbc2400c}" relid="0x2" childrelidcntr="0x4">
-								<name>Writer</name>
-								<attribute kind="InterfaceSemantics">
-									<value>local</value>
-								</attribute>
-								<attribute kind="PostPreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="PrePreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="PrefixTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="SupportsAsync" status="meta">
-									<value>false</value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<model id="id-0065-00000187" kind="Attribute" role="Attribute" guid="{325bb065-4fba-4e0b-b9cd-e71d659f8c91}" relid="0x2" childrelidcntr="0x1">
-									<name>is_coherent_write</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,260</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-000001a6" kind="AttributeMember" role="AttributeMember" guid="{dcaf8484-6535-4f33-882f-fae5f083fbc8}" relid="0x0" referred="id-0066-00000033">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-								<model id="id-0065-00000188" kind="TwowayOperation" role="TwowayOperation" guid="{fc0a0deb-7c8b-45d9-ac99-98465ecc30e7}" relid="0x1" childrelidcntr="0x1">
-									<name>write_many</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,160</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-000001a7" kind="ExceptionRef" role="ExceptionRef" guid="{47f91bb8-abf7-4b0d-a96c-00d0379e9636}" relid="0x0" referred="id-0065-00000153">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>160,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-000003bd" kind="InParameter" role="InParameter" guid="{b96601ec-2773-418a-8d88-4ccb0a1e455e}" relid="0x0" referred="id-0067-000001ae">
-										<name>data</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-								<model id="id-0065-00000189" kind="TwowayOperation" role="TwowayOperation" guid="{762b9f68-9fca-4e2d-bf86-c03de77cdad1}" relid="0x0" childrelidcntr="0x1">
-									<name>write_one</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-000001a8" kind="ExceptionRef" role="ExceptionRef" guid="{3848e2f2-a990-45be-a164-14edae3f0ec0}" relid="0x0" referred="id-0065-00000153">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>260,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-000001a9" kind="InParameter" role="InParameter" guid="{1c7934af-9cce-4084-9f1a-e2fa632bde07}" relid="0x0" referred="id-0067-00000029">
-										<name>instance_handle</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>160,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-000003be" kind="InParameter" role="InParameter" guid="{39d3f530-7b40-40a5-a378-2c0859e5308e}" relid="0x0" referred="id-0066-00000055">
-										<name>datum</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-								<reference id="id-0067-000003bf" kind="Inherits" role="Inherits" guid="{7f8ce04c-e7fa-4476-8cda-4f3917f455dc}" relid="0x3" referred="id-0065-0000018a">
-									<name>Inherits</name>
-								</reference>
-							</model>
-							<model id="id-0065-0000018a" kind="Object" role="Object" guid="{31f0e62f-0265-4cf5-b71d-5990577117be}" relid="0x1" childrelidcntr="0x2">
-								<name>InstanceHandleManager</name>
-								<attribute kind="InterfaceSemantics">
-									<value>local</value>
-								</attribute>
-								<attribute kind="PostPreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="PrePreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="PrefixTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="SupportsAsync" status="meta">
-									<value>false</value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<model id="id-0065-0000018b" kind="TwowayOperation" role="TwowayOperation" guid="{45fd16b9-8789-4bf2-b463-9fdb00d2c384}" relid="0x1" childrelidcntr="0x1">
-									<name>unregister_instance</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,160</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-000001aa" kind="ExceptionRef" role="ExceptionRef" guid="{9075612e-91a1-421c-9bee-841dd0fffe72}" relid="0x0" referred="id-0065-00000153">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>260,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-000001ab" kind="InParameter" role="InParameter" guid="{684865be-9ec3-4cf2-800c-def69ba0ecc5}" relid="0x0" referred="id-0067-00000029">
-										<name>instance_handle</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>160,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-000003c0" kind="InParameter" role="InParameter" guid="{ac8c14ed-8e35-425b-8cf2-a6f5ba489e97}" relid="0x0" referred="id-0066-00000055">
-										<name>datum</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-								<model id="id-0065-0000018c" kind="TwowayOperation" role="TwowayOperation" guid="{92ba42fc-d09f-4927-b1cf-1e3ffa873740}" relid="0x0" childrelidcntr="0x1">
-									<name>register_instance</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-000001ac" kind="ExceptionRef" role="ExceptionRef" guid="{fd5c661f-a1b2-4762-9415-bbdf2d17fce7}" relid="0x0" referred="id-0065-00000153">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>260,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-000001ad" kind="ReturnType" role="ReturnType" guid="{74c76ece-44ea-43ef-ba15-87a7d8f07e97}" relid="0x0" referred="id-0067-00000029">
-										<name>ReturnType</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-000003c1" kind="InParameter" role="InParameter" guid="{a4ab3f39-b211-43b3-83d9-4fcfedf38985}" relid="0x0" referred="id-0066-00000055">
-										<name>datum</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>160,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-							</model>
-							<atom id="id-0066-00000055" kind="NameParameter" role="NameParameter" guid="{f7eae334-9a8a-46fa-859b-a1306b0f717c}" relid="0x0">
-								<name>T</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="TemplateParameters" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-							<reference id="id-0067-000001ae" kind="CollectionParameter" role="CollectionParameter" guid="{4a4d7fb8-c4c9-4bce-934f-302e9df8fa56}" relid="0x1" referred="id-0066-00000055">
-								<name>TSeq</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="TemplateParameters" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>160,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-					</model>
-				</model>
-			</folder>
-		</folder>
-	</folder>
-</project>
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/models/Shapes-complete.xme b/CIAO/connectors/dds4ccm/examples/Shapes/models/Shapes-complete.xme
deleted file mode 100644
index 169a0218e3e..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Shapes/models/Shapes-complete.xme
+++ /dev/null
@@ -1,19194 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE project SYSTEM "mga.dtd">
-
-<project guid="{2548C30D-8A4D-4907-81BA-2E5B54A24902}" cdate="Thu Jul 29 11:39:51 2010" mdate="Thu Jul 29 11:39:51 2010" version="" metaguid="{5A2F3650-E646-42C2-BDBF-CE9E3BF3B223}" metaversion="" metaname="PICML">
-	<name>Shapes</name>
-	<comment></comment>
-	<author></author>
-	<folder id="id-006a-00000001" relid="0x1" childrelidcntr="0x8" kind="RootFolder" guid="{49be9b2d-e47f-4d48-9a57-6e1d40d20df8}">
-		<name>Shapes</name>
-		<folder id="id-006a-00000002" relid="0x0" childrelidcntr="0x4" kind="InterfaceDefinitions" guid="{b05aa06c-b4e0-44a2-9a34-f54ddb09e96a}">
-			<name>InterfaceDefinitions</name>
-			<model id="id-0065-00000001" kind="File" guid="{c4170cbd-3f84-4a64-9339-62892638e540}" relid="0x0" childrelidcntr="0x3">
-				<name>Shapes_Base</name>
-				<attribute kind="Path">
-					<value>Base</value>
-				</attribute>
-				<attribute kind="PostPreprocessorDirectives" status="meta">
-					<value></value>
-				</attribute>
-				<attribute kind="PrePreprocessorDirectives" status="meta">
-					<value></value>
-				</attribute>
-				<attribute kind="PrefixTag" status="meta">
-					<value></value>
-				</attribute>
-				<model id="id-0065-00000002" kind="Aggregate" role="Aggregate" guid="{2c677724-9ced-405b-bc67-15def1bc1e5e}" relid="0x0" childrelidcntr="0x3">
-					<name>ShapeType</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="InterfaceDefinition" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>55,13</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="PostPreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="PrePreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="SpecifyIdTag" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="VersionTag" status="meta">
-						<value></value>
-					</attribute>
-					<atom id="id-0066-00000001" kind="Key" role="Key" guid="{bb793c55-d931-45e9-a33e-5bfe29496354}" relid="0x1">
-						<name>Key</name>
-					</atom>
-					<reference id="id-0067-000001a0" kind="Member" role="Member" guid="{0ab29862-b41a-4829-aee4-5730b4051b50}" relid="0x0" referred="id-0066-0000001b">
-						<name>color</name>
-						<regnode name="PartRegs" isopaque="yes">
-							<value></value>
-							<regnode name="InterfaceDefinition" isopaque="yes">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>60,60</value>
-								</regnode>
-							</regnode>
-						</regnode>
-					</reference>
-					<reference id="id-0067-000001a1" kind="Member" role="Member" guid="{bcea1633-a2e9-4e08-be58-027eac1ff634}" relid="0x0" referred="id-0066-00000010">
-						<name>x</name>
-						<regnode name="PartRegs" isopaque="yes">
-							<value></value>
-							<regnode name="InterfaceDefinition" isopaque="yes">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>60,160</value>
-								</regnode>
-							</regnode>
-						</regnode>
-					</reference>
-					<reference id="id-0067-000001a2" kind="Member" role="Member" guid="{9f25a66c-3437-41e8-be08-1216c328d76c}" relid="0x0" referred="id-0066-00000010">
-						<name>y</name>
-						<regnode name="PartRegs" isopaque="yes">
-							<value></value>
-							<regnode name="InterfaceDefinition" isopaque="yes">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>60,260</value>
-								</regnode>
-							</regnode>
-						</regnode>
-					</reference>
-					<reference id="id-0067-000001a3" kind="Member" role="Member" guid="{001275b8-c026-431a-9888-12b9f33b7e0a}" relid="0x0" referred="id-0066-00000010">
-						<name>shapesize</name>
-						<regnode name="PartRegs" isopaque="yes">
-							<value></value>
-							<regnode name="InterfaceDefinition" isopaque="yes">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>60,360</value>
-								</regnode>
-							</regnode>
-						</regnode>
-					</reference>
-					<connection id="id-0068-00000001" kind="KeyMember" role="KeyMember" guid="{8c83c3cc-a1cb-4a4d-b48d-5e109f891a27}" relid="0x2">
-						<name></name>
-						<connpoint role="src" target="id-0066-00000001"/>
-						<connpoint role="dst" target="id-0067-000001a0"/>
-					</connection>
-				</model>
-				<model id="id-0065-00000003" kind="Aggregate" role="Aggregate" guid="{0e77c5f0-0aba-4f5b-aa7e-2bb4033f3014}" relid="0x1" childrelidcntr="0x4">
-					<name>Attributes</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="InterfaceDefinition" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>13,13</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="PostPreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="PrePreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="SpecifyIdTag" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="VersionTag" status="meta">
-						<value></value>
-					</attribute>
-					<atom id="id-0066-00000002" kind="Key" role="Key" guid="{f21575f0-de87-40e8-914a-fa732dc928ae}" relid="0x1">
-						<name>Key</name>
-					</atom>
-					<reference id="id-0067-000001a4" kind="Member" role="Member" guid="{ce0f13a8-95d7-4e81-9635-24db534a7a6f}" relid="0x0" referred="id-0066-0000001b">
-						<name>shape</name>
-						<regnode name="PartRegs" isopaque="yes">
-							<value></value>
-							<regnode name="InterfaceDefinition" isopaque="yes">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>60,60</value>
-								</regnode>
-							</regnode>
-						</regnode>
-					</reference>
-					<reference id="id-0067-000001a5" kind="Member" role="Member" guid="{8cdb9bc6-3c14-4d99-85a4-5b7d8dc25f8f}" relid="0x0" referred="id-0066-0000001b">
-						<name>color</name>
-						<regnode name="PartRegs" isopaque="yes">
-							<value></value>
-							<regnode name="InterfaceDefinition" isopaque="yes">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>60,160</value>
-								</regnode>
-							</regnode>
-						</regnode>
-					</reference>
-					<reference id="id-0067-000001a6" kind="Member" role="Member" guid="{05be6c88-767f-459d-9d8e-b468540741cf}" relid="0x0" referred="id-0066-00000015">
-						<name>speed</name>
-						<regnode name="PartRegs" isopaque="yes">
-							<value></value>
-							<regnode name="InterfaceDefinition" isopaque="yes">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>60,260</value>
-								</regnode>
-							</regnode>
-						</regnode>
-					</reference>
-					<connection id="id-0068-00000002" kind="KeyMember" role="KeyMember" guid="{043fe3e2-eb3a-4458-b279-4b1fd95e91ef}" relid="0x2">
-						<name></name>
-						<connpoint role="src" target="id-0066-00000002"/>
-						<connpoint role="dst" target="id-0067-000001a4"/>
-					</connection>
-					<connection id="id-0068-00000003" kind="KeyMember" role="KeyMember" guid="{5708e4e1-61b5-4445-91fa-2d7aa483c8de}" relid="0x3">
-						<name></name>
-						<connpoint role="src" target="id-0066-00000002"/>
-						<connpoint role="dst" target="id-0067-000001a5"/>
-					</connection>
-				</model>
-				<reference id="id-0067-00000001" kind="Collection" role="Collection" guid="{580e0b9d-134b-4096-96de-fa65dc681c48}" relid="0x2" referred="id-0065-00000002">
-					<name>ShapeTypeSeq</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="InterfaceDefinition" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>55,55</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="PostPreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="PrePreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="SpecifyIdTag" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="VersionTag" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="bound" status="meta">
-						<value></value>
-					</attribute>
-				</reference>
-			</model>
-			<model id="id-0065-00000004" kind="File" guid="{ee8de3d8-c95c-4797-ae4c-3ce1ab410021}" relid="0x1" childrelidcntr="0x1">
-				<name>Shapes_Connector</name>
-				<attribute kind="Path">
-					<value>Connector</value>
-				</attribute>
-				<attribute kind="PostPreprocessorDirectives" status="meta">
-					<value></value>
-				</attribute>
-				<attribute kind="PrePreprocessorDirectives" status="meta">
-					<value></value>
-				</attribute>
-				<attribute kind="PrefixTag" status="meta">
-					<value></value>
-				</attribute>
-				<model id="id-0065-00000005" kind="TemplatePackageInstance" role="TemplatePackageInstance" guid="{9e99a607-a98a-437a-b209-327ec241449b}" relid="0x0" childrelidcntr="0x1">
-					<name>Shapes</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="InterfaceDefinition" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>14,14</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<reference id="id-0067-00000002" kind="TemplateParameterValue" role="TemplateParameterValue" guid="{39425d37-8b87-4546-a6cc-b8d07181c30e}" relid="0x0" referred="id-0065-00000002">
-						<name>TemplateParameterValue</name>
-						<regnode name="PartRegs" isopaque="yes">
-							<value></value>
-							<regnode name="TemplateParameters" isopaque="yes">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>160,60</value>
-								</regnode>
-							</regnode>
-						</regnode>
-					</reference>
-					<reference id="id-0067-00000003" kind="TemplateParameterValue" role="TemplateParameterValue" guid="{7bc6d55c-c934-4f8e-a93d-254dd95cb414}" relid="0x0" referred="id-0067-00000001">
-						<name>TemplateParameterValue</name>
-						<regnode name="PartRegs" isopaque="yes">
-							<value></value>
-							<regnode name="TemplateParameters" isopaque="yes">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>260,60</value>
-								</regnode>
-							</regnode>
-						</regnode>
-					</reference>
-					<reference id="id-0067-000001a7" kind="PackageType" role="PackageType" guid="{0d831506-6efa-41bb-9fe2-838e12e9ffdd}" relid="0x0" referred="id-0065-0000015e">
-						<name>PackageType</name>
-						<regnode name="PartRegs" isopaque="yes">
-							<value></value>
-							<regnode name="TemplateParameters" isopaque="yes">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>60,60</value>
-								</regnode>
-							</regnode>
-						</regnode>
-					</reference>
-				</model>
-			</model>
-			<model id="id-0065-00000006" kind="File" guid="{c484e75a-5d7b-4819-981e-62c78998175a}" relid="0x2" childrelidcntr="0x1">
-				<name>Shapes_Receiver</name>
-				<attribute kind="Path">
-					<value>Receiver</value>
-				</attribute>
-				<attribute kind="PostPreprocessorDirectives" status="meta">
-					<value></value>
-				</attribute>
-				<attribute kind="PrePreprocessorDirectives" status="meta">
-					<value></value>
-				</attribute>
-				<attribute kind="PrefixTag" status="meta">
-					<value></value>
-				</attribute>
-				<model id="id-0065-00000007" kind="Package" role="Package" guid="{34217b02-3360-4f2a-abed-449cb2c7076b}" relid="0x0" childrelidcntr="0x2">
-					<name>Shapes</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="InterfaceDefinition" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>13,13</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="PostPreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="PrePreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="PrefixTag" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="SpecifyIdTag" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="VersionTag" status="meta">
-						<value></value>
-					</attribute>
-					<model id="id-0065-00000008" kind="Component" role="Component" guid="{3d2d3968-c963-40bc-b14d-68809ef1ff49}" relid="0x0" childrelidcntr="0x6">
-						<name>Receiver</name>
-						<regnode name="PartRegs" status="undefined">
-							<value></value>
-							<regnode name="InterfaceDefinition" status="undefined">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>13,11</value>
-								</regnode>
-							</regnode>
-						</regnode>
-						<attribute kind="PostPreprocessorDirectives" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="PrePreprocessorDirectives" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="SpecifyIdTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="UUID">
-							<value>8AA750E8-9B27-11DF-8DCF-000C2958D27B</value>
-						</attribute>
-						<attribute kind="VersionTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="label" status="meta">
-							<value></value>
-						</attribute>
-						<model id="id-0065-00000009" kind="Attribute" role="Attribute" guid="{2c8f3297-a1bc-43ed-b048-d29e2f64d313}" relid="0x0" childrelidcntr="0x1">
-							<name>rate</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="InterfaceDefinition" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>97,13</value>
-									</regnode>
-								</regnode>
-							</regnode>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000001a8" kind="AttributeMember" role="AttributeMember" guid="{2c0b5daa-ed58-43ad-ba99-3dbf78b9c68b}" relid="0x0" referred="id-0066-00000013">
-								<name></name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-0000000a" kind="Attribute" role="Attribute" guid="{634c750e-73e8-4cca-a9f4-899d025ab106}" relid="0x1" childrelidcntr="0x1">
-							<name>get_data</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="InterfaceDefinition" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>55,13</value>
-									</regnode>
-								</regnode>
-							</regnode>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000001a9" kind="AttributeMember" role="AttributeMember" guid="{b4d173b3-b4f3-494c-a204-35f8d4656d88}" relid="0x0" referred="id-0066-0000000b">
-								<name></name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-0000000b" kind="Attribute" role="Attribute" guid="{5061ec64-a010-4489-9b61-796ae3bb7fc1}" relid="0x2" childrelidcntr="0x1">
-							<name>read_data</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="InterfaceDefinition" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>13,13</value>
-									</regnode>
-								</regnode>
-							</regnode>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000001aa" kind="AttributeMember" role="AttributeMember" guid="{3cafd14a-92c4-4578-9758-4889e5367377}" relid="0x0" referred="id-0066-0000000b">
-								<name></name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-0000000c" kind="Attribute" role="Attribute" guid="{9c080d06-7189-42c6-9ab2-3f83304bf231}" relid="0x3" childrelidcntr="0x1">
-							<name>raw_listen</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="InterfaceDefinition" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>97,55</value>
-									</regnode>
-								</regnode>
-							</regnode>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000001ab" kind="AttributeMember" role="AttributeMember" guid="{7fdf72de-09dc-4ca4-99d8-72b1207492db}" relid="0x0" referred="id-0066-0000000b">
-								<name></name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<reference id="id-0067-00000004" kind="TemplatePackageInstanceRef" role="TemplatePackageInstanceRef" guid="{31629fa3-2657-4e5d-92fb-a2db8c620639}" relid="0x4" referred="id-0065-00000005">
-							<name></name>
-						</reference>
-						<reference id="id-0067-000001ac" kind="ExtendedPort" role="ExtendedPort" guid="{788be180-c1ce-4a9a-896e-775bce201091}" relid="0x0" referred="id-0065-00000163">
-							<name>info_out</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="InterfaceDefinition" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>62,223</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-						<reference id="id-0067-000001ad" kind="ExtendedPort" role="ExtendedPort" guid="{e30e1d19-daf0-4e3d-8bbc-ea6d3d7ecf7d}" relid="0x0" referred="id-0065-00000165">
-							<name>info_get</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="InterfaceDefinition" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>55,146</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-						<connection id="id-0068-00000004" kind="TemplatePackageInstanceDecl" role="TemplatePackageInstanceDecl" guid="{380b9d86-6935-4fc1-924f-6e02b5917fee}" relid="0x4">
-							<name></name>
-							<connpoint role="src" target="id-0067-00000004"/>
-							<connpoint role="dst" target="id-0067-000001ad"/>
-						</connection>
-						<connection id="id-0068-00000005" kind="TemplatePackageInstanceDecl" role="TemplatePackageInstanceDecl" guid="{375afcab-830f-4e14-9c54-d5cacd788587}" relid="0x5">
-							<name></name>
-							<connpoint role="src" target="id-0067-00000004"/>
-							<connpoint role="dst" target="id-0067-000001ac"/>
-						</connection>
-					</model>
-				</model>
-			</model>
-			<model id="id-0065-0000000d" kind="File" guid="{a7be3b5e-ff2d-4a8f-ab5b-86b495b4acb1}" relid="0x3" childrelidcntr="0x1">
-				<name>Shapes_Sender</name>
-				<attribute kind="Path">
-					<value>Sender</value>
-				</attribute>
-				<attribute kind="PostPreprocessorDirectives" status="meta">
-					<value></value>
-				</attribute>
-				<attribute kind="PrePreprocessorDirectives" status="meta">
-					<value></value>
-				</attribute>
-				<attribute kind="PrefixTag" status="meta">
-					<value></value>
-				</attribute>
-				<model id="id-0065-0000000e" kind="Package" role="Package" guid="{577535f0-2ded-4f58-ac3b-022dc629751f}" relid="0x0" childrelidcntr="0x1">
-					<name>Shapes</name>
-					<attribute kind="PostPreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="PrePreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="PrefixTag" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="SpecifyIdTag" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="VersionTag" status="meta">
-						<value></value>
-					</attribute>
-					<model id="id-0065-0000000f" kind="Component" role="Component" guid="{d328a900-ed31-4710-b05c-5276f519cf70}" relid="0x0" childrelidcntr="0x6">
-						<name>Sender</name>
-						<regnode name="PartRegs" status="undefined">
-							<value></value>
-							<regnode name="InterfaceDefinition" status="undefined">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>13,11</value>
-								</regnode>
-							</regnode>
-						</regnode>
-						<attribute kind="PostPreprocessorDirectives" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="PrePreprocessorDirectives" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="SpecifyIdTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="UUID">
-							<value>8AA9B338-9B27-11DF-8000-000C2958D27B</value>
-						</attribute>
-						<attribute kind="VersionTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="label" status="meta">
-							<value></value>
-						</attribute>
-						<model id="id-0065-00000010" kind="Attribute" role="Attribute" guid="{fca6d27d-9a0b-43fd-b18d-a6cdee3910c1}" relid="0x0" childrelidcntr="0x1">
-							<name>rate</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="Behavior" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>97,13</value>
-									</regnode>
-								</regnode>
-								<regnode name="InterfaceDefinition" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>97,13</value>
-									</regnode>
-								</regnode>
-							</regnode>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000001ae" kind="AttributeMember" role="AttributeMember" guid="{45aa7c74-5412-4d0a-b02e-d7faab1ebb75}" relid="0x0" referred="id-0066-00000013">
-								<name></name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000011" kind="Attribute" role="Attribute" guid="{23144f21-9fe9-42fc-954b-092274452a81}" relid="0x1" childrelidcntr="0x1">
-							<name>max_x</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="Behavior" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>13,13</value>
-									</regnode>
-								</regnode>
-								<regnode name="InterfaceDefinition" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>13,55</value>
-									</regnode>
-								</regnode>
-							</regnode>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000001af" kind="AttributeMember" role="AttributeMember" guid="{009c6f7b-d5ff-4752-9448-f9423d2351c2}" relid="0x0" referred="id-0066-00000012">
-								<name></name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000012" kind="Attribute" role="Attribute" guid="{eeee1124-c8cd-4f0f-85d7-41f45bbaba06}" relid="0x2" childrelidcntr="0x1">
-							<name>max_y</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="Behavior" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>55,55</value>
-									</regnode>
-								</regnode>
-								<regnode name="InterfaceDefinition" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>55,55</value>
-									</regnode>
-								</regnode>
-							</regnode>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000001b0" kind="AttributeMember" role="AttributeMember" guid="{d6bf3d7a-b34d-4521-ae5a-293a6e955342}" relid="0x0" referred="id-0066-00000012">
-								<name></name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000013" kind="Attribute" role="Attribute" guid="{166cb68c-38a9-4d36-a37b-d25bfb765a8a}" relid="0x3" childrelidcntr="0x1">
-							<name>max_size</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="Behavior" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>55,13</value>
-									</regnode>
-								</regnode>
-								<regnode name="InterfaceDefinition" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>13,13</value>
-									</regnode>
-								</regnode>
-							</regnode>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000001b1" kind="AttributeMember" role="AttributeMember" guid="{529db421-1d05-4acc-ad16-875b5d36ce4b}" relid="0x0" referred="id-0066-00000012">
-								<name></name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000014" kind="Attribute" role="Attribute" guid="{19480211-2314-4cd0-940f-4c3a14883852}" relid="0x4" childrelidcntr="0x1">
-							<name>resize_shape</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="Behavior" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>13,55</value>
-									</regnode>
-								</regnode>
-								<regnode name="InterfaceDefinition" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>55,13</value>
-									</regnode>
-								</regnode>
-							</regnode>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000001b2" kind="AttributeMember" role="AttributeMember" guid="{f1b289ee-7f90-47c7-9dd7-97f9a3047b91}" relid="0x0" referred="id-0066-0000000b">
-								<name></name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<reference id="id-0067-00000005" kind="TemplatePackageInstanceRef" role="TemplatePackageInstanceRef" guid="{035280d6-cc89-4f8b-95c3-cae9c8be9ba4}" relid="0x5" referred="id-0065-00000005">
-							<name></name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="TemplatePackageType" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>12,12</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-						<reference id="id-0067-000001b3" kind="ExtendedPort" role="ExtendedPort" guid="{5f9a3f74-0fd6-4afe-b1b4-f68abab7a3ce}" relid="0x0" referred="id-0065-0000016a">
-							<name>info_write</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="InterfaceDefinition" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>104,160</value>
-									</regnode>
-								</regnode>
-								<regnode name="TemplatePackageType" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>97,97</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-						<connection id="id-0068-00000006" kind="TemplatePackageInstanceDecl" role="TemplatePackageInstanceDecl" guid="{67366c1e-36ef-4972-9ad9-0d2a796087c9}" relid="0x5">
-							<name></name>
-							<connpoint role="src" target="id-0067-00000005"/>
-							<connpoint role="dst" target="id-0067-000001b3"/>
-						</connection>
-					</model>
-				</model>
-			</model>
-		</folder>
-		<folder id="id-006a-00000003" relid="0x1" childrelidcntr="0x3" kind="ImplementationArtifacts" guid="{6dca98d0-09e7-4d6b-894b-955e2fe0a27c}">
-			<name>ImplementationArtifacts</name>
-			<model id="id-0065-00000015" kind="ArtifactContainer" guid="{bd61a69b-9d36-44f7-a7d7-1307cccd35d1}" relid="0x0" childrelidcntr="0x2">
-				<name>Shapes_ReceiverArtifacts</name>
-				<atom id="id-0066-00000003" kind="ImplementationArtifact" role="ImplementationArtifact" guid="{bf211cd8-d04d-418a-8259-e741bc35d964}" relid="0x0">
-					<name>Shapes_Receiver_svnt</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>150,150</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="UUID">
-						<value>8AA9B338-9B27-11DF-8001-000C2958D27B</value>
-					</attribute>
-					<attribute kind="architecture" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="artifactVersion" status="meta">
-						<value>0.0.0.0</value>
-					</attribute>
-					<attribute kind="configuration" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="label" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="location">
-						<value>Receiver_svnt</value>
-					</attribute>
-					<attribute kind="operatingSystem" status="meta">
-						<value></value>
-					</attribute>
-				</atom>
-				<atom id="id-0066-00000004" kind="ImplementationArtifact" role="ImplementationArtifact" guid="{b07b18d0-4e95-47a5-b68c-d622b240f5e1}" relid="0x1">
-					<name>Shapes_Receiver_exec</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>450,150</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="UUID">
-						<value>8AA9B338-9B27-11DF-8002-000C2958D27B</value>
-					</attribute>
-					<attribute kind="architecture" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="artifactVersion" status="meta">
-						<value>0.0.0.0</value>
-					</attribute>
-					<attribute kind="configuration" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="label" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="location">
-						<value>Receiver_exec</value>
-					</attribute>
-					<attribute kind="operatingSystem" status="meta">
-						<value></value>
-					</attribute>
-				</atom>
-			</model>
-			<model id="id-0065-00000016" kind="ArtifactContainer" guid="{4e1adde7-4470-45a6-b941-bb3256ac19ff}" relid="0x1" childrelidcntr="0x2">
-				<name>Shapes_SenderArtifacts</name>
-				<atom id="id-0066-00000005" kind="ImplementationArtifact" role="ImplementationArtifact" guid="{a7c658cb-5835-4c05-924b-674d49d0d261}" relid="0x0">
-					<name>Shapes_Sender_svnt</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>150,150</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="UUID">
-						<value>8AA9B338-9B27-11DF-8003-000C2958D27B</value>
-					</attribute>
-					<attribute kind="architecture" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="artifactVersion" status="meta">
-						<value>0.0.0.0</value>
-					</attribute>
-					<attribute kind="configuration" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="label" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="location">
-						<value>Sender_svnt</value>
-					</attribute>
-					<attribute kind="operatingSystem" status="meta">
-						<value></value>
-					</attribute>
-				</atom>
-				<atom id="id-0066-00000006" kind="ImplementationArtifact" role="ImplementationArtifact" guid="{c170cde2-f995-4f51-b0e6-11b949f09bc0}" relid="0x1">
-					<name>Shapes_Sender_exec</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>450,150</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="UUID">
-						<value>8AA9B338-9B27-11DF-8004-000C2958D27B</value>
-					</attribute>
-					<attribute kind="architecture" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="artifactVersion" status="meta">
-						<value>0.0.0.0</value>
-					</attribute>
-					<attribute kind="configuration" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="label" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="location">
-						<value>Sender_exec</value>
-					</attribute>
-					<attribute kind="operatingSystem" status="meta">
-						<value></value>
-					</attribute>
-				</atom>
-			</model>
-			<model id="id-0065-00000017" kind="ArtifactContainer" guid="{8971658b-9a54-4900-a499-347c345b7431}" relid="0x3" childrelidcntr="0x2">
-				<name>DDS_Shapes_ConnectorArtifacts</name>
-				<atom id="id-0066-00000007" kind="ImplementationArtifact" role="ImplementationArtifact" guid="{9a54fb98-c78c-47f9-a8bc-7e5c8854a0b5}" relid="0x1">
-					<name>Shapes_Connector_exec</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Packaging" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>13,13</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="UUID">
-						<value>8AA9B338-9B27-11DF-8005-000C2958D27B</value>
-					</attribute>
-					<attribute kind="architecture" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="artifactVersion" status="meta">
-						<value>0.0.0.0</value>
-					</attribute>
-					<attribute kind="configuration" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="label" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="location">
-						<value>DDS_Shapes_Connector_exec</value>
-					</attribute>
-					<attribute kind="operatingSystem" status="meta">
-						<value></value>
-					</attribute>
-				</atom>
-				<atom id="id-0066-00000008" kind="ImplementationArtifact" role="ImplementationArtifact" guid="{4e003332-fac9-4392-ac35-e6ba1c3016a9}" relid="0x2">
-					<name>Shapes_Connector_svnt</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Packaging" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>55,13</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="UUID">
-						<value>8AA9B338-9B27-11DF-8006-000C2958D27B</value>
-					</attribute>
-					<attribute kind="architecture" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="artifactVersion" status="meta">
-						<value>0.0.0.0</value>
-					</attribute>
-					<attribute kind="configuration" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="label" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="location">
-						<value>DDS_Shapes_Connector_svnt</value>
-					</attribute>
-					<attribute kind="operatingSystem" status="meta">
-						<value></value>
-					</attribute>
-				</atom>
-			</model>
-		</folder>
-		<folder id="id-006a-00000004" relid="0x2" childrelidcntr="0x4" kind="ComponentImplementations" guid="{366e4113-df59-40f3-a43f-6ba74a2ac952}">
-			<name>ComponentImplementations</name>
-			<model id="id-0065-00000018" kind="ComponentImplementationContainer" guid="{89016009-f7a2-4292-a090-6fb10650f9cc}" relid="0x0" childrelidcntr="0x4">
-				<name>Shapes_ReceiverImpl</name>
-				<atom id="id-0066-00000009" kind="MonolithicImplementation" role="MonolithicImplementation" guid="{b0a429c3-f81a-48f1-a1e1-0bacb332f5e0}" relid="0x0">
-					<name>Shapes_ReceiverImpl</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>250,250</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="UUID">
-						<value>8AA9B338-9B27-11DF-8007-000C2958D27B</value>
-					</attribute>
-					<attribute kind="defaultVersion" status="meta">
-						<value>0.0.0.0</value>
-					</attribute>
-					<attribute kind="label" status="meta">
-						<value></value>
-					</attribute>
-				</atom>
-				<reference id="id-0067-00000006" kind="ComponentRef" role="ComponentRef" guid="{8903b096-df80-427c-a769-00915e001a78}" relid="0x1" referred="id-0065-00000008">
-					<name>Receiver</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>203,71</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-				<reference id="id-0067-00000007" kind="ComponentServantArtifact" role="ComponentServantArtifact" guid="{59776363-2021-4a67-bb87-92f39e615e18}" relid="0x2" referred="id-0066-00000003">
-					<name>Shapes_Receiver_svnt</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>506,347</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="EntryPoint">
-						<value>create_Shapes_Receiver_Servant</value>
-					</attribute>
-				</reference>
-				<reference id="id-0067-00000008" kind="ComponentImplementationArtifact" role="ComponentImplementationArtifact" guid="{192dc1a9-3c2e-447a-902a-70f554331efa}" relid="0x3" referred="id-0066-00000004">
-					<name>Shapes_Receiver_exec</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>506,151</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="EntryPoint">
-						<value>create_Shapes_Receiver_Impl</value>
-					</attribute>
-				</reference>
-				<connection id="id-0068-00000007" kind="Implements" role="Implements" guid="{8163a0d4-e75f-496e-b3df-240e716a4649}" relid="0x1">
-					<name></name>
-					<connpoint role="src" target="id-0066-00000009"/>
-					<connpoint role="dst" target="id-0067-00000006"/>
-				</connection>
-				<connection id="id-0068-00000008" kind="MonolithprimaryArtifact" role="MonolithprimaryArtifact" guid="{22275400-7b26-438e-a61b-1abf55c81d45}" relid="0x2">
-					<name></name>
-					<connpoint role="src" target="id-0066-00000009"/>
-					<connpoint role="dst" target="id-0067-00000007"/>
-				</connection>
-				<connection id="id-0068-00000009" kind="MonolithprimaryArtifact" role="MonolithprimaryArtifact" guid="{65a703c5-a579-40a7-80b6-f6187f1374fe}" relid="0x3">
-					<name></name>
-					<connpoint role="src" target="id-0066-00000009"/>
-					<connpoint role="dst" target="id-0067-00000008"/>
-				</connection>
-			</model>
-			<model id="id-0065-00000019" kind="ComponentImplementationContainer" guid="{dfeee7a5-3686-450c-ab18-2a857b6b7938}" relid="0x1" childrelidcntr="0x4">
-				<name>Shapes_SenderImpl</name>
-				<atom id="id-0066-0000000a" kind="MonolithicImplementation" role="MonolithicImplementation" guid="{11980425-4885-48fc-b653-9267ab632d93}" relid="0x0">
-					<name>Shapes_SenderImpl</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>250,250</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="UUID">
-						<value>8AA9B338-9B27-11DF-8008-000C2958D27B</value>
-					</attribute>
-					<attribute kind="defaultVersion" status="meta">
-						<value>0.0.0.0</value>
-					</attribute>
-					<attribute kind="label" status="meta">
-						<value></value>
-					</attribute>
-				</atom>
-				<reference id="id-0067-00000009" kind="ComponentRef" role="ComponentRef" guid="{af117e75-db1d-4fcf-bf6a-ba4e0b12f5e6}" relid="0x1" referred="id-0065-0000000f">
-					<name>Sender</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>187,75</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-				<reference id="id-0067-0000000a" kind="ComponentServantArtifact" role="ComponentServantArtifact" guid="{1852bef0-6e90-46e9-a2be-2c5dae76a875}" relid="0x2" referred="id-0066-00000005">
-					<name>Shapes_Sender_svnt</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>506,347</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="EntryPoint">
-						<value>create_Shapes_Sender_Servant</value>
-					</attribute>
-				</reference>
-				<reference id="id-0067-0000000b" kind="ComponentImplementationArtifact" role="ComponentImplementationArtifact" guid="{785d5f76-9086-46c9-9072-babbab3b21c4}" relid="0x3" referred="id-0066-00000006">
-					<name>Shapes_Sender_exec</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>506,151</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="EntryPoint">
-						<value>create_Shape_Sender_Impl</value>
-					</attribute>
-				</reference>
-				<connection id="id-0068-0000000a" kind="Implements" role="Implements" guid="{3ec8909b-549c-4e97-bd6b-8ab059709a70}" relid="0x1">
-					<name></name>
-					<connpoint role="src" target="id-0066-0000000a"/>
-					<connpoint role="dst" target="id-0067-00000009"/>
-				</connection>
-				<connection id="id-0068-0000000b" kind="MonolithprimaryArtifact" role="MonolithprimaryArtifact" guid="{66f2a3c8-5797-465f-9d43-2b1c24a353eb}" relid="0x2">
-					<name></name>
-					<connpoint role="src" target="id-0066-0000000a"/>
-					<connpoint role="dst" target="id-0067-0000000a"/>
-				</connection>
-				<connection id="id-0068-0000000c" kind="MonolithprimaryArtifact" role="MonolithprimaryArtifact" guid="{287013ed-1e36-416b-ae90-bc4c55fa29cb}" relid="0x3">
-					<name></name>
-					<connpoint role="src" target="id-0066-0000000a"/>
-					<connpoint role="dst" target="id-0067-0000000b"/>
-				</connection>
-			</model>
-			<model id="id-0065-0000001a" kind="ComponentImplementationContainer" guid="{4363b461-a138-4fd8-86d9-3ded3d0d8414}" relid="0x3" childrelidcntr="0x2">
-				<name>ShapesAssembly</name>
-				<model id="id-0065-0000001b" kind="ComponentAssembly" role="ComponentAssembly" guid="{9706e7c0-1c99-429a-9f53-231d6f84273b}" relid="0x1" childrelidcntr="0x31">
-					<name>ComponentAssembly</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Packaging" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>376,152</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="UUID">
-						<value>8AA9B338-9B27-11DF-8009-000C2958D27B</value>
-					</attribute>
-					<attribute kind="label" status="meta">
-						<value></value>
-					</attribute>
-					<model id="id-0065-0000001c" kind="ConnectorInstance" role="ConnectorInstance" guid="{94cf78f6-2fc6-49a1-a5c9-8c90ba6d4b38}" relid="0x8" childrelidcntr="0x1">
-						<name>ConnectorInstance</name>
-						<regnode name="PartRegs" status="undefined">
-							<value></value>
-							<regnode name="Packaging" status="undefined">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>469,98</value>
-								</regnode>
-							</regnode>
-						</regnode>
-						<attribute kind="UUID">
-							<value>8AA9B338-9B27-11DF-800A-000C2958D27B</value>
-						</attribute>
-						<reference id="id-0067-000001b4" kind="ConnectorImplementationType" role="ConnectorImplementationType" guid="{d25b00b4-6af9-4f34-b276-065ca402a922}" relid="0x1" referred="id-0066-0000001d">
-							<name>ConnectorImplementation</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="ConnectorImplAspect" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>367,171</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-					</model>
-					<model id="id-0065-0000001d" kind="Property" role="Property" guid="{2c510c84-e50f-4c01-98ba-3148bcb05c12}" relid="0xb" childrelidcntr="0x1">
-						<name>topic_name</name>
-						<regnode name="PartRegs" status="undefined">
-							<value></value>
-							<regnode name="Packaging" status="undefined">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>461,160</value>
-								</regnode>
-							</regnode>
-						</regnode>
-						<attribute kind="DataValue" status="meta">
-							<value></value>
-						</attribute>
-						<reference id="id-0067-000001b5" kind="DataValue" role="DataValue" guid="{ccce4e67-6079-4d8b-b321-d0367156b90e}" relid="0x1" referred="id-0066-0000001b">
-							<name>topic_name</name>
-							<attribute kind="Value">
-								<value>Square</value>
-							</attribute>
-						</reference>
-					</model>
-					<model id="id-0065-0000001e" kind="Property" role="Property" guid="{912d9cc1-7c0e-44f8-8f1a-b949f432a590}" relid="0xd" childrelidcntr="0x1">
-						<name>max_x</name>
-						<regnode name="PartRegs" status="undefined">
-							<value></value>
-							<regnode name="Packaging" status="undefined">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>13,174</value>
-								</regnode>
-							</regnode>
-						</regnode>
-						<attribute kind="DataValue" status="meta">
-							<value></value>
-						</attribute>
-						<reference id="id-0067-000001b6" kind="DataValue" role="DataValue" guid="{bdb6a858-b511-40c2-ae2f-9537b5d81051}" relid="0x1" referred="id-0066-00000012">
-							<name>max_x</name>
-							<attribute kind="Value">
-								<value>225</value>
-							</attribute>
-						</reference>
-					</model>
-					<model id="id-0065-0000001f" kind="Property" role="Property" guid="{af02ade8-9e6d-4245-83be-ebc0bbb40b20}" relid="0xf" childrelidcntr="0x1">
-						<name>rate</name>
-						<regnode name="PartRegs" status="undefined">
-							<value></value>
-							<regnode name="Packaging" status="undefined">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>48,223</value>
-								</regnode>
-							</regnode>
-						</regnode>
-						<attribute kind="DataValue" status="meta">
-							<value></value>
-						</attribute>
-						<reference id="id-0067-000001b7" kind="DataValue" role="DataValue" guid="{5611ebb0-cb9f-4913-9989-b6580c8081d2}" relid="0x1" referred="id-0066-00000013">
-							<name>rate</name>
-							<attribute kind="Value">
-								<value>10</value>
-							</attribute>
-						</reference>
-					</model>
-					<model id="id-0065-00000020" kind="Property" role="Property" guid="{18eef87e-12d2-4039-877d-520110d27a00}" relid="0x10" childrelidcntr="0x1">
-						<name>resize_shape</name>
-						<regnode name="PartRegs" status="undefined">
-							<value></value>
-							<regnode name="Packaging" status="undefined">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>83,272</value>
-								</regnode>
-							</regnode>
-						</regnode>
-						<attribute kind="DataValue" status="meta">
-							<value></value>
-						</attribute>
-						<reference id="id-0067-000001b8" kind="DataValue" role="DataValue" guid="{6e388b84-8c84-4b7b-9d3d-550a3bf4e5d2}" relid="0x1" referred="id-0066-0000000b">
-							<name>resize_shape</name>
-							<attribute kind="Value">
-								<value>true</value>
-							</attribute>
-						</reference>
-					</model>
-					<model id="id-0065-00000021" kind="Property" role="Property" guid="{f58faf84-27dd-4bfb-88af-196debb66b20}" relid="0x11" childrelidcntr="0x1">
-						<name>max_y</name>
-						<regnode name="PartRegs" status="undefined">
-							<value></value>
-							<regnode name="Packaging" status="undefined">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>125,321</value>
-								</regnode>
-							</regnode>
-						</regnode>
-						<attribute kind="DataValue" status="meta">
-							<value></value>
-						</attribute>
-						<reference id="id-0067-000001b9" kind="DataValue" role="DataValue" guid="{e4011a90-c749-4961-94e4-53745e898d64}" relid="0x1" referred="id-0066-00000012">
-							<name>max_y</name>
-							<attribute kind="Value">
-								<value>250</value>
-							</attribute>
-						</reference>
-					</model>
-					<model id="id-0065-00000022" kind="Property" role="Property" guid="{651b818a-6672-4653-8383-d38c82b0be97}" relid="0x15" childrelidcntr="0x1">
-						<name>max_size</name>
-						<regnode name="PartRegs" status="undefined">
-							<value></value>
-							<regnode name="Packaging" status="undefined">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>167,349</value>
-								</regnode>
-							</regnode>
-						</regnode>
-						<attribute kind="DataValue" status="meta">
-							<value></value>
-						</attribute>
-						<reference id="id-0067-000001ba" kind="DataValue" role="DataValue" guid="{ee46d9ef-ab27-451a-a6c3-8511463ecb64}" relid="0x1" referred="id-0066-00000012">
-							<name>max_size</name>
-							<attribute kind="Value">
-								<value>25</value>
-							</attribute>
-						</reference>
-					</model>
-					<model id="id-0065-00000023" kind="Property" role="Property" guid="{7833ee0a-6031-41ad-a12b-8cfcd023bfd1}" relid="0x17" childrelidcntr="0x1">
-						<name>rate</name>
-						<regnode name="PartRegs" status="undefined">
-							<value></value>
-							<regnode name="Packaging" status="undefined">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>706,251</value>
-								</regnode>
-							</regnode>
-						</regnode>
-						<attribute kind="DataValue" status="meta">
-							<value></value>
-						</attribute>
-						<reference id="id-0067-000001bb" kind="DataValue" role="DataValue" guid="{70fc44a9-5ffe-4500-bebc-8450ed09e151}" relid="0x1" referred="id-0066-00000013">
-							<name>rate</name>
-							<attribute kind="Value">
-								<value>1</value>
-							</attribute>
-						</reference>
-					</model>
-					<model id="id-0065-00000024" kind="Property" role="Property" guid="{1072e7a4-89bc-4dcb-be32-2bd947aafa2c}" relid="0x18" childrelidcntr="0x1">
-						<name>get_data</name>
-						<regnode name="PartRegs" status="undefined">
-							<value></value>
-							<regnode name="Packaging" status="undefined">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>741,300</value>
-								</regnode>
-							</regnode>
-						</regnode>
-						<attribute kind="DataValue" status="meta">
-							<value></value>
-						</attribute>
-						<reference id="id-0067-000001bc" kind="DataValue" role="DataValue" guid="{73f04b30-3c7d-42c1-b7c5-42ffbf207c48}" relid="0x1" referred="id-0066-0000000b">
-							<name>get_data</name>
-							<attribute kind="Value">
-								<value>false</value>
-							</attribute>
-						</reference>
-					</model>
-					<model id="id-0065-00000025" kind="Property" role="Property" guid="{6ee1b949-841e-41f7-985e-99144c44e573}" relid="0x19" childrelidcntr="0x1">
-						<name>read_data</name>
-						<regnode name="PartRegs" status="undefined">
-							<value></value>
-							<regnode name="Packaging" status="undefined">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>790,335</value>
-								</regnode>
-							</regnode>
-						</regnode>
-						<attribute kind="DataValue" status="meta">
-							<value></value>
-						</attribute>
-						<reference id="id-0067-000001bd" kind="DataValue" role="DataValue" guid="{a91a70ae-6574-405c-922b-b2c1ac459631}" relid="0x1" referred="id-0066-0000000b">
-							<name>read_data</name>
-							<attribute kind="Value">
-								<value>false</value>
-							</attribute>
-						</reference>
-					</model>
-					<model id="id-0065-00000026" kind="Property" role="Property" guid="{77046732-ac90-457e-805c-d3da570a92a6}" relid="0x1d" childrelidcntr="0x1">
-						<name>raw_listen</name>
-						<regnode name="PartRegs" status="undefined">
-							<value></value>
-							<regnode name="Packaging" status="undefined">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>839,363</value>
-								</regnode>
-							</regnode>
-						</regnode>
-						<attribute kind="DataValue" status="meta">
-							<value></value>
-						</attribute>
-						<reference id="id-0067-000001be" kind="DataValue" role="DataValue" guid="{a6714792-c17c-4031-8f08-8369a8935b9b}" relid="0x1" referred="id-0066-0000000b">
-							<name>raw_listen</name>
-							<attribute kind="Value">
-								<value>true</value>
-							</attribute>
-						</reference>
-					</model>
-					<model id="id-0065-00000027" kind="ComponentInstance" role="ComponentInstance" guid="{2523eeaa-a8fc-4171-be8b-064e53b19e81}" relid="0x25" childrelidcntr="0x7">
-						<name>ReceiverInstance</name>
-						<regnode name="PartRegs" status="undefined">
-							<value></value>
-							<regnode name="Packaging" status="undefined">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>602,78</value>
-								</regnode>
-							</regnode>
-						</regnode>
-						<attribute kind="UUID">
-							<value>8AA9B338-9B27-11DF-800B-000C2958D27B</value>
-						</attribute>
-						<reference id="id-0067-0000000c" kind="ComponentInstanceType" role="ComponentInstanceType" guid="{a499f8a7-e9b0-4792-9ac0-c8c91fb2b31c}" relid="0x1" referred="id-0066-00000009">
-							<name>Shapes_ReceiverImpl</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="ComponentImplementation" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>326,200</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-						<reference id="id-0067-0000000d" kind="AttributeInstance" role="AttributeInstance" guid="{70aca9f6-d4b7-4538-a23b-e2e0e12cdd1f}" relid="0x2" referred="id-0065-00000009">
-							<name>rate</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="ComponentInterface" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>545,153</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-						<reference id="id-0067-0000000e" kind="AttributeInstance" role="AttributeInstance" guid="{0a36fcbb-8621-458e-bdc9-85eebc69c547}" relid="0x3" referred="id-0065-0000000a">
-							<name>get_data</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="ComponentInterface" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>545,34</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-						<reference id="id-0067-0000000f" kind="AttributeInstance" role="AttributeInstance" guid="{fb55a1ec-3130-4e6d-81f2-64bfd585a25a}" relid="0x4" referred="id-0065-0000000c">
-							<name>raw_listen</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="ComponentInterface" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>545,202</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-						<reference id="id-0067-00000010" kind="AttributeInstance" role="AttributeInstance" guid="{4a0247cf-0d39-4f9b-a467-c3ca0b859589}" relid="0x5" referred="id-0065-0000000b">
-							<name>read_data</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="ComponentInterface" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>545,90</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-						<reference id="id-0067-000001bf" kind="ExtendedPortInstance" role="ExtendedPortInstance" guid="{2e78b0b1-43d9-4165-ac63-cedf17d824cc}" relid="0x6" referred="id-0067-000001ac">
-							<name>info_out</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="ComponentInterface" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>93,9</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-						<reference id="id-0067-000001c0" kind="ExtendedPortInstance" role="ExtendedPortInstance" guid="{f41b80f1-fca6-43ee-abd7-feb62630fb4e}" relid="0x7" referred="id-0067-000001ad">
-							<name>info_get</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="ComponentInterface" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>51,51</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-					</model>
-					<model id="id-0065-00000028" kind="ComponentInstance" role="ComponentInstance" guid="{74e989fd-1656-424c-b902-6b23aaaf70f1}" relid="0x26" childrelidcntr="0x7">
-						<name>SenderInstance</name>
-						<regnode name="PartRegs" status="undefined">
-							<value></value>
-							<regnode name="Packaging" status="undefined">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>231,78</value>
-								</regnode>
-							</regnode>
-						</regnode>
-						<attribute kind="UUID">
-							<value>8AA9B338-9B27-11DF-800C-000C2958D27B</value>
-						</attribute>
-						<reference id="id-0067-00000011" kind="ComponentInstanceType" role="ComponentInstanceType" guid="{04e14456-33fc-4d1e-b99e-ef9ae287bd84}" relid="0x1" referred="id-0066-0000000a">
-							<name>Shapes_SenderImpl</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="ComponentImplementation" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>333,214</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-						<reference id="id-0067-00000012" kind="AttributeInstance" role="AttributeInstance" guid="{dedfb2f7-38f2-4593-a86c-8a7679585662}" relid="0x2" referred="id-0065-00000010">
-							<name>rate</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="ComponentInterface" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>97,13</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-						<reference id="id-0067-00000013" kind="AttributeInstance" role="AttributeInstance" guid="{74bcf19a-65bc-4dae-8ecb-550ae1dee3eb}" relid="0x3" referred="id-0065-00000012">
-							<name>max_y</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="ComponentInterface" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>55,55</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-						<reference id="id-0067-00000014" kind="AttributeInstance" role="AttributeInstance" guid="{2027fc5e-e9b4-4792-8676-dc8c674642ea}" relid="0x4" referred="id-0065-00000013">
-							<name>max_size</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="ComponentInterface" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>97,55</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-						<reference id="id-0067-00000015" kind="AttributeInstance" role="AttributeInstance" guid="{068d69d1-7028-459c-8858-4e1e53847ebb}" relid="0x5" referred="id-0065-00000014">
-							<name>resize_shape</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="ComponentInterface" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>13,13</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-						<reference id="id-0067-00000016" kind="AttributeInstance" role="AttributeInstance" guid="{12367879-e672-442a-b0f2-0b7594cf456f}" relid="0x6" referred="id-0065-00000011">
-							<name>max_x</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="ComponentInterface" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>55,13</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-						<reference id="id-0067-000001c1" kind="ExtendedPortInstance" role="ExtendedPortInstance" guid="{bac379e4-046f-4c31-8a9d-a12c4b639472}" relid="0x7" referred="id-0067-000001b3">
-							<name>info_write</name>
-							<regnode name="PartRegs" status="undefined">
-								<value></value>
-								<regnode name="ComponentInterface" status="undefined">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>331,177</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-					</model>
-					<connection id="id-0068-0000000d" kind="AssemblyConfigProperty" role="AssemblyConfigProperty" guid="{f60a551b-a825-41da-8e97-c3b22ae20215}" relid="0xc">
-						<name>AssemblyConfigProperty</name>
-						<regnode name="autorouterPref" isopaque="yes">
-							<value>Sn</value>
-						</regnode>
-						<connpoint role="src" target="id-0065-0000001c"/>
-						<connpoint role="dst" target="id-0065-0000001d"/>
-					</connection>
-					<connection id="id-0068-0000000e" kind="Publish" role="Publish" guid="{df8267a2-208e-46b9-88c4-5c8cb2e6dde3}" relid="0x27">
-						<name>supplier</name>
-						<regnode name="autorouterPref" isopaque="yes">
-							<value>w</value>
-						</regnode>
-						<connpoint role="dst" target="id-0065-0000001c"/>
-						<connpoint role="src" target="id-0067-000001c1"/>
-					</connection>
-					<connection id="id-0068-0000000f" kind="Consume" role="Consume" guid="{d9c619f9-ceb3-4b16-a8ed-9b3c3baef4c3}" relid="0x28">
-						<name>push_consumer</name>
-						<regnode name="autorouterPref" isopaque="yes">
-							<value>E</value>
-						</regnode>
-						<connpoint role="src" target="id-0065-0000001c"/>
-						<connpoint role="dst" target="id-0067-000001bf"/>
-					</connection>
-					<connection id="id-0068-00000010" kind="AttributeValue" role="AttributeValue" guid="{9b7a4ee4-e5c9-4dc6-a8fe-c7b3ae4ad122}" relid="0x29">
-						<name>AttributeValue</name>
-						<regnode name="autorouterPref" isopaque="yes">
-							<value>n</value>
-						</regnode>
-						<connpoint role="dst" target="id-0065-00000020"/>
-						<connpoint role="src" target="id-0067-00000015"/>
-					</connection>
-					<connection id="id-0068-00000011" kind="AttributeValue" role="AttributeValue" guid="{39ba389b-5ae1-4015-a80a-acad0f9b0e6c}" relid="0x2a">
-						<name>AttributeValue</name>
-						<regnode name="autorouterPref" isopaque="yes">
-							<value>n</value>
-						</regnode>
-						<connpoint role="dst" target="id-0065-0000001e"/>
-						<connpoint role="src" target="id-0067-00000016"/>
-					</connection>
-					<connection id="id-0068-00000012" kind="AttributeValue" role="AttributeValue" guid="{806a31b1-2d4d-457c-bad2-8f50415afdec}" relid="0x2b">
-						<name>AttributeValue</name>
-						<regnode name="autorouterPref" isopaque="yes">
-							<value>n</value>
-						</regnode>
-						<connpoint role="dst" target="id-0065-0000001f"/>
-						<connpoint role="src" target="id-0067-00000012"/>
-					</connection>
-					<connection id="id-0068-00000013" kind="AttributeValue" role="AttributeValue" guid="{2d098e62-0428-4fe7-8a36-04d7f4bc9b61}" relid="0x2c">
-						<name>AttributeValue</name>
-						<regnode name="autorouterPref" isopaque="yes">
-							<value>n</value>
-						</regnode>
-						<connpoint role="dst" target="id-0065-00000021"/>
-						<connpoint role="src" target="id-0067-00000013"/>
-					</connection>
-					<connection id="id-0068-00000014" kind="AttributeValue" role="AttributeValue" guid="{755cc591-c4c0-459b-b8e1-17aeafd7a932}" relid="0x2d">
-						<name>AttributeValue</name>
-						<regnode name="autorouterPref" isopaque="yes">
-							<value>n</value>
-						</regnode>
-						<connpoint role="dst" target="id-0065-00000022"/>
-						<connpoint role="src" target="id-0067-00000014"/>
-					</connection>
-					<connection id="id-0068-00000015" kind="AttributeValue" role="AttributeValue" guid="{62948403-8b32-45c0-920d-788ccbbdfba6}" relid="0x2e">
-						<name>AttributeValue</name>
-						<regnode name="autorouterPref" isopaque="yes">
-							<value>n</value>
-						</regnode>
-						<connpoint role="dst" target="id-0065-00000023"/>
-						<connpoint role="src" target="id-0067-0000000d"/>
-					</connection>
-					<connection id="id-0068-00000016" kind="AttributeValue" role="AttributeValue" guid="{f5d3e75b-0966-4638-bed4-7606d55ccc58}" relid="0x2f">
-						<name>AttributeValue</name>
-						<regnode name="autorouterPref" isopaque="yes">
-							<value>n</value>
-						</regnode>
-						<connpoint role="dst" target="id-0065-00000024"/>
-						<connpoint role="src" target="id-0067-0000000e"/>
-					</connection>
-					<connection id="id-0068-00000017" kind="AttributeValue" role="AttributeValue" guid="{9771af10-cf8b-4fc0-9419-17872785a8bb}" relid="0x30">
-						<name>AttributeValue</name>
-						<regnode name="autorouterPref" isopaque="yes">
-							<value>n</value>
-						</regnode>
-						<connpoint role="dst" target="id-0065-00000025"/>
-						<connpoint role="src" target="id-0067-00000010"/>
-					</connection>
-					<connection id="id-0068-00000018" kind="AttributeValue" role="AttributeValue" guid="{fc66b3fb-f08e-462a-b9cd-c3aace1e7941}" relid="0x31">
-						<name>AttributeValue</name>
-						<regnode name="autorouterPref" isopaque="yes">
-							<value>n</value>
-						</regnode>
-						<connpoint role="dst" target="id-0065-00000026"/>
-						<connpoint role="src" target="id-0067-0000000f"/>
-					</connection>
-				</model>
-			</model>
-		</folder>
-		<folder id="id-006a-00000005" relid="0x3" childrelidcntr="0x12" kind="PredefinedTypes" guid="{cbe1298b-1473-4753-9726-de8b263b513a}">
-			<name>PredefinedTypes</name>
-			<atom id="id-0066-0000000b" kind="Boolean" guid="{53acb444-c5b1-432c-9ec5-a3f3795f593f}" relid="0x0">
-				<name>Boolean</name>
-			</atom>
-			<atom id="id-0066-0000000c" kind="Byte" guid="{9ff0da18-0ef7-4def-ba0d-fbf3df2a19fe}" relid="0x1">
-				<name>Byte</name>
-			</atom>
-			<atom id="id-0066-0000000d" kind="Char" guid="{1079e57a-3842-4d6a-93e0-1b4a6eac360b}" relid="0x2">
-				<name>Char</name>
-			</atom>
-			<atom id="id-0066-0000000e" kind="WideChar" guid="{662f0832-2548-43eb-8d4e-1210b2cc9a66}" relid="0x3">
-				<name>WideChar</name>
-			</atom>
-			<atom id="id-0066-0000000f" kind="ShortInteger" guid="{3fd3f39f-382b-44cc-b726-514e338adb75}" relid="0x4">
-				<name>ShortInteger</name>
-			</atom>
-			<atom id="id-0066-00000010" kind="LongInteger" guid="{e3aa3cd1-5dae-4aa4-b32b-18843ea6a191}" relid="0x5">
-				<name>LongInteger</name>
-			</atom>
-			<atom id="id-0066-00000011" kind="LongLongInteger" guid="{42d7014a-48ca-4f1b-8668-5f2cdf2dee86}" relid="0x6">
-				<name>LongLongInteger</name>
-			</atom>
-			<atom id="id-0066-00000012" kind="UnsignedShortInteger" guid="{83f74784-35cf-4183-9ed3-395d43053a5a}" relid="0x7">
-				<name>UnsignedShortInteger</name>
-			</atom>
-			<atom id="id-0066-00000013" kind="UnsignedLongInteger" guid="{617bcb0e-13ec-43c2-8ed2-04e19e2a158e}" relid="0x8">
-				<name>UnsignedLongInteger</name>
-			</atom>
-			<atom id="id-0066-00000014" kind="UnsignedLongLongInteger" guid="{bf1a91e0-07d8-4870-a226-23d07a39a1ae}" relid="0x9">
-				<name>UnsignedLongLongInteger</name>
-			</atom>
-			<atom id="id-0066-00000015" kind="FloatNumber" guid="{c2670960-8b24-4518-bb67-784066aeb47e}" relid="0xa">
-				<name>FloatNumber</name>
-			</atom>
-			<atom id="id-0066-00000016" kind="DoubleNumber" guid="{eee443b7-2a99-45f5-85aa-358bfcd3307b}" relid="0xb">
-				<name>DoubleNumber</name>
-			</atom>
-			<atom id="id-0066-00000017" kind="LongDoubleNumber" guid="{55949982-aa0f-486b-8166-d36f6549f0c9}" relid="0xc">
-				<name>LongDoubleNumber</name>
-			</atom>
-			<atom id="id-0066-00000018" kind="GenericObject" guid="{59ea3bde-0a44-4550-b57f-6dc4ee1129bc}" relid="0xd">
-				<name>GenericObject</name>
-			</atom>
-			<atom id="id-0066-00000019" kind="GenericValue" guid="{6df923df-c4f7-4b8f-8314-ff3f0de581b0}" relid="0xe">
-				<name>GenericValue</name>
-			</atom>
-			<atom id="id-0066-0000001a" kind="GenericValueObject" guid="{855ab75c-94ac-489a-a979-89b83a0d1630}" relid="0xf">
-				<name>GenericValueObject</name>
-			</atom>
-			<atom id="id-0066-0000001b" kind="String" guid="{157c2583-10df-4ed3-b830-60777aaf41f2}" relid="0x10">
-				<name>String</name>
-			</atom>
-			<atom id="id-0066-0000001c" kind="WideString" guid="{75ebce03-65f9-406c-b954-7cb7bf6604ba}" relid="0x11">
-				<name>WideString</name>
-			</atom>
-		</folder>
-		<folder id="id-006a-00000006" relid="0x5" childrelidcntr="0x1" kind="ConnectorImplementations" guid="{1bb94077-88e0-4f3b-80a2-7e64df8df4f5}">
-			<name>Connector Implementations</name>
-			<model id="id-0065-00000029" kind="ConnectorImplementationContainer" guid="{d1b41cea-3979-4b1b-8192-bc9f0eeee967}" relid="0x1" childrelidcntr="0x7">
-				<name>DDS_Shapes_Connector</name>
-				<atom id="id-0066-0000001d" kind="ConnectorImplementation" role="ConnectorImplementation" guid="{f171bd99-d282-4bf9-a55c-ea985640b87a}" relid="0x1">
-					<name>ConnectorImplementation</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Packaging" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>495,320</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="UUID">
-						<value>8AAC1588-9B27-11DF-8000-000C2958D27B</value>
-					</attribute>
-					<attribute kind="label" status="meta">
-						<value></value>
-					</attribute>
-				</atom>
-				<reference id="id-0067-00000017" kind="ComponentImplementationArtifact" role="ComponentImplementationArtifact" guid="{c1ae9ec4-8990-457c-8a9d-72725b1ad0da}" relid="0x4" referred="id-0066-00000007">
-					<name>Shapes_Connector_exec</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Packaging" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>702,270</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="EntryPoint">
-						<value>create_Shapes_DDS_Event_Impl</value>
-					</attribute>
-				</reference>
-				<reference id="id-0067-00000018" kind="ComponentServantArtifact" role="ComponentServantArtifact" guid="{0ee932e9-2e4c-4cd5-9ac0-f8f09191b43f}" relid="0x5" referred="id-0066-00000008">
-					<name>Shapes_Connector_svnt</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Packaging" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>702,368</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="EntryPoint">
-						<value>create_Shapes_DDS_Event_Servant</value>
-					</attribute>
-				</reference>
-				<reference id="id-0067-000001c2" kind="ConnectorType" role="ConnectorType" guid="{7ee9b774-cd3d-4062-befd-a3407b1f0d25}" relid="0x2" referred="id-0065-0000015f">
-					<name>ConnectorType</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Packaging" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>460,110</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-				<connection id="id-0068-00000019" kind="ConnectorImplements" role="ConnectorImplements" guid="{f4ab173d-0c67-4038-bd8b-23ba9ba75314}" relid="0x3">
-					<name>ConnectorImplements</name>
-					<regnode name="autorouterPref" isopaque="yes">
-						<value>Ns</value>
-					</regnode>
-					<connpoint role="src" target="id-0066-0000001d"/>
-					<connpoint role="dst" target="id-0067-000001c2"/>
-				</connection>
-				<connection id="id-0068-0000001a" kind="MonolithprimaryArtifact" role="MonolithprimaryArtifact" guid="{a2ea556e-8fa7-4a74-b770-5e1f88b59a98}" relid="0x6">
-					<name>MonolithprimaryArtifact</name>
-					<regnode name="autorouterPref" isopaque="yes">
-						<value>Ew</value>
-					</regnode>
-					<connpoint role="src" target="id-0066-0000001d"/>
-					<connpoint role="dst" target="id-0067-00000017"/>
-				</connection>
-				<connection id="id-0068-0000001b" kind="MonolithprimaryArtifact" role="MonolithprimaryArtifact" guid="{382b4753-7f9f-4d84-8342-82da6da7e692}" relid="0x7">
-					<name>MonolithprimaryArtifact</name>
-					<regnode name="autorouterPref" isopaque="yes">
-						<value>Ew</value>
-					</regnode>
-					<connpoint role="src" target="id-0066-0000001d"/>
-					<connpoint role="dst" target="id-0067-00000018"/>
-				</connection>
-			</model>
-		</folder>
-		<folder id="id-006a-00000007" relid="0x7" childrelidcntr="0x1" kind="Targets" guid="{bd9d5937-1c73-44e8-b516-7c7b5202464c}">
-			<name>Targets</name>
-			<model id="id-0065-0000002a" kind="Domain" guid="{2c0c57aa-823b-4b80-8a12-a70b46789e13}" relid="0x1" childrelidcntr="0x2">
-				<name>TestDomain</name>
-				<attribute kind="UUID">
-					<value>8AAC1588-9B27-11DF-8001-000C2958D27B</value>
-				</attribute>
-				<attribute kind="label" status="meta">
-					<value></value>
-				</attribute>
-				<model id="id-0065-0000002b" kind="Node" role="Node" guid="{c12377bb-fb78-4bff-b639-a7126403200f}" relid="0x1" childrelidcntr="0x0">
-					<name>ReceiverNode</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Target" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>300,237</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="architecture" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="label" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="operatingSystem" status="meta">
-						<value></value>
-					</attribute>
-				</model>
-				<model id="id-0065-0000002c" kind="Node" role="Node" guid="{44bd27bf-0272-410f-aa84-a89a1054f835}" relid="0x2" childrelidcntr="0x0">
-					<name>SenderNode</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Target" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>510,244</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="architecture" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="label" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="operatingSystem" status="meta">
-						<value></value>
-					</attribute>
-				</model>
-			</model>
-		</folder>
-		<folder id="id-006a-00000008" relid="0x8" childrelidcntr="0x1" kind="DeploymentPlans" guid="{62f8e528-4668-49cc-9376-811d48cbb5cd}">
-			<name>DeploymentPlans</name>
-			<model id="id-0065-0000002d" kind="DeploymentPlan" guid="{16eec04c-d3e9-49e0-a6aa-aed6b7121a7d}" relid="0x1" childrelidcntr="0x8">
-				<name>SimpleDeployment</name>
-				<attribute kind="UUID">
-					<value>8AAC1588-9B27-11DF-8002-000C2958D27B</value>
-				</attribute>
-				<attribute kind="label" status="meta">
-					<value></value>
-				</attribute>
-				<reference id="id-0067-00000019" kind="NodeReference" role="NodeReference" guid="{41aa0c77-8844-4f37-8323-bbab98bb8067}" relid="0x1" referred="id-0065-0000002b">
-					<name>ReceiverNode</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="NodeMapping" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>522,60</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-				<reference id="id-0067-0000001a" kind="NodeReference" role="NodeReference" guid="{18fdb1e9-6506-498b-ad03-49c673f12f0d}" relid="0x2" referred="id-0065-0000002c">
-					<name>SenderNode</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="NodeMapping" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>242,46</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-				<reference id="id-0067-0000001b" kind="ComponentInstanceRef" role="ComponentInstanceRef" guid="{df5ecc35-bac3-4b10-8d9f-7fb48f86b427}" relid="0x7" referred="id-0065-00000027">
-					<name>ReceiverInstance</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="NodeMapping" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>488,279</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-				<reference id="id-0067-0000001c" kind="ComponentInstanceRef" role="ComponentInstanceRef" guid="{30958a33-5c98-4480-85d8-862645ff3b7e}" relid="0x8" referred="id-0065-00000028">
-					<name>SenderInstance</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="NodeMapping" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>194,279</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-				<connection id="id-0068-0000001c" kind="InstanceMapping" role="InstanceMapping" guid="{2728d436-990b-4de9-a706-3d2a8979e0ab}" relid="0x4">
-					<name></name>
-					<connpoint role="dst" target="id-0067-00000019"/>
-					<connpoint role="src" target="id-0069-00000001"/>
-				</connection>
-				<connection id="id-0068-0000001d" kind="InstanceMapping" role="InstanceMapping" guid="{0775b537-df69-4427-9fdf-1b16ee8fb12a}" relid="0x6">
-					<name></name>
-					<connpoint role="dst" target="id-0067-0000001a"/>
-					<connpoint role="src" target="id-0069-00000002"/>
-				</connection>
-				<set id="id-0069-00000001" kind="CollocationGroup" role="CollocationGroup" guid="{6d5e7eda-5099-406b-b98f-dbf8cdb17694}" relid="0x3" members="id-0067-0000001b">
-					<name>DefaultGroup</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="NodeMapping" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>524,188</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</set>
-				<set id="id-0069-00000002" kind="CollocationGroup" role="CollocationGroup" guid="{4b620afb-ec57-4d39-a9f6-6147f8c72bbd}" relid="0x5" members="id-0067-0000001c">
-					<name>DefaultGroup</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="NodeMapping" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>244,174</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</set>
-			</model>
-		</folder>
-		<folder id="id-006a-00000009" relid="0x1" childrelidcntr="0x4" libref="MGA=E:/proj/vc9/ACE_TAO_CIAO/CIAO/connectors/dds4ccm/models/dds4ccm.mga" kind="RootFolder" guid="{dcf2ae2f-94b5-41a4-8798-28318fff8fb8}">
-			<name>MGA=E:/proj/vc9/ACE_TAO_CIAO/CIAO/connectors/dds4ccm/models/dds4ccm.mga</name>
-			<folder id="id-006a-0000000a" relid="0x2" childrelidcntr="0x0" kind="ComponentImplementations" guid="{761a1f97-c812-44a4-95d4-bedbffef5e88}">
-				<name>ComponentImplementations</name>
-			</folder>
-			<folder id="id-006a-0000000b" relid="0x3" childrelidcntr="0x12" kind="PredefinedTypes" guid="{dddb800b-cb2d-44c1-8565-04c55466865d}">
-				<name>PredefinedTypes</name>
-				<atom id="id-0066-0000001e" kind="WideString" guid="{e783ca74-1607-4282-996b-f76573af40f4}" relid="0x11">
-					<name>WideString</name>
-				</atom>
-				<atom id="id-0066-0000001f" kind="String" guid="{27e3d44c-6193-4866-b3af-e20dff54bbab}" relid="0x10">
-					<name>String</name>
-				</atom>
-				<atom id="id-0066-00000020" kind="GenericValueObject" guid="{78214cf5-c763-4757-8021-1f4048f149db}" relid="0xf">
-					<name>GenericValueObject</name>
-				</atom>
-				<atom id="id-0066-00000021" kind="GenericValue" guid="{f8a3717c-66ac-4036-82ca-cd1ae722f2f5}" relid="0xe">
-					<name>GenericValue</name>
-				</atom>
-				<atom id="id-0066-00000022" kind="GenericObject" guid="{9febfeb2-0029-4e17-863a-95ce95fc96c8}" relid="0xd">
-					<name>GenericObject</name>
-				</atom>
-				<atom id="id-0066-00000023" kind="LongDoubleNumber" guid="{2ff7e056-4843-4aa2-92b3-7a63d5f05f7e}" relid="0xc">
-					<name>LongDoubleNumber</name>
-				</atom>
-				<atom id="id-0066-00000024" kind="DoubleNumber" guid="{31da4bfa-4cdd-4aa3-a2b2-ca4565fe6c5e}" relid="0xb">
-					<name>DoubleNumber</name>
-				</atom>
-				<atom id="id-0066-00000025" kind="FloatNumber" guid="{86abaec4-275b-4557-b7fc-3c37162e4c88}" relid="0xa">
-					<name>FloatNumber</name>
-				</atom>
-				<atom id="id-0066-00000026" kind="UnsignedLongLongInteger" guid="{4088faaa-acb3-4f25-8e02-facd710cffc6}" relid="0x9">
-					<name>UnsignedLongLongInteger</name>
-				</atom>
-				<atom id="id-0066-00000027" kind="UnsignedLongInteger" guid="{9007bf15-29fc-4b32-a84a-7b7d37391b84}" relid="0x8">
-					<name>UnsignedLongInteger</name>
-				</atom>
-				<atom id="id-0066-00000028" kind="UnsignedShortInteger" guid="{db80209c-37a2-4682-b082-c7e6c836e85a}" relid="0x7">
-					<name>UnsignedShortInteger</name>
-				</atom>
-				<atom id="id-0066-00000029" kind="LongLongInteger" guid="{74476a32-4e8e-4476-9386-c18ca08b7169}" relid="0x6">
-					<name>LongLongInteger</name>
-				</atom>
-				<atom id="id-0066-0000002a" kind="LongInteger" guid="{82e9b301-b8d9-4ed6-adde-3f6fa870a4e1}" relid="0x5">
-					<name>LongInteger</name>
-				</atom>
-				<atom id="id-0066-0000002b" kind="ShortInteger" guid="{5bded188-b1f8-4aad-b46f-44c70302479c}" relid="0x4">
-					<name>ShortInteger</name>
-				</atom>
-				<atom id="id-0066-0000002c" kind="WideChar" guid="{05b11570-71e1-448c-828f-834dfe5843da}" relid="0x3">
-					<name>WideChar</name>
-				</atom>
-				<atom id="id-0066-0000002d" kind="Char" guid="{8193fe8f-a5af-40a1-b393-de6c5d54c352}" relid="0x2">
-					<name>Char</name>
-				</atom>
-				<atom id="id-0066-0000002e" kind="Byte" guid="{e4f7be2e-25d8-4a0b-9645-28580fe6b533}" relid="0x1">
-					<name>Byte</name>
-				</atom>
-				<atom id="id-0066-0000002f" kind="Boolean" guid="{fb202a59-8bd9-4a7e-aada-1816868d4387}" relid="0x0">
-					<name>Boolean</name>
-				</atom>
-			</folder>
-			<folder id="id-006a-0000000c" relid="0x1" childrelidcntr="0x0" kind="ImplementationArtifacts" guid="{69574031-9f39-4d8e-823d-d29fd48aa072}">
-				<name>ImplementationArtifacts</name>
-			</folder>
-			<folder id="id-006a-0000000d" relid="0x0" childrelidcntr="0x12" kind="InterfaceDefinitions" guid="{6d852a9e-1977-4a6a-8943-64c549a2db8b}">
-				<name>InterfaceDefinitions</name>
-				<model id="id-0065-0000002e" kind="File" guid="{5f33e8ef-85f4-49ef-bcbb-a2ef7ac61eb3}" relid="0x10" childrelidcntr="0x1">
-					<name>dds_rtf2_dcps_i_handle</name>
-					<attribute kind="Path">
-						<value>connectors/dds4ccm/idl</value>
-					</attribute>
-					<attribute kind="PostPreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="PrePreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="PrefixTag" status="meta">
-						<value></value>
-					</attribute>
-					<model id="id-0065-0000002f" kind="Package" role="Package" guid="{38efb2d6-c5ac-47be-ae87-cb4afe74bdeb}" relid="0x0" childrelidcntr="0x2">
-						<name>DDS</name>
-						<attribute kind="PostPreprocessorDirectives" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="PrePreprocessorDirectives" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="PrefixTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="SpecifyIdTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="VersionTag" status="meta">
-							<value></value>
-						</attribute>
-						<model id="id-0065-00000030" kind="Aggregate" role="Aggregate" guid="{d669c2b7-7879-4d7c-953d-5e3241428e92}" relid="0x0" childrelidcntr="0x1">
-							<name>NativeInstanceHandle_t</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-0000001d" kind="Member" role="Member" guid="{5a1128c6-a81c-48e0-bb50-5a582a1cd3ba}" relid="0x0" referred="id-0066-00000027">
-								<name>isValid</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000001e" kind="Member" role="Member" guid="{8136fdb0-7dbb-4225-8755-2577a3e773db}" relid="0x0" referred="id-0066-00000027">
-								<name>length</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000001f" kind="ArrayMember" role="ArrayMember" guid="{8bac54ad-db49-4c71-8611-018b48d10830}" relid="0x0" referred="id-0066-0000002e">
-								<name>value</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="Size">
-									<value>16</value>
-								</attribute>
-							</reference>
-						</model>
-						<reference id="id-0067-00000020" kind="Alias" role="Alias" guid="{ff971609-3de5-4dfd-92d3-5c05a80afaa9}" relid="0x1" referred="id-0065-00000030">
-							<name>InstanceHandle_t</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000001c3" kind="Collection" role="Collection" guid="{d18bc8f7-a45e-4fbb-a5f2-d48f872f7ecd}" relid="0x1" referred="id-0067-00000020">
-							<name>InstanceHandleSeq</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="bound" status="meta">
-								<value></value>
-							</attribute>
-						</reference>
-					</model>
-				</model>
-				<model id="id-0065-00000031" kind="File" guid="{ab5b259b-a53c-4e92-a982-85860248d4ce}" relid="0xf" childrelidcntr="0x1">
-					<name>dds_rtf2_dcps_instance_handle</name>
-					<attribute kind="Path">
-						<value>connectors/dds4ccm/idl</value>
-					</attribute>
-					<attribute kind="PostPreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="PrePreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="PrefixTag" status="meta">
-						<value></value>
-					</attribute>
-					<model id="id-0065-00000032" kind="Package" role="Package" guid="{639af11c-9d1e-4f6e-bb6f-90cfd4a688e1}" relid="0x0" childrelidcntr="0x1">
-						<name>DDS</name>
-						<attribute kind="PostPreprocessorDirectives" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="PrePreprocessorDirectives" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="PrefixTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="SpecifyIdTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="VersionTag" status="meta">
-							<value></value>
-						</attribute>
-						<atom id="id-0066-00000030" kind="NativeValue" role="NativeValue" guid="{d0de930c-c067-42ed-b568-847c0dcbde68}" relid="0x0">
-							<name>HANDLE_NIL</name>
-						</atom>
-					</model>
-				</model>
-				<model id="id-0065-00000033" kind="File" guid="{b752d754-9e41-4e14-a36e-919b1ee7cd89}" relid="0xd" childrelidcntr="0x1">
-					<name>dds_rtf2_dcps</name>
-					<attribute kind="Path">
-						<value>connectors/dds4ccm/idl</value>
-					</attribute>
-					<attribute kind="PostPreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="PrePreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="PrefixTag" status="meta">
-						<value></value>
-					</attribute>
-					<model id="id-0065-00000034" kind="Package" role="Package" guid="{6159b4d6-7d7b-4f62-acbd-b40c9258f224}" relid="0x0" childrelidcntr="0x56">
-						<name>DDS</name>
-						<attribute kind="PostPreprocessorDirectives" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="PrePreprocessorDirectives" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="PrefixTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="SpecifyIdTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="VersionTag" status="meta">
-							<value></value>
-						</attribute>
-						<model id="id-0065-00000035" kind="Aggregate" role="Aggregate" guid="{2c714200-d641-462c-bf26-2293aad854a7}" relid="0x54" childrelidcntr="0x1">
-							<name>SampleInfo</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-00000021" kind="Member" role="Member" guid="{fba1a42c-2a85-44e3-ad4d-c04e21f2d664}" relid="0x0" referred="id-0066-0000002f">
-								<name>valid_data</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000022" kind="Member" role="Member" guid="{81356fa4-ada4-4164-af68-95365767a870}" relid="0x0" referred="id-0066-0000002a">
-								<name>absolute_generation_rank</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1060</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000023" kind="Member" role="Member" guid="{c6d029fb-0fa0-448a-bdf0-31a9450202e2}" relid="0x0" referred="id-0066-0000002a">
-								<name>generation_rank</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,960</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000024" kind="Member" role="Member" guid="{290e16f9-124e-496c-8f46-7ed2a438b312}" relid="0x0" referred="id-0066-0000002a">
-								<name>sample_rank</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,860</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000025" kind="Member" role="Member" guid="{3b58615b-6cc1-463d-972c-98a94d2e01c3}" relid="0x0" referred="id-0066-0000002a">
-								<name>no_writers_generation_count</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,760</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000026" kind="Member" role="Member" guid="{e74fea75-90c0-448f-9b58-9b3e905bbb87}" relid="0x0" referred="id-0066-0000002a">
-								<name>disposed_generation_count</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,660</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000027" kind="Member" role="Member" guid="{4fa5bb5e-3329-4877-848d-a26582bf4d50}" relid="0x0" referred="id-0067-00000020">
-								<name>publication_handle</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,560</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000028" kind="Member" role="Member" guid="{4c8d1441-a5a8-424f-baf6-707dbd0a9d24}" relid="0x0" referred="id-0067-00000020">
-								<name>instance_handle</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000001c4" kind="Member" role="Member" guid="{a8c50a2d-d410-473c-8c24-e229b970d707}" relid="0x0" referred="id-0067-000000fc">
-								<name>instance_state</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000001c5" kind="Member" role="Member" guid="{614b0fc2-c0a3-46e2-8b48-d11929ebc612}" relid="0x0" referred="id-0067-00000101">
-								<name>view_state</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000001c6" kind="Member" role="Member" guid="{16ccd183-b53b-4bd7-bc3c-490516d85f39}" relid="0x0" referred="id-0067-00000106">
-								<name>sample_state</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000001c7" kind="Member" role="Member" guid="{ee88b06b-cd8b-4a5a-9b8a-0d8af3e25b6a}" relid="0x0" referred="id-0065-0000012d">
-								<name>source_timestamp</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000036" kind="Object" role="Object" guid="{14b976f7-962c-418e-b344-dd2ff78462cd}" relid="0x53" childrelidcntr="0x0">
-							<name>TypeSupport</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-						</model>
-						<model id="id-0065-00000037" kind="Object" role="Object" guid="{8618bd5c-69d6-4ba3-9b56-ad662f7efe94}" relid="0x52" childrelidcntr="0x9">
-							<name>DomainParticipantFactory</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-00000038" kind="TwowayOperation" role="TwowayOperation" guid="{674d12cb-927b-4e2e-9770-92d5788c2abc}" relid="0x8" childrelidcntr="0x1">
-								<name>get_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,860</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000001c8" kind="ReturnType" role="ReturnType" guid="{57addb8d-c750-4a11-9680-b0db3239335d}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000001c9" kind="InoutParameter" role="InoutParameter" guid="{8afd2ce7-31f6-4acf-86be-8847b772f8b8}" relid="0x0" referred="id-0065-00000073">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000039" kind="TwowayOperation" role="TwowayOperation" guid="{f5e360dc-04db-4a5d-8763-82164e537ef1}" relid="0x7" childrelidcntr="0x1">
-								<name>set_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,760</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000001ca" kind="ReturnType" role="ReturnType" guid="{36031c37-c807-4caf-9b94-69ed4cc7b275}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000001cb" kind="InParameter" role="InParameter" guid="{daa9299a-6902-49b4-9244-ee9be3197668}" relid="0x0" referred="id-0065-00000073">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000003a" kind="TwowayOperation" role="TwowayOperation" guid="{0ca98cb8-df82-4713-8767-0bb3a70335e7}" relid="0x6" childrelidcntr="0x1">
-								<name>get_default_participant_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,660</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000001cc" kind="ReturnType" role="ReturnType" guid="{12cb18d4-431c-4808-8689-361558ef34d1}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000001cd" kind="InoutParameter" role="InoutParameter" guid="{125224c3-3b1a-46b1-80ee-ca9d65cc2425}" relid="0x0" referred="id-0065-00000072">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000003b" kind="TwowayOperation" role="TwowayOperation" guid="{411a66ab-799d-4a25-8996-fc2bda71ebf7}" relid="0x5" childrelidcntr="0x1">
-								<name>set_default_participant_qos_with_profile</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,560</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000029" kind="InParameter" role="InParameter" guid="{ead2634b-0cd4-4dfb-abb4-4d369c8a7c6e}" relid="0x0" referred="id-0066-0000001f">
-									<name>profile_name</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000002a" kind="InParameter" role="InParameter" guid="{b9e19955-7e65-4d6f-a400-f031912cc998}" relid="0x0" referred="id-0066-0000001f">
-									<name>library_name</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000001ce" kind="ReturnType" role="ReturnType" guid="{6bbf23f6-fa96-4c5e-a493-fe60cb292c6f}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000003c" kind="TwowayOperation" role="TwowayOperation" guid="{f54757de-ad62-481e-9a37-ab5a8dcdef9f}" relid="0x4" childrelidcntr="0x1">
-								<name>set_default_participant_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000001cf" kind="ReturnType" role="ReturnType" guid="{8635d377-08f8-4219-86fb-c93d98d8e7f4}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000001d0" kind="InParameter" role="InParameter" guid="{173433a3-cb80-465d-9960-3fd457352d60}" relid="0x0" referred="id-0065-00000072">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000003d" kind="TwowayOperation" role="TwowayOperation" guid="{4130315a-e18a-4551-b141-8cb58641b1c6}" relid="0x3" childrelidcntr="0x1">
-								<name>lookup_participant</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000001d1" kind="InParameter" role="InParameter" guid="{776b9098-3954-4614-8e54-c79f85797d68}" relid="0x0" referred="id-0067-0000012f">
-									<name>domain_id</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000001d2" kind="ReturnType" role="ReturnType" guid="{4bfd6543-86f1-400b-aab8-40cb3faffc6a}" relid="0x0" referred="id-0065-00000041">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000003e" kind="TwowayOperation" role="TwowayOperation" guid="{5e9db718-7dd8-4b78-8f29-7afce0c9ec81}" relid="0x2" childrelidcntr="0x1">
-								<name>delete_participant</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000001d3" kind="ReturnType" role="ReturnType" guid="{e390220e-a3ec-402e-b292-84a90c4589b7}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000001d4" kind="InParameter" role="InParameter" guid="{763b8624-0475-4e4e-98f5-b6c3211e6928}" relid="0x0" referred="id-0065-00000041">
-									<name>a_participant</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000003f" kind="TwowayOperation" role="TwowayOperation" guid="{0472a690-d2e1-4737-856e-3f411a1d5ea3}" relid="0x1" childrelidcntr="0x1">
-								<name>create_participant_with_profile</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000002b" kind="InParameter" role="InParameter" guid="{f8d0ed9a-fecd-4389-9300-6d95c6b41898}" relid="0x0" referred="id-0066-0000001f">
-									<name>profile_name</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>360,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000002c" kind="InParameter" role="InParameter" guid="{d32f5a3a-5ae8-481f-8585-f526ad1440d0}" relid="0x0" referred="id-0066-0000001f">
-									<name>library_name</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000001d5" kind="InParameter" role="InParameter" guid="{65e6a89e-3878-4fbe-8c1a-c3ff03037e12}" relid="0x0" referred="id-0067-00000116">
-									<name>mask</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>560,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000001d6" kind="InParameter" role="InParameter" guid="{675917ad-7652-4f74-bad1-e2090aea6706}" relid="0x0" referred="id-0067-0000012f">
-									<name>domain_id</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000001d7" kind="InParameter" role="InParameter" guid="{467268db-03b5-4e0c-985f-8594f6f662b7}" relid="0x0" referred="id-0065-000000a7">
-									<name>a_listener</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>460,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000001d8" kind="ReturnType" role="ReturnType" guid="{4082c988-87e8-4fa0-97b6-60d63ee3b35f}" relid="0x0" referred="id-0065-00000041">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000040" kind="TwowayOperation" role="TwowayOperation" guid="{3ce1c5ab-14fe-4956-91a4-d6c6abea5d8b}" relid="0x0" childrelidcntr="0x1">
-								<name>create_participant</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000001d9" kind="InParameter" role="InParameter" guid="{2149a187-35d4-4345-84a1-1fe0acc7a272}" relid="0x0" referred="id-0067-00000116">
-									<name>mask</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>460,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000001da" kind="InParameter" role="InParameter" guid="{3f515376-3a1e-4294-ba80-168a2da40038}" relid="0x0" referred="id-0067-0000012f">
-									<name>domain_id</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000001db" kind="InParameter" role="InParameter" guid="{c5c06cfb-1ba1-4cf7-b3a1-2e6b2da7421d}" relid="0x0" referred="id-0065-000000a7">
-									<name>a_listener</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>360,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000001dc" kind="InParameter" role="InParameter" guid="{b05cc2ff-337c-498f-8f1b-05cf478b5396}" relid="0x0" referred="id-0065-00000072">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000001dd" kind="ReturnType" role="ReturnType" guid="{a12326d2-f203-471b-92a1-11b422f87581}" relid="0x0" referred="id-0065-00000041">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-						</model>
-						<model id="id-0065-00000041" kind="Object" role="Object" guid="{adbad2ab-fe31-4027-b268-34d81e9b40bb}" relid="0x51" childrelidcntr="0x28">
-							<name>DomainParticipant</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-00000042" kind="TwowayOperation" role="TwowayOperation" guid="{6fce6d4c-c837-4b60-b354-26410f70df8a}" relid="0x26" childrelidcntr="0x1">
-								<name>get_current_time</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,3860</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000001de" kind="ReturnType" role="ReturnType" guid="{05b63672-5cab-439b-9400-582bff97a774}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000001df" kind="InoutParameter" role="InoutParameter" guid="{bddfcd19-94cf-4091-aea2-f7cd16871403}" relid="0x0" referred="id-0065-0000012d">
-									<name>current_time</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000043" kind="TwowayOperation" role="TwowayOperation" guid="{4dd82f0f-51b8-4b5a-a8dd-e48f8597365e}" relid="0x25" childrelidcntr="0x1">
-								<name>contains_entity</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,3760</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000002d" kind="InParameter" role="InParameter" guid="{ba1641bc-ee64-4012-b384-24463440f654}" relid="0x0" referred="id-0067-00000020">
-									<name>a_handle</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000002e" kind="ReturnType" role="ReturnType" guid="{8ac61c0e-6fc7-4c14-9f8c-00fd2e7d6148}" relid="0x0" referred="id-0066-0000002f">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000044" kind="TwowayOperation" role="TwowayOperation" guid="{c27b14e7-4a67-4be7-a03c-66666c054971}" relid="0x24" childrelidcntr="0x1">
-								<name>get_discovered_topic_data</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,3660</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000002f" kind="InParameter" role="InParameter" guid="{49bfc992-f5df-4d43-b303-99633d71ed51}" relid="0x0" referred="id-0067-00000020">
-									<name>topic_handle</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000001e0" kind="ReturnType" role="ReturnType" guid="{a97f7013-a8dd-4c41-8f26-1926fdebe300}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000001e1" kind="InoutParameter" role="InoutParameter" guid="{f34c8437-0275-4ecc-92f6-5a0584fe5598}" relid="0x0" referred="id-0065-0000006b">
-									<name>topic_data</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000045" kind="TwowayOperation" role="TwowayOperation" guid="{3dc43948-20e5-4a27-a2fb-6b4bbdf3cfa6}" relid="0x23" childrelidcntr="0x1">
-								<name>get_discovered_topics</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,3560</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000001e2" kind="InoutParameter" role="InoutParameter" guid="{c1f37e6b-4fa9-4f5a-afa7-2345eb1b60ae}" relid="0x0" referred="id-0067-000001c3">
-									<name>topic_handles</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000001e3" kind="ReturnType" role="ReturnType" guid="{84876e6a-42a0-4d03-94aa-b308db0742b9}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000046" kind="TwowayOperation" role="TwowayOperation" guid="{e0495d7e-8cd3-48d5-819c-a59fe3c40c04}" relid="0x22" childrelidcntr="0x1">
-								<name>get_discovered_participant_data</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,3460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000030" kind="InParameter" role="InParameter" guid="{4e2a47e0-e14e-44c2-a00d-63ff9a58ac0f}" relid="0x0" referred="id-0067-00000020">
-									<name>participant_handle</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000001e4" kind="ReturnType" role="ReturnType" guid="{de9dfffb-6b06-4193-8ee1-f5fd9feb18ba}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000001e5" kind="InoutParameter" role="InoutParameter" guid="{6b74548a-e564-43dc-9444-efd3bd2d7969}" relid="0x0" referred="id-0065-0000006c">
-									<name>participant_data</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000047" kind="TwowayOperation" role="TwowayOperation" guid="{4e754f33-3463-4d8b-962a-a18fae66410d}" relid="0x21" childrelidcntr="0x1">
-								<name>get_discovered_participants</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,3360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000001e6" kind="InoutParameter" role="InoutParameter" guid="{4b89bc26-a2b4-4934-a1dd-e1981eb2b099}" relid="0x0" referred="id-0067-000001c3">
-									<name>participant_handles</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000001e7" kind="ReturnType" role="ReturnType" guid="{a419422a-9344-4313-a4c4-14d24caab8ec}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000048" kind="TwowayOperation" role="TwowayOperation" guid="{758fb5e5-b06c-4329-a90f-18960491b1b7}" relid="0x20" childrelidcntr="0x1">
-								<name>get_default_topic_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,3260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000001e8" kind="ReturnType" role="ReturnType" guid="{fd2d8d09-c6b8-49c9-a0f8-cc292b81ce21}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000001e9" kind="InoutParameter" role="InoutParameter" guid="{8837687d-ef75-465d-8257-b78fbab6bf91}" relid="0x0" referred="id-0065-00000071">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000049" kind="TwowayOperation" role="TwowayOperation" guid="{b416ad7f-4714-4a7d-a7c7-4ce5dfc70110}" relid="0x1f" childrelidcntr="0x1">
-								<name>set_default_topic_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,3160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000001ea" kind="ReturnType" role="ReturnType" guid="{edbb3b4c-ad4b-40f6-b3f8-67d78a69610c}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000001eb" kind="InParameter" role="InParameter" guid="{fa1b9032-40e6-4b97-9732-924fd0d42d07}" relid="0x0" referred="id-0065-00000071">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000004a" kind="TwowayOperation" role="TwowayOperation" guid="{0cd5146d-a815-490c-b917-ddc9de5432aa}" relid="0x1e" childrelidcntr="0x1">
-								<name>get_default_subscriber_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,3060</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000001ec" kind="ReturnType" role="ReturnType" guid="{7a3120e1-df05-4389-a7cf-71c6d6e8ccb3}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000001ed" kind="InoutParameter" role="InoutParameter" guid="{41a3db01-6842-49e4-8ec4-d6842b2013ff}" relid="0x0" referred="id-0065-0000006d">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000004b" kind="TwowayOperation" role="TwowayOperation" guid="{128b56ba-1d89-4305-88b1-a64ecb787178}" relid="0x1d" childrelidcntr="0x1">
-								<name>set_default_subscriber_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,2960</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000001ee" kind="ReturnType" role="ReturnType" guid="{490eed98-b30a-4ac1-8e9e-07533ab9f1d8}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000001ef" kind="InParameter" role="InParameter" guid="{115f6d99-04e5-48cd-95a3-32dcf2e70109}" relid="0x0" referred="id-0065-0000006d">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000004c" kind="TwowayOperation" role="TwowayOperation" guid="{c3bf1dff-8bb1-410a-8306-cd80c6fca52d}" relid="0x1c" childrelidcntr="0x1">
-								<name>get_default_publisher_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,2860</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000001f0" kind="ReturnType" role="ReturnType" guid="{32c5dd66-4144-4216-bd29-21c675888334}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000001f1" kind="InoutParameter" role="InoutParameter" guid="{0cfd0280-a5c3-4552-9cc2-7058cde5fdbf}" relid="0x0" referred="id-0065-0000006f">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000004d" kind="TwowayOperation" role="TwowayOperation" guid="{c329253d-b985-4bd5-b4ea-17bf5724fe00}" relid="0x1b" childrelidcntr="0x1">
-								<name>set_default_publisher_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,2760</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000001f2" kind="ReturnType" role="ReturnType" guid="{09d296d1-2f3c-4d49-9ab6-8e28716c9890}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000001f3" kind="InParameter" role="InParameter" guid="{ff28657c-0e9b-4625-bf2f-d347fd2f7015}" relid="0x0" referred="id-0065-0000006f">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000004e" kind="TwowayOperation" role="TwowayOperation" guid="{89d187b7-6e2d-4021-bf50-9299fc2fa4d3}" relid="0x1a" childrelidcntr="0x1">
-								<name>assert_liveliness</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,2660</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000001f4" kind="ReturnType" role="ReturnType" guid="{5fc1cbc0-8c47-42fc-a970-4e162834344c}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000004f" kind="TwowayOperation" role="TwowayOperation" guid="{6c8fdbcd-9398-4275-b9bc-6f0fc879c3ea}" relid="0x19" childrelidcntr="0x1">
-								<name>get_domain_id</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,2560</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000001f5" kind="ReturnType" role="ReturnType" guid="{9049c76f-05d4-4c5a-a9fd-8be554036db4}" relid="0x0" referred="id-0067-0000012f">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000050" kind="TwowayOperation" role="TwowayOperation" guid="{6337f55e-fc7f-4e61-8caa-5ee7ab8d7ba9}" relid="0x18" childrelidcntr="0x1">
-								<name>ignore_subscription</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,2460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000031" kind="InParameter" role="InParameter" guid="{4c616eea-1ab0-409e-b8eb-fe8697cef426}" relid="0x0" referred="id-0067-00000020">
-									<name>handle</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000001f6" kind="ReturnType" role="ReturnType" guid="{7912ab17-7fb8-47ae-a2ea-d2dbc93e3887}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000051" kind="TwowayOperation" role="TwowayOperation" guid="{7d2a36ce-29c2-430a-ac9c-7cdd65155b21}" relid="0x17" childrelidcntr="0x1">
-								<name>ignore_publication</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,2360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000032" kind="InParameter" role="InParameter" guid="{f479077b-2018-4917-945a-5ef5303baa57}" relid="0x0" referred="id-0067-00000020">
-									<name>handle</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000001f7" kind="ReturnType" role="ReturnType" guid="{14a39626-16e8-42c2-bd35-5337c6d0fbb8}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000052" kind="TwowayOperation" role="TwowayOperation" guid="{d5bb24d4-d4e4-4876-b5f6-7508240446d9}" relid="0x16" childrelidcntr="0x1">
-								<name>ignore_topic</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,2260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000033" kind="InParameter" role="InParameter" guid="{394d409f-bdc7-4f59-9831-6617430cb682}" relid="0x0" referred="id-0067-00000020">
-									<name>handle</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000001f8" kind="ReturnType" role="ReturnType" guid="{0b124489-8800-48fd-b332-de8667926465}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000053" kind="TwowayOperation" role="TwowayOperation" guid="{4d4b8f5f-cf81-449b-b2f6-872bd32bd5db}" relid="0x15" childrelidcntr="0x1">
-								<name>ignore_participant</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,2160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000034" kind="InParameter" role="InParameter" guid="{01539cc7-a2c2-42bb-92a6-3fd2203d0e41}" relid="0x0" referred="id-0067-00000020">
-									<name>handle</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000001f9" kind="ReturnType" role="ReturnType" guid="{59b7b008-db35-42c3-b56f-d8d68dfcbdef}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000054" kind="TwowayOperation" role="TwowayOperation" guid="{dc55a1b3-396d-4ac4-9847-90bfd30093d2}" relid="0x14" childrelidcntr="0x1">
-								<name>get_listener</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,2060</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000001fa" kind="ReturnType" role="ReturnType" guid="{d15e7d8d-9d46-4ae1-9ac2-2e8c499e1ee2}" relid="0x0" referred="id-0065-000000a7">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000055" kind="TwowayOperation" role="TwowayOperation" guid="{12fc8be7-116f-46ec-b564-9d18d897a11a}" relid="0x13" childrelidcntr="0x1">
-								<name>set_listener</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1960</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000001fb" kind="InParameter" role="InParameter" guid="{e54d1be9-7537-4c5c-b740-9b889e9a7e76}" relid="0x0" referred="id-0067-00000116">
-									<name>mask</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000001fc" kind="ReturnType" role="ReturnType" guid="{938c4114-7ac8-4790-b4a6-8e7c5b2ebe7e}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000001fd" kind="InParameter" role="InParameter" guid="{251691d4-8b12-4fa6-b684-d8cfdbb80282}" relid="0x0" referred="id-0065-000000a7">
-									<name>a_listener</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000056" kind="TwowayOperation" role="TwowayOperation" guid="{543868eb-2b6e-496c-b4c2-176c5c7970a3}" relid="0x12" childrelidcntr="0x1">
-								<name>get_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1860</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000001fe" kind="ReturnType" role="ReturnType" guid="{45196a75-f961-415c-a9a7-b08bd15bbe5c}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000001ff" kind="InoutParameter" role="InoutParameter" guid="{9b1a4dab-78a5-4685-9cbc-c0c42e948804}" relid="0x0" referred="id-0065-00000072">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000057" kind="TwowayOperation" role="TwowayOperation" guid="{086f4f5f-e13c-4513-9f2d-7de2e3d30ec5}" relid="0x11" childrelidcntr="0x1">
-								<name>set_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1760</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000200" kind="ReturnType" role="ReturnType" guid="{1fa31447-a789-41ce-a73e-fb616592267f}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000201" kind="InParameter" role="InParameter" guid="{13199f31-14a6-49b0-86c9-486ef7c4b832}" relid="0x0" referred="id-0065-00000072">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000058" kind="TwowayOperation" role="TwowayOperation" guid="{c2f044a0-dc38-42fd-9a91-55ebf9acccde}" relid="0x10" childrelidcntr="0x1">
-								<name>delete_contained_entities</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1660</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000202" kind="ReturnType" role="ReturnType" guid="{e40a1f57-fd01-420a-b3fd-305b4ad47113}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000059" kind="TwowayOperation" role="TwowayOperation" guid="{db0538ac-f8b4-44e9-baa3-6e574059167b}" relid="0xf" childrelidcntr="0x1">
-								<name>delete_multitopic</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1560</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000203" kind="ReturnType" role="ReturnType" guid="{a8516b15-6769-456d-ae17-2c5ee99c8871}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000204" kind="InParameter" role="InParameter" guid="{7d35df1b-d557-41f3-ba90-0248bff6defe}" relid="0x0" referred="id-0065-00000104">
-									<name>a_multitopic</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000005a" kind="TwowayOperation" role="TwowayOperation" guid="{2dc11291-40d1-4b2c-ae97-2594c9096575}" relid="0xe" childrelidcntr="0x1">
-								<name>create_multitopic</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000035" kind="InParameter" role="InParameter" guid="{b553f4ca-68fe-42ea-9f52-dad935a546f5}" relid="0x0" referred="id-0066-0000001f">
-									<name>subscription_expression</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>360,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000036" kind="InParameter" role="InParameter" guid="{ca454e0f-bcbc-4862-9c41-0bdf6e7a3ed2}" relid="0x0" referred="id-0066-0000001f">
-									<name>type_name</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000037" kind="InParameter" role="InParameter" guid="{f700a488-b10c-4821-8977-3c0ecd98c844}" relid="0x0" referred="id-0066-0000001f">
-									<name>name</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000205" kind="InParameter" role="InParameter" guid="{89695eec-c9da-4338-8666-7bee3106ff37}" relid="0x0" referred="id-0067-0000012c">
-									<name>expression_parameters</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>460,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000206" kind="ReturnType" role="ReturnType" guid="{3d5b5a6b-2c10-40ec-a45d-e4f97399ff98}" relid="0x0" referred="id-0065-00000104">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000005b" kind="TwowayOperation" role="TwowayOperation" guid="{1338efef-c90f-45bf-a65b-b25776d9bd99}" relid="0xd" childrelidcntr="0x1">
-								<name>delete_contentfilteredtopic</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000207" kind="ReturnType" role="ReturnType" guid="{3674aaaa-5fd1-4c05-98c4-c99689e3e1df}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000208" kind="InParameter" role="InParameter" guid="{31fae1fa-5c38-4f82-9ac7-c798999fa6fa}" relid="0x0" referred="id-0065-00000108">
-									<name>a_contentfilteredtopic</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000005c" kind="TwowayOperation" role="TwowayOperation" guid="{12d37d0c-69c4-4aa0-9213-7af9034e957d}" relid="0xc" childrelidcntr="0x1">
-								<name>create_contentfilteredtopic</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000038" kind="InParameter" role="InParameter" guid="{d9ad90ee-d6b8-403d-bbc4-5455880a6be6}" relid="0x0" referred="id-0066-0000001f">
-									<name>filter_expression</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>360,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000039" kind="InParameter" role="InParameter" guid="{17b7cf4a-2a8e-413b-915c-57a94636138d}" relid="0x0" referred="id-0066-0000001f">
-									<name>name</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000209" kind="InParameter" role="InParameter" guid="{1a23c6bb-ab8d-4230-91ba-4e9690a3e514}" relid="0x0" referred="id-0067-0000012c">
-									<name>expression_parameters</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>460,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000020a" kind="InParameter" role="InParameter" guid="{24750656-187f-4b50-8341-8d821758acdf}" relid="0x0" referred="id-0065-0000010d">
-									<name>related_topic</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000020b" kind="ReturnType" role="ReturnType" guid="{21a67334-ad16-4f72-b547-cccc13ab10fa}" relid="0x0" referred="id-0065-00000108">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000005d" kind="TwowayOperation" role="TwowayOperation" guid="{91c52ba0-87a4-44bd-983e-8bb82915a40d}" relid="0xb" childrelidcntr="0x1">
-								<name>lookup_topicdescription</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000003a" kind="InParameter" role="InParameter" guid="{16006c5d-9f58-4ae2-8ed0-2a29932677f9}" relid="0x0" referred="id-0066-0000001f">
-									<name>name</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000020c" kind="ReturnType" role="ReturnType" guid="{a99b4bd1-fed9-4b6f-b30a-1a6873368964}" relid="0x0" referred="id-0065-00000113">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000005e" kind="TwowayOperation" role="TwowayOperation" guid="{58160d02-77ed-4143-a960-ecce9f570018}" relid="0xa" childrelidcntr="0x1">
-								<name>find_topic</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1060</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000003b" kind="InParameter" role="InParameter" guid="{d859af0b-492b-4ced-bfab-cd360c038fe2}" relid="0x0" referred="id-0066-0000001f">
-									<name>topic_name</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000020d" kind="InParameter" role="InParameter" guid="{f3c31cc8-7f69-4310-9c3d-ee0aafb573f5}" relid="0x0" referred="id-0065-0000012e">
-									<name>timeout</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000020e" kind="ReturnType" role="ReturnType" guid="{884e3058-2897-4e00-8a29-01ef193d4e08}" relid="0x0" referred="id-0065-0000010d">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000005f" kind="TwowayOperation" role="TwowayOperation" guid="{e640ed42-df31-4f81-93d6-aaee63fdceb4}" relid="0x9" childrelidcntr="0x1">
-								<name>delete_topic</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,960</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000020f" kind="ReturnType" role="ReturnType" guid="{38dff28f-ed5a-45d8-89cc-edfc6581f0dd}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000210" kind="InParameter" role="InParameter" guid="{905ab556-9e6b-4425-b83c-bc83aff9a7d1}" relid="0x0" referred="id-0065-0000010d">
-									<name>a_topic</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000060" kind="TwowayOperation" role="TwowayOperation" guid="{0f940ffb-b482-4581-baed-cc7a1b0bf9a1}" relid="0x8" childrelidcntr="0x1">
-								<name>create_topic_with_profile</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,860</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000003c" kind="InParameter" role="InParameter" guid="{28c9cfdd-3e8a-4a1a-b74a-1e31de095c8e}" relid="0x0" referred="id-0066-0000001f">
-									<name>profile_name</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>460,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000003d" kind="InParameter" role="InParameter" guid="{ad625c85-07d5-4bdf-8943-3efec1ca7b49}" relid="0x0" referred="id-0066-0000001f">
-									<name>library_name</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>360,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000003e" kind="InParameter" role="InParameter" guid="{da0571fb-0964-48ec-b26e-5dcd45a14581}" relid="0x0" referred="id-0066-0000001f">
-									<name>type_name</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000003f" kind="InParameter" role="InParameter" guid="{029f4052-ee01-4d95-9ad2-444fc1d30603}" relid="0x0" referred="id-0066-0000001f">
-									<name>topic_name</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000211" kind="InParameter" role="InParameter" guid="{a6419720-dba3-428b-9dbb-120f57066c87}" relid="0x0" referred="id-0067-00000116">
-									<name>mask</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>660,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000212" kind="InParameter" role="InParameter" guid="{73475718-4991-4669-a54e-5205f10de2c6}" relid="0x0" referred="id-0065-000000ba">
-									<name>a_listener</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>560,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000213" kind="ReturnType" role="ReturnType" guid="{83c05f2e-78aa-4e93-8e62-64fb7b698c7b}" relid="0x0" referred="id-0065-0000010d">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000061" kind="TwowayOperation" role="TwowayOperation" guid="{5af04129-2734-46d2-babf-d6a6b4316fad}" relid="0x7" childrelidcntr="0x1">
-								<name>create_topic</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,760</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000040" kind="InParameter" role="InParameter" guid="{56602453-5cac-4a29-bf15-7361b730be6d}" relid="0x0" referred="id-0066-0000001f">
-									<name>type_name</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000041" kind="InParameter" role="InParameter" guid="{c62c0c58-6204-473b-b78f-5719d007aa4e}" relid="0x0" referred="id-0066-0000001f">
-									<name>topic_name</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000214" kind="InParameter" role="InParameter" guid="{e74035a6-c8c4-405a-8051-8c4d11735cc8}" relid="0x0" referred="id-0067-00000116">
-									<name>mask</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>560,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000215" kind="InParameter" role="InParameter" guid="{0ab3874c-d2bf-4462-8000-ab8b4f3b02ce}" relid="0x0" referred="id-0065-000000ba">
-									<name>a_listener</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>460,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000216" kind="InParameter" role="InParameter" guid="{907b5437-39ce-4fc4-974d-41e00266b640}" relid="0x0" referred="id-0065-00000071">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>360,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000217" kind="ReturnType" role="ReturnType" guid="{6cd0a48f-b5af-4db6-9c63-a79ba779a488}" relid="0x0" referred="id-0065-0000010d">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000062" kind="TwowayOperation" role="TwowayOperation" guid="{088936e8-802f-48cc-8fb8-704514d1ff74}" relid="0x6" childrelidcntr="0x1">
-								<name>get_builtin_subscriber</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,660</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000218" kind="ReturnType" role="ReturnType" guid="{20169755-3c31-4477-967c-e0b7ad76a87e}" relid="0x0" referred="id-0065-000000cf">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000063" kind="TwowayOperation" role="TwowayOperation" guid="{b3f885a3-5f06-4f80-ac51-76e2354a5f71}" relid="0x5" childrelidcntr="0x1">
-								<name>delete_subscriber</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,560</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000219" kind="ReturnType" role="ReturnType" guid="{491fe4b7-1197-4b25-aa39-d73d9289d017}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000021a" kind="InParameter" role="InParameter" guid="{ffed51e2-201b-4634-b99a-274d9fafe3b8}" relid="0x0" referred="id-0065-000000cf">
-									<name>s</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000064" kind="TwowayOperation" role="TwowayOperation" guid="{4a0f5f77-add2-4a39-b8f2-5914531b73a8}" relid="0x4" childrelidcntr="0x1">
-								<name>create_subscriber_with_profile</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000042" kind="InParameter" role="InParameter" guid="{c902f4b3-5c28-496c-8445-ee3c8dd28a2d}" relid="0x0" referred="id-0066-0000001f">
-									<name>profile_name</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000043" kind="InParameter" role="InParameter" guid="{f6e61b84-c21d-4753-a82d-62a5c43c832a}" relid="0x0" referred="id-0066-0000001f">
-									<name>library_name</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000021b" kind="InParameter" role="InParameter" guid="{4b5e21cb-a0a4-4d52-b411-9178b9559637}" relid="0x0" referred="id-0067-00000116">
-									<name>mask</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>460,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000021c" kind="InParameter" role="InParameter" guid="{ff25f43b-1477-40b9-819b-3601b505e3a8}" relid="0x0" referred="id-0065-000000a8">
-									<name>a_listener</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>360,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000021d" kind="ReturnType" role="ReturnType" guid="{9f1b2807-bc7b-42ea-8fcc-c6f8d54c496e}" relid="0x0" referred="id-0065-000000cf">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000065" kind="TwowayOperation" role="TwowayOperation" guid="{92f68ffe-d20d-4e41-b4f3-fa409878e14a}" relid="0x3" childrelidcntr="0x1">
-								<name>create_subscriber</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000021e" kind="InParameter" role="InParameter" guid="{92ada6e9-5fda-40d4-b92d-af48cd36dc53}" relid="0x0" referred="id-0067-00000116">
-									<name>mask</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>360,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000021f" kind="InParameter" role="InParameter" guid="{f34ba127-eb23-4977-9469-007cc1d5d551}" relid="0x0" referred="id-0065-000000a8">
-									<name>a_listener</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000220" kind="InParameter" role="InParameter" guid="{6f2085f7-30ab-48ef-be30-25d267d1486c}" relid="0x0" referred="id-0065-0000006d">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000221" kind="ReturnType" role="ReturnType" guid="{c3f95a33-4686-4aef-8310-034e358030ca}" relid="0x0" referred="id-0065-000000cf">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000066" kind="TwowayOperation" role="TwowayOperation" guid="{514c959c-2e91-47d1-93aa-727d7655aea5}" relid="0x2" childrelidcntr="0x1">
-								<name>delete_publisher</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000222" kind="ReturnType" role="ReturnType" guid="{28a89f80-e0be-4ff1-bb5b-6bb6f42fd1b3}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000223" kind="InParameter" role="InParameter" guid="{1dbd09f1-2033-4370-b145-384ed4240df7}" relid="0x0" referred="id-0065-000000bc">
-									<name>p</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000067" kind="TwowayOperation" role="TwowayOperation" guid="{97adace4-5ab0-4f2c-be4a-54f3e413816d}" relid="0x1" childrelidcntr="0x1">
-								<name>create_publisher_with_profile</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000044" kind="InParameter" role="InParameter" guid="{afdac122-bee2-484c-9a50-099abadbbbfa}" relid="0x0" referred="id-0066-0000001f">
-									<name>profile_name</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000045" kind="InParameter" role="InParameter" guid="{a84cdc29-91b8-4e23-925d-31eee31bd934}" relid="0x0" referred="id-0066-0000001f">
-									<name>library_name</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000224" kind="InParameter" role="InParameter" guid="{534a2637-1b2a-42ec-ba93-ef97cddaee5f}" relid="0x0" referred="id-0067-00000116">
-									<name>mask</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>460,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000225" kind="InParameter" role="InParameter" guid="{d2b69164-88fd-487f-bbf6-801ace2a21cb}" relid="0x0" referred="id-0065-000000b2">
-									<name>a_listener</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>360,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000226" kind="ReturnType" role="ReturnType" guid="{fa3c8080-819f-40b6-a9b9-07982de8837a}" relid="0x0" referred="id-0065-000000bc">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000068" kind="TwowayOperation" role="TwowayOperation" guid="{c8fde55c-1bc5-43ee-a1ad-d0128c992d70}" relid="0x0" childrelidcntr="0x1">
-								<name>create_publisher</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000227" kind="InParameter" role="InParameter" guid="{27367b8e-01b0-46a8-9601-bd17713a19e1}" relid="0x0" referred="id-0067-00000116">
-									<name>mask</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>360,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000228" kind="InParameter" role="InParameter" guid="{87e3fc46-8293-489c-afac-d5b63f899fe4}" relid="0x0" referred="id-0065-000000b2">
-									<name>a_listener</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000229" kind="InParameter" role="InParameter" guid="{4f7cb5a1-4b55-4990-8cb7-30805bdcbaf8}" relid="0x0" referred="id-0065-0000006f">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000022a" kind="ReturnType" role="ReturnType" guid="{3a6369f1-9ffa-42af-abf1-17d0cecb3264}" relid="0x0" referred="id-0065-000000bc">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<reference id="id-0067-0000022b" kind="Inherits" role="Inherits" guid="{5863ff9d-d433-44ba-a111-feabffd00e26}" relid="0x27" referred="id-0065-00000117">
-								<name>Inherits</name>
-							</reference>
-						</model>
-						<model id="id-0065-00000069" kind="Aggregate" role="Aggregate" guid="{c26aeb2a-96c1-4b36-940d-42eec8123db6}" relid="0x50" childrelidcntr="0x1">
-							<name>SubscriptionBuiltinTopicData</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-00000046" kind="Member" role="Member" guid="{9342c04a-4f17-4418-a928-08406abad35a}" relid="0x0" referred="id-0066-0000001f">
-								<name>type_name</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000047" kind="Member" role="Member" guid="{62f7f8e6-0422-4dc9-a981-62585849a9c3}" relid="0x0" referred="id-0066-0000001f">
-								<name>topic_name</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000022c" kind="Member" role="Member" guid="{3a2f2a70-a965-4044-8ac7-4198d7b7b45e}" relid="0x0" referred="id-0065-0000008e">
-								<name>group_data</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1660</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000022d" kind="Member" role="Member" guid="{f5d49385-2094-4b5f-b689-6f486d9434f5}" relid="0x0" referred="id-0065-0000008f">
-								<name>topic_data</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1560</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000022e" kind="Member" role="Member" guid="{812b0b1d-cf37-4f78-80fb-1a5082067c90}" relid="0x0" referred="id-0065-0000007f">
-								<name>partition</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000022f" kind="Member" role="Member" guid="{29d7e235-fe4b-40ce-8377-d2dc327847be}" relid="0x0" referred="id-0065-00000088">
-								<name>presentation</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000230" kind="Member" role="Member" guid="{268b0ea6-c4c9-439f-bc05-663169532974}" relid="0x0" referred="id-0065-00000080">
-								<name>time_based_filter</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000231" kind="Member" role="Member" guid="{7ae8363a-13a0-4c1e-be9a-3e5923dbe1c3}" relid="0x0" referred="id-0065-00000090">
-								<name>user_data</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000232" kind="Member" role="Member" guid="{8d2c75aa-031c-4a8e-8bc9-5771fa5198ee}" relid="0x0" referred="id-0065-0000007b">
-								<name>destination_order</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1060</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000233" kind="Member" role="Member" guid="{1cc8aa76-8048-4119-97f8-b591845ad95a}" relid="0x0" referred="id-0065-00000084">
-								<name>ownership</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,960</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000234" kind="Member" role="Member" guid="{49bad0fb-0561-4ce2-9689-8ecfdcc4866f}" relid="0x0" referred="id-0065-0000007d">
-								<name>reliability</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,860</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000235" kind="Member" role="Member" guid="{99ec8a4b-f7f8-460e-b8e0-9a5708343f4e}" relid="0x0" referred="id-0065-00000081">
-								<name>liveliness</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,760</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000236" kind="Member" role="Member" guid="{1647c2c4-22bb-42a7-bec7-d3e24031bc32}" relid="0x0" referred="id-0065-00000086">
-								<name>latency_budget</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,660</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000237" kind="Member" role="Member" guid="{309c21a6-5f73-40e0-a332-97718d42617f}" relid="0x0" referred="id-0065-00000087">
-								<name>deadline</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,560</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000238" kind="Member" role="Member" guid="{6402f6f6-6348-4450-b54f-0c546cfa5b8f}" relid="0x0" referred="id-0065-0000008a">
-								<name>durability</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000239" kind="Member" role="Member" guid="{ec72bb7a-e715-4ccd-a5e5-52582cdd4beb}" relid="0x0" referred="id-0065-0000012f">
-								<name>participant_key</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000023a" kind="Member" role="Member" guid="{4e51c86b-f1e9-4739-8438-076ef6b1e16e}" relid="0x0" referred="id-0065-0000012f">
-								<name>key</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-0000006a" kind="Aggregate" role="Aggregate" guid="{d6a2cf29-0b4f-4e8c-aea7-874f14043462}" relid="0x4f" childrelidcntr="0x1">
-							<name>PublicationBuiltinTopicData</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-00000048" kind="Member" role="Member" guid="{0a141642-e12e-4ac5-a872-a970a8ffbe4c}" relid="0x0" referred="id-0066-0000001f">
-								<name>type_name</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000049" kind="Member" role="Member" guid="{94428c6c-cef2-4092-b960-b153c7e4dea8}" relid="0x0" referred="id-0066-0000001f">
-								<name>topic_name</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000023b" kind="Member" role="Member" guid="{fb4beee6-479d-4b40-9156-a995c06774f1}" relid="0x0" referred="id-0065-0000008e">
-								<name>group_data</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1860</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000023c" kind="Member" role="Member" guid="{55315601-9b0b-4c16-99f9-bf75b54b075e}" relid="0x0" referred="id-0065-0000008f">
-								<name>topic_data</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1760</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000023d" kind="Member" role="Member" guid="{04d93761-36bc-46f7-9181-c18877c2fc8c}" relid="0x0" referred="id-0065-0000007f">
-								<name>partition</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1660</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000023e" kind="Member" role="Member" guid="{df1cc389-715b-49b5-a3da-fa14045eb638}" relid="0x0" referred="id-0065-00000088">
-								<name>presentation</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1560</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000023f" kind="Member" role="Member" guid="{caf54c3f-127a-42a0-9284-51e89cb34f2a}" relid="0x0" referred="id-0065-0000007b">
-								<name>destination_order</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000240" kind="Member" role="Member" guid="{e654a5f6-b0bf-4d6b-9488-04ea35ba6172}" relid="0x0" referred="id-0065-00000083">
-								<name>ownership_strength</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000241" kind="Member" role="Member" guid="{3e571104-51ea-42fb-9d97-5cac48a97bd7}" relid="0x0" referred="id-0065-00000084">
-								<name>ownership</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000242" kind="Member" role="Member" guid="{6f0f0e3e-ca32-4c18-9147-e2fb6ba365d6}" relid="0x0" referred="id-0065-00000090">
-								<name>user_data</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000243" kind="Member" role="Member" guid="{5acc1014-0f9c-4aaa-b162-3d464fd6ab4a}" relid="0x0" referred="id-0065-0000008c">
-								<name>lifespan</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1060</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000244" kind="Member" role="Member" guid="{e1164fd0-8a8d-4a14-a558-a43e92a7535c}" relid="0x0" referred="id-0065-0000007d">
-								<name>reliability</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,960</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000245" kind="Member" role="Member" guid="{098876d8-a496-4f36-910d-bd4ae426180a}" relid="0x0" referred="id-0065-00000081">
-								<name>liveliness</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,860</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000246" kind="Member" role="Member" guid="{18d212a7-81d6-493e-a187-2f2269007044}" relid="0x0" referred="id-0065-00000086">
-								<name>latency_budget</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,760</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000247" kind="Member" role="Member" guid="{f66233b3-97f0-4183-97a5-1f5fc9a7744f}" relid="0x0" referred="id-0065-00000087">
-								<name>deadline</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,660</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000248" kind="Member" role="Member" guid="{435a2530-9905-4a2a-9dc0-8293d3f1f658}" relid="0x0" referred="id-0065-00000074">
-								<name>durability_service</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,560</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000249" kind="Member" role="Member" guid="{19aee622-60df-40f6-8434-979ee6000124}" relid="0x0" referred="id-0065-0000008a">
-								<name>durability</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000024a" kind="Member" role="Member" guid="{b0007b0a-29e8-48c6-a7dd-83b56c723775}" relid="0x0" referred="id-0065-0000012f">
-								<name>participant_key</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000024b" kind="Member" role="Member" guid="{322986af-0d46-44fa-93fc-edc57452abe6}" relid="0x0" referred="id-0065-0000012f">
-								<name>key</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-0000006b" kind="Aggregate" role="Aggregate" guid="{2bd37d3a-9a67-4ef1-a1f8-fbbc2b51723f}" relid="0x4e" childrelidcntr="0x1">
-							<name>TopicBuiltinTopicData</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-0000004a" kind="Member" role="Member" guid="{6e203ff9-56a2-4e0d-b13b-46eb029b618d}" relid="0x0" referred="id-0066-0000001f">
-								<name>type_name</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000004b" kind="Member" role="Member" guid="{be5ded00-6080-42ca-a729-ef08939b5bef}" relid="0x0" referred="id-0066-0000001f">
-								<name>name</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000024c" kind="Member" role="Member" guid="{f19a9151-2614-4a85-bd89-66e0ff11416d}" relid="0x0" referred="id-0065-0000008f">
-								<name>topic_data</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1560</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000024d" kind="Member" role="Member" guid="{737fb5c5-07d8-4862-8519-c1299ddcb421}" relid="0x0" referred="id-0065-00000084">
-								<name>ownership</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000024e" kind="Member" role="Member" guid="{8ac6eb4f-2f26-4ed0-a667-133233092ea1}" relid="0x0" referred="id-0065-00000078">
-								<name>resource_limits</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000024f" kind="Member" role="Member" guid="{10465536-fc3b-4701-9d0a-3159e43be578}" relid="0x0" referred="id-0065-00000079">
-								<name>history</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000250" kind="Member" role="Member" guid="{89f2277c-d997-4259-a91e-a752f9d9aaf4}" relid="0x0" referred="id-0065-0000007b">
-								<name>destination_order</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000251" kind="Member" role="Member" guid="{6ec7265a-72e8-4982-bd02-c55a2d5d9c00}" relid="0x0" referred="id-0065-0000008c">
-								<name>lifespan</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1060</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000252" kind="Member" role="Member" guid="{76c22efb-eda4-4f76-8c13-a79d5ca4cb9b}" relid="0x0" referred="id-0065-0000008d">
-								<name>transport_priority</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,960</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000253" kind="Member" role="Member" guid="{fa16155c-7949-4ba1-b8aa-0fc8d9f4e491}" relid="0x0" referred="id-0065-0000007d">
-								<name>reliability</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,860</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000254" kind="Member" role="Member" guid="{237cc5ca-046d-45c1-929f-1ae92e859ecc}" relid="0x0" referred="id-0065-00000081">
-								<name>liveliness</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,760</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000255" kind="Member" role="Member" guid="{b3976ba1-0d26-4df7-a64e-0a564b1ed436}" relid="0x0" referred="id-0065-00000086">
-								<name>latency_budget</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,660</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000256" kind="Member" role="Member" guid="{640eeb42-3323-4378-8704-f8cfebb5d9e4}" relid="0x0" referred="id-0065-00000087">
-								<name>deadline</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,560</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000257" kind="Member" role="Member" guid="{d7753d28-9a6d-4df6-bb22-2f8b2de38c2c}" relid="0x0" referred="id-0065-00000074">
-								<name>durability_service</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000258" kind="Member" role="Member" guid="{86c5afa3-a1be-41eb-b069-e380608e8e48}" relid="0x0" referred="id-0065-0000008a">
-								<name>durability</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000259" kind="Member" role="Member" guid="{6b3ce870-f78f-4fd2-a63e-797f9e6a650e}" relid="0x0" referred="id-0065-0000012f">
-								<name>key</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-0000006c" kind="Aggregate" role="Aggregate" guid="{6d7fa318-c5c6-452d-9ece-ca1ab5aef753}" relid="0x4d" childrelidcntr="0x1">
-							<name>ParticipantBuiltinTopicData</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-0000025a" kind="Member" role="Member" guid="{0647706a-1b80-4ef7-b901-cb14181598ee}" relid="0x0" referred="id-0065-00000090">
-								<name>user_data</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000025b" kind="Member" role="Member" guid="{fbeff137-5e5f-40ec-a672-6a2bbcce8923}" relid="0x0" referred="id-0065-0000012f">
-								<name>key</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-0000006d" kind="Aggregate" role="Aggregate" guid="{ad48c95c-f86c-4bd5-b12c-c7eba6432e44}" relid="0x4c" childrelidcntr="0x1">
-							<name>SubscriberQos</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-0000025c" kind="Member" role="Member" guid="{beecdcab-928f-4f06-baeb-b36efa54fb4f}" relid="0x0" referred="id-0065-00000077">
-								<name>entity_factory</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000025d" kind="Member" role="Member" guid="{1eceadee-ea1a-4f28-b95e-da8b38db62eb}" relid="0x0" referred="id-0065-0000008e">
-								<name>group_data</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000025e" kind="Member" role="Member" guid="{a8cd770b-55e5-4041-a5cd-fdacf4c2ed66}" relid="0x0" referred="id-0065-0000007f">
-								<name>partition</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000025f" kind="Member" role="Member" guid="{aa9100b8-993a-44c6-8a8b-60e102804fdf}" relid="0x0" referred="id-0065-00000088">
-								<name>presentation</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-0000006e" kind="Aggregate" role="Aggregate" guid="{5d8504b8-9924-4d9f-8454-057da8c34ac6}" relid="0x4b" childrelidcntr="0x1">
-							<name>DataReaderQos</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-00000260" kind="Member" role="Member" guid="{066817f2-148d-4524-a7dc-03864e563b7c}" relid="0x0" referred="id-0065-00000075">
-								<name>reader_data_lifecycle</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000261" kind="Member" role="Member" guid="{ae2ac85f-4ca8-4719-9b75-d1eb2f8d6d64}" relid="0x0" referred="id-0065-00000080">
-								<name>time_based_filter</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1060</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000262" kind="Member" role="Member" guid="{8d486a1b-fc87-44bd-a0dd-43269adae313}" relid="0x0" referred="id-0065-00000084">
-								<name>ownership</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,960</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000263" kind="Member" role="Member" guid="{75038eb6-12d7-4b05-a3ca-0b56c09289de}" relid="0x0" referred="id-0065-00000090">
-								<name>user_data</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,860</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000264" kind="Member" role="Member" guid="{9ea85702-c298-499e-b8d5-a3a5119c6ad8}" relid="0x0" referred="id-0065-00000078">
-								<name>resource_limits</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,760</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000265" kind="Member" role="Member" guid="{1af79dc4-80df-44b4-b755-b78c130504c9}" relid="0x0" referred="id-0065-00000079">
-								<name>history</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,660</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000266" kind="Member" role="Member" guid="{d06b2587-7836-47a3-8db4-0fd9b1a35cc4}" relid="0x0" referred="id-0065-0000007b">
-								<name>destination_order</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,560</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000267" kind="Member" role="Member" guid="{c598c25e-4b38-40ac-9481-73d226446408}" relid="0x0" referred="id-0065-0000007d">
-								<name>reliability</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000268" kind="Member" role="Member" guid="{2748857a-a261-47a7-8697-43989a3016c9}" relid="0x0" referred="id-0065-00000081">
-								<name>liveliness</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000269" kind="Member" role="Member" guid="{16d3543d-99da-4ab2-982e-b307a74938c7}" relid="0x0" referred="id-0065-00000086">
-								<name>latency_budget</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000026a" kind="Member" role="Member" guid="{2e3cb73e-6c5b-4166-8d8d-80586358ce71}" relid="0x0" referred="id-0065-00000087">
-								<name>deadline</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000026b" kind="Member" role="Member" guid="{a8a7970b-a25c-45af-9e9e-65d1d36f8b25}" relid="0x0" referred="id-0065-0000008a">
-								<name>durability</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-0000006f" kind="Aggregate" role="Aggregate" guid="{05f323d2-bea1-4cd9-97d2-9d2d15244fbc}" relid="0x4a" childrelidcntr="0x1">
-							<name>PublisherQos</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-0000026c" kind="Member" role="Member" guid="{95c00a23-9a51-4bbd-b7b2-8b10a62bb323}" relid="0x0" referred="id-0065-00000077">
-								<name>entity_factory</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000026d" kind="Member" role="Member" guid="{96603f31-1a32-43d3-955c-7de1350608af}" relid="0x0" referred="id-0065-0000008e">
-								<name>group_data</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000026e" kind="Member" role="Member" guid="{6fa8ae61-0ba5-4fcd-b0dc-0f3f94fb0903}" relid="0x0" referred="id-0065-0000007f">
-								<name>partition</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000026f" kind="Member" role="Member" guid="{507c41be-ceb6-4a51-960b-f79f086b46e9}" relid="0x0" referred="id-0065-00000088">
-								<name>presentation</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000070" kind="Aggregate" role="Aggregate" guid="{142090e7-4afa-40f9-a7b7-acca45b58f89}" relid="0x49" childrelidcntr="0x1">
-							<name>DataWriterQos</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-00000270" kind="Member" role="Member" guid="{2a7f428e-f781-4d5a-8614-6fbab50ec1f9}" relid="0x0" referred="id-0065-00000076">
-								<name>writer_data_lifecycle</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000271" kind="Member" role="Member" guid="{6eb4257c-6a47-42dd-9585-971b6f1e591b}" relid="0x0" referred="id-0065-00000083">
-								<name>ownership_strength</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000272" kind="Member" role="Member" guid="{82ac8d4d-96de-401e-9a0d-09f02332e7ca}" relid="0x0" referred="id-0065-00000084">
-								<name>ownership</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000273" kind="Member" role="Member" guid="{5323a935-6a62-44c5-9149-ccabb2ee80ba}" relid="0x0" referred="id-0065-00000090">
-								<name>user_data</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000274" kind="Member" role="Member" guid="{43b72f95-f755-4253-9693-34052ad1b3dc}" relid="0x0" referred="id-0065-0000008c">
-								<name>lifespan</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1060</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000275" kind="Member" role="Member" guid="{74fdb0e3-5d0e-481f-9985-f8d33b72b238}" relid="0x0" referred="id-0065-0000008d">
-								<name>transport_priority</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,960</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000276" kind="Member" role="Member" guid="{2f93bc29-54a3-41cc-adb4-f54c99330b5a}" relid="0x0" referred="id-0065-00000078">
-								<name>resource_limits</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,860</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000277" kind="Member" role="Member" guid="{cae97f14-b966-4b09-852d-3f3112b8a57e}" relid="0x0" referred="id-0065-00000079">
-								<name>history</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,760</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000278" kind="Member" role="Member" guid="{318a73ee-29f7-4651-b9b7-654d6b956ac9}" relid="0x0" referred="id-0065-0000007b">
-								<name>destination_order</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,660</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000279" kind="Member" role="Member" guid="{872e8c21-6318-4ab5-a1d4-890ee96fc4ce}" relid="0x0" referred="id-0065-0000007d">
-								<name>reliability</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,560</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000027a" kind="Member" role="Member" guid="{dd5d7b74-74d4-4f7f-8110-a098f5052b14}" relid="0x0" referred="id-0065-00000081">
-								<name>liveliness</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000027b" kind="Member" role="Member" guid="{9d9aa4a9-e988-4b14-b328-862ee8be23e3}" relid="0x0" referred="id-0065-00000086">
-								<name>latency_budget</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000027c" kind="Member" role="Member" guid="{161dce72-3f95-4cc7-9a75-da9564ca3aea}" relid="0x0" referred="id-0065-00000087">
-								<name>deadline</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000027d" kind="Member" role="Member" guid="{40bb7cad-1c21-4c1c-97d5-74e80222eb35}" relid="0x0" referred="id-0065-00000074">
-								<name>durability_service</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000027e" kind="Member" role="Member" guid="{dbc6fe81-1bc3-4cac-acd0-8d819637963a}" relid="0x0" referred="id-0065-0000008a">
-								<name>durability</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000071" kind="Aggregate" role="Aggregate" guid="{d3a0c983-29d0-43c8-8bd8-29d44ba1f655}" relid="0x48" childrelidcntr="0x1">
-							<name>TopicQos</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-0000027f" kind="Member" role="Member" guid="{94a5ca2d-6006-413c-9599-7b78c7ae6318}" relid="0x0" referred="id-0065-00000084">
-								<name>ownership</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000280" kind="Member" role="Member" guid="{a1a4d783-fc7d-4b24-b6c5-7dd4ceb8f78d}" relid="0x0" referred="id-0065-0000008c">
-								<name>lifespan</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000281" kind="Member" role="Member" guid="{1621cc44-b1e0-4e97-a19c-4d8cffdb85a8}" relid="0x0" referred="id-0065-0000008d">
-								<name>transport_priority</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1060</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000282" kind="Member" role="Member" guid="{fc6db77a-da19-4c24-9b38-f4adaf495ea0}" relid="0x0" referred="id-0065-00000078">
-								<name>resource_limits</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,960</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000283" kind="Member" role="Member" guid="{7061f8ed-86da-493c-a821-871b8b50983d}" relid="0x0" referred="id-0065-00000079">
-								<name>history</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,860</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000284" kind="Member" role="Member" guid="{65e2a28d-1333-461f-8fce-fc49b1255cc3}" relid="0x0" referred="id-0065-0000007b">
-								<name>destination_order</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,760</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000285" kind="Member" role="Member" guid="{9070def0-791b-4252-ba41-0fe9742ff8fd}" relid="0x0" referred="id-0065-0000007d">
-								<name>reliability</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,660</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000286" kind="Member" role="Member" guid="{2c72abea-95b5-48ba-8778-92dcf8ea5212}" relid="0x0" referred="id-0065-00000081">
-								<name>liveliness</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,560</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000287" kind="Member" role="Member" guid="{fce43b52-4868-4e1f-a9b0-d113954a6e1e}" relid="0x0" referred="id-0065-00000086">
-								<name>latency_budget</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000288" kind="Member" role="Member" guid="{ceea4172-e125-48b6-af32-c92321bcb497}" relid="0x0" referred="id-0065-00000087">
-								<name>deadline</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000289" kind="Member" role="Member" guid="{ef026d4c-df93-4537-862c-1f6d6e96f209}" relid="0x0" referred="id-0065-00000074">
-								<name>durability_service</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000028a" kind="Member" role="Member" guid="{8cd8f79d-6a29-471e-b0bb-cc5d6b7ffe34}" relid="0x0" referred="id-0065-0000008a">
-								<name>durability</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000028b" kind="Member" role="Member" guid="{d104f47a-95f8-4d58-aad8-19e32111c9f1}" relid="0x0" referred="id-0065-0000008f">
-								<name>topic_data</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000072" kind="Aggregate" role="Aggregate" guid="{80880e1a-6bf3-4fad-8983-6703f02306de}" relid="0x47" childrelidcntr="0x1">
-							<name>DomainParticipantQos</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-0000028c" kind="Member" role="Member" guid="{ae9c7b4c-817a-4eeb-9ac6-442d42d6ac8c}" relid="0x0" referred="id-0065-00000077">
-								<name>entity_factory</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000028d" kind="Member" role="Member" guid="{38a14857-e704-4a13-ad7b-d54be2b3ae21}" relid="0x0" referred="id-0065-00000090">
-								<name>user_data</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000073" kind="Aggregate" role="Aggregate" guid="{e01cafd0-be06-4610-bff3-cf897ea84212}" relid="0x46" childrelidcntr="0x1">
-							<name>DomainParticipantFactoryQos</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-0000028e" kind="Member" role="Member" guid="{7adb24c4-6ca5-4543-85ac-a114f06ef16a}" relid="0x0" referred="id-0065-00000077">
-								<name>entity_factory</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000074" kind="Aggregate" role="Aggregate" guid="{66cb25d0-4e81-4929-a939-d2e4008a3c0d}" relid="0x45" childrelidcntr="0x1">
-							<name>DurabilityServiceQosPolicy</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-0000004c" kind="Member" role="Member" guid="{7cf79540-2e2c-4b32-a441-9c6f0448d7e2}" relid="0x0" referred="id-0066-0000002a">
-								<name>max_samples_per_instance</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,560</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000004d" kind="Member" role="Member" guid="{443d629e-763c-4995-9222-0aa69f824604}" relid="0x0" referred="id-0066-0000002a">
-								<name>max_instances</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000004e" kind="Member" role="Member" guid="{028068fb-4140-47a0-82a3-7481a1fd5f55}" relid="0x0" referred="id-0066-0000002a">
-								<name>max_samples</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000004f" kind="Member" role="Member" guid="{9a11855b-e433-47b7-bc08-05028dd0d5ab}" relid="0x0" referred="id-0066-0000002a">
-								<name>history_depth</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000028f" kind="Member" role="Member" guid="{2822bd5d-8275-416a-916e-fb16379386a8}" relid="0x0" referred="id-0065-0000007a">
-								<name>history_kind</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000290" kind="Member" role="Member" guid="{975eed39-aa06-4b1c-b3a3-5981dac1db8a}" relid="0x0" referred="id-0065-0000012e">
-								<name>service_cleanup_delay</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000075" kind="Aggregate" role="Aggregate" guid="{dd3409b2-3697-4a11-bdf1-8678ac54106b}" relid="0x44" childrelidcntr="0x1">
-							<name>ReaderDataLifecycleQosPolicy</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-00000291" kind="Member" role="Member" guid="{cfde8b31-af5b-4977-8087-860ff997669b}" relid="0x0" referred="id-0065-0000012e">
-								<name>autopurge_disposed_samples_delay</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000292" kind="Member" role="Member" guid="{1ddfb830-8f41-4f6f-b977-7338cd722230}" relid="0x0" referred="id-0065-0000012e">
-								<name>autopurge_nowriter_samples_delay</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000076" kind="Aggregate" role="Aggregate" guid="{a6461d6d-7852-4fc0-9ae7-e5d889df27f7}" relid="0x43" childrelidcntr="0x1">
-							<name>WriterDataLifecycleQosPolicy</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-00000050" kind="Member" role="Member" guid="{10690b87-d46c-433c-9f98-8840fe0ba8d9}" relid="0x0" referred="id-0066-0000002f">
-								<name>autodispose_unregistered_instances</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000077" kind="Aggregate" role="Aggregate" guid="{fb47bdf9-902a-4e57-8f13-c418ec0265c6}" relid="0x42" childrelidcntr="0x1">
-							<name>EntityFactoryQosPolicy</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-00000051" kind="Member" role="Member" guid="{3b58eef4-8165-466a-afbb-5560964f1031}" relid="0x0" referred="id-0066-0000002f">
-								<name>autoenable_created_entities</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000078" kind="Aggregate" role="Aggregate" guid="{f8a00190-2a75-41c2-b5a0-682d61568931}" relid="0x41" childrelidcntr="0x1">
-							<name>ResourceLimitsQosPolicy</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-00000052" kind="Member" role="Member" guid="{f744660b-bf6d-4b72-a07f-857e5f8fce68}" relid="0x0" referred="id-0066-0000002a">
-								<name>max_samples_per_instance</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000053" kind="Member" role="Member" guid="{ca3c745f-ba26-4d08-b621-951177cb1687}" relid="0x0" referred="id-0066-0000002a">
-								<name>max_instances</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000054" kind="Member" role="Member" guid="{cc496538-8bd6-43a0-9c79-36cb89801e41}" relid="0x0" referred="id-0066-0000002a">
-								<name>max_samples</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000079" kind="Aggregate" role="Aggregate" guid="{0ac088b7-d4d1-45e3-b138-3de5e5f8ca51}" relid="0x40" childrelidcntr="0x1">
-							<name>HistoryQosPolicy</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-00000055" kind="Member" role="Member" guid="{433081f8-8617-42fd-9abe-b688bbcf98ce}" relid="0x0" referred="id-0066-0000002a">
-								<name>depth</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000293" kind="Member" role="Member" guid="{7217533c-d1f2-4c3b-b3d9-61d2045ea106}" relid="0x0" referred="id-0065-0000007a">
-								<name>kind</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-0000007a" kind="Enum" role="Enum" guid="{08af6c5f-caa3-4ca1-a4d1-b9d54310c697}" relid="0x3f" childrelidcntr="0x2">
-							<name>HistoryQosPolicyKind</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<atom id="id-0066-00000031" kind="EnumValue" role="EnumValue" guid="{ed898fc4-b4d7-4d8b-9ec7-4e18b78f8d47}" relid="0x1">
-								<name>KEEP_ALL_HISTORY_QOS</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-							<atom id="id-0066-00000032" kind="EnumValue" role="EnumValue" guid="{7fc1b160-a621-440a-a680-dcb03426eda0}" relid="0x0">
-								<name>KEEP_LAST_HISTORY_QOS</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-						</model>
-						<model id="id-0065-0000007b" kind="Aggregate" role="Aggregate" guid="{196945c2-043f-4a8f-bfb1-7d05a359ed03}" relid="0x3e" childrelidcntr="0x1">
-							<name>DestinationOrderQosPolicy</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-00000294" kind="Member" role="Member" guid="{9bde85a2-fd0a-4bf3-978c-4673d1e5e12c}" relid="0x0" referred="id-0065-0000007c">
-								<name>kind</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-0000007c" kind="Enum" role="Enum" guid="{8591eaca-32e4-44e4-bebb-b3e52d458ce1}" relid="0x3d" childrelidcntr="0x2">
-							<name>DestinationOrderQosPolicyKind</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<atom id="id-0066-00000033" kind="EnumValue" role="EnumValue" guid="{0c071810-7892-4c4c-bdb8-a77fafb75faf}" relid="0x1">
-								<name>BY_SOURCE_TIMESTAMP_DESTINATIONORDER_QOS</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-							<atom id="id-0066-00000034" kind="EnumValue" role="EnumValue" guid="{80c44981-7092-43c8-9e6f-34e5e0dd7506}" relid="0x0">
-								<name>BY_RECEPTION_TIMESTAMP_DESTINATIONORDER_QOS</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-						</model>
-						<model id="id-0065-0000007d" kind="Aggregate" role="Aggregate" guid="{23dcaea5-1b19-4696-9f88-59597b375aea}" relid="0x3c" childrelidcntr="0x1">
-							<name>ReliabilityQosPolicy</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-00000295" kind="Member" role="Member" guid="{48e76418-260b-4186-b8f5-b58fe85f0efd}" relid="0x0" referred="id-0065-0000012e">
-								<name>max_blocking_time</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000296" kind="Member" role="Member" guid="{2d463ec8-1f8b-413d-b901-2877be67a0d9}" relid="0x0" referred="id-0065-0000007e">
-								<name>kind</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-0000007e" kind="Enum" role="Enum" guid="{58736bb3-17e7-4d63-94c9-6fbdcf891236}" relid="0x3b" childrelidcntr="0x2">
-							<name>ReliabilityQosPolicyKind</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<atom id="id-0066-00000035" kind="EnumValue" role="EnumValue" guid="{415114cd-5195-489f-bd3d-62da3c346ce5}" relid="0x1">
-								<name>RELIABLE_RELIABILITY_QOS</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-							<atom id="id-0066-00000036" kind="EnumValue" role="EnumValue" guid="{67c74094-0213-40ca-95a5-944d3ec6bbe1}" relid="0x0">
-								<name>BEST_EFFORT_RELIABILITY_QOS</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-						</model>
-						<model id="id-0065-0000007f" kind="Aggregate" role="Aggregate" guid="{9d41c454-c99c-437c-adba-ad1734d0de96}" relid="0x3a" childrelidcntr="0x1">
-							<name>PartitionQosPolicy</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-00000297" kind="Member" role="Member" guid="{6bdaee44-0810-4fac-b0d7-83d06edf56b1}" relid="0x0" referred="id-0067-0000012c">
-								<name>name</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000080" kind="Aggregate" role="Aggregate" guid="{b6a1a384-bb33-4f77-8481-c99115ff8f75}" relid="0x39" childrelidcntr="0x1">
-							<name>TimeBasedFilterQosPolicy</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-00000298" kind="Member" role="Member" guid="{bdba4cf2-1773-454f-9848-e77539c6047d}" relid="0x0" referred="id-0065-0000012e">
-								<name>minimum_separation</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000081" kind="Aggregate" role="Aggregate" guid="{9edb5275-ff34-4335-8293-ffbff6839c8a}" relid="0x38" childrelidcntr="0x1">
-							<name>LivelinessQosPolicy</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-00000299" kind="Member" role="Member" guid="{290d189e-21d9-4a89-bc2d-c146e577531a}" relid="0x0" referred="id-0065-0000012e">
-								<name>lease_duration</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000029a" kind="Member" role="Member" guid="{47b83650-1752-455a-819e-af36e2a02141}" relid="0x0" referred="id-0065-00000082">
-								<name>kind</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000082" kind="Enum" role="Enum" guid="{7038e581-f25e-4142-bd4c-60e4dde8a414}" relid="0x37" childrelidcntr="0x3">
-							<name>LivelinessQosPolicyKind</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<atom id="id-0066-00000037" kind="EnumValue" role="EnumValue" guid="{09db2b95-ea2f-4c62-aee6-38106f64e4c5}" relid="0x2">
-								<name>MANUAL_BY_TOPIC_LIVELINESS_QOS</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-							<atom id="id-0066-00000038" kind="EnumValue" role="EnumValue" guid="{327f4ac0-ec1a-4eb9-a118-3af2a9076ed5}" relid="0x1">
-								<name>MANUAL_BY_PARTICIPANT_LIVELINESS_QOS</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-							<atom id="id-0066-00000039" kind="EnumValue" role="EnumValue" guid="{eeb954a4-8770-4151-a626-e4adc5aa10a6}" relid="0x0">
-								<name>AUTOMATIC_LIVELINESS_QOS</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-						</model>
-						<model id="id-0065-00000083" kind="Aggregate" role="Aggregate" guid="{44e1dafc-c12e-486c-9196-a18a5e346bbf}" relid="0x36" childrelidcntr="0x1">
-							<name>OwnershipStrengthQosPolicy</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-00000056" kind="Member" role="Member" guid="{99a7f461-8cbe-4576-b104-37bc31847fa6}" relid="0x0" referred="id-0066-0000002a">
-								<name>value</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000084" kind="Aggregate" role="Aggregate" guid="{40c1b881-6f39-4bf5-9073-bea84cfcae9a}" relid="0x35" childrelidcntr="0x1">
-							<name>OwnershipQosPolicy</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-0000029b" kind="Member" role="Member" guid="{7c40efef-88c4-4943-a5c1-f2bf1669fbf8}" relid="0x0" referred="id-0065-00000085">
-								<name>kind</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000085" kind="Enum" role="Enum" guid="{13267686-3ead-49f5-9b7d-db38a7ba7d6c}" relid="0x34" childrelidcntr="0x2">
-							<name>OwnershipQosPolicyKind</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<atom id="id-0066-0000003a" kind="EnumValue" role="EnumValue" guid="{f66082d0-4e9f-4361-a26d-6d6050d83b9c}" relid="0x1">
-								<name>EXCLUSIVE_OWNERSHIP_QOS</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-							<atom id="id-0066-0000003b" kind="EnumValue" role="EnumValue" guid="{35bbee33-3cfb-4100-9f13-2089c07e8708}" relid="0x0">
-								<name>SHARED_OWNERSHIP_QOS</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-						</model>
-						<model id="id-0065-00000086" kind="Aggregate" role="Aggregate" guid="{cf2d355a-ac71-42e8-974e-2991e17d4819}" relid="0x33" childrelidcntr="0x1">
-							<name>LatencyBudgetQosPolicy</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-0000029c" kind="Member" role="Member" guid="{9497318d-e203-47fc-8222-76fee855c609}" relid="0x0" referred="id-0065-0000012e">
-								<name>duration</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000087" kind="Aggregate" role="Aggregate" guid="{7d1121ef-12bb-4158-8d1c-c83e92792f6a}" relid="0x32" childrelidcntr="0x1">
-							<name>DeadlineQosPolicy</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-0000029d" kind="Member" role="Member" guid="{973f4fac-415a-4c29-99ee-0c8cff77b894}" relid="0x0" referred="id-0065-0000012e">
-								<name>period</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000088" kind="Aggregate" role="Aggregate" guid="{ca630852-9aea-4553-8cb2-041012ae8aec}" relid="0x31" childrelidcntr="0x1">
-							<name>PresentationQosPolicy</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-00000057" kind="Member" role="Member" guid="{95f21377-62b7-4462-a043-98094379ebb7}" relid="0x0" referred="id-0066-0000002f">
-								<name>ordered_access</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000058" kind="Member" role="Member" guid="{1a77a076-e8af-4a83-bdc7-e3dbe8e6079e}" relid="0x0" referred="id-0066-0000002f">
-								<name>coherent_access</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000029e" kind="Member" role="Member" guid="{d481933b-86f0-492a-b029-8288e8a6b97c}" relid="0x0" referred="id-0065-00000089">
-								<name>access_scope</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000089" kind="Enum" role="Enum" guid="{6bfe912d-b9e1-4a25-93a0-b44eb90e129d}" relid="0x30" childrelidcntr="0x3">
-							<name>PresentationQosPolicyAccessScopeKind</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<atom id="id-0066-0000003c" kind="EnumValue" role="EnumValue" guid="{90f403f0-3368-4050-aef9-2ae0da24c2c9}" relid="0x2">
-								<name>GROUP_PRESENTATION_QOS</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-							<atom id="id-0066-0000003d" kind="EnumValue" role="EnumValue" guid="{ce53e6e7-5e3b-46f5-b79f-795c4b48e0ad}" relid="0x1">
-								<name>TOPIC_PRESENTATION_QOS</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-							<atom id="id-0066-0000003e" kind="EnumValue" role="EnumValue" guid="{9673971f-2e34-46de-8ec8-73798197d0bd}" relid="0x0">
-								<name>INSTANCE_PRESENTATION_QOS</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-						</model>
-						<model id="id-0065-0000008a" kind="Aggregate" role="Aggregate" guid="{5af9d5af-d54e-482b-8e8c-c8bbcbf3b030}" relid="0x2f" childrelidcntr="0x1">
-							<name>DurabilityQosPolicy</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-0000029f" kind="Member" role="Member" guid="{6cb4e11e-f909-43c8-af97-acddef43abf8}" relid="0x0" referred="id-0065-0000008b">
-								<name>kind</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-0000008b" kind="Enum" role="Enum" guid="{640d2a39-4edc-4d30-84c1-3015943c36c1}" relid="0x2e" childrelidcntr="0x4">
-							<name>DurabilityQosPolicyKind</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<atom id="id-0066-0000003f" kind="EnumValue" role="EnumValue" guid="{cc39bfcd-d61c-466e-8320-328d1c9f05c3}" relid="0x3">
-								<name>PERSISTENT_DURABILITY_QOS</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-							<atom id="id-0066-00000040" kind="EnumValue" role="EnumValue" guid="{72b79f7c-e86f-4718-9a41-00be9c925290}" relid="0x2">
-								<name>TRANSIENT_DURABILITY_QOS</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-							<atom id="id-0066-00000041" kind="EnumValue" role="EnumValue" guid="{6ec098c3-f16b-43c0-b632-3e6f83d4fd72}" relid="0x1">
-								<name>TRANSIENT_LOCAL_DURABILITY_QOS</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-							<atom id="id-0066-00000042" kind="EnumValue" role="EnumValue" guid="{e250443e-7189-42c1-af22-aa7e3e62bf4b}" relid="0x0">
-								<name>VOLATILE_DURABILITY_QOS</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-						</model>
-						<model id="id-0065-0000008c" kind="Aggregate" role="Aggregate" guid="{d0473b4d-657b-4a9a-9b78-6119c51060ea}" relid="0x2d" childrelidcntr="0x1">
-							<name>LifespanQosPolicy</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000002a0" kind="Member" role="Member" guid="{92a37816-156e-4678-b977-791074f4683c}" relid="0x0" referred="id-0065-0000012e">
-								<name>duration</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-0000008d" kind="Aggregate" role="Aggregate" guid="{8f8dfe08-4063-42d2-a314-927a6aba1826}" relid="0x2c" childrelidcntr="0x1">
-							<name>TransportPriorityQosPolicy</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-00000059" kind="Member" role="Member" guid="{09ac6238-520c-4c56-9ec6-8a4afc0f4357}" relid="0x0" referred="id-0066-0000002a">
-								<name>value</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-0000008e" kind="Aggregate" role="Aggregate" guid="{a1453d77-ab8f-49f1-854f-53aca2b29f30}" relid="0x2b" childrelidcntr="0x1">
-							<name>GroupDataQosPolicy</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000002a1" kind="Member" role="Member" guid="{cc6206d6-92db-42f9-ae85-1f10fc8fcc5a}" relid="0x0" referred="id-0067-000000c9">
-								<name>value</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-0000008f" kind="Aggregate" role="Aggregate" guid="{31e7ed51-9481-4d36-8b4c-1143ae45140b}" relid="0x2a" childrelidcntr="0x1">
-							<name>TopicDataQosPolicy</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000002a2" kind="Member" role="Member" guid="{0d4a3355-a817-412a-8ea7-9cd4192fe166}" relid="0x0" referred="id-0067-000000c9">
-								<name>value</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000090" kind="Aggregate" role="Aggregate" guid="{5d0b0d21-0174-4a3f-a4b1-4810b9b03867}" relid="0x29" childrelidcntr="0x1">
-							<name>UserDataQosPolicy</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000002a3" kind="Member" role="Member" guid="{cd833cb5-c474-4de6-82bd-f5813899e78a}" relid="0x0" referred="id-0067-000000c9">
-								<name>value</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000091" kind="Object" role="Object" guid="{fb4c57c7-0d18-4743-873b-9f444650dd32}" relid="0x28" childrelidcntr="0x4">
-							<name>QueryCondition</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-00000092" kind="TwowayOperation" role="TwowayOperation" guid="{0a953f9e-5d4c-4249-b695-e32385783cbf}" relid="0x2" childrelidcntr="0x1">
-								<name>set_query_parameters</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002a4" kind="InParameter" role="InParameter" guid="{ae451663-d878-4598-a1df-6d0c6546cfd0}" relid="0x0" referred="id-0067-0000012c">
-									<name>query_parameters</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002a5" kind="ReturnType" role="ReturnType" guid="{af4a8656-a5fa-4d09-b08d-7e51d3320c6c}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000093" kind="TwowayOperation" role="TwowayOperation" guid="{0fb3b601-7e6c-4f02-9178-624d03577090}" relid="0x1" childrelidcntr="0x1">
-								<name>get_query_parameters</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002a6" kind="InoutParameter" role="InoutParameter" guid="{aa2e4b34-ec63-4eeb-a430-e191519b6275}" relid="0x0" referred="id-0067-0000012c">
-									<name>query_parameters</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002a7" kind="ReturnType" role="ReturnType" guid="{522fcbb6-90c7-40e2-af2e-f550658b2792}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000094" kind="TwowayOperation" role="TwowayOperation" guid="{834abc4d-407d-40e2-93a6-6411f0a7e826}" relid="0x0" childrelidcntr="0x1">
-								<name>get_query_expression</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000005a" kind="ReturnType" role="ReturnType" guid="{5983d075-b2ce-4cf5-b567-1cf4936a7486}" relid="0x0" referred="id-0066-0000001f">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<reference id="id-0067-000002a8" kind="Inherits" role="Inherits" guid="{c9fce9c4-515f-47f1-a2ed-3238a98e6e7e}" relid="0x3" referred="id-0065-00000095">
-								<name>Inherits</name>
-							</reference>
-						</model>
-						<model id="id-0065-00000095" kind="Object" role="Object" guid="{64561bb2-bbd1-4a4c-90c7-d4e94b5b0c86}" relid="0x27" childrelidcntr="0x5">
-							<name>ReadCondition</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-00000096" kind="TwowayOperation" role="TwowayOperation" guid="{7dfd7c28-b9d7-47b3-9156-e7402dfc6424}" relid="0x3" childrelidcntr="0x1">
-								<name>get_datareader</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002a9" kind="ReturnType" role="ReturnType" guid="{9d0a0fce-db19-4a2a-bc5d-aa07a31d7d45}" relid="0x0" referred="id-0065-000000e1">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000097" kind="TwowayOperation" role="TwowayOperation" guid="{597df2bf-444d-4ef5-9016-790a7c639e41}" relid="0x2" childrelidcntr="0x1">
-								<name>get_instance_state_mask</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002aa" kind="ReturnType" role="ReturnType" guid="{83dc1818-b6aa-413e-9966-4a62cf8d9aba}" relid="0x0" referred="id-0067-000000f8">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000098" kind="TwowayOperation" role="TwowayOperation" guid="{35102179-2176-4e02-a59a-012ea18cd27b}" relid="0x1" childrelidcntr="0x1">
-								<name>get_view_state_mask</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002ab" kind="ReturnType" role="ReturnType" guid="{331a9701-847d-4307-900a-71d242fdbe19}" relid="0x0" referred="id-0067-000000fe">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000099" kind="TwowayOperation" role="TwowayOperation" guid="{08ef321e-fe40-447f-9bc6-8cd61417375b}" relid="0x0" childrelidcntr="0x1">
-								<name>get_sample_state_mask</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002ac" kind="ReturnType" role="ReturnType" guid="{61ec1fe6-5488-4dcd-9de0-7d9650927c6a}" relid="0x0" referred="id-0067-00000103">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<reference id="id-0067-000002ad" kind="Inherits" role="Inherits" guid="{4ac38eff-3932-4e71-a37c-20baa0295035}" relid="0x4" referred="id-0065-000000a5">
-								<name>Inherits</name>
-							</reference>
-						</model>
-						<model id="id-0065-0000009a" kind="Object" role="Object" guid="{ad67a803-70ff-4d6e-967b-990b5e6c9e7f}" relid="0x26" childrelidcntr="0x4">
-							<name>StatusCondition</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-0000009b" kind="TwowayOperation" role="TwowayOperation" guid="{70d00df7-c473-441d-a716-cb05b29a4cf2}" relid="0x2" childrelidcntr="0x1">
-								<name>get_entity</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002ae" kind="ReturnType" role="ReturnType" guid="{99718575-6fb6-4a21-8e8e-cbfd521c869e}" relid="0x0" referred="id-0065-00000117">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000009c" kind="TwowayOperation" role="TwowayOperation" guid="{4706f066-fb65-49ce-9f68-f7c41a719ac1}" relid="0x1" childrelidcntr="0x1">
-								<name>set_enabled_statuses</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002af" kind="InParameter" role="InParameter" guid="{3b21d514-9639-48b5-9416-b388ca4ca93e}" relid="0x0" referred="id-0067-00000116">
-									<name>mask</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002b0" kind="ReturnType" role="ReturnType" guid="{6de57292-4752-4277-b663-859fb467b851}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000009d" kind="TwowayOperation" role="TwowayOperation" guid="{b7a09a16-8c83-4c45-b89b-2e323d17198b}" relid="0x0" childrelidcntr="0x1">
-								<name>get_enabled_statuses</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002b1" kind="ReturnType" role="ReturnType" guid="{4a0b2011-450f-48de-977e-a6bf358aff39}" relid="0x0" referred="id-0067-00000116">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<reference id="id-0067-000002b2" kind="Inherits" role="Inherits" guid="{8f2a90d9-5b79-4c30-b0a4-9a152fda0bff}" relid="0x3" referred="id-0065-000000a5">
-								<name>Inherits</name>
-							</reference>
-						</model>
-						<model id="id-0065-0000009e" kind="Object" role="Object" guid="{80afdb19-9426-44ec-a1e6-d7d81b6ec892}" relid="0x25" childrelidcntr="0x2">
-							<name>GuardCondition</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-0000009f" kind="TwowayOperation" role="TwowayOperation" guid="{ca4365c0-7848-43e7-815b-cda458caf3e2}" relid="0x0" childrelidcntr="0x1">
-								<name>set_trigger_value</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000005b" kind="InParameter" role="InParameter" guid="{316e1617-c876-4c5d-85a1-4c42b205e7d5}" relid="0x0" referred="id-0066-0000002f">
-									<name>value</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002b3" kind="ReturnType" role="ReturnType" guid="{adfa5c45-4218-405c-a892-35ea698c8f7d}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<reference id="id-0067-000002b4" kind="Inherits" role="Inherits" guid="{38506d9c-3d34-4866-a783-f75d14a7a74f}" relid="0x1" referred="id-0065-000000a5">
-								<name>Inherits</name>
-							</reference>
-						</model>
-						<model id="id-0065-000000a0" kind="Object" role="Object" guid="{963ea670-e2d4-4b71-b455-a310e1a8c32e}" relid="0x24" childrelidcntr="0x4">
-							<name>WaitSet</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-000000a1" kind="TwowayOperation" role="TwowayOperation" guid="{1444279c-ee95-4c33-9e1d-b4adde514038}" relid="0x3" childrelidcntr="0x1">
-								<name>get_conditions</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002b5" kind="ReturnType" role="ReturnType" guid="{3bb459d2-17c8-48c9-980b-29187643ed0d}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002b6" kind="InoutParameter" role="InoutParameter" guid="{e27cb3cf-160d-440b-97c9-0e779c719ae6}" relid="0x0" referred="id-0067-00000131">
-									<name>attached_conditions</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000a2" kind="TwowayOperation" role="TwowayOperation" guid="{f111c931-37a1-4b4b-a8ab-1b1d21ebe53f}" relid="0x2" childrelidcntr="0x1">
-								<name>detach_condition</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002b7" kind="ReturnType" role="ReturnType" guid="{a1cec342-59b0-48ca-9fcd-e36a8ac60acf}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002b8" kind="InParameter" role="InParameter" guid="{f718c48d-f98d-4e3b-9b3b-17abd3d1998c}" relid="0x0" referred="id-0065-000000a5">
-									<name>cond</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000a3" kind="TwowayOperation" role="TwowayOperation" guid="{180796f6-b238-4fb1-b53d-95a62d74c7c7}" relid="0x1" childrelidcntr="0x1">
-								<name>attach_condition</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002b9" kind="ReturnType" role="ReturnType" guid="{be03b66e-ce78-4793-9760-502027a66357}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002ba" kind="InParameter" role="InParameter" guid="{cc5892e9-6b25-4a8f-be23-b23185a8fed5}" relid="0x0" referred="id-0065-000000a5">
-									<name>cond</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000a4" kind="TwowayOperation" role="TwowayOperation" guid="{2bec1971-a06d-49a1-b11f-dd4583830a2e}" relid="0x0" childrelidcntr="0x1">
-								<name>wait</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002bb" kind="ReturnType" role="ReturnType" guid="{87bff5ae-af9c-4ae1-8671-cdb4258dc924}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002bc" kind="InParameter" role="InParameter" guid="{d9d9632b-67bf-4cc4-81f6-3e56f1537b3d}" relid="0x0" referred="id-0065-0000012e">
-									<name>timeout</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002bd" kind="InoutParameter" role="InoutParameter" guid="{79266214-f81a-421a-bdb5-7e8e3203a7f0}" relid="0x0" referred="id-0067-00000131">
-									<name>active_conditions</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-						</model>
-						<model id="id-0065-000000a5" kind="Object" role="Object" guid="{20c8b739-65af-41ec-8d86-d821626a2a0e}" relid="0x23" childrelidcntr="0x1">
-							<name>Condition</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-000000a6" kind="TwowayOperation" role="TwowayOperation" guid="{90f43f6f-85b5-4226-ad3e-affd7916af2b}" relid="0x0" childrelidcntr="0x1">
-								<name>get_trigger_value</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000005c" kind="ReturnType" role="ReturnType" guid="{7090f7d6-516d-4f5a-b12e-3c2a0aaf1b4f}" relid="0x0" referred="id-0066-0000002f">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-						</model>
-						<model id="id-0065-000000a7" kind="Object" role="Object" guid="{f9d59fe3-9616-4806-833d-2a15868c3cae}" relid="0x22" childrelidcntr="0x1">
-							<name>DomainParticipantListener</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000002be" kind="Inherits" role="Inherits" guid="{a56eb686-b35a-4881-a923-f6aff8c00ba7}" relid="0x0" referred="id-0065-000000b2">
-								<name>Inherits</name>
-							</reference>
-							<reference id="id-0067-000002bf" kind="Inherits" role="Inherits" guid="{02f1a8ab-9785-494b-8445-ec77f5cdbcf7}" relid="0x0" referred="id-0065-0000011c">
-								<name>Inherits</name>
-							</reference>
-							<reference id="id-0067-000002c0" kind="Inherits" role="Inherits" guid="{f2584eaf-ef06-4ad5-87ba-810c016187da}" relid="0x0" referred="id-0065-000000ba">
-								<name>Inherits</name>
-							</reference>
-						</model>
-						<model id="id-0065-000000a8" kind="Object" role="Object" guid="{4c9f54ce-366e-4d5b-8e0c-d733f62e3b94}" relid="0x21" childrelidcntr="0x2">
-							<name>SubscriberListener</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-000000a9" kind="TwowayOperation" role="TwowayOperation" guid="{77606d1b-4d11-4ffa-a143-6eaffb7108e4}" relid="0x0" childrelidcntr="0x1">
-								<name>on_data_on_readers</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002c1" kind="InParameter" role="InParameter" guid="{a84e3704-da57-47b7-81ad-9ca5d3083444}" relid="0x0" referred="id-0065-000000cf">
-									<name>the_subscriber</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<reference id="id-0067-000002c2" kind="Inherits" role="Inherits" guid="{3df2b316-f31a-4c9f-ba84-3a93a8eb0f8d}" relid="0x1" referred="id-0065-000000aa">
-								<name>Inherits</name>
-							</reference>
-						</model>
-						<model id="id-0065-000000aa" kind="Object" role="Object" guid="{21482efd-7490-4df3-bd59-af5c783e3468}" relid="0x20" childrelidcntr="0x8">
-							<name>DataReaderListener</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-000000ab" kind="TwowayOperation" role="TwowayOperation" guid="{ef0ed577-2fe7-41e2-9d84-01b3a7ac5ac2}" relid="0x6" childrelidcntr="0x1">
-								<name>on_sample_lost</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,660</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002c3" kind="InParameter" role="InParameter" guid="{3a2275ba-2b65-4f7c-9b49-5d93a4b4916e}" relid="0x0" referred="id-0065-0000012b">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002c4" kind="InParameter" role="InParameter" guid="{99dfc069-394a-4586-8af3-f6b8d1ae62e9}" relid="0x0" referred="id-0065-000000e1">
-									<name>the_reader</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000ac" kind="TwowayOperation" role="TwowayOperation" guid="{5d373a8d-d337-44cc-a28e-c3822dc7719a}" relid="0x5" childrelidcntr="0x1">
-								<name>on_subscription_matched</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,560</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002c5" kind="InParameter" role="InParameter" guid="{22bbcafe-f6a8-43b0-b9ec-da82617a9034}" relid="0x0" referred="id-0065-00000120">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002c6" kind="InParameter" role="InParameter" guid="{5339ea05-93ed-42f3-bf5a-e650aa6386cf}" relid="0x0" referred="id-0065-000000e1">
-									<name>the_reader</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000ad" kind="TwowayOperation" role="TwowayOperation" guid="{707b7440-d471-4b40-9cea-01a2d07993e9}" relid="0x4" childrelidcntr="0x1">
-								<name>on_data_available</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002c7" kind="InParameter" role="InParameter" guid="{5fcc73b8-51c8-4f68-a130-67d9ee8ff7e3}" relid="0x0" referred="id-0065-000000e1">
-									<name>the_reader</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000ae" kind="TwowayOperation" role="TwowayOperation" guid="{0163a50f-8169-4ccf-b200-89dbb6e3da85}" relid="0x3" childrelidcntr="0x1">
-								<name>on_liveliness_changed</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002c8" kind="InParameter" role="InParameter" guid="{94ddd20b-f16b-4ee6-895b-ad9c5bb5070b}" relid="0x0" referred="id-0065-00000127">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002c9" kind="InParameter" role="InParameter" guid="{72986913-c2cd-4987-b638-a01efe9cfb7a}" relid="0x0" referred="id-0065-000000e1">
-									<name>the_reader</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000af" kind="TwowayOperation" role="TwowayOperation" guid="{ab1169ab-0f50-4b35-bbb1-da177461bec7}" relid="0x2" childrelidcntr="0x1">
-								<name>on_sample_rejected</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002ca" kind="InParameter" role="InParameter" guid="{1fa64424-331f-4dc3-8801-cae23da11c7c}" relid="0x0" referred="id-0065-00000129">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002cb" kind="InParameter" role="InParameter" guid="{2e19fa4e-30af-4a38-8a07-83c6e50e848f}" relid="0x0" referred="id-0065-000000e1">
-									<name>the_reader</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000b0" kind="TwowayOperation" role="TwowayOperation" guid="{92c9b989-c372-49c2-a59f-5324d7779a4a}" relid="0x1" childrelidcntr="0x1">
-								<name>on_requested_incompatible_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002cc" kind="InParameter" role="InParameter" guid="{f496b174-7bc3-43c7-8bd6-b8d7c02a40e8}" relid="0x0" referred="id-0065-00000122">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002cd" kind="InParameter" role="InParameter" guid="{bd247fbc-54fa-4eb9-92da-2bff562cd95f}" relid="0x0" referred="id-0065-000000e1">
-									<name>the_reader</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000b1" kind="TwowayOperation" role="TwowayOperation" guid="{f152534c-add7-4f9d-91a6-ad53cb298618}" relid="0x0" childrelidcntr="0x1">
-								<name>on_requested_deadline_missed</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002ce" kind="InParameter" role="InParameter" guid="{7693b0f3-2e6a-4190-b460-1537d2b25b04}" relid="0x0" referred="id-0065-00000125">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002cf" kind="InParameter" role="InParameter" guid="{3a3ec0f6-3bed-4f2a-b03f-ab31f579d132}" relid="0x0" referred="id-0065-000000e1">
-									<name>the_reader</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<reference id="id-0067-000002d0" kind="Inherits" role="Inherits" guid="{f6a27cc0-3122-4857-8022-6391beb021c3}" relid="0x7" referred="id-0065-0000011c">
-								<name>Inherits</name>
-							</reference>
-						</model>
-						<model id="id-0065-000000b2" kind="Object" role="Object" guid="{e4699243-959f-4fce-8308-d6fb2a3ba60c}" relid="0x1f" childrelidcntr="0x1">
-							<name>PublisherListener</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000002d1" kind="Inherits" role="Inherits" guid="{b19e72bd-4670-4fe6-b0f4-b571561e68f0}" relid="0x0" referred="id-0065-000000b3">
-								<name>Inherits</name>
-							</reference>
-						</model>
-						<model id="id-0065-000000b3" kind="Object" role="Object" guid="{6ec642f5-e2c2-4b1b-ad6b-c7589f6124ab}" relid="0x1e" childrelidcntr="0x7">
-							<name>DataWriterListener</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-000000b4" kind="TwowayOperation" role="TwowayOperation" guid="{32206b40-6314-4acb-a78f-f0aeb4218877}" relid="0x5" childrelidcntr="0x1">
-								<name>on_reliable_reader_activity_changed</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,560</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002d2" kind="InParameter" role="InParameter" guid="{2c9ad149-a03c-452e-ab6e-9b7e9336968b}" relid="0x0" referred="id-0065-0000011f">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002d3" kind="InParameter" role="InParameter" guid="{2974bfbf-5852-4460-8473-e59140fd694f}" relid="0x0" referred="id-0065-000000f5">
-									<name>writer</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000b5" kind="TwowayOperation" role="TwowayOperation" guid="{b11529b5-a0d8-4003-9974-51497c3abaab}" relid="0x4" childrelidcntr="0x1">
-								<name>on_reliable_writer_cache_changed</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002d4" kind="InParameter" role="InParameter" guid="{bb850eb5-7830-4ce9-88cb-a8344d424b5d}" relid="0x0" referred="id-0065-0000011d">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002d5" kind="InParameter" role="InParameter" guid="{73023405-7e9b-4a0b-ad70-78c4aa8d80d2}" relid="0x0" referred="id-0065-000000f5">
-									<name>writer</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000b6" kind="TwowayOperation" role="TwowayOperation" guid="{296dafd2-3702-44d9-ab7a-f929d72fbf65}" relid="0x3" childrelidcntr="0x1">
-								<name>on_publication_matched</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002d6" kind="InParameter" role="InParameter" guid="{ce1e5a71-12f7-406e-94b7-4b3ac2a2ef42}" relid="0x0" referred="id-0065-00000121">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002d7" kind="InParameter" role="InParameter" guid="{c2e910b4-b861-4d01-a709-989a53a053f3}" relid="0x0" referred="id-0065-000000f5">
-									<name>writer</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000b7" kind="TwowayOperation" role="TwowayOperation" guid="{65ac6074-64e3-4b24-92a0-d7f90c511e4e}" relid="0x2" childrelidcntr="0x1">
-								<name>on_liveliness_lost</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002d8" kind="InParameter" role="InParameter" guid="{4b722d31-7fa2-415d-83c7-39a18d7ae812}" relid="0x0" referred="id-0065-00000128">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002d9" kind="InParameter" role="InParameter" guid="{1132162b-706b-4e7e-bb43-3bdf83c4c761}" relid="0x0" referred="id-0065-000000f5">
-									<name>writer</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000b8" kind="TwowayOperation" role="TwowayOperation" guid="{8ddaf5b7-f2a4-4bce-b2aa-62afaaf4a8fd}" relid="0x1" childrelidcntr="0x1">
-								<name>on_offered_incompatible_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002da" kind="InParameter" role="InParameter" guid="{30780cf3-8476-44da-bc3a-8dd199c42853}" relid="0x0" referred="id-0065-00000123">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002db" kind="InParameter" role="InParameter" guid="{826506ef-7504-4bf7-86c4-1a909979cced}" relid="0x0" referred="id-0065-000000f5">
-									<name>writer</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000b9" kind="TwowayOperation" role="TwowayOperation" guid="{4853b54d-7248-433c-ad29-dfaa7a701549}" relid="0x0" childrelidcntr="0x1">
-								<name>on_offered_deadline_missed</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002dc" kind="InParameter" role="InParameter" guid="{1d4cc92e-9eff-41d3-a609-80026f5123df}" relid="0x0" referred="id-0065-00000126">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002dd" kind="InParameter" role="InParameter" guid="{74c70e9f-b9ff-4924-95a1-d325adec0f18}" relid="0x0" referred="id-0065-000000f5">
-									<name>writer</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<reference id="id-0067-000002de" kind="Inherits" role="Inherits" guid="{d6f48dce-0393-45a5-af20-3d76bab7e49a}" relid="0x6" referred="id-0065-0000011c">
-								<name>Inherits</name>
-							</reference>
-						</model>
-						<model id="id-0065-000000ba" kind="Object" role="Object" guid="{b96f7fda-6a45-47d2-b103-11ad5bd524d4}" relid="0x1d" childrelidcntr="0x2">
-							<name>TopicListener</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-000000bb" kind="TwowayOperation" role="TwowayOperation" guid="{251c4042-ea65-4042-b536-b8a43990aa0c}" relid="0x0" childrelidcntr="0x1">
-								<name>on_inconsistent_topic</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002df" kind="InParameter" role="InParameter" guid="{667f44e5-472d-4fa2-b9ef-b4cbfab49c8d}" relid="0x0" referred="id-0065-0000012c">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002e0" kind="InParameter" role="InParameter" guid="{8e0de7d7-b5b0-49bf-a8c1-32ee4dca0cd2}" relid="0x0" referred="id-0065-0000010d">
-									<name>the_topic</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<reference id="id-0067-000002e1" kind="Inherits" role="Inherits" guid="{e1aef13f-a614-4c9b-82f6-d23fcbf62ffb}" relid="0x1" referred="id-0065-0000011c">
-								<name>Inherits</name>
-							</reference>
-						</model>
-						<model id="id-0065-000000bc" kind="Object" role="Object" guid="{4f5eebbb-cf9a-4547-88c3-68b4139798b5}" relid="0x1c" childrelidcntr="0x13">
-							<name>Publisher</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-000000bd" kind="TwowayOperation" role="TwowayOperation" guid="{bac79da3-694b-4630-b0e8-b0e1c6588d5a}" relid="0x11" childrelidcntr="0x1">
-								<name>copy_from_topic_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1760</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000005d" kind="InParameter" role="InParameter" guid="{5d3895b6-c2d6-4015-af00-5465948508ef}" relid="0x0" referred="id-0065-00000071">
-									<name>a_topic_qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000005e" kind="InoutParameter" role="InoutParameter" guid="{c7f99d7f-4ff0-43d6-9549-5e4f0fe584e7}" relid="0x0" referred="id-0065-00000070">
-									<name>a_datawriter_qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002e2" kind="ReturnType" role="ReturnType" guid="{1577cab5-647c-4da4-84cf-4126946ffae7}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000be" kind="TwowayOperation" role="TwowayOperation" guid="{f75d0811-ff01-4500-8125-4fc76004c532}" relid="0x10" childrelidcntr="0x1">
-								<name>get_default_datawriter_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1660</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000005f" kind="InoutParameter" role="InoutParameter" guid="{d4685544-1f06-459b-81a5-c618cce73903}" relid="0x0" referred="id-0065-00000070">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002e3" kind="ReturnType" role="ReturnType" guid="{74d27c57-f92d-4af0-a090-c3acdb17ff21}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000bf" kind="TwowayOperation" role="TwowayOperation" guid="{c122be64-e057-4bce-b70e-c911a0ef18d3}" relid="0xf" childrelidcntr="0x1">
-								<name>set_default_datawriter_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1560</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000060" kind="InParameter" role="InParameter" guid="{e201161b-3245-4c3e-87ff-54935e71b731}" relid="0x0" referred="id-0065-00000070">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002e4" kind="ReturnType" role="ReturnType" guid="{ebcedb62-f5f4-4dd3-b652-5f8f6ae28093}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000c0" kind="TwowayOperation" role="TwowayOperation" guid="{c9f8ec8f-69a9-4c5b-885c-974b20297674}" relid="0xe" childrelidcntr="0x1">
-								<name>get_participant</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000061" kind="ReturnType" role="ReturnType" guid="{9d3b8308-1b73-45f2-8b20-b0c0d7105af5}" relid="0x0" referred="id-0065-00000041">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000c1" kind="TwowayOperation" role="TwowayOperation" guid="{d5293866-6ed6-4f2d-b42b-22fbca744fd4}" relid="0xd" childrelidcntr="0x1">
-								<name>wait_for_acknowledgments</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002e5" kind="ReturnType" role="ReturnType" guid="{641d952c-266b-4a75-95ab-77dd3f516a57}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002e6" kind="InParameter" role="InParameter" guid="{c9e98644-418c-4f72-bbf0-55362ec76bcd}" relid="0x0" referred="id-0065-0000012e">
-									<name>max_wait</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000c2" kind="TwowayOperation" role="TwowayOperation" guid="{66214d0a-29a9-4bf1-a24e-eddd7d3b4398}" relid="0xc" childrelidcntr="0x1">
-								<name>end_coherent_changes</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002e7" kind="ReturnType" role="ReturnType" guid="{325fcbf1-6cb7-4152-a8fe-ad543c4d6f11}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000c3" kind="TwowayOperation" role="TwowayOperation" guid="{09792629-4fdb-4c0e-b596-718cfbb74571}" relid="0xb" childrelidcntr="0x1">
-								<name>begin_coherent_changes</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002e8" kind="ReturnType" role="ReturnType" guid="{dcc3bae7-db81-4fd1-8540-b8892c32513e}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000c4" kind="TwowayOperation" role="TwowayOperation" guid="{0f6efba4-a689-4d3f-b7e9-cef7fa4bbd8c}" relid="0xa" childrelidcntr="0x1">
-								<name>resume_publications</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1060</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002e9" kind="ReturnType" role="ReturnType" guid="{040979b6-4257-4fd0-b06c-2a9f887c4ec6}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000c5" kind="TwowayOperation" role="TwowayOperation" guid="{e7385d87-75fc-461e-b864-015eec341af5}" relid="0x9" childrelidcntr="0x1">
-								<name>suspend_publications</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,960</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002ea" kind="ReturnType" role="ReturnType" guid="{60dc06b1-7275-4cd8-98be-9c7632266e9e}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000c6" kind="TwowayOperation" role="TwowayOperation" guid="{f4d17e9a-58fd-4fa5-9749-2161c13877e9}" relid="0x8" childrelidcntr="0x1">
-								<name>get_listener</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,860</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000062" kind="ReturnType" role="ReturnType" guid="{4418ea4f-36c0-44b2-96cc-928bfac92f54}" relid="0x0" referred="id-0065-000000b2">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000c7" kind="TwowayOperation" role="TwowayOperation" guid="{cda3d7c2-d517-4ebc-bbba-88e79be7d0d0}" relid="0x7" childrelidcntr="0x1">
-								<name>set_listener</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,760</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000063" kind="InParameter" role="InParameter" guid="{5736a6b7-874a-4338-bc81-75ee9a951225}" relid="0x0" referred="id-0065-000000b2">
-									<name>a_listener</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002eb" kind="InParameter" role="InParameter" guid="{64528804-81a9-4bce-9624-c344e1b7516a}" relid="0x0" referred="id-0067-00000116">
-									<name>mask</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002ec" kind="ReturnType" role="ReturnType" guid="{4cae743d-7e86-4885-8090-0e47849879cb}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000c8" kind="TwowayOperation" role="TwowayOperation" guid="{fb86cfc0-06ba-4804-8150-bf09edab5a9b}" relid="0x6" childrelidcntr="0x1">
-								<name>get_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,660</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000064" kind="InoutParameter" role="InoutParameter" guid="{733a97ee-941d-4148-9821-c0f89a193f3b}" relid="0x0" referred="id-0065-0000006f">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002ed" kind="ReturnType" role="ReturnType" guid="{945ebf05-6a30-41f7-834d-e10b1d75060f}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000c9" kind="TwowayOperation" role="TwowayOperation" guid="{179d9a18-c488-4307-88d2-9f57797fb88d}" relid="0x5" childrelidcntr="0x1">
-								<name>set_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,560</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000065" kind="InParameter" role="InParameter" guid="{12663ac4-c11d-46e2-b1b7-fb490b1011db}" relid="0x0" referred="id-0065-0000006f">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002ee" kind="ReturnType" role="ReturnType" guid="{dfd9f22b-b22f-4f6b-bb06-103200df3b51}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000ca" kind="TwowayOperation" role="TwowayOperation" guid="{8d2971dc-bd0f-450c-a657-8e7d55ad7bd4}" relid="0x4" childrelidcntr="0x1">
-								<name>delete_contained_entities</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002ef" kind="ReturnType" role="ReturnType" guid="{3be19ff5-37af-4fe5-8a39-baabcc2fd8cf}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000cb" kind="TwowayOperation" role="TwowayOperation" guid="{d7ddfcd8-0fb8-4bba-bed4-87b098e094a9}" relid="0x3" childrelidcntr="0x1">
-								<name>lookup_datawriter</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000066" kind="InParameter" role="InParameter" guid="{44de8d28-5be1-4cf7-aefb-43ad2397a6fe}" relid="0x0" referred="id-0066-0000001f">
-									<name>topic_name</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002f0" kind="ReturnType" role="ReturnType" guid="{00e37ecc-0ea0-4d8b-9235-fa67204c2a02}" relid="0x0" referred="id-0065-000000f5">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000cc" kind="TwowayOperation" role="TwowayOperation" guid="{b90ffda6-2051-4a0a-95ab-37a59a19edf9}" relid="0x2" childrelidcntr="0x1">
-								<name>delete_datawriter</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002f1" kind="ReturnType" role="ReturnType" guid="{8e4d973b-95e8-4308-8793-2e3a6cdb5fb3}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002f2" kind="InParameter" role="InParameter" guid="{02aa4e05-ae68-4033-9419-74c767cdafad}" relid="0x0" referred="id-0065-000000f5">
-									<name>a_datawriter</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000cd" kind="TwowayOperation" role="TwowayOperation" guid="{afa7274d-6817-4601-9deb-d710d43e40d0}" relid="0x1" childrelidcntr="0x1">
-								<name>create_datawriter_with_profile</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000067" kind="InParameter" role="InParameter" guid="{79540497-9b9e-48a9-89e3-58c7e8d86aa4}" relid="0x0" referred="id-0065-000000b3">
-									<name>a_listener</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>460,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000068" kind="InParameter" role="InParameter" guid="{2421b119-5e27-4379-86f6-308f67a223c2}" relid="0x0" referred="id-0066-0000001f">
-									<name>probile_name</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>360,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000069" kind="InParameter" role="InParameter" guid="{6981d70d-ddbb-4140-8259-ed8ba6c74c34}" relid="0x0" referred="id-0066-0000001f">
-									<name>library_name</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002f3" kind="InParameter" role="InParameter" guid="{e46386b3-7971-4061-b9d9-e6aa0ae129af}" relid="0x0" referred="id-0067-00000116">
-									<name>mask</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>560,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002f4" kind="InParameter" role="InParameter" guid="{a918d624-2e7b-4cc8-83a2-7368cc29ef3c}" relid="0x0" referred="id-0065-0000010d">
-									<name>a_topic</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002f5" kind="ReturnType" role="ReturnType" guid="{0e08f6b6-76ad-4b40-82d3-b3024f8e751e}" relid="0x0" referred="id-0065-000000f5">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000ce" kind="TwowayOperation" role="TwowayOperation" guid="{d4a98d8d-7f33-41b7-98b5-4cc3572f0731}" relid="0x0" childrelidcntr="0x1">
-								<name>create_datawriter</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000006a" kind="InParameter" role="InParameter" guid="{ea51d174-903a-43f3-9023-e38848c4d448}" relid="0x0" referred="id-0065-000000b3">
-									<name>a_listener</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>360,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000006b" kind="InParameter" role="InParameter" guid="{bf0a5c44-eb8a-41f4-869b-f7bf96c77dec}" relid="0x0" referred="id-0065-00000070">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002f6" kind="InParameter" role="InParameter" guid="{188b0667-16f2-4bcd-bc77-964e2366d0fe}" relid="0x0" referred="id-0067-00000116">
-									<name>mask</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>460,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002f7" kind="InParameter" role="InParameter" guid="{34f51ff6-670d-4eff-8ed6-e811c6b38717}" relid="0x0" referred="id-0065-0000010d">
-									<name>a_topic</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002f8" kind="ReturnType" role="ReturnType" guid="{cdd7167e-c07c-4afe-b134-209d53aabd6e}" relid="0x0" referred="id-0065-000000f5">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<reference id="id-0067-000002f9" kind="Inherits" role="Inherits" guid="{e4183a64-c3c8-4f7f-8d5c-cb8d262353a7}" relid="0x12" referred="id-0065-00000117">
-								<name>Inherits</name>
-							</reference>
-						</model>
-						<model id="id-0065-000000cf" kind="Object" role="Object" guid="{a113f8ff-f511-492e-8f3e-73fbfa24baef}" relid="0x1b" childrelidcntr="0x12">
-							<name>Subscriber</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-000000d0" kind="TwowayOperation" role="TwowayOperation" guid="{6f1547e5-e8de-4537-80e4-a53bed927dbf}" relid="0x10" childrelidcntr="0x1">
-								<name>copy_from_topic_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1660</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000006c" kind="InParameter" role="InParameter" guid="{0664ad23-1a72-45d3-9c08-0ad871bf29a3}" relid="0x0" referred="id-0065-00000071">
-									<name>a_topic_qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000006d" kind="InoutParameter" role="InoutParameter" guid="{5b5f3cad-0276-4fd1-a5a8-3e025a696bd2}" relid="0x0" referred="id-0065-0000006e">
-									<name>a_datareader_qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002fa" kind="ReturnType" role="ReturnType" guid="{7bc581f7-89fd-4916-8939-3b9e01f3dbd1}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000d1" kind="TwowayOperation" role="TwowayOperation" guid="{10a13d5c-af2a-4a99-960b-6ce6b033b957}" relid="0xf" childrelidcntr="0x1">
-								<name>get_default_datareader_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1560</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000006e" kind="InoutParameter" role="InoutParameter" guid="{c134bb48-d9e8-44fc-8e1e-f3f78406833c}" relid="0x0" referred="id-0065-0000006e">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002fb" kind="ReturnType" role="ReturnType" guid="{716daca9-9c40-4155-a00d-be826b5cfc4e}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000d2" kind="TwowayOperation" role="TwowayOperation" guid="{f3371ab8-af13-44e8-b0a5-dd29f3e977c6}" relid="0xe" childrelidcntr="0x1">
-								<name>set_default_datareader_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000006f" kind="InParameter" role="InParameter" guid="{401654fe-a2f6-459b-b6c0-0113e70be839}" relid="0x0" referred="id-0065-0000006e">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002fc" kind="ReturnType" role="ReturnType" guid="{171e9191-5944-4e5f-b7b8-84234331f3d9}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000d3" kind="TwowayOperation" role="TwowayOperation" guid="{8335259a-d72c-4c44-811f-3f9df0e84b6e}" relid="0xd" childrelidcntr="0x1">
-								<name>get_participant</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000070" kind="ReturnType" role="ReturnType" guid="{65f9d75e-ccc8-4abc-b161-d4d609fbe1c6}" relid="0x0" referred="id-0065-00000041">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000d4" kind="TwowayOperation" role="TwowayOperation" guid="{ca070b7c-2035-4501-a173-913adb2de7af}" relid="0xc" childrelidcntr="0x1">
-								<name>end_access</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002fd" kind="ReturnType" role="ReturnType" guid="{a13f205e-d755-4713-a9a9-ab01cc26f656}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000d5" kind="TwowayOperation" role="TwowayOperation" guid="{10f5ae9e-1189-4942-b4fe-b4d8bfc8834c}" relid="0xb" childrelidcntr="0x1">
-								<name>begin_access</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-000002fe" kind="ReturnType" role="ReturnType" guid="{737ddcc9-63ef-4dd6-89e2-9692ae6d55e8}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000d6" kind="TwowayOperation" role="TwowayOperation" guid="{68723394-e823-4e51-abdf-6be53b7cdf9a}" relid="0xa" childrelidcntr="0x1">
-								<name>get_listener</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1060</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000071" kind="ReturnType" role="ReturnType" guid="{453c2c55-363e-44fe-afc8-dd4c27456b65}" relid="0x0" referred="id-0065-000000a8">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000d7" kind="TwowayOperation" role="TwowayOperation" guid="{f80fee9e-c13c-4c8a-bf9d-e3f6516ccf93}" relid="0x9" childrelidcntr="0x1">
-								<name>set_listener</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,960</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000072" kind="InParameter" role="InParameter" guid="{f4c07ebd-16e2-4e17-b5d9-0c65b175de31}" relid="0x0" referred="id-0065-000000a8">
-									<name>a_listener</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-000002ff" kind="InParameter" role="InParameter" guid="{26414354-b5c6-422d-882b-2c217fdb3e65}" relid="0x0" referred="id-0067-00000116">
-									<name>mask</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000300" kind="ReturnType" role="ReturnType" guid="{4b24d435-ed88-4ef3-a254-7f9fbd7ba88c}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000d8" kind="TwowayOperation" role="TwowayOperation" guid="{214ee0c6-04bd-4bcf-8cda-9b9e748a5964}" relid="0x8" childrelidcntr="0x1">
-								<name>get_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,860</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000073" kind="InoutParameter" role="InoutParameter" guid="{1d17d063-a724-4aef-b623-d5210eac0d53}" relid="0x0" referred="id-0065-0000006d">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000301" kind="ReturnType" role="ReturnType" guid="{617ac9bb-8e8f-4723-9042-66937b916c6f}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000d9" kind="TwowayOperation" role="TwowayOperation" guid="{2b8f29ad-5481-4930-b64c-458a7cb68b79}" relid="0x7" childrelidcntr="0x1">
-								<name>set_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,760</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000074" kind="InParameter" role="InParameter" guid="{08fe8b5f-56af-4a23-a7e8-43186b10525c}" relid="0x0" referred="id-0065-0000006d">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000302" kind="ReturnType" role="ReturnType" guid="{badc2a99-847c-4197-8328-11cfc16bb01e}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000da" kind="TwowayOperation" role="TwowayOperation" guid="{48db7971-bd50-43f9-84e0-26d3e3798b40}" relid="0x6" childrelidcntr="0x1">
-								<name>notify_datareaders</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,660</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000303" kind="ReturnType" role="ReturnType" guid="{a979f694-aa7d-426e-b4ac-083295d17694}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000db" kind="TwowayOperation" role="TwowayOperation" guid="{5ae59d40-bd26-405e-9e83-97614689543e}" relid="0x5" childrelidcntr="0x1">
-								<name>get_datareaders</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,560</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000304" kind="InParameter" role="InParameter" guid="{2a80dc59-0e77-42cb-8a13-024122aafdb0}" relid="0x0" referred="id-0067-000000f8">
-									<name>instance_states</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>460,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000305" kind="InParameter" role="InParameter" guid="{5b0c5ed6-21a3-40cb-b017-6c4ce9ece9c5}" relid="0x0" referred="id-0067-000000fe">
-									<name>view_states</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>360,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000306" kind="InParameter" role="InParameter" guid="{028f06b5-ed5e-444e-acf1-dfdf163f5850}" relid="0x0" referred="id-0067-00000103">
-									<name>sample_states</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000307" kind="InoutParameter" role="InoutParameter" guid="{3d3b90a6-59ba-4b88-b424-e2bc6f1517e3}" relid="0x0" referred="id-0067-00000132">
-									<name>readers</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000308" kind="ReturnType" role="ReturnType" guid="{b5899b66-4d78-4072-85e9-164f8db37ed8}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000dc" kind="TwowayOperation" role="TwowayOperation" guid="{36b1e64f-1d4b-4503-b025-65f4d3c0f093}" relid="0x4" childrelidcntr="0x1">
-								<name>lookup_datareader</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000075" kind="InParameter" role="InParameter" guid="{640f5837-4ffe-4a5d-b2c7-6a8b5c68060e}" relid="0x0" referred="id-0066-0000001f">
-									<name>topic_name</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000309" kind="ReturnType" role="ReturnType" guid="{37c3f4e8-20bd-4f6a-ae4e-aeec521ab3b2}" relid="0x0" referred="id-0065-000000e1">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000dd" kind="TwowayOperation" role="TwowayOperation" guid="{218763d2-572d-4185-a2f8-b96b6ba1edc1}" relid="0x3" childrelidcntr="0x1">
-								<name>delete_contained_entities</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000030a" kind="ReturnType" role="ReturnType" guid="{cb5cdb85-f31f-449a-874b-12745dedeca7}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000de" kind="TwowayOperation" role="TwowayOperation" guid="{56a03b42-9fad-4041-8a90-0c653e30677d}" relid="0x2" childrelidcntr="0x1">
-								<name>delete_datareader</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000030b" kind="ReturnType" role="ReturnType" guid="{39555b40-9e6a-428c-91df-8ba60a80b0fa}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000030c" kind="InParameter" role="InParameter" guid="{d823a347-0491-469b-a106-c455478bb667}" relid="0x0" referred="id-0065-000000e1">
-									<name>a_datareader</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000df" kind="TwowayOperation" role="TwowayOperation" guid="{a832090b-f734-4b0b-b203-71aad2fadae9}" relid="0x1" childrelidcntr="0x1">
-								<name>create_datareader_with_profile</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000076" kind="InParameter" role="InParameter" guid="{903a65c7-0c8d-49ed-a4e6-af4481a3f7e1}" relid="0x0" referred="id-0065-000000aa">
-									<name>a_listener</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>460,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000077" kind="InParameter" role="InParameter" guid="{962da721-9691-4709-afaa-c515be44a833}" relid="0x0" referred="id-0066-0000001f">
-									<name>profile_name</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>360,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000078" kind="InParameter" role="InParameter" guid="{fa32da6b-e51b-42d7-a141-f2ee67c52780}" relid="0x0" referred="id-0066-0000001f">
-									<name>library_name</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000030d" kind="InParameter" role="InParameter" guid="{b5733249-8332-4dc6-85ba-97c59fd37ac4}" relid="0x0" referred="id-0067-00000116">
-									<name>mask</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>560,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000030e" kind="InParameter" role="InParameter" guid="{1dcde549-a8e2-4dda-8ee8-09b6cc9f0640}" relid="0x0" referred="id-0065-00000113">
-									<name>a_topic</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000030f" kind="ReturnType" role="ReturnType" guid="{38be5418-98f9-434a-9d16-d83296d16c3c}" relid="0x0" referred="id-0065-000000e1">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000e0" kind="TwowayOperation" role="TwowayOperation" guid="{bbf7de78-8d06-4ea2-9c05-f229f25c2db0}" relid="0x0" childrelidcntr="0x1">
-								<name>create_datareader</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000079" kind="InParameter" role="InParameter" guid="{a88d13a8-95b4-43a2-b336-6e9389267b0c}" relid="0x0" referred="id-0065-000000aa">
-									<name>a_listener</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>360,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000007a" kind="InParameter" role="InParameter" guid="{f2e089d5-e473-457d-80fc-66d8bea290b3}" relid="0x0" referred="id-0065-0000006e">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000310" kind="InParameter" role="InParameter" guid="{31fcbf32-00a5-4877-bdfa-0381fb4a38a9}" relid="0x0" referred="id-0067-00000116">
-									<name>mask</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>460,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000311" kind="InParameter" role="InParameter" guid="{eb1c9be3-ab4b-40e3-913d-cce3d47abccb}" relid="0x0" referred="id-0065-00000113">
-									<name>a_topic</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000312" kind="ReturnType" role="ReturnType" guid="{a24c2fc7-3ec8-42e7-98ec-0437cbc8ddcd}" relid="0x0" referred="id-0065-000000e1">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<reference id="id-0067-00000313" kind="Inherits" role="Inherits" guid="{4a00ae57-4ab2-4cff-b63f-0116e1ca0432}" relid="0x11" referred="id-0065-00000117">
-								<name>Inherits</name>
-							</reference>
-						</model>
-						<model id="id-0065-000000e1" kind="Object" role="Object" guid="{fdc8bf1e-e6c9-414a-aae8-714cae79f77d}" relid="0x1a" childrelidcntr="0x14">
-							<name>DataReader</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-000000e2" kind="TwowayOperation" role="TwowayOperation" guid="{0f133d49-abcd-45ba-9745-f48be5734e60}" relid="0x12" childrelidcntr="0x1">
-								<name>get_matched_publication_data</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1860</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000007b" kind="InParameter" role="InParameter" guid="{b5649232-92e1-4d70-a805-8bff7b23cd18}" relid="0x0" referred="id-0067-00000020">
-									<name>publication_handle</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000007c" kind="InoutParameter" role="InoutParameter" guid="{70174954-be47-435a-9205-a9490ea902c8}" relid="0x0" referred="id-0065-0000006a">
-									<name>publication_data</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000314" kind="ReturnType" role="ReturnType" guid="{1ac6aab5-ab51-4304-af34-64a5ba64ba97}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000e3" kind="TwowayOperation" role="TwowayOperation" guid="{f7385d65-dd28-4743-8666-44afdc0129b1}" relid="0x11" childrelidcntr="0x1">
-								<name>get_matched_publications</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1760</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000315" kind="InoutParameter" role="InoutParameter" guid="{20acc5d7-554a-4dec-b47f-3bedea1bd78b}" relid="0x0" referred="id-0067-000001c3">
-									<name>publication_handles</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000316" kind="ReturnType" role="ReturnType" guid="{7d346b0a-c905-4a28-849e-fc2b86d70de4}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000e4" kind="TwowayOperation" role="TwowayOperation" guid="{be4f3287-cd07-4eb7-b6c7-b6896851149d}" relid="0x10" childrelidcntr="0x1">
-								<name>wait_for_historical_data</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1660</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000317" kind="ReturnType" role="ReturnType" guid="{f1748b53-c1f1-4fdd-9202-bf3388f88eee}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000318" kind="InParameter" role="InParameter" guid="{e3586331-a04c-48d6-96b6-fea0ce63a58b}" relid="0x0" referred="id-0065-0000012e">
-									<name>max_wait</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000e5" kind="TwowayOperation" role="TwowayOperation" guid="{88c6b525-6df9-413a-b781-9bc5393b5977}" relid="0xf" childrelidcntr="0x1">
-								<name>get_sample_lost_status</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1560</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000319" kind="ReturnType" role="ReturnType" guid="{7a9a3452-d0c6-4893-8c1f-1e796ba00329}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000031a" kind="InoutParameter" role="InoutParameter" guid="{5cbe2df3-9bc6-4df7-a410-43ab45db51e9}" relid="0x0" referred="id-0065-0000012b">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000e6" kind="TwowayOperation" role="TwowayOperation" guid="{2ca658fc-8e90-4e7d-ab2d-2690f5298858}" relid="0xe" childrelidcntr="0x1">
-								<name>get_subscription_matched_status</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000031b" kind="ReturnType" role="ReturnType" guid="{b3915b89-c92a-4982-9188-3484fe4784eb}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000031c" kind="InoutParameter" role="InoutParameter" guid="{29026bb4-fe9d-444d-887e-ae6562a04e82}" relid="0x0" referred="id-0065-00000120">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000e7" kind="TwowayOperation" role="TwowayOperation" guid="{8fbc76bf-a8dc-41d1-bbbd-d950354e7fad}" relid="0xd" childrelidcntr="0x1">
-								<name>get_requested_incompatible_qos_status</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000031d" kind="ReturnType" role="ReturnType" guid="{17a44ee7-0ea9-401d-898d-2bdc0e33f7b2}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000031e" kind="InoutParameter" role="InoutParameter" guid="{8ea78cd1-84d0-414a-9a39-280656bae196}" relid="0x0" referred="id-0065-00000122">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000e8" kind="TwowayOperation" role="TwowayOperation" guid="{e07c8a90-1bb4-415d-a61f-e84d832cde82}" relid="0xc" childrelidcntr="0x1">
-								<name>get_requested_deadline_missed_status</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000031f" kind="ReturnType" role="ReturnType" guid="{3325465b-0890-48b6-9e0f-30e321a8a143}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000320" kind="InoutParameter" role="InoutParameter" guid="{b8b86714-2293-424e-b89c-638dc177aba7}" relid="0x0" referred="id-0065-00000125">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000e9" kind="TwowayOperation" role="TwowayOperation" guid="{20d01bb3-85db-4f54-91c8-e86d17646904}" relid="0xb" childrelidcntr="0x1">
-								<name>get_liveliness_changed_status</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000321" kind="ReturnType" role="ReturnType" guid="{b3ca04b8-3317-4a38-b73f-7bc61ef0b153}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000322" kind="InoutParameter" role="InoutParameter" guid="{d7f892f0-21d5-4859-9740-eeb548de58ee}" relid="0x0" referred="id-0065-00000127">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000ea" kind="TwowayOperation" role="TwowayOperation" guid="{908884b0-ec2f-4f93-9d92-35676ec68618}" relid="0xa" childrelidcntr="0x1">
-								<name>get_sample_rejected_status</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1060</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000323" kind="ReturnType" role="ReturnType" guid="{f9a9e169-86e9-4445-8806-62d620053a24}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000324" kind="InoutParameter" role="InoutParameter" guid="{83bc4080-3dd2-4fc0-ab27-1b165be5d9d7}" relid="0x0" referred="id-0065-00000129">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000eb" kind="TwowayOperation" role="TwowayOperation" guid="{8a7e2afe-5ab1-4cfe-b674-aacd0fd4c738}" relid="0x9" childrelidcntr="0x1">
-								<name>get_subscriber</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,960</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000007d" kind="ReturnType" role="ReturnType" guid="{9ce8b5ad-c5a6-4ca0-aea6-360d84a46e7b}" relid="0x0" referred="id-0065-000000cf">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000ec" kind="TwowayOperation" role="TwowayOperation" guid="{d2af0371-d9d1-428f-8bfb-802afdf9359e}" relid="0x8" childrelidcntr="0x1">
-								<name>get_topicdescription</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,860</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000325" kind="ReturnType" role="ReturnType" guid="{a268a2b0-c39d-4647-a1ce-efabc5dcf561}" relid="0x0" referred="id-0065-00000113">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000ed" kind="TwowayOperation" role="TwowayOperation" guid="{7baa6334-727a-45eb-8bc8-acdb0ad2b540}" relid="0x7" childrelidcntr="0x1">
-								<name>get_listener</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,760</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000007e" kind="ReturnType" role="ReturnType" guid="{f502b17e-d2b7-464e-bd39-9412dd43606b}" relid="0x0" referred="id-0065-000000aa">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000ee" kind="TwowayOperation" role="TwowayOperation" guid="{850308ef-c9a2-479c-9f4c-8351d2622eee}" relid="0x6" childrelidcntr="0x1">
-								<name>set_listener</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,660</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000007f" kind="InParameter" role="InParameter" guid="{865b5c00-d3fa-49e0-911b-8693599905c5}" relid="0x0" referred="id-0065-000000aa">
-									<name>a_listener</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000326" kind="InParameter" role="InParameter" guid="{a821d230-c7d8-4f84-b429-de12810f0dcc}" relid="0x0" referred="id-0067-00000116">
-									<name>mask</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000327" kind="ReturnType" role="ReturnType" guid="{0c8d5a79-55fe-423d-a93d-407f1521af88}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000ef" kind="TwowayOperation" role="TwowayOperation" guid="{1226b0b4-f9a7-48e6-a60f-90d18d32fb6b}" relid="0x5" childrelidcntr="0x1">
-								<name>get_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,560</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000080" kind="InoutParameter" role="InoutParameter" guid="{0c1e6def-dd0d-4ff9-9c39-bb4ca7affbb6}" relid="0x0" referred="id-0065-0000006e">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000328" kind="ReturnType" role="ReturnType" guid="{88a30702-5c90-4a78-b8f9-fbb64efe5c6d}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000f0" kind="TwowayOperation" role="TwowayOperation" guid="{78a49b0e-0668-48ae-bb70-f1c739f5d501}" relid="0x4" childrelidcntr="0x1">
-								<name>set_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000081" kind="InParameter" role="InParameter" guid="{b4c2cd01-c6c5-4803-9652-27e44b271449}" relid="0x0" referred="id-0065-0000006e">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000329" kind="ReturnType" role="ReturnType" guid="{85583779-1ee1-42a2-b29c-d17d41a90ba5}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000f1" kind="TwowayOperation" role="TwowayOperation" guid="{bbe5c7d5-792e-4c19-839f-26a79eb0ea3a}" relid="0x3" childrelidcntr="0x1">
-								<name>delete_contained_entities</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000032a" kind="ReturnType" role="ReturnType" guid="{98589b6b-47c5-424a-8325-88b6c6b8ddf9}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000f2" kind="TwowayOperation" role="TwowayOperation" guid="{ca9b0360-b989-4013-9ce5-1cf10de5e498}" relid="0x2" childrelidcntr="0x1">
-								<name>delete_readcondition</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000082" kind="InParameter" role="InParameter" guid="{ef05c440-391f-405a-a776-ce9f2a730c8b}" relid="0x0" referred="id-0065-00000095">
-									<name>a_condition</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000032b" kind="ReturnType" role="ReturnType" guid="{282d5486-b054-42f4-8780-375153252f41}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000f3" kind="TwowayOperation" role="TwowayOperation" guid="{366fb55c-2487-452e-9b75-cb3b4f59e662}" relid="0x1" childrelidcntr="0x1">
-								<name>create_querycondition</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000083" kind="InParameter" role="InParameter" guid="{a145acb8-6446-4d02-8797-cf7254ce6ab7}" relid="0x0" referred="id-0066-0000001f">
-									<name>query_expression</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>460,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000084" kind="ReturnType" role="ReturnType" guid="{52e4d1ae-1206-4481-a20f-102fa6dfea60}" relid="0x0" referred="id-0065-00000091">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000032c" kind="InParameter" role="InParameter" guid="{df2c621c-a512-41e6-a5a6-d595bd8a0622}" relid="0x0" referred="id-0067-000000f8">
-									<name>instance_states</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>360,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000032d" kind="InParameter" role="InParameter" guid="{a606eec2-53b4-450d-8e33-fcba20eaef10}" relid="0x0" referred="id-0067-000000fe">
-									<name>view_states</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000032e" kind="InParameter" role="InParameter" guid="{c1095bab-1aca-4140-b46a-e3709a6e4da3}" relid="0x0" referred="id-0067-00000103">
-									<name>sample_states</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000032f" kind="InParameter" role="InParameter" guid="{b06736dc-9e54-41fc-afac-4e99bb3223b2}" relid="0x0" referred="id-0067-0000012c">
-									<name>query_parameters</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>560,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000f4" kind="TwowayOperation" role="TwowayOperation" guid="{8364c0c8-5ebe-4e07-a39b-f421840d182b}" relid="0x0" childrelidcntr="0x1">
-								<name>create_readcondition</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000085" kind="ReturnType" role="ReturnType" guid="{4f24a7ec-5131-4418-addf-5e0196357674}" relid="0x0" referred="id-0065-00000095">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000330" kind="InParameter" role="InParameter" guid="{f6fa2b6d-c993-42db-9dec-0fc8c2b72b6d}" relid="0x0" referred="id-0067-000000f8">
-									<name>instance_states</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>360,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000331" kind="InParameter" role="InParameter" guid="{da663271-0415-4a50-a029-882464ba26f1}" relid="0x0" referred="id-0067-000000fe">
-									<name>view_states</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000332" kind="InParameter" role="InParameter" guid="{2510d978-6f92-4dff-abb6-17f3f5cff5f7}" relid="0x0" referred="id-0067-00000103">
-									<name>sample_states</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<reference id="id-0067-00000333" kind="Inherits" role="Inherits" guid="{862fa6bf-24a5-468a-aab3-85bb4ea3344c}" relid="0x13" referred="id-0065-00000117">
-								<name>Inherits</name>
-							</reference>
-						</model>
-						<model id="id-0065-000000f5" kind="Object" role="Object" guid="{b06f71dd-0286-4ae8-af83-414fd2f115e1}" relid="0x19" childrelidcntr="0xf">
-							<name>DataWriter</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-000000f6" kind="TwowayOperation" role="TwowayOperation" guid="{3180ae88-c33d-4ad9-8eb5-e12f78ff97f4}" relid="0xd" childrelidcntr="0x1">
-								<name>get_matched_subscription_data</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000086" kind="InParameter" role="InParameter" guid="{3e4fe32d-6220-4369-9f62-bfffbf45b2f1}" relid="0x0" referred="id-0067-00000020">
-									<name>subscription_handle</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000087" kind="InoutParameter" role="InoutParameter" guid="{07f081be-d49c-453a-a416-c9104a68f015}" relid="0x0" referred="id-0065-00000069">
-									<name>subscription_data</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000334" kind="ReturnType" role="ReturnType" guid="{80b2092b-af96-4601-9823-3990c3aa0577}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000f7" kind="TwowayOperation" role="TwowayOperation" guid="{51711f31-8793-4171-ad92-715c15b342a7}" relid="0xc" childrelidcntr="0x1">
-								<name>get_matched_subscriptions</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000335" kind="InoutParameter" role="InoutParameter" guid="{376a6c69-0e21-40b6-96d9-5126c4983691}" relid="0x0" referred="id-0067-000001c3">
-									<name>subscription_handles</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000336" kind="ReturnType" role="ReturnType" guid="{d1a4d556-9a9c-42a3-a693-a04cd53e0a6f}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000f8" kind="TwowayOperation" role="TwowayOperation" guid="{d508c7f9-ce6f-480f-981c-9ae6984b38b0}" relid="0xb" childrelidcntr="0x1">
-								<name>assert_liveliness</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000337" kind="ReturnType" role="ReturnType" guid="{402cfdd7-adf7-44f5-aeeb-69c088ce010f}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000f9" kind="TwowayOperation" role="TwowayOperation" guid="{b7413953-2322-422b-b920-ac083e2e442f}" relid="0xa" childrelidcntr="0x1">
-								<name>get_publication_matched_status</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,1060</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000338" kind="ReturnType" role="ReturnType" guid="{5478d02f-8641-4493-801c-72f72e3d7513}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000339" kind="InoutParameter" role="InoutParameter" guid="{3cd41ec7-c494-43d7-b9e2-f13e0e008c9d}" relid="0x0" referred="id-0065-00000121">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000fa" kind="TwowayOperation" role="TwowayOperation" guid="{0c5e9011-e170-44b4-ac2e-450219040898}" relid="0x9" childrelidcntr="0x1">
-								<name>get_offered_incompatible_qos_status</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,960</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000033a" kind="ReturnType" role="ReturnType" guid="{58d3582f-037b-4be8-aa65-f39993307301}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000033b" kind="InoutParameter" role="InoutParameter" guid="{8bbe6930-9292-46d7-a01e-60f8c6ac69fe}" relid="0x0" referred="id-0065-00000123">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000fb" kind="TwowayOperation" role="TwowayOperation" guid="{9546b16e-5df7-40fc-b2f9-5710df09a4da}" relid="0x8" childrelidcntr="0x1">
-								<name>get_offered_deadline_missed_status</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,860</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000033c" kind="ReturnType" role="ReturnType" guid="{1212d1c6-f9c6-4d27-8461-e5b06ba811bd}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000033d" kind="InoutParameter" role="InoutParameter" guid="{3285d48a-a6ba-4c99-880b-c0563ed2da97}" relid="0x0" referred="id-0065-00000126">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000fc" kind="TwowayOperation" role="TwowayOperation" guid="{54cadb57-5f14-41e7-9f7c-b0af1097dc14}" relid="0x7" childrelidcntr="0x1">
-								<name>get_liveliness_lost_status</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,760</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000033e" kind="ReturnType" role="ReturnType" guid="{588ee479-1971-4d22-99b4-fda31545c49a}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000033f" kind="InoutParameter" role="InoutParameter" guid="{07cf7dba-714b-48cf-a8c5-599ae57c3941}" relid="0x0" referred="id-0065-00000128">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000fd" kind="TwowayOperation" role="TwowayOperation" guid="{c98e7e74-8fcf-415f-bd37-c97cd4f7182f}" relid="0x6" childrelidcntr="0x1">
-								<name>wait_for_acknowledgments</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,660</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000340" kind="ReturnType" role="ReturnType" guid="{e3f34ddd-cefd-409c-8a37-080012a60cd2}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000341" kind="InParameter" role="InParameter" guid="{27a2f532-fede-463a-a5dc-f8cbb9fde023}" relid="0x0" referred="id-0065-0000012e">
-									<name>max_wait</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000fe" kind="TwowayOperation" role="TwowayOperation" guid="{11d1d9c9-263c-4cfd-a6f7-33b47dcb8736}" relid="0x5" childrelidcntr="0x1">
-								<name>get_publisher</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,560</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000088" kind="ReturnType" role="ReturnType" guid="{6a12959c-234a-46b8-89ea-923efc30c87d}" relid="0x0" referred="id-0065-000000bc">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-000000ff" kind="TwowayOperation" role="TwowayOperation" guid="{21be9e68-5bbb-4898-8d96-cff5e882597c}" relid="0x4" childrelidcntr="0x1">
-								<name>get_topic</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000342" kind="ReturnType" role="ReturnType" guid="{88cf4104-533a-42e2-9532-14ade65ada92}" relid="0x0" referred="id-0065-0000010d">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000100" kind="TwowayOperation" role="TwowayOperation" guid="{e960875e-f4de-4dbe-807f-96ff38898542}" relid="0x3" childrelidcntr="0x1">
-								<name>get_listener</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000089" kind="ReturnType" role="ReturnType" guid="{3f1e29b1-c420-4588-b32b-8b176bb7625c}" relid="0x0" referred="id-0065-000000b3">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000101" kind="TwowayOperation" role="TwowayOperation" guid="{d541075f-8cad-4036-869d-47204ccd947d}" relid="0x2" childrelidcntr="0x1">
-								<name>set_listener</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000008a" kind="InParameter" role="InParameter" guid="{0a53e61f-3a3f-4a58-a868-df00a3ef2a13}" relid="0x0" referred="id-0065-000000b3">
-									<name>a_listener</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000343" kind="InParameter" role="InParameter" guid="{86f347c1-0283-4d58-bd0b-eb50215dfaf8}" relid="0x0" referred="id-0067-00000116">
-									<name>mask</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000344" kind="ReturnType" role="ReturnType" guid="{8aca85ab-f235-4a2d-88ca-fa93c53483d0}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000102" kind="TwowayOperation" role="TwowayOperation" guid="{1be41d0f-9bea-4f28-afe8-fd0f97234fed}" relid="0x1" childrelidcntr="0x1">
-								<name>get_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000008b" kind="InoutParameter" role="InoutParameter" guid="{a260f328-f446-4d9c-9704-d68f156d3d50}" relid="0x0" referred="id-0065-00000070">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000345" kind="ReturnType" role="ReturnType" guid="{a172233d-bf1e-4669-821d-f80937375164}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000103" kind="TwowayOperation" role="TwowayOperation" guid="{03e60fae-d7ec-4096-a3e0-308a9ac0684e}" relid="0x0" childrelidcntr="0x1">
-								<name>set_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000008c" kind="InParameter" role="InParameter" guid="{40be1f9d-d188-4b06-b3d8-d019165a2031}" relid="0x0" referred="id-0065-00000070">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000346" kind="ReturnType" role="ReturnType" guid="{66921089-3b93-420d-9d09-e983d0c3fccb}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<reference id="id-0067-00000347" kind="Inherits" role="Inherits" guid="{235fc104-2ce5-4b65-af6c-7b6925c8eef2}" relid="0xe" referred="id-0065-00000117">
-								<name>Inherits</name>
-							</reference>
-						</model>
-						<model id="id-0065-00000104" kind="Object" role="Object" guid="{0f4b4aa3-418d-424e-8be1-2311617dcbf2}" relid="0x18" childrelidcntr="0x4">
-							<name>MultiTopic</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-00000105" kind="TwowayOperation" role="TwowayOperation" guid="{d90029a3-0ce6-4b5a-a5f0-6b35cf55adcf}" relid="0x2" childrelidcntr="0x1">
-								<name>set_expression_parameters</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000348" kind="InParameter" role="InParameter" guid="{34737b11-e434-4d96-a3d8-c09985a95ff7}" relid="0x0" referred="id-0067-0000012c">
-									<name>expression_parameters</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000349" kind="ReturnType" role="ReturnType" guid="{87dd0a91-9db6-4325-b320-5aec593dd698}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000106" kind="TwowayOperation" role="TwowayOperation" guid="{614b535e-aaa3-4539-b615-6e4818bad6f0}" relid="0x1" childrelidcntr="0x1">
-								<name>get_expression_parameters</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000034a" kind="InoutParameter" role="InoutParameter" guid="{8743fd10-4d33-4f47-8e99-29a35214f615}" relid="0x0" referred="id-0067-0000012c">
-									<name>expression_parameters</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000034b" kind="ReturnType" role="ReturnType" guid="{c174c042-2ead-46b5-812e-f933a9e431f8}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000107" kind="TwowayOperation" role="TwowayOperation" guid="{98bec281-8398-46f9-af91-4f4220b9fd80}" relid="0x0" childrelidcntr="0x1">
-								<name>get_subscription_expression</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000008d" kind="ReturnType" role="ReturnType" guid="{35c1f5b1-72f9-4651-8a22-2f79041ddc4e}" relid="0x0" referred="id-0066-0000001f">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<reference id="id-0067-0000034c" kind="Inherits" role="Inherits" guid="{cf64023a-355c-4206-970d-78254da32458}" relid="0x3" referred="id-0065-00000113">
-								<name>Inherits</name>
-							</reference>
-						</model>
-						<model id="id-0065-00000108" kind="Object" role="Object" guid="{4519d714-cb1e-4ecb-bfad-1efad7a5148e}" relid="0x17" childrelidcntr="0x5">
-							<name>ContentFilteredTopic</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-00000109" kind="TwowayOperation" role="TwowayOperation" guid="{f89c4835-6002-4e00-b33d-02ecddfe8b71}" relid="0x3" childrelidcntr="0x1">
-								<name>get_related_topic</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000034d" kind="ReturnType" role="ReturnType" guid="{cc3d38e3-2e8a-4b95-9159-a408db3f4cf8}" relid="0x0" referred="id-0065-0000010d">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000010a" kind="TwowayOperation" role="TwowayOperation" guid="{62800662-7ae4-48a1-837e-07a83ab4d863}" relid="0x2" childrelidcntr="0x1">
-								<name>set_expression_parameters</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000034e" kind="InParameter" role="InParameter" guid="{6ba3e11c-de03-49cb-98c8-0b732bbda9ef}" relid="0x0" referred="id-0067-0000012c">
-									<name>expression_parameters</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000034f" kind="ReturnType" role="ReturnType" guid="{29f41b68-9d52-47ad-a07c-3c227fe54954}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000010b" kind="TwowayOperation" role="TwowayOperation" guid="{ced05860-39f6-4a16-a2ae-04fc3bb5015a}" relid="0x1" childrelidcntr="0x1">
-								<name>get_expression_parameters</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000350" kind="InoutParameter" role="InoutParameter" guid="{be1a771a-f6ad-49ca-8d37-b5ba85078272}" relid="0x0" referred="id-0067-0000012c">
-									<name>expression_parameters</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000351" kind="ReturnType" role="ReturnType" guid="{f9164bd9-18e0-4f3c-bb91-f57d1727a055}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000010c" kind="TwowayOperation" role="TwowayOperation" guid="{f74964a8-b61b-437c-a1d8-3092e88c392b}" relid="0x0" childrelidcntr="0x1">
-								<name>get_filter_expression</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000008e" kind="ReturnType" role="ReturnType" guid="{5b987a95-3d0b-418c-8ca8-f2e65ee355d8}" relid="0x0" referred="id-0066-0000001f">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<reference id="id-0067-00000352" kind="Inherits" role="Inherits" guid="{6227c533-9113-45c3-bac0-550d056c3c9e}" relid="0x4" referred="id-0065-00000113">
-								<name>Inherits</name>
-							</reference>
-						</model>
-						<model id="id-0065-0000010d" kind="Object" role="Object" guid="{1513a26f-41cf-4f33-bc0d-453acf586e69}" relid="0x16" childrelidcntr="0x6">
-							<name>Topic</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-0000010e" kind="TwowayOperation" role="TwowayOperation" guid="{b2ffb576-5688-4807-b934-4f44f570d63c}" relid="0x4" childrelidcntr="0x1">
-								<name>get_inconsistent_topic_status</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000353" kind="ReturnType" role="ReturnType" guid="{c36ce585-f418-43ac-8890-d430daa2c078}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000354" kind="InoutParameter" role="InoutParameter" guid="{f4c39c16-4506-45c0-9c24-c51267f78f51}" relid="0x0" referred="id-0065-0000012c">
-									<name>a_status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000010f" kind="TwowayOperation" role="TwowayOperation" guid="{9537ee1d-3a24-4448-95a7-362da20940ce}" relid="0x3" childrelidcntr="0x1">
-								<name>get_listener</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000008f" kind="ReturnType" role="ReturnType" guid="{e482526c-2533-49e4-8a38-9a899057428f}" relid="0x0" referred="id-0065-000000ba">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000110" kind="TwowayOperation" role="TwowayOperation" guid="{9cdc4a9b-cdce-42d3-b440-b803850fa319}" relid="0x2" childrelidcntr="0x1">
-								<name>set_listener</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000090" kind="InParameter" role="InParameter" guid="{f4c3cae0-5b5c-4238-9f7b-6ecdcf5b8b89}" relid="0x0" referred="id-0065-000000ba">
-									<name>a_listener</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000355" kind="InParameter" role="InParameter" guid="{64a2df6d-e0a0-4d65-9c33-ec2da6f921a1}" relid="0x0" referred="id-0067-00000116">
-									<name>mask</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>260,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000356" kind="ReturnType" role="ReturnType" guid="{07bcd3c9-f216-418f-99c3-86b56c601eae}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000111" kind="TwowayOperation" role="TwowayOperation" guid="{2c8512d5-aef0-4292-8ec3-5578e9bd97c0}" relid="0x1" childrelidcntr="0x1">
-								<name>get_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000091" kind="InoutParameter" role="InoutParameter" guid="{7e95ac3b-ad35-4e30-b741-4d2029bc1153}" relid="0x0" referred="id-0065-00000071">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000357" kind="ReturnType" role="ReturnType" guid="{52a9e0ae-f407-4e21-b24c-0f27102fce7d}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000112" kind="TwowayOperation" role="TwowayOperation" guid="{7c385dbf-8514-4e9f-9b8d-e4036f71b57a}" relid="0x0" childrelidcntr="0x1">
-								<name>set_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000092" kind="InParameter" role="InParameter" guid="{d4e3d371-a644-4ed5-a1ba-8801ce340a9d}" relid="0x0" referred="id-0065-00000071">
-									<name>qos</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000358" kind="ReturnType" role="ReturnType" guid="{7e8c5d5a-8861-430d-b509-5cafd8118cc3}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<reference id="id-0067-00000359" kind="Inherits" role="Inherits" guid="{0b7b4c65-7f41-4aee-9f49-d1cb418ed5bd}" relid="0x5" referred="id-0065-00000113">
-								<name>Inherits</name>
-							</reference>
-							<reference id="id-0067-0000035a" kind="Inherits" role="Inherits" guid="{05ff6b9f-53a9-4836-a396-33ca2d536404}" relid="0x5" referred="id-0065-00000117">
-								<name>Inherits</name>
-							</reference>
-						</model>
-						<model id="id-0065-00000113" kind="Object" role="Object" guid="{7acee41b-3015-491c-a696-bfedaa9963e1}" relid="0x15" childrelidcntr="0x3">
-							<name>TopicDescription</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-00000114" kind="TwowayOperation" role="TwowayOperation" guid="{aebbe005-9458-4808-a804-68743be3b8da}" relid="0x2" childrelidcntr="0x1">
-								<name>get_participant</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000093" kind="ReturnType" role="ReturnType" guid="{0afcd804-47fe-4c8c-bfbd-16b81cf907b3}" relid="0x0" referred="id-0065-00000041">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000115" kind="TwowayOperation" role="TwowayOperation" guid="{ce550fbe-44e3-4d1f-8a83-36113be0bf40}" relid="0x1" childrelidcntr="0x1">
-								<name>get_name</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000094" kind="ReturnType" role="ReturnType" guid="{8f7e62ff-51c5-4125-9aeb-e9f40044a1f3}" relid="0x0" referred="id-0066-0000001f">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000116" kind="TwowayOperation" role="TwowayOperation" guid="{47f9ef74-bb3c-44c2-a901-5b67615f168c}" relid="0x0" childrelidcntr="0x1">
-								<name>get_type_name</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000095" kind="ReturnType" role="ReturnType" guid="{f4b8d2dc-c32d-4112-b4a3-c7c3a3f0e69d}" relid="0x0" referred="id-0066-0000001f">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-						</model>
-						<model id="id-0065-00000117" kind="Object" role="Object" guid="{3fc48051-8ef3-4e8f-a50f-aca9fa66774d}" relid="0x14" childrelidcntr="0x4">
-							<name>Entity</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-00000118" kind="TwowayOperation" role="TwowayOperation" guid="{77725c52-dc35-4efe-a66c-633af883860a}" relid="0x3" childrelidcntr="0x1">
-								<name>get_instance_handle</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000096" kind="ReturnType" role="ReturnType" guid="{b8866053-8666-4021-815c-e623148034dd}" relid="0x0" referred="id-0067-00000020">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000119" kind="TwowayOperation" role="TwowayOperation" guid="{79239a78-be48-45db-8ae8-0592dca31355}" relid="0x2" childrelidcntr="0x1">
-								<name>get_status_changes</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000035b" kind="ReturnType" role="ReturnType" guid="{6acfc95d-65f9-4cda-a0ed-62dd3f2374c5}" relid="0x0" referred="id-0067-00000116">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000011a" kind="TwowayOperation" role="TwowayOperation" guid="{4fdecb27-0c35-4eb8-8286-947bb4e0fe5b}" relid="0x1" childrelidcntr="0x1">
-								<name>get_statuscondition</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000097" kind="ReturnType" role="ReturnType" guid="{14c67b3e-0e96-453f-9a16-a69ed9615ffe}" relid="0x0" referred="id-0065-0000009a">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000011b" kind="TwowayOperation" role="TwowayOperation" guid="{37f77090-3e8c-4924-a64a-378829cdbf7b}" relid="0x0" childrelidcntr="0x1">
-								<name>enable</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000035c" kind="ReturnType" role="ReturnType" guid="{c38bcd20-1e89-4657-94cc-5efa85b9c2f8}" relid="0x0" referred="id-0067-0000012e">
-									<name>ReturnType</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-						</model>
-						<model id="id-0065-0000011c" kind="Object" role="Object" guid="{f8027bdb-3f5e-42e8-8ab5-09488c655dda}" relid="0x13" childrelidcntr="0x0">
-							<name>Listener</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-						</model>
-						<model id="id-0065-0000011d" kind="Aggregate" role="Aggregate" guid="{438dc305-e48b-42eb-b104-295744b3b57b}" relid="0x12" childrelidcntr="0x1">
-							<name>ReliableWriterCacheChangedStatus</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-00000098" kind="Member" role="Member" guid="{9ac5831c-f9bd-4d4b-9963-f7e01fc0b141}" relid="0x0" referred="id-0066-0000002a">
-								<name>unacknowledged_sample_count_peak</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,560</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000099" kind="Member" role="Member" guid="{c93d2194-f2e8-4024-8318-cae098b46aca}" relid="0x0" referred="id-0066-0000002a">
-								<name>unacknowledged_sample_count</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000035d" kind="Member" role="Member" guid="{f7f2e72d-9d9d-453b-be78-79fb5f5c4744}" relid="0x0" referred="id-0065-0000011e">
-								<name>high_watermark_reliable_writer_cache</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000035e" kind="Member" role="Member" guid="{928fd414-705b-4bd9-82fa-62db0e7c2a62}" relid="0x0" referred="id-0065-0000011e">
-								<name>low_watermark_reliable_writer_cache</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000035f" kind="Member" role="Member" guid="{12c63f1a-c9aa-4b27-9e7d-b78a381183e5}" relid="0x0" referred="id-0065-0000011e">
-								<name>full_reliable_writer_cache</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000360" kind="Member" role="Member" guid="{254a14d0-36de-4b30-bfe5-3e6b1e383613}" relid="0x0" referred="id-0065-0000011e">
-								<name>empty_reliable_writer_cache</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-0000011e" kind="Aggregate" role="Aggregate" guid="{189a004d-1843-4899-8fa7-10a12c89fcab}" relid="0x11" childrelidcntr="0x1">
-							<name>ReliableWriterCacheEventCount</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-0000009a" kind="Member" role="Member" guid="{222fb828-d06c-47d4-9db6-adaad3a0ba3a}" relid="0x0" referred="id-0066-0000002a">
-								<name>total_count_change</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000009b" kind="Member" role="Member" guid="{5eb39167-0ac1-4736-bd26-c155bcd56a85}" relid="0x0" referred="id-0066-0000002a">
-								<name>total_count</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-0000011f" kind="Aggregate" role="Aggregate" guid="{763fd3a6-9b56-4284-93d5-1544fb78a6c2}" relid="0x10" childrelidcntr="0x1">
-							<name>ReliableReaderActivityChangedStatus</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-0000009c" kind="Member" role="Member" guid="{3e56fe6b-bf13-4dcc-9296-42a5b6e0f6b4}" relid="0x0" referred="id-0067-00000020">
-								<name>last_instance_handle</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000009d" kind="Member" role="Member" guid="{c39f1a60-aacc-4450-b3f2-7786959cf62b}" relid="0x0" referred="id-0066-0000002a">
-								<name>inactive_count_change</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000009e" kind="Member" role="Member" guid="{4f05037b-b956-4b09-9c52-30f891dd4849}" relid="0x0" referred="id-0066-0000002a">
-								<name>active_count_change</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000009f" kind="Member" role="Member" guid="{13945772-0a96-4cba-ae2e-e5b168075ee3}" relid="0x0" referred="id-0066-0000002a">
-								<name>inactive_count</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000a0" kind="Member" role="Member" guid="{6d73f6f0-4b2a-4d36-85e3-37f3c0ded980}" relid="0x0" referred="id-0066-0000002a">
-								<name>active_count</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000120" kind="Aggregate" role="Aggregate" guid="{a3904686-138a-4a85-83ec-0d91c721912a}" relid="0xf" childrelidcntr="0x1">
-							<name>SubscriptionMatchedStatus</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000000a1" kind="Member" role="Member" guid="{601d70a5-e20d-4ec6-b055-4f91a6c89285}" relid="0x0" referred="id-0067-00000020">
-								<name>last_publication_handle</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000a2" kind="Member" role="Member" guid="{dbf559ef-9da3-4929-89c9-7d3a4d9f46eb}" relid="0x0" referred="id-0066-0000002a">
-								<name>current_count_change</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000a3" kind="Member" role="Member" guid="{cb21e320-eb39-49dd-aea1-a456bea93be6}" relid="0x0" referred="id-0066-0000002a">
-								<name>current_count</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000a4" kind="Member" role="Member" guid="{7b6a054b-ecf3-4dfa-ba59-14dfbe089576}" relid="0x0" referred="id-0066-0000002a">
-								<name>total_count_change</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000a5" kind="Member" role="Member" guid="{37a0d63c-fcc2-4ec0-bd04-0445d48c120e}" relid="0x0" referred="id-0066-0000002a">
-								<name>total_count</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000121" kind="Aggregate" role="Aggregate" guid="{2c2c71b4-dddf-4f35-bfd1-50b65509ebdd}" relid="0xe" childrelidcntr="0x1">
-							<name>PublicationMatchedStatus</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000000a6" kind="Member" role="Member" guid="{74cd297f-c4c3-48b1-9ef0-784b0e30c5d6}" relid="0x0" referred="id-0067-00000020">
-								<name>last_subscription_handle</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000a7" kind="Member" role="Member" guid="{501da5cb-155e-4954-94e2-4cefec1109d6}" relid="0x0" referred="id-0066-0000002a">
-								<name>current_count_change</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000a8" kind="Member" role="Member" guid="{62c7e48b-ae99-43fa-8218-d054c79f6dcd}" relid="0x0" referred="id-0066-0000002a">
-								<name>current_count</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000a9" kind="Member" role="Member" guid="{f12a6ed0-8be3-4aaa-93b0-b1ed1cf009c2}" relid="0x0" referred="id-0066-0000002a">
-								<name>total_count_change</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000aa" kind="Member" role="Member" guid="{eb99edd9-bcd8-483a-b588-ae830734ed0e}" relid="0x0" referred="id-0066-0000002a">
-								<name>total_count</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000122" kind="Aggregate" role="Aggregate" guid="{56377413-92e4-472a-90a9-71c28539f15b}" relid="0xd" childrelidcntr="0x1">
-							<name>RequestedIncompatibleQosStatus</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000000ab" kind="Member" role="Member" guid="{2d002650-9d63-48d5-a296-bf41ee91abf2}" relid="0x0" referred="id-0066-0000002a">
-								<name>total_count_change</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000ac" kind="Member" role="Member" guid="{ec6e0a1c-f3b4-4152-8c0f-cf1688878463}" relid="0x0" referred="id-0066-0000002a">
-								<name>total_count</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000361" kind="Member" role="Member" guid="{5ed8833c-ac09-4483-9ed2-01c8b0d0a39d}" relid="0x0" referred="id-0067-0000012d">
-								<name>last_policy_id</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000362" kind="Member" role="Member" guid="{ddf0bbc1-8477-4303-b7ca-0d358c381535}" relid="0x0" referred="id-0067-00000133">
-								<name>policies</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000123" kind="Aggregate" role="Aggregate" guid="{c88e3a59-17ff-4108-875b-7535cb293858}" relid="0xc" childrelidcntr="0x1">
-							<name>OfferedIncompatibleQosStatus</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000000ad" kind="Member" role="Member" guid="{e52be414-0737-4bb8-9ee1-fe8f17cae070}" relid="0x0" referred="id-0066-0000002a">
-								<name>total_count_change</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000ae" kind="Member" role="Member" guid="{01aafd7d-429f-495a-ae47-fd37ed99122a}" relid="0x0" referred="id-0066-0000002a">
-								<name>total_count</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000363" kind="Member" role="Member" guid="{f8707b10-8d0c-4add-90ea-a4fd6422cf04}" relid="0x0" referred="id-0067-0000012d">
-								<name>last_policy_id</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000364" kind="Member" role="Member" guid="{53f69b13-a147-47af-8558-f9b6c3129f9d}" relid="0x0" referred="id-0067-00000133">
-								<name>policies</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000124" kind="Aggregate" role="Aggregate" guid="{e89fea34-133b-4b0c-bce3-7d283cd5af96}" relid="0xb" childrelidcntr="0x1">
-							<name>QosPolicyCount</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000000af" kind="Member" role="Member" guid="{680f80fb-bf72-4d79-8897-d35a225f9368}" relid="0x0" referred="id-0066-0000002a">
-								<name>count</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000365" kind="Member" role="Member" guid="{a78c98e1-d747-463c-a1d7-af5d695e1e0e}" relid="0x0" referred="id-0067-0000012d">
-								<name>policy_id</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000125" kind="Aggregate" role="Aggregate" guid="{43d167dc-af08-4dcb-ad53-82442cb9eed9}" relid="0xa" childrelidcntr="0x1">
-							<name>RequestedDeadlineMissedStatus</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000000b0" kind="Member" role="Member" guid="{2c893c41-ac52-4ddc-993f-fbee4caa1603}" relid="0x0" referred="id-0067-00000020">
-								<name>last_instance_handle</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000b1" kind="Member" role="Member" guid="{cc844a3b-91d3-45bc-8534-71a9b174f452}" relid="0x0" referred="id-0066-0000002a">
-								<name>total_count_change</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000b2" kind="Member" role="Member" guid="{659375ea-d3d6-4a59-8176-671dac36def7}" relid="0x0" referred="id-0066-0000002a">
-								<name>total_count</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000126" kind="Aggregate" role="Aggregate" guid="{ff404a73-66eb-4bb8-a94e-b11c999b79ee}" relid="0x9" childrelidcntr="0x1">
-							<name>OfferedDeadlineMissedStatus</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000000b3" kind="Member" role="Member" guid="{9e7ec43a-270d-4403-aece-470e6f84c159}" relid="0x0" referred="id-0067-00000020">
-								<name>last_instance_handle</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000b4" kind="Member" role="Member" guid="{b5e7ff62-6ad1-4ea3-a1ad-4be218ba0a75}" relid="0x0" referred="id-0066-0000002a">
-								<name>total_count_change</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000b5" kind="Member" role="Member" guid="{40978a0e-e00b-42e5-bc09-e565784b221c}" relid="0x0" referred="id-0066-0000002a">
-								<name>total_count</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000127" kind="Aggregate" role="Aggregate" guid="{9254f504-2700-4569-93f3-c03d9b61ed81}" relid="0x8" childrelidcntr="0x1">
-							<name>LivelinessChangedStatus</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000000b6" kind="Member" role="Member" guid="{4d321c30-dccc-4f1f-9f5b-666417af0d1b}" relid="0x0" referred="id-0067-00000020">
-								<name>last_publication_handle</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000b7" kind="Member" role="Member" guid="{11957c4f-c294-456e-be08-9677f4370e81}" relid="0x0" referred="id-0066-0000002a">
-								<name>not_alive_count_change</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000b8" kind="Member" role="Member" guid="{c30d7c42-fb36-4109-bad2-91bd904173bf}" relid="0x0" referred="id-0066-0000002a">
-								<name>alive_count_change</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000b9" kind="Member" role="Member" guid="{49bd96aa-52e4-4912-91ef-dda97895c3a3}" relid="0x0" referred="id-0066-0000002a">
-								<name>not_alive_count</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000ba" kind="Member" role="Member" guid="{4b14f82d-bb06-42fd-8162-787055f30596}" relid="0x0" referred="id-0066-0000002a">
-								<name>alive_count</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000128" kind="Aggregate" role="Aggregate" guid="{d0dc1307-a10d-4a65-b01f-aa1a0d6ed20a}" relid="0x7" childrelidcntr="0x1">
-							<name>LivelinessLostStatus</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000000bb" kind="Member" role="Member" guid="{3d412127-8425-48d4-8dc5-a5e739d3c7cc}" relid="0x0" referred="id-0066-0000002a">
-								<name>total_count_change</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000bc" kind="Member" role="Member" guid="{9453bb3b-d71a-425c-9c15-cc87630f5c4e}" relid="0x0" referred="id-0066-0000002a">
-								<name>total_count</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000129" kind="Aggregate" role="Aggregate" guid="{f2a168c3-4719-4d0a-b560-b46dac88b5be}" relid="0x6" childrelidcntr="0x1">
-							<name>SampleRejectedStatus</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000000bd" kind="Member" role="Member" guid="{14c0ee38-4c2f-43bf-9124-563e0abc2b0b}" relid="0x0" referred="id-0067-00000020">
-								<name>last_instance_handle</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000be" kind="Member" role="Member" guid="{5654f0f9-6fbf-4f0e-a540-63987c47380e}" relid="0x0" referred="id-0066-0000002a">
-								<name>total_count_change</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000bf" kind="Member" role="Member" guid="{d0e39512-4e45-435e-8284-7a7233e5a757}" relid="0x0" referred="id-0066-0000002a">
-								<name>total_count</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000366" kind="Member" role="Member" guid="{2747eab6-65b3-48f8-bdc2-07a15a0da61b}" relid="0x0" referred="id-0065-0000012a">
-								<name>last_reason</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-0000012a" kind="Enum" role="Enum" guid="{41e84200-639f-4863-9cc4-525be2ee68fe}" relid="0x5" childrelidcntr="0x4">
-							<name>SampleRejectedStatusKind</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<atom id="id-0066-00000043" kind="EnumValue" role="EnumValue" guid="{fac2dfa4-72a9-4188-8bab-56473e6dec96}" relid="0x3">
-								<name>REJECTED_BY_SAMPLES_PER_INSTANCE_LIMIT</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-							<atom id="id-0066-00000044" kind="EnumValue" role="EnumValue" guid="{2fd82d72-0967-419a-851b-512f4fb4386f}" relid="0x2">
-								<name>REJECTED_BY_SAMPLES_LIMIT</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-							<atom id="id-0066-00000045" kind="EnumValue" role="EnumValue" guid="{5c62b917-c1a5-44c4-bf43-a62d8fc5ed69}" relid="0x1">
-								<name>REJECTED_BY_INSTANCES_LIMIT</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-							<atom id="id-0066-00000046" kind="EnumValue" role="EnumValue" guid="{1ca8c1cc-a038-44a2-8fe6-8012da8f2d3b}" relid="0x0">
-								<name>NOT_REJECTED</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-						</model>
-						<model id="id-0065-0000012b" kind="Aggregate" role="Aggregate" guid="{477c1c4d-6625-4047-ad1b-049f98ea2c66}" relid="0x4" childrelidcntr="0x1">
-							<name>SampleLostStatus</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000000c0" kind="Member" role="Member" guid="{47b47e09-61d7-49ac-a95c-3e31690da56c}" relid="0x0" referred="id-0066-0000002a">
-								<name>total_count_change</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000c1" kind="Member" role="Member" guid="{a26d5d65-edb9-4f2d-8c1a-fc92878f82c3}" relid="0x0" referred="id-0066-0000002a">
-								<name>total_count</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-0000012c" kind="Aggregate" role="Aggregate" guid="{8d4c6c71-0536-4c64-9850-775867425145}" relid="0x3" childrelidcntr="0x1">
-							<name>InconsistentTopicStatus</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000000c2" kind="Member" role="Member" guid="{81bac9f7-c709-43bd-8a49-66513505d5a7}" relid="0x0" referred="id-0066-0000002a">
-								<name>total_count_change</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000c3" kind="Member" role="Member" guid="{e184c237-4a17-48c5-8959-4114ffcbd4ad}" relid="0x0" referred="id-0066-0000002a">
-								<name>total_count</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-0000012d" kind="Aggregate" role="Aggregate" guid="{d7b87f17-977a-4be0-9091-944d13e2abef}" relid="0x2" childrelidcntr="0x1">
-							<name>Time_t</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000000c4" kind="Member" role="Member" guid="{dbaf34cb-cfac-42d4-aaed-03350e4224e3}" relid="0x0" referred="id-0066-00000027">
-								<name>nanosec</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000c5" kind="Member" role="Member" guid="{a0263a6d-9891-4948-be8c-8b143eb61ebc}" relid="0x0" referred="id-0066-0000002a">
-								<name>sec</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-0000012e" kind="Aggregate" role="Aggregate" guid="{c25f412d-47d0-4004-82a1-97aca23f80c2}" relid="0x1" childrelidcntr="0x1">
-							<name>Duration_t</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000000c6" kind="Member" role="Member" guid="{1f465721-a2e5-4476-85c8-187f26c707b0}" relid="0x0" referred="id-0066-00000027">
-								<name>nanosec</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-000000c7" kind="Member" role="Member" guid="{4249a059-015c-4349-9139-c647a1fa2d40}" relid="0x0" referred="id-0066-0000002a">
-								<name>sec</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-0000012f" kind="Aggregate" role="Aggregate" guid="{a5b03cad-ef21-4083-922b-2ab35bb09683}" relid="0x0" childrelidcntr="0x1">
-							<name>BuiltinTopicKey_t</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-000000c8" kind="ArrayMember" role="ArrayMember" guid="{963202a2-5e3c-498c-b606-79df39a64df7}" relid="0x0" referred="id-0066-0000002a">
-								<name>value</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="Size">
-									<value>3</value>
-								</attribute>
-							</reference>
-						</model>
-						<reference id="id-0067-000000c9" kind="Collection" role="Collection" guid="{3d739258-d430-4f96-965e-b0712419b322}" relid="0x29" referred="id-0066-0000002e">
-							<name>OctetSeq</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="bound" status="meta">
-								<value></value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000ca" kind="Constant" role="Constant" guid="{9a3f8cd3-6297-4271-bff0-5df4d6ef4e86}" relid="0x29" referred="id-0066-0000002a">
-							<name>DURABILITYSERVICE_QOS_POLICY_ID</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>22</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000cb" kind="Constant" role="Constant" guid="{6ea3d1b9-4d9c-422d-b840-dd7dbdc687c1}" relid="0x29" referred="id-0066-0000002a">
-							<name>LIFESPAN_QOS_POLICY_ID</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>21</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000cc" kind="Constant" role="Constant" guid="{d4477e99-5985-489d-9609-b8f294c8a149}" relid="0x29" referred="id-0066-0000002a">
-							<name>TRANSPORTPRIORITY_QOS_POLICY_ID</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>20</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000cd" kind="Constant" role="Constant" guid="{c40ef8d5-414f-463b-b547-477523ea9ac7}" relid="0x29" referred="id-0066-0000002a">
-							<name>GROUPDATA_QOS_POLICY_ID</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>19</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000ce" kind="Constant" role="Constant" guid="{a62f9110-3577-4424-8204-d55f86b042fd}" relid="0x29" referred="id-0066-0000002a">
-							<name>TOPICDATA_QOS_POLICY_ID</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>18</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000cf" kind="Constant" role="Constant" guid="{6444c694-b5c1-4f80-a898-3be27fb49b8e}" relid="0x29" referred="id-0066-0000002a">
-							<name>READERDATALIFECYCLE_QOS_POLICY_ID</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>17</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000d0" kind="Constant" role="Constant" guid="{b47ce178-3002-41e4-b156-cd2859716e21}" relid="0x29" referred="id-0066-0000002a">
-							<name>WRITERDATALIFECYCLE_QOS_POLICY_ID</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>16</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000d1" kind="Constant" role="Constant" guid="{22c87c9f-59d2-4208-ac27-bf4e7ed3a26a}" relid="0x29" referred="id-0066-0000002a">
-							<name>ENTITYFACTORY_QOS_POLICY_ID</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>15</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000d2" kind="Constant" role="Constant" guid="{20e774b6-a766-4159-b9a5-ddf2694e6819}" relid="0x29" referred="id-0066-0000002a">
-							<name>RESOURCELIMITS_QOS_POLICY_ID</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>14</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000d3" kind="Constant" role="Constant" guid="{fa43c7d0-05ed-41f8-8209-b62c8275fafe}" relid="0x29" referred="id-0066-0000002a">
-							<name>HISTORY_QOS_POLICY_ID</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>13</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000d4" kind="Constant" role="Constant" guid="{3d1b86b5-e1ef-44eb-a0a0-0a68b139696d}" relid="0x29" referred="id-0066-0000002a">
-							<name>DESTINATIONORDER_QOS_POLICY_ID</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>12</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000d5" kind="Constant" role="Constant" guid="{6fe0af61-4983-4eaf-a0e4-2f95c0e61ae4}" relid="0x29" referred="id-0066-0000002a">
-							<name>RELIABILITY_QOS_POLICY_ID</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>11</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000d6" kind="Constant" role="Constant" guid="{8cc80712-a728-439a-97e9-01656d5f0798}" relid="0x29" referred="id-0066-0000002a">
-							<name>PARTITION_QOS_POLICY_ID</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>10</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000d7" kind="Constant" role="Constant" guid="{6cc25795-4a61-42b0-92ee-b178311f6685}" relid="0x29" referred="id-0066-0000002a">
-							<name>TIMEBASEDFILTER_QOS_POLICY_ID</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>9</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000d8" kind="Constant" role="Constant" guid="{3e13fcc4-1376-45ec-a75d-1fe3e3a21b32}" relid="0x29" referred="id-0066-0000002a">
-							<name>LIVELINESS_QOS_POLICY_ID</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>8</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000d9" kind="Constant" role="Constant" guid="{73353c2c-8b07-47b5-b1d2-bf8488a53abd}" relid="0x29" referred="id-0066-0000002a">
-							<name>OWNERSHIPSTRENGTH_QOS_POLICY_ID</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>7</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000da" kind="Constant" role="Constant" guid="{04c3ccdd-029a-42b9-966c-03a39649c434}" relid="0x29" referred="id-0066-0000002a">
-							<name>OWNERSHIP_QOS_POLICY_ID</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>6</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000db" kind="Constant" role="Constant" guid="{5e24adef-84f2-4217-935c-7919ca41349f}" relid="0x29" referred="id-0066-0000002a">
-							<name>LATENCYBUDGET_QOS_POLICY_ID</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>5</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000dc" kind="Constant" role="Constant" guid="{f1351792-cb5c-420d-87ef-9a382e601e0f}" relid="0x29" referred="id-0066-0000002a">
-							<name>DEADLINE_QOS_POLICY_ID</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>4</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000dd" kind="Constant" role="Constant" guid="{5f9654da-90dd-4c64-bdf9-b54f9c22cee3}" relid="0x29" referred="id-0066-0000002a">
-							<name>PRESENTATION_QOS_POLICY_ID</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>3</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000de" kind="Constant" role="Constant" guid="{90cff5dc-65c5-4439-87f4-9ffe7c471ec3}" relid="0x29" referred="id-0066-0000002a">
-							<name>DURABILITY_QOS_POLICY_ID</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>2</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000df" kind="Constant" role="Constant" guid="{900018cf-41d6-4dd2-bc12-5519f7fa71af}" relid="0x29" referred="id-0066-0000002a">
-							<name>USERDATA_QOS_POLICY_ID</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>1</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000e0" kind="Constant" role="Constant" guid="{a5583f66-b4fd-41cb-bf8a-93f5a3ad592d}" relid="0x29" referred="id-0066-0000002a">
-							<name>INVALID_QOS_POLICY_ID</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>0</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000e1" kind="Constant" role="Constant" guid="{25e9c88b-ecc3-49b5-856b-ce68ed556005}" relid="0x29" referred="id-0066-0000001f">
-							<name>DURABILITYSERVICE_POLICY_NAME</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>DurabilityService</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000e2" kind="Constant" role="Constant" guid="{84431488-0616-42bb-b041-ff04f04afd4a}" relid="0x29" referred="id-0066-0000001f">
-							<name>LIFESPAN_QOS_POLICY_NAME</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>Lifespan</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000e3" kind="Constant" role="Constant" guid="{2f74cd87-7056-411e-8df5-ec3fde12f838}" relid="0x29" referred="id-0066-0000001f">
-							<name>GROUPDATA_QOS_POLICY_NAME</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>TransportPriority</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000e4" kind="Constant" role="Constant" guid="{9e8145d3-32fd-469c-9ba2-5e1b37d28950}" relid="0x29" referred="id-0066-0000001f">
-							<name>TOPICDATA_QOS_POLICY_NAME</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>TopicData</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000e5" kind="Constant" role="Constant" guid="{686913f1-452e-43e0-ab32-5586c0f0fed6}" relid="0x29" referred="id-0066-0000001f">
-							<name>READERDATALIFECYCLE_QOS_POLICY_NAME</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>ReaderDataLifecycle</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000e6" kind="Constant" role="Constant" guid="{70754b78-bddf-4f69-9867-dfd284250706}" relid="0x29" referred="id-0066-0000001f">
-							<name>WRITERDATALIFECYCLE_QOS_POLICY_NAME</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>WriterDataLifecycle</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000e7" kind="Constant" role="Constant" guid="{987c7a77-32a3-405e-b79c-0e4ffa535e83}" relid="0x29" referred="id-0066-0000001f">
-							<name>ENTITYFACTORY_QOS_POLICY_NAME</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>EntityFactory</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000e8" kind="Constant" role="Constant" guid="{b59b8a19-89a4-4848-a844-14233b466053}" relid="0x29" referred="id-0066-0000001f">
-							<name>RESOURCELIMITS_QOS_POLICY_NAME</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>ResourceLimits</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000e9" kind="Constant" role="Constant" guid="{cfd2bd41-b9af-417b-8354-94a13b32eed0}" relid="0x29" referred="id-0066-0000001f">
-							<name>HISTORY_QOS_POLICY_NAME</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>History</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000ea" kind="Constant" role="Constant" guid="{70bd1a60-33c8-4a8a-9b17-38334ebddb3c}" relid="0x29" referred="id-0066-0000001f">
-							<name>DESTINATIONORDER_QOS_POLICY_NAME</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>DestinationOrder</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000eb" kind="Constant" role="Constant" guid="{4b7d207f-8a78-4551-8aa7-02e74dc6f675}" relid="0x29" referred="id-0066-0000001f">
-							<name>RELIABILITY_QOS_POLICY_NAME</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>Reliability</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000ec" kind="Constant" role="Constant" guid="{b354cef1-9129-4ca3-8c48-258b0d804a5e}" relid="0x29" referred="id-0066-0000001f">
-							<name>PARTITION_QOS_POLICY_NAME</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>Partition</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000ed" kind="Constant" role="Constant" guid="{07e31c0c-3231-42b3-98dc-a388ae679ae2}" relid="0x29" referred="id-0066-0000001f">
-							<name>TIMEBASEDFILTER_QOS_POLICY_NAME</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>TimeBasedFilter</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000ee" kind="Constant" role="Constant" guid="{2d6cb837-6e20-4313-a165-c586617b6349}" relid="0x29" referred="id-0066-0000001f">
-							<name>LIVELINESS_QOS_POLICY_NAME</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>Liveliness</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000ef" kind="Constant" role="Constant" guid="{d595fd88-30b2-4603-aa2c-a57f65e22357}" relid="0x29" referred="id-0066-0000001f">
-							<name>OWNERSHIPSTRENGTH_QOS_POLICY_NAME</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>OwnershipStrength</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000f0" kind="Constant" role="Constant" guid="{fc9eff9b-593b-45dd-84f6-3cdf5fc55aad}" relid="0x29" referred="id-0066-0000001f">
-							<name>OWNERSHIP_QOS_POLICY_NAME</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>Ownership</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000f1" kind="Constant" role="Constant" guid="{885dfeed-2652-4be0-900f-abf60f93e712}" relid="0x29" referred="id-0066-0000001f">
-							<name>LATENCYBUDGET_QOS_POLICY_NAME</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>LatencyBudget</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000f2" kind="Constant" role="Constant" guid="{960a135a-7067-4dd8-9729-9a36abcce18c}" relid="0x29" referred="id-0066-0000001f">
-							<name>DEADLINE_QOS_POLICY_NAME</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>Deadline</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000f3" kind="Constant" role="Constant" guid="{e865df56-22dc-4c6a-be4a-b1d323b7b4e5}" relid="0x29" referred="id-0066-0000001f">
-							<name>PRESENTATION_QOS_POLICY_NAME</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>Presentation</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000f4" kind="Constant" role="Constant" guid="{342bfbee-3001-4713-a5ea-dddfca9b01cd}" relid="0x29" referred="id-0066-0000001f">
-							<name>DURABILITY_QOS_POLICY_NAME</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>Durability</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000f5" kind="Constant" role="Constant" guid="{5f2172a2-f0a7-4b0c-8e2c-05302321d0bf}" relid="0x29" referred="id-0066-0000001f">
-							<name>USERDATA_QOS_POLICY_NAME</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>UserData</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000f6" kind="Constant" role="Constant" guid="{e8c6d22f-e0e5-434f-a299-a99ea6cfa987}" relid="0x27" referred="id-0066-00000027">
-							<name>NOT_ALIVE_INSTANCE_STATE</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>6</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000f7" kind="Constant" role="Constant" guid="{23d82ced-1d06-4d87-8fbe-6d1670269ac4}" relid="0x27" referred="id-0066-00000027">
-							<name>ANY_INSTANCE_STATE</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>65535</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000f8" kind="Alias" role="Alias" guid="{84c665d4-308d-4399-b82c-2c563536cc8d}" relid="0x27" referred="id-0066-00000027">
-							<name>InstanceStateMask</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000f9" kind="Constant" role="Constant" guid="{e0060c39-9494-44ff-a214-2f7921141c80}" relid="0x27" referred="id-0066-00000027">
-							<name>NOT_ALIVE_NO_WRITERS_INSTANCE_STATE</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>4</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000fa" kind="Constant" role="Constant" guid="{e1c6fd6c-781c-49ff-8fde-9fabae35ea93}" relid="0x27" referred="id-0066-00000027">
-							<name>NOT_ALIVE_DISPOSED_INSTANCE_STATE</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>2</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000fb" kind="Constant" role="Constant" guid="{bcc2e328-cbeb-4833-bf50-1df5d7434084}" relid="0x27" referred="id-0066-00000027">
-							<name>ALIVE_INSTANCE_STATE</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>1</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000fc" kind="Alias" role="Alias" guid="{5c99fed6-c066-42b9-86ac-4a97f68bbf97}" relid="0x27" referred="id-0066-00000027">
-							<name>InstanceStateKind</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000fd" kind="Constant" role="Constant" guid="{627de5a1-3601-468b-b810-aa7558271c89}" relid="0x27" referred="id-0066-00000027">
-							<name>ANY_VIEW_STATE</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>65535</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000fe" kind="Alias" role="Alias" guid="{04fab75a-961a-447b-bd69-c034886db852}" relid="0x27" referred="id-0066-00000027">
-							<name>ViewStateMask</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-000000ff" kind="Constant" role="Constant" guid="{dc6609b3-65aa-4a80-957f-b95df0b784c8}" relid="0x27" referred="id-0066-00000027">
-							<name>NOT_NEW_VIEW_STATE</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>2</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000100" kind="Constant" role="Constant" guid="{30af0b37-bb5b-44e3-ab35-5edf7b82f369}" relid="0x27" referred="id-0066-00000027">
-							<name>NEW_VIEW_STATE</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>1</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000101" kind="Alias" role="Alias" guid="{eae82e38-e6f6-4063-b0ef-b4fa45834f07}" relid="0x27" referred="id-0066-00000027">
-							<name>ViewStateKind</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000102" kind="Constant" role="Constant" guid="{9f6561a8-db66-4e2a-b809-e12d7d79f22e}" relid="0x27" referred="id-0066-00000027">
-							<name>ANY_SAMPLE_STATE</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>65535</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000103" kind="Alias" role="Alias" guid="{e52a7097-2f47-4e71-8fbb-25708a6329ca}" relid="0x27" referred="id-0066-00000027">
-							<name>SampleStateMask</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000104" kind="Constant" role="Constant" guid="{c6c1b717-4293-4ea5-8888-73283f554469}" relid="0x27" referred="id-0066-00000027">
-							<name>NOT_READ_SAMPLE_STATE</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>2</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000105" kind="Constant" role="Constant" guid="{5c97dd5c-e30a-4e5e-982b-5941ea736d23}" relid="0x27" referred="id-0066-00000027">
-							<name>READ_SAMPLE_STATE</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>1</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000106" kind="Alias" role="Alias" guid="{5ac8c882-8da5-48d1-8a51-8664de6b73d9}" relid="0x27" referred="id-0066-00000027">
-							<name>SampleStateKind</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000107" kind="Constant" role="Constant" guid="{2f13072f-80e4-4fce-a346-016fc43f8e04}" relid="0x3" referred="id-0066-00000027">
-							<name>RELIABLE_READER_ACTIVITY_CHANGED_STATUS</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>33554432</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000108" kind="Constant" role="Constant" guid="{c385cc93-bf7c-4209-8588-a989d7a6041f}" relid="0x3" referred="id-0066-00000027">
-							<name>RELIABLE_WRITER_CACHE_CHANGED_STATUS</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>16777216</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000109" kind="Constant" role="Constant" guid="{7f72eea7-bb4f-4cb1-8ca1-05481e4fefc0}" relid="0x3" referred="id-0066-00000027">
-							<name>SUBSCRIPTION_MATCHED_STATUS</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>16384</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-0000010a" kind="Constant" role="Constant" guid="{15265a69-3a8f-4070-a446-f4b7cb4ff669}" relid="0x3" referred="id-0066-00000027">
-							<name>PUBLICATION_MATCHED_STATUS</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>8192</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-0000010b" kind="Constant" role="Constant" guid="{366574bb-4b22-43ec-b6c8-66eb202422b7}" relid="0x3" referred="id-0066-00000027">
-							<name>LIVELINESS_CHANGED_STATUS</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>4096</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-0000010c" kind="Constant" role="Constant" guid="{d5a8e220-5da9-48c0-b855-3da19c65a356}" relid="0x3" referred="id-0066-00000027">
-							<name>LIVELINESS_LOST_STATUS</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>2048</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-0000010d" kind="Constant" role="Constant" guid="{0921cb80-552a-47d5-88ee-210c46ba266c}" relid="0x3" referred="id-0066-00000027">
-							<name>DATA_AVAILABLE_STATUS</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>1024</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-0000010e" kind="Constant" role="Constant" guid="{983b235d-e54e-48c8-8c2f-97a936501285}" relid="0x3" referred="id-0066-00000027">
-							<name>DATA_ON_READERS_STATUS</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>512</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-0000010f" kind="Constant" role="Constant" guid="{2fee8117-c460-4931-abef-c01bfde44c49}" relid="0x3" referred="id-0066-00000027">
-							<name>SAMPLE_REJECTED_STATUS</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>256</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000110" kind="Constant" role="Constant" guid="{15e2b955-f873-4cad-b6c6-d94cce3f9685}" relid="0x3" referred="id-0066-00000027">
-							<name>SAMPLE_LOST_STATUS</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>128</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000111" kind="Constant" role="Constant" guid="{37e18cc5-9bbc-450b-bad4-0ff02873a212}" relid="0x3" referred="id-0066-00000027">
-							<name>REQUESTED_INCOMPATIBLE_QOS_STATUS</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>64</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000112" kind="Constant" role="Constant" guid="{10b14bda-e0e1-4eeb-ba07-2a92fb7bfb07}" relid="0x3" referred="id-0066-00000027">
-							<name>OFFERED_INCOMPATIBLE_QOS_STATUS</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>32</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000113" kind="Constant" role="Constant" guid="{405c4afe-1866-4a0b-8468-b66f108c2ebd}" relid="0x3" referred="id-0066-00000027">
-							<name>REQUESTED_DEADLINE_MISSED_STATUS</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>4</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000114" kind="Constant" role="Constant" guid="{3d3d20d7-9b0d-4cc5-8ffd-1a9731baedda}" relid="0x3" referred="id-0066-00000027">
-							<name>OFFERED_DEADLINE_MISSED_STATUS</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>2</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000115" kind="Constant" role="Constant" guid="{390c8e3d-7a61-4cb1-ab0c-97cbb3fd7a30}" relid="0x3" referred="id-0066-00000027">
-							<name>INCONSISTENT_TOPIC_STATUS</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>1</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000116" kind="Alias" role="Alias" guid="{992d1d26-1d82-4eea-8c98-6c3dd6a5a37b}" relid="0x3" referred="id-0066-00000027">
-							<name>StatusMask</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000117" kind="Alias" role="Alias" guid="{88ce6fba-c5b2-4c03-8df0-b6a327ebcba2}" relid="0x3" referred="id-0066-00000027">
-							<name>StatusKind</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000118" kind="Constant" role="Constant" guid="{23a28218-3ff5-4be4-8295-01e195640efd}" relid="0x3" referred="id-0066-0000002a">
-							<name>RETCODE_ILLEGAL_OPERATION</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>12</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000119" kind="Constant" role="Constant" guid="{6de3ed4b-7ab1-4753-acfa-0f1114945d6b}" relid="0x3" referred="id-0066-0000002a">
-							<name>RETCODE_NO_DATA</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>11</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-0000011a" kind="Constant" role="Constant" guid="{7b36e470-9dfe-4cc5-a389-b4d0e30e0a9c}" relid="0x3" referred="id-0066-0000002a">
-							<name>RETCODE_TIMEOUT</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>10</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-0000011b" kind="Constant" role="Constant" guid="{e4ce1290-b724-4824-bb76-56ebc69ec16b}" relid="0x3" referred="id-0066-0000002a">
-							<name>RETCODE_ALREADY_DELETED</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>9</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-0000011c" kind="Constant" role="Constant" guid="{a52e4168-636b-44a7-8ba3-a11e22f9fb5a}" relid="0x3" referred="id-0066-0000002a">
-							<name>RETCODE_INCONSISTENT_POLICY</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>8</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-0000011d" kind="Constant" role="Constant" guid="{f5f7a86f-d94f-438b-96d7-b6df65ba24a8}" relid="0x3" referred="id-0066-0000002a">
-							<name>RETCODE_IMMUTABLE_POLICY</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>7</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-0000011e" kind="Constant" role="Constant" guid="{5c987617-b4c4-4971-943b-d34fd0f19847}" relid="0x3" referred="id-0066-0000002a">
-							<name>RETCODE_NOT_ENABLED</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>6</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-0000011f" kind="Constant" role="Constant" guid="{88a50b74-c817-4b16-820d-3631a6292452}" relid="0x3" referred="id-0066-0000002a">
-							<name>RETCODE_OUT_OF_RESOURCES</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>5</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000120" kind="Constant" role="Constant" guid="{a8d4855f-fe24-4c25-b0de-a4beeb6f2925}" relid="0x3" referred="id-0066-0000002a">
-							<name>RETCODE_PRECONDITION_NOT_MET</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>4</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000121" kind="Constant" role="Constant" guid="{f9ee7160-a3d9-4953-91bd-06a551332950}" relid="0x3" referred="id-0066-0000002a">
-							<name>RETCODE_BAD_PARAMETER</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>3</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000122" kind="Constant" role="Constant" guid="{365e41c5-8103-423a-a0f1-7bcade5636c5}" relid="0x3" referred="id-0066-0000002a">
-							<name>RETCODE_UNSUPPORTED</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>2</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000123" kind="Constant" role="Constant" guid="{86342260-9134-4388-9af2-d239afc7dcbb}" relid="0x3" referred="id-0066-0000002a">
-							<name>RETCODE_ERROR</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>1</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000124" kind="Constant" role="Constant" guid="{e7b59fbc-7ad2-4f0d-8d89-1b0318de9ed1}" relid="0x3" referred="id-0066-0000002a">
-							<name>RETCODE_OK</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>0</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000125" kind="Constant" role="Constant" guid="{2b5c66eb-aac9-4e0e-bc66-7c7e2bf3fbc4}" relid="0x3" referred="id-0066-00000027">
-							<name>TIME_INVALID_NSEC</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>4294967295</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000126" kind="Constant" role="Constant" guid="{822e18b5-55fe-484f-a1d7-d0b77d14be1d}" relid="0x3" referred="id-0066-0000002a">
-							<name>TIME_INVALID_SEC</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>-1</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000127" kind="Constant" role="Constant" guid="{a8512bf6-3e19-47a5-8c2a-4520e2b49e9c}" relid="0x3" referred="id-0066-00000027">
-							<name>DURATION_ZERO_NSEC</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>0</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000128" kind="Constant" role="Constant" guid="{c00cbe0c-59f9-48bb-8ecb-0cc857d64131}" relid="0x3" referred="id-0066-0000002a">
-							<name>DURATION_ZERO_SEC</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>0</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000129" kind="Constant" role="Constant" guid="{9f13e94e-e632-43e6-8845-35ae7a316311}" relid="0x3" referred="id-0066-00000027">
-							<name>DURATION_INFINITE_NSEC</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>2147483647</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-0000012a" kind="Constant" role="Constant" guid="{71b0533d-dfa0-4c38-aef2-bbd79356393c}" relid="0x3" referred="id-0066-0000002a">
-							<name>DURATION_INFINITE_SEC</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>2147483647</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-0000012b" kind="Constant" role="Constant" guid="{47cb98dd-3048-4658-ba09-708cac3e5ee1}" relid="0x3" referred="id-0066-0000002a">
-							<name>LENGTH_UNLIMITED</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>-1</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-0000012c" kind="Collection" role="Collection" guid="{66e4851c-b1a2-4d81-b012-8e022cc217a6}" relid="0x1" referred="id-0066-0000001f">
-							<name>StringSeq</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="bound" status="meta">
-								<value></value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-0000012d" kind="Alias" role="Alias" guid="{63648047-b328-4109-a598-d73b5c303abf}" relid="0x1" referred="id-0066-0000002a">
-							<name>QosPolicyId_t</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-0000012e" kind="Alias" role="Alias" guid="{7af80fb7-37be-44c8-b3be-fb071b3f8b98}" relid="0x1" referred="id-0066-0000002a">
-							<name>ReturnCode_t</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-0000012f" kind="Alias" role="Alias" guid="{2fe5da52-96b2-4647-8938-ebb93f03845d}" relid="0x0" referred="id-0066-0000002a">
-							<name>DomainId_t</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000130" kind="Collection" role="Collection" guid="{bd00d3e2-536b-428c-9e03-cb8db4187959}" relid="0x55" referred="id-0065-00000035">
-							<name>SampleInfoSeq</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="bound" status="meta">
-								<value></value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000131" kind="Collection" role="Collection" guid="{ea4d831c-0b5d-4558-86cb-a1dbecede78d}" relid="0x24" referred="id-0065-000000a5">
-							<name>ConditionSeq</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="bound" status="meta">
-								<value></value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000132" kind="Collection" role="Collection" guid="{78e9e4ce-0c16-4926-9cab-98fca7f42340}" relid="0x1d" referred="id-0065-000000e1">
-							<name>DataReaderSeq</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="bound" status="meta">
-								<value></value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000133" kind="Collection" role="Collection" guid="{6d8fb54a-e172-4f46-a98a-abc0ec6e11d8}" relid="0xc" referred="id-0065-00000124">
-							<name>QosPolicyCountSeq</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="bound" status="meta">
-								<value></value>
-							</attribute>
-						</reference>
-					</model>
-				</model>
-				<model id="id-0065-00000130" kind="File" guid="{768e2924-97d0-49e4-b182-d580695d585b}" relid="0xb" childrelidcntr="0x1">
-					<name>dds4ccm_StateListenerControl</name>
-					<attribute kind="Path">
-						<value>connectors/dds4ccm/idl</value>
-					</attribute>
-					<attribute kind="PostPreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="PrePreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="PrefixTag" status="meta">
-						<value></value>
-					</attribute>
-					<model id="id-0065-00000131" kind="Package" role="Package" guid="{af3c382b-cfef-4c8e-872b-6784d3580514}" relid="0x0" childrelidcntr="0x1">
-						<name>CCM_DDS</name>
-						<attribute kind="PostPreprocessorDirectives" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="PrePreprocessorDirectives" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="PrefixTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="SpecifyIdTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="VersionTag" status="meta">
-							<value></value>
-						</attribute>
-						<model id="id-0065-00000132" kind="Object" role="Object" guid="{c5c6d8fb-caaa-4e16-a1d2-46560b3ba292}" relid="0x0" childrelidcntr="0x2">
-							<name>StateListenerControl</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-00000133" kind="Attribute" role="Attribute" guid="{cb32524d-b746-4462-9a83-47bc84c72aba}" relid="0x0" childrelidcntr="0x1">
-								<name>is_filter_interpreted</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000134" kind="AttributeMember" role="AttributeMember" guid="{cd30567b-74f9-4aae-97a1-9f58e29f2b23}" relid="0x0" referred="id-0066-0000002f">
-									<name></name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<reference id="id-0067-00000367" kind="Inherits" role="Inherits" guid="{a73c26e3-7c5f-4e12-97e7-c1aa98be57f2}" relid="0x1" referred="id-0065-0000013b">
-								<name>Inherits</name>
-							</reference>
-						</model>
-					</model>
-				</model>
-				<model id="id-0065-00000134" kind="File" guid="{2a99f802-8c2c-4a0c-be0f-f323a7f359f2}" relid="0x9" childrelidcntr="0x1">
-					<name>dds4ccm_PortStatusListener</name>
-					<attribute kind="Path">
-						<value>connectors/dds4ccm/idl</value>
-					</attribute>
-					<attribute kind="PostPreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="PrePreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="PrefixTag" status="meta">
-						<value></value>
-					</attribute>
-					<model id="id-0065-00000135" kind="Package" role="Package" guid="{9c2ac504-a781-4b30-a43b-9820a96d033d}" relid="0x0" childrelidcntr="0x1">
-						<name>CCM_DDS</name>
-						<attribute kind="PostPreprocessorDirectives" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="PrePreprocessorDirectives" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="PrefixTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="SpecifyIdTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="VersionTag" status="meta">
-							<value></value>
-						</attribute>
-						<model id="id-0065-00000136" kind="Object" role="Object" guid="{846970af-1676-4855-a75f-38bea43c18b4}" relid="0x0" childrelidcntr="0x2">
-							<name>PortStatusListener</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-00000137" kind="TwowayOperation" role="TwowayOperation" guid="{64478210-d18a-471b-be3f-3ace98685c27}" relid="0x1" childrelidcntr="0x1">
-								<name>on_sample_lost</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000135" kind="InParameter" role="InParameter" guid="{2a95c9d6-ab99-4f97-a742-55189ecfbb55}" relid="0x0" referred="id-0065-0000012b">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000136" kind="InParameter" role="InParameter" guid="{04b72909-7452-4933-b6cd-b90efe528b3e}" relid="0x0" referred="id-0065-000000e1">
-									<name>the_reader</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000138" kind="TwowayOperation" role="TwowayOperation" guid="{e2aba88a-e59a-4a1d-a740-caf533037a94}" relid="0x0" childrelidcntr="0x1">
-								<name>on_requested_deadline_missed</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000137" kind="InParameter" role="InParameter" guid="{8b892cb7-97f5-4e8e-bd50-f9f3abf4aa33}" relid="0x0" referred="id-0065-00000125">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000138" kind="InParameter" role="InParameter" guid="{495fcba1-fa62-49a3-9d80-9f186311b9b3}" relid="0x0" referred="id-0065-000000e1">
-									<name>the_reader</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-						</model>
-					</model>
-				</model>
-				<model id="id-0065-00000139" kind="File" guid="{4f3adb2a-cc9a-4398-8540-a53bd472e5df}" relid="0x7" childrelidcntr="0x1">
-					<name>dds4ccm_DataListenerControl</name>
-					<attribute kind="Path">
-						<value>connectors/dds4ccm/idl</value>
-					</attribute>
-					<attribute kind="PostPreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="PrePreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="PrefixTag" status="meta">
-						<value></value>
-					</attribute>
-					<model id="id-0065-0000013a" kind="Package" role="Package" guid="{dff4a2e0-25d9-412d-b2b7-82ceebb363e4}" relid="0x0" childrelidcntr="0x1">
-						<name>CCM_DDS</name>
-						<attribute kind="PostPreprocessorDirectives" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="PrePreprocessorDirectives" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="PrefixTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="SpecifyIdTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="VersionTag" status="meta">
-							<value></value>
-						</attribute>
-						<model id="id-0065-0000013b" kind="Object" role="Object" guid="{090ff77c-89cb-41d6-a927-b6aa4bc482b6}" relid="0x0" childrelidcntr="0x2">
-							<name>DataListenerControl</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-0000013c" kind="Attribute" role="Attribute" guid="{c6536dfa-cc90-4e97-98ac-174c6892deab}" relid="0x1" childrelidcntr="0x1">
-								<name>max_delivered_data</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000368" kind="AttributeMember" role="AttributeMember" guid="{f9fc391e-7816-4e7d-b8e3-2b463077dbc3}" relid="0x0" referred="id-0067-00000151">
-									<name></name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000013d" kind="Attribute" role="Attribute" guid="{7b1a3436-61c1-48d3-a3f1-536487457d81}" relid="0x0" childrelidcntr="0x1">
-								<name>mode</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000369" kind="AttributeMember" role="AttributeMember" guid="{9f8f84d9-8d4e-4739-959a-8a4c61ab4387}" relid="0x0" referred="id-0065-00000157">
-									<name></name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-						</model>
-					</model>
-				</model>
-				<model id="id-0065-0000013e" kind="File" guid="{f6ec2990-716f-4726-bd1a-49dce16c903e}" relid="0x5" childrelidcntr="0x1">
-					<name>dds4ccm_ConnectorStatusListener</name>
-					<attribute kind="Path">
-						<value>connectors/dds4ccm/idl</value>
-					</attribute>
-					<attribute kind="PostPreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="PrePreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="PrefixTag" status="meta">
-						<value></value>
-					</attribute>
-					<model id="id-0065-0000013f" kind="Package" role="Package" guid="{633dfb10-2b6b-45bb-8d08-638ab70494bd}" relid="0x0" childrelidcntr="0x1">
-						<name>CCM_DDS</name>
-						<attribute kind="PostPreprocessorDirectives" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="PrePreprocessorDirectives" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="PrefixTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="SpecifyIdTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="VersionTag" status="meta">
-							<value></value>
-						</attribute>
-						<model id="id-0065-00000140" kind="Object" role="Object" guid="{da8dd74e-a925-4f3e-a1fa-cac45ace8b9d}" relid="0x0" childrelidcntr="0x6">
-							<name>ConnectorStatusListener</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-00000141" kind="TwowayOperation" role="TwowayOperation" guid="{ae770844-b851-4227-94ad-e215a124851e}" relid="0x5" childrelidcntr="0x1">
-								<name>on_unexpected_status</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,560</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000139" kind="InParameter" role="InParameter" guid="{957ae072-6620-4b92-91aa-18ad29d341a3}" relid="0x0" referred="id-0067-00000117">
-									<name>status_kind</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000013a" kind="InParameter" role="InParameter" guid="{3348c215-8940-4e9e-980f-5cc34bede3b1}" relid="0x0" referred="id-0065-00000117">
-									<name>the_entity</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000142" kind="TwowayOperation" role="TwowayOperation" guid="{e693cdd9-32f6-426f-86b8-b28388d10d68}" relid="0x4" childrelidcntr="0x1">
-								<name>on_offered_incompatible_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000013b" kind="InParameter" role="InParameter" guid="{538bd74f-1d95-4dc5-8e5c-17151a92b55e}" relid="0x0" referred="id-0065-00000123">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000013c" kind="InParameter" role="InParameter" guid="{3d43c29a-58bd-42c4-ba24-f57332333d20}" relid="0x0" referred="id-0065-000000f5">
-									<name>the_writer</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000143" kind="TwowayOperation" role="TwowayOperation" guid="{7d1c8df9-94c6-4eef-aa87-94732c3629e8}" relid="0x3" childrelidcntr="0x1">
-								<name>on_offered_deadline_missed</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000013d" kind="InParameter" role="InParameter" guid="{75bd9949-8a22-49a5-8455-4d68126de471}" relid="0x0" referred="id-0065-00000126">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000013e" kind="InParameter" role="InParameter" guid="{42a71a0c-224d-434a-b72a-3bda842434c9}" relid="0x0" referred="id-0065-000000f5">
-									<name>the_writer</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000144" kind="TwowayOperation" role="TwowayOperation" guid="{258f94e3-04b2-4921-87b3-413d9ab90951}" relid="0x2" childrelidcntr="0x1">
-								<name>on_sample_rejected</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000013f" kind="InParameter" role="InParameter" guid="{5a4bd54e-b7b6-4f90-9e81-c2586c53e138}" relid="0x0" referred="id-0065-00000129">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000140" kind="InParameter" role="InParameter" guid="{79345a69-2280-4a78-9056-afe5ad2416a5}" relid="0x0" referred="id-0065-000000e1">
-									<name>the_reader</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000145" kind="TwowayOperation" role="TwowayOperation" guid="{82972328-0c93-4fb1-ad63-4e57650477da}" relid="0x1" childrelidcntr="0x1">
-								<name>on_requested_incompatible_qos</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000141" kind="InParameter" role="InParameter" guid="{f5f6cd3b-d3c6-47ea-b77c-9ed5e65d28fe}" relid="0x0" referred="id-0065-00000122">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000142" kind="InParameter" role="InParameter" guid="{1c10e95c-e083-470e-be27-e77b278f0824}" relid="0x0" referred="id-0065-000000e1">
-									<name>the_reader</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-00000146" kind="TwowayOperation" role="TwowayOperation" guid="{7882cc5e-046d-4ae3-b649-6a2cfbf01fee}" relid="0x0" childrelidcntr="0x1">
-								<name>on_inconsistent_topic</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000143" kind="InParameter" role="InParameter" guid="{1d815fc2-2786-4e43-9ff3-a28d51deb9c1}" relid="0x0" referred="id-0065-0000012c">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-00000144" kind="InParameter" role="InParameter" guid="{29b91f00-b74a-4af2-aa2d-42926cff9580}" relid="0x0" referred="id-0065-0000010d">
-									<name>the_topic</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-						</model>
-					</model>
-				</model>
-				<model id="id-0065-00000147" kind="File" guid="{829aaff6-dcd8-4f11-827b-7d212e9a904b}" relid="0x3" childrelidcntr="0x1">
-					<name>dds4ccm_Connector</name>
-					<attribute kind="Path">
-						<value>connectors/dds4ccm/idl</value>
-					</attribute>
-					<attribute kind="PostPreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="PrePreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="PrefixTag" status="meta">
-						<value></value>
-					</attribute>
-					<model id="id-0065-00000148" kind="Package" role="Package" guid="{cd22e550-5212-470e-a781-7bb0ff31444f}" relid="0x0" childrelidcntr="0x2">
-						<name>CCM_DDS</name>
-						<attribute kind="PostPreprocessorDirectives" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="PrePreprocessorDirectives" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="PrefixTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="SpecifyIdTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="VersionTag" status="meta">
-							<value></value>
-						</attribute>
-						<model id="id-0065-00000149" kind="ConnectorObject" role="ConnectorObject" guid="{929df5a6-7abe-4e80-854e-d7eb0e88a1a1}" relid="0x1" childrelidcntr="0x2">
-							<name>DDS_TopicBase</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="UUID">
-								<value>C61798A6-7C26-11DF-8003-000C2958D27B</value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-0000014a" kind="Attribute" role="Attribute" guid="{c8f93226-f80b-4012-af94-2bf47910895c}" relid="0x1" childrelidcntr="0x1">
-								<name>key_fields</name>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000145" kind="AttributeMember" role="AttributeMember" guid="{bbb0cd1e-b990-4ae0-b1a0-625c26dfb166}" relid="0x0" referred="id-0067-0000012c">
-									<name></name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000036a" kind="SetException" role="SetException" guid="{79cecbcd-2c05-49ff-a801-658b232ceecd}" relid="0x0" referred="id-0065-00000153">
-									<name></name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000014b" kind="Attribute" role="Attribute" guid="{ad843b0c-e8eb-4ed6-b132-436f53ff200b}" relid="0x0" childrelidcntr="0x1">
-								<name>topic_name</name>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000146" kind="AttributeMember" role="AttributeMember" guid="{d6f8da99-e195-4c2f-bebf-8a3ddeb926ac}" relid="0x0" referred="id-0066-0000001f">
-									<name></name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000036b" kind="SetException" role="SetException" guid="{a5efd038-e5a5-49b1-8ea2-8db89abe9df8}" relid="0x0" referred="id-0065-00000153">
-									<name></name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-						</model>
-						<model id="id-0065-0000014c" kind="ConnectorObject" role="ConnectorObject" guid="{b29cc787-8b26-4d1b-9b29-d80ec94e1613}" relid="0x0" childrelidcntr="0x2">
-							<name>DDS_Base</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="UUID">
-								<value>C61798A6-7C26-11DF-8002-000C2958D27B</value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-0000014d" kind="Attribute" role="Attribute" guid="{41269dd5-2c55-459c-9016-7fed7a1052fb}" relid="0x1" childrelidcntr="0x1">
-								<name>qos_profile</name>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000147" kind="AttributeMember" role="AttributeMember" guid="{70efda93-3154-472d-8f61-921da307c5b9}" relid="0x0" referred="id-0066-0000001f">
-									<name></name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000036c" kind="SetException" role="SetException" guid="{e2f5b0fc-ccb0-4ad8-9844-98230252382c}" relid="0x0" referred="id-0065-00000153">
-									<name></name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<model id="id-0065-0000014e" kind="Attribute" role="Attribute" guid="{93fde27e-0d57-4d0e-8200-f5236f0e8dd4}" relid="0x0" childrelidcntr="0x1">
-								<name>domain_id</name>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000148" kind="AttributeMember" role="AttributeMember" guid="{0118c12e-990e-4960-a783-f07bf3baa3b3}" relid="0x0" referred="id-0067-0000012f">
-									<name></name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000036d" kind="SetException" role="SetException" guid="{b3efb2e0-0e56-4b69-a959-99b4768435a8}" relid="0x0" referred="id-0065-00000153">
-									<name></name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-							<reference id="id-0067-00000149" kind="RequiredRequestPort" role="RequiredRequestPort" guid="{9eaa85f3-f263-4b31-9982-c0f9092ea95c}" relid="0x0" referred="id-0065-00000140">
-								<name>error_listener</name>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="exclusiveProvider" status="meta">
-									<value>false</value>
-								</attribute>
-								<attribute kind="exclusiveUser" status="meta">
-									<value>false</value>
-								</attribute>
-								<attribute kind="multiple_connections">
-									<value>true</value>
-								</attribute>
-								<attribute kind="optional" status="meta">
-									<value>false</value>
-								</attribute>
-							</reference>
-						</model>
-					</model>
-				</model>
-				<model id="id-0065-0000014f" kind="File" guid="{efa14826-304a-4575-8733-94aaa271dfd6}" relid="0x1" childrelidcntr="0x1">
-					<name>dds4ccm_Base</name>
-					<attribute kind="Path">
-						<value>connectors/dds4ccm/idl</value>
-					</attribute>
-					<attribute kind="PostPreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="PrePreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="PrefixTag" status="meta">
-						<value></value>
-					</attribute>
-					<model id="id-0065-00000150" kind="Package" role="Package" guid="{4591f46e-5f2b-484f-a218-955942cb37ea}" relid="0x0" childrelidcntr="0xa">
-						<name>CCM_DDS</name>
-						<attribute kind="PostPreprocessorDirectives" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="PrePreprocessorDirectives" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="PrefixTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="SpecifyIdTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="VersionTag" status="meta">
-							<value></value>
-						</attribute>
-						<model id="id-0065-00000151" kind="Object" role="Object" guid="{db1f229a-c7d8-4b0a-8ba5-18dd8c151409}" relid="0x9" childrelidcntr="0x1">
-							<name>ContentFilterSetting</name>
-							<attribute kind="InterfaceSemantics">
-								<value>local</value>
-							</attribute>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-00000152" kind="TwowayOperation" role="TwowayOperation" guid="{0f5be5ce-59fc-4b43-9379-00bfa3b1c732}" relid="0x0" childrelidcntr="0x1">
-								<name>set_filter_parameters</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000014a" kind="InParameter" role="InParameter" guid="{b7f67965-829b-430e-8998-f274bff8993b}" relid="0x0" referred="id-0067-0000012c">
-									<name>parameters</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-								<reference id="id-0067-0000036e" kind="ExceptionRef" role="ExceptionRef" guid="{fa19a987-a133-40e6-b6f0-47ec09d31075}" relid="0x0" referred="id-0065-00000154">
-									<name></name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>160,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-								</reference>
-							</model>
-						</model>
-						<model id="id-0065-00000153" kind="Exception" role="Exception" guid="{dab7a9cd-b69c-4cf3-ac7e-599d6ecb5ff1}" relid="0x8" childrelidcntr="0x0">
-							<name>NonChangeable</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-						</model>
-						<model id="id-0065-00000154" kind="Exception" role="Exception" guid="{2acfcd50-3fae-47a3-8fef-cb659f920f4a}" relid="0x7" childrelidcntr="0x1">
-							<name>InternalError</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-0000014b" kind="Member" role="Member" guid="{4730d586-61aa-4f85-b670-e8271bfd2931}" relid="0x0" referred="id-0067-0000012e">
-								<name>error_code</name>
-							</reference>
-							<reference id="id-0067-0000036f" kind="Member" role="Member" guid="{f78229fc-61d5-4fd3-a9a2-5a9cba818528}" relid="0x0" referred="id-0067-00000151">
-								<name>index</name>
-							</reference>
-						</model>
-						<model id="id-0065-00000155" kind="Exception" role="Exception" guid="{8b15e311-1ddc-4f0f-9542-3532990fe642}" relid="0x6" childrelidcntr="0x1">
-							<name>NonExistent</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-0000039d" kind="Member" role="Member" guid="{73592d82-e3ff-4933-983a-d97298f6de1c}" relid="0x0" referred="id-0067-00000372">
-								<name>indexes</name>
-							</reference>
-						</model>
-						<model id="id-0065-00000156" kind="Exception" role="Exception" guid="{3efaef2a-246b-4597-8332-e21a55903433}" relid="0x5" childrelidcntr="0x1">
-							<name>AlreadyCreated</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-0000039e" kind="Member" role="Member" guid="{451b5926-5f07-4742-ab1e-75050787ab46}" relid="0x0" referred="id-0067-00000372">
-								<name>indexes</name>
-							</reference>
-						</model>
-						<model id="id-0065-00000157" kind="Enum" role="Enum" guid="{65805011-4422-4420-a30d-c077f21e0757}" relid="0x4" childrelidcntr="0x3">
-							<name>ListenerMode</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<atom id="id-0066-00000047" kind="EnumValue" role="EnumValue" guid="{86aa0e66-ffc2-4fc1-a48d-19bb13bdb106}" relid="0x2">
-								<name>MANY_BY_MANY</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-							<atom id="id-0066-00000048" kind="EnumValue" role="EnumValue" guid="{e0d9ffaf-1236-40bd-96d6-6378d3c1c763}" relid="0x1">
-								<name>ONE_BY_ONE</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-							<atom id="id-0066-00000049" kind="EnumValue" role="EnumValue" guid="{9f0cb3a2-eaf5-4e36-a2c2-3cddd6efba01}" relid="0x0">
-								<name>NOT_ENABLED</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-						</model>
-						<model id="id-0065-00000158" kind="Aggregate" role="Aggregate" guid="{0361de1d-4c0e-4a9d-a52b-a1ce50fb2994}" relid="0x3" childrelidcntr="0x1">
-							<name>QueryFilter</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-0000014c" kind="Member" role="Member" guid="{fae65ed4-c5fc-42b8-a3bc-09fb7b14c4f1}" relid="0x0" referred="id-0067-0000012c">
-								<name>parameters</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000014d" kind="Member" role="Member" guid="{ec7a4b7b-1534-4911-927a-856d030d3486}" relid="0x0" referred="id-0066-0000001f">
-								<name>expression</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-00000159" kind="Aggregate" role="Aggregate" guid="{f0154a87-3f3a-40e5-86ca-9b2391830453}" relid="0x2" childrelidcntr="0x1">
-							<name>ReadInfo</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-0000014e" kind="Member" role="Member" guid="{df90510b-d2e5-4813-95a8-8bb0d03fb27f}" relid="0x0" referred="id-0065-0000012d">
-								<name>source_timestamp</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000014f" kind="Member" role="Member" guid="{6c2866c9-c87c-4407-ab26-4766db5a4901}" relid="0x0" referred="id-0067-00000020">
-								<name>instance_handle</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000370" kind="Member" role="Member" guid="{a5d48ef3-faf3-45b2-ba9e-53dc324eab36}" relid="0x0" referred="id-0065-0000015a">
-								<name>instance_status</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000371" kind="Member" role="Member" guid="{d9028ef2-afdc-4373-8888-a8b497a5c11a}" relid="0x0" referred="id-0065-0000015b">
-								<name>access_status</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-0000015a" kind="Enum" role="Enum" guid="{dea334c6-b3b5-4676-97a4-897ea6fe6f79}" relid="0x1" childrelidcntr="0x5">
-							<name>InstanceStatus</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<atom id="id-0066-0000004a" kind="EnumValue" role="EnumValue" guid="{096fd7f6-203b-4001-ac47-8e5beafc141c}" relid="0x4">
-								<name>INSTANCE_DELETED</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,460</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-							<atom id="id-0066-0000004b" kind="EnumValue" role="EnumValue" guid="{a683b070-f079-4d71-a397-02f96217692d}" relid="0x3">
-								<name>INSTANCE_FILTERED_OUT</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,360</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-							<atom id="id-0066-0000004c" kind="EnumValue" role="EnumValue" guid="{ae72f4b8-1e2a-4dbe-af7a-63d6ea4db75d}" relid="0x2">
-								<name>INSTANCE_UPDATED</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,260</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-							<atom id="id-0066-0000004d" kind="EnumValue" role="EnumValue" guid="{3fe5e3c0-9b4c-4120-95b8-1a04abedbb8f}" relid="0x1">
-								<name>INSTANCE_FILTERED_IN</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-							<atom id="id-0066-0000004e" kind="EnumValue" role="EnumValue" guid="{8b04876e-8fed-4a1e-ac7a-416ccd590f7a}" relid="0x0">
-								<name>INSTANCE_CREATED</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-						</model>
-						<model id="id-0065-0000015b" kind="Enum" role="Enum" guid="{8e40374e-5636-44e4-b1c5-8b9582a20307}" relid="0x0" childrelidcntr="0x2">
-							<name>AccessStatus</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<atom id="id-0066-0000004f" kind="EnumValue" role="EnumValue" guid="{b3796768-7a7a-4e15-83f0-f7771da88f6b}" relid="0x1">
-								<name>ALREADY_SEEN</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,160</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-							<atom id="id-0066-00000050" kind="EnumValue" role="EnumValue" guid="{56069827-6a1a-40dc-be8d-25077dd54f1d}" relid="0x0">
-								<name>FRESH_INFO</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-						</model>
-						<reference id="id-0067-00000150" kind="Constant" role="Constant" guid="{91bde20c-4789-4717-9d53-80b7beb0491a}" relid="0x0" referred="id-0066-00000027">
-							<name>UNLIMITED</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="value">
-								<value>0</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000151" kind="Alias" role="Alias" guid="{ebc3aec5-b0aa-4ea9-9a6f-63fb408599e7}" relid="0x0" referred="id-0066-00000027">
-							<name>DataNumber_t</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000152" kind="Collection" role="Collection" guid="{18679629-7b2e-42c7-ba12-ee4d4f0c3111}" relid="0x3" referred="id-0065-00000159">
-							<name>ReadInfoSeq</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="bound" status="meta">
-								<value></value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000372" kind="Collection" role="Collection" guid="{8becee46-56cf-4276-9592-0da89f0c64b0}" relid="0x0" referred="id-0067-00000151">
-							<name>DataNumberSeq</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="bound" status="meta">
-								<value></value>
-							</attribute>
-						</reference>
-					</model>
-				</model>
-				<model id="id-0065-0000015c" kind="File" guid="{c15ffee3-4e42-4415-b8d3-2c6eb6f273bb}" relid="0x0" childrelidcntr="0x1">
-					<name>ccm_dds</name>
-					<attribute kind="Path">
-						<value>connectors/dds4ccm/idl</value>
-					</attribute>
-					<attribute kind="PostPreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="PrePreprocessorDirectives" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="PrefixTag" status="meta">
-						<value></value>
-					</attribute>
-					<model id="id-0065-0000015d" kind="Package" role="Package" guid="{34a2a80d-dd8a-4ebf-9e5d-3eedeef2764d}" relid="0x0" childrelidcntr="0x1">
-						<name>CCM_DDS</name>
-						<attribute kind="PostPreprocessorDirectives" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="PrePreprocessorDirectives" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="PrefixTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="SpecifyIdTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="VersionTag" status="meta">
-							<value></value>
-						</attribute>
-						<model id="id-0065-0000015e" kind="Package" role="Package" guid="{973858e2-a3a5-47b4-84b6-7dccd553eafe}" relid="0x0" childrelidcntr="0x10">
-							<name>Typed</name>
-							<attribute kind="PostPreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrePreprocessorDirectives" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="PrefixTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<model id="id-0065-0000015f" kind="ConnectorObject" role="ConnectorObject" guid="{a748a69a-9c98-4a2e-ae64-c98b9f684f0d}" relid="0xf" childrelidcntr="0x1">
-								<name>DDS_Event</name>
-								<attribute kind="PostPreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="PrePreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="UUID">
-									<value>C61798A6-7C26-11DF-8001-000C2958D27B</value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000373" kind="MirrorPort" role="MirrorPort" guid="{ac9efffe-2746-401f-8e5f-d87a31348854}" relid="0x0" referred="id-0065-00000163">
-									<name>push_consumer</name>
-								</reference>
-								<reference id="id-0067-00000374" kind="MirrorPort" role="MirrorPort" guid="{a9eda479-9be6-4d13-bfe1-d48d8793a55b}" relid="0x0" referred="id-0065-00000165">
-									<name>pull_consumer</name>
-								</reference>
-								<reference id="id-0067-00000375" kind="MirrorPort" role="MirrorPort" guid="{97bf7da7-c669-4858-84bd-a5e0d55f03c9}" relid="0x0" referred="id-0065-0000016a">
-									<name>supplier</name>
-								</reference>
-							</model>
-							<model id="id-0065-00000160" kind="ConnectorObject" role="ConnectorObject" guid="{9ba0875d-02f6-46a4-b15c-0ec933b459e0}" relid="0xe" childrelidcntr="0x1">
-								<name>DDS_State</name>
-								<attribute kind="PostPreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="PrePreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="UUID">
-									<value>C61798A6-7C26-11DF-8000-000C2958D27B</value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000376" kind="MirrorPort" role="MirrorPort" guid="{85a0a8e1-d5b2-4c4f-8363-ae8abcd39b00}" relid="0x0" referred="id-0065-00000161">
-									<name>push_state_observer</name>
-								</reference>
-								<reference id="id-0067-00000377" kind="MirrorPort" role="MirrorPort" guid="{fec38694-fe28-4669-be83-d7142ece8d92}" relid="0x0" referred="id-0065-00000163">
-									<name>push_observer</name>
-								</reference>
-								<reference id="id-0067-00000378" kind="MirrorPort" role="MirrorPort" guid="{f8de4b83-cc7c-45f7-aa09-c444b91f1945}" relid="0x0" referred="id-0065-00000165">
-									<name>pull_observer</name>
-								</reference>
-								<reference id="id-0067-00000379" kind="MirrorPort" role="MirrorPort" guid="{e09832c6-f7fb-436c-91fb-b89d677a9261}" relid="0x0" referred="id-0065-00000167">
-									<name>passive_observer</name>
-								</reference>
-								<reference id="id-0067-0000037a" kind="MirrorPort" role="MirrorPort" guid="{f37bfb4b-b88a-4815-94f7-8cd699d13e8c}" relid="0x0" referred="id-0065-00000169">
-									<name>observable</name>
-								</reference>
-							</model>
-							<model id="id-0065-00000161" kind="PortType" role="PortType" guid="{824566cf-5c31-4bc4-b7f0-08f3e194df43}" relid="0xd" childrelidcntr="0x2">
-								<name>DDS_StateListen</name>
-								<attribute kind="PostPreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="PrePreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<model id="id-0065-00000162" kind="Attribute" role="Attribute" guid="{8037acb0-12ad-40b1-94bb-69c1bee6b6b9}" relid="0x0" childrelidcntr="0x1">
-									<name>filter</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,560</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-00000153" kind="SetException" role="SetException" guid="{eed9c788-7b5a-4c1f-9795-21704f2d8d96}" relid="0x0" referred="id-0065-00000153">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>160,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-00000154" kind="AttributeMember" role="AttributeMember" guid="{6b8ae559-da9a-4a03-95b7-fcc3996051dc}" relid="0x0" referred="id-0065-00000158">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-								<reference id="id-0067-00000155" kind="RequiredRequestPort" role="RequiredRequestPort" guid="{b462f37c-4f66-4b08-84a6-59c2abe46a4a}" relid="0x1" referred="id-0065-00000151">
-									<name>filter_config</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,660</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="exclusiveProvider" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="exclusiveUser" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="multiple_connections">
-										<value>true</value>
-									</attribute>
-									<attribute kind="optional" status="meta">
-										<value>false</value>
-									</attribute>
-								</reference>
-								<reference id="id-0067-00000156" kind="ProvidedRequestPort" role="ProvidedRequestPort" guid="{6b1da435-fdcc-4081-a454-a6e227c098b3}" relid="0x0" referred="id-0065-00000136">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,460</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="exclusiveProvider" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="exclusiveUser" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="optional" status="meta">
-										<value>false</value>
-									</attribute>
-								</reference>
-								<reference id="id-0067-00000157" kind="RequiredRequestPort" role="RequiredRequestPort" guid="{e3f7233f-8283-4539-9f9d-df4eac67aafe}" relid="0x0" referred="id-0065-000000e1">
-									<name>dds_entity</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,360</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="exclusiveProvider" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="exclusiveUser" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="multiple_connections">
-										<value>true</value>
-									</attribute>
-									<attribute kind="optional" status="meta">
-										<value>false</value>
-									</attribute>
-								</reference>
-								<reference id="id-0067-00000158" kind="RequiredRequestPort" role="RequiredRequestPort" guid="{11b899d0-7064-4e27-b20e-b8a5e24f3548}" relid="0x0" referred="id-0065-00000132">
-									<name>data_control</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,160</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="exclusiveProvider" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="exclusiveUser" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="multiple_connections">
-										<value>true</value>
-									</attribute>
-									<attribute kind="optional" status="meta">
-										<value>false</value>
-									</attribute>
-								</reference>
-								<reference id="id-0067-0000037b" kind="ProvidedRequestPort" role="ProvidedRequestPort" guid="{b7888fd0-b0c0-4ca4-8013-70d865278be2}" relid="0x0" referred="id-0065-0000016b">
-									<name>data_listener</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,260</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="exclusiveProvider" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="exclusiveUser" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="optional" status="meta">
-										<value>false</value>
-									</attribute>
-								</reference>
-								<reference id="id-0067-0000037c" kind="RequiredRequestPort" role="RequiredRequestPort" guid="{c6ee3ff0-c5b4-4ef5-990a-4c47dcc5b655}" relid="0x0" referred="id-0065-00000178">
-									<name>data</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="exclusiveProvider" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="exclusiveUser" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="multiple_connections">
-										<value>true</value>
-									</attribute>
-									<attribute kind="optional" status="meta">
-										<value>false</value>
-									</attribute>
-								</reference>
-							</model>
-							<model id="id-0065-00000163" kind="PortType" role="PortType" guid="{aea302e1-40ee-45b5-91e4-5b78deb209e5}" relid="0xc" childrelidcntr="0x2">
-								<name>DDS_Listen</name>
-								<attribute kind="PostPreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="PrePreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<model id="id-0065-00000164" kind="Attribute" role="Attribute" guid="{3266e8d4-569a-479c-b9a8-9cc5b04e4f0c}" relid="0x0" childrelidcntr="0x1">
-									<name>filter</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,560</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-00000159" kind="SetException" role="SetException" guid="{106b5a2c-d7e6-4cea-9a93-df7bd5ce260d}" relid="0x0" referred="id-0065-00000153">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>160,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-0000015a" kind="AttributeMember" role="AttributeMember" guid="{c71df672-bb1c-4913-8ed6-e0ddafb2d3bd}" relid="0x0" referred="id-0065-00000158">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-								<reference id="id-0067-0000015b" kind="RequiredRequestPort" role="RequiredRequestPort" guid="{3833a4bb-b7ac-4a39-aa65-c4c0e8bd36a3}" relid="0x1" referred="id-0065-00000151">
-									<name>filter_config</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,660</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="exclusiveProvider" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="exclusiveUser" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="multiple_connections">
-										<value>true</value>
-									</attribute>
-									<attribute kind="optional" status="meta">
-										<value>false</value>
-									</attribute>
-								</reference>
-								<reference id="id-0067-0000015c" kind="ProvidedRequestPort" role="ProvidedRequestPort" guid="{6c42a3a9-66e9-4e7c-9b8d-e9134cbc6f56}" relid="0x0" referred="id-0065-00000136">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,460</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="exclusiveProvider" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="exclusiveUser" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="optional" status="meta">
-										<value>false</value>
-									</attribute>
-								</reference>
-								<reference id="id-0067-0000015d" kind="RequiredRequestPort" role="RequiredRequestPort" guid="{a79437df-5339-40f8-854b-b46af2edaa40}" relid="0x0" referred="id-0065-000000e1">
-									<name>dds_entity</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,360</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="exclusiveProvider" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="exclusiveUser" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="multiple_connections">
-										<value>true</value>
-									</attribute>
-									<attribute kind="optional" status="meta">
-										<value>false</value>
-									</attribute>
-								</reference>
-								<reference id="id-0067-0000015e" kind="RequiredRequestPort" role="RequiredRequestPort" guid="{a1c754a8-c82b-44ad-b713-92e20eec5675}" relid="0x0" referred="id-0065-0000013b">
-									<name>data_control</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,160</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="exclusiveProvider" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="exclusiveUser" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="multiple_connections">
-										<value>true</value>
-									</attribute>
-									<attribute kind="optional" status="meta">
-										<value>false</value>
-									</attribute>
-								</reference>
-								<reference id="id-0067-0000037d" kind="ProvidedRequestPort" role="ProvidedRequestPort" guid="{394c2257-6520-4469-92e3-8d0f4f74fc01}" relid="0x0" referred="id-0065-00000170">
-									<name>data_listener</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,260</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="exclusiveProvider" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="exclusiveUser" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="optional" status="meta">
-										<value>false</value>
-									</attribute>
-								</reference>
-								<reference id="id-0067-0000037e" kind="RequiredRequestPort" role="RequiredRequestPort" guid="{61e2a992-3538-4606-a1d1-24a25f88ca5d}" relid="0x0" referred="id-0065-00000178">
-									<name>data</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="exclusiveProvider" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="exclusiveUser" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="multiple_connections">
-										<value>true</value>
-									</attribute>
-									<attribute kind="optional" status="meta">
-										<value>false</value>
-									</attribute>
-								</reference>
-							</model>
-							<model id="id-0065-00000165" kind="PortType" role="PortType" guid="{eec68a9a-758a-45d3-833f-c088cb078876}" relid="0xb" childrelidcntr="0x2">
-								<name>DDS_Get</name>
-								<attribute kind="PostPreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="PrePreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<model id="id-0065-00000166" kind="Attribute" role="Attribute" guid="{0f78654e-eb44-499d-9350-0839b4e63858}" relid="0x0" childrelidcntr="0x1">
-									<name>filter</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,460</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-0000015f" kind="SetException" role="SetException" guid="{af5c09aa-0e28-4795-b9ea-3279f4ed9630}" relid="0x0" referred="id-0065-00000153">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>160,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-00000160" kind="AttributeMember" role="AttributeMember" guid="{b0f3941f-2b7b-4b50-89bc-c464e1075e64}" relid="0x0" referred="id-0065-00000158">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-								<reference id="id-0067-00000161" kind="RequiredRequestPort" role="RequiredRequestPort" guid="{ac904120-1317-4dbb-b291-8fe317fa5f13}" relid="0x1" referred="id-0065-00000151">
-									<name>filter_config</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,560</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="exclusiveProvider" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="exclusiveUser" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="multiple_connections">
-										<value>true</value>
-									</attribute>
-									<attribute kind="optional" status="meta">
-										<value>false</value>
-									</attribute>
-								</reference>
-								<reference id="id-0067-00000162" kind="ProvidedRequestPort" role="ProvidedRequestPort" guid="{76519d1d-5f12-44f2-bb37-44aef358bf08}" relid="0x0" referred="id-0065-00000136">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,360</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="exclusiveProvider" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="exclusiveUser" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="optional" status="meta">
-										<value>false</value>
-									</attribute>
-								</reference>
-								<reference id="id-0067-00000163" kind="RequiredRequestPort" role="RequiredRequestPort" guid="{e04cbec6-6cd6-4218-990f-a887e7c3d456}" relid="0x0" referred="id-0065-000000e1">
-									<name>dds_entity</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,260</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="exclusiveProvider" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="exclusiveUser" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="multiple_connections">
-										<value>true</value>
-									</attribute>
-									<attribute kind="optional" status="meta">
-										<value>false</value>
-									</attribute>
-								</reference>
-								<reference id="id-0067-0000037f" kind="RequiredRequestPort" role="RequiredRequestPort" guid="{7f9aae18-cc60-49ac-9c64-e8677dc82db1}" relid="0x0" referred="id-0065-00000173">
-									<name>fresh_data</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,160</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="exclusiveProvider" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="exclusiveUser" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="multiple_connections">
-										<value>true</value>
-									</attribute>
-									<attribute kind="optional" status="meta">
-										<value>false</value>
-									</attribute>
-								</reference>
-								<reference id="id-0067-00000380" kind="RequiredRequestPort" role="RequiredRequestPort" guid="{5e75a6e7-bfbe-4d84-ac64-bbbdb4597a3a}" relid="0x0" referred="id-0065-00000178">
-									<name>data</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="exclusiveProvider" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="exclusiveUser" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="multiple_connections">
-										<value>true</value>
-									</attribute>
-									<attribute kind="optional" status="meta">
-										<value>false</value>
-									</attribute>
-								</reference>
-							</model>
-							<model id="id-0065-00000167" kind="PortType" role="PortType" guid="{3dddee43-c914-43c0-810a-ebcc47971a9d}" relid="0xa" childrelidcntr="0x2">
-								<name>DDS_Read</name>
-								<attribute kind="PostPreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="PrePreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<model id="id-0065-00000168" kind="Attribute" role="Attribute" guid="{5bf211cb-da7e-481a-a999-bc5c6c65993c}" relid="0x0" childrelidcntr="0x1">
-									<name>filter</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,360</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-00000164" kind="SetException" role="SetException" guid="{e4350f70-6dce-4fd6-a3ef-6b5df46e16fe}" relid="0x0" referred="id-0065-00000153">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>160,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-00000165" kind="AttributeMember" role="AttributeMember" guid="{aaf5cbf1-3594-4a38-b409-95bb4ad994ad}" relid="0x0" referred="id-0065-00000158">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-								<reference id="id-0067-00000166" kind="RequiredRequestPort" role="RequiredRequestPort" guid="{bb4a7c18-32e6-4393-b5ad-cbbdc1af1d08}" relid="0x1" referred="id-0065-00000151">
-									<name>filter_config</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,460</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="exclusiveProvider" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="exclusiveUser" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="multiple_connections">
-										<value>true</value>
-									</attribute>
-									<attribute kind="optional" status="meta">
-										<value>false</value>
-									</attribute>
-								</reference>
-								<reference id="id-0067-00000167" kind="ProvidedRequestPort" role="ProvidedRequestPort" guid="{96e30ab7-5c98-41ab-ae48-48d3c443c5e1}" relid="0x0" referred="id-0065-00000136">
-									<name>status</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,260</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="exclusiveProvider" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="exclusiveUser" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="optional" status="meta">
-										<value>false</value>
-									</attribute>
-								</reference>
-								<reference id="id-0067-00000168" kind="RequiredRequestPort" role="RequiredRequestPort" guid="{1525c918-c01b-482f-a278-b466237da990}" relid="0x0" referred="id-0065-000000e1">
-									<name>dds_entity</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,160</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="exclusiveProvider" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="exclusiveUser" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="multiple_connections">
-										<value>true</value>
-									</attribute>
-									<attribute kind="optional" status="meta">
-										<value>false</value>
-									</attribute>
-								</reference>
-								<reference id="id-0067-00000381" kind="RequiredRequestPort" role="RequiredRequestPort" guid="{4812a509-ba1f-4611-aa3b-1d20d3315187}" relid="0x0" referred="id-0065-00000178">
-									<name>data</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="exclusiveProvider" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="exclusiveUser" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="multiple_connections">
-										<value>true</value>
-									</attribute>
-									<attribute kind="optional" status="meta">
-										<value>false</value>
-									</attribute>
-								</reference>
-							</model>
-							<model id="id-0065-00000169" kind="PortType" role="PortType" guid="{619861da-4c85-4e91-b5fb-93ecabbb6911}" relid="0x9" childrelidcntr="0x1">
-								<name>DDS_Update</name>
-								<attribute kind="PostPreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="PrePreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-00000169" kind="RequiredRequestPort" role="RequiredRequestPort" guid="{3b2998ec-5de6-45bb-8c02-39d49bceee9d}" relid="0x0" referred="id-0065-000000f5">
-									<name>dds_entity</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,160</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="exclusiveProvider" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="exclusiveUser" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="multiple_connections">
-										<value>true</value>
-									</attribute>
-									<attribute kind="optional" status="meta">
-										<value>false</value>
-									</attribute>
-								</reference>
-								<reference id="id-0067-00000382" kind="RequiredRequestPort" role="RequiredRequestPort" guid="{6334db56-7834-4a77-9551-8e78c0fb870c}" relid="0x0" referred="id-0065-0000017e">
-									<name>data</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="exclusiveProvider" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="exclusiveUser" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="multiple_connections">
-										<value>true</value>
-									</attribute>
-									<attribute kind="optional" status="meta">
-										<value>false</value>
-									</attribute>
-								</reference>
-							</model>
-							<model id="id-0065-0000016a" kind="PortType" role="PortType" guid="{bf7f6820-3670-48c1-a350-fe275461d999}" relid="0x8" childrelidcntr="0x1">
-								<name>DDS_Write</name>
-								<attribute kind="PostPreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="PrePreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<reference id="id-0067-0000016a" kind="RequiredRequestPort" role="RequiredRequestPort" guid="{b8a368fc-cdb8-4419-9284-e9f121fd368c}" relid="0x0" referred="id-0065-000000f5">
-									<name>dds_entity</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,160</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="exclusiveProvider" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="exclusiveUser" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="multiple_connections">
-										<value>true</value>
-									</attribute>
-									<attribute kind="optional" status="meta">
-										<value>false</value>
-									</attribute>
-								</reference>
-								<reference id="id-0067-00000383" kind="RequiredRequestPort" role="RequiredRequestPort" guid="{cbd3c158-008a-494f-ae24-f5f3666759b9}" relid="0x0" referred="id-0065-00000187">
-									<name>data</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="exclusiveProvider" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="exclusiveUser" status="meta">
-										<value>false</value>
-									</attribute>
-									<attribute kind="multiple_connections">
-										<value>true</value>
-									</attribute>
-									<attribute kind="optional" status="meta">
-										<value>false</value>
-									</attribute>
-								</reference>
-							</model>
-							<model id="id-0065-0000016b" kind="Object" role="Object" guid="{25604677-e315-48da-a2b8-1b382b98f532}" relid="0x7" childrelidcntr="0x4">
-								<name>StateListener</name>
-								<attribute kind="InterfaceSemantics">
-									<value>local</value>
-								</attribute>
-								<attribute kind="PostPreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="PrePreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="PrefixTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<model id="id-0065-0000016c" kind="TwowayOperation" role="TwowayOperation" guid="{d013b562-3c78-426d-bce0-b6b180150028}" relid="0x3" childrelidcntr="0x1">
-									<name>on_deletion</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,360</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-0000016b" kind="InParameter" role="InParameter" guid="{3602e7ae-be1e-4ba2-b7a0-2cdad7239406}" relid="0x0" referred="id-0065-00000159">
-										<name>info</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>160,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-00000384" kind="InParameter" role="InParameter" guid="{65ac5876-8892-407c-accf-fd563e016a58}" relid="0x0" referred="id-0066-00000051">
-										<name>datum</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-								<model id="id-0065-0000016d" kind="TwowayOperation" role="TwowayOperation" guid="{cf530e97-b8da-4cd7-aa64-1361f9f7054e}" relid="0x2" childrelidcntr="0x1">
-									<name>on_many_updates</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,260</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-0000016c" kind="InParameter" role="InParameter" guid="{76d2a292-1e27-47f0-b329-db0d1c3d7d63}" relid="0x0" referred="id-0067-00000152">
-										<name>infos</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>160,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-00000385" kind="InParameter" role="InParameter" guid="{c7fcbef5-e941-4acb-8abd-3d5a8395e6fb}" relid="0x0" referred="id-0067-0000019f">
-										<name>data</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-								<model id="id-0065-0000016e" kind="TwowayOperation" role="TwowayOperation" guid="{de2eea24-bfb6-4b50-a248-71049b862d6f}" relid="0x1" childrelidcntr="0x1">
-									<name>on_one_update</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,160</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-0000016d" kind="InParameter" role="InParameter" guid="{57b4b0a1-44c5-41d2-aca7-a2f50070eead}" relid="0x0" referred="id-0065-00000159">
-										<name>info</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>160,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-00000386" kind="InParameter" role="InParameter" guid="{cb2395ef-477c-44c6-92b1-91c2b4b223f7}" relid="0x0" referred="id-0066-00000051">
-										<name>datum</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-								<model id="id-0065-0000016f" kind="TwowayOperation" role="TwowayOperation" guid="{028d00f7-5b8e-461b-8284-98e662135fe4}" relid="0x0" childrelidcntr="0x1">
-									<name>on_creation</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-0000016e" kind="InParameter" role="InParameter" guid="{ca1a067d-37e4-4f0b-8a49-529b420f6ee9}" relid="0x0" referred="id-0065-00000159">
-										<name>info</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>160,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-00000387" kind="InParameter" role="InParameter" guid="{e4c1f87d-4c5c-4a5d-8ebc-a93908c6e7a5}" relid="0x0" referred="id-0066-00000051">
-										<name>datum</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-							</model>
-							<model id="id-0065-00000170" kind="Object" role="Object" guid="{6250051f-0f23-46a4-84b2-6b44fc5782db}" relid="0x6" childrelidcntr="0x2">
-								<name>Listener</name>
-								<attribute kind="InterfaceSemantics">
-									<value>local</value>
-								</attribute>
-								<attribute kind="PostPreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="PrePreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="PrefixTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<model id="id-0065-00000171" kind="TwowayOperation" role="TwowayOperation" guid="{21fbe98c-805b-41dc-a052-c2e5b6bce679}" relid="0x1" childrelidcntr="0x1">
-									<name>on_many_data</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,160</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-0000016f" kind="InParameter" role="InParameter" guid="{84537cd4-be78-4b29-9e66-98e28837a6ea}" relid="0x0" referred="id-0067-00000152">
-										<name>infos</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>160,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-00000388" kind="InParameter" role="InParameter" guid="{dbfd6cdc-9219-4b29-bb1a-e91da13dc31a}" relid="0x0" referred="id-0067-0000019f">
-										<name>data</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-								<model id="id-0065-00000172" kind="TwowayOperation" role="TwowayOperation" guid="{ccd1e971-4e02-49f3-ae51-fd2cc9c351ed}" relid="0x0" childrelidcntr="0x1">
-									<name>on_one_data</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-00000170" kind="InParameter" role="InParameter" guid="{41dcc038-4baa-45af-b5ff-e2ca817eb149}" relid="0x0" referred="id-0065-00000159">
-										<name>info</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>160,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-00000389" kind="InParameter" role="InParameter" guid="{7a78080c-3b7c-46e2-8cbc-f5bd78abdb0e}" relid="0x0" referred="id-0066-00000051">
-										<name>datum</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-							</model>
-							<model id="id-0065-00000173" kind="Object" role="Object" guid="{4e697921-f915-4dcc-91fc-489f76ea9a82}" relid="0x5" childrelidcntr="0x4">
-								<name>Getter</name>
-								<attribute kind="InterfaceSemantics">
-									<value>local</value>
-								</attribute>
-								<attribute kind="PostPreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="PrePreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="PrefixTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<model id="id-0065-00000174" kind="Attribute" role="Attribute" guid="{06f018e7-9d1a-49ed-acb5-f28f1b79f1c7}" relid="0x3" childrelidcntr="0x1">
-									<name>max_delivered_data</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,360</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-00000171" kind="AttributeMember" role="AttributeMember" guid="{b689cc61-d959-414b-9307-709982762a1d}" relid="0x0" referred="id-0067-00000151">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-								<model id="id-0065-00000175" kind="Attribute" role="Attribute" guid="{1e6a1ff3-f4d2-4e19-966b-d94e9d7d91db}" relid="0x2" childrelidcntr="0x1">
-									<name>time_out</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,260</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-00000172" kind="AttributeMember" role="AttributeMember" guid="{8bb061eb-7eb2-422e-8970-0328d48c7286}" relid="0x0" referred="id-0065-0000012e">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-								<model id="id-0065-00000176" kind="TwowayOperation" role="TwowayOperation" guid="{24b3532a-b438-49bc-a36b-40b6d0bb3e7a}" relid="0x1" childrelidcntr="0x1">
-									<name>get_many</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,160</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-00000173" kind="ExceptionRef" role="ExceptionRef" guid="{e4c3692f-190e-4f31-8e9f-00d740adb36a}" relid="0x0" referred="id-0065-00000154">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>360,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-00000174" kind="InoutParameter" role="InoutParameter" guid="{7a774978-975a-4ad0-9a75-f6b75fb58374}" relid="0x0" referred="id-0067-00000152">
-										<name>infos</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>260,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-00000175" kind="ReturnType" role="ReturnType" guid="{bee572a0-8c5f-47a5-8b5a-541311ce3bdf}" relid="0x0" referred="id-0066-0000002f">
-										<name>ReturnType</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-0000038a" kind="InoutParameter" role="InoutParameter" guid="{b3b72284-6df7-4267-9ed5-2733b7035e46}" relid="0x0" referred="id-0067-0000019f">
-										<name>data</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>160,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-								<model id="id-0065-00000177" kind="TwowayOperation" role="TwowayOperation" guid="{bf64b05a-ab7e-4060-bc7c-af69eee2c826}" relid="0x0" childrelidcntr="0x1">
-									<name>get_one</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-00000176" kind="ExceptionRef" role="ExceptionRef" guid="{caef1103-880d-4e62-8dc3-dbb59d376a2c}" relid="0x0" referred="id-0065-00000154">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>360,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-00000177" kind="OutParameter" role="OutParameter" guid="{08ee158f-0d69-4c00-bcfd-eecdf17e21c4}" relid="0x0" referred="id-0065-00000159">
-										<name>info</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>260,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-00000178" kind="ReturnType" role="ReturnType" guid="{339639f5-9e87-4fb1-931d-bb0d1b40c3e7}" relid="0x0" referred="id-0066-0000002f">
-										<name>ReturnType</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-0000038b" kind="OutParameter" role="OutParameter" guid="{c5253db0-34fd-4107-966a-2a36bad3fc2b}" relid="0x0" referred="id-0066-00000051">
-										<name>datum</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>160,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-							</model>
-							<model id="id-0065-00000178" kind="Object" role="Object" guid="{fbaae8e6-f7e9-44c0-a2d8-23c772e7e80f}" relid="0x4" childrelidcntr="0x5">
-								<name>Reader</name>
-								<attribute kind="InterfaceSemantics">
-									<value>local</value>
-								</attribute>
-								<attribute kind="PostPreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="PrePreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="PrefixTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<model id="id-0065-00000179" kind="Attribute" role="Attribute" guid="{4e4d040f-210e-4478-a09c-0e616a3cbb37}" relid="0x4" childrelidcntr="0x1">
-									<name>query</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,460</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-00000179" kind="SetException" role="SetException" guid="{e7510491-305f-4e28-83de-378dd549b65e}" relid="0x0" referred="id-0065-00000154">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>160,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-0000017a" kind="AttributeMember" role="AttributeMember" guid="{e52d1685-755d-4ad3-9983-6c33af87848e}" relid="0x0" referred="id-0065-00000158">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-								<model id="id-0065-0000017a" kind="TwowayOperation" role="TwowayOperation" guid="{9d4c9094-2e65-4998-837d-853704667ed7}" relid="0x3" childrelidcntr="0x1">
-									<name>read_one_all</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,360</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-0000017b" kind="ExceptionRef" role="ExceptionRef" guid="{0267af8d-e264-4a6b-b8ef-93af18391f02}" relid="0x0" referred="id-0065-00000154">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>560,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-0000017c" kind="ExceptionRef" role="ExceptionRef" guid="{05dcdca9-f31c-4606-b538-c93caf965ba2}" relid="0x0" referred="id-0065-00000155">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>460,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-0000017d" kind="InParameter" role="InParameter" guid="{7e0af45b-784f-4c63-9f38-bc5b076d395e}" relid="0x0" referred="id-0067-00000020">
-										<name>instance_handle</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>360,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-0000017e" kind="InoutParameter" role="InoutParameter" guid="{7c0fb1d1-b030-4a03-bd3c-cdf2cd1cd5a5}" relid="0x0" referred="id-0067-00000152">
-										<name>infos</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>260,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-0000038c" kind="InoutParameter" role="InoutParameter" guid="{51e5a25b-df5e-4ac0-87e3-ec768a239f35}" relid="0x0" referred="id-0067-0000019f">
-										<name>data</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>160,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-0000038d" kind="InParameter" role="InParameter" guid="{bef80ff6-3ee7-440a-ab11-b28cb887ba9c}" relid="0x0" referred="id-0066-00000051">
-										<name>datum</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-								<model id="id-0065-0000017b" kind="TwowayOperation" role="TwowayOperation" guid="{962a6c2b-4d26-4297-955b-f5fe7ce399ec}" relid="0x2" childrelidcntr="0x1">
-									<name>read_one_last</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,260</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-0000017f" kind="ExceptionRef" role="ExceptionRef" guid="{5b88a936-0604-4801-84a1-9af6bac59f5a}" relid="0x0" referred="id-0065-00000154">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>460,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-00000180" kind="ExceptionRef" role="ExceptionRef" guid="{10b9d7e0-3a2c-4373-a218-8d82a3d20af2}" relid="0x0" referred="id-0065-00000155">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>360,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-00000181" kind="InParameter" role="InParameter" guid="{485e3452-096b-45cd-aed9-17b92c1d2418}" relid="0x0" referred="id-0067-00000020">
-										<name>instance_handle</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>260,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-00000182" kind="OutParameter" role="OutParameter" guid="{0cbc06f2-3bd6-4dac-9375-c6fc7fb0bacc}" relid="0x0" referred="id-0065-00000159">
-										<name>info</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>160,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-0000038e" kind="InoutParameter" role="InoutParameter" guid="{bf72e9ae-e767-4a3f-9b71-25d90d3347e5}" relid="0x0" referred="id-0066-00000051">
-										<name>datum</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-								<model id="id-0065-0000017c" kind="TwowayOperation" role="TwowayOperation" guid="{d5f05976-af23-4514-8d05-cb38cf76944c}" relid="0x1" childrelidcntr="0x1">
-									<name>read_all</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,160</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-00000183" kind="ExceptionRef" role="ExceptionRef" guid="{5debda2b-712e-4ac1-9802-7c7fddd419a3}" relid="0x0" referred="id-0065-00000154">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>260,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-00000184" kind="InoutParameter" role="InoutParameter" guid="{b92ab869-0388-49dc-9a84-f093613a8098}" relid="0x0" referred="id-0067-00000152">
-										<name>infos</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>160,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-0000038f" kind="InoutParameter" role="InoutParameter" guid="{ea094b3f-dd2f-4827-ae5e-5e6e0144ee8c}" relid="0x0" referred="id-0067-0000019f">
-										<name>data</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-								<model id="id-0065-0000017d" kind="TwowayOperation" role="TwowayOperation" guid="{9c80ff59-7621-4f27-8b70-09686b72e054}" relid="0x0" childrelidcntr="0x1">
-									<name>read_last</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-00000185" kind="ExceptionRef" role="ExceptionRef" guid="{10375f16-b46e-4ff3-895d-8b43cf7e4c22}" relid="0x0" referred="id-0065-00000154">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>260,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-00000186" kind="InoutParameter" role="InoutParameter" guid="{93632f7b-130a-420b-8dbb-b2ae03eda7dd}" relid="0x0" referred="id-0067-00000152">
-										<name>infos</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>160,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-00000390" kind="InoutParameter" role="InoutParameter" guid="{9c922906-3e03-4154-bc7c-130c56a1f5fb}" relid="0x0" referred="id-0067-0000019f">
-										<name>data</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-							</model>
-							<model id="id-0065-0000017e" kind="Object" role="Object" guid="{66f2b8ec-262f-4de9-8f85-47d751509c36}" relid="0x3" childrelidcntr="0x9">
-								<name>Updater</name>
-								<attribute kind="InterfaceSemantics">
-									<value>local</value>
-								</attribute>
-								<attribute kind="PostPreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="PrePreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="PrefixTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<model id="id-0065-0000017f" kind="Attribute" role="Attribute" guid="{94b21c7e-dfd6-4f18-97d2-6441336af003}" relid="0x7" childrelidcntr="0x1">
-									<name>is_coherent_write</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,760</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-00000187" kind="AttributeMember" role="AttributeMember" guid="{9e483357-6b07-4e20-b357-efb37fcd53e3}" relid="0x0" referred="id-0066-0000002f">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-								<model id="id-0065-00000180" kind="ReadonlyAttribute" role="ReadonlyAttribute" guid="{10fafe01-6de0-4ece-b0d3-fe89ef7f4835}" relid="0x6" childrelidcntr="0x1">
-									<name>is_global_scope</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,660</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-00000188" kind="AttributeMember" role="AttributeMember" guid="{87a9c6ed-1501-4c88-a20d-2feae9cde5b1}" relid="0x0" referred="id-0066-0000002f">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-								<model id="id-0065-00000181" kind="TwowayOperation" role="TwowayOperation" guid="{813df944-1459-43e8-bbc8-88acc57a1fa5}" relid="0x5" childrelidcntr="0x1">
-									<name>delete_many</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,560</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-00000189" kind="ExceptionRef" role="ExceptionRef" guid="{b524aac1-b976-40f9-a64f-2d4ddfa61438}" relid="0x0" referred="id-0065-00000154">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>260,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-0000018a" kind="ExceptionRef" role="ExceptionRef" guid="{5e770cfe-e15a-4a80-99fa-3e0406d7acf9}" relid="0x0" referred="id-0065-00000155">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>160,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-00000391" kind="InParameter" role="InParameter" guid="{e8ca1bc7-caab-440e-b1fa-3201e467791e}" relid="0x0" referred="id-0067-0000019f">
-										<name>data</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-								<model id="id-0065-00000182" kind="TwowayOperation" role="TwowayOperation" guid="{95bde85e-e757-49b2-a908-a83f2c188fbd}" relid="0x4" childrelidcntr="0x1">
-									<name>update_many</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,460</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-0000018b" kind="ExceptionRef" role="ExceptionRef" guid="{d06d9371-0088-4dd8-9752-a18b3063c69b}" relid="0x0" referred="id-0065-00000154">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>260,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-0000018c" kind="ExceptionRef" role="ExceptionRef" guid="{379470f8-0040-4e10-b8a6-8fa2b34fddf9}" relid="0x0" referred="id-0065-00000155">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>160,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-00000392" kind="InParameter" role="InParameter" guid="{8caec0b7-d5fe-4556-9b87-15dc20896ff8}" relid="0x0" referred="id-0067-0000019f">
-										<name>data</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-								<model id="id-0065-00000183" kind="TwowayOperation" role="TwowayOperation" guid="{cb8e328d-38a4-4f2a-b717-8d8374d68daf}" relid="0x3" childrelidcntr="0x1">
-									<name>create_many</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,360</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-0000018d" kind="ExceptionRef" role="ExceptionRef" guid="{b7b7c6d5-bc8e-4fd3-bd58-45cbf201756e}" relid="0x0" referred="id-0065-00000154">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>260,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-0000018e" kind="ExceptionRef" role="ExceptionRef" guid="{02de4bb7-fa93-4aa6-ab0e-d1e6286f4dec}" relid="0x0" referred="id-0065-00000156">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>160,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-00000393" kind="InParameter" role="InParameter" guid="{7256c665-bf07-4a9c-ab2a-256e4f3c50f2}" relid="0x0" referred="id-0067-0000019f">
-										<name>data</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-								<model id="id-0065-00000184" kind="TwowayOperation" role="TwowayOperation" guid="{f537077f-f387-4192-8a26-5596277a3f2a}" relid="0x2" childrelidcntr="0x1">
-									<name>delete_one</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,260</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-0000018f" kind="ExceptionRef" role="ExceptionRef" guid="{f530443c-3e1b-4ad5-95ed-cd0eb0573d2a}" relid="0x0" referred="id-0065-00000154">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>360,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-00000190" kind="ExceptionRef" role="ExceptionRef" guid="{c27b475f-efca-4407-9a21-7f4285994efb}" relid="0x0" referred="id-0065-00000155">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>260,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-00000191" kind="InParameter" role="InParameter" guid="{5b50bc69-f23a-4111-9846-c32dd6f9815a}" relid="0x0" referred="id-0067-00000020">
-										<name>instance_handle</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>160,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-00000394" kind="InParameter" role="InParameter" guid="{4a256ca6-114e-400d-8770-c41736da19d8}" relid="0x0" referred="id-0066-00000051">
-										<name>datum</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-								<model id="id-0065-00000185" kind="TwowayOperation" role="TwowayOperation" guid="{f66c8596-6cc6-4cbf-ae36-721f1bf0480e}" relid="0x1" childrelidcntr="0x1">
-									<name>update_one</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,160</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-00000192" kind="ExceptionRef" role="ExceptionRef" guid="{1943cc4b-c1e0-44c4-abda-6e7414de060f}" relid="0x0" referred="id-0065-00000154">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>360,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-00000193" kind="ExceptionRef" role="ExceptionRef" guid="{ef9152da-cdfc-4865-a315-ed95202698fe}" relid="0x0" referred="id-0065-00000155">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>260,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-00000194" kind="InParameter" role="InParameter" guid="{7df5fc97-60cf-4d88-8700-f566ecbcc8bb}" relid="0x0" referred="id-0067-00000020">
-										<name>instance_handle</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>160,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-00000395" kind="InParameter" role="InParameter" guid="{5d7dad55-48e4-4a8a-bf93-a2f306a04cdb}" relid="0x0" referred="id-0066-00000051">
-										<name>datum</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-								<model id="id-0065-00000186" kind="TwowayOperation" role="TwowayOperation" guid="{6cb43fd0-0169-4d67-b9c6-824a1f499f8e}" relid="0x0" childrelidcntr="0x1">
-									<name>create_one</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-00000195" kind="ExceptionRef" role="ExceptionRef" guid="{7864288f-9093-48f9-bb10-60ebe95e73ca}" relid="0x0" referred="id-0065-00000154">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>260,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-00000196" kind="ExceptionRef" role="ExceptionRef" guid="{1cd4fb1d-7e9b-48c2-b941-cd533753fc27}" relid="0x0" referred="id-0065-00000156">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>160,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-00000396" kind="InParameter" role="InParameter" guid="{38e44026-f094-4559-9f59-4866d65c2e57}" relid="0x0" referred="id-0066-00000051">
-										<name>datum</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-								<reference id="id-0067-00000397" kind="Inherits" role="Inherits" guid="{43974de2-add7-4185-afb2-14c0c6ce5460}" relid="0x8" referred="id-0065-0000018b">
-									<name>Inherits</name>
-								</reference>
-							</model>
-							<model id="id-0065-00000187" kind="Object" role="Object" guid="{6354d461-c223-4732-a44a-6994bbc2400c}" relid="0x2" childrelidcntr="0x4">
-								<name>Writer</name>
-								<attribute kind="InterfaceSemantics">
-									<value>local</value>
-								</attribute>
-								<attribute kind="PostPreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="PrePreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="PrefixTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<model id="id-0065-00000188" kind="Attribute" role="Attribute" guid="{325bb065-4fba-4e0b-b9cd-e71d659f8c91}" relid="0x2" childrelidcntr="0x1">
-									<name>is_coherent_write</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,260</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-00000197" kind="AttributeMember" role="AttributeMember" guid="{dcaf8484-6535-4f33-882f-fae5f083fbc8}" relid="0x0" referred="id-0066-0000002f">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-								<model id="id-0065-00000189" kind="TwowayOperation" role="TwowayOperation" guid="{fc0a0deb-7c8b-45d9-ac99-98465ecc30e7}" relid="0x1" childrelidcntr="0x1">
-									<name>write_many</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,160</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-00000198" kind="ExceptionRef" role="ExceptionRef" guid="{47f91bb8-abf7-4b0d-a96c-00d0379e9636}" relid="0x0" referred="id-0065-00000154">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>160,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-00000398" kind="InParameter" role="InParameter" guid="{b96601ec-2773-418a-8d88-4ccb0a1e455e}" relid="0x0" referred="id-0067-0000019f">
-										<name>data</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-								<model id="id-0065-0000018a" kind="TwowayOperation" role="TwowayOperation" guid="{762b9f68-9fca-4e2d-bf86-c03de77cdad1}" relid="0x0" childrelidcntr="0x1">
-									<name>write_one</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-00000199" kind="ExceptionRef" role="ExceptionRef" guid="{3848e2f2-a990-45be-a164-14edae3f0ec0}" relid="0x0" referred="id-0065-00000154">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>260,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-0000019a" kind="InParameter" role="InParameter" guid="{1c7934af-9cce-4084-9f1a-e2fa632bde07}" relid="0x0" referred="id-0067-00000020">
-										<name>instance_handle</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>160,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-00000399" kind="InParameter" role="InParameter" guid="{39d3f530-7b40-40a5-a378-2c0859e5308e}" relid="0x0" referred="id-0066-00000051">
-										<name>datum</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-								<reference id="id-0067-0000039a" kind="Inherits" role="Inherits" guid="{7f8ce04c-e7fa-4476-8cda-4f3917f455dc}" relid="0x3" referred="id-0065-0000018b">
-									<name>Inherits</name>
-								</reference>
-							</model>
-							<model id="id-0065-0000018b" kind="Object" role="Object" guid="{31f0e62f-0265-4cf5-b71d-5990577117be}" relid="0x1" childrelidcntr="0x2">
-								<name>InstanceHandleManager</name>
-								<attribute kind="InterfaceSemantics">
-									<value>local</value>
-								</attribute>
-								<attribute kind="PostPreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="PrePreprocessorDirectives" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="PrefixTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="SpecifyIdTag" status="meta">
-									<value></value>
-								</attribute>
-								<attribute kind="VersionTag" status="meta">
-									<value></value>
-								</attribute>
-								<model id="id-0065-0000018c" kind="TwowayOperation" role="TwowayOperation" guid="{45fd16b9-8789-4bf2-b463-9fdb00d2c384}" relid="0x1" childrelidcntr="0x1">
-									<name>unregister_instance</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,160</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-0000019b" kind="ExceptionRef" role="ExceptionRef" guid="{9075612e-91a1-421c-9bee-841dd0fffe72}" relid="0x0" referred="id-0065-00000154">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>260,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-0000019c" kind="InParameter" role="InParameter" guid="{684865be-9ec3-4cf2-800c-def69ba0ecc5}" relid="0x0" referred="id-0067-00000020">
-										<name>instance_handle</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>160,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-0000039b" kind="InParameter" role="InParameter" guid="{ac8c14ed-8e35-425b-8cf2-a6f5ba489e97}" relid="0x0" referred="id-0066-00000051">
-										<name>datum</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-								<model id="id-0065-0000018d" kind="TwowayOperation" role="TwowayOperation" guid="{92ba42fc-d09f-4927-b1cf-1e3ffa873740}" relid="0x0" childrelidcntr="0x1">
-									<name>register_instance</name>
-									<regnode name="PartRegs" isopaque="yes">
-										<value></value>
-										<regnode name="InterfaceDefinition" isopaque="yes">
-											<value></value>
-											<regnode name="Position" isopaque="yes">
-												<value>60,60</value>
-											</regnode>
-										</regnode>
-									</regnode>
-									<attribute kind="SpecifyIdTag" status="meta">
-										<value></value>
-									</attribute>
-									<attribute kind="VersionTag" status="meta">
-										<value></value>
-									</attribute>
-									<reference id="id-0067-0000019d" kind="ExceptionRef" role="ExceptionRef" guid="{fd5c661f-a1b2-4762-9415-bbdf2d17fce7}" relid="0x0" referred="id-0065-00000154">
-										<name></name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>260,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-0000019e" kind="ReturnType" role="ReturnType" guid="{74c76ece-44ea-43ef-ba15-87a7d8f07e97}" relid="0x0" referred="id-0067-00000020">
-										<name>ReturnType</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>60,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-									<reference id="id-0067-0000039c" kind="InParameter" role="InParameter" guid="{a4ab3f39-b211-43b3-83d9-4fcfedf38985}" relid="0x0" referred="id-0066-00000051">
-										<name>datum</name>
-										<regnode name="PartRegs" isopaque="yes">
-											<value></value>
-											<regnode name="InterfaceDefinition" isopaque="yes">
-												<value></value>
-												<regnode name="Position" isopaque="yes">
-													<value>160,60</value>
-												</regnode>
-											</regnode>
-										</regnode>
-									</reference>
-								</model>
-							</model>
-							<atom id="id-0066-00000051" kind="NameParameter" role="NameParameter" guid="{f7eae334-9a8a-46fa-859b-a1306b0f717c}" relid="0x0">
-								<name>T</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="TemplateParameters" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>60,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</atom>
-							<reference id="id-0067-0000019f" kind="CollectionParameter" role="CollectionParameter" guid="{4a4d7fb8-c4c9-4bce-934f-302e9df8fa56}" relid="0x1" referred="id-0066-00000051">
-								<name>TSeq</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="TemplateParameters" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>160,60</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-					</model>
-				</model>
-			</folder>
-		</folder>
-	</folder>
-</project>
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/models/Shapes.xme b/CIAO/connectors/dds4ccm/examples/Shapes/models/Shapes.xme
deleted file mode 100644
index c9e43290a4a..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Shapes/models/Shapes.xme
+++ /dev/null
@@ -1,37085 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<!DOCTYPE project SYSTEM "mga.dtd">
-<project cdate="Mon Jun 21 00:30:00 2010" guid="{5BEAF782-1D7C-43EE-8A29-B331FF20C64C}" mdate="Tue Jun 22 11:50:21 2010" metaguid="{DE73FCDF-2F13-4435-AEBF-356CAAF1F554}" metaname="PICML" metaversion="" version="">
-
-  <name>Shapes</name>
-
-  <comment/>
-
-  <author/>
-
-  <folder childrelidcntr="0x4" guid="{3d854909-0e99-48e1-b89f-1845a1a5ff24}" id="id-006a-00000001" kind="RootFolder" relid="0x1">
-    <name>Shapes</name>
-    <folder childrelidcntr="0xa" guid="{f1c46923-5c7b-488a-ab07-508364c852e6}" id="id-006a-00000002" kind="InterfaceDefinitions" relid="0x0">
-      <name>InterfaceDefinitions</name>
-      <model childrelidcntr="0x3" guid="{5bcab75b-6c6c-4c99-a889-8a8ca205ef79}" id="id-0065-00000001" kind="File" relid="0x0">
-        <name>Shapes_Base</name>
-        <attribute kind="Path">
-          <value>Base</value>
-        </attribute>
-        <attribute kind="PostPreprocessorDirectives" status="meta">
-          <value/>
-        </attribute>
-        <attribute kind="PrePreprocessorDirectives" status="meta">
-          <value/>
-        </attribute>
-        <attribute kind="PrefixTag" status="meta">
-          <value/>
-        </attribute>
-        <model childrelidcntr="0x5" guid="{c0b1c88c-d145-4d06-8384-42db90c9b3c0}" id="id-0065-00000002" kind="Aggregate" relid="0x0" role="Aggregate">
-          <name>ShapeType</name>
-          <attribute kind="PostPreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrePreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="SpecifyIdTag" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="VersionTag" status="meta">
-            <value/>
-          </attribute>
-          <reference guid="{e8acfd4e-1814-46d5-b3bc-6ee60b3d435e}" id="id-0067-000000ad" kind="Member" referred="id-0066-00000019" relid="0x0" role="Member">
-            <name>color</name>
-            <regnode isopaque="yes" name="PartRegs">
-              <value/>
-              <regnode isopaque="yes" name="InterfaceDefinition">
-                <value/>
-                <regnode isopaque="yes" name="Position">
-                  <value>60,60</value>
-                </regnode>
-              </regnode>
-            </regnode>
-          </reference>
-          <reference guid="{2586cc41-f969-4180-8252-ffcdbf5fe8c5}" id="id-0067-000000ae" kind="Member" referred="id-0066-0000000e" relid="0x0" role="Member">
-            <name>x</name>
-            <regnode isopaque="yes" name="PartRegs">
-              <value/>
-              <regnode isopaque="yes" name="InterfaceDefinition">
-                <value/>
-                <regnode isopaque="yes" name="Position">
-                  <value>60,160</value>
-                </regnode>
-              </regnode>
-            </regnode>
-          </reference>
-          <reference guid="{7aa7b805-3c0e-4bc6-b2ae-24a37247fee1}" id="id-0067-000000af" kind="Member" referred="id-0066-0000000e" relid="0x0" role="Member">
-            <name>y</name>
-            <regnode isopaque="yes" name="PartRegs">
-              <value/>
-              <regnode isopaque="yes" name="InterfaceDefinition">
-                <value/>
-                <regnode isopaque="yes" name="Position">
-                  <value>60,260</value>
-                </regnode>
-              </regnode>
-            </regnode>
-          </reference>
-          <reference guid="{a283bbfd-e97c-49d4-823c-5fd6e36a6e43}" id="id-0067-000000b0" kind="Member" referred="id-0066-0000000e" relid="0x0" role="Member">
-            <name>shapesize</name>
-            <regnode isopaque="yes" name="PartRegs">
-              <value/>
-              <regnode isopaque="yes" name="InterfaceDefinition">
-                <value/>
-                <regnode isopaque="yes" name="Position">
-                  <value>60,360</value>
-                </regnode>
-              </regnode>
-            </regnode>
-          </reference>
-          <atom id="id-0066-00000068" kind="Key" relid="0x3" role="Key">
-            <name>Key</name>
-          </atom>
-          <connection id="id-0068-0000000a" kind="KeyMember" relid="0x4" role="KeyMember">
-            <name></name>
-            <connpoint role="src" target="id-0066-00000068"/>
-            <connpoint role="dst" target="id-0067-000000ad"/>
-          </connection>
-        </model>
-        <model childrelidcntr="0x7" guid="{e9ce625d-eca7-4fe9-ad19-7a4f7cfa12df}" id="id-0065-00000003" kind="Aggregate" relid="0x1" role="Aggregate">
-          <name>Attributes</name>
-          <attribute kind="PostPreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrePreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="SpecifyIdTag" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="VersionTag" status="meta">
-            <value/>
-          </attribute>
-          <reference guid="{2da91ef5-16a1-40ac-8354-8017ffb51f67}" id="id-0067-000000b1" kind="Member" referred="id-0066-00000019" relid="0x0" role="Member">
-            <name>shape</name>
-            <regnode isopaque="yes" name="PartRegs">
-              <value/>
-              <regnode isopaque="yes" name="InterfaceDefinition">
-                <value/>
-                <regnode isopaque="yes" name="Position">
-                  <value>60,60</value>
-                </regnode>
-              </regnode>
-            </regnode>
-          </reference>
-          <reference guid="{3eab7993-5cb2-4b48-aac9-f712f8007368}" id="id-0067-000000b2" kind="Member" referred="id-0066-00000019" relid="0x0" role="Member">
-            <name>color</name>
-            <regnode isopaque="yes" name="PartRegs">
-              <value/>
-              <regnode isopaque="yes" name="InterfaceDefinition">
-                <value/>
-                <regnode isopaque="yes" name="Position">
-                  <value>60,160</value>
-                </regnode>
-              </regnode>
-            </regnode>
-          </reference>
-          <reference guid="{8bfd1850-7257-4c21-8d97-e7ede49c17f1}" id="id-0067-000000b3" kind="Member" referred="id-0066-00000013" relid="0x0" role="Member">
-            <name>speed</name>
-            <regnode isopaque="yes" name="PartRegs">
-              <value/>
-              <regnode isopaque="yes" name="InterfaceDefinition">
-                <value/>
-                <regnode isopaque="yes" name="Position">
-                  <value>60,260</value>
-                </regnode>
-              </regnode>
-            </regnode>
-          </reference>
-          <atom id="id-0066-00000069" kind="Key" relid="0x4" role="Key">
-            <name>Key</name>
-          </atom>
-          <connection id="id-0068-0000000b" kind="KeyMember" relid="0x5" role="KeyMember">
-            <name></name>
-            <connpoint role="src" target="id-0066-00000069"/>
-            <connpoint role="dst" target="id-0067-000000b1"/>
-          </connection>
-          <connection id="id-0068-0000000c" kind="KeyMember" relid="0x6" role="KeyMember">
-            <name></name>
-            <connpoint role="src" target="id-0066-00000069"/>
-            <connpoint role="dst" target="id-0067-000000b2"/>
-          </connection>
-        </model>
-        <reference guid="{a6a5053c-3b7b-4216-b7da-c2523d6b88b4}" id="id-0067-00000001" kind="Collection" referred="id-0065-00000002" relid="0x2" role="Collection">
-          <name>ShapeTypeSeq</name>
-          <attribute kind="PostPreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrePreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="SpecifyIdTag" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="VersionTag" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="bound" status="meta">
-            <value/>
-          </attribute>
-        </reference>
-      </model>
-      <model childrelidcntr="0x1" guid="{dab3ed99-dd53-470a-a14c-4d48b3377ed2}" id="id-0065-00000004" kind="File" relid="0x1">
-        <name>Shapes_Connector</name>
-        <attribute kind="Path">
-          <value>Connector</value>
-        </attribute>
-        <attribute kind="PostPreprocessorDirectives" status="meta">
-          <value/>
-        </attribute>
-        <attribute kind="PrePreprocessorDirectives" status="meta">
-          <value/>
-        </attribute>
-        <attribute kind="PrefixTag" status="meta">
-          <value/>
-        </attribute>
-        <model childrelidcntr="0x1" guid="{ea5e2133-bbdf-4f6b-88f9-2a5d808dd6de}" id="id-0065-00000005" kind="TemplatePackageInstance" relid="0x0" role="TemplatePackageInstance">
-          <name>Shapes</name>
-          <reference guid="{b1353e3a-87fc-4e74-bbd0-0960e009f0f4}" id="id-0067-00000002" kind="PackageType" referred="id-0065-00000149" relid="0x0" role="PackageType">
-            <name>PackageType</name>
-            <regnode isopaque="yes" name="PartRegs">
-              <value/>
-              <regnode isopaque="yes" name="TemplateParameters">
-                <value/>
-                <regnode isopaque="yes" name="Position">
-                  <value>60,60</value>
-                </regnode>
-              </regnode>
-            </regnode>
-          </reference>
-          <reference guid="{a05733be-9d8f-425d-9879-4da62b80d230}" id="id-0067-00000003" kind="TemplateParameterValue" referred="id-0065-00000002" relid="0x0" role="TemplateParameterValue">
-            <name>TemplateParameterValue</name>
-            <regnode isopaque="yes" name="PartRegs">
-              <value/>
-              <regnode isopaque="yes" name="TemplateParameters">
-                <value/>
-                <regnode isopaque="yes" name="Position">
-                  <value>160,60</value>
-                </regnode>
-              </regnode>
-            </regnode>
-          </reference>
-          <reference guid="{5096f61b-5336-43ad-a5e0-af3f650d26c6}" id="id-0067-00000004" kind="TemplateParameterValue" referred="id-0067-00000001" relid="0x0" role="TemplateParameterValue">
-            <name>TemplateParameterValue</name>
-            <regnode isopaque="yes" name="PartRegs">
-              <value/>
-              <regnode isopaque="yes" name="TemplateParameters">
-                <value/>
-                <regnode isopaque="yes" name="Position">
-                  <value>260,60</value>
-                </regnode>
-              </regnode>
-            </regnode>
-          </reference>
-        </model>
-      </model>
-      <model childrelidcntr="0x1" guid="{0707e4bd-c3b8-48cb-b281-288aa9ce9f93}" id="id-0065-00000006" kind="File" relid="0x3">
-        <name>Shapes_Receiver</name>
-        <attribute kind="Path">
-          <value>Receiver</value>
-        </attribute>
-        <attribute kind="PostPreprocessorDirectives" status="meta">
-          <value/>
-        </attribute>
-        <attribute kind="PrePreprocessorDirectives" status="meta">
-          <value/>
-        </attribute>
-        <attribute kind="PrefixTag" status="meta">
-          <value/>
-        </attribute>
-        <model childrelidcntr="0x1" guid="{8718b159-6b9f-448b-a595-23598708df01}" id="id-0065-00000007" kind="Package" relid="0x0" role="Package">
-          <name>Shapes</name>
-          <attribute kind="PostPreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrePreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrefixTag" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="SpecifyIdTag" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="VersionTag" status="meta">
-            <value/>
-          </attribute>
-          <model childrelidcntr="0x6" guid="{aed4d338-64c2-4203-a896-28cc53fa1509}" id="id-0065-00000008" kind="Component" relid="0x0" role="Component">
-            <name>Receiver</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="UUID">
-              <value>AA8C9DEE-7CED-11DF-8DCF-000C2958D27B</value>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="label" status="meta">
-              <value/>
-            </attribute>
-            <model childrelidcntr="0x1" guid="{eb899414-0ed3-4985-b29b-cf122a504a65}" id="id-0065-00000009" kind="Attribute" relid="0x0" role="Attribute">
-              <name>rate</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{4716c488-5b95-4fb8-b27e-1dfac196cd94}" id="id-0067-000000b4" kind="AttributeMember" referred="id-0066-00000011" relid="0x0" role="AttributeMember">
-                <name/>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{9eac8cc0-1636-4551-a603-dee30f64a1f1}" id="id-0065-0000000a" kind="Attribute" relid="0x1" role="Attribute">
-              <name>get_data</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{f39178cd-0b60-4d87-9b8a-5fde90d6c001}" id="id-0067-000000b5" kind="AttributeMember" referred="id-0066-00000009" relid="0x0" role="AttributeMember">
-                <name/>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{ea364bc0-b5a9-4ae2-9a58-e4f9a48fefec}" id="id-0065-0000000b" kind="Attribute" relid="0x2" role="Attribute">
-              <name>read_data</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{cdfdc5e5-49ae-420e-bcdb-d240ed36e6f7}" id="id-0067-000000b6" kind="AttributeMember" referred="id-0066-00000009" relid="0x0" role="AttributeMember">
-                <name/>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{cf6d4549-62a5-4853-938d-5744fe94ae01}" id="id-0065-0000000c" kind="Attribute" relid="0x3" role="Attribute">
-              <name>raw_listen</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{22bdb50e-2b28-4c89-ab40-afd218523f4b}" id="id-0067-000000b7" kind="AttributeMember" referred="id-0066-00000009" relid="0x0" role="AttributeMember">
-                <name/>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <reference guid="{a882aa1f-f8b6-458e-bfdd-801d9cb172ee}" id="id-0067-00000005" kind="ExtendedPort" referred="id-0065-0000014e" relid="0x0" role="ExtendedPort">
-              <name>info_out</name>
-            </reference>
-            <reference guid="{39232686-229d-43c3-a3d4-cc536a1bf5ab}" id="id-0067-00000006" kind="ExtendedPort" referred="id-0065-00000150" relid="0x0" role="ExtendedPort">
-              <name>info_get</name>
-            </reference>
-            <reference id="id-0067-00000706" kind="TemplatePackageInstanceRef" referred="id-0065-00000005" relid="0x4" role="TemplatePackageInstanceRef">
-              <name></name>
-            </reference>
-            <connection id="id-0068-00000000" kind="TemplatePackageInstanceDecl" relid="0x4" role="TemplatePackageInstanceDecl">
-              <name></name>
-              <connpoint role="src" target="id-0067-00000706"/>
-              <connpoint role="dst" target="id-0067-00000006"/>
-            </connection>
-            <connection id="id-0068-00000007" kind="TemplatePackageInstanceDecl" relid="0x5" role="TemplatePackageInstanceDecl">
-              <name></name>
-              <connpoint role="src" target="id-0067-00000706"/>
-              <connpoint role="dst" target="id-0067-00000005"/>
-            </connection>
-          </model>
-        </model>
-      </model>
-      <model childrelidcntr="0x1" guid="{e1d54357-0dc5-4eff-9a32-30b58c6397e0}" id="id-0065-0000000d" kind="File" relid="0x5">
-        <name>Shapes_Sender</name>
-        <attribute kind="Path">
-          <value>Sender</value>
-        </attribute>
-        <attribute kind="PostPreprocessorDirectives" status="meta">
-          <value/>
-        </attribute>
-        <attribute kind="PrePreprocessorDirectives" status="meta">
-          <value/>
-        </attribute>
-        <attribute kind="PrefixTag" status="meta">
-          <value/>
-        </attribute>
-        <model childrelidcntr="0x1" guid="{04046b87-217f-468a-8ba3-7ad0b187f59e}" id="id-0065-0000000e" kind="Package" relid="0x0" role="Package">
-          <name>Shapes</name>
-          <attribute kind="PostPreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrePreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrefixTag" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="SpecifyIdTag" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="VersionTag" status="meta">
-            <value/>
-          </attribute>
-          <model childrelidcntr="0x6" guid="{f03426be-618c-4f0b-9442-4a95d5944f29}" id="id-0065-0000000f" kind="Component" relid="0x0" role="Component">
-            <name>Sender</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="UUID">
-              <value>AA8C9DEE-7CED-11DF-8DD0-000C2958D27B</value>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="label" status="meta">
-              <value/>
-            </attribute>
-            <model childrelidcntr="0x1" guid="{61ef1595-6d99-4af2-aa0c-6e49088717a1}" id="id-0065-00000010" kind="Attribute" relid="0x0" role="Attribute">
-              <name>rate</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{09981da4-2433-4c77-b12d-62b256d3bec4}" id="id-0067-000000b8" kind="AttributeMember" referred="id-0066-00000011" relid="0x0" role="AttributeMember">
-                <name/>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{31a2d4b5-0fbc-4efe-b5c1-6ca46164a408}" id="id-0065-00000011" kind="Attribute" relid="0x1" role="Attribute">
-              <name>max_x</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{8e5b21b1-e5a5-443b-9b47-e221b797ff33}" id="id-0067-000000b9" kind="AttributeMember" referred="id-0066-00000010" relid="0x0" role="AttributeMember">
-                <name/>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{974d1d0e-8d98-47a0-9b92-2348611601d3}" id="id-0065-00000012" kind="Attribute" relid="0x2" role="Attribute">
-              <name>max_y</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{d963cfd1-3914-4695-9df7-8e7921dea287}" id="id-0067-000000ba" kind="AttributeMember" referred="id-0066-00000010" relid="0x0" role="AttributeMember">
-                <name/>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{42d76347-6ce0-4d06-974b-ae5d09e0c84a}" id="id-0065-00000013" kind="Attribute" relid="0x3" role="Attribute">
-              <name>max_size</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{f508c055-4d47-4092-ac37-544b35c73a37}" id="id-0067-000000bb" kind="AttributeMember" referred="id-0066-00000010" relid="0x0" role="AttributeMember">
-                <name/>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{8f083d5c-92ac-406b-a08e-4f56730c35a7}" id="id-0065-00000014" kind="Attribute" relid="0x4" role="Attribute">
-              <name>resize_shape</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{eadd1c61-ef06-4dda-ab25-ae2b8168303f}" id="id-0067-000000bc" kind="AttributeMember" referred="id-0066-00000009" relid="0x0" role="AttributeMember">
-                <name/>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <reference guid="{c4c419e8-0ec8-4c4f-aa05-ccaabb38d019}" id="id-0067-00000007" kind="ExtendedPort" referred="id-0065-00000155" relid="0x0" role="ExtendedPort">
-              <name>info_write</name>
-            </reference>
-            <reference id="id-0067-0000070d" kind="TemplatePackageInstanceRef" referred="id-0065-00000005" relid="0x5" role="TemplatePackageInstanceRef">
-              <name></name>
-            </reference>
-            <connection id="id-0068-00000008" kind="TemplatePackageInstanceDecl" relid="0x5" role="TemplatePackageInstanceDecl">
-              <name></name>
-              <connpoint role="src" target="id-0067-0000070d"/>
-              <connpoint role="dst" target="id-0067-00000007"/>
-            </connection>
-          </model>
-        </model>
-      </model>
-      <model childrelidcntr="0x3" id="id-0065-000002c0" kind="File" relid="0x7" role="File">
-        <name>Shapes_ConnectorE</name>
-        <attribute kind="Path">
-          <value>Connector</value>
-        </attribute>
-        <model childrelidcntr="0xb" id="id-0065-000002c3" kind="Package" relid="0x0" role="Package">
-          <name>Shapes</name>
-          <model childrelidcntr="0x0" id="id-0065-000002c4" kind="Object" relid="0x0" role="Object">
-            <name>CCM_InstanceHandleManager</name>
-            <attribute kind="InterfaceSemantics">
-              <value>local</value>
-            </attribute>
-          </model>
-          <model childrelidcntr="0x0" id="id-0065-000002c5" kind="Object" relid="0x1" role="Object">
-            <name>CCM_Writer</name>
-            <attribute kind="InterfaceSemantics">
-              <value>local</value>
-            </attribute>
-          </model>
-          <model childrelidcntr="0x0" id="id-0065-000002c6" kind="Object" relid="0x2" role="Object">
-            <name>CCM_Updater</name>
-            <attribute kind="InterfaceSemantics">
-              <value>local</value>
-            </attribute>
-          </model>
-          <model childrelidcntr="0x0" id="id-0065-000002c7" kind="Object" relid="0x3" role="Object">
-            <name>CCM_Reader</name>
-            <attribute kind="InterfaceSemantics">
-              <value>local</value>
-            </attribute>
-          </model>
-          <model childrelidcntr="0x0" id="id-0065-000002c8" kind="Object" relid="0x4" role="Object">
-            <name>CCM_Getter</name>
-            <attribute kind="InterfaceSemantics">
-              <value>local</value>
-            </attribute>
-          </model>
-          <model childrelidcntr="0x0" id="id-0065-000002c9" kind="Object" relid="0x5" role="Object">
-            <name>CCM_Listener</name>
-            <attribute kind="InterfaceSemantics">
-              <value>local</value>
-            </attribute>
-          </model>
-          <model childrelidcntr="0x0" id="id-0065-000002ca" kind="Object" relid="0x6" role="Object">
-            <name>CCM_StateListener</name>
-            <attribute kind="InterfaceSemantics">
-              <value>local</value>
-            </attribute>
-          </model>
-          <model childrelidcntr="0x15" id="id-0065-000002cb" kind="Object" relid="0x7" role="Object">
-            <name>CCM_DDS_State</name>
-            <attribute kind="InterfaceSemantics">
-              <value>local</value>
-            </attribute>
-            <model childrelidcntr="0x1" id="id-0065-000002cc" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-              <name>get_observable_data</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006be" kind="ReturnType" referred="id-0065-000002c6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" id="id-0065-000002cd" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-              <name>get_observable_dds_entity</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006bf" kind="ReturnType" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" id="id-0065-000002ce" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-              <name>get_passive_observer_data</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006c0" kind="ReturnType" referred="id-0065-000002c7" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" id="id-0065-000002cf" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-              <name>get_passive_observer_dds_entity</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,360</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006c1" kind="ReturnType" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" id="id-0065-000002d0" kind="Attribute" relid="0x4" role="Attribute">
-              <name>passive_observer_filter</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,460</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006c2" kind="AttributeMember" referred="id-0065-00000143" relid="0x0" role="AttributeMember">
-                <name></name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" id="id-0065-000002d1" kind="TwowayOperation" relid="0x5" role="TwowayOperation">
-              <name>get_passive_observer_filter_config</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,560</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006c3" kind="ReturnType" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" id="id-0065-000002d2" kind="TwowayOperation" relid="0x6" role="TwowayOperation">
-              <name>get_pull_observer_data</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,660</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006c4" kind="ReturnType" referred="id-0065-000002c7" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" id="id-0065-000002d3" kind="TwowayOperation" relid="0x7" role="TwowayOperation">
-              <name>get_pull_observer_fresh_data</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,760</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006c5" kind="ReturnType" referred="id-0065-000002c8" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" id="id-0065-000002d4" kind="TwowayOperation" relid="0x8" role="TwowayOperation">
-              <name>get_pull_observer_dds_entity</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,860</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006c6" kind="ReturnType" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" id="id-0065-000002d5" kind="Attribute" relid="0x9" role="Attribute">
-              <name>pull_observer_filter</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,960</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006c7" kind="AttributeMember" referred="id-0065-00000143" relid="0x0" role="AttributeMember">
-                <name></name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" id="id-0065-000002d6" kind="TwowayOperation" relid="0xa" role="TwowayOperation">
-              <name>get_pull_observer_filter_config</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,1060</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006c8" kind="ReturnType" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" id="id-0065-000002d7" kind="TwowayOperation" relid="0xb" role="TwowayOperation">
-              <name>get_push_observer_data</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,1160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006c9" kind="ReturnType" referred="id-0065-000002c7" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" id="id-0065-000002d8" kind="TwowayOperation" relid="0xc" role="TwowayOperation">
-              <name>get_push_observer_data_control</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,1260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006ca" kind="ReturnType" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" id="id-0065-000002d9" kind="TwowayOperation" relid="0xd" role="TwowayOperation">
-              <name>get_push_observer_dds_entity</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,1360</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006cb" kind="ReturnType" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" id="id-0065-000002da" kind="Attribute" relid="0xe" role="Attribute">
-              <name>push_observer_filter</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,1460</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006cc" kind="AttributeMember" referred="id-0065-00000143" relid="0x0" role="AttributeMember">
-                <name></name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" id="id-0065-000002db" kind="TwowayOperation" relid="0xf" role="TwowayOperation">
-              <name>get_push_observer_filter_config</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,1560</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006cd" kind="ReturnType" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" id="id-0065-000002dc" kind="TwowayOperation" relid="0x10" role="TwowayOperation">
-              <name>get_push_state_observer_data</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,1660</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006ce" kind="ReturnType" referred="id-0065-000002c7" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" id="id-0065-000002dd" kind="TwowayOperation" relid="0x11" role="TwowayOperation">
-              <name>get_push_state_observer_data_control</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,1760</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006cf" kind="ReturnType" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" id="id-0065-000002de" kind="TwowayOperation" relid="0x12" role="TwowayOperation">
-              <name>get_push_state_observer_dds_entity</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,1860</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006d0" kind="ReturnType" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" id="id-0065-000002df" kind="Attribute" relid="0x13" role="Attribute">
-              <name>push_state_observer_filter</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,1960</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006d1" kind="AttributeMember" referred="id-0065-00000143" relid="0x0" role="AttributeMember">
-                <name></name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" id="id-0065-000002e0" kind="TwowayOperation" relid="0x14" role="TwowayOperation">
-              <name>get_push_state_observer_filter_config</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,2060</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006d2" kind="ReturnType" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-          </model>
-          <model childrelidcntr="0x6" id="id-0065-000002e1" kind="Object" relid="0x8" role="Object">
-            <name>CCM_DDS_State_Context</name>
-            <attribute kind="InterfaceSemantics">
-              <value>local</value>
-            </attribute>
-            <model childrelidcntr="0x1" id="id-0065-000002e2" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-              <name>get_connection_passive_observer_status</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006d3" kind="ReturnType" referred="id-0065-00000121" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" id="id-0065-000002e3" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-              <name>get_connection_pull_observer_status</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006d4" kind="ReturnType" referred="id-0065-00000121" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x2" id="id-0065-000002e4" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-              <name>get_connection_push_observer_data_listener</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006d5" kind="ReturnType" referred="id-0065-0000015b" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference id="id-0067-00000707" kind="TemplatePackageInstanceRef" referred="id-0065-00000005" relid="0x1" role="TemplatePackageInstanceRef">
-                <name></name>
-              </reference>
-              <connection id="id-0068-00000001" kind="TemplatePackageInstanceDecl" relid="0x1" role="TemplatePackageInstanceDecl">
-                <name></name>
-                <connpoint role="src" target="id-0067-00000707"/>
-                <connpoint role="dst" target="id-0067-000006d5"/>
-              </connection>
-            </model>
-            <model childrelidcntr="0x1" id="id-0065-000002e5" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-              <name>get_connection_push_observer_status</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,360</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006d6" kind="ReturnType" referred="id-0065-00000121" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x2" id="id-0065-000002e6" kind="TwowayOperation" relid="0x4" role="TwowayOperation">
-              <name>get_connection_push_state_observer_data_listener</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,460</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006d7" kind="ReturnType" referred="id-0065-00000156" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference id="id-0067-00000708" kind="TemplatePackageInstanceRef" referred="id-0065-00000005" relid="0x1" role="TemplatePackageInstanceRef">
-                <name></name>
-              </reference>
-              <connection id="id-0068-00000002" kind="TemplatePackageInstanceDecl" relid="0x1" role="TemplatePackageInstanceDecl">
-                <name></name>
-                <connpoint role="src" target="id-0067-00000708"/>
-                <connpoint role="dst" target="id-0067-000006d7"/>
-              </connection>
-            </model>
-            <model childrelidcntr="0x1" id="id-0065-000002e7" kind="TwowayOperation" relid="0x5" role="TwowayOperation">
-              <name>get_connection_push_state_observer_status</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,560</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006d8" kind="ReturnType" referred="id-0065-00000121" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-          </model>
-          <model childrelidcntr="0xc" id="id-0065-000002ea" kind="Object" relid="0x9" role="Object">
-            <name>CCM_DDS_Event</name>
-            <attribute kind="InterfaceSemantics">
-              <value>local</value>
-            </attribute>
-            <model childrelidcntr="0x1" id="id-0065-000002eb" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-              <name>get_supplier_data</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006db" kind="ReturnType" referred="id-0065-000002c5" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" id="id-0065-000002ec" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-              <name>get_supplier_dds_entity</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006dc" kind="ReturnType" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" id="id-0065-000002ed" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-              <name>get_pull_consumer_data</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006dd" kind="ReturnType" referred="id-0065-000002c7" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" id="id-0065-000002ee" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-              <name>get_pull_consumer_fresh_data</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,360</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006de" kind="ReturnType" referred="id-0065-000002c8" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" id="id-0065-000002ef" kind="TwowayOperation" relid="0x4" role="TwowayOperation">
-              <name>get_pull_consumer_dds_entity</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,460</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006df" kind="ReturnType" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" id="id-0065-000002f0" kind="Attribute" relid="0x5" role="Attribute">
-              <name>pull_consumer_filter</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,560</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006e0" kind="AttributeMember" referred="id-0065-00000143" relid="0x0" role="AttributeMember">
-                <name></name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" id="id-0065-000002f1" kind="TwowayOperation" relid="0x6" role="TwowayOperation">
-              <name>get_pull_consumer_filter_config</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,660</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006e1" kind="ReturnType" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" id="id-0065-000002f2" kind="TwowayOperation" relid="0x7" role="TwowayOperation">
-              <name>get_push_consumer_data</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,760</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006e2" kind="ReturnType" referred="id-0065-000002c7" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" id="id-0065-000002f3" kind="TwowayOperation" relid="0x8" role="TwowayOperation">
-              <name>get_push_consumer_data_control</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,860</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006e3" kind="ReturnType" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" id="id-0065-000002f4" kind="TwowayOperation" relid="0x9" role="TwowayOperation">
-              <name>get_push_consumer_dds_entity</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,960</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006e4" kind="ReturnType" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" id="id-0065-000002f5" kind="Attribute" relid="0xa" role="Attribute">
-              <name>push_consumer_filter</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,1060</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006e5" kind="AttributeMember" referred="id-0065-00000143" relid="0x0" role="AttributeMember">
-                <name></name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" id="id-0065-000002f6" kind="TwowayOperation" relid="0xb" role="TwowayOperation">
-              <name>get_push_consumer_filter_config</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,1160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006e6" kind="ReturnType" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-          </model>
-          <model childrelidcntr="0x3" id="id-0065-000002f7" kind="Object" relid="0xa" role="Object">
-            <name>CCM_DDS_Event_Context</name>
-            <attribute kind="InterfaceSemantics">
-              <value>local</value>
-            </attribute>
-            <model childrelidcntr="0x1" id="id-0065-000002f8" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-              <name>get_connection_pull_consumer_status</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006e7" kind="ReturnType" referred="id-0065-00000121" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x2" id="id-0065-000002f9" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-              <name>get_connection_push_consumer_data_listener</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006e8" kind="ReturnType" referred="id-0065-0000015b" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference id="id-0067-0000070e" kind="TemplatePackageInstanceRef" referred="id-0065-00000005" relid="0x1" role="TemplatePackageInstanceRef">
-                <name></name>
-              </reference>
-              <connection id="id-0068-00000009" kind="TemplatePackageInstanceDecl" relid="0x1" role="TemplatePackageInstanceDecl">
-                <name></name>
-                <connpoint role="src" target="id-0067-0000070e"/>
-                <connpoint role="dst" target="id-0067-000006e8"/>
-              </connection>
-            </model>
-            <model childrelidcntr="0x1" id="id-0065-000002fa" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-              <name>get_connection_push_consumer_status</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006e9" kind="ReturnType" referred="id-0065-00000121" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-          </model>
-        </model>
-        <model childrelidcntr="0x1" id="id-0065-000002e8" kind="Package" relid="0x1" role="Package">
-          <name>CIAO_Shapes_DDS_State_Impl</name>
-          <reference id="id-0067-000006d9" kind="Alias" referred="id-0065-000002e1" relid="0x0" role="Alias">
-            <name>DDS_State_Exec_Context</name>
-          </reference>
-          <model childrelidcntr="0x1" id="id-0065-000002e9" kind="Object" relid="0x0" role="Object">
-            <name>DDS_State_Exec</name>
-            <attribute kind="InterfaceSemantics">
-              <value>local</value>
-            </attribute>
-            <reference id="id-0067-000006da" kind="Inherits" referred="id-0065-000002cb" relid="0x0" role="Inherits">
-              <name>Inherits</name>
-            </reference>
-          </model>
-        </model>
-        <model childrelidcntr="0x1" id="id-0065-000002fb" kind="Package" relid="0x2" role="Package">
-          <name>CIAO_Shapes_DDS_Event_Impl</name>
-          <reference id="id-0067-000006ea" kind="Alias" referred="id-0065-000002f7" relid="0x0" role="Alias">
-            <name>DDS_Event_Exec_Context</name>
-          </reference>
-          <model childrelidcntr="0x1" id="id-0065-000002fc" kind="Object" relid="0x0" role="Object">
-            <name>DDS_Event_Exec</name>
-            <attribute kind="InterfaceSemantics">
-              <value>local</value>
-            </attribute>
-            <reference id="id-0067-000006eb" kind="Inherits" referred="id-0065-000002ea" relid="0x0" role="Inherits">
-              <name>Inherits</name>
-            </reference>
-          </model>
-        </model>
-      </model>
-      <model childrelidcntr="0x2" id="id-0065-000002c1" kind="File" relid="0x8" role="File">
-        <name>Shapes_ReceiverE</name>
-        <attribute kind="Path">
-          <value>Receiver</value>
-        </attribute>
-        <model childrelidcntr="0x2" id="id-0065-000002fd" kind="Package" relid="0x0" role="Package">
-          <name>Shapes</name>
-          <model childrelidcntr="0x7" id="id-0065-000002fe" kind="Object" relid="0x0" role="Object">
-            <name>CCM_Receiver</name>
-            <attribute kind="InterfaceSemantics">
-              <value>local</value>
-            </attribute>
-            <model childrelidcntr="0x1" id="id-0065-000002ff" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-              <name>get_info_out_data_listener</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006ec" kind="ReturnType" referred="id-0065-000002c9" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" id="id-0065-00000300" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-              <name>get_info_out_status</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006ed" kind="ReturnType" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" id="id-0065-00000301" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-              <name>get_info_get_status</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006ee" kind="ReturnType" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" id="id-0065-00000302" kind="Attribute" relid="0x3" role="Attribute">
-              <name>rate</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,360</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006ef" kind="AttributeMember" referred="id-0066-00000011" relid="0x0" role="AttributeMember">
-                <name></name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" id="id-0065-00000303" kind="Attribute" relid="0x4" role="Attribute">
-              <name>get_data</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,460</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006f0" kind="AttributeMember" referred="id-0066-00000009" relid="0x0" role="AttributeMember">
-                <name></name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" id="id-0065-00000304" kind="Attribute" relid="0x5" role="Attribute">
-              <name>read_data</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,560</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006f1" kind="AttributeMember" referred="id-0066-00000009" relid="0x0" role="AttributeMember">
-                <name></name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" id="id-0065-00000305" kind="Attribute" relid="0x6" role="Attribute">
-              <name>raw_listen</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,660</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006f2" kind="AttributeMember" referred="id-0066-00000009" relid="0x0" role="AttributeMember">
-                <name></name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-          </model>
-          <model childrelidcntr="0x8" id="id-0065-00000306" kind="Object" relid="0x1" role="Object">
-            <name>CCM_Receiver_Context</name>
-            <attribute kind="InterfaceSemantics">
-              <value>local</value>
-            </attribute>
-            <model childrelidcntr="0x2" id="id-0065-00000307" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-              <name>get_connection_info_out_data</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006f3" kind="ReturnType" referred="id-0065-00000163" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference id="id-0067-0000070c" kind="TemplatePackageInstanceRef" referred="id-0065-00000005" relid="0x1" role="TemplatePackageInstanceRef">
-                <name></name>
-              </reference>
-              <connection id="id-0068-00000006" kind="TemplatePackageInstanceDecl" relid="0x1" role="TemplatePackageInstanceDecl">
-                <name></name>
-                <connpoint role="src" target="id-0067-0000070c"/>
-                <connpoint role="dst" target="id-0067-000006f3"/>
-              </connection>
-            </model>
-            <model childrelidcntr="0x1" id="id-0065-00000308" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-              <name>get_connection_info_out_data_control</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006f4" kind="ReturnType" referred="id-0065-00000126" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" id="id-0065-00000309" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-              <name>get_connection_info_out_dds_entity</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006f5" kind="ReturnType" referred="id-0065-000000cc" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" id="id-0065-0000030a" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-              <name>get_connection_info_out_filter_config</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,360</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006f6" kind="ReturnType" referred="id-0065-0000013c" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x2" id="id-0065-0000030b" kind="TwowayOperation" relid="0x4" role="TwowayOperation">
-              <name>get_connection_info_get_data</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,460</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006f7" kind="ReturnType" referred="id-0065-00000163" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference id="id-0067-00000709" kind="TemplatePackageInstanceRef" referred="id-0065-00000005" relid="0x1" role="TemplatePackageInstanceRef">
-                <name></name>
-              </reference>
-              <connection id="id-0068-00000003" kind="TemplatePackageInstanceDecl" relid="0x1" role="TemplatePackageInstanceDecl">
-                <name></name>
-                <connpoint role="src" target="id-0067-00000709"/>
-                <connpoint role="dst" target="id-0067-000006f7"/>
-              </connection>
-            </model>
-            <model childrelidcntr="0x2" id="id-0065-0000030c" kind="TwowayOperation" relid="0x5" role="TwowayOperation">
-              <name>get_connection_info_get_fresh_data</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,560</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006f8" kind="ReturnType" referred="id-0065-0000015e" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference id="id-0067-0000070a" kind="TemplatePackageInstanceRef" referred="id-0065-00000005" relid="0x1" role="TemplatePackageInstanceRef">
-                <name></name>
-              </reference>
-              <connection id="id-0068-00000004" kind="TemplatePackageInstanceDecl" relid="0x1" role="TemplatePackageInstanceDecl">
-                <name></name>
-                <connpoint role="src" target="id-0067-0000070a"/>
-                <connpoint role="dst" target="id-0067-000006f8"/>
-              </connection>
-            </model>
-            <model childrelidcntr="0x1" id="id-0065-0000030d" kind="TwowayOperation" relid="0x6" role="TwowayOperation">
-              <name>get_connection_info_get_dds_entity</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,660</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006f9" kind="ReturnType" referred="id-0065-000000cc" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" id="id-0065-0000030e" kind="TwowayOperation" relid="0x7" role="TwowayOperation">
-              <name>get_connection_info_get_filter_config</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,760</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006fa" kind="ReturnType" referred="id-0065-0000013c" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-          </model>
-        </model>
-        <model childrelidcntr="0x1" id="id-0065-0000030f" kind="Package" relid="0x1" role="Package">
-          <name>CIAO_Shapes_Receiver_Impl</name>
-          <reference id="id-0067-000006fb" kind="Alias" referred="id-0065-00000306" relid="0x0" role="Alias">
-            <name>Receiver_Exec_Context</name>
-          </reference>
-          <model childrelidcntr="0x1" id="id-0065-00000310" kind="Object" relid="0x0" role="Object">
-            <name>Receiver_Exec</name>
-            <attribute kind="InterfaceSemantics">
-              <value>local</value>
-            </attribute>
-            <reference id="id-0067-000006fc" kind="Inherits" referred="id-0065-000002fe" relid="0x0" role="Inherits">
-              <name>Inherits</name>
-            </reference>
-          </model>
-        </model>
-      </model>
-      <model childrelidcntr="0x2" id="id-0065-000002c2" kind="File" relid="0x9" role="File">
-        <name>Shapes_SenderE</name>
-        <attribute kind="Path">
-          <value>Sender</value>
-        </attribute>
-        <model childrelidcntr="0x2" id="id-0065-00000311" kind="Package" relid="0x0" role="Package">
-          <name>Shapes</name>
-          <model childrelidcntr="0x5" id="id-0065-00000312" kind="Object" relid="0x0" role="Object">
-            <name>CCM_Sender</name>
-            <attribute kind="InterfaceSemantics">
-              <value>local</value>
-            </attribute>
-            <model childrelidcntr="0x1" id="id-0065-00000313" kind="Attribute" relid="0x0" role="Attribute">
-              <name>rate</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006fd" kind="AttributeMember" referred="id-0066-00000011" relid="0x0" role="AttributeMember">
-                <name></name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" id="id-0065-00000314" kind="Attribute" relid="0x1" role="Attribute">
-              <name>max_x</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006fe" kind="AttributeMember" referred="id-0066-00000010" relid="0x0" role="AttributeMember">
-                <name></name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" id="id-0065-00000315" kind="Attribute" relid="0x2" role="Attribute">
-              <name>max_y</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-000006ff" kind="AttributeMember" referred="id-0066-00000010" relid="0x0" role="AttributeMember">
-                <name></name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" id="id-0065-00000316" kind="Attribute" relid="0x3" role="Attribute">
-              <name>max_size</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,360</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-00000700" kind="AttributeMember" referred="id-0066-00000010" relid="0x0" role="AttributeMember">
-                <name></name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" id="id-0065-00000317" kind="Attribute" relid="0x4" role="Attribute">
-              <name>resize_shape</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,460</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-00000701" kind="AttributeMember" referred="id-0066-00000009" relid="0x0" role="AttributeMember">
-                <name></name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-          </model>
-          <model childrelidcntr="0x2" id="id-0065-00000318" kind="Object" relid="0x1" role="Object">
-            <name>CCM_Sender_Context</name>
-            <attribute kind="InterfaceSemantics">
-              <value>local</value>
-            </attribute>
-            <model childrelidcntr="0x2" id="id-0065-00000319" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-              <name>get_connection_info_write_data</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-00000702" kind="ReturnType" referred="id-0065-00000172" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference id="id-0067-0000070b" kind="TemplatePackageInstanceRef" referred="id-0065-00000005" relid="0x1" role="TemplatePackageInstanceRef">
-                <name></name>
-              </reference>
-              <connection id="id-0068-00000005" kind="TemplatePackageInstanceDecl" relid="0x1" role="TemplatePackageInstanceDecl">
-                <name></name>
-                <connpoint role="src" target="id-0067-0000070b"/>
-                <connpoint role="dst" target="id-0067-00000702"/>
-              </connection>
-            </model>
-            <model childrelidcntr="0x1" id="id-0065-0000031a" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-              <name>get_connection_info_write_dds_entity</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <reference id="id-0067-00000703" kind="ReturnType" referred="id-0065-000000e0" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode name="PartRegs">
-                  <value/>
-                  <regnode name="InterfaceDefinition">
-                    <value/>
-                    <regnode name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-          </model>
-        </model>
-        <model childrelidcntr="0x1" id="id-0065-0000031b" kind="Package" relid="0x1" role="Package">
-          <name>CIAO_Shapes_Sender_Impl</name>
-          <reference id="id-0067-00000704" kind="Alias" referred="id-0065-00000318" relid="0x0" role="Alias">
-            <name>Sender_Exec_Context</name>
-          </reference>
-          <model childrelidcntr="0x1" id="id-0065-0000031c" kind="Object" relid="0x0" role="Object">
-            <name>Sender_Exec</name>
-            <attribute kind="InterfaceSemantics">
-              <value>local</value>
-            </attribute>
-            <reference id="id-0067-00000705" kind="Inherits" referred="id-0065-00000312" relid="0x0" role="Inherits">
-              <name>Inherits</name>
-            </reference>
-          </model>
-        </model>
-      </model>
-    </folder>
-    <folder childrelidcntr="0x2" guid="{6d95ee3d-ddf0-403b-ad48-ccfff948c47c}" id="id-006a-00000003" kind="ImplementationArtifacts" relid="0x1">
-      <name>ImplementationArtifacts</name>
-      <model childrelidcntr="0x2" guid="{bc5b6a8d-20f8-4de3-90dd-7e61fc3d3c9f}" id="id-0065-00000015" kind="ArtifactContainer" relid="0x0">
-        <name>Shapes_ReceiverArtifacts</name>
-        <atom guid="{f760fed3-c1d1-4fd9-8b17-13037d912151}" id="id-0066-00000003" kind="ImplementationArtifact" relid="0x0" role="ImplementationArtifact">
-          <name>Shapes_Receiver_svnt</name>
-          <regnode isopaque="yes" name="PartRegs">
-            <value/>
-            <regnode isopaque="yes" name="Packaging">
-              <value/>
-              <regnode isopaque="yes" name="Position">
-                <value>150,150</value>
-              </regnode>
-            </regnode>
-          </regnode>
-          <attribute kind="UUID">
-            <value>AA8C9DEE-7CED-11DF-8DD1-000C2958D27B</value>
-          </attribute>
-          <attribute kind="architecture" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="artifactVersion" status="meta">
-            <value>0.0.0.0</value>
-          </attribute>
-          <attribute kind="configuration" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="label" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="location">
-            <value>Shapes_Receiver_svnt</value>
-          </attribute>
-          <attribute kind="operatingSystem" status="meta">
-            <value/>
-          </attribute>
-        </atom>
-        <atom guid="{4a5a42b3-6890-4365-8683-1bffc8bb5c84}" id="id-0066-00000004" kind="ImplementationArtifact" relid="0x1" role="ImplementationArtifact">
-          <name>Shapes_Receiver_exec</name>
-          <regnode isopaque="yes" name="PartRegs">
-            <value/>
-            <regnode isopaque="yes" name="Packaging">
-              <value/>
-              <regnode isopaque="yes" name="Position">
-                <value>450,150</value>
-              </regnode>
-            </regnode>
-          </regnode>
-          <attribute kind="UUID">
-            <value>AA8C9DEE-7CED-11DF-8DD2-000C2958D27B</value>
-          </attribute>
-          <attribute kind="architecture" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="artifactVersion" status="meta">
-            <value>0.0.0.0</value>
-          </attribute>
-          <attribute kind="configuration" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="label" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="location">
-            <value>Shapes_Receiver_exec</value>
-          </attribute>
-          <attribute kind="operatingSystem" status="meta">
-            <value/>
-          </attribute>
-        </atom>
-      </model>
-      <model childrelidcntr="0x2" guid="{85625c3b-6017-45bf-97f6-8309502acb43}" id="id-0065-00000016" kind="ArtifactContainer" relid="0x1">
-        <name>Shapes_SenderArtifacts</name>
-        <atom guid="{82f2b5f1-e8e3-4c5a-a2eb-150727ff74cc}" id="id-0066-00000005" kind="ImplementationArtifact" relid="0x0" role="ImplementationArtifact">
-          <name>Shapes_Sender_svnt</name>
-          <regnode isopaque="yes" name="PartRegs">
-            <value/>
-            <regnode isopaque="yes" name="Packaging">
-              <value/>
-              <regnode isopaque="yes" name="Position">
-                <value>150,150</value>
-              </regnode>
-            </regnode>
-          </regnode>
-          <attribute kind="UUID">
-            <value>AA8C9DEE-7CED-11DF-8DD3-000C2958D27B</value>
-          </attribute>
-          <attribute kind="architecture" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="artifactVersion" status="meta">
-            <value>0.0.0.0</value>
-          </attribute>
-          <attribute kind="configuration" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="label" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="location">
-            <value>Shapes_Sender_svnt</value>
-          </attribute>
-          <attribute kind="operatingSystem" status="meta">
-            <value/>
-          </attribute>
-        </atom>
-        <atom guid="{82d684fe-2d00-432e-9bb5-a8d15e6bf352}" id="id-0066-00000006" kind="ImplementationArtifact" relid="0x1" role="ImplementationArtifact">
-          <name>Shapes_Sender_exec</name>
-          <regnode isopaque="yes" name="PartRegs">
-            <value/>
-            <regnode isopaque="yes" name="Packaging">
-              <value/>
-              <regnode isopaque="yes" name="Position">
-                <value>450,150</value>
-              </regnode>
-            </regnode>
-          </regnode>
-          <attribute kind="UUID">
-            <value>AA8C9DEE-7CED-11DF-8DD4-000C2958D27B</value>
-          </attribute>
-          <attribute kind="architecture" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="artifactVersion" status="meta">
-            <value>0.0.0.0</value>
-          </attribute>
-          <attribute kind="configuration" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="label" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="location">
-            <value>Shapes_Sender_exec</value>
-          </attribute>
-          <attribute kind="operatingSystem" status="meta">
-            <value/>
-          </attribute>
-        </atom>
-      </model>
-    </folder>
-    <folder childrelidcntr="0x2" guid="{5cd70137-3f09-4791-a17e-aaf0c71606d3}" id="id-006a-00000004" kind="ComponentImplementations" relid="0x2">
-      <name>ComponentImplementations</name>
-      <model childrelidcntr="0x4" guid="{ff87e81e-508d-42e0-a73a-e80583760df3}" id="id-0065-00000017" kind="ComponentImplementationContainer" relid="0x0">
-        <name>Shapes_ReceiverImpl</name>
-        <atom guid="{bf03f0c5-91d6-4428-ae6e-bfe28ebe2a0b}" id="id-0066-00000007" kind="MonolithicImplementation" relid="0x0" role="MonolithicImplementation">
-          <name>Shapes_ReceiverImpl</name>
-          <regnode isopaque="yes" name="PartRegs">
-            <value/>
-            <regnode isopaque="yes" name="Packaging">
-              <value/>
-              <regnode isopaque="yes" name="Position">
-                <value>250,250</value>
-              </regnode>
-            </regnode>
-          </regnode>
-          <attribute kind="UUID">
-            <value>AA8C9DEE-7CED-11DF-8DD5-000C2958D27B</value>
-          </attribute>
-          <attribute kind="defaultVersion" status="meta">
-            <value>0.0.0.0</value>
-          </attribute>
-          <attribute kind="label" status="meta">
-            <value/>
-          </attribute>
-        </atom>
-        <reference guid="{0bfcc0de-8e14-407f-89f8-c7f61337a522}" id="id-0067-00000008" kind="ComponentRef" referred="id-0065-00000008" relid="0x1" role="ComponentRef">
-          <name>Receiver</name>
-          <regnode isopaque="yes" name="PartRegs">
-            <value/>
-            <regnode isopaque="yes" name="Packaging">
-              <value/>
-              <regnode isopaque="yes" name="Position">
-                <value>187,75</value>
-              </regnode>
-            </regnode>
-          </regnode>
-        </reference>
-        <reference guid="{f4c98b52-871d-43c0-a6e4-67987201b934}" id="id-0067-00000009" kind="ComponentServantArtifact" referred="id-0066-00000003" relid="0x2" role="ComponentServantArtifact">
-          <name>Shapes_Receiver_svnt</name>
-          <regnode isopaque="yes" name="PartRegs">
-            <value/>
-            <regnode isopaque="yes" name="Packaging">
-              <value/>
-              <regnode isopaque="yes" name="Position">
-                <value>506,347</value>
-              </regnode>
-            </regnode>
-          </regnode>
-          <attribute kind="EntryPoint">
-            <value>create_Shapes_Receiver_Servant</value>
-          </attribute>
-        </reference>
-        <reference guid="{7d361c76-8085-4de7-9e4f-f9d27776d0fe}" id="id-0067-0000000a" kind="ComponentImplementationArtifact" referred="id-0066-00000004" relid="0x3" role="ComponentImplementationArtifact">
-          <name>Shapes_Receiver_exec</name>
-          <regnode isopaque="yes" name="PartRegs">
-            <value/>
-            <regnode isopaque="yes" name="Packaging">
-              <value/>
-              <regnode isopaque="yes" name="Position">
-                <value>506,151</value>
-              </regnode>
-            </regnode>
-          </regnode>
-          <attribute kind="EntryPoint">
-            <value>create_Shapes_Receiver_Impl</value>
-          </attribute>
-        </reference>
-        <connection guid="{ca3df463-5e2c-40e0-92f1-4a06651a259e}" id="id-0068-00000004" kind="Implements" relid="0x1" role="Implements">
-          <name/>
-          <connpoint role="src" target="id-0066-00000007"/>
-          <connpoint role="dst" target="id-0067-00000008"/>
-        </connection>
-        <connection guid="{b9feb741-28da-42eb-8a6c-214d52f5759c}" id="id-0068-00000005" kind="MonolithprimaryArtifact" relid="0x2" role="MonolithprimaryArtifact">
-          <name/>
-          <connpoint role="src" target="id-0066-00000007"/>
-          <connpoint role="dst" target="id-0067-00000009"/>
-        </connection>
-        <connection guid="{770c4fb9-b4db-4f12-9ce8-3f6b4fa718b8}" id="id-0068-00000006" kind="MonolithprimaryArtifact" relid="0x3" role="MonolithprimaryArtifact">
-          <name/>
-          <connpoint role="src" target="id-0066-00000007"/>
-          <connpoint role="dst" target="id-0067-0000000a"/>
-        </connection>
-      </model>
-      <model childrelidcntr="0x4" guid="{faeb0d75-09bc-4a71-a235-4ea98c877d87}" id="id-0065-00000018" kind="ComponentImplementationContainer" relid="0x1">
-        <name>Shapes_SenderImpl</name>
-        <atom guid="{2811a542-4fcf-4182-bed9-4358cd9742be}" id="id-0066-00000008" kind="MonolithicImplementation" relid="0x0" role="MonolithicImplementation">
-          <name>Shapes_SenderImpl</name>
-          <regnode isopaque="yes" name="PartRegs">
-            <value/>
-            <regnode isopaque="yes" name="Packaging">
-              <value/>
-              <regnode isopaque="yes" name="Position">
-                <value>250,250</value>
-              </regnode>
-            </regnode>
-          </regnode>
-          <attribute kind="UUID">
-            <value>AA8C9DEE-7CED-11DF-8DD6-000C2958D27B</value>
-          </attribute>
-          <attribute kind="defaultVersion" status="meta">
-            <value>0.0.0.0</value>
-          </attribute>
-          <attribute kind="label" status="meta">
-            <value/>
-          </attribute>
-        </atom>
-        <reference guid="{665d07f8-b4f5-4d29-9a98-2a33209b3d2a}" id="id-0067-0000000b" kind="ComponentRef" referred="id-0065-0000000f" relid="0x1" role="ComponentRef">
-          <name>Sender</name>
-          <regnode isopaque="yes" name="PartRegs">
-            <value/>
-            <regnode isopaque="yes" name="Packaging">
-              <value/>
-              <regnode isopaque="yes" name="Position">
-                <value>187,75</value>
-              </regnode>
-            </regnode>
-          </regnode>
-        </reference>
-        <reference guid="{88d964ee-1940-4de0-a11b-5dd2f9acf6dc}" id="id-0067-0000000c" kind="ComponentServantArtifact" referred="id-0066-00000005" relid="0x2" role="ComponentServantArtifact">
-          <name>Shapes_Sender_svnt</name>
-          <regnode isopaque="yes" name="PartRegs">
-            <value/>
-            <regnode isopaque="yes" name="Packaging">
-              <value/>
-              <regnode isopaque="yes" name="Position">
-                <value>506,347</value>
-              </regnode>
-            </regnode>
-          </regnode>
-          <attribute kind="EntryPoint">
-            <value>create_Shapes_Sender_Servant</value>
-          </attribute>
-        </reference>
-        <reference guid="{469be072-3daf-4a99-8a77-62f71122245c}" id="id-0067-0000000d" kind="ComponentImplementationArtifact" referred="id-0066-00000006" relid="0x3" role="ComponentImplementationArtifact">
-          <name>Shapes_Sender_exec</name>
-          <regnode isopaque="yes" name="PartRegs">
-            <value/>
-            <regnode isopaque="yes" name="Packaging">
-              <value/>
-              <regnode isopaque="yes" name="Position">
-                <value>506,151</value>
-              </regnode>
-            </regnode>
-          </regnode>
-          <attribute kind="EntryPoint">
-            <value>create_Shapes_Sender_Impl</value>
-          </attribute>
-        </reference>
-        <connection guid="{63a48c9b-50ba-4a6a-854b-f9a84dd83040}" id="id-0068-00000007" kind="Implements" relid="0x1" role="Implements">
-          <name/>
-          <connpoint role="src" target="id-0066-00000008"/>
-          <connpoint role="dst" target="id-0067-0000000b"/>
-        </connection>
-        <connection guid="{a935b1f2-cf56-4dd1-af39-7a1c6ce726e2}" id="id-0068-00000008" kind="MonolithprimaryArtifact" relid="0x2" role="MonolithprimaryArtifact">
-          <name/>
-          <connpoint role="src" target="id-0066-00000008"/>
-          <connpoint role="dst" target="id-0067-0000000c"/>
-        </connection>
-        <connection guid="{43a23a33-3923-41a6-af67-e41607e289a2}" id="id-0068-00000009" kind="MonolithprimaryArtifact" relid="0x3" role="MonolithprimaryArtifact">
-          <name/>
-          <connpoint role="src" target="id-0066-00000008"/>
-          <connpoint role="dst" target="id-0067-0000000d"/>
-        </connection>
-      </model>
-    </folder>
-    <folder childrelidcntr="0x12" guid="{8680e226-2c7f-43a3-af4c-2edfeb6fc71f}" id="id-006a-00000005" kind="PredefinedTypes" relid="0x3">
-      <name>PredefinedTypes</name>
-      <atom guid="{e0bc69e7-9cac-4861-8439-8e2f9fa522f5}" id="id-0066-00000009" kind="Boolean" relid="0x0">
-        <name>Boolean</name>
-      </atom>
-      <atom guid="{b8ecf3f8-d969-4a88-a688-09f306f92f31}" id="id-0066-0000000a" kind="Byte" relid="0x1">
-        <name>Byte</name>
-      </atom>
-      <atom guid="{cb419233-7a08-482c-a19d-6306c365247f}" id="id-0066-0000000b" kind="Char" relid="0x2">
-        <name>Char</name>
-      </atom>
-      <atom guid="{73f55ea1-9831-4e8b-a545-9d638cb82d74}" id="id-0066-0000000c" kind="WideChar" relid="0x3">
-        <name>WideChar</name>
-      </atom>
-      <atom guid="{19e21ea6-c500-4304-96bb-bedea7e61f02}" id="id-0066-0000000d" kind="ShortInteger" relid="0x4">
-        <name>ShortInteger</name>
-      </atom>
-      <atom guid="{3d234a77-9e87-45c5-b24d-eab709cb0ef9}" id="id-0066-0000000e" kind="LongInteger" relid="0x5">
-        <name>LongInteger</name>
-      </atom>
-      <atom guid="{2547d0a6-1117-4a6c-9572-59fd2c4ea8ae}" id="id-0066-0000000f" kind="LongLongInteger" relid="0x6">
-        <name>LongLongInteger</name>
-      </atom>
-      <atom guid="{9dcfe0cf-b588-40a8-a91e-916791143214}" id="id-0066-00000010" kind="UnsignedShortInteger" relid="0x7">
-        <name>UnsignedShortInteger</name>
-      </atom>
-      <atom guid="{3159b452-612c-4e1a-a59d-55cbff328d76}" id="id-0066-00000011" kind="UnsignedLongInteger" relid="0x8">
-        <name>UnsignedLongInteger</name>
-      </atom>
-      <atom guid="{cb7427ac-fa1f-47d3-af99-6bf36aa040e6}" id="id-0066-00000012" kind="UnsignedLongLongInteger" relid="0x9">
-        <name>UnsignedLongLongInteger</name>
-      </atom>
-      <atom guid="{baebc499-53b7-4e8f-92ee-7bb765fef162}" id="id-0066-00000013" kind="FloatNumber" relid="0xa">
-        <name>FloatNumber</name>
-      </atom>
-      <atom guid="{a3d30208-c54a-4373-a807-2f6e72ef9e81}" id="id-0066-00000014" kind="DoubleNumber" relid="0xb">
-        <name>DoubleNumber</name>
-      </atom>
-      <atom guid="{161ae9fd-3d4a-470f-9792-1a1f137765d4}" id="id-0066-00000015" kind="LongDoubleNumber" relid="0xc">
-        <name>LongDoubleNumber</name>
-      </atom>
-      <atom guid="{cde7f5f7-8869-4abe-a3a8-76bdcb6a6f45}" id="id-0066-00000016" kind="GenericObject" relid="0xd">
-        <name>GenericObject</name>
-      </atom>
-      <atom guid="{816046f3-9c1a-44c4-b570-f00447dad344}" id="id-0066-00000017" kind="GenericValue" relid="0xe">
-        <name>GenericValue</name>
-      </atom>
-      <atom guid="{e6f96031-9b39-4b64-8f5b-5863ed10e482}" id="id-0066-00000018" kind="GenericValueObject" relid="0xf">
-        <name>GenericValueObject</name>
-      </atom>
-      <atom guid="{510478ff-5a5b-4837-a813-b71c95b583c4}" id="id-0066-00000019" kind="String" relid="0x10">
-        <name>String</name>
-      </atom>
-      <atom guid="{78ab34ca-1cc0-4982-b2cb-9e8af1a09346}" id="id-0066-0000001a" kind="WideString" relid="0x11">
-        <name>WideString</name>
-      </atom>
-    </folder>
-    <folder childrelidcntr="0x4" guid="{dcf2ae2f-94b5-41a4-8798-28318fff8fb8}" id="id-006a-00000006" kind="RootFolder" libref="MGA=E:\proj\vc9\ACE_TAO_CIAO\CIAO\connectors\dds4ccm\models\dds4ccm.mga" relid="0x0">
-      <name>MGA=E:\proj\vc9\ACE_TAO_CIAO\CIAO\connectors\dds4ccm\models\dds4ccm.mga</name>
-      <folder childrelidcntr="0x12" guid="{6d852a9e-1977-4a6a-8943-64c549a2db8b}" id="id-006a-00000007" kind="InterfaceDefinitions" relid="0x0">
-        <name>InterfaceDefinitions</name>
-        <model childrelidcntr="0x1" guid="{5f33e8ef-85f4-49ef-bcbb-a2ef7ac61eb3}" id="id-0065-00000019" kind="File" relid="0x10">
-          <name>dds_rtf2_dcps_i_handle</name>
-          <attribute kind="Path">
-            <value>connectors/dds4ccm/idl</value>
-          </attribute>
-          <attribute kind="PostPreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrePreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrefixTag" status="meta">
-            <value/>
-          </attribute>
-          <model childrelidcntr="0x2" guid="{38efb2d6-c5ac-47be-ae87-cb4afe74bdeb}" id="id-0065-0000001a" kind="Package" relid="0x0" role="Package">
-            <name>DDS</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrefixTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <model childrelidcntr="0x1" guid="{d669c2b7-7879-4d7c-953d-5e3241428e92}" id="id-0065-0000001b" kind="Aggregate" relid="0x0" role="Aggregate">
-              <name>NativeInstanceHandle_t</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{5a1128c6-a81c-48e0-bb50-5a582a1cd3ba}" id="id-0067-000000bd" kind="Member" referred="id-0066-00000046" relid="0x0" role="Member">
-                <name>isValid</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{8136fdb0-7dbb-4225-8755-2577a3e773db}" id="id-0067-000000be" kind="Member" referred="id-0066-00000046" relid="0x0" role="Member">
-                <name>length</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{8bac54ad-db49-4c71-8611-018b48d10830}" id="id-0067-000000bf" kind="ArrayMember" referred="id-0066-0000004d" relid="0x0" role="ArrayMember">
-                <name>value</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="Size">
-                  <value>16</value>
-                </attribute>
-              </reference>
-            </model>
-            <reference guid="{ff971609-3de5-4dfd-92d3-5c05a80afaa9}" id="id-0067-0000000e" kind="Alias" referred="id-0065-0000001b" relid="0x1" role="Alias">
-              <name>InstanceHandle_t</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-            </reference>
-            <reference guid="{d18bc8f7-a45e-4fbb-a5f2-d48f872f7ecd}" id="id-0067-000000c0" kind="Collection" referred="id-0067-0000000e" relid="0x1" role="Collection">
-              <name>InstanceHandleSeq</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="bound" status="meta">
-                <value/>
-              </attribute>
-            </reference>
-          </model>
-        </model>
-        <model childrelidcntr="0x1" guid="{ab5b259b-a53c-4e92-a982-85860248d4ce}" id="id-0065-0000001c" kind="File" relid="0xf">
-          <name>dds_rtf2_dcps_instance_handle</name>
-          <attribute kind="Path">
-            <value>connectors/dds4ccm/idl</value>
-          </attribute>
-          <attribute kind="PostPreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrePreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrefixTag" status="meta">
-            <value/>
-          </attribute>
-          <model childrelidcntr="0x1" guid="{639af11c-9d1e-4f6e-bb6f-90cfd4a688e1}" id="id-0065-0000001d" kind="Package" relid="0x0" role="Package">
-            <name>DDS</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrefixTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <atom guid="{d0de930c-c067-42ed-b568-847c0dcbde68}" id="id-0066-0000001b" kind="NativeValue" relid="0x0" role="NativeValue">
-              <name>HANDLE_NIL</name>
-            </atom>
-          </model>
-        </model>
-        <model childrelidcntr="0x1" guid="{b752d754-9e41-4e14-a36e-919b1ee7cd89}" id="id-0065-0000001e" kind="File" relid="0xd">
-          <name>dds_rtf2_dcps</name>
-          <attribute kind="Path">
-            <value>connectors/dds4ccm/idl</value>
-          </attribute>
-          <attribute kind="PostPreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrePreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrefixTag" status="meta">
-            <value/>
-          </attribute>
-          <model childrelidcntr="0x56" guid="{6159b4d6-7d7b-4f62-acbd-b40c9258f224}" id="id-0065-0000001f" kind="Package" relid="0x0" role="Package">
-            <name>DDS</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrefixTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <model childrelidcntr="0x1" guid="{2c714200-d641-462c-bf26-2293aad854a7}" id="id-0065-00000020" kind="Aggregate" relid="0x54" role="Aggregate">
-              <name>SampleInfo</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{4fa5bb5e-3329-4877-848d-a26582bf4d50}" id="id-0067-0000000f" kind="Member" referred="id-0067-0000000e" relid="0x0" role="Member">
-                <name>publication_handle</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{4c8d1441-a5a8-424f-baf6-707dbd0a9d24}" id="id-0067-00000010" kind="Member" referred="id-0067-0000000e" relid="0x0" role="Member">
-                <name>instance_handle</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{fba1a42c-2a85-44e3-ad4d-c04e21f2d664}" id="id-0067-000000c1" kind="Member" referred="id-0066-0000004e" relid="0x0" role="Member">
-                <name>valid_data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{81356fa4-ada4-4164-af68-95365767a870}" id="id-0067-000000c2" kind="Member" referred="id-0066-00000049" relid="0x0" role="Member">
-                <name>absolute_generation_rank</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1060</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{c6d029fb-0fa0-448a-bdf0-31a9450202e2}" id="id-0067-000000c3" kind="Member" referred="id-0066-00000049" relid="0x0" role="Member">
-                <name>generation_rank</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,960</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{290e16f9-124e-496c-8f46-7ed2a438b312}" id="id-0067-000000c4" kind="Member" referred="id-0066-00000049" relid="0x0" role="Member">
-                <name>sample_rank</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,860</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{3b58615b-6cc1-463d-972c-98a94d2e01c3}" id="id-0067-000000c5" kind="Member" referred="id-0066-00000049" relid="0x0" role="Member">
-                <name>no_writers_generation_count</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,760</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{e74fea75-90c0-448f-9b58-9b3e905bbb87}" id="id-0067-000000c6" kind="Member" referred="id-0066-00000049" relid="0x0" role="Member">
-                <name>disposed_generation_count</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,660</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{ee88b06b-cd8b-4a5a-9b8a-0d8af3e25b6a}" id="id-0067-000000c7" kind="Member" referred="id-0065-00000118" relid="0x0" role="Member">
-                <name>source_timestamp</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{a8c50a2d-d410-473c-8c24-e229b970d707}" id="id-0067-000002de" kind="Member" referred="id-0067-00000265" relid="0x0" role="Member">
-                <name>instance_state</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{614b0fc2-c0a3-46e2-8b48-d11929ebc612}" id="id-0067-000002df" kind="Member" referred="id-0067-0000026a" relid="0x0" role="Member">
-                <name>view_state</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{16ccd183-b53b-4bd7-bc3c-490516d85f39}" id="id-0067-000002e0" kind="Member" referred="id-0067-0000026f" relid="0x0" role="Member">
-                <name>sample_state</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x0" guid="{14b976f7-962c-418e-b344-dd2ff78462cd}" id="id-0065-00000021" kind="Object" relid="0x53" role="Object">
-              <name>TypeSupport</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-            </model>
-            <model childrelidcntr="0x9" guid="{8618bd5c-69d6-4ba3-9b56-ad662f7efe94}" id="id-0065-00000022" kind="Object" relid="0x52" role="Object">
-              <name>DomainParticipantFactory</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{674d12cb-927b-4e2e-9770-92d5788c2abc}" id="id-0065-00000023" kind="TwowayOperation" relid="0x8" role="TwowayOperation">
-                <name>get_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,860</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{8afd2ce7-31f6-4acf-86be-8847b772f8b8}" id="id-0067-000000c8" kind="InoutParameter" referred="id-0065-0000005e" relid="0x0" role="InoutParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{57addb8d-c750-4a11-9680-b0db3239335d}" id="id-0067-000002e1" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{f5e360dc-04db-4a5d-8763-82164e537ef1}" id="id-0065-00000024" kind="TwowayOperation" relid="0x7" role="TwowayOperation">
-                <name>set_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,760</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{daa9299a-6902-49b4-9244-ee9be3197668}" id="id-0067-000000c9" kind="InParameter" referred="id-0065-0000005e" relid="0x0" role="InParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{36031c37-c807-4caf-9b94-69ed4cc7b275}" id="id-0067-000002e2" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{0ca98cb8-df82-4713-8767-0bb3a70335e7}" id="id-0065-00000025" kind="TwowayOperation" relid="0x6" role="TwowayOperation">
-                <name>get_default_participant_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,660</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{125224c3-3b1a-46b1-80ee-ca9d65cc2425}" id="id-0067-000000ca" kind="InoutParameter" referred="id-0065-0000005d" relid="0x0" role="InoutParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{12cb18d4-431c-4808-8689-361558ef34d1}" id="id-0067-000002e3" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{411a66ab-799d-4a25-8996-fc2bda71ebf7}" id="id-0065-00000026" kind="TwowayOperation" relid="0x5" role="TwowayOperation">
-                <name>set_default_participant_qos_with_profile</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{ead2634b-0cd4-4dfb-abb4-4d369c8a7c6e}" id="id-0067-000000cb" kind="InParameter" referred="id-0066-0000003e" relid="0x0" role="InParameter">
-                  <name>profile_name</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{b9e19955-7e65-4d6f-a400-f031912cc998}" id="id-0067-000000cc" kind="InParameter" referred="id-0066-0000003e" relid="0x0" role="InParameter">
-                  <name>library_name</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{6bbf23f6-fa96-4c5e-a493-fe60cb292c6f}" id="id-0067-000002e4" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{f54757de-ad62-481e-9a37-ab5a8dcdef9f}" id="id-0065-00000027" kind="TwowayOperation" relid="0x4" role="TwowayOperation">
-                <name>set_default_participant_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{173433a3-cb80-465d-9960-3fd457352d60}" id="id-0067-000000cd" kind="InParameter" referred="id-0065-0000005d" relid="0x0" role="InParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{8635d377-08f8-4219-86fb-c93d98d8e7f4}" id="id-0067-000002e5" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{4130315a-e18a-4551-b141-8cb58641b1c6}" id="id-0065-00000028" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-                <name>lookup_participant</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{4bfd6543-86f1-400b-aab8-40cb3faffc6a}" id="id-0067-000000ce" kind="ReturnType" referred="id-0065-0000002c" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{776b9098-3954-4614-8e54-c79f85797d68}" id="id-0067-000002e6" kind="InParameter" referred="id-0067-00000298" relid="0x0" role="InParameter">
-                  <name>domain_id</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{5e9db718-7dd8-4b78-8f29-7afce0c9ec81}" id="id-0065-00000029" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-                <name>delete_participant</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{763b8624-0475-4e4e-98f5-b6c3211e6928}" id="id-0067-000000cf" kind="InParameter" referred="id-0065-0000002c" relid="0x0" role="InParameter">
-                  <name>a_participant</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{e390220e-a3ec-402e-b292-84a90c4589b7}" id="id-0067-000002e7" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{0472a690-d2e1-4737-856e-3f411a1d5ea3}" id="id-0065-0000002a" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                <name>create_participant_with_profile</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{f8d0ed9a-fecd-4389-9300-6d95c6b41898}" id="id-0067-000000d0" kind="InParameter" referred="id-0066-0000003e" relid="0x0" role="InParameter">
-                  <name>profile_name</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>360,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{d32f5a3a-5ae8-481f-8585-f526ad1440d0}" id="id-0067-000000d1" kind="InParameter" referred="id-0066-0000003e" relid="0x0" role="InParameter">
-                  <name>library_name</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{467268db-03b5-4e0c-985f-8594f6f662b7}" id="id-0067-000000d2" kind="InParameter" referred="id-0065-00000092" relid="0x0" role="InParameter">
-                  <name>a_listener</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>460,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{4082c988-87e8-4fa0-97b6-60d63ee3b35f}" id="id-0067-000000d3" kind="ReturnType" referred="id-0065-0000002c" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{65e6a89e-3878-4fbe-8c1a-c3ff03037e12}" id="id-0067-000002e8" kind="InParameter" referred="id-0067-0000027f" relid="0x0" role="InParameter">
-                  <name>mask</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>560,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{675917ad-7652-4f74-bad1-e2090aea6706}" id="id-0067-000002e9" kind="InParameter" referred="id-0067-00000298" relid="0x0" role="InParameter">
-                  <name>domain_id</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{3ce1c5ab-14fe-4956-91a4-d6c6abea5d8b}" id="id-0065-0000002b" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>create_participant</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{c5c06cfb-1ba1-4cf7-b3a1-2e6b2da7421d}" id="id-0067-000000d4" kind="InParameter" referred="id-0065-00000092" relid="0x0" role="InParameter">
-                  <name>a_listener</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>360,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{b05cc2ff-337c-498f-8f1b-05cf478b5396}" id="id-0067-000000d5" kind="InParameter" referred="id-0065-0000005d" relid="0x0" role="InParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{a12326d2-f203-471b-92a1-11b422f87581}" id="id-0067-000000d6" kind="ReturnType" referred="id-0065-0000002c" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{2149a187-35d4-4345-84a1-1fe0acc7a272}" id="id-0067-000002ea" kind="InParameter" referred="id-0067-0000027f" relid="0x0" role="InParameter">
-                  <name>mask</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>460,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{3f515376-3a1e-4294-ba80-168a2da40038}" id="id-0067-000002eb" kind="InParameter" referred="id-0067-00000298" relid="0x0" role="InParameter">
-                  <name>domain_id</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-            </model>
-            <model childrelidcntr="0x28" guid="{adbad2ab-fe31-4027-b268-34d81e9b40bb}" id="id-0065-0000002c" kind="Object" relid="0x51" role="Object">
-              <name>DomainParticipant</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{6fce6d4c-c837-4b60-b354-26410f70df8a}" id="id-0065-0000002d" kind="TwowayOperation" relid="0x26" role="TwowayOperation">
-                <name>get_current_time</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,3860</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{bddfcd19-94cf-4091-aea2-f7cd16871403}" id="id-0067-000000d7" kind="InoutParameter" referred="id-0065-00000118" relid="0x0" role="InoutParameter">
-                  <name>current_time</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{05b63672-5cab-439b-9400-582bff97a774}" id="id-0067-000002ec" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{4dd82f0f-51b8-4b5a-a8dd-e48f8597365e}" id="id-0065-0000002e" kind="TwowayOperation" relid="0x25" role="TwowayOperation">
-                <name>contains_entity</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,3760</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{ba1641bc-ee64-4012-b384-24463440f654}" id="id-0067-00000011" kind="InParameter" referred="id-0067-0000000e" relid="0x0" role="InParameter">
-                  <name>a_handle</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{8ac61c0e-6fc7-4c14-9f8c-00fd2e7d6148}" id="id-0067-000000d8" kind="ReturnType" referred="id-0066-0000004e" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{c27b14e7-4a67-4be7-a03c-66666c054971}" id="id-0065-0000002f" kind="TwowayOperation" relid="0x24" role="TwowayOperation">
-                <name>get_discovered_topic_data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,3660</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{49bfc992-f5df-4d43-b303-99633d71ed51}" id="id-0067-00000012" kind="InParameter" referred="id-0067-0000000e" relid="0x0" role="InParameter">
-                  <name>topic_handle</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{f34c8437-0275-4ecc-92f6-5a0584fe5598}" id="id-0067-000000d9" kind="InoutParameter" referred="id-0065-00000056" relid="0x0" role="InoutParameter">
-                  <name>topic_data</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{a97f7013-a8dd-4c41-8f26-1926fdebe300}" id="id-0067-000002ed" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{3dc43948-20e5-4a27-a2fb-6b4bbdf3cfa6}" id="id-0065-00000030" kind="TwowayOperation" relid="0x23" role="TwowayOperation">
-                <name>get_discovered_topics</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,3560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{c1f37e6b-4fa9-4f5a-afa7-2345eb1b60ae}" id="id-0067-000000da" kind="InoutParameter" referred="id-0067-000000c0" relid="0x0" role="InoutParameter">
-                  <name>topic_handles</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{84876e6a-42a0-4d03-94aa-b308db0742b9}" id="id-0067-000002ee" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{e0495d7e-8cd3-48d5-819c-a59fe3c40c04}" id="id-0065-00000031" kind="TwowayOperation" relid="0x22" role="TwowayOperation">
-                <name>get_discovered_participant_data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,3460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{4e2a47e0-e14e-44c2-a00d-63ff9a58ac0f}" id="id-0067-00000013" kind="InParameter" referred="id-0067-0000000e" relid="0x0" role="InParameter">
-                  <name>participant_handle</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{6b74548a-e564-43dc-9444-efd3bd2d7969}" id="id-0067-000000db" kind="InoutParameter" referred="id-0065-00000057" relid="0x0" role="InoutParameter">
-                  <name>participant_data</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{de9dfffb-6b06-4193-8ee1-f5fd9feb18ba}" id="id-0067-000002ef" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{4e754f33-3463-4d8b-962a-a18fae66410d}" id="id-0065-00000032" kind="TwowayOperation" relid="0x21" role="TwowayOperation">
-                <name>get_discovered_participants</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,3360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{4b89bc26-a2b4-4934-a1dd-e1981eb2b099}" id="id-0067-000000dc" kind="InoutParameter" referred="id-0067-000000c0" relid="0x0" role="InoutParameter">
-                  <name>participant_handles</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{a419422a-9344-4313-a4c4-14d24caab8ec}" id="id-0067-000002f0" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{758fb5e5-b06c-4329-a90f-18960491b1b7}" id="id-0065-00000033" kind="TwowayOperation" relid="0x20" role="TwowayOperation">
-                <name>get_default_topic_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,3260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{8837687d-ef75-465d-8257-b78fbab6bf91}" id="id-0067-000000dd" kind="InoutParameter" referred="id-0065-0000005c" relid="0x0" role="InoutParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{fd2d8d09-c6b8-49c9-a0f8-cc292b81ce21}" id="id-0067-000002f1" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{b416ad7f-4714-4a7d-a7c7-4ce5dfc70110}" id="id-0065-00000034" kind="TwowayOperation" relid="0x1f" role="TwowayOperation">
-                <name>set_default_topic_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,3160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{fa1b9032-40e6-4b97-9732-924fd0d42d07}" id="id-0067-000000de" kind="InParameter" referred="id-0065-0000005c" relid="0x0" role="InParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{edbb3b4c-ad4b-40f6-b3f8-67d78a69610c}" id="id-0067-000002f2" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{0cd5146d-a815-490c-b917-ddc9de5432aa}" id="id-0065-00000035" kind="TwowayOperation" relid="0x1e" role="TwowayOperation">
-                <name>get_default_subscriber_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,3060</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{41a3db01-6842-49e4-8ec4-d6842b2013ff}" id="id-0067-000000df" kind="InoutParameter" referred="id-0065-00000058" relid="0x0" role="InoutParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{7a3120e1-df05-4389-a7cf-71c6d6e8ccb3}" id="id-0067-000002f3" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{128b56ba-1d89-4305-88b1-a64ecb787178}" id="id-0065-00000036" kind="TwowayOperation" relid="0x1d" role="TwowayOperation">
-                <name>set_default_subscriber_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,2960</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{115f6d99-04e5-48cd-95a3-32dcf2e70109}" id="id-0067-000000e0" kind="InParameter" referred="id-0065-00000058" relid="0x0" role="InParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{490eed98-b30a-4ac1-8e9e-07533ab9f1d8}" id="id-0067-000002f4" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{c3bf1dff-8bb1-410a-8306-cd80c6fca52d}" id="id-0065-00000037" kind="TwowayOperation" relid="0x1c" role="TwowayOperation">
-                <name>get_default_publisher_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,2860</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{0cfd0280-a5c3-4552-9cc2-7058cde5fdbf}" id="id-0067-000000e1" kind="InoutParameter" referred="id-0065-0000005a" relid="0x0" role="InoutParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{32c5dd66-4144-4216-bd29-21c675888334}" id="id-0067-000002f5" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{c329253d-b985-4bd5-b4ea-17bf5724fe00}" id="id-0065-00000038" kind="TwowayOperation" relid="0x1b" role="TwowayOperation">
-                <name>set_default_publisher_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,2760</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{ff28657c-0e9b-4625-bf2f-d347fd2f7015}" id="id-0067-000000e2" kind="InParameter" referred="id-0065-0000005a" relid="0x0" role="InParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{09d296d1-2f3c-4d49-9ab6-8e28716c9890}" id="id-0067-000002f6" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{89d187b7-6e2d-4021-bf50-9299fc2fa4d3}" id="id-0065-00000039" kind="TwowayOperation" relid="0x1a" role="TwowayOperation">
-                <name>assert_liveliness</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,2660</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{5fc1cbc0-8c47-42fc-a970-4e162834344c}" id="id-0067-000002f7" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{6c8fdbcd-9398-4275-b9bc-6f0fc879c3ea}" id="id-0065-0000003a" kind="TwowayOperation" relid="0x19" role="TwowayOperation">
-                <name>get_domain_id</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,2560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{9049c76f-05d4-4c5a-a9fd-8be554036db4}" id="id-0067-000002f8" kind="ReturnType" referred="id-0067-00000298" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{6337f55e-fc7f-4e61-8caa-5ee7ab8d7ba9}" id="id-0065-0000003b" kind="TwowayOperation" relid="0x18" role="TwowayOperation">
-                <name>ignore_subscription</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,2460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{4c616eea-1ab0-409e-b8eb-fe8697cef426}" id="id-0067-00000014" kind="InParameter" referred="id-0067-0000000e" relid="0x0" role="InParameter">
-                  <name>handle</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{7912ab17-7fb8-47ae-a2ea-d2dbc93e3887}" id="id-0067-000002f9" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{7d2a36ce-29c2-430a-ac9c-7cdd65155b21}" id="id-0065-0000003c" kind="TwowayOperation" relid="0x17" role="TwowayOperation">
-                <name>ignore_publication</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,2360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{f479077b-2018-4917-945a-5ef5303baa57}" id="id-0067-00000015" kind="InParameter" referred="id-0067-0000000e" relid="0x0" role="InParameter">
-                  <name>handle</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{14a39626-16e8-42c2-bd35-5337c6d0fbb8}" id="id-0067-000002fa" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{d5bb24d4-d4e4-4876-b5f6-7508240446d9}" id="id-0065-0000003d" kind="TwowayOperation" relid="0x16" role="TwowayOperation">
-                <name>ignore_topic</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,2260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{394d409f-bdc7-4f59-9831-6617430cb682}" id="id-0067-00000016" kind="InParameter" referred="id-0067-0000000e" relid="0x0" role="InParameter">
-                  <name>handle</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{0b124489-8800-48fd-b332-de8667926465}" id="id-0067-000002fb" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{4d4b8f5f-cf81-449b-b2f6-872bd32bd5db}" id="id-0065-0000003e" kind="TwowayOperation" relid="0x15" role="TwowayOperation">
-                <name>ignore_participant</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,2160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{01539cc7-a2c2-42bb-92a6-3fd2203d0e41}" id="id-0067-00000017" kind="InParameter" referred="id-0067-0000000e" relid="0x0" role="InParameter">
-                  <name>handle</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{59b7b008-db35-42c3-b56f-d8d68dfcbdef}" id="id-0067-000002fc" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{dc55a1b3-396d-4ac4-9847-90bfd30093d2}" id="id-0065-0000003f" kind="TwowayOperation" relid="0x14" role="TwowayOperation">
-                <name>get_listener</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,2060</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{d15e7d8d-9d46-4ae1-9ac2-2e8c499e1ee2}" id="id-0067-000000e3" kind="ReturnType" referred="id-0065-00000092" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{12fc8be7-116f-46ec-b564-9d18d897a11a}" id="id-0065-00000040" kind="TwowayOperation" relid="0x13" role="TwowayOperation">
-                <name>set_listener</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1960</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{251691d4-8b12-4fa6-b684-d8cfdbb80282}" id="id-0067-000000e4" kind="InParameter" referred="id-0065-00000092" relid="0x0" role="InParameter">
-                  <name>a_listener</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{e54d1be9-7537-4c5c-b740-9b889e9a7e76}" id="id-0067-000002fd" kind="InParameter" referred="id-0067-0000027f" relid="0x0" role="InParameter">
-                  <name>mask</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{938c4114-7ac8-4790-b4a6-8e7c5b2ebe7e}" id="id-0067-000002fe" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{543868eb-2b6e-496c-b4c2-176c5c7970a3}" id="id-0065-00000041" kind="TwowayOperation" relid="0x12" role="TwowayOperation">
-                <name>get_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1860</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{9b1a4dab-78a5-4685-9cbc-c0c42e948804}" id="id-0067-000000e5" kind="InoutParameter" referred="id-0065-0000005d" relid="0x0" role="InoutParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{45196a75-f961-415c-a9a7-b08bd15bbe5c}" id="id-0067-000002ff" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{086f4f5f-e13c-4513-9f2d-7de2e3d30ec5}" id="id-0065-00000042" kind="TwowayOperation" relid="0x11" role="TwowayOperation">
-                <name>set_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1760</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{13199f31-14a6-49b0-86c9-486ef7c4b832}" id="id-0067-000000e6" kind="InParameter" referred="id-0065-0000005d" relid="0x0" role="InParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{1fa31447-a789-41ce-a73e-fb616592267f}" id="id-0067-00000300" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{c2f044a0-dc38-42fd-9a91-55ebf9acccde}" id="id-0065-00000043" kind="TwowayOperation" relid="0x10" role="TwowayOperation">
-                <name>delete_contained_entities</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1660</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{e40a1f57-fd01-420a-b3fd-305b4ad47113}" id="id-0067-00000301" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{db0538ac-f8b4-44e9-baa3-6e574059167b}" id="id-0065-00000044" kind="TwowayOperation" relid="0xf" role="TwowayOperation">
-                <name>delete_multitopic</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{7d35df1b-d557-41f3-ba90-0248bff6defe}" id="id-0067-000000e7" kind="InParameter" referred="id-0065-000000ef" relid="0x0" role="InParameter">
-                  <name>a_multitopic</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{a8516b15-6769-456d-ae17-2c5ee99c8871}" id="id-0067-00000302" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{2dc11291-40d1-4b2c-ae97-2594c9096575}" id="id-0065-00000045" kind="TwowayOperation" relid="0xe" role="TwowayOperation">
-                <name>create_multitopic</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{b553f4ca-68fe-42ea-9f52-dad935a546f5}" id="id-0067-000000e8" kind="InParameter" referred="id-0066-0000003e" relid="0x0" role="InParameter">
-                  <name>subscription_expression</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>360,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{ca454e0f-bcbc-4862-9c41-0bdf6e7a3ed2}" id="id-0067-000000e9" kind="InParameter" referred="id-0066-0000003e" relid="0x0" role="InParameter">
-                  <name>type_name</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{f700a488-b10c-4821-8977-3c0ecd98c844}" id="id-0067-000000ea" kind="InParameter" referred="id-0066-0000003e" relid="0x0" role="InParameter">
-                  <name>name</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{3d5b5a6b-2c10-40ec-a45d-e4f97399ff98}" id="id-0067-000000eb" kind="ReturnType" referred="id-0065-000000ef" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{89695eec-c9da-4338-8666-7bee3106ff37}" id="id-0067-00000303" kind="InParameter" referred="id-0067-00000295" relid="0x0" role="InParameter">
-                  <name>expression_parameters</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>460,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{1338efef-c90f-45bf-a65b-b25776d9bd99}" id="id-0065-00000046" kind="TwowayOperation" relid="0xd" role="TwowayOperation">
-                <name>delete_contentfilteredtopic</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{31fae1fa-5c38-4f82-9ac7-c798999fa6fa}" id="id-0067-000000ec" kind="InParameter" referred="id-0065-000000f3" relid="0x0" role="InParameter">
-                  <name>a_contentfilteredtopic</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{3674aaaa-5fd1-4c05-98c4-c99689e3e1df}" id="id-0067-00000304" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{12d37d0c-69c4-4aa0-9213-7af9034e957d}" id="id-0065-00000047" kind="TwowayOperation" relid="0xc" role="TwowayOperation">
-                <name>create_contentfilteredtopic</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{d9ad90ee-d6b8-403d-bbc4-5455880a6be6}" id="id-0067-000000ed" kind="InParameter" referred="id-0066-0000003e" relid="0x0" role="InParameter">
-                  <name>filter_expression</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>360,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{17b7cf4a-2a8e-413b-915c-57a94636138d}" id="id-0067-000000ee" kind="InParameter" referred="id-0066-0000003e" relid="0x0" role="InParameter">
-                  <name>name</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{24750656-187f-4b50-8341-8d821758acdf}" id="id-0067-000000ef" kind="InParameter" referred="id-0065-000000f8" relid="0x0" role="InParameter">
-                  <name>related_topic</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{21a67334-ad16-4f72-b547-cccc13ab10fa}" id="id-0067-000000f0" kind="ReturnType" referred="id-0065-000000f3" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{1a23c6bb-ab8d-4230-91ba-4e9690a3e514}" id="id-0067-00000305" kind="InParameter" referred="id-0067-00000295" relid="0x0" role="InParameter">
-                  <name>expression_parameters</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>460,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{91c52ba0-87a4-44bd-983e-8bb82915a40d}" id="id-0065-00000048" kind="TwowayOperation" relid="0xb" role="TwowayOperation">
-                <name>lookup_topicdescription</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{16006c5d-9f58-4ae2-8ed0-2a29932677f9}" id="id-0067-000000f1" kind="InParameter" referred="id-0066-0000003e" relid="0x0" role="InParameter">
-                  <name>name</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{a99b4bd1-fed9-4b6f-b30a-1a6873368964}" id="id-0067-000000f2" kind="ReturnType" referred="id-0065-000000fe" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{58160d02-77ed-4143-a960-ecce9f570018}" id="id-0065-00000049" kind="TwowayOperation" relid="0xa" role="TwowayOperation">
-                <name>find_topic</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1060</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{d859af0b-492b-4ced-bfab-cd360c038fe2}" id="id-0067-000000f3" kind="InParameter" referred="id-0066-0000003e" relid="0x0" role="InParameter">
-                  <name>topic_name</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{f3c31cc8-7f69-4310-9c3d-ee0aafb573f5}" id="id-0067-000000f4" kind="InParameter" referred="id-0065-00000119" relid="0x0" role="InParameter">
-                  <name>timeout</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{884e3058-2897-4e00-8a29-01ef193d4e08}" id="id-0067-000000f5" kind="ReturnType" referred="id-0065-000000f8" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{e640ed42-df31-4f81-93d6-aaee63fdceb4}" id="id-0065-0000004a" kind="TwowayOperation" relid="0x9" role="TwowayOperation">
-                <name>delete_topic</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,960</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{905ab556-9e6b-4425-b83c-bc83aff9a7d1}" id="id-0067-000000f6" kind="InParameter" referred="id-0065-000000f8" relid="0x0" role="InParameter">
-                  <name>a_topic</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{38dff28f-ed5a-45d8-89cc-edfc6581f0dd}" id="id-0067-00000306" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{0f940ffb-b482-4581-baed-cc7a1b0bf9a1}" id="id-0065-0000004b" kind="TwowayOperation" relid="0x8" role="TwowayOperation">
-                <name>create_topic_with_profile</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,860</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{28c9cfdd-3e8a-4a1a-b74a-1e31de095c8e}" id="id-0067-000000f7" kind="InParameter" referred="id-0066-0000003e" relid="0x0" role="InParameter">
-                  <name>profile_name</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>460,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{ad625c85-07d5-4bdf-8943-3efec1ca7b49}" id="id-0067-000000f8" kind="InParameter" referred="id-0066-0000003e" relid="0x0" role="InParameter">
-                  <name>library_name</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>360,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{da0571fb-0964-48ec-b26e-5dcd45a14581}" id="id-0067-000000f9" kind="InParameter" referred="id-0066-0000003e" relid="0x0" role="InParameter">
-                  <name>type_name</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{029f4052-ee01-4d95-9ad2-444fc1d30603}" id="id-0067-000000fa" kind="InParameter" referred="id-0066-0000003e" relid="0x0" role="InParameter">
-                  <name>topic_name</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{73475718-4991-4669-a54e-5205f10de2c6}" id="id-0067-000000fb" kind="InParameter" referred="id-0065-000000a5" relid="0x0" role="InParameter">
-                  <name>a_listener</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>560,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{83c05f2e-78aa-4e93-8e62-64fb7b698c7b}" id="id-0067-000000fc" kind="ReturnType" referred="id-0065-000000f8" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{a6419720-dba3-428b-9dbb-120f57066c87}" id="id-0067-00000307" kind="InParameter" referred="id-0067-0000027f" relid="0x0" role="InParameter">
-                  <name>mask</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>660,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{5af04129-2734-46d2-babf-d6a6b4316fad}" id="id-0065-0000004c" kind="TwowayOperation" relid="0x7" role="TwowayOperation">
-                <name>create_topic</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,760</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{56602453-5cac-4a29-bf15-7361b730be6d}" id="id-0067-000000fd" kind="InParameter" referred="id-0066-0000003e" relid="0x0" role="InParameter">
-                  <name>type_name</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{c62c0c58-6204-473b-b78f-5719d007aa4e}" id="id-0067-000000fe" kind="InParameter" referred="id-0066-0000003e" relid="0x0" role="InParameter">
-                  <name>topic_name</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{0ab3874c-d2bf-4462-8000-ab8b4f3b02ce}" id="id-0067-000000ff" kind="InParameter" referred="id-0065-000000a5" relid="0x0" role="InParameter">
-                  <name>a_listener</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>460,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{907b5437-39ce-4fc4-974d-41e00266b640}" id="id-0067-00000100" kind="InParameter" referred="id-0065-0000005c" relid="0x0" role="InParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>360,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{6cd0a48f-b5af-4db6-9c63-a79ba779a488}" id="id-0067-00000101" kind="ReturnType" referred="id-0065-000000f8" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{e74035a6-c8c4-405a-8051-8c4d11735cc8}" id="id-0067-00000308" kind="InParameter" referred="id-0067-0000027f" relid="0x0" role="InParameter">
-                  <name>mask</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>560,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{088936e8-802f-48cc-8fb8-704514d1ff74}" id="id-0065-0000004d" kind="TwowayOperation" relid="0x6" role="TwowayOperation">
-                <name>get_builtin_subscriber</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,660</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{20169755-3c31-4477-967c-e0b7ad76a87e}" id="id-0067-00000102" kind="ReturnType" referred="id-0065-000000ba" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{b3f885a3-5f06-4f80-ac51-76e2354a5f71}" id="id-0065-0000004e" kind="TwowayOperation" relid="0x5" role="TwowayOperation">
-                <name>delete_subscriber</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{ffed51e2-201b-4634-b99a-274d9fafe3b8}" id="id-0067-00000103" kind="InParameter" referred="id-0065-000000ba" relid="0x0" role="InParameter">
-                  <name>s</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{491fe4b7-1197-4b25-aa39-d73d9289d017}" id="id-0067-00000309" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{4a0f5f77-add2-4a39-b8f2-5914531b73a8}" id="id-0065-0000004f" kind="TwowayOperation" relid="0x4" role="TwowayOperation">
-                <name>create_subscriber_with_profile</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{c902f4b3-5c28-496c-8445-ee3c8dd28a2d}" id="id-0067-00000104" kind="InParameter" referred="id-0066-0000003e" relid="0x0" role="InParameter">
-                  <name>profile_name</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{f6e61b84-c21d-4753-a82d-62a5c43c832a}" id="id-0067-00000105" kind="InParameter" referred="id-0066-0000003e" relid="0x0" role="InParameter">
-                  <name>library_name</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{ff25f43b-1477-40b9-819b-3601b505e3a8}" id="id-0067-00000106" kind="InParameter" referred="id-0065-00000093" relid="0x0" role="InParameter">
-                  <name>a_listener</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>360,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{9f1b2807-bc7b-42ea-8fcc-c6f8d54c496e}" id="id-0067-00000107" kind="ReturnType" referred="id-0065-000000ba" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{4b5e21cb-a0a4-4d52-b411-9178b9559637}" id="id-0067-0000030a" kind="InParameter" referred="id-0067-0000027f" relid="0x0" role="InParameter">
-                  <name>mask</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>460,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{92f68ffe-d20d-4e41-b4f3-fa409878e14a}" id="id-0065-00000050" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-                <name>create_subscriber</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{f34ba127-eb23-4977-9469-007cc1d5d551}" id="id-0067-00000108" kind="InParameter" referred="id-0065-00000093" relid="0x0" role="InParameter">
-                  <name>a_listener</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{6f2085f7-30ab-48ef-be30-25d267d1486c}" id="id-0067-00000109" kind="InParameter" referred="id-0065-00000058" relid="0x0" role="InParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{c3f95a33-4686-4aef-8310-034e358030ca}" id="id-0067-0000010a" kind="ReturnType" referred="id-0065-000000ba" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{92ada6e9-5fda-40d4-b92d-af48cd36dc53}" id="id-0067-0000030b" kind="InParameter" referred="id-0067-0000027f" relid="0x0" role="InParameter">
-                  <name>mask</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>360,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{514c959c-2e91-47d1-93aa-727d7655aea5}" id="id-0065-00000051" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-                <name>delete_publisher</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{1dbd09f1-2033-4370-b145-384ed4240df7}" id="id-0067-0000010b" kind="InParameter" referred="id-0065-000000a7" relid="0x0" role="InParameter">
-                  <name>p</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{28a89f80-e0be-4ff1-bb5b-6bb6f42fd1b3}" id="id-0067-0000030c" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{97adace4-5ab0-4f2c-be4a-54f3e413816d}" id="id-0065-00000052" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                <name>create_publisher_with_profile</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{afdac122-bee2-484c-9a50-099abadbbbfa}" id="id-0067-0000010c" kind="InParameter" referred="id-0066-0000003e" relid="0x0" role="InParameter">
-                  <name>profile_name</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{a84cdc29-91b8-4e23-925d-31eee31bd934}" id="id-0067-0000010d" kind="InParameter" referred="id-0066-0000003e" relid="0x0" role="InParameter">
-                  <name>library_name</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{d2b69164-88fd-487f-bbf6-801ace2a21cb}" id="id-0067-0000010e" kind="InParameter" referred="id-0065-0000009d" relid="0x0" role="InParameter">
-                  <name>a_listener</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>360,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{fa3c8080-819f-40b6-a9b9-07982de8837a}" id="id-0067-0000010f" kind="ReturnType" referred="id-0065-000000a7" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{534a2637-1b2a-42ec-ba93-ef97cddaee5f}" id="id-0067-0000030d" kind="InParameter" referred="id-0067-0000027f" relid="0x0" role="InParameter">
-                  <name>mask</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>460,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{c8fde55c-1bc5-43ee-a1ad-d0128c992d70}" id="id-0065-00000053" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>create_publisher</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{87e3fc46-8293-489c-afac-d5b63f899fe4}" id="id-0067-00000110" kind="InParameter" referred="id-0065-0000009d" relid="0x0" role="InParameter">
-                  <name>a_listener</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{4f7cb5a1-4b55-4990-8cb7-30805bdcbaf8}" id="id-0067-00000111" kind="InParameter" referred="id-0065-0000005a" relid="0x0" role="InParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{3a6369f1-9ffa-42af-abf1-17d0cecb3264}" id="id-0067-00000112" kind="ReturnType" referred="id-0065-000000a7" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{27367b8e-01b0-46a8-9601-bd17713a19e1}" id="id-0067-0000030e" kind="InParameter" referred="id-0067-0000027f" relid="0x0" role="InParameter">
-                  <name>mask</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>360,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <reference guid="{5863ff9d-d433-44ba-a111-feabffd00e26}" id="id-0067-00000113" kind="Inherits" referred="id-0065-00000102" relid="0x27" role="Inherits">
-                <name>Inherits</name>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{c26aeb2a-96c1-4b36-940d-42eec8123db6}" id="id-0065-00000054" kind="Aggregate" relid="0x50" role="Aggregate">
-              <name>SubscriptionBuiltinTopicData</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{9342c04a-4f17-4418-a928-08406abad35a}" id="id-0067-00000114" kind="Member" referred="id-0066-0000003e" relid="0x0" role="Member">
-                <name>type_name</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{62f7f8e6-0422-4dc9-a981-62585849a9c3}" id="id-0067-00000115" kind="Member" referred="id-0066-0000003e" relid="0x0" role="Member">
-                <name>topic_name</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{3a2f2a70-a965-4044-8ac7-4198d7b7b45e}" id="id-0067-00000116" kind="Member" referred="id-0065-00000079" relid="0x0" role="Member">
-                <name>group_data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1660</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{f5d49385-2094-4b5f-b689-6f486d9434f5}" id="id-0067-00000117" kind="Member" referred="id-0065-0000007a" relid="0x0" role="Member">
-                <name>topic_data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{812b0b1d-cf37-4f78-80fb-1a5082067c90}" id="id-0067-00000118" kind="Member" referred="id-0065-0000006a" relid="0x0" role="Member">
-                <name>partition</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{29d7e235-fe4b-40ce-8377-d2dc327847be}" id="id-0067-00000119" kind="Member" referred="id-0065-00000073" relid="0x0" role="Member">
-                <name>presentation</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{268b0ea6-c4c9-439f-bc05-663169532974}" id="id-0067-0000011a" kind="Member" referred="id-0065-0000006b" relid="0x0" role="Member">
-                <name>time_based_filter</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{7ae8363a-13a0-4c1e-be9a-3e5923dbe1c3}" id="id-0067-0000011b" kind="Member" referred="id-0065-0000007b" relid="0x0" role="Member">
-                <name>user_data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{8d2c75aa-031c-4a8e-8bc9-5771fa5198ee}" id="id-0067-0000011c" kind="Member" referred="id-0065-00000066" relid="0x0" role="Member">
-                <name>destination_order</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1060</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{1cc8aa76-8048-4119-97f8-b591845ad95a}" id="id-0067-0000011d" kind="Member" referred="id-0065-0000006f" relid="0x0" role="Member">
-                <name>ownership</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,960</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{49bad0fb-0561-4ce2-9689-8ecfdcc4866f}" id="id-0067-0000011e" kind="Member" referred="id-0065-00000068" relid="0x0" role="Member">
-                <name>reliability</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,860</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{99ec8a4b-f7f8-460e-b8e0-9a5708343f4e}" id="id-0067-0000011f" kind="Member" referred="id-0065-0000006c" relid="0x0" role="Member">
-                <name>liveliness</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,760</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{1647c2c4-22bb-42a7-bec7-d3e24031bc32}" id="id-0067-00000120" kind="Member" referred="id-0065-00000071" relid="0x0" role="Member">
-                <name>latency_budget</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,660</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{309c21a6-5f73-40e0-a332-97718d42617f}" id="id-0067-00000121" kind="Member" referred="id-0065-00000072" relid="0x0" role="Member">
-                <name>deadline</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{6402f6f6-6348-4450-b54f-0c546cfa5b8f}" id="id-0067-00000122" kind="Member" referred="id-0065-00000075" relid="0x0" role="Member">
-                <name>durability</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{ec72bb7a-e715-4ccd-a5e5-52582cdd4beb}" id="id-0067-00000123" kind="Member" referred="id-0065-0000011a" relid="0x0" role="Member">
-                <name>participant_key</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{4e51c86b-f1e9-4739-8438-076ef6b1e16e}" id="id-0067-00000124" kind="Member" referred="id-0065-0000011a" relid="0x0" role="Member">
-                <name>key</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{d6a2cf29-0b4f-4e8c-aea7-874f14043462}" id="id-0065-00000055" kind="Aggregate" relid="0x4f" role="Aggregate">
-              <name>PublicationBuiltinTopicData</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{0a141642-e12e-4ac5-a872-a970a8ffbe4c}" id="id-0067-00000125" kind="Member" referred="id-0066-0000003e" relid="0x0" role="Member">
-                <name>type_name</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{94428c6c-cef2-4092-b960-b153c7e4dea8}" id="id-0067-00000126" kind="Member" referred="id-0066-0000003e" relid="0x0" role="Member">
-                <name>topic_name</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{fb4beee6-479d-4b40-9156-a995c06774f1}" id="id-0067-00000127" kind="Member" referred="id-0065-00000079" relid="0x0" role="Member">
-                <name>group_data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1860</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{55315601-9b0b-4c16-99f9-bf75b54b075e}" id="id-0067-00000128" kind="Member" referred="id-0065-0000007a" relid="0x0" role="Member">
-                <name>topic_data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1760</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{04d93761-36bc-46f7-9181-c18877c2fc8c}" id="id-0067-00000129" kind="Member" referred="id-0065-0000006a" relid="0x0" role="Member">
-                <name>partition</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1660</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{df1cc389-715b-49b5-a3da-fa14045eb638}" id="id-0067-0000012a" kind="Member" referred="id-0065-00000073" relid="0x0" role="Member">
-                <name>presentation</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{caf54c3f-127a-42a0-9284-51e89cb34f2a}" id="id-0067-0000012b" kind="Member" referred="id-0065-00000066" relid="0x0" role="Member">
-                <name>destination_order</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{e654a5f6-b0bf-4d6b-9488-04ea35ba6172}" id="id-0067-0000012c" kind="Member" referred="id-0065-0000006e" relid="0x0" role="Member">
-                <name>ownership_strength</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{3e571104-51ea-42fb-9d97-5cac48a97bd7}" id="id-0067-0000012d" kind="Member" referred="id-0065-0000006f" relid="0x0" role="Member">
-                <name>ownership</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{6f0f0e3e-ca32-4c18-9147-e2fb6ba365d6}" id="id-0067-0000012e" kind="Member" referred="id-0065-0000007b" relid="0x0" role="Member">
-                <name>user_data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{5acc1014-0f9c-4aaa-b162-3d464fd6ab4a}" id="id-0067-0000012f" kind="Member" referred="id-0065-00000077" relid="0x0" role="Member">
-                <name>lifespan</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1060</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{e1164fd0-8a8d-4a14-a558-a43e92a7535c}" id="id-0067-00000130" kind="Member" referred="id-0065-00000068" relid="0x0" role="Member">
-                <name>reliability</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,960</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{098876d8-a496-4f36-910d-bd4ae426180a}" id="id-0067-00000131" kind="Member" referred="id-0065-0000006c" relid="0x0" role="Member">
-                <name>liveliness</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,860</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{18d212a7-81d6-493e-a187-2f2269007044}" id="id-0067-00000132" kind="Member" referred="id-0065-00000071" relid="0x0" role="Member">
-                <name>latency_budget</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,760</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{f66233b3-97f0-4183-97a5-1f5fc9a7744f}" id="id-0067-00000133" kind="Member" referred="id-0065-00000072" relid="0x0" role="Member">
-                <name>deadline</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,660</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{435a2530-9905-4a2a-9dc0-8293d3f1f658}" id="id-0067-00000134" kind="Member" referred="id-0065-0000005f" relid="0x0" role="Member">
-                <name>durability_service</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{19aee622-60df-40f6-8434-979ee6000124}" id="id-0067-00000135" kind="Member" referred="id-0065-00000075" relid="0x0" role="Member">
-                <name>durability</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{b0007b0a-29e8-48c6-a7dd-83b56c723775}" id="id-0067-00000136" kind="Member" referred="id-0065-0000011a" relid="0x0" role="Member">
-                <name>participant_key</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{322986af-0d46-44fa-93fc-edc57452abe6}" id="id-0067-00000137" kind="Member" referred="id-0065-0000011a" relid="0x0" role="Member">
-                <name>key</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{2bd37d3a-9a67-4ef1-a1f8-fbbc2b51723f}" id="id-0065-00000056" kind="Aggregate" relid="0x4e" role="Aggregate">
-              <name>TopicBuiltinTopicData</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{6e203ff9-56a2-4e0d-b13b-46eb029b618d}" id="id-0067-00000138" kind="Member" referred="id-0066-0000003e" relid="0x0" role="Member">
-                <name>type_name</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{be5ded00-6080-42ca-a729-ef08939b5bef}" id="id-0067-00000139" kind="Member" referred="id-0066-0000003e" relid="0x0" role="Member">
-                <name>name</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{f19a9151-2614-4a85-bd89-66e0ff11416d}" id="id-0067-0000013a" kind="Member" referred="id-0065-0000007a" relid="0x0" role="Member">
-                <name>topic_data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{737fb5c5-07d8-4862-8519-c1299ddcb421}" id="id-0067-0000013b" kind="Member" referred="id-0065-0000006f" relid="0x0" role="Member">
-                <name>ownership</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{8ac6eb4f-2f26-4ed0-a667-133233092ea1}" id="id-0067-0000013c" kind="Member" referred="id-0065-00000063" relid="0x0" role="Member">
-                <name>resource_limits</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{10465536-fc3b-4701-9d0a-3159e43be578}" id="id-0067-0000013d" kind="Member" referred="id-0065-00000064" relid="0x0" role="Member">
-                <name>history</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{89f2277c-d997-4259-a91e-a752f9d9aaf4}" id="id-0067-0000013e" kind="Member" referred="id-0065-00000066" relid="0x0" role="Member">
-                <name>destination_order</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{6ec7265a-72e8-4982-bd02-c55a2d5d9c00}" id="id-0067-0000013f" kind="Member" referred="id-0065-00000077" relid="0x0" role="Member">
-                <name>lifespan</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1060</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{76c22efb-eda4-4f76-8c13-a79d5ca4cb9b}" id="id-0067-00000140" kind="Member" referred="id-0065-00000078" relid="0x0" role="Member">
-                <name>transport_priority</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,960</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{fa16155c-7949-4ba1-b8aa-0fc8d9f4e491}" id="id-0067-00000141" kind="Member" referred="id-0065-00000068" relid="0x0" role="Member">
-                <name>reliability</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,860</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{237cc5ca-046d-45c1-929f-1ae92e859ecc}" id="id-0067-00000142" kind="Member" referred="id-0065-0000006c" relid="0x0" role="Member">
-                <name>liveliness</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,760</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{b3976ba1-0d26-4df7-a64e-0a564b1ed436}" id="id-0067-00000143" kind="Member" referred="id-0065-00000071" relid="0x0" role="Member">
-                <name>latency_budget</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,660</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{640eeb42-3323-4378-8704-f8cfebb5d9e4}" id="id-0067-00000144" kind="Member" referred="id-0065-00000072" relid="0x0" role="Member">
-                <name>deadline</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{d7753d28-9a6d-4df6-bb22-2f8b2de38c2c}" id="id-0067-00000145" kind="Member" referred="id-0065-0000005f" relid="0x0" role="Member">
-                <name>durability_service</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{86c5afa3-a1be-41eb-b069-e380608e8e48}" id="id-0067-00000146" kind="Member" referred="id-0065-00000075" relid="0x0" role="Member">
-                <name>durability</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{6b3ce870-f78f-4fd2-a63e-797f9e6a650e}" id="id-0067-00000147" kind="Member" referred="id-0065-0000011a" relid="0x0" role="Member">
-                <name>key</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{6d7fa318-c5c6-452d-9ece-ca1ab5aef753}" id="id-0065-00000057" kind="Aggregate" relid="0x4d" role="Aggregate">
-              <name>ParticipantBuiltinTopicData</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{0647706a-1b80-4ef7-b901-cb14181598ee}" id="id-0067-00000148" kind="Member" referred="id-0065-0000007b" relid="0x0" role="Member">
-                <name>user_data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{fbeff137-5e5f-40ec-a672-6a2bbcce8923}" id="id-0067-00000149" kind="Member" referred="id-0065-0000011a" relid="0x0" role="Member">
-                <name>key</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{ad48c95c-f86c-4bd5-b12c-c7eba6432e44}" id="id-0065-00000058" kind="Aggregate" relid="0x4c" role="Aggregate">
-              <name>SubscriberQos</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{beecdcab-928f-4f06-baeb-b36efa54fb4f}" id="id-0067-0000014a" kind="Member" referred="id-0065-00000062" relid="0x0" role="Member">
-                <name>entity_factory</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{1eceadee-ea1a-4f28-b95e-da8b38db62eb}" id="id-0067-0000014b" kind="Member" referred="id-0065-00000079" relid="0x0" role="Member">
-                <name>group_data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{a8cd770b-55e5-4041-a5cd-fdacf4c2ed66}" id="id-0067-0000014c" kind="Member" referred="id-0065-0000006a" relid="0x0" role="Member">
-                <name>partition</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{aa9100b8-993a-44c6-8a8b-60e102804fdf}" id="id-0067-0000014d" kind="Member" referred="id-0065-00000073" relid="0x0" role="Member">
-                <name>presentation</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{5d8504b8-9924-4d9f-8454-057da8c34ac6}" id="id-0065-00000059" kind="Aggregate" relid="0x4b" role="Aggregate">
-              <name>DataReaderQos</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{066817f2-148d-4524-a7dc-03864e563b7c}" id="id-0067-0000014e" kind="Member" referred="id-0065-00000060" relid="0x0" role="Member">
-                <name>reader_data_lifecycle</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{ae2ac85f-4ca8-4719-9b75-d1eb2f8d6d64}" id="id-0067-0000014f" kind="Member" referred="id-0065-0000006b" relid="0x0" role="Member">
-                <name>time_based_filter</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1060</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{8d486a1b-fc87-44bd-a0dd-43269adae313}" id="id-0067-00000150" kind="Member" referred="id-0065-0000006f" relid="0x0" role="Member">
-                <name>ownership</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,960</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{75038eb6-12d7-4b05-a3ca-0b56c09289de}" id="id-0067-00000151" kind="Member" referred="id-0065-0000007b" relid="0x0" role="Member">
-                <name>user_data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,860</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{9ea85702-c298-499e-b8d5-a3a5119c6ad8}" id="id-0067-00000152" kind="Member" referred="id-0065-00000063" relid="0x0" role="Member">
-                <name>resource_limits</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,760</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{1af79dc4-80df-44b4-b755-b78c130504c9}" id="id-0067-00000153" kind="Member" referred="id-0065-00000064" relid="0x0" role="Member">
-                <name>history</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,660</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{d06b2587-7836-47a3-8db4-0fd9b1a35cc4}" id="id-0067-00000154" kind="Member" referred="id-0065-00000066" relid="0x0" role="Member">
-                <name>destination_order</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{c598c25e-4b38-40ac-9481-73d226446408}" id="id-0067-00000155" kind="Member" referred="id-0065-00000068" relid="0x0" role="Member">
-                <name>reliability</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{2748857a-a261-47a7-8697-43989a3016c9}" id="id-0067-00000156" kind="Member" referred="id-0065-0000006c" relid="0x0" role="Member">
-                <name>liveliness</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{16d3543d-99da-4ab2-982e-b307a74938c7}" id="id-0067-00000157" kind="Member" referred="id-0065-00000071" relid="0x0" role="Member">
-                <name>latency_budget</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{2e3cb73e-6c5b-4166-8d8d-80586358ce71}" id="id-0067-00000158" kind="Member" referred="id-0065-00000072" relid="0x0" role="Member">
-                <name>deadline</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{a8a7970b-a25c-45af-9e9e-65d1d36f8b25}" id="id-0067-00000159" kind="Member" referred="id-0065-00000075" relid="0x0" role="Member">
-                <name>durability</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{05f323d2-bea1-4cd9-97d2-9d2d15244fbc}" id="id-0065-0000005a" kind="Aggregate" relid="0x4a" role="Aggregate">
-              <name>PublisherQos</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{95c00a23-9a51-4bbd-b7b2-8b10a62bb323}" id="id-0067-0000015a" kind="Member" referred="id-0065-00000062" relid="0x0" role="Member">
-                <name>entity_factory</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{96603f31-1a32-43d3-955c-7de1350608af}" id="id-0067-0000015b" kind="Member" referred="id-0065-00000079" relid="0x0" role="Member">
-                <name>group_data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{6fa8ae61-0ba5-4fcd-b0dc-0f3f94fb0903}" id="id-0067-0000015c" kind="Member" referred="id-0065-0000006a" relid="0x0" role="Member">
-                <name>partition</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{507c41be-ceb6-4a51-960b-f79f086b46e9}" id="id-0067-0000015d" kind="Member" referred="id-0065-00000073" relid="0x0" role="Member">
-                <name>presentation</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{142090e7-4afa-40f9-a7b7-acca45b58f89}" id="id-0065-0000005b" kind="Aggregate" relid="0x49" role="Aggregate">
-              <name>DataWriterQos</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{2a7f428e-f781-4d5a-8614-6fbab50ec1f9}" id="id-0067-0000015e" kind="Member" referred="id-0065-00000061" relid="0x0" role="Member">
-                <name>writer_data_lifecycle</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{6eb4257c-6a47-42dd-9585-971b6f1e591b}" id="id-0067-0000015f" kind="Member" referred="id-0065-0000006e" relid="0x0" role="Member">
-                <name>ownership_strength</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{82ac8d4d-96de-401e-9a0d-09f02332e7ca}" id="id-0067-00000160" kind="Member" referred="id-0065-0000006f" relid="0x0" role="Member">
-                <name>ownership</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{5323a935-6a62-44c5-9149-ccabb2ee80ba}" id="id-0067-00000161" kind="Member" referred="id-0065-0000007b" relid="0x0" role="Member">
-                <name>user_data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{43b72f95-f755-4253-9693-34052ad1b3dc}" id="id-0067-00000162" kind="Member" referred="id-0065-00000077" relid="0x0" role="Member">
-                <name>lifespan</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1060</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{74fdb0e3-5d0e-481f-9985-f8d33b72b238}" id="id-0067-00000163" kind="Member" referred="id-0065-00000078" relid="0x0" role="Member">
-                <name>transport_priority</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,960</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{2f93bc29-54a3-41cc-adb4-f54c99330b5a}" id="id-0067-00000164" kind="Member" referred="id-0065-00000063" relid="0x0" role="Member">
-                <name>resource_limits</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,860</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{cae97f14-b966-4b09-852d-3f3112b8a57e}" id="id-0067-00000165" kind="Member" referred="id-0065-00000064" relid="0x0" role="Member">
-                <name>history</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,760</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{318a73ee-29f7-4651-b9b7-654d6b956ac9}" id="id-0067-00000166" kind="Member" referred="id-0065-00000066" relid="0x0" role="Member">
-                <name>destination_order</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,660</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{872e8c21-6318-4ab5-a1d4-890ee96fc4ce}" id="id-0067-00000167" kind="Member" referred="id-0065-00000068" relid="0x0" role="Member">
-                <name>reliability</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{dd5d7b74-74d4-4f7f-8110-a098f5052b14}" id="id-0067-00000168" kind="Member" referred="id-0065-0000006c" relid="0x0" role="Member">
-                <name>liveliness</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{9d9aa4a9-e988-4b14-b328-862ee8be23e3}" id="id-0067-00000169" kind="Member" referred="id-0065-00000071" relid="0x0" role="Member">
-                <name>latency_budget</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{161dce72-3f95-4cc7-9a75-da9564ca3aea}" id="id-0067-0000016a" kind="Member" referred="id-0065-00000072" relid="0x0" role="Member">
-                <name>deadline</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{40bb7cad-1c21-4c1c-97d5-74e80222eb35}" id="id-0067-0000016b" kind="Member" referred="id-0065-0000005f" relid="0x0" role="Member">
-                <name>durability_service</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{dbc6fe81-1bc3-4cac-acd0-8d819637963a}" id="id-0067-0000016c" kind="Member" referred="id-0065-00000075" relid="0x0" role="Member">
-                <name>durability</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{d3a0c983-29d0-43c8-8bd8-29d44ba1f655}" id="id-0065-0000005c" kind="Aggregate" relid="0x48" role="Aggregate">
-              <name>TopicQos</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{94a5ca2d-6006-413c-9599-7b78c7ae6318}" id="id-0067-0000016d" kind="Member" referred="id-0065-0000006f" relid="0x0" role="Member">
-                <name>ownership</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{a1a4d783-fc7d-4b24-b6c5-7dd4ceb8f78d}" id="id-0067-0000016e" kind="Member" referred="id-0065-00000077" relid="0x0" role="Member">
-                <name>lifespan</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{1621cc44-b1e0-4e97-a19c-4d8cffdb85a8}" id="id-0067-0000016f" kind="Member" referred="id-0065-00000078" relid="0x0" role="Member">
-                <name>transport_priority</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1060</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{fc6db77a-da19-4c24-9b38-f4adaf495ea0}" id="id-0067-00000170" kind="Member" referred="id-0065-00000063" relid="0x0" role="Member">
-                <name>resource_limits</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,960</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{7061f8ed-86da-493c-a821-871b8b50983d}" id="id-0067-00000171" kind="Member" referred="id-0065-00000064" relid="0x0" role="Member">
-                <name>history</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,860</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{65e2a28d-1333-461f-8fce-fc49b1255cc3}" id="id-0067-00000172" kind="Member" referred="id-0065-00000066" relid="0x0" role="Member">
-                <name>destination_order</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,760</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{9070def0-791b-4252-ba41-0fe9742ff8fd}" id="id-0067-00000173" kind="Member" referred="id-0065-00000068" relid="0x0" role="Member">
-                <name>reliability</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,660</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{2c72abea-95b5-48ba-8778-92dcf8ea5212}" id="id-0067-00000174" kind="Member" referred="id-0065-0000006c" relid="0x0" role="Member">
-                <name>liveliness</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{fce43b52-4868-4e1f-a9b0-d113954a6e1e}" id="id-0067-00000175" kind="Member" referred="id-0065-00000071" relid="0x0" role="Member">
-                <name>latency_budget</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{ceea4172-e125-48b6-af32-c92321bcb497}" id="id-0067-00000176" kind="Member" referred="id-0065-00000072" relid="0x0" role="Member">
-                <name>deadline</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{ef026d4c-df93-4537-862c-1f6d6e96f209}" id="id-0067-00000177" kind="Member" referred="id-0065-0000005f" relid="0x0" role="Member">
-                <name>durability_service</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{8cd8f79d-6a29-471e-b0bb-cc5d6b7ffe34}" id="id-0067-00000178" kind="Member" referred="id-0065-00000075" relid="0x0" role="Member">
-                <name>durability</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{d104f47a-95f8-4d58-aad8-19e32111c9f1}" id="id-0067-00000179" kind="Member" referred="id-0065-0000007a" relid="0x0" role="Member">
-                <name>topic_data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{80880e1a-6bf3-4fad-8983-6703f02306de}" id="id-0065-0000005d" kind="Aggregate" relid="0x47" role="Aggregate">
-              <name>DomainParticipantQos</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{ae9c7b4c-817a-4eeb-9ac6-442d42d6ac8c}" id="id-0067-0000017a" kind="Member" referred="id-0065-00000062" relid="0x0" role="Member">
-                <name>entity_factory</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{38a14857-e704-4a13-ad7b-d54be2b3ae21}" id="id-0067-0000017b" kind="Member" referred="id-0065-0000007b" relid="0x0" role="Member">
-                <name>user_data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{e01cafd0-be06-4610-bff3-cf897ea84212}" id="id-0065-0000005e" kind="Aggregate" relid="0x46" role="Aggregate">
-              <name>DomainParticipantFactoryQos</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{7adb24c4-6ca5-4543-85ac-a114f06ef16a}" id="id-0067-0000017c" kind="Member" referred="id-0065-00000062" relid="0x0" role="Member">
-                <name>entity_factory</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{66cb25d0-4e81-4929-a939-d2e4008a3c0d}" id="id-0065-0000005f" kind="Aggregate" relid="0x45" role="Aggregate">
-              <name>DurabilityServiceQosPolicy</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{7cf79540-2e2c-4b32-a441-9c6f0448d7e2}" id="id-0067-0000017d" kind="Member" referred="id-0066-00000049" relid="0x0" role="Member">
-                <name>max_samples_per_instance</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{443d629e-763c-4995-9222-0aa69f824604}" id="id-0067-0000017e" kind="Member" referred="id-0066-00000049" relid="0x0" role="Member">
-                <name>max_instances</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{028068fb-4140-47a0-82a3-7481a1fd5f55}" id="id-0067-0000017f" kind="Member" referred="id-0066-00000049" relid="0x0" role="Member">
-                <name>max_samples</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{9a11855b-e433-47b7-bc08-05028dd0d5ab}" id="id-0067-00000180" kind="Member" referred="id-0066-00000049" relid="0x0" role="Member">
-                <name>history_depth</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{2822bd5d-8275-416a-916e-fb16379386a8}" id="id-0067-00000181" kind="Member" referred="id-0065-00000065" relid="0x0" role="Member">
-                <name>history_kind</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{975eed39-aa06-4b1c-b3a3-5981dac1db8a}" id="id-0067-00000182" kind="Member" referred="id-0065-00000119" relid="0x0" role="Member">
-                <name>service_cleanup_delay</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{dd3409b2-3697-4a11-bdf1-8678ac54106b}" id="id-0065-00000060" kind="Aggregate" relid="0x44" role="Aggregate">
-              <name>ReaderDataLifecycleQosPolicy</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{cfde8b31-af5b-4977-8087-860ff997669b}" id="id-0067-00000183" kind="Member" referred="id-0065-00000119" relid="0x0" role="Member">
-                <name>autopurge_disposed_samples_delay</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{1ddfb830-8f41-4f6f-b977-7338cd722230}" id="id-0067-00000184" kind="Member" referred="id-0065-00000119" relid="0x0" role="Member">
-                <name>autopurge_nowriter_samples_delay</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{a6461d6d-7852-4fc0-9ae7-e5d889df27f7}" id="id-0065-00000061" kind="Aggregate" relid="0x43" role="Aggregate">
-              <name>WriterDataLifecycleQosPolicy</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{10690b87-d46c-433c-9f98-8840fe0ba8d9}" id="id-0067-00000185" kind="Member" referred="id-0066-0000004e" relid="0x0" role="Member">
-                <name>autodispose_unregistered_instances</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{fb47bdf9-902a-4e57-8f13-c418ec0265c6}" id="id-0065-00000062" kind="Aggregate" relid="0x42" role="Aggregate">
-              <name>EntityFactoryQosPolicy</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{3b58eef4-8165-466a-afbb-5560964f1031}" id="id-0067-00000186" kind="Member" referred="id-0066-0000004e" relid="0x0" role="Member">
-                <name>autoenable_created_entities</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{f8a00190-2a75-41c2-b5a0-682d61568931}" id="id-0065-00000063" kind="Aggregate" relid="0x41" role="Aggregate">
-              <name>ResourceLimitsQosPolicy</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{f744660b-bf6d-4b72-a07f-857e5f8fce68}" id="id-0067-00000187" kind="Member" referred="id-0066-00000049" relid="0x0" role="Member">
-                <name>max_samples_per_instance</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{ca3c745f-ba26-4d08-b621-951177cb1687}" id="id-0067-00000188" kind="Member" referred="id-0066-00000049" relid="0x0" role="Member">
-                <name>max_instances</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{cc496538-8bd6-43a0-9c79-36cb89801e41}" id="id-0067-00000189" kind="Member" referred="id-0066-00000049" relid="0x0" role="Member">
-                <name>max_samples</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{0ac088b7-d4d1-45e3-b138-3de5e5f8ca51}" id="id-0065-00000064" kind="Aggregate" relid="0x40" role="Aggregate">
-              <name>HistoryQosPolicy</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{433081f8-8617-42fd-9abe-b688bbcf98ce}" id="id-0067-0000018a" kind="Member" referred="id-0066-00000049" relid="0x0" role="Member">
-                <name>depth</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{7217533c-d1f2-4c3b-b3d9-61d2045ea106}" id="id-0067-0000018b" kind="Member" referred="id-0065-00000065" relid="0x0" role="Member">
-                <name>kind</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x2" guid="{08af6c5f-caa3-4ca1-a4d1-b9d54310c697}" id="id-0065-00000065" kind="Enum" relid="0x3f" role="Enum">
-              <name>HistoryQosPolicyKind</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <atom guid="{ed898fc4-b4d7-4d8b-9ec7-4e18b78f8d47}" id="id-0066-0000001c" kind="EnumValue" relid="0x1" role="EnumValue">
-                <name>KEEP_ALL_HISTORY_QOS</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-              <atom guid="{7fc1b160-a621-440a-a680-dcb03426eda0}" id="id-0066-0000001d" kind="EnumValue" relid="0x0" role="EnumValue">
-                <name>KEEP_LAST_HISTORY_QOS</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-            </model>
-            <model childrelidcntr="0x1" guid="{196945c2-043f-4a8f-bfb1-7d05a359ed03}" id="id-0065-00000066" kind="Aggregate" relid="0x3e" role="Aggregate">
-              <name>DestinationOrderQosPolicy</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{9bde85a2-fd0a-4bf3-978c-4673d1e5e12c}" id="id-0067-0000018c" kind="Member" referred="id-0065-00000067" relid="0x0" role="Member">
-                <name>kind</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x2" guid="{8591eaca-32e4-44e4-bebb-b3e52d458ce1}" id="id-0065-00000067" kind="Enum" relid="0x3d" role="Enum">
-              <name>DestinationOrderQosPolicyKind</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <atom guid="{0c071810-7892-4c4c-bdb8-a77fafb75faf}" id="id-0066-0000001e" kind="EnumValue" relid="0x1" role="EnumValue">
-                <name>BY_SOURCE_TIMESTAMP_DESTINATIONORDER_QOS</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-              <atom guid="{80c44981-7092-43c8-9e6f-34e5e0dd7506}" id="id-0066-0000001f" kind="EnumValue" relid="0x0" role="EnumValue">
-                <name>BY_RECEPTION_TIMESTAMP_DESTINATIONORDER_QOS</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-            </model>
-            <model childrelidcntr="0x1" guid="{23dcaea5-1b19-4696-9f88-59597b375aea}" id="id-0065-00000068" kind="Aggregate" relid="0x3c" role="Aggregate">
-              <name>ReliabilityQosPolicy</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{48e76418-260b-4186-b8f5-b58fe85f0efd}" id="id-0067-0000018d" kind="Member" referred="id-0065-00000119" relid="0x0" role="Member">
-                <name>max_blocking_time</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{2d463ec8-1f8b-413d-b901-2877be67a0d9}" id="id-0067-0000018e" kind="Member" referred="id-0065-00000069" relid="0x0" role="Member">
-                <name>kind</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x2" guid="{58736bb3-17e7-4d63-94c9-6fbdcf891236}" id="id-0065-00000069" kind="Enum" relid="0x3b" role="Enum">
-              <name>ReliabilityQosPolicyKind</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <atom guid="{415114cd-5195-489f-bd3d-62da3c346ce5}" id="id-0066-00000020" kind="EnumValue" relid="0x1" role="EnumValue">
-                <name>RELIABLE_RELIABILITY_QOS</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-              <atom guid="{67c74094-0213-40ca-95a5-944d3ec6bbe1}" id="id-0066-00000021" kind="EnumValue" relid="0x0" role="EnumValue">
-                <name>BEST_EFFORT_RELIABILITY_QOS</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-            </model>
-            <model childrelidcntr="0x1" guid="{9d41c454-c99c-437c-adba-ad1734d0de96}" id="id-0065-0000006a" kind="Aggregate" relid="0x3a" role="Aggregate">
-              <name>PartitionQosPolicy</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{6bdaee44-0810-4fac-b0d7-83d06edf56b1}" id="id-0067-0000030f" kind="Member" referred="id-0067-00000295" relid="0x0" role="Member">
-                <name>name</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{b6a1a384-bb33-4f77-8481-c99115ff8f75}" id="id-0065-0000006b" kind="Aggregate" relid="0x39" role="Aggregate">
-              <name>TimeBasedFilterQosPolicy</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{bdba4cf2-1773-454f-9848-e77539c6047d}" id="id-0067-0000018f" kind="Member" referred="id-0065-00000119" relid="0x0" role="Member">
-                <name>minimum_separation</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{9edb5275-ff34-4335-8293-ffbff6839c8a}" id="id-0065-0000006c" kind="Aggregate" relid="0x38" role="Aggregate">
-              <name>LivelinessQosPolicy</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{290d189e-21d9-4a89-bc2d-c146e577531a}" id="id-0067-00000190" kind="Member" referred="id-0065-00000119" relid="0x0" role="Member">
-                <name>lease_duration</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{47b83650-1752-455a-819e-af36e2a02141}" id="id-0067-00000191" kind="Member" referred="id-0065-0000006d" relid="0x0" role="Member">
-                <name>kind</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x3" guid="{7038e581-f25e-4142-bd4c-60e4dde8a414}" id="id-0065-0000006d" kind="Enum" relid="0x37" role="Enum">
-              <name>LivelinessQosPolicyKind</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <atom guid="{09db2b95-ea2f-4c62-aee6-38106f64e4c5}" id="id-0066-00000022" kind="EnumValue" relid="0x2" role="EnumValue">
-                <name>MANUAL_BY_TOPIC_LIVELINESS_QOS</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-              <atom guid="{327f4ac0-ec1a-4eb9-a118-3af2a9076ed5}" id="id-0066-00000023" kind="EnumValue" relid="0x1" role="EnumValue">
-                <name>MANUAL_BY_PARTICIPANT_LIVELINESS_QOS</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-              <atom guid="{eeb954a4-8770-4151-a626-e4adc5aa10a6}" id="id-0066-00000024" kind="EnumValue" relid="0x0" role="EnumValue">
-                <name>AUTOMATIC_LIVELINESS_QOS</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-            </model>
-            <model childrelidcntr="0x1" guid="{44e1dafc-c12e-486c-9196-a18a5e346bbf}" id="id-0065-0000006e" kind="Aggregate" relid="0x36" role="Aggregate">
-              <name>OwnershipStrengthQosPolicy</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{99a7f461-8cbe-4576-b104-37bc31847fa6}" id="id-0067-00000192" kind="Member" referred="id-0066-00000049" relid="0x0" role="Member">
-                <name>value</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{40c1b881-6f39-4bf5-9073-bea84cfcae9a}" id="id-0065-0000006f" kind="Aggregate" relid="0x35" role="Aggregate">
-              <name>OwnershipQosPolicy</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{7c40efef-88c4-4943-a5c1-f2bf1669fbf8}" id="id-0067-00000193" kind="Member" referred="id-0065-00000070" relid="0x0" role="Member">
-                <name>kind</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x2" guid="{13267686-3ead-49f5-9b7d-db38a7ba7d6c}" id="id-0065-00000070" kind="Enum" relid="0x34" role="Enum">
-              <name>OwnershipQosPolicyKind</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <atom guid="{f66082d0-4e9f-4361-a26d-6d6050d83b9c}" id="id-0066-00000025" kind="EnumValue" relid="0x1" role="EnumValue">
-                <name>EXCLUSIVE_OWNERSHIP_QOS</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-              <atom guid="{35bbee33-3cfb-4100-9f13-2089c07e8708}" id="id-0066-00000026" kind="EnumValue" relid="0x0" role="EnumValue">
-                <name>SHARED_OWNERSHIP_QOS</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-            </model>
-            <model childrelidcntr="0x1" guid="{cf2d355a-ac71-42e8-974e-2991e17d4819}" id="id-0065-00000071" kind="Aggregate" relid="0x33" role="Aggregate">
-              <name>LatencyBudgetQosPolicy</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{9497318d-e203-47fc-8222-76fee855c609}" id="id-0067-00000194" kind="Member" referred="id-0065-00000119" relid="0x0" role="Member">
-                <name>duration</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{7d1121ef-12bb-4158-8d1c-c83e92792f6a}" id="id-0065-00000072" kind="Aggregate" relid="0x32" role="Aggregate">
-              <name>DeadlineQosPolicy</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{973f4fac-415a-4c29-99ee-0c8cff77b894}" id="id-0067-00000195" kind="Member" referred="id-0065-00000119" relid="0x0" role="Member">
-                <name>period</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{ca630852-9aea-4553-8cb2-041012ae8aec}" id="id-0065-00000073" kind="Aggregate" relid="0x31" role="Aggregate">
-              <name>PresentationQosPolicy</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{95f21377-62b7-4462-a043-98094379ebb7}" id="id-0067-00000196" kind="Member" referred="id-0066-0000004e" relid="0x0" role="Member">
-                <name>ordered_access</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{1a77a076-e8af-4a83-bdc7-e3dbe8e6079e}" id="id-0067-00000197" kind="Member" referred="id-0066-0000004e" relid="0x0" role="Member">
-                <name>coherent_access</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{d481933b-86f0-492a-b029-8288e8a6b97c}" id="id-0067-00000198" kind="Member" referred="id-0065-00000074" relid="0x0" role="Member">
-                <name>access_scope</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x3" guid="{6bfe912d-b9e1-4a25-93a0-b44eb90e129d}" id="id-0065-00000074" kind="Enum" relid="0x30" role="Enum">
-              <name>PresentationQosPolicyAccessScopeKind</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <atom guid="{90f403f0-3368-4050-aef9-2ae0da24c2c9}" id="id-0066-00000027" kind="EnumValue" relid="0x2" role="EnumValue">
-                <name>GROUP_PRESENTATION_QOS</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-              <atom guid="{ce53e6e7-5e3b-46f5-b79f-795c4b48e0ad}" id="id-0066-00000028" kind="EnumValue" relid="0x1" role="EnumValue">
-                <name>TOPIC_PRESENTATION_QOS</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-              <atom guid="{9673971f-2e34-46de-8ec8-73798197d0bd}" id="id-0066-00000029" kind="EnumValue" relid="0x0" role="EnumValue">
-                <name>INSTANCE_PRESENTATION_QOS</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-            </model>
-            <model childrelidcntr="0x1" guid="{5af9d5af-d54e-482b-8e8c-c8bbcbf3b030}" id="id-0065-00000075" kind="Aggregate" relid="0x2f" role="Aggregate">
-              <name>DurabilityQosPolicy</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{6cb4e11e-f909-43c8-af97-acddef43abf8}" id="id-0067-00000199" kind="Member" referred="id-0065-00000076" relid="0x0" role="Member">
-                <name>kind</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x4" guid="{640d2a39-4edc-4d30-84c1-3015943c36c1}" id="id-0065-00000076" kind="Enum" relid="0x2e" role="Enum">
-              <name>DurabilityQosPolicyKind</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <atom guid="{cc39bfcd-d61c-466e-8320-328d1c9f05c3}" id="id-0066-0000002a" kind="EnumValue" relid="0x3" role="EnumValue">
-                <name>PERSISTENT_DURABILITY_QOS</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-              <atom guid="{72b79f7c-e86f-4718-9a41-00be9c925290}" id="id-0066-0000002b" kind="EnumValue" relid="0x2" role="EnumValue">
-                <name>TRANSIENT_DURABILITY_QOS</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-              <atom guid="{6ec098c3-f16b-43c0-b632-3e6f83d4fd72}" id="id-0066-0000002c" kind="EnumValue" relid="0x1" role="EnumValue">
-                <name>TRANSIENT_LOCAL_DURABILITY_QOS</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-              <atom guid="{e250443e-7189-42c1-af22-aa7e3e62bf4b}" id="id-0066-0000002d" kind="EnumValue" relid="0x0" role="EnumValue">
-                <name>VOLATILE_DURABILITY_QOS</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-            </model>
-            <model childrelidcntr="0x1" guid="{d0473b4d-657b-4a9a-9b78-6119c51060ea}" id="id-0065-00000077" kind="Aggregate" relid="0x2d" role="Aggregate">
-              <name>LifespanQosPolicy</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{92a37816-156e-4678-b977-791074f4683c}" id="id-0067-0000019a" kind="Member" referred="id-0065-00000119" relid="0x0" role="Member">
-                <name>duration</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{8f8dfe08-4063-42d2-a314-927a6aba1826}" id="id-0065-00000078" kind="Aggregate" relid="0x2c" role="Aggregate">
-              <name>TransportPriorityQosPolicy</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{09ac6238-520c-4c56-9ec6-8a4afc0f4357}" id="id-0067-0000019b" kind="Member" referred="id-0066-00000049" relid="0x0" role="Member">
-                <name>value</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{a1453d77-ab8f-49f1-854f-53aca2b29f30}" id="id-0065-00000079" kind="Aggregate" relid="0x2b" role="Aggregate">
-              <name>GroupDataQosPolicy</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{cc6206d6-92db-42f9-ae85-1f10fc8fcc5a}" id="id-0067-00000310" kind="Member" referred="id-0067-00000232" relid="0x0" role="Member">
-                <name>value</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{31e7ed51-9481-4d36-8b4c-1143ae45140b}" id="id-0065-0000007a" kind="Aggregate" relid="0x2a" role="Aggregate">
-              <name>TopicDataQosPolicy</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{0d4a3355-a817-412a-8ea7-9cd4192fe166}" id="id-0067-00000311" kind="Member" referred="id-0067-00000232" relid="0x0" role="Member">
-                <name>value</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{5d0b0d21-0174-4a3f-a4b1-4810b9b03867}" id="id-0065-0000007b" kind="Aggregate" relid="0x29" role="Aggregate">
-              <name>UserDataQosPolicy</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{cd833cb5-c474-4de6-82bd-f5813899e78a}" id="id-0067-00000312" kind="Member" referred="id-0067-00000232" relid="0x0" role="Member">
-                <name>value</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x4" guid="{fb4c57c7-0d18-4743-873b-9f444650dd32}" id="id-0065-0000007c" kind="Object" relid="0x28" role="Object">
-              <name>QueryCondition</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{0a953f9e-5d4c-4249-b695-e32385783cbf}" id="id-0065-0000007d" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-                <name>set_query_parameters</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{ae451663-d878-4598-a1df-6d0c6546cfd0}" id="id-0067-00000313" kind="InParameter" referred="id-0067-00000295" relid="0x0" role="InParameter">
-                  <name>query_parameters</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{af4a8656-a5fa-4d09-b08d-7e51d3320c6c}" id="id-0067-00000314" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{0fb3b601-7e6c-4f02-9178-624d03577090}" id="id-0065-0000007e" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                <name>get_query_parameters</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{aa2e4b34-ec63-4eeb-a430-e191519b6275}" id="id-0067-00000315" kind="InoutParameter" referred="id-0067-00000295" relid="0x0" role="InoutParameter">
-                  <name>query_parameters</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{522fcbb6-90c7-40e2-af2e-f550658b2792}" id="id-0067-00000316" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{834abc4d-407d-40e2-93a6-6411f0a7e826}" id="id-0065-0000007f" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>get_query_expression</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{5983d075-b2ce-4cf5-b567-1cf4936a7486}" id="id-0067-0000019c" kind="ReturnType" referred="id-0066-0000003e" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <reference guid="{c9fce9c4-515f-47f1-a2ed-3238a98e6e7e}" id="id-0067-0000019d" kind="Inherits" referred="id-0065-00000080" relid="0x3" role="Inherits">
-                <name>Inherits</name>
-              </reference>
-            </model>
-            <model childrelidcntr="0x5" guid="{64561bb2-bbd1-4a4c-90c7-d4e94b5b0c86}" id="id-0065-00000080" kind="Object" relid="0x27" role="Object">
-              <name>ReadCondition</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{7dfd7c28-b9d7-47b3-9156-e7402dfc6424}" id="id-0065-00000081" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-                <name>get_datareader</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{9d0a0fce-db19-4a2a-bc5d-aa07a31d7d45}" id="id-0067-0000019e" kind="ReturnType" referred="id-0065-000000cc" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{597df2bf-444d-4ef5-9016-790a7c639e41}" id="id-0065-00000082" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-                <name>get_instance_state_mask</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{83dc1818-b6aa-413e-9966-4a62cf8d9aba}" id="id-0067-00000317" kind="ReturnType" referred="id-0067-00000261" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{35102179-2176-4e02-a59a-012ea18cd27b}" id="id-0065-00000083" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                <name>get_view_state_mask</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{331a9701-847d-4307-900a-71d242fdbe19}" id="id-0067-00000318" kind="ReturnType" referred="id-0067-00000267" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{08ef321e-fe40-447f-9bc6-8cd61417375b}" id="id-0065-00000084" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>get_sample_state_mask</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{61ec1fe6-5488-4dcd-9de0-7d9650927c6a}" id="id-0067-00000319" kind="ReturnType" referred="id-0067-0000026c" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <reference guid="{4ac38eff-3932-4e71-a37c-20baa0295035}" id="id-0067-0000019f" kind="Inherits" referred="id-0065-00000090" relid="0x4" role="Inherits">
-                <name>Inherits</name>
-              </reference>
-            </model>
-            <model childrelidcntr="0x4" guid="{ad67a803-70ff-4d6e-967b-990b5e6c9e7f}" id="id-0065-00000085" kind="Object" relid="0x26" role="Object">
-              <name>StatusCondition</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{70d00df7-c473-441d-a716-cb05b29a4cf2}" id="id-0065-00000086" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-                <name>get_entity</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{99718575-6fb6-4a21-8e8e-cbfd521c869e}" id="id-0067-000001a0" kind="ReturnType" referred="id-0065-00000102" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{4706f066-fb65-49ce-9f68-f7c41a719ac1}" id="id-0065-00000087" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                <name>set_enabled_statuses</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{3b21d514-9639-48b5-9416-b388ca4ca93e}" id="id-0067-0000031a" kind="InParameter" referred="id-0067-0000027f" relid="0x0" role="InParameter">
-                  <name>mask</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{6de57292-4752-4277-b663-859fb467b851}" id="id-0067-0000031b" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{b7a09a16-8c83-4c45-b89b-2e323d17198b}" id="id-0065-00000088" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>get_enabled_statuses</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{4a0b2011-450f-48de-977e-a6bf358aff39}" id="id-0067-0000031c" kind="ReturnType" referred="id-0067-0000027f" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <reference guid="{8f2a90d9-5b79-4c30-b0a4-9a152fda0bff}" id="id-0067-000001a1" kind="Inherits" referred="id-0065-00000090" relid="0x3" role="Inherits">
-                <name>Inherits</name>
-              </reference>
-            </model>
-            <model childrelidcntr="0x2" guid="{80afdb19-9426-44ec-a1e6-d7d81b6ec892}" id="id-0065-00000089" kind="Object" relid="0x25" role="Object">
-              <name>GuardCondition</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{ca4365c0-7848-43e7-815b-cda458caf3e2}" id="id-0065-0000008a" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>set_trigger_value</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{316e1617-c876-4c5d-85a1-4c42b205e7d5}" id="id-0067-000001a2" kind="InParameter" referred="id-0066-0000004e" relid="0x0" role="InParameter">
-                  <name>value</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{adfa5c45-4218-405c-a892-35ea698c8f7d}" id="id-0067-0000031d" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <reference guid="{38506d9c-3d34-4866-a783-f75d14a7a74f}" id="id-0067-000001a3" kind="Inherits" referred="id-0065-00000090" relid="0x1" role="Inherits">
-                <name>Inherits</name>
-              </reference>
-            </model>
-            <model childrelidcntr="0x4" guid="{963ea670-e2d4-4b71-b455-a310e1a8c32e}" id="id-0065-0000008b" kind="Object" relid="0x24" role="Object">
-              <name>WaitSet</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{1444279c-ee95-4c33-9e1d-b4adde514038}" id="id-0065-0000008c" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-                <name>get_conditions</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{e27cb3cf-160d-440b-97c9-0e779c719ae6}" id="id-0067-000001a4" kind="InoutParameter" referred="id-0067-00000050" relid="0x0" role="InoutParameter">
-                  <name>attached_conditions</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{3bb459d2-17c8-48c9-980b-29187643ed0d}" id="id-0067-0000031e" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{f111c931-37a1-4b4b-a8ab-1b1d21ebe53f}" id="id-0065-0000008d" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-                <name>detach_condition</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{f718c48d-f98d-4e3b-9b3b-17abd3d1998c}" id="id-0067-000001a5" kind="InParameter" referred="id-0065-00000090" relid="0x0" role="InParameter">
-                  <name>cond</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{a1cec342-59b0-48ca-9fcd-e36a8ac60acf}" id="id-0067-0000031f" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{180796f6-b238-4fb1-b53d-95a62d74c7c7}" id="id-0065-0000008e" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                <name>attach_condition</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{cc5892e9-6b25-4a8f-be23-b23185a8fed5}" id="id-0067-000001a6" kind="InParameter" referred="id-0065-00000090" relid="0x0" role="InParameter">
-                  <name>cond</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{be03b66e-ce78-4793-9760-502027a66357}" id="id-0067-00000320" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{2bec1971-a06d-49a1-b11f-dd4583830a2e}" id="id-0065-0000008f" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>wait</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{d9d9632b-67bf-4cc4-81f6-3e56f1537b3d}" id="id-0067-000001a7" kind="InParameter" referred="id-0065-00000119" relid="0x0" role="InParameter">
-                  <name>timeout</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{79266214-f81a-421a-bdb5-7e8e3203a7f0}" id="id-0067-000001a8" kind="InoutParameter" referred="id-0067-00000050" relid="0x0" role="InoutParameter">
-                  <name>active_conditions</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{87bff5ae-af9c-4ae1-8671-cdb4258dc924}" id="id-0067-00000321" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-            </model>
-            <model childrelidcntr="0x1" guid="{20c8b739-65af-41ec-8d86-d821626a2a0e}" id="id-0065-00000090" kind="Object" relid="0x23" role="Object">
-              <name>Condition</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{90f43f6f-85b5-4226-ad3e-affd7916af2b}" id="id-0065-00000091" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>get_trigger_value</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{7090f7d6-516d-4f5a-b12e-3c2a0aaf1b4f}" id="id-0067-000001a9" kind="ReturnType" referred="id-0066-0000004e" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-            </model>
-            <model childrelidcntr="0x1" guid="{f9d59fe3-9616-4806-833d-2a15868c3cae}" id="id-0065-00000092" kind="Object" relid="0x22" role="Object">
-              <name>DomainParticipantListener</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{a56eb686-b35a-4881-a923-f6aff8c00ba7}" id="id-0067-000001aa" kind="Inherits" referred="id-0065-0000009d" relid="0x0" role="Inherits">
-                <name>Inherits</name>
-              </reference>
-              <reference guid="{02f1a8ab-9785-494b-8445-ec77f5cdbcf7}" id="id-0067-000001ab" kind="Inherits" referred="id-0065-00000107" relid="0x0" role="Inherits">
-                <name>Inherits</name>
-              </reference>
-              <reference guid="{f2584eaf-ef06-4ad5-87ba-810c016187da}" id="id-0067-000001ac" kind="Inherits" referred="id-0065-000000a5" relid="0x0" role="Inherits">
-                <name>Inherits</name>
-              </reference>
-            </model>
-            <model childrelidcntr="0x2" guid="{4c9f54ce-366e-4d5b-8e0c-d733f62e3b94}" id="id-0065-00000093" kind="Object" relid="0x21" role="Object">
-              <name>SubscriberListener</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{77606d1b-4d11-4ffa-a143-6eaffb7108e4}" id="id-0065-00000094" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>on_data_on_readers</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{a84e3704-da57-47b7-81ad-9ca5d3083444}" id="id-0067-000001ad" kind="InParameter" referred="id-0065-000000ba" relid="0x0" role="InParameter">
-                  <name>the_subscriber</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <reference guid="{3df2b316-f31a-4c9f-ba84-3a93a8eb0f8d}" id="id-0067-000001ae" kind="Inherits" referred="id-0065-00000095" relid="0x1" role="Inherits">
-                <name>Inherits</name>
-              </reference>
-            </model>
-            <model childrelidcntr="0x8" guid="{21482efd-7490-4df3-bd59-af5c783e3468}" id="id-0065-00000095" kind="Object" relid="0x20" role="Object">
-              <name>DataReaderListener</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{ef0ed577-2fe7-41e2-9d84-01b3a7ac5ac2}" id="id-0065-00000096" kind="TwowayOperation" relid="0x6" role="TwowayOperation">
-                <name>on_sample_lost</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,660</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{3a2275ba-2b65-4f7c-9b49-5d93a4b4916e}" id="id-0067-000001af" kind="InParameter" referred="id-0065-00000116" relid="0x0" role="InParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{99dfc069-394a-4586-8af3-f6b8d1ae62e9}" id="id-0067-000001b0" kind="InParameter" referred="id-0065-000000cc" relid="0x0" role="InParameter">
-                  <name>the_reader</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{5d373a8d-d337-44cc-a28e-c3822dc7719a}" id="id-0065-00000097" kind="TwowayOperation" relid="0x5" role="TwowayOperation">
-                <name>on_subscription_matched</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{22bbcafe-f6a8-43b0-b9ec-da82617a9034}" id="id-0067-000001b1" kind="InParameter" referred="id-0065-0000010b" relid="0x0" role="InParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{5339ea05-93ed-42f3-bf5a-e650aa6386cf}" id="id-0067-000001b2" kind="InParameter" referred="id-0065-000000cc" relid="0x0" role="InParameter">
-                  <name>the_reader</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{707b7440-d471-4b40-9cea-01a2d07993e9}" id="id-0065-00000098" kind="TwowayOperation" relid="0x4" role="TwowayOperation">
-                <name>on_data_available</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{5fcc73b8-51c8-4f68-a130-67d9ee8ff7e3}" id="id-0067-000001b3" kind="InParameter" referred="id-0065-000000cc" relid="0x0" role="InParameter">
-                  <name>the_reader</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{0163a50f-8169-4ccf-b200-89dbb6e3da85}" id="id-0065-00000099" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-                <name>on_liveliness_changed</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{94ddd20b-f16b-4ee6-895b-ad9c5bb5070b}" id="id-0067-000001b4" kind="InParameter" referred="id-0065-00000112" relid="0x0" role="InParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{72986913-c2cd-4987-b638-a01efe9cfb7a}" id="id-0067-000001b5" kind="InParameter" referred="id-0065-000000cc" relid="0x0" role="InParameter">
-                  <name>the_reader</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{ab1169ab-0f50-4b35-bbb1-da177461bec7}" id="id-0065-0000009a" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-                <name>on_sample_rejected</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{1fa64424-331f-4dc3-8801-cae23da11c7c}" id="id-0067-000001b6" kind="InParameter" referred="id-0065-00000114" relid="0x0" role="InParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{2e19fa4e-30af-4a38-8a07-83c6e50e848f}" id="id-0067-000001b7" kind="InParameter" referred="id-0065-000000cc" relid="0x0" role="InParameter">
-                  <name>the_reader</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{92c9b989-c372-49c2-a59f-5324d7779a4a}" id="id-0065-0000009b" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                <name>on_requested_incompatible_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{f496b174-7bc3-43c7-8bd6-b8d7c02a40e8}" id="id-0067-000001b8" kind="InParameter" referred="id-0065-0000010d" relid="0x0" role="InParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{bd247fbc-54fa-4eb9-92da-2bff562cd95f}" id="id-0067-000001b9" kind="InParameter" referred="id-0065-000000cc" relid="0x0" role="InParameter">
-                  <name>the_reader</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{f152534c-add7-4f9d-91a6-ad53cb298618}" id="id-0065-0000009c" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>on_requested_deadline_missed</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{7693b0f3-2e6a-4190-b460-1537d2b25b04}" id="id-0067-000001ba" kind="InParameter" referred="id-0065-00000110" relid="0x0" role="InParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{3a3ec0f6-3bed-4f2a-b03f-ab31f579d132}" id="id-0067-000001bb" kind="InParameter" referred="id-0065-000000cc" relid="0x0" role="InParameter">
-                  <name>the_reader</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <reference guid="{f6a27cc0-3122-4857-8022-6391beb021c3}" id="id-0067-000001bc" kind="Inherits" referred="id-0065-00000107" relid="0x7" role="Inherits">
-                <name>Inherits</name>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{e4699243-959f-4fce-8308-d6fb2a3ba60c}" id="id-0065-0000009d" kind="Object" relid="0x1f" role="Object">
-              <name>PublisherListener</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{b19e72bd-4670-4fe6-b0f4-b571561e68f0}" id="id-0067-000001bd" kind="Inherits" referred="id-0065-0000009e" relid="0x0" role="Inherits">
-                <name>Inherits</name>
-              </reference>
-            </model>
-            <model childrelidcntr="0x7" guid="{6ec642f5-e2c2-4b1b-ad6b-c7589f6124ab}" id="id-0065-0000009e" kind="Object" relid="0x1e" role="Object">
-              <name>DataWriterListener</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{32206b40-6314-4acb-a78f-f0aeb4218877}" id="id-0065-0000009f" kind="TwowayOperation" relid="0x5" role="TwowayOperation">
-                <name>on_reliable_reader_activity_changed</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{2c9ad149-a03c-452e-ab6e-9b7e9336968b}" id="id-0067-000001be" kind="InParameter" referred="id-0065-0000010a" relid="0x0" role="InParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{2974bfbf-5852-4460-8473-e59140fd694f}" id="id-0067-000001bf" kind="InParameter" referred="id-0065-000000e0" relid="0x0" role="InParameter">
-                  <name>writer</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{b11529b5-a0d8-4003-9974-51497c3abaab}" id="id-0065-000000a0" kind="TwowayOperation" relid="0x4" role="TwowayOperation">
-                <name>on_reliable_writer_cache_changed</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{bb850eb5-7830-4ce9-88cb-a8344d424b5d}" id="id-0067-000001c0" kind="InParameter" referred="id-0065-00000108" relid="0x0" role="InParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{73023405-7e9b-4a0b-ad70-78c4aa8d80d2}" id="id-0067-000001c1" kind="InParameter" referred="id-0065-000000e0" relid="0x0" role="InParameter">
-                  <name>writer</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{296dafd2-3702-44d9-ab7a-f929d72fbf65}" id="id-0065-000000a1" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-                <name>on_publication_matched</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{ce1e5a71-12f7-406e-94b7-4b3ac2a2ef42}" id="id-0067-000001c2" kind="InParameter" referred="id-0065-0000010c" relid="0x0" role="InParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{c2e910b4-b861-4d01-a709-989a53a053f3}" id="id-0067-000001c3" kind="InParameter" referred="id-0065-000000e0" relid="0x0" role="InParameter">
-                  <name>writer</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{65ac6074-64e3-4b24-92a0-d7f90c511e4e}" id="id-0065-000000a2" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-                <name>on_liveliness_lost</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{4b722d31-7fa2-415d-83c7-39a18d7ae812}" id="id-0067-000001c4" kind="InParameter" referred="id-0065-00000113" relid="0x0" role="InParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{1132162b-706b-4e7e-bb43-3bdf83c4c761}" id="id-0067-000001c5" kind="InParameter" referred="id-0065-000000e0" relid="0x0" role="InParameter">
-                  <name>writer</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{8ddaf5b7-f2a4-4bce-b2aa-62afaaf4a8fd}" id="id-0065-000000a3" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                <name>on_offered_incompatible_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{30780cf3-8476-44da-bc3a-8dd199c42853}" id="id-0067-000001c6" kind="InParameter" referred="id-0065-0000010e" relid="0x0" role="InParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{826506ef-7504-4bf7-86c4-1a909979cced}" id="id-0067-000001c7" kind="InParameter" referred="id-0065-000000e0" relid="0x0" role="InParameter">
-                  <name>writer</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{4853b54d-7248-433c-ad29-dfaa7a701549}" id="id-0065-000000a4" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>on_offered_deadline_missed</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{1d4cc92e-9eff-41d3-a609-80026f5123df}" id="id-0067-000001c8" kind="InParameter" referred="id-0065-00000111" relid="0x0" role="InParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{74c70e9f-b9ff-4924-95a1-d325adec0f18}" id="id-0067-000001c9" kind="InParameter" referred="id-0065-000000e0" relid="0x0" role="InParameter">
-                  <name>writer</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <reference guid="{d6f48dce-0393-45a5-af20-3d76bab7e49a}" id="id-0067-000001ca" kind="Inherits" referred="id-0065-00000107" relid="0x6" role="Inherits">
-                <name>Inherits</name>
-              </reference>
-            </model>
-            <model childrelidcntr="0x2" guid="{b96f7fda-6a45-47d2-b103-11ad5bd524d4}" id="id-0065-000000a5" kind="Object" relid="0x1d" role="Object">
-              <name>TopicListener</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{251c4042-ea65-4042-b536-b8a43990aa0c}" id="id-0065-000000a6" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>on_inconsistent_topic</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{667f44e5-472d-4fa2-b9ef-b4cbfab49c8d}" id="id-0067-000001cb" kind="InParameter" referred="id-0065-00000117" relid="0x0" role="InParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{8e0de7d7-b5b0-49bf-a8c1-32ee4dca0cd2}" id="id-0067-000001cc" kind="InParameter" referred="id-0065-000000f8" relid="0x0" role="InParameter">
-                  <name>the_topic</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <reference guid="{e1aef13f-a614-4c9b-82f6-d23fcbf62ffb}" id="id-0067-000001cd" kind="Inherits" referred="id-0065-00000107" relid="0x1" role="Inherits">
-                <name>Inherits</name>
-              </reference>
-            </model>
-            <model childrelidcntr="0x13" guid="{4f5eebbb-cf9a-4547-88c3-68b4139798b5}" id="id-0065-000000a7" kind="Object" relid="0x1c" role="Object">
-              <name>Publisher</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{bac79da3-694b-4630-b0e8-b0e1c6588d5a}" id="id-0065-000000a8" kind="TwowayOperation" relid="0x11" role="TwowayOperation">
-                <name>copy_from_topic_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1760</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{5d3895b6-c2d6-4015-af00-5465948508ef}" id="id-0067-00000018" kind="InParameter" referred="id-0065-0000005c" relid="0x0" role="InParameter">
-                  <name>a_topic_qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{c7f99d7f-4ff0-43d6-9549-5e4f0fe584e7}" id="id-0067-00000019" kind="InoutParameter" referred="id-0065-0000005b" relid="0x0" role="InoutParameter">
-                  <name>a_datawriter_qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{1577cab5-647c-4da4-84cf-4126946ffae7}" id="id-0067-00000322" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{f75d0811-ff01-4500-8125-4fc76004c532}" id="id-0065-000000a9" kind="TwowayOperation" relid="0x10" role="TwowayOperation">
-                <name>get_default_datawriter_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1660</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{d4685544-1f06-459b-81a5-c618cce73903}" id="id-0067-0000001a" kind="InoutParameter" referred="id-0065-0000005b" relid="0x0" role="InoutParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{74d27c57-f92d-4af0-a090-c3acdb17ff21}" id="id-0067-00000323" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{c122be64-e057-4bce-b70e-c911a0ef18d3}" id="id-0065-000000aa" kind="TwowayOperation" relid="0xf" role="TwowayOperation">
-                <name>set_default_datawriter_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{e201161b-3245-4c3e-87ff-54935e71b731}" id="id-0067-0000001b" kind="InParameter" referred="id-0065-0000005b" relid="0x0" role="InParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{ebcedb62-f5f4-4dd3-b652-5f8f6ae28093}" id="id-0067-00000324" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{c9f8ec8f-69a9-4c5b-885c-974b20297674}" id="id-0065-000000ab" kind="TwowayOperation" relid="0xe" role="TwowayOperation">
-                <name>get_participant</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{9d3b8308-1b73-45f2-8b20-b0c0d7105af5}" id="id-0067-0000001c" kind="ReturnType" referred="id-0065-0000002c" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{d5293866-6ed6-4f2d-b42b-22fbca744fd4}" id="id-0065-000000ac" kind="TwowayOperation" relid="0xd" role="TwowayOperation">
-                <name>wait_for_acknowledgments</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{c9e98644-418c-4f72-bbf0-55362ec76bcd}" id="id-0067-000001ce" kind="InParameter" referred="id-0065-00000119" relid="0x0" role="InParameter">
-                  <name>max_wait</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{641d952c-266b-4a75-95ab-77dd3f516a57}" id="id-0067-00000325" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{66214d0a-29a9-4bf1-a24e-eddd7d3b4398}" id="id-0065-000000ad" kind="TwowayOperation" relid="0xc" role="TwowayOperation">
-                <name>end_coherent_changes</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{325fcbf1-6cb7-4152-a8fe-ad543c4d6f11}" id="id-0067-00000326" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{09792629-4fdb-4c0e-b596-718cfbb74571}" id="id-0065-000000ae" kind="TwowayOperation" relid="0xb" role="TwowayOperation">
-                <name>begin_coherent_changes</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{dcc3bae7-db81-4fd1-8540-b8892c32513e}" id="id-0067-00000327" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{0f6efba4-a689-4d3f-b7e9-cef7fa4bbd8c}" id="id-0065-000000af" kind="TwowayOperation" relid="0xa" role="TwowayOperation">
-                <name>resume_publications</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1060</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{040979b6-4257-4fd0-b06c-2a9f887c4ec6}" id="id-0067-00000328" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{e7385d87-75fc-461e-b864-015eec341af5}" id="id-0065-000000b0" kind="TwowayOperation" relid="0x9" role="TwowayOperation">
-                <name>suspend_publications</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,960</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{60dc06b1-7275-4cd8-98be-9c7632266e9e}" id="id-0067-00000329" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{f4d17e9a-58fd-4fa5-9749-2161c13877e9}" id="id-0065-000000b1" kind="TwowayOperation" relid="0x8" role="TwowayOperation">
-                <name>get_listener</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,860</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{4418ea4f-36c0-44b2-96cc-928bfac92f54}" id="id-0067-0000001d" kind="ReturnType" referred="id-0065-0000009d" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{cda3d7c2-d517-4ebc-bbba-88e79be7d0d0}" id="id-0065-000000b2" kind="TwowayOperation" relid="0x7" role="TwowayOperation">
-                <name>set_listener</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,760</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{5736a6b7-874a-4338-bc81-75ee9a951225}" id="id-0067-0000001e" kind="InParameter" referred="id-0065-0000009d" relid="0x0" role="InParameter">
-                  <name>a_listener</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{64528804-81a9-4bce-9624-c344e1b7516a}" id="id-0067-0000032a" kind="InParameter" referred="id-0067-0000027f" relid="0x0" role="InParameter">
-                  <name>mask</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{4cae743d-7e86-4885-8090-0e47849879cb}" id="id-0067-0000032b" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{fb86cfc0-06ba-4804-8150-bf09edab5a9b}" id="id-0065-000000b3" kind="TwowayOperation" relid="0x6" role="TwowayOperation">
-                <name>get_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,660</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{733a97ee-941d-4148-9821-c0f89a193f3b}" id="id-0067-0000001f" kind="InoutParameter" referred="id-0065-0000005a" relid="0x0" role="InoutParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{945ebf05-6a30-41f7-834d-e10b1d75060f}" id="id-0067-0000032c" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{179d9a18-c488-4307-88d2-9f57797fb88d}" id="id-0065-000000b4" kind="TwowayOperation" relid="0x5" role="TwowayOperation">
-                <name>set_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{12663ac4-c11d-46e2-b1b7-fb490b1011db}" id="id-0067-00000020" kind="InParameter" referred="id-0065-0000005a" relid="0x0" role="InParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{dfd9f22b-b22f-4f6b-bb06-103200df3b51}" id="id-0067-0000032d" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{8d2971dc-bd0f-450c-a657-8e7d55ad7bd4}" id="id-0065-000000b5" kind="TwowayOperation" relid="0x4" role="TwowayOperation">
-                <name>delete_contained_entities</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{3be19ff5-37af-4fe5-8a39-baabcc2fd8cf}" id="id-0067-0000032e" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{d7ddfcd8-0fb8-4bba-bed4-87b098e094a9}" id="id-0065-000000b6" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-                <name>lookup_datawriter</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{44de8d28-5be1-4cf7-aefb-43ad2397a6fe}" id="id-0067-000001cf" kind="InParameter" referred="id-0066-0000003e" relid="0x0" role="InParameter">
-                  <name>topic_name</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{00e37ecc-0ea0-4d8b-9235-fa67204c2a02}" id="id-0067-000001d0" kind="ReturnType" referred="id-0065-000000e0" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{b90ffda6-2051-4a0a-95ab-37a59a19edf9}" id="id-0065-000000b7" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-                <name>delete_datawriter</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{02aa4e05-ae68-4033-9419-74c767cdafad}" id="id-0067-000001d1" kind="InParameter" referred="id-0065-000000e0" relid="0x0" role="InParameter">
-                  <name>a_datawriter</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{8e4d973b-95e8-4308-8793-2e3a6cdb5fb3}" id="id-0067-0000032f" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{afa7274d-6817-4601-9deb-d710d43e40d0}" id="id-0065-000000b8" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                <name>create_datawriter_with_profile</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{79540497-9b9e-48a9-89e3-58c7e8d86aa4}" id="id-0067-00000021" kind="InParameter" referred="id-0065-0000009e" relid="0x0" role="InParameter">
-                  <name>a_listener</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>460,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{2421b119-5e27-4379-86f6-308f67a223c2}" id="id-0067-000001d2" kind="InParameter" referred="id-0066-0000003e" relid="0x0" role="InParameter">
-                  <name>probile_name</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>360,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{6981d70d-ddbb-4140-8259-ed8ba6c74c34}" id="id-0067-000001d3" kind="InParameter" referred="id-0066-0000003e" relid="0x0" role="InParameter">
-                  <name>library_name</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{a918d624-2e7b-4cc8-83a2-7368cc29ef3c}" id="id-0067-000001d4" kind="InParameter" referred="id-0065-000000f8" relid="0x0" role="InParameter">
-                  <name>a_topic</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{0e08f6b6-76ad-4b40-82d3-b3024f8e751e}" id="id-0067-000001d5" kind="ReturnType" referred="id-0065-000000e0" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{e46386b3-7971-4061-b9d9-e6aa0ae129af}" id="id-0067-00000330" kind="InParameter" referred="id-0067-0000027f" relid="0x0" role="InParameter">
-                  <name>mask</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>560,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{d4a98d8d-7f33-41b7-98b5-4cc3572f0731}" id="id-0065-000000b9" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>create_datawriter</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{ea51d174-903a-43f3-9023-e38848c4d448}" id="id-0067-00000022" kind="InParameter" referred="id-0065-0000009e" relid="0x0" role="InParameter">
-                  <name>a_listener</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>360,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{bf0a5c44-eb8a-41f4-869b-f7bf96c77dec}" id="id-0067-00000023" kind="InParameter" referred="id-0065-0000005b" relid="0x0" role="InParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{34f51ff6-670d-4eff-8ed6-e811c6b38717}" id="id-0067-000001d6" kind="InParameter" referred="id-0065-000000f8" relid="0x0" role="InParameter">
-                  <name>a_topic</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{cdd7167e-c07c-4afe-b134-209d53aabd6e}" id="id-0067-000001d7" kind="ReturnType" referred="id-0065-000000e0" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{188b0667-16f2-4bcd-bc77-964e2366d0fe}" id="id-0067-00000331" kind="InParameter" referred="id-0067-0000027f" relid="0x0" role="InParameter">
-                  <name>mask</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>460,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <reference guid="{e4183a64-c3c8-4f7f-8d5c-cb8d262353a7}" id="id-0067-000001d8" kind="Inherits" referred="id-0065-00000102" relid="0x12" role="Inherits">
-                <name>Inherits</name>
-              </reference>
-            </model>
-            <model childrelidcntr="0x12" guid="{a113f8ff-f511-492e-8f3e-73fbfa24baef}" id="id-0065-000000ba" kind="Object" relid="0x1b" role="Object">
-              <name>Subscriber</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{6f1547e5-e8de-4537-80e4-a53bed927dbf}" id="id-0065-000000bb" kind="TwowayOperation" relid="0x10" role="TwowayOperation">
-                <name>copy_from_topic_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1660</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{0664ad23-1a72-45d3-9c08-0ad871bf29a3}" id="id-0067-00000024" kind="InParameter" referred="id-0065-0000005c" relid="0x0" role="InParameter">
-                  <name>a_topic_qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{5b5f3cad-0276-4fd1-a5a8-3e025a696bd2}" id="id-0067-00000025" kind="InoutParameter" referred="id-0065-00000059" relid="0x0" role="InoutParameter">
-                  <name>a_datareader_qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{7bc581f7-89fd-4916-8939-3b9e01f3dbd1}" id="id-0067-00000332" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{10a13d5c-af2a-4a99-960b-6ce6b033b957}" id="id-0065-000000bc" kind="TwowayOperation" relid="0xf" role="TwowayOperation">
-                <name>get_default_datareader_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{c134bb48-d9e8-44fc-8e1e-f3f78406833c}" id="id-0067-00000026" kind="InoutParameter" referred="id-0065-00000059" relid="0x0" role="InoutParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{716daca9-9c40-4155-a00d-be826b5cfc4e}" id="id-0067-00000333" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{f3371ab8-af13-44e8-b0a5-dd29f3e977c6}" id="id-0065-000000bd" kind="TwowayOperation" relid="0xe" role="TwowayOperation">
-                <name>set_default_datareader_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{401654fe-a2f6-459b-b6c0-0113e70be839}" id="id-0067-00000027" kind="InParameter" referred="id-0065-00000059" relid="0x0" role="InParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{171e9191-5944-4e5f-b7b8-84234331f3d9}" id="id-0067-00000334" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{8335259a-d72c-4c44-811f-3f9df0e84b6e}" id="id-0065-000000be" kind="TwowayOperation" relid="0xd" role="TwowayOperation">
-                <name>get_participant</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{65f9d75e-ccc8-4abc-b161-d4d609fbe1c6}" id="id-0067-00000028" kind="ReturnType" referred="id-0065-0000002c" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{ca070b7c-2035-4501-a173-913adb2de7af}" id="id-0065-000000bf" kind="TwowayOperation" relid="0xc" role="TwowayOperation">
-                <name>end_access</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{a13f205e-d755-4713-a9a9-ab01cc26f656}" id="id-0067-00000335" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{10f5ae9e-1189-4942-b4fe-b4d8bfc8834c}" id="id-0065-000000c0" kind="TwowayOperation" relid="0xb" role="TwowayOperation">
-                <name>begin_access</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{737ddcc9-63ef-4dd6-89e2-9692ae6d55e8}" id="id-0067-00000336" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{68723394-e823-4e51-abdf-6be53b7cdf9a}" id="id-0065-000000c1" kind="TwowayOperation" relid="0xa" role="TwowayOperation">
-                <name>get_listener</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1060</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{453c2c55-363e-44fe-afc8-dd4c27456b65}" id="id-0067-00000029" kind="ReturnType" referred="id-0065-00000093" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{f80fee9e-c13c-4c8a-bf9d-e3f6516ccf93}" id="id-0065-000000c2" kind="TwowayOperation" relid="0x9" role="TwowayOperation">
-                <name>set_listener</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,960</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{f4c07ebd-16e2-4e17-b5d9-0c65b175de31}" id="id-0067-0000002a" kind="InParameter" referred="id-0065-00000093" relid="0x0" role="InParameter">
-                  <name>a_listener</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{26414354-b5c6-422d-882b-2c217fdb3e65}" id="id-0067-00000337" kind="InParameter" referred="id-0067-0000027f" relid="0x0" role="InParameter">
-                  <name>mask</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{4b24d435-ed88-4ef3-a254-7f9fbd7ba88c}" id="id-0067-00000338" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{214ee0c6-04bd-4bcf-8cda-9b9e748a5964}" id="id-0065-000000c3" kind="TwowayOperation" relid="0x8" role="TwowayOperation">
-                <name>get_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,860</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{1d17d063-a724-4aef-b623-d5210eac0d53}" id="id-0067-0000002b" kind="InoutParameter" referred="id-0065-00000058" relid="0x0" role="InoutParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{617ac9bb-8e8f-4723-9042-66937b916c6f}" id="id-0067-00000339" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{2b8f29ad-5481-4930-b64c-458a7cb68b79}" id="id-0065-000000c4" kind="TwowayOperation" relid="0x7" role="TwowayOperation">
-                <name>set_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,760</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{08fe8b5f-56af-4a23-a7e8-43186b10525c}" id="id-0067-0000002c" kind="InParameter" referred="id-0065-00000058" relid="0x0" role="InParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{badc2a99-847c-4197-8328-11cfc16bb01e}" id="id-0067-0000033a" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{48db7971-bd50-43f9-84e0-26d3e3798b40}" id="id-0065-000000c5" kind="TwowayOperation" relid="0x6" role="TwowayOperation">
-                <name>notify_datareaders</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,660</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{a979f694-aa7d-426e-b4ac-083295d17694}" id="id-0067-0000033b" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{5ae59d40-bd26-405e-9e83-97614689543e}" id="id-0065-000000c6" kind="TwowayOperation" relid="0x5" role="TwowayOperation">
-                <name>get_datareaders</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{3d3b90a6-59ba-4b88-b424-e2bc6f1517e3}" id="id-0067-000001d9" kind="InoutParameter" referred="id-0067-00000051" relid="0x0" role="InoutParameter">
-                  <name>readers</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{2a80dc59-0e77-42cb-8a13-024122aafdb0}" id="id-0067-0000033c" kind="InParameter" referred="id-0067-00000261" relid="0x0" role="InParameter">
-                  <name>instance_states</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>460,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{5b0c5ed6-21a3-40cb-b017-6c4ce9ece9c5}" id="id-0067-0000033d" kind="InParameter" referred="id-0067-00000267" relid="0x0" role="InParameter">
-                  <name>view_states</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>360,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{028f06b5-ed5e-444e-acf1-dfdf163f5850}" id="id-0067-0000033e" kind="InParameter" referred="id-0067-0000026c" relid="0x0" role="InParameter">
-                  <name>sample_states</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{b5899b66-4d78-4072-85e9-164f8db37ed8}" id="id-0067-0000033f" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{36b1e64f-1d4b-4503-b025-65f4d3c0f093}" id="id-0065-000000c7" kind="TwowayOperation" relid="0x4" role="TwowayOperation">
-                <name>lookup_datareader</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{640f5837-4ffe-4a5d-b2c7-6a8b5c68060e}" id="id-0067-000001da" kind="InParameter" referred="id-0066-0000003e" relid="0x0" role="InParameter">
-                  <name>topic_name</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{37c3f4e8-20bd-4f6a-ae4e-aeec521ab3b2}" id="id-0067-000001db" kind="ReturnType" referred="id-0065-000000cc" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{218763d2-572d-4185-a2f8-b96b6ba1edc1}" id="id-0065-000000c8" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-                <name>delete_contained_entities</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{cb5cdb85-f31f-449a-874b-12745dedeca7}" id="id-0067-00000340" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{56a03b42-9fad-4041-8a90-0c653e30677d}" id="id-0065-000000c9" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-                <name>delete_datareader</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{d823a347-0491-469b-a106-c455478bb667}" id="id-0067-000001dc" kind="InParameter" referred="id-0065-000000cc" relid="0x0" role="InParameter">
-                  <name>a_datareader</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{39555b40-9e6a-428c-91df-8ba60a80b0fa}" id="id-0067-00000341" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{a832090b-f734-4b0b-b203-71aad2fadae9}" id="id-0065-000000ca" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                <name>create_datareader_with_profile</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{903a65c7-0c8d-49ed-a4e6-af4481a3f7e1}" id="id-0067-0000002d" kind="InParameter" referred="id-0065-00000095" relid="0x0" role="InParameter">
-                  <name>a_listener</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>460,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{962da721-9691-4709-afaa-c515be44a833}" id="id-0067-000001dd" kind="InParameter" referred="id-0066-0000003e" relid="0x0" role="InParameter">
-                  <name>profile_name</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>360,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{fa32da6b-e51b-42d7-a141-f2ee67c52780}" id="id-0067-000001de" kind="InParameter" referred="id-0066-0000003e" relid="0x0" role="InParameter">
-                  <name>library_name</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{1dcde549-a8e2-4dda-8ee8-09b6cc9f0640}" id="id-0067-000001df" kind="InParameter" referred="id-0065-000000fe" relid="0x0" role="InParameter">
-                  <name>a_topic</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{38be5418-98f9-434a-9d16-d83296d16c3c}" id="id-0067-000001e0" kind="ReturnType" referred="id-0065-000000cc" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{b5733249-8332-4dc6-85ba-97c59fd37ac4}" id="id-0067-00000342" kind="InParameter" referred="id-0067-0000027f" relid="0x0" role="InParameter">
-                  <name>mask</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>560,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{bbf7de78-8d06-4ea2-9c05-f229f25c2db0}" id="id-0065-000000cb" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>create_datareader</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{a88d13a8-95b4-43a2-b336-6e9389267b0c}" id="id-0067-0000002e" kind="InParameter" referred="id-0065-00000095" relid="0x0" role="InParameter">
-                  <name>a_listener</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>360,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{f2e089d5-e473-457d-80fc-66d8bea290b3}" id="id-0067-0000002f" kind="InParameter" referred="id-0065-00000059" relid="0x0" role="InParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{eb1c9be3-ab4b-40e3-913d-cce3d47abccb}" id="id-0067-000001e1" kind="InParameter" referred="id-0065-000000fe" relid="0x0" role="InParameter">
-                  <name>a_topic</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{a24c2fc7-3ec8-42e7-98ec-0437cbc8ddcd}" id="id-0067-000001e2" kind="ReturnType" referred="id-0065-000000cc" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{31fcbf32-00a5-4877-bdfa-0381fb4a38a9}" id="id-0067-00000343" kind="InParameter" referred="id-0067-0000027f" relid="0x0" role="InParameter">
-                  <name>mask</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>460,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <reference guid="{4a00ae57-4ab2-4cff-b63f-0116e1ca0432}" id="id-0067-000001e3" kind="Inherits" referred="id-0065-00000102" relid="0x11" role="Inherits">
-                <name>Inherits</name>
-              </reference>
-            </model>
-            <model childrelidcntr="0x14" guid="{fdc8bf1e-e6c9-414a-aae8-714cae79f77d}" id="id-0065-000000cc" kind="Object" relid="0x1a" role="Object">
-              <name>DataReader</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{0f133d49-abcd-45ba-9745-f48be5734e60}" id="id-0065-000000cd" kind="TwowayOperation" relid="0x12" role="TwowayOperation">
-                <name>get_matched_publication_data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1860</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{b5649232-92e1-4d70-a805-8bff7b23cd18}" id="id-0067-00000030" kind="InParameter" referred="id-0067-0000000e" relid="0x0" role="InParameter">
-                  <name>publication_handle</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{70174954-be47-435a-9205-a9490ea902c8}" id="id-0067-00000031" kind="InoutParameter" referred="id-0065-00000055" relid="0x0" role="InoutParameter">
-                  <name>publication_data</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{1ac6aab5-ab51-4304-af34-64a5ba64ba97}" id="id-0067-00000344" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{f7385d65-dd28-4743-8666-44afdc0129b1}" id="id-0065-000000ce" kind="TwowayOperation" relid="0x11" role="TwowayOperation">
-                <name>get_matched_publications</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1760</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{20acc5d7-554a-4dec-b47f-3bedea1bd78b}" id="id-0067-000001e4" kind="InoutParameter" referred="id-0067-000000c0" relid="0x0" role="InoutParameter">
-                  <name>publication_handles</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{7d346b0a-c905-4a28-849e-fc2b86d70de4}" id="id-0067-00000345" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{be4f3287-cd07-4eb7-b6c7-b6896851149d}" id="id-0065-000000cf" kind="TwowayOperation" relid="0x10" role="TwowayOperation">
-                <name>wait_for_historical_data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1660</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{e3586331-a04c-48d6-96b6-fea0ce63a58b}" id="id-0067-000001e5" kind="InParameter" referred="id-0065-00000119" relid="0x0" role="InParameter">
-                  <name>max_wait</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{f1748b53-c1f1-4fdd-9202-bf3388f88eee}" id="id-0067-00000346" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{88c6b525-6df9-413a-b781-9bc5393b5977}" id="id-0065-000000d0" kind="TwowayOperation" relid="0xf" role="TwowayOperation">
-                <name>get_sample_lost_status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{5cbe2df3-9bc6-4df7-a410-43ab45db51e9}" id="id-0067-000001e6" kind="InoutParameter" referred="id-0065-00000116" relid="0x0" role="InoutParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{7a9a3452-d0c6-4893-8c1f-1e796ba00329}" id="id-0067-00000347" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{2ca658fc-8e90-4e7d-ab2d-2690f5298858}" id="id-0065-000000d1" kind="TwowayOperation" relid="0xe" role="TwowayOperation">
-                <name>get_subscription_matched_status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{29026bb4-fe9d-444d-887e-ae6562a04e82}" id="id-0067-000001e7" kind="InoutParameter" referred="id-0065-0000010b" relid="0x0" role="InoutParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{b3915b89-c92a-4982-9188-3484fe4784eb}" id="id-0067-00000348" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{8fbc76bf-a8dc-41d1-bbbd-d950354e7fad}" id="id-0065-000000d2" kind="TwowayOperation" relid="0xd" role="TwowayOperation">
-                <name>get_requested_incompatible_qos_status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{8ea78cd1-84d0-414a-9a39-280656bae196}" id="id-0067-000001e8" kind="InoutParameter" referred="id-0065-0000010d" relid="0x0" role="InoutParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{17a44ee7-0ea9-401d-898d-2bdc0e33f7b2}" id="id-0067-00000349" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{e07c8a90-1bb4-415d-a61f-e84d832cde82}" id="id-0065-000000d3" kind="TwowayOperation" relid="0xc" role="TwowayOperation">
-                <name>get_requested_deadline_missed_status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{b8b86714-2293-424e-b89c-638dc177aba7}" id="id-0067-000001e9" kind="InoutParameter" referred="id-0065-00000110" relid="0x0" role="InoutParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{3325465b-0890-48b6-9e0f-30e321a8a143}" id="id-0067-0000034a" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{20d01bb3-85db-4f54-91c8-e86d17646904}" id="id-0065-000000d4" kind="TwowayOperation" relid="0xb" role="TwowayOperation">
-                <name>get_liveliness_changed_status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{d7f892f0-21d5-4859-9740-eeb548de58ee}" id="id-0067-000001ea" kind="InoutParameter" referred="id-0065-00000112" relid="0x0" role="InoutParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{b3ca04b8-3317-4a38-b73f-7bc61ef0b153}" id="id-0067-0000034b" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{908884b0-ec2f-4f93-9d92-35676ec68618}" id="id-0065-000000d5" kind="TwowayOperation" relid="0xa" role="TwowayOperation">
-                <name>get_sample_rejected_status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1060</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{83bc4080-3dd2-4fc0-ab27-1b165be5d9d7}" id="id-0067-000001eb" kind="InoutParameter" referred="id-0065-00000114" relid="0x0" role="InoutParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{f9a9e169-86e9-4445-8806-62d620053a24}" id="id-0067-0000034c" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{8a7e2afe-5ab1-4cfe-b674-aacd0fd4c738}" id="id-0065-000000d6" kind="TwowayOperation" relid="0x9" role="TwowayOperation">
-                <name>get_subscriber</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,960</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{9ce8b5ad-c5a6-4ca0-aea6-360d84a46e7b}" id="id-0067-00000032" kind="ReturnType" referred="id-0065-000000ba" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{d2af0371-d9d1-428f-8bfb-802afdf9359e}" id="id-0065-000000d7" kind="TwowayOperation" relid="0x8" role="TwowayOperation">
-                <name>get_topicdescription</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,860</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{a268a2b0-c39d-4647-a1ce-efabc5dcf561}" id="id-0067-000001ec" kind="ReturnType" referred="id-0065-000000fe" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{7baa6334-727a-45eb-8bc8-acdb0ad2b540}" id="id-0065-000000d8" kind="TwowayOperation" relid="0x7" role="TwowayOperation">
-                <name>get_listener</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,760</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{f502b17e-d2b7-464e-bd39-9412dd43606b}" id="id-0067-00000033" kind="ReturnType" referred="id-0065-00000095" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{850308ef-c9a2-479c-9f4c-8351d2622eee}" id="id-0065-000000d9" kind="TwowayOperation" relid="0x6" role="TwowayOperation">
-                <name>set_listener</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,660</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{865b5c00-d3fa-49e0-911b-8693599905c5}" id="id-0067-00000034" kind="InParameter" referred="id-0065-00000095" relid="0x0" role="InParameter">
-                  <name>a_listener</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{a821d230-c7d8-4f84-b429-de12810f0dcc}" id="id-0067-0000034d" kind="InParameter" referred="id-0067-0000027f" relid="0x0" role="InParameter">
-                  <name>mask</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{0c8d5a79-55fe-423d-a93d-407f1521af88}" id="id-0067-0000034e" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{1226b0b4-f9a7-48e6-a60f-90d18d32fb6b}" id="id-0065-000000da" kind="TwowayOperation" relid="0x5" role="TwowayOperation">
-                <name>get_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{0c1e6def-dd0d-4ff9-9c39-bb4ca7affbb6}" id="id-0067-00000035" kind="InoutParameter" referred="id-0065-00000059" relid="0x0" role="InoutParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{88a30702-5c90-4a78-b8f9-fbb64efe5c6d}" id="id-0067-0000034f" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{78a49b0e-0668-48ae-bb70-f1c739f5d501}" id="id-0065-000000db" kind="TwowayOperation" relid="0x4" role="TwowayOperation">
-                <name>set_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{b4c2cd01-c6c5-4803-9652-27e44b271449}" id="id-0067-00000036" kind="InParameter" referred="id-0065-00000059" relid="0x0" role="InParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{85583779-1ee1-42a2-b29c-d17d41a90ba5}" id="id-0067-00000350" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{bbe5c7d5-792e-4c19-839f-26a79eb0ea3a}" id="id-0065-000000dc" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-                <name>delete_contained_entities</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{98589b6b-47c5-424a-8325-88b6c6b8ddf9}" id="id-0067-00000351" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{ca9b0360-b989-4013-9ce5-1cf10de5e498}" id="id-0065-000000dd" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-                <name>delete_readcondition</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{ef05c440-391f-405a-a776-ce9f2a730c8b}" id="id-0067-00000037" kind="InParameter" referred="id-0065-00000080" relid="0x0" role="InParameter">
-                  <name>a_condition</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{282d5486-b054-42f4-8780-375153252f41}" id="id-0067-00000352" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{366fb55c-2487-452e-9b75-cb3b4f59e662}" id="id-0065-000000de" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                <name>create_querycondition</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{52e4d1ae-1206-4481-a20f-102fa6dfea60}" id="id-0067-00000038" kind="ReturnType" referred="id-0065-0000007c" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{a145acb8-6446-4d02-8797-cf7254ce6ab7}" id="id-0067-000001ed" kind="InParameter" referred="id-0066-0000003e" relid="0x0" role="InParameter">
-                  <name>query_expression</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>460,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{df2c621c-a512-41e6-a5a6-d595bd8a0622}" id="id-0067-00000353" kind="InParameter" referred="id-0067-00000261" relid="0x0" role="InParameter">
-                  <name>instance_states</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>360,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{a606eec2-53b4-450d-8e33-fcba20eaef10}" id="id-0067-00000354" kind="InParameter" referred="id-0067-00000267" relid="0x0" role="InParameter">
-                  <name>view_states</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{c1095bab-1aca-4140-b46a-e3709a6e4da3}" id="id-0067-00000355" kind="InParameter" referred="id-0067-0000026c" relid="0x0" role="InParameter">
-                  <name>sample_states</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{b06736dc-9e54-41fc-afac-4e99bb3223b2}" id="id-0067-00000356" kind="InParameter" referred="id-0067-00000295" relid="0x0" role="InParameter">
-                  <name>query_parameters</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>560,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{8364c0c8-5ebe-4e07-a39b-f421840d182b}" id="id-0065-000000df" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>create_readcondition</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{4f24a7ec-5131-4418-addf-5e0196357674}" id="id-0067-00000039" kind="ReturnType" referred="id-0065-00000080" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{f6fa2b6d-c993-42db-9dec-0fc8c2b72b6d}" id="id-0067-00000357" kind="InParameter" referred="id-0067-00000261" relid="0x0" role="InParameter">
-                  <name>instance_states</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>360,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{da663271-0415-4a50-a029-882464ba26f1}" id="id-0067-00000358" kind="InParameter" referred="id-0067-00000267" relid="0x0" role="InParameter">
-                  <name>view_states</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{2510d978-6f92-4dff-abb6-17f3f5cff5f7}" id="id-0067-00000359" kind="InParameter" referred="id-0067-0000026c" relid="0x0" role="InParameter">
-                  <name>sample_states</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <reference guid="{862fa6bf-24a5-468a-aab3-85bb4ea3344c}" id="id-0067-000001ee" kind="Inherits" referred="id-0065-00000102" relid="0x13" role="Inherits">
-                <name>Inherits</name>
-              </reference>
-            </model>
-            <model childrelidcntr="0xf" guid="{b06f71dd-0286-4ae8-af83-414fd2f115e1}" id="id-0065-000000e0" kind="Object" relid="0x19" role="Object">
-              <name>DataWriter</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{3180ae88-c33d-4ad9-8eb5-e12f78ff97f4}" id="id-0065-000000e1" kind="TwowayOperation" relid="0xd" role="TwowayOperation">
-                <name>get_matched_subscription_data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{3e4fe32d-6220-4369-9f62-bfffbf45b2f1}" id="id-0067-0000003a" kind="InParameter" referred="id-0067-0000000e" relid="0x0" role="InParameter">
-                  <name>subscription_handle</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{07f081be-d49c-453a-a416-c9104a68f015}" id="id-0067-0000003b" kind="InoutParameter" referred="id-0065-00000054" relid="0x0" role="InoutParameter">
-                  <name>subscription_data</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{80b2092b-af96-4601-9823-3990c3aa0577}" id="id-0067-0000035a" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{51711f31-8793-4171-ad92-715c15b342a7}" id="id-0065-000000e2" kind="TwowayOperation" relid="0xc" role="TwowayOperation">
-                <name>get_matched_subscriptions</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{376a6c69-0e21-40b6-96d9-5126c4983691}" id="id-0067-000001ef" kind="InoutParameter" referred="id-0067-000000c0" relid="0x0" role="InoutParameter">
-                  <name>subscription_handles</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{d1a4d556-9a9c-42a3-a693-a04cd53e0a6f}" id="id-0067-0000035b" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{d508c7f9-ce6f-480f-981c-9ae6984b38b0}" id="id-0065-000000e3" kind="TwowayOperation" relid="0xb" role="TwowayOperation">
-                <name>assert_liveliness</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{402cfdd7-adf7-44f5-aeeb-69c088ce010f}" id="id-0067-0000035c" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{b7413953-2322-422b-b920-ac083e2e442f}" id="id-0065-000000e4" kind="TwowayOperation" relid="0xa" role="TwowayOperation">
-                <name>get_publication_matched_status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1060</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{3cd41ec7-c494-43d7-b9e2-f13e0e008c9d}" id="id-0067-000001f0" kind="InoutParameter" referred="id-0065-0000010c" relid="0x0" role="InoutParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{5478d02f-8641-4493-801c-72f72e3d7513}" id="id-0067-0000035d" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{0c5e9011-e170-44b4-ac2e-450219040898}" id="id-0065-000000e5" kind="TwowayOperation" relid="0x9" role="TwowayOperation">
-                <name>get_offered_incompatible_qos_status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,960</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{8bbe6930-9292-46d7-a01e-60f8c6ac69fe}" id="id-0067-000001f1" kind="InoutParameter" referred="id-0065-0000010e" relid="0x0" role="InoutParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{58d3582f-037b-4be8-aa65-f39993307301}" id="id-0067-0000035e" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{9546b16e-5df7-40fc-b2f9-5710df09a4da}" id="id-0065-000000e6" kind="TwowayOperation" relid="0x8" role="TwowayOperation">
-                <name>get_offered_deadline_missed_status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,860</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{3285d48a-a6ba-4c99-880b-c0563ed2da97}" id="id-0067-000001f2" kind="InoutParameter" referred="id-0065-00000111" relid="0x0" role="InoutParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{1212d1c6-f9c6-4d27-8461-e5b06ba811bd}" id="id-0067-0000035f" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{54cadb57-5f14-41e7-9f7c-b0af1097dc14}" id="id-0065-000000e7" kind="TwowayOperation" relid="0x7" role="TwowayOperation">
-                <name>get_liveliness_lost_status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,760</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{07cf7dba-714b-48cf-a8c5-599ae57c3941}" id="id-0067-000001f3" kind="InoutParameter" referred="id-0065-00000113" relid="0x0" role="InoutParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{588ee479-1971-4d22-99b4-fda31545c49a}" id="id-0067-00000360" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{c98e7e74-8fcf-415f-bd37-c97cd4f7182f}" id="id-0065-000000e8" kind="TwowayOperation" relid="0x6" role="TwowayOperation">
-                <name>wait_for_acknowledgments</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,660</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{27a2f532-fede-463a-a5dc-f8cbb9fde023}" id="id-0067-000001f4" kind="InParameter" referred="id-0065-00000119" relid="0x0" role="InParameter">
-                  <name>max_wait</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{e3f34ddd-cefd-409c-8a37-080012a60cd2}" id="id-0067-00000361" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{11d1d9c9-263c-4cfd-a6f7-33b47dcb8736}" id="id-0065-000000e9" kind="TwowayOperation" relid="0x5" role="TwowayOperation">
-                <name>get_publisher</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{6a12959c-234a-46b8-89ea-923efc30c87d}" id="id-0067-0000003c" kind="ReturnType" referred="id-0065-000000a7" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{21be9e68-5bbb-4898-8d96-cff5e882597c}" id="id-0065-000000ea" kind="TwowayOperation" relid="0x4" role="TwowayOperation">
-                <name>get_topic</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{88cf4104-533a-42e2-9532-14ade65ada92}" id="id-0067-000001f5" kind="ReturnType" referred="id-0065-000000f8" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{e960875e-f4de-4dbe-807f-96ff38898542}" id="id-0065-000000eb" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-                <name>get_listener</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{3f1e29b1-c420-4588-b32b-8b176bb7625c}" id="id-0067-0000003d" kind="ReturnType" referred="id-0065-0000009e" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{d541075f-8cad-4036-869d-47204ccd947d}" id="id-0065-000000ec" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-                <name>set_listener</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{0a53e61f-3a3f-4a58-a868-df00a3ef2a13}" id="id-0067-0000003e" kind="InParameter" referred="id-0065-0000009e" relid="0x0" role="InParameter">
-                  <name>a_listener</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{86f347c1-0283-4d58-bd0b-eb50215dfaf8}" id="id-0067-00000362" kind="InParameter" referred="id-0067-0000027f" relid="0x0" role="InParameter">
-                  <name>mask</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{8aca85ab-f235-4a2d-88ca-fa93c53483d0}" id="id-0067-00000363" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{1be41d0f-9bea-4f28-afe8-fd0f97234fed}" id="id-0065-000000ed" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                <name>get_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{a260f328-f446-4d9c-9704-d68f156d3d50}" id="id-0067-0000003f" kind="InoutParameter" referred="id-0065-0000005b" relid="0x0" role="InoutParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{a172233d-bf1e-4669-821d-f80937375164}" id="id-0067-00000364" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{03e60fae-d7ec-4096-a3e0-308a9ac0684e}" id="id-0065-000000ee" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>set_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{40be1f9d-d188-4b06-b3d8-d019165a2031}" id="id-0067-00000040" kind="InParameter" referred="id-0065-0000005b" relid="0x0" role="InParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{66921089-3b93-420d-9d09-e983d0c3fccb}" id="id-0067-00000365" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <reference guid="{235fc104-2ce5-4b65-af6c-7b6925c8eef2}" id="id-0067-000001f6" kind="Inherits" referred="id-0065-00000102" relid="0xe" role="Inherits">
-                <name>Inherits</name>
-              </reference>
-            </model>
-            <model childrelidcntr="0x4" guid="{0f4b4aa3-418d-424e-8be1-2311617dcbf2}" id="id-0065-000000ef" kind="Object" relid="0x18" role="Object">
-              <name>MultiTopic</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{d90029a3-0ce6-4b5a-a5f0-6b35cf55adcf}" id="id-0065-000000f0" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-                <name>set_expression_parameters</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{34737b11-e434-4d96-a3d8-c09985a95ff7}" id="id-0067-00000366" kind="InParameter" referred="id-0067-00000295" relid="0x0" role="InParameter">
-                  <name>expression_parameters</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{87dd0a91-9db6-4325-b320-5aec593dd698}" id="id-0067-00000367" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{614b535e-aaa3-4539-b615-6e4818bad6f0}" id="id-0065-000000f1" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                <name>get_expression_parameters</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{8743fd10-4d33-4f47-8e99-29a35214f615}" id="id-0067-00000368" kind="InoutParameter" referred="id-0067-00000295" relid="0x0" role="InoutParameter">
-                  <name>expression_parameters</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{c174c042-2ead-46b5-812e-f933a9e431f8}" id="id-0067-00000369" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{98bec281-8398-46f9-af91-4f4220b9fd80}" id="id-0065-000000f2" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>get_subscription_expression</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{35c1f5b1-72f9-4651-8a22-2f79041ddc4e}" id="id-0067-000001f7" kind="ReturnType" referred="id-0066-0000003e" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <reference guid="{cf64023a-355c-4206-970d-78254da32458}" id="id-0067-000001f8" kind="Inherits" referred="id-0065-000000fe" relid="0x3" role="Inherits">
-                <name>Inherits</name>
-              </reference>
-            </model>
-            <model childrelidcntr="0x5" guid="{4519d714-cb1e-4ecb-bfad-1efad7a5148e}" id="id-0065-000000f3" kind="Object" relid="0x17" role="Object">
-              <name>ContentFilteredTopic</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{f89c4835-6002-4e00-b33d-02ecddfe8b71}" id="id-0065-000000f4" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-                <name>get_related_topic</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{cc3d38e3-2e8a-4b95-9159-a408db3f4cf8}" id="id-0067-000001f9" kind="ReturnType" referred="id-0065-000000f8" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{62800662-7ae4-48a1-837e-07a83ab4d863}" id="id-0065-000000f5" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-                <name>set_expression_parameters</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{6ba3e11c-de03-49cb-98c8-0b732bbda9ef}" id="id-0067-0000036a" kind="InParameter" referred="id-0067-00000295" relid="0x0" role="InParameter">
-                  <name>expression_parameters</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{29f41b68-9d52-47ad-a07c-3c227fe54954}" id="id-0067-0000036b" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{ced05860-39f6-4a16-a2ae-04fc3bb5015a}" id="id-0065-000000f6" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                <name>get_expression_parameters</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{be1a771a-f6ad-49ca-8d37-b5ba85078272}" id="id-0067-0000036c" kind="InoutParameter" referred="id-0067-00000295" relid="0x0" role="InoutParameter">
-                  <name>expression_parameters</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{f9164bd9-18e0-4f3c-bb91-f57d1727a055}" id="id-0067-0000036d" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{f74964a8-b61b-437c-a1d8-3092e88c392b}" id="id-0065-000000f7" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>get_filter_expression</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{5b987a95-3d0b-418c-8ca8-f2e65ee355d8}" id="id-0067-000001fa" kind="ReturnType" referred="id-0066-0000003e" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <reference guid="{6227c533-9113-45c3-bac0-550d056c3c9e}" id="id-0067-000001fb" kind="Inherits" referred="id-0065-000000fe" relid="0x4" role="Inherits">
-                <name>Inherits</name>
-              </reference>
-            </model>
-            <model childrelidcntr="0x6" guid="{1513a26f-41cf-4f33-bc0d-453acf586e69}" id="id-0065-000000f8" kind="Object" relid="0x16" role="Object">
-              <name>Topic</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{b2ffb576-5688-4807-b934-4f44f570d63c}" id="id-0065-000000f9" kind="TwowayOperation" relid="0x4" role="TwowayOperation">
-                <name>get_inconsistent_topic_status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{f4c39c16-4506-45c0-9c24-c51267f78f51}" id="id-0067-000001fc" kind="InoutParameter" referred="id-0065-00000117" relid="0x0" role="InoutParameter">
-                  <name>a_status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{c36ce585-f418-43ac-8890-d430daa2c078}" id="id-0067-0000036e" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{9537ee1d-3a24-4448-95a7-362da20940ce}" id="id-0065-000000fa" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-                <name>get_listener</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{e482526c-2533-49e4-8a38-9a899057428f}" id="id-0067-00000041" kind="ReturnType" referred="id-0065-000000a5" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{9cdc4a9b-cdce-42d3-b440-b803850fa319}" id="id-0065-000000fb" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-                <name>set_listener</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{f4c3cae0-5b5c-4238-9f7b-6ecdcf5b8b89}" id="id-0067-00000042" kind="InParameter" referred="id-0065-000000a5" relid="0x0" role="InParameter">
-                  <name>a_listener</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{64a2df6d-e0a0-4d65-9c33-ec2da6f921a1}" id="id-0067-0000036f" kind="InParameter" referred="id-0067-0000027f" relid="0x0" role="InParameter">
-                  <name>mask</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{07bcd3c9-f216-418f-99c3-86b56c601eae}" id="id-0067-00000370" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{2c8512d5-aef0-4292-8ec3-5578e9bd97c0}" id="id-0065-000000fc" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                <name>get_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{7e95ac3b-ad35-4e30-b741-4d2029bc1153}" id="id-0067-00000043" kind="InoutParameter" referred="id-0065-0000005c" relid="0x0" role="InoutParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{52a9e0ae-f407-4e21-b24c-0f27102fce7d}" id="id-0067-00000371" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{7c385dbf-8514-4e9f-9b8d-e4036f71b57a}" id="id-0065-000000fd" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>set_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{d4e3d371-a644-4ed5-a1ba-8801ce340a9d}" id="id-0067-00000044" kind="InParameter" referred="id-0065-0000005c" relid="0x0" role="InParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{7e8c5d5a-8861-430d-b509-5cafd8118cc3}" id="id-0067-00000372" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <reference guid="{0b7b4c65-7f41-4aee-9f49-d1cb418ed5bd}" id="id-0067-000001fd" kind="Inherits" referred="id-0065-000000fe" relid="0x5" role="Inherits">
-                <name>Inherits</name>
-              </reference>
-              <reference guid="{05ff6b9f-53a9-4836-a396-33ca2d536404}" id="id-0067-000001fe" kind="Inherits" referred="id-0065-00000102" relid="0x5" role="Inherits">
-                <name>Inherits</name>
-              </reference>
-            </model>
-            <model childrelidcntr="0x3" guid="{7acee41b-3015-491c-a696-bfedaa9963e1}" id="id-0065-000000fe" kind="Object" relid="0x15" role="Object">
-              <name>TopicDescription</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{aebbe005-9458-4808-a804-68743be3b8da}" id="id-0065-000000ff" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-                <name>get_participant</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{0afcd804-47fe-4c8c-bfbd-16b81cf907b3}" id="id-0067-00000045" kind="ReturnType" referred="id-0065-0000002c" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{ce550fbe-44e3-4d1f-8a83-36113be0bf40}" id="id-0065-00000100" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                <name>get_name</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{8f7e62ff-51c5-4125-9aeb-e9f40044a1f3}" id="id-0067-000001ff" kind="ReturnType" referred="id-0066-0000003e" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{47f9ef74-bb3c-44c2-a901-5b67615f168c}" id="id-0065-00000101" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>get_type_name</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{f4b8d2dc-c32d-4112-b4a3-c7c3a3f0e69d}" id="id-0067-00000200" kind="ReturnType" referred="id-0066-0000003e" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-            </model>
-            <model childrelidcntr="0x4" guid="{3fc48051-8ef3-4e8f-a50f-aca9fa66774d}" id="id-0065-00000102" kind="Object" relid="0x14" role="Object">
-              <name>Entity</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{77725c52-dc35-4efe-a66c-633af883860a}" id="id-0065-00000103" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-                <name>get_instance_handle</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{b8866053-8666-4021-815c-e623148034dd}" id="id-0067-00000046" kind="ReturnType" referred="id-0067-0000000e" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{79239a78-be48-45db-8ae8-0592dca31355}" id="id-0065-00000104" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-                <name>get_status_changes</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{6acfc95d-65f9-4cda-a0ed-62dd3f2374c5}" id="id-0067-00000373" kind="ReturnType" referred="id-0067-0000027f" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{4fdecb27-0c35-4eb8-8286-947bb4e0fe5b}" id="id-0065-00000105" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                <name>get_statuscondition</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{14c67b3e-0e96-453f-9a16-a69ed9615ffe}" id="id-0067-00000047" kind="ReturnType" referred="id-0065-00000085" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{37f77090-3e8c-4924-a64a-378829cdbf7b}" id="id-0065-00000106" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>enable</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{c38bcd20-1e89-4657-94cc-5efa85b9c2f8}" id="id-0067-00000374" kind="ReturnType" referred="id-0067-00000297" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-            </model>
-            <model childrelidcntr="0x0" guid="{f8027bdb-3f5e-42e8-8ab5-09488c655dda}" id="id-0065-00000107" kind="Object" relid="0x13" role="Object">
-              <name>Listener</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-            </model>
-            <model childrelidcntr="0x1" guid="{438dc305-e48b-42eb-b104-295744b3b57b}" id="id-0065-00000108" kind="Aggregate" relid="0x12" role="Aggregate">
-              <name>ReliableWriterCacheChangedStatus</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{9ac5831c-f9bd-4d4b-9963-f7e01fc0b141}" id="id-0067-00000201" kind="Member" referred="id-0066-00000049" relid="0x0" role="Member">
-                <name>unacknowledged_sample_count_peak</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{c93d2194-f2e8-4024-8318-cae098b46aca}" id="id-0067-00000202" kind="Member" referred="id-0066-00000049" relid="0x0" role="Member">
-                <name>unacknowledged_sample_count</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{f7f2e72d-9d9d-453b-be78-79fb5f5c4744}" id="id-0067-00000203" kind="Member" referred="id-0065-00000109" relid="0x0" role="Member">
-                <name>high_watermark_reliable_writer_cache</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{928fd414-705b-4bd9-82fa-62db0e7c2a62}" id="id-0067-00000204" kind="Member" referred="id-0065-00000109" relid="0x0" role="Member">
-                <name>low_watermark_reliable_writer_cache</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{12c63f1a-c9aa-4b27-9e7d-b78a381183e5}" id="id-0067-00000205" kind="Member" referred="id-0065-00000109" relid="0x0" role="Member">
-                <name>full_reliable_writer_cache</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{254a14d0-36de-4b30-bfe5-3e6b1e383613}" id="id-0067-00000206" kind="Member" referred="id-0065-00000109" relid="0x0" role="Member">
-                <name>empty_reliable_writer_cache</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{189a004d-1843-4899-8fa7-10a12c89fcab}" id="id-0065-00000109" kind="Aggregate" relid="0x11" role="Aggregate">
-              <name>ReliableWriterCacheEventCount</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{222fb828-d06c-47d4-9db6-adaad3a0ba3a}" id="id-0067-00000207" kind="Member" referred="id-0066-00000049" relid="0x0" role="Member">
-                <name>total_count_change</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{5eb39167-0ac1-4736-bd26-c155bcd56a85}" id="id-0067-00000208" kind="Member" referred="id-0066-00000049" relid="0x0" role="Member">
-                <name>total_count</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{763fd3a6-9b56-4284-93d5-1544fb78a6c2}" id="id-0065-0000010a" kind="Aggregate" relid="0x10" role="Aggregate">
-              <name>ReliableReaderActivityChangedStatus</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{3e56fe6b-bf13-4dcc-9296-42a5b6e0f6b4}" id="id-0067-00000048" kind="Member" referred="id-0067-0000000e" relid="0x0" role="Member">
-                <name>last_instance_handle</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{c39f1a60-aacc-4450-b3f2-7786959cf62b}" id="id-0067-00000209" kind="Member" referred="id-0066-00000049" relid="0x0" role="Member">
-                <name>inactive_count_change</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{4f05037b-b956-4b09-9c52-30f891dd4849}" id="id-0067-0000020a" kind="Member" referred="id-0066-00000049" relid="0x0" role="Member">
-                <name>active_count_change</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{13945772-0a96-4cba-ae2e-e5b168075ee3}" id="id-0067-0000020b" kind="Member" referred="id-0066-00000049" relid="0x0" role="Member">
-                <name>inactive_count</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{6d73f6f0-4b2a-4d36-85e3-37f3c0ded980}" id="id-0067-0000020c" kind="Member" referred="id-0066-00000049" relid="0x0" role="Member">
-                <name>active_count</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{a3904686-138a-4a85-83ec-0d91c721912a}" id="id-0065-0000010b" kind="Aggregate" relid="0xf" role="Aggregate">
-              <name>SubscriptionMatchedStatus</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{601d70a5-e20d-4ec6-b055-4f91a6c89285}" id="id-0067-00000049" kind="Member" referred="id-0067-0000000e" relid="0x0" role="Member">
-                <name>last_publication_handle</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{dbf559ef-9da3-4929-89c9-7d3a4d9f46eb}" id="id-0067-0000020d" kind="Member" referred="id-0066-00000049" relid="0x0" role="Member">
-                <name>current_count_change</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{cb21e320-eb39-49dd-aea1-a456bea93be6}" id="id-0067-0000020e" kind="Member" referred="id-0066-00000049" relid="0x0" role="Member">
-                <name>current_count</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{7b6a054b-ecf3-4dfa-ba59-14dfbe089576}" id="id-0067-0000020f" kind="Member" referred="id-0066-00000049" relid="0x0" role="Member">
-                <name>total_count_change</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{37a0d63c-fcc2-4ec0-bd04-0445d48c120e}" id="id-0067-00000210" kind="Member" referred="id-0066-00000049" relid="0x0" role="Member">
-                <name>total_count</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{2c2c71b4-dddf-4f35-bfd1-50b65509ebdd}" id="id-0065-0000010c" kind="Aggregate" relid="0xe" role="Aggregate">
-              <name>PublicationMatchedStatus</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{74cd297f-c4c3-48b1-9ef0-784b0e30c5d6}" id="id-0067-0000004a" kind="Member" referred="id-0067-0000000e" relid="0x0" role="Member">
-                <name>last_subscription_handle</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{501da5cb-155e-4954-94e2-4cefec1109d6}" id="id-0067-00000211" kind="Member" referred="id-0066-00000049" relid="0x0" role="Member">
-                <name>current_count_change</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{62c7e48b-ae99-43fa-8218-d054c79f6dcd}" id="id-0067-00000212" kind="Member" referred="id-0066-00000049" relid="0x0" role="Member">
-                <name>current_count</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{f12a6ed0-8be3-4aaa-93b0-b1ed1cf009c2}" id="id-0067-00000213" kind="Member" referred="id-0066-00000049" relid="0x0" role="Member">
-                <name>total_count_change</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{eb99edd9-bcd8-483a-b588-ae830734ed0e}" id="id-0067-00000214" kind="Member" referred="id-0066-00000049" relid="0x0" role="Member">
-                <name>total_count</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{56377413-92e4-472a-90a9-71c28539f15b}" id="id-0065-0000010d" kind="Aggregate" relid="0xd" role="Aggregate">
-              <name>RequestedIncompatibleQosStatus</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{2d002650-9d63-48d5-a296-bf41ee91abf2}" id="id-0067-00000215" kind="Member" referred="id-0066-00000049" relid="0x0" role="Member">
-                <name>total_count_change</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{ec6e0a1c-f3b4-4152-8c0f-cf1688878463}" id="id-0067-00000216" kind="Member" referred="id-0066-00000049" relid="0x0" role="Member">
-                <name>total_count</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{ddf0bbc1-8477-4303-b7ca-0d358c381535}" id="id-0067-00000217" kind="Member" referred="id-0067-00000052" relid="0x0" role="Member">
-                <name>policies</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{5ed8833c-ac09-4483-9ed2-01c8b0d0a39d}" id="id-0067-00000375" kind="Member" referred="id-0067-00000296" relid="0x0" role="Member">
-                <name>last_policy_id</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{c88e3a59-17ff-4108-875b-7535cb293858}" id="id-0065-0000010e" kind="Aggregate" relid="0xc" role="Aggregate">
-              <name>OfferedIncompatibleQosStatus</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{e52be414-0737-4bb8-9ee1-fe8f17cae070}" id="id-0067-00000218" kind="Member" referred="id-0066-00000049" relid="0x0" role="Member">
-                <name>total_count_change</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{01aafd7d-429f-495a-ae47-fd37ed99122a}" id="id-0067-00000219" kind="Member" referred="id-0066-00000049" relid="0x0" role="Member">
-                <name>total_count</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{53f69b13-a147-47af-8558-f9b6c3129f9d}" id="id-0067-0000021a" kind="Member" referred="id-0067-00000052" relid="0x0" role="Member">
-                <name>policies</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{f8707b10-8d0c-4add-90ea-a4fd6422cf04}" id="id-0067-00000376" kind="Member" referred="id-0067-00000296" relid="0x0" role="Member">
-                <name>last_policy_id</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{e89fea34-133b-4b0c-bce3-7d283cd5af96}" id="id-0065-0000010f" kind="Aggregate" relid="0xb" role="Aggregate">
-              <name>QosPolicyCount</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{680f80fb-bf72-4d79-8897-d35a225f9368}" id="id-0067-0000021b" kind="Member" referred="id-0066-00000049" relid="0x0" role="Member">
-                <name>count</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{a78c98e1-d747-463c-a1d7-af5d695e1e0e}" id="id-0067-00000377" kind="Member" referred="id-0067-00000296" relid="0x0" role="Member">
-                <name>policy_id</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{43d167dc-af08-4dcb-ad53-82442cb9eed9}" id="id-0065-00000110" kind="Aggregate" relid="0xa" role="Aggregate">
-              <name>RequestedDeadlineMissedStatus</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{2c893c41-ac52-4ddc-993f-fbee4caa1603}" id="id-0067-0000004b" kind="Member" referred="id-0067-0000000e" relid="0x0" role="Member">
-                <name>last_instance_handle</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{cc844a3b-91d3-45bc-8534-71a9b174f452}" id="id-0067-0000021c" kind="Member" referred="id-0066-00000049" relid="0x0" role="Member">
-                <name>total_count_change</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{659375ea-d3d6-4a59-8176-671dac36def7}" id="id-0067-0000021d" kind="Member" referred="id-0066-00000049" relid="0x0" role="Member">
-                <name>total_count</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{ff404a73-66eb-4bb8-a94e-b11c999b79ee}" id="id-0065-00000111" kind="Aggregate" relid="0x9" role="Aggregate">
-              <name>OfferedDeadlineMissedStatus</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{9e7ec43a-270d-4403-aece-470e6f84c159}" id="id-0067-0000004c" kind="Member" referred="id-0067-0000000e" relid="0x0" role="Member">
-                <name>last_instance_handle</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{b5e7ff62-6ad1-4ea3-a1ad-4be218ba0a75}" id="id-0067-0000021e" kind="Member" referred="id-0066-00000049" relid="0x0" role="Member">
-                <name>total_count_change</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{40978a0e-e00b-42e5-bc09-e565784b221c}" id="id-0067-0000021f" kind="Member" referred="id-0066-00000049" relid="0x0" role="Member">
-                <name>total_count</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{9254f504-2700-4569-93f3-c03d9b61ed81}" id="id-0065-00000112" kind="Aggregate" relid="0x8" role="Aggregate">
-              <name>LivelinessChangedStatus</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{4d321c30-dccc-4f1f-9f5b-666417af0d1b}" id="id-0067-0000004d" kind="Member" referred="id-0067-0000000e" relid="0x0" role="Member">
-                <name>last_publication_handle</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{11957c4f-c294-456e-be08-9677f4370e81}" id="id-0067-00000220" kind="Member" referred="id-0066-00000049" relid="0x0" role="Member">
-                <name>not_alive_count_change</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{c30d7c42-fb36-4109-bad2-91bd904173bf}" id="id-0067-00000221" kind="Member" referred="id-0066-00000049" relid="0x0" role="Member">
-                <name>alive_count_change</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{49bd96aa-52e4-4912-91ef-dda97895c3a3}" id="id-0067-00000222" kind="Member" referred="id-0066-00000049" relid="0x0" role="Member">
-                <name>not_alive_count</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{4b14f82d-bb06-42fd-8162-787055f30596}" id="id-0067-00000223" kind="Member" referred="id-0066-00000049" relid="0x0" role="Member">
-                <name>alive_count</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{d0dc1307-a10d-4a65-b01f-aa1a0d6ed20a}" id="id-0065-00000113" kind="Aggregate" relid="0x7" role="Aggregate">
-              <name>LivelinessLostStatus</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{3d412127-8425-48d4-8dc5-a5e739d3c7cc}" id="id-0067-00000224" kind="Member" referred="id-0066-00000049" relid="0x0" role="Member">
-                <name>total_count_change</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{9453bb3b-d71a-425c-9c15-cc87630f5c4e}" id="id-0067-00000225" kind="Member" referred="id-0066-00000049" relid="0x0" role="Member">
-                <name>total_count</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{f2a168c3-4719-4d0a-b560-b46dac88b5be}" id="id-0065-00000114" kind="Aggregate" relid="0x6" role="Aggregate">
-              <name>SampleRejectedStatus</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{14c0ee38-4c2f-43bf-9124-563e0abc2b0b}" id="id-0067-0000004e" kind="Member" referred="id-0067-0000000e" relid="0x0" role="Member">
-                <name>last_instance_handle</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{5654f0f9-6fbf-4f0e-a540-63987c47380e}" id="id-0067-00000226" kind="Member" referred="id-0066-00000049" relid="0x0" role="Member">
-                <name>total_count_change</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{d0e39512-4e45-435e-8284-7a7233e5a757}" id="id-0067-00000227" kind="Member" referred="id-0066-00000049" relid="0x0" role="Member">
-                <name>total_count</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{2747eab6-65b3-48f8-bdc2-07a15a0da61b}" id="id-0067-00000228" kind="Member" referred="id-0065-00000115" relid="0x0" role="Member">
-                <name>last_reason</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x4" guid="{41e84200-639f-4863-9cc4-525be2ee68fe}" id="id-0065-00000115" kind="Enum" relid="0x5" role="Enum">
-              <name>SampleRejectedStatusKind</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <atom guid="{fac2dfa4-72a9-4188-8bab-56473e6dec96}" id="id-0066-0000002e" kind="EnumValue" relid="0x3" role="EnumValue">
-                <name>REJECTED_BY_SAMPLES_PER_INSTANCE_LIMIT</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-              <atom guid="{2fd82d72-0967-419a-851b-512f4fb4386f}" id="id-0066-0000002f" kind="EnumValue" relid="0x2" role="EnumValue">
-                <name>REJECTED_BY_SAMPLES_LIMIT</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-              <atom guid="{5c62b917-c1a5-44c4-bf43-a62d8fc5ed69}" id="id-0066-00000030" kind="EnumValue" relid="0x1" role="EnumValue">
-                <name>REJECTED_BY_INSTANCES_LIMIT</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-              <atom guid="{1ca8c1cc-a038-44a2-8fe6-8012da8f2d3b}" id="id-0066-00000031" kind="EnumValue" relid="0x0" role="EnumValue">
-                <name>NOT_REJECTED</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-            </model>
-            <model childrelidcntr="0x1" guid="{477c1c4d-6625-4047-ad1b-049f98ea2c66}" id="id-0065-00000116" kind="Aggregate" relid="0x4" role="Aggregate">
-              <name>SampleLostStatus</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{47b47e09-61d7-49ac-a95c-3e31690da56c}" id="id-0067-00000229" kind="Member" referred="id-0066-00000049" relid="0x0" role="Member">
-                <name>total_count_change</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{a26d5d65-edb9-4f2d-8c1a-fc92878f82c3}" id="id-0067-0000022a" kind="Member" referred="id-0066-00000049" relid="0x0" role="Member">
-                <name>total_count</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{8d4c6c71-0536-4c64-9850-775867425145}" id="id-0065-00000117" kind="Aggregate" relid="0x3" role="Aggregate">
-              <name>InconsistentTopicStatus</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{81bac9f7-c709-43bd-8a49-66513505d5a7}" id="id-0067-0000022b" kind="Member" referred="id-0066-00000049" relid="0x0" role="Member">
-                <name>total_count_change</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{e184c237-4a17-48c5-8959-4114ffcbd4ad}" id="id-0067-0000022c" kind="Member" referred="id-0066-00000049" relid="0x0" role="Member">
-                <name>total_count</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{d7b87f17-977a-4be0-9091-944d13e2abef}" id="id-0065-00000118" kind="Aggregate" relid="0x2" role="Aggregate">
-              <name>Time_t</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{dbaf34cb-cfac-42d4-aaed-03350e4224e3}" id="id-0067-0000022d" kind="Member" referred="id-0066-00000046" relid="0x0" role="Member">
-                <name>nanosec</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{a0263a6d-9891-4948-be8c-8b143eb61ebc}" id="id-0067-0000022e" kind="Member" referred="id-0066-00000049" relid="0x0" role="Member">
-                <name>sec</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{c25f412d-47d0-4004-82a1-97aca23f80c2}" id="id-0065-00000119" kind="Aggregate" relid="0x1" role="Aggregate">
-              <name>Duration_t</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{1f465721-a2e5-4476-85c8-187f26c707b0}" id="id-0067-0000022f" kind="Member" referred="id-0066-00000046" relid="0x0" role="Member">
-                <name>nanosec</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{4249a059-015c-4349-9139-c647a1fa2d40}" id="id-0067-00000230" kind="Member" referred="id-0066-00000049" relid="0x0" role="Member">
-                <name>sec</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{a5b03cad-ef21-4083-922b-2ab35bb09683}" id="id-0065-0000011a" kind="Aggregate" relid="0x0" role="Aggregate">
-              <name>BuiltinTopicKey_t</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{963202a2-5e3c-498c-b606-79df39a64df7}" id="id-0067-00000231" kind="ArrayMember" referred="id-0066-00000049" relid="0x0" role="ArrayMember">
-                <name>value</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="Size">
-                  <value>3</value>
-                </attribute>
-              </reference>
-            </model>
-            <reference guid="{bd00d3e2-536b-428c-9e03-cb8db4187959}" id="id-0067-0000004f" kind="Collection" referred="id-0065-00000020" relid="0x55" role="Collection">
-              <name>SampleInfoSeq</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="bound" status="meta">
-                <value/>
-              </attribute>
-            </reference>
-            <reference guid="{ea4d831c-0b5d-4558-86cb-a1dbecede78d}" id="id-0067-00000050" kind="Collection" referred="id-0065-00000090" relid="0x24" role="Collection">
-              <name>ConditionSeq</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="bound" status="meta">
-                <value/>
-              </attribute>
-            </reference>
-            <reference guid="{78e9e4ce-0c16-4926-9cab-98fca7f42340}" id="id-0067-00000051" kind="Collection" referred="id-0065-000000cc" relid="0x1d" role="Collection">
-              <name>DataReaderSeq</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="bound" status="meta">
-                <value/>
-              </attribute>
-            </reference>
-            <reference guid="{6d8fb54a-e172-4f46-a98a-abc0ec6e11d8}" id="id-0067-00000052" kind="Collection" referred="id-0065-0000010f" relid="0xc" role="Collection">
-              <name>QosPolicyCountSeq</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="bound" status="meta">
-                <value/>
-              </attribute>
-            </reference>
-            <reference guid="{3d739258-d430-4f96-965e-b0712419b322}" id="id-0067-00000232" kind="Collection" referred="id-0066-0000004d" relid="0x29" role="Collection">
-              <name>OctetSeq</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="bound" status="meta">
-                <value/>
-              </attribute>
-            </reference>
-            <reference guid="{9a3f8cd3-6297-4271-bff0-5df4d6ef4e86}" id="id-0067-00000233" kind="Constant" referred="id-0066-00000049" relid="0x29" role="Constant">
-              <name>DURABILITYSERVICE_QOS_POLICY_ID</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>22</value>
-              </attribute>
-            </reference>
-            <reference guid="{6ea3d1b9-4d9c-422d-b840-dd7dbdc687c1}" id="id-0067-00000234" kind="Constant" referred="id-0066-00000049" relid="0x29" role="Constant">
-              <name>LIFESPAN_QOS_POLICY_ID</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>21</value>
-              </attribute>
-            </reference>
-            <reference guid="{d4477e99-5985-489d-9609-b8f294c8a149}" id="id-0067-00000235" kind="Constant" referred="id-0066-00000049" relid="0x29" role="Constant">
-              <name>TRANSPORTPRIORITY_QOS_POLICY_ID</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>20</value>
-              </attribute>
-            </reference>
-            <reference guid="{c40ef8d5-414f-463b-b547-477523ea9ac7}" id="id-0067-00000236" kind="Constant" referred="id-0066-00000049" relid="0x29" role="Constant">
-              <name>GROUPDATA_QOS_POLICY_ID</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>19</value>
-              </attribute>
-            </reference>
-            <reference guid="{a62f9110-3577-4424-8204-d55f86b042fd}" id="id-0067-00000237" kind="Constant" referred="id-0066-00000049" relid="0x29" role="Constant">
-              <name>TOPICDATA_QOS_POLICY_ID</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>18</value>
-              </attribute>
-            </reference>
-            <reference guid="{6444c694-b5c1-4f80-a898-3be27fb49b8e}" id="id-0067-00000238" kind="Constant" referred="id-0066-00000049" relid="0x29" role="Constant">
-              <name>READERDATALIFECYCLE_QOS_POLICY_ID</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>17</value>
-              </attribute>
-            </reference>
-            <reference guid="{b47ce178-3002-41e4-b156-cd2859716e21}" id="id-0067-00000239" kind="Constant" referred="id-0066-00000049" relid="0x29" role="Constant">
-              <name>WRITERDATALIFECYCLE_QOS_POLICY_ID</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>16</value>
-              </attribute>
-            </reference>
-            <reference guid="{22c87c9f-59d2-4208-ac27-bf4e7ed3a26a}" id="id-0067-0000023a" kind="Constant" referred="id-0066-00000049" relid="0x29" role="Constant">
-              <name>ENTITYFACTORY_QOS_POLICY_ID</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>15</value>
-              </attribute>
-            </reference>
-            <reference guid="{20e774b6-a766-4159-b9a5-ddf2694e6819}" id="id-0067-0000023b" kind="Constant" referred="id-0066-00000049" relid="0x29" role="Constant">
-              <name>RESOURCELIMITS_QOS_POLICY_ID</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>14</value>
-              </attribute>
-            </reference>
-            <reference guid="{fa43c7d0-05ed-41f8-8209-b62c8275fafe}" id="id-0067-0000023c" kind="Constant" referred="id-0066-00000049" relid="0x29" role="Constant">
-              <name>HISTORY_QOS_POLICY_ID</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>13</value>
-              </attribute>
-            </reference>
-            <reference guid="{3d1b86b5-e1ef-44eb-a0a0-0a68b139696d}" id="id-0067-0000023d" kind="Constant" referred="id-0066-00000049" relid="0x29" role="Constant">
-              <name>DESTINATIONORDER_QOS_POLICY_ID</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>12</value>
-              </attribute>
-            </reference>
-            <reference guid="{6fe0af61-4983-4eaf-a0e4-2f95c0e61ae4}" id="id-0067-0000023e" kind="Constant" referred="id-0066-00000049" relid="0x29" role="Constant">
-              <name>RELIABILITY_QOS_POLICY_ID</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>11</value>
-              </attribute>
-            </reference>
-            <reference guid="{8cc80712-a728-439a-97e9-01656d5f0798}" id="id-0067-0000023f" kind="Constant" referred="id-0066-00000049" relid="0x29" role="Constant">
-              <name>PARTITION_QOS_POLICY_ID</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>10</value>
-              </attribute>
-            </reference>
-            <reference guid="{6cc25795-4a61-42b0-92ee-b178311f6685}" id="id-0067-00000240" kind="Constant" referred="id-0066-00000049" relid="0x29" role="Constant">
-              <name>TIMEBASEDFILTER_QOS_POLICY_ID</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>9</value>
-              </attribute>
-            </reference>
-            <reference guid="{3e13fcc4-1376-45ec-a75d-1fe3e3a21b32}" id="id-0067-00000241" kind="Constant" referred="id-0066-00000049" relid="0x29" role="Constant">
-              <name>LIVELINESS_QOS_POLICY_ID</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>8</value>
-              </attribute>
-            </reference>
-            <reference guid="{73353c2c-8b07-47b5-b1d2-bf8488a53abd}" id="id-0067-00000242" kind="Constant" referred="id-0066-00000049" relid="0x29" role="Constant">
-              <name>OWNERSHIPSTRENGTH_QOS_POLICY_ID</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>7</value>
-              </attribute>
-            </reference>
-            <reference guid="{04c3ccdd-029a-42b9-966c-03a39649c434}" id="id-0067-00000243" kind="Constant" referred="id-0066-00000049" relid="0x29" role="Constant">
-              <name>OWNERSHIP_QOS_POLICY_ID</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>6</value>
-              </attribute>
-            </reference>
-            <reference guid="{5e24adef-84f2-4217-935c-7919ca41349f}" id="id-0067-00000244" kind="Constant" referred="id-0066-00000049" relid="0x29" role="Constant">
-              <name>LATENCYBUDGET_QOS_POLICY_ID</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>5</value>
-              </attribute>
-            </reference>
-            <reference guid="{f1351792-cb5c-420d-87ef-9a382e601e0f}" id="id-0067-00000245" kind="Constant" referred="id-0066-00000049" relid="0x29" role="Constant">
-              <name>DEADLINE_QOS_POLICY_ID</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>4</value>
-              </attribute>
-            </reference>
-            <reference guid="{5f9654da-90dd-4c64-bdf9-b54f9c22cee3}" id="id-0067-00000246" kind="Constant" referred="id-0066-00000049" relid="0x29" role="Constant">
-              <name>PRESENTATION_QOS_POLICY_ID</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>3</value>
-              </attribute>
-            </reference>
-            <reference guid="{90cff5dc-65c5-4439-87f4-9ffe7c471ec3}" id="id-0067-00000247" kind="Constant" referred="id-0066-00000049" relid="0x29" role="Constant">
-              <name>DURABILITY_QOS_POLICY_ID</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>2</value>
-              </attribute>
-            </reference>
-            <reference guid="{900018cf-41d6-4dd2-bc12-5519f7fa71af}" id="id-0067-00000248" kind="Constant" referred="id-0066-00000049" relid="0x29" role="Constant">
-              <name>USERDATA_QOS_POLICY_ID</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>1</value>
-              </attribute>
-            </reference>
-            <reference guid="{a5583f66-b4fd-41cb-bf8a-93f5a3ad592d}" id="id-0067-00000249" kind="Constant" referred="id-0066-00000049" relid="0x29" role="Constant">
-              <name>INVALID_QOS_POLICY_ID</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>0</value>
-              </attribute>
-            </reference>
-            <reference guid="{25e9c88b-ecc3-49b5-856b-ce68ed556005}" id="id-0067-0000024a" kind="Constant" referred="id-0066-0000003e" relid="0x29" role="Constant">
-              <name>DURABILITYSERVICE_POLICY_NAME</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>DurabilityService</value>
-              </attribute>
-            </reference>
-            <reference guid="{84431488-0616-42bb-b041-ff04f04afd4a}" id="id-0067-0000024b" kind="Constant" referred="id-0066-0000003e" relid="0x29" role="Constant">
-              <name>LIFESPAN_QOS_POLICY_NAME</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>Lifespan</value>
-              </attribute>
-            </reference>
-            <reference guid="{2f74cd87-7056-411e-8df5-ec3fde12f838}" id="id-0067-0000024c" kind="Constant" referred="id-0066-0000003e" relid="0x29" role="Constant">
-              <name>GROUPDATA_QOS_POLICY_NAME</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>TransportPriority</value>
-              </attribute>
-            </reference>
-            <reference guid="{9e8145d3-32fd-469c-9ba2-5e1b37d28950}" id="id-0067-0000024d" kind="Constant" referred="id-0066-0000003e" relid="0x29" role="Constant">
-              <name>TOPICDATA_QOS_POLICY_NAME</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>TopicData</value>
-              </attribute>
-            </reference>
-            <reference guid="{686913f1-452e-43e0-ab32-5586c0f0fed6}" id="id-0067-0000024e" kind="Constant" referred="id-0066-0000003e" relid="0x29" role="Constant">
-              <name>READERDATALIFECYCLE_QOS_POLICY_NAME</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>ReaderDataLifecycle</value>
-              </attribute>
-            </reference>
-            <reference guid="{70754b78-bddf-4f69-9867-dfd284250706}" id="id-0067-0000024f" kind="Constant" referred="id-0066-0000003e" relid="0x29" role="Constant">
-              <name>WRITERDATALIFECYCLE_QOS_POLICY_NAME</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>WriterDataLifecycle</value>
-              </attribute>
-            </reference>
-            <reference guid="{987c7a77-32a3-405e-b79c-0e4ffa535e83}" id="id-0067-00000250" kind="Constant" referred="id-0066-0000003e" relid="0x29" role="Constant">
-              <name>ENTITYFACTORY_QOS_POLICY_NAME</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>EntityFactory</value>
-              </attribute>
-            </reference>
-            <reference guid="{b59b8a19-89a4-4848-a844-14233b466053}" id="id-0067-00000251" kind="Constant" referred="id-0066-0000003e" relid="0x29" role="Constant">
-              <name>RESOURCELIMITS_QOS_POLICY_NAME</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>ResourceLimits</value>
-              </attribute>
-            </reference>
-            <reference guid="{cfd2bd41-b9af-417b-8354-94a13b32eed0}" id="id-0067-00000252" kind="Constant" referred="id-0066-0000003e" relid="0x29" role="Constant">
-              <name>HISTORY_QOS_POLICY_NAME</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>History</value>
-              </attribute>
-            </reference>
-            <reference guid="{70bd1a60-33c8-4a8a-9b17-38334ebddb3c}" id="id-0067-00000253" kind="Constant" referred="id-0066-0000003e" relid="0x29" role="Constant">
-              <name>DESTINATIONORDER_QOS_POLICY_NAME</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>DestinationOrder</value>
-              </attribute>
-            </reference>
-            <reference guid="{4b7d207f-8a78-4551-8aa7-02e74dc6f675}" id="id-0067-00000254" kind="Constant" referred="id-0066-0000003e" relid="0x29" role="Constant">
-              <name>RELIABILITY_QOS_POLICY_NAME</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>Reliability</value>
-              </attribute>
-            </reference>
-            <reference guid="{b354cef1-9129-4ca3-8c48-258b0d804a5e}" id="id-0067-00000255" kind="Constant" referred="id-0066-0000003e" relid="0x29" role="Constant">
-              <name>PARTITION_QOS_POLICY_NAME</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>Partition</value>
-              </attribute>
-            </reference>
-            <reference guid="{07e31c0c-3231-42b3-98dc-a388ae679ae2}" id="id-0067-00000256" kind="Constant" referred="id-0066-0000003e" relid="0x29" role="Constant">
-              <name>TIMEBASEDFILTER_QOS_POLICY_NAME</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>TimeBasedFilter</value>
-              </attribute>
-            </reference>
-            <reference guid="{2d6cb837-6e20-4313-a165-c586617b6349}" id="id-0067-00000257" kind="Constant" referred="id-0066-0000003e" relid="0x29" role="Constant">
-              <name>LIVELINESS_QOS_POLICY_NAME</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>Liveliness</value>
-              </attribute>
-            </reference>
-            <reference guid="{d595fd88-30b2-4603-aa2c-a57f65e22357}" id="id-0067-00000258" kind="Constant" referred="id-0066-0000003e" relid="0x29" role="Constant">
-              <name>OWNERSHIPSTRENGTH_QOS_POLICY_NAME</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>OwnershipStrength</value>
-              </attribute>
-            </reference>
-            <reference guid="{fc9eff9b-593b-45dd-84f6-3cdf5fc55aad}" id="id-0067-00000259" kind="Constant" referred="id-0066-0000003e" relid="0x29" role="Constant">
-              <name>OWNERSHIP_QOS_POLICY_NAME</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>Ownership</value>
-              </attribute>
-            </reference>
-            <reference guid="{885dfeed-2652-4be0-900f-abf60f93e712}" id="id-0067-0000025a" kind="Constant" referred="id-0066-0000003e" relid="0x29" role="Constant">
-              <name>LATENCYBUDGET_QOS_POLICY_NAME</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>LatencyBudget</value>
-              </attribute>
-            </reference>
-            <reference guid="{960a135a-7067-4dd8-9729-9a36abcce18c}" id="id-0067-0000025b" kind="Constant" referred="id-0066-0000003e" relid="0x29" role="Constant">
-              <name>DEADLINE_QOS_POLICY_NAME</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>Deadline</value>
-              </attribute>
-            </reference>
-            <reference guid="{e865df56-22dc-4c6a-be4a-b1d323b7b4e5}" id="id-0067-0000025c" kind="Constant" referred="id-0066-0000003e" relid="0x29" role="Constant">
-              <name>PRESENTATION_QOS_POLICY_NAME</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>Presentation</value>
-              </attribute>
-            </reference>
-            <reference guid="{342bfbee-3001-4713-a5ea-dddfca9b01cd}" id="id-0067-0000025d" kind="Constant" referred="id-0066-0000003e" relid="0x29" role="Constant">
-              <name>DURABILITY_QOS_POLICY_NAME</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>Durability</value>
-              </attribute>
-            </reference>
-            <reference guid="{5f2172a2-f0a7-4b0c-8e2c-05302321d0bf}" id="id-0067-0000025e" kind="Constant" referred="id-0066-0000003e" relid="0x29" role="Constant">
-              <name>USERDATA_QOS_POLICY_NAME</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>UserData</value>
-              </attribute>
-            </reference>
-            <reference guid="{e8c6d22f-e0e5-434f-a299-a99ea6cfa987}" id="id-0067-0000025f" kind="Constant" referred="id-0066-00000046" relid="0x27" role="Constant">
-              <name>NOT_ALIVE_INSTANCE_STATE</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>6</value>
-              </attribute>
-            </reference>
-            <reference guid="{23d82ced-1d06-4d87-8fbe-6d1670269ac4}" id="id-0067-00000260" kind="Constant" referred="id-0066-00000046" relid="0x27" role="Constant">
-              <name>ANY_INSTANCE_STATE</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>65535</value>
-              </attribute>
-            </reference>
-            <reference guid="{84c665d4-308d-4399-b82c-2c563536cc8d}" id="id-0067-00000261" kind="Alias" referred="id-0066-00000046" relid="0x27" role="Alias">
-              <name>InstanceStateMask</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-            </reference>
-            <reference guid="{e0060c39-9494-44ff-a214-2f7921141c80}" id="id-0067-00000262" kind="Constant" referred="id-0066-00000046" relid="0x27" role="Constant">
-              <name>NOT_ALIVE_NO_WRITERS_INSTANCE_STATE</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>4</value>
-              </attribute>
-            </reference>
-            <reference guid="{e1c6fd6c-781c-49ff-8fde-9fabae35ea93}" id="id-0067-00000263" kind="Constant" referred="id-0066-00000046" relid="0x27" role="Constant">
-              <name>NOT_ALIVE_DISPOSED_INSTANCE_STATE</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>2</value>
-              </attribute>
-            </reference>
-            <reference guid="{bcc2e328-cbeb-4833-bf50-1df5d7434084}" id="id-0067-00000264" kind="Constant" referred="id-0066-00000046" relid="0x27" role="Constant">
-              <name>ALIVE_INSTANCE_STATE</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>1</value>
-              </attribute>
-            </reference>
-            <reference guid="{5c99fed6-c066-42b9-86ac-4a97f68bbf97}" id="id-0067-00000265" kind="Alias" referred="id-0066-00000046" relid="0x27" role="Alias">
-              <name>InstanceStateKind</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-            </reference>
-            <reference guid="{627de5a1-3601-468b-b810-aa7558271c89}" id="id-0067-00000266" kind="Constant" referred="id-0066-00000046" relid="0x27" role="Constant">
-              <name>ANY_VIEW_STATE</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>65535</value>
-              </attribute>
-            </reference>
-            <reference guid="{04fab75a-961a-447b-bd69-c034886db852}" id="id-0067-00000267" kind="Alias" referred="id-0066-00000046" relid="0x27" role="Alias">
-              <name>ViewStateMask</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-            </reference>
-            <reference guid="{dc6609b3-65aa-4a80-957f-b95df0b784c8}" id="id-0067-00000268" kind="Constant" referred="id-0066-00000046" relid="0x27" role="Constant">
-              <name>NOT_NEW_VIEW_STATE</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>2</value>
-              </attribute>
-            </reference>
-            <reference guid="{30af0b37-bb5b-44e3-ab35-5edf7b82f369}" id="id-0067-00000269" kind="Constant" referred="id-0066-00000046" relid="0x27" role="Constant">
-              <name>NEW_VIEW_STATE</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>1</value>
-              </attribute>
-            </reference>
-            <reference guid="{eae82e38-e6f6-4063-b0ef-b4fa45834f07}" id="id-0067-0000026a" kind="Alias" referred="id-0066-00000046" relid="0x27" role="Alias">
-              <name>ViewStateKind</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-            </reference>
-            <reference guid="{9f6561a8-db66-4e2a-b809-e12d7d79f22e}" id="id-0067-0000026b" kind="Constant" referred="id-0066-00000046" relid="0x27" role="Constant">
-              <name>ANY_SAMPLE_STATE</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>65535</value>
-              </attribute>
-            </reference>
-            <reference guid="{e52a7097-2f47-4e71-8fbb-25708a6329ca}" id="id-0067-0000026c" kind="Alias" referred="id-0066-00000046" relid="0x27" role="Alias">
-              <name>SampleStateMask</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-            </reference>
-            <reference guid="{c6c1b717-4293-4ea5-8888-73283f554469}" id="id-0067-0000026d" kind="Constant" referred="id-0066-00000046" relid="0x27" role="Constant">
-              <name>NOT_READ_SAMPLE_STATE</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>2</value>
-              </attribute>
-            </reference>
-            <reference guid="{5c97dd5c-e30a-4e5e-982b-5941ea736d23}" id="id-0067-0000026e" kind="Constant" referred="id-0066-00000046" relid="0x27" role="Constant">
-              <name>READ_SAMPLE_STATE</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>1</value>
-              </attribute>
-            </reference>
-            <reference guid="{5ac8c882-8da5-48d1-8a51-8664de6b73d9}" id="id-0067-0000026f" kind="Alias" referred="id-0066-00000046" relid="0x27" role="Alias">
-              <name>SampleStateKind</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-            </reference>
-            <reference guid="{2f13072f-80e4-4fce-a346-016fc43f8e04}" id="id-0067-00000270" kind="Constant" referred="id-0066-00000046" relid="0x3" role="Constant">
-              <name>RELIABLE_READER_ACTIVITY_CHANGED_STATUS</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>33554432</value>
-              </attribute>
-            </reference>
-            <reference guid="{c385cc93-bf7c-4209-8588-a989d7a6041f}" id="id-0067-00000271" kind="Constant" referred="id-0066-00000046" relid="0x3" role="Constant">
-              <name>RELIABLE_WRITER_CACHE_CHANGED_STATUS</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>16777216</value>
-              </attribute>
-            </reference>
-            <reference guid="{7f72eea7-bb4f-4cb1-8ca1-05481e4fefc0}" id="id-0067-00000272" kind="Constant" referred="id-0066-00000046" relid="0x3" role="Constant">
-              <name>SUBSCRIPTION_MATCHED_STATUS</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>16384</value>
-              </attribute>
-            </reference>
-            <reference guid="{15265a69-3a8f-4070-a446-f4b7cb4ff669}" id="id-0067-00000273" kind="Constant" referred="id-0066-00000046" relid="0x3" role="Constant">
-              <name>PUBLICATION_MATCHED_STATUS</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>8192</value>
-              </attribute>
-            </reference>
-            <reference guid="{366574bb-4b22-43ec-b6c8-66eb202422b7}" id="id-0067-00000274" kind="Constant" referred="id-0066-00000046" relid="0x3" role="Constant">
-              <name>LIVELINESS_CHANGED_STATUS</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>4096</value>
-              </attribute>
-            </reference>
-            <reference guid="{d5a8e220-5da9-48c0-b855-3da19c65a356}" id="id-0067-00000275" kind="Constant" referred="id-0066-00000046" relid="0x3" role="Constant">
-              <name>LIVELINESS_LOST_STATUS</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>2048</value>
-              </attribute>
-            </reference>
-            <reference guid="{0921cb80-552a-47d5-88ee-210c46ba266c}" id="id-0067-00000276" kind="Constant" referred="id-0066-00000046" relid="0x3" role="Constant">
-              <name>DATA_AVAILABLE_STATUS</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>1024</value>
-              </attribute>
-            </reference>
-            <reference guid="{983b235d-e54e-48c8-8c2f-97a936501285}" id="id-0067-00000277" kind="Constant" referred="id-0066-00000046" relid="0x3" role="Constant">
-              <name>DATA_ON_READERS_STATUS</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>512</value>
-              </attribute>
-            </reference>
-            <reference guid="{2fee8117-c460-4931-abef-c01bfde44c49}" id="id-0067-00000278" kind="Constant" referred="id-0066-00000046" relid="0x3" role="Constant">
-              <name>SAMPLE_REJECTED_STATUS</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>256</value>
-              </attribute>
-            </reference>
-            <reference guid="{15e2b955-f873-4cad-b6c6-d94cce3f9685}" id="id-0067-00000279" kind="Constant" referred="id-0066-00000046" relid="0x3" role="Constant">
-              <name>SAMPLE_LOST_STATUS</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>128</value>
-              </attribute>
-            </reference>
-            <reference guid="{37e18cc5-9bbc-450b-bad4-0ff02873a212}" id="id-0067-0000027a" kind="Constant" referred="id-0066-00000046" relid="0x3" role="Constant">
-              <name>REQUESTED_INCOMPATIBLE_QOS_STATUS</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>64</value>
-              </attribute>
-            </reference>
-            <reference guid="{10b14bda-e0e1-4eeb-ba07-2a92fb7bfb07}" id="id-0067-0000027b" kind="Constant" referred="id-0066-00000046" relid="0x3" role="Constant">
-              <name>OFFERED_INCOMPATIBLE_QOS_STATUS</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>32</value>
-              </attribute>
-            </reference>
-            <reference guid="{405c4afe-1866-4a0b-8468-b66f108c2ebd}" id="id-0067-0000027c" kind="Constant" referred="id-0066-00000046" relid="0x3" role="Constant">
-              <name>REQUESTED_DEADLINE_MISSED_STATUS</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>4</value>
-              </attribute>
-            </reference>
-            <reference guid="{3d3d20d7-9b0d-4cc5-8ffd-1a9731baedda}" id="id-0067-0000027d" kind="Constant" referred="id-0066-00000046" relid="0x3" role="Constant">
-              <name>OFFERED_DEADLINE_MISSED_STATUS</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>2</value>
-              </attribute>
-            </reference>
-            <reference guid="{390c8e3d-7a61-4cb1-ab0c-97cbb3fd7a30}" id="id-0067-0000027e" kind="Constant" referred="id-0066-00000046" relid="0x3" role="Constant">
-              <name>INCONSISTENT_TOPIC_STATUS</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>1</value>
-              </attribute>
-            </reference>
-            <reference guid="{992d1d26-1d82-4eea-8c98-6c3dd6a5a37b}" id="id-0067-0000027f" kind="Alias" referred="id-0066-00000046" relid="0x3" role="Alias">
-              <name>StatusMask</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-            </reference>
-            <reference guid="{88ce6fba-c5b2-4c03-8df0-b6a327ebcba2}" id="id-0067-00000280" kind="Alias" referred="id-0066-00000046" relid="0x3" role="Alias">
-              <name>StatusKind</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-            </reference>
-            <reference guid="{23a28218-3ff5-4be4-8295-01e195640efd}" id="id-0067-00000281" kind="Constant" referred="id-0066-00000049" relid="0x3" role="Constant">
-              <name>RETCODE_ILLEGAL_OPERATION</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>12</value>
-              </attribute>
-            </reference>
-            <reference guid="{6de3ed4b-7ab1-4753-acfa-0f1114945d6b}" id="id-0067-00000282" kind="Constant" referred="id-0066-00000049" relid="0x3" role="Constant">
-              <name>RETCODE_NO_DATA</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>11</value>
-              </attribute>
-            </reference>
-            <reference guid="{7b36e470-9dfe-4cc5-a389-b4d0e30e0a9c}" id="id-0067-00000283" kind="Constant" referred="id-0066-00000049" relid="0x3" role="Constant">
-              <name>RETCODE_TIMEOUT</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>10</value>
-              </attribute>
-            </reference>
-            <reference guid="{e4ce1290-b724-4824-bb76-56ebc69ec16b}" id="id-0067-00000284" kind="Constant" referred="id-0066-00000049" relid="0x3" role="Constant">
-              <name>RETCODE_ALREADY_DELETED</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>9</value>
-              </attribute>
-            </reference>
-            <reference guid="{a52e4168-636b-44a7-8ba3-a11e22f9fb5a}" id="id-0067-00000285" kind="Constant" referred="id-0066-00000049" relid="0x3" role="Constant">
-              <name>RETCODE_INCONSISTENT_POLICY</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>8</value>
-              </attribute>
-            </reference>
-            <reference guid="{f5f7a86f-d94f-438b-96d7-b6df65ba24a8}" id="id-0067-00000286" kind="Constant" referred="id-0066-00000049" relid="0x3" role="Constant">
-              <name>RETCODE_IMMUTABLE_POLICY</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>7</value>
-              </attribute>
-            </reference>
-            <reference guid="{5c987617-b4c4-4971-943b-d34fd0f19847}" id="id-0067-00000287" kind="Constant" referred="id-0066-00000049" relid="0x3" role="Constant">
-              <name>RETCODE_NOT_ENABLED</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>6</value>
-              </attribute>
-            </reference>
-            <reference guid="{88a50b74-c817-4b16-820d-3631a6292452}" id="id-0067-00000288" kind="Constant" referred="id-0066-00000049" relid="0x3" role="Constant">
-              <name>RETCODE_OUT_OF_RESOURCES</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>5</value>
-              </attribute>
-            </reference>
-            <reference guid="{a8d4855f-fe24-4c25-b0de-a4beeb6f2925}" id="id-0067-00000289" kind="Constant" referred="id-0066-00000049" relid="0x3" role="Constant">
-              <name>RETCODE_PRECONDITION_NOT_MET</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>4</value>
-              </attribute>
-            </reference>
-            <reference guid="{f9ee7160-a3d9-4953-91bd-06a551332950}" id="id-0067-0000028a" kind="Constant" referred="id-0066-00000049" relid="0x3" role="Constant">
-              <name>RETCODE_BAD_PARAMETER</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>3</value>
-              </attribute>
-            </reference>
-            <reference guid="{365e41c5-8103-423a-a0f1-7bcade5636c5}" id="id-0067-0000028b" kind="Constant" referred="id-0066-00000049" relid="0x3" role="Constant">
-              <name>RETCODE_UNSUPPORTED</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>2</value>
-              </attribute>
-            </reference>
-            <reference guid="{86342260-9134-4388-9af2-d239afc7dcbb}" id="id-0067-0000028c" kind="Constant" referred="id-0066-00000049" relid="0x3" role="Constant">
-              <name>RETCODE_ERROR</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>1</value>
-              </attribute>
-            </reference>
-            <reference guid="{e7b59fbc-7ad2-4f0d-8d89-1b0318de9ed1}" id="id-0067-0000028d" kind="Constant" referred="id-0066-00000049" relid="0x3" role="Constant">
-              <name>RETCODE_OK</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>0</value>
-              </attribute>
-            </reference>
-            <reference guid="{2b5c66eb-aac9-4e0e-bc66-7c7e2bf3fbc4}" id="id-0067-0000028e" kind="Constant" referred="id-0066-00000046" relid="0x3" role="Constant">
-              <name>TIME_INVALID_NSEC</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>4294967295</value>
-              </attribute>
-            </reference>
-            <reference guid="{822e18b5-55fe-484f-a1d7-d0b77d14be1d}" id="id-0067-0000028f" kind="Constant" referred="id-0066-00000049" relid="0x3" role="Constant">
-              <name>TIME_INVALID_SEC</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>-1</value>
-              </attribute>
-            </reference>
-            <reference guid="{a8512bf6-3e19-47a5-8c2a-4520e2b49e9c}" id="id-0067-00000290" kind="Constant" referred="id-0066-00000046" relid="0x3" role="Constant">
-              <name>DURATION_ZERO_NSEC</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>0</value>
-              </attribute>
-            </reference>
-            <reference guid="{c00cbe0c-59f9-48bb-8ecb-0cc857d64131}" id="id-0067-00000291" kind="Constant" referred="id-0066-00000049" relid="0x3" role="Constant">
-              <name>DURATION_ZERO_SEC</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>0</value>
-              </attribute>
-            </reference>
-            <reference guid="{9f13e94e-e632-43e6-8845-35ae7a316311}" id="id-0067-00000292" kind="Constant" referred="id-0066-00000046" relid="0x3" role="Constant">
-              <name>DURATION_INFINITE_NSEC</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>2147483647</value>
-              </attribute>
-            </reference>
-            <reference guid="{71b0533d-dfa0-4c38-aef2-bbd79356393c}" id="id-0067-00000293" kind="Constant" referred="id-0066-00000049" relid="0x3" role="Constant">
-              <name>DURATION_INFINITE_SEC</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>2147483647</value>
-              </attribute>
-            </reference>
-            <reference guid="{47cb98dd-3048-4658-ba09-708cac3e5ee1}" id="id-0067-00000294" kind="Constant" referred="id-0066-00000049" relid="0x3" role="Constant">
-              <name>LENGTH_UNLIMITED</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>-1</value>
-              </attribute>
-            </reference>
-            <reference guid="{66e4851c-b1a2-4d81-b012-8e022cc217a6}" id="id-0067-00000295" kind="Collection" referred="id-0066-0000003e" relid="0x1" role="Collection">
-              <name>StringSeq</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="bound" status="meta">
-                <value/>
-              </attribute>
-            </reference>
-            <reference guid="{63648047-b328-4109-a598-d73b5c303abf}" id="id-0067-00000296" kind="Alias" referred="id-0066-00000049" relid="0x1" role="Alias">
-              <name>QosPolicyId_t</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-            </reference>
-            <reference guid="{7af80fb7-37be-44c8-b3be-fb071b3f8b98}" id="id-0067-00000297" kind="Alias" referred="id-0066-00000049" relid="0x1" role="Alias">
-              <name>ReturnCode_t</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-            </reference>
-            <reference guid="{2fe5da52-96b2-4647-8938-ebb93f03845d}" id="id-0067-00000298" kind="Alias" referred="id-0066-00000049" relid="0x0" role="Alias">
-              <name>DomainId_t</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-            </reference>
-          </model>
-        </model>
-        <model childrelidcntr="0x1" guid="{768e2924-97d0-49e4-b182-d580695d585b}" id="id-0065-0000011b" kind="File" relid="0xb">
-          <name>dds4ccm_StateListenerControl</name>
-          <attribute kind="Path">
-            <value>connectors/dds4ccm/idl</value>
-          </attribute>
-          <attribute kind="PostPreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrePreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrefixTag" status="meta">
-            <value/>
-          </attribute>
-          <model childrelidcntr="0x1" guid="{af3c382b-cfef-4c8e-872b-6784d3580514}" id="id-0065-0000011c" kind="Package" relid="0x0" role="Package">
-            <name>CCM_DDS</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrefixTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <model childrelidcntr="0x2" guid="{c5c6d8fb-caaa-4e16-a1d2-46560b3ba292}" id="id-0065-0000011d" kind="Object" relid="0x0" role="Object">
-              <name>StateListenerControl</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{cb32524d-b746-4462-9a83-47bc84c72aba}" id="id-0065-0000011e" kind="Attribute" relid="0x0" role="Attribute">
-                <name>is_filter_interpreted</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{cd30567b-74f9-4aae-97a1-9f58e29f2b23}" id="id-0067-00000299" kind="AttributeMember" referred="id-0066-0000004e" relid="0x0" role="AttributeMember">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <reference guid="{a73c26e3-7c5f-4e12-97e7-c1aa98be57f2}" id="id-0067-0000029a" kind="Inherits" referred="id-0065-00000126" relid="0x1" role="Inherits">
-                <name>Inherits</name>
-              </reference>
-            </model>
-          </model>
-        </model>
-        <model childrelidcntr="0x1" guid="{2a99f802-8c2c-4a0c-be0f-f323a7f359f2}" id="id-0065-0000011f" kind="File" relid="0x9">
-          <name>dds4ccm_PortStatusListener</name>
-          <attribute kind="Path">
-            <value>connectors/dds4ccm/idl</value>
-          </attribute>
-          <attribute kind="PostPreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrePreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrefixTag" status="meta">
-            <value/>
-          </attribute>
-          <model childrelidcntr="0x1" guid="{9c2ac504-a781-4b30-a43b-9820a96d033d}" id="id-0065-00000120" kind="Package" relid="0x0" role="Package">
-            <name>CCM_DDS</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrefixTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <model childrelidcntr="0x2" guid="{846970af-1676-4855-a75f-38bea43c18b4}" id="id-0065-00000121" kind="Object" relid="0x0" role="Object">
-              <name>PortStatusListener</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{64478210-d18a-471b-be3f-3ace98685c27}" id="id-0065-00000122" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                <name>on_sample_lost</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{2a95c9d6-ab99-4f97-a742-55189ecfbb55}" id="id-0067-00000053" kind="InParameter" referred="id-0065-00000116" relid="0x0" role="InParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{04b72909-7452-4933-b6cd-b90efe528b3e}" id="id-0067-00000054" kind="InParameter" referred="id-0065-000000cc" relid="0x0" role="InParameter">
-                  <name>the_reader</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{e2aba88a-e59a-4a1d-a740-caf533037a94}" id="id-0065-00000123" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>on_requested_deadline_missed</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{8b892cb7-97f5-4e8e-bd50-f9f3abf4aa33}" id="id-0067-00000055" kind="InParameter" referred="id-0065-00000110" relid="0x0" role="InParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{495fcba1-fa62-49a3-9d80-9f186311b9b3}" id="id-0067-00000056" kind="InParameter" referred="id-0065-000000cc" relid="0x0" role="InParameter">
-                  <name>the_reader</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-            </model>
-          </model>
-        </model>
-        <model childrelidcntr="0x1" guid="{4f3adb2a-cc9a-4398-8540-a53bd472e5df}" id="id-0065-00000124" kind="File" relid="0x7">
-          <name>dds4ccm_DataListenerControl</name>
-          <attribute kind="Path">
-            <value>connectors/dds4ccm/idl</value>
-          </attribute>
-          <attribute kind="PostPreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrePreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrefixTag" status="meta">
-            <value/>
-          </attribute>
-          <model childrelidcntr="0x1" guid="{dff4a2e0-25d9-412d-b2b7-82ceebb363e4}" id="id-0065-00000125" kind="Package" relid="0x0" role="Package">
-            <name>CCM_DDS</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrefixTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <model childrelidcntr="0x2" guid="{090ff77c-89cb-41d6-a927-b6aa4bc482b6}" id="id-0065-00000126" kind="Object" relid="0x0" role="Object">
-              <name>DataListenerControl</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{c6536dfa-cc90-4e97-98ac-174c6892deab}" id="id-0065-00000127" kind="Attribute" relid="0x1" role="Attribute">
-                <name>max_delivered_data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{f9fc391e-7816-4e7d-b8e3-2b463077dbc3}" id="id-0067-00000378" kind="AttributeMember" referred="id-0067-000002ad" relid="0x0" role="AttributeMember">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{7b1a3436-61c1-48d3-a3f1-536487457d81}" id="id-0065-00000128" kind="Attribute" relid="0x0" role="Attribute">
-                <name>mode</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{9f8f84d9-8d4e-4739-959a-8a4c61ab4387}" id="id-0067-0000029b" kind="AttributeMember" referred="id-0065-00000142" relid="0x0" role="AttributeMember">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-            </model>
-          </model>
-        </model>
-        <model childrelidcntr="0x1" guid="{f6ec2990-716f-4726-bd1a-49dce16c903e}" id="id-0065-00000129" kind="File" relid="0x5">
-          <name>dds4ccm_ConnectorStatusListener</name>
-          <attribute kind="Path">
-            <value>connectors/dds4ccm/idl</value>
-          </attribute>
-          <attribute kind="PostPreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrePreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrefixTag" status="meta">
-            <value/>
-          </attribute>
-          <model childrelidcntr="0x1" guid="{633dfb10-2b6b-45bb-8d08-638ab70494bd}" id="id-0065-0000012a" kind="Package" relid="0x0" role="Package">
-            <name>CCM_DDS</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrefixTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <model childrelidcntr="0x6" guid="{da8dd74e-a925-4f3e-a1fa-cac45ace8b9d}" id="id-0065-0000012b" kind="Object" relid="0x0" role="Object">
-              <name>ConnectorStatusListener</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{ae770844-b851-4227-94ad-e215a124851e}" id="id-0065-0000012c" kind="TwowayOperation" relid="0x5" role="TwowayOperation">
-                <name>on_unexpected_status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{3348c215-8940-4e9e-980f-5cc34bede3b1}" id="id-0067-00000057" kind="InParameter" referred="id-0065-00000102" relid="0x0" role="InParameter">
-                  <name>the_entity</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{957ae072-6620-4b92-91aa-18ad29d341a3}" id="id-0067-0000029c" kind="InParameter" referred="id-0067-00000280" relid="0x0" role="InParameter">
-                  <name>status_kind</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{e693cdd9-32f6-426f-86b8-b28388d10d68}" id="id-0065-0000012d" kind="TwowayOperation" relid="0x4" role="TwowayOperation">
-                <name>on_offered_incompatible_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{538bd74f-1d95-4dc5-8e5c-17151a92b55e}" id="id-0067-00000058" kind="InParameter" referred="id-0065-0000010e" relid="0x0" role="InParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{3d43c29a-58bd-42c4-ba24-f57332333d20}" id="id-0067-00000059" kind="InParameter" referred="id-0065-000000e0" relid="0x0" role="InParameter">
-                  <name>the_writer</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{7d1c8df9-94c6-4eef-aa87-94732c3629e8}" id="id-0065-0000012e" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-                <name>on_offered_deadline_missed</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{75bd9949-8a22-49a5-8455-4d68126de471}" id="id-0067-0000005a" kind="InParameter" referred="id-0065-00000111" relid="0x0" role="InParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{42a71a0c-224d-434a-b72a-3bda842434c9}" id="id-0067-0000005b" kind="InParameter" referred="id-0065-000000e0" relid="0x0" role="InParameter">
-                  <name>the_writer</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{258f94e3-04b2-4921-87b3-413d9ab90951}" id="id-0065-0000012f" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-                <name>on_sample_rejected</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{5a4bd54e-b7b6-4f90-9e81-c2586c53e138}" id="id-0067-0000005c" kind="InParameter" referred="id-0065-00000114" relid="0x0" role="InParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{79345a69-2280-4a78-9056-afe5ad2416a5}" id="id-0067-0000005d" kind="InParameter" referred="id-0065-000000cc" relid="0x0" role="InParameter">
-                  <name>the_reader</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{82972328-0c93-4fb1-ad63-4e57650477da}" id="id-0065-00000130" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                <name>on_requested_incompatible_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{f5f6cd3b-d3c6-47ea-b77c-9ed5e65d28fe}" id="id-0067-0000005e" kind="InParameter" referred="id-0065-0000010d" relid="0x0" role="InParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{1c10e95c-e083-470e-be27-e77b278f0824}" id="id-0067-0000005f" kind="InParameter" referred="id-0065-000000cc" relid="0x0" role="InParameter">
-                  <name>the_reader</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{7882cc5e-046d-4ae3-b649-6a2cfbf01fee}" id="id-0065-00000131" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>on_inconsistent_topic</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{1d815fc2-2786-4e43-9ff3-a28d51deb9c1}" id="id-0067-00000060" kind="InParameter" referred="id-0065-00000117" relid="0x0" role="InParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{29b91f00-b74a-4af2-aa2d-42926cff9580}" id="id-0067-00000061" kind="InParameter" referred="id-0065-000000f8" relid="0x0" role="InParameter">
-                  <name>the_topic</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-            </model>
-          </model>
-        </model>
-        <model childrelidcntr="0x1" guid="{829aaff6-dcd8-4f11-827b-7d212e9a904b}" id="id-0065-00000132" kind="File" relid="0x3">
-          <name>dds4ccm_Connector</name>
-          <attribute kind="Path">
-            <value>connectors/dds4ccm/idl</value>
-          </attribute>
-          <attribute kind="PostPreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrePreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrefixTag" status="meta">
-            <value/>
-          </attribute>
-          <model childrelidcntr="0x2" guid="{cd22e550-5212-470e-a781-7bb0ff31444f}" id="id-0065-00000133" kind="Package" relid="0x0" role="Package">
-            <name>CCM_DDS</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrefixTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <model childrelidcntr="0x2" guid="{929df5a6-7abe-4e80-854e-d7eb0e88a1a1}" id="id-0065-00000134" kind="ConnectorObject" relid="0x1" role="ConnectorObject">
-              <name>DDS_TopicBase</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="UUID">
-                <value>C61798A6-7C26-11DF-8003-000C2958D27B</value>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{c8f93226-f80b-4012-af94-2bf47910895c}" id="id-0065-00000135" kind="Attribute" relid="0x1" role="Attribute">
-                <name>key_fields</name>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{bbb0cd1e-b990-4ae0-b1a0-625c26dfb166}" id="id-0067-0000029d" kind="AttributeMember" referred="id-0067-00000295" relid="0x0" role="AttributeMember">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{79cecbcd-2c05-49ff-a801-658b232ceecd}" id="id-0067-0000029e" kind="SetException" referred="id-0065-0000013e" relid="0x0" role="SetException">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{ad843b0c-e8eb-4ed6-b132-436f53ff200b}" id="id-0065-00000136" kind="Attribute" relid="0x0" role="Attribute">
-                <name>topic_name</name>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{d6f8da99-e195-4c2f-bebf-8a3ddeb926ac}" id="id-0067-0000029f" kind="AttributeMember" referred="id-0066-0000003e" relid="0x0" role="AttributeMember">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{a5efd038-e5a5-49b1-8ea2-8db89abe9df8}" id="id-0067-000002a0" kind="SetException" referred="id-0065-0000013e" relid="0x0" role="SetException">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-            </model>
-            <model childrelidcntr="0x2" guid="{b29cc787-8b26-4d1b-9b29-d80ec94e1613}" id="id-0065-00000137" kind="ConnectorObject" relid="0x0" role="ConnectorObject">
-              <name>DDS_Base</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="UUID">
-                <value>C61798A6-7C26-11DF-8002-000C2958D27B</value>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{41269dd5-2c55-459c-9016-7fed7a1052fb}" id="id-0065-00000138" kind="Attribute" relid="0x1" role="Attribute">
-                <name>qos_profile</name>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{70efda93-3154-472d-8f61-921da307c5b9}" id="id-0067-000002a1" kind="AttributeMember" referred="id-0066-0000003e" relid="0x0" role="AttributeMember">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{e2f5b0fc-ccb0-4ad8-9844-98230252382c}" id="id-0067-000002a2" kind="SetException" referred="id-0065-0000013e" relid="0x0" role="SetException">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{93fde27e-0d57-4d0e-8200-f5236f0e8dd4}" id="id-0065-00000139" kind="Attribute" relid="0x0" role="Attribute">
-                <name>domain_id</name>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{0118c12e-990e-4960-a783-f07bf3baa3b3}" id="id-0067-000002a3" kind="AttributeMember" referred="id-0067-00000298" relid="0x0" role="AttributeMember">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{b3efb2e0-0e56-4b69-a959-99b4768435a8}" id="id-0067-000002a4" kind="SetException" referred="id-0065-0000013e" relid="0x0" role="SetException">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <reference guid="{9eaa85f3-f263-4b31-9982-c0f9092ea95c}" id="id-0067-00000062" kind="RequiredRequestPort" referred="id-0065-0000012b" relid="0x0" role="RequiredRequestPort">
-                <name>error_listener</name>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="exclusiveProvider" status="meta">
-                  <value>false</value>
-                </attribute>
-                <attribute kind="exclusiveUser" status="meta">
-                  <value>false</value>
-                </attribute>
-                <attribute kind="multiple_connections">
-                  <value>true</value>
-                </attribute>
-                <attribute kind="optional" status="meta">
-                  <value>false</value>
-                </attribute>
-              </reference>
-            </model>
-          </model>
-        </model>
-        <model childrelidcntr="0x1" guid="{efa14826-304a-4575-8733-94aaa271dfd6}" id="id-0065-0000013a" kind="File" relid="0x1">
-          <name>dds4ccm_Base</name>
-          <attribute kind="Path">
-            <value>connectors/dds4ccm/idl</value>
-          </attribute>
-          <attribute kind="PostPreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrePreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrefixTag" status="meta">
-            <value/>
-          </attribute>
-          <model childrelidcntr="0xa" guid="{4591f46e-5f2b-484f-a218-955942cb37ea}" id="id-0065-0000013b" kind="Package" relid="0x0" role="Package">
-            <name>CCM_DDS</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrefixTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <model childrelidcntr="0x1" guid="{db1f229a-c7d8-4b0a-8ba5-18dd8c151409}" id="id-0065-0000013c" kind="Object" relid="0x9" role="Object">
-              <name>ContentFilterSetting</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{0f5be5ce-59fc-4b43-9379-00bfa3b1c732}" id="id-0065-0000013d" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>set_filter_parameters</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{b7f67965-829b-430e-8998-f274bff8993b}" id="id-0067-000002a5" kind="InParameter" referred="id-0067-00000295" relid="0x0" role="InParameter">
-                  <name>parameters</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{fa19a987-a133-40e6-b6f0-47ec09d31075}" id="id-0067-000002a6" kind="ExceptionRef" referred="id-0065-0000013f" relid="0x0" role="ExceptionRef">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-            </model>
-            <model childrelidcntr="0x0" guid="{dab7a9cd-b69c-4cf3-ac7e-599d6ecb5ff1}" id="id-0065-0000013e" kind="Exception" relid="0x8" role="Exception">
-              <name>NonChangeable</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-            </model>
-            <model childrelidcntr="0x1" guid="{2acfcd50-3fae-47a3-8fef-cb659f920f4a}" id="id-0065-0000013f" kind="Exception" relid="0x7" role="Exception">
-              <name>InternalError</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{4730d586-61aa-4f85-b670-e8271bfd2931}" id="id-0067-000002a7" kind="Member" referred="id-0067-00000297" relid="0x0" role="Member">
-                <name>error_code</name>
-              </reference>
-              <reference guid="{f78229fc-61d5-4fd3-a9a2-5a9cba818528}" id="id-0067-00000379" kind="Member" referred="id-0067-000002ad" relid="0x0" role="Member">
-                <name>index</name>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{8b15e311-1ddc-4f0f-9542-3532990fe642}" id="id-0065-00000140" kind="Exception" relid="0x6" role="Exception">
-              <name>NonExistent</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{73592d82-e3ff-4933-983a-d97298f6de1c}" id="id-0067-0000037b" kind="Member" referred="id-0067-0000037a" relid="0x0" role="Member">
-                <name>indexes</name>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{3efaef2a-246b-4597-8332-e21a55903433}" id="id-0065-00000141" kind="Exception" relid="0x5" role="Exception">
-              <name>AlreadyCreated</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{451b5926-5f07-4742-ab1e-75050787ab46}" id="id-0067-0000037c" kind="Member" referred="id-0067-0000037a" relid="0x0" role="Member">
-                <name>indexes</name>
-              </reference>
-            </model>
-            <model childrelidcntr="0x3" guid="{65805011-4422-4420-a30d-c077f21e0757}" id="id-0065-00000142" kind="Enum" relid="0x4" role="Enum">
-              <name>ListenerMode</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <atom guid="{86aa0e66-ffc2-4fc1-a48d-19bb13bdb106}" id="id-0066-00000032" kind="EnumValue" relid="0x2" role="EnumValue">
-                <name>MANY_BY_MANY</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-              <atom guid="{e0d9ffaf-1236-40bd-96d6-6378d3c1c763}" id="id-0066-00000033" kind="EnumValue" relid="0x1" role="EnumValue">
-                <name>ONE_BY_ONE</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-              <atom guid="{9f0cb3a2-eaf5-4e36-a2c2-3cddd6efba01}" id="id-0066-00000034" kind="EnumValue" relid="0x0" role="EnumValue">
-                <name>NOT_ENABLED</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-            </model>
-            <model childrelidcntr="0x1" guid="{0361de1d-4c0e-4a9d-a52b-a1ce50fb2994}" id="id-0065-00000143" kind="Aggregate" relid="0x3" role="Aggregate">
-              <name>QueryFilter</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{fae65ed4-c5fc-42b8-a3bc-09fb7b14c4f1}" id="id-0067-000002a8" kind="Member" referred="id-0067-00000295" relid="0x0" role="Member">
-                <name>parameters</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{ec7a4b7b-1534-4911-927a-856d030d3486}" id="id-0067-000002a9" kind="Member" referred="id-0066-0000003e" relid="0x0" role="Member">
-                <name>expression</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{f0154a87-3f3a-40e5-86ca-9b2391830453}" id="id-0065-00000144" kind="Aggregate" relid="0x2" role="Aggregate">
-              <name>ReadInfo</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{df90510b-d2e5-4813-95a8-8bb0d03fb27f}" id="id-0067-00000063" kind="Member" referred="id-0065-00000118" relid="0x0" role="Member">
-                <name>source_timestamp</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{6c2866c9-c87c-4407-ab26-4766db5a4901}" id="id-0067-00000064" kind="Member" referred="id-0067-0000000e" relid="0x0" role="Member">
-                <name>instance_handle</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{a5d48ef3-faf3-45b2-ba9e-53dc324eab36}" id="id-0067-000002aa" kind="Member" referred="id-0065-00000145" relid="0x0" role="Member">
-                <name>instance_status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{d9028ef2-afdc-4373-8888-a8b497a5c11a}" id="id-0067-000002ab" kind="Member" referred="id-0065-00000146" relid="0x0" role="Member">
-                <name>access_status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x5" guid="{dea334c6-b3b5-4676-97a4-897ea6fe6f79}" id="id-0065-00000145" kind="Enum" relid="0x1" role="Enum">
-              <name>InstanceStatus</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <atom guid="{096fd7f6-203b-4001-ac47-8e5beafc141c}" id="id-0066-00000035" kind="EnumValue" relid="0x4" role="EnumValue">
-                <name>INSTANCE_DELETED</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-              <atom guid="{a683b070-f079-4d71-a397-02f96217692d}" id="id-0066-00000036" kind="EnumValue" relid="0x3" role="EnumValue">
-                <name>INSTANCE_FILTERED_OUT</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-              <atom guid="{ae72f4b8-1e2a-4dbe-af7a-63d6ea4db75d}" id="id-0066-00000037" kind="EnumValue" relid="0x2" role="EnumValue">
-                <name>INSTANCE_UPDATED</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-              <atom guid="{3fe5e3c0-9b4c-4120-95b8-1a04abedbb8f}" id="id-0066-00000038" kind="EnumValue" relid="0x1" role="EnumValue">
-                <name>INSTANCE_FILTERED_IN</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-              <atom guid="{8b04876e-8fed-4a1e-ac7a-416ccd590f7a}" id="id-0066-00000039" kind="EnumValue" relid="0x0" role="EnumValue">
-                <name>INSTANCE_CREATED</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-            </model>
-            <model childrelidcntr="0x2" guid="{8e40374e-5636-44e4-b1c5-8b9582a20307}" id="id-0065-00000146" kind="Enum" relid="0x0" role="Enum">
-              <name>AccessStatus</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <atom guid="{b3796768-7a7a-4e15-83f0-f7771da88f6b}" id="id-0066-0000003a" kind="EnumValue" relid="0x1" role="EnumValue">
-                <name>ALREADY_SEEN</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-              <atom guid="{56069827-6a1a-40dc-be8d-25077dd54f1d}" id="id-0066-0000003b" kind="EnumValue" relid="0x0" role="EnumValue">
-                <name>FRESH_INFO</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-            </model>
-            <reference guid="{18679629-7b2e-42c7-ba12-ee4d4f0c3111}" id="id-0067-00000065" kind="Collection" referred="id-0065-00000144" relid="0x3" role="Collection">
-              <name>ReadInfoSeq</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="bound" status="meta">
-                <value/>
-              </attribute>
-            </reference>
-            <reference guid="{91bde20c-4789-4717-9d53-80b7beb0491a}" id="id-0067-000002ac" kind="Constant" referred="id-0066-00000046" relid="0x0" role="Constant">
-              <name>UNLIMITED</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>0</value>
-              </attribute>
-            </reference>
-            <reference guid="{ebc3aec5-b0aa-4ea9-9a6f-63fb408599e7}" id="id-0067-000002ad" kind="Alias" referred="id-0066-00000046" relid="0x0" role="Alias">
-              <name>DataNumber_t</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-            </reference>
-            <reference guid="{8becee46-56cf-4276-9592-0da89f0c64b0}" id="id-0067-0000037a" kind="Collection" referred="id-0067-000002ad" relid="0x0" role="Collection">
-              <name>DataNumberSeq</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="bound" status="meta">
-                <value/>
-              </attribute>
-            </reference>
-          </model>
-        </model>
-        <model childrelidcntr="0x1" guid="{c15ffee3-4e42-4415-b8d3-2c6eb6f273bb}" id="id-0065-00000147" kind="File" relid="0x0">
-          <name>ccm_dds</name>
-          <attribute kind="Path">
-            <value>connectors/dds4ccm/idl</value>
-          </attribute>
-          <attribute kind="PostPreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrePreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrefixTag" status="meta">
-            <value/>
-          </attribute>
-          <model childrelidcntr="0x1" guid="{34a2a80d-dd8a-4ebf-9e5d-3eedeef2764d}" id="id-0065-00000148" kind="Package" relid="0x0" role="Package">
-            <name>CCM_DDS</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrefixTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <model childrelidcntr="0x10" guid="{973858e2-a3a5-47b4-84b6-7dccd553eafe}" id="id-0065-00000149" kind="Package" relid="0x0" role="Package">
-              <name>Typed</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{a748a69a-9c98-4a2e-ae64-c98b9f684f0d}" id="id-0065-0000014a" kind="ConnectorObject" relid="0xf" role="ConnectorObject">
-                <name>DDS_Event</name>
-                <attribute kind="PostPreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="PrePreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="UUID">
-                  <value>C61798A6-7C26-11DF-8001-000C2958D27B</value>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{ac9efffe-2746-401f-8e5f-d87a31348854}" id="id-0067-000002ae" kind="MirrorPort" referred="id-0065-0000014e" relid="0x0" role="MirrorPort">
-                  <name>push_consumer</name>
-                </reference>
-                <reference guid="{a9eda479-9be6-4d13-bfe1-d48d8793a55b}" id="id-0067-000002af" kind="MirrorPort" referred="id-0065-00000150" relid="0x0" role="MirrorPort">
-                  <name>pull_consumer</name>
-                </reference>
-                <reference guid="{97bf7da7-c669-4858-84bd-a5e0d55f03c9}" id="id-0067-000002b0" kind="MirrorPort" referred="id-0065-00000155" relid="0x0" role="MirrorPort">
-                  <name>supplier</name>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{9ba0875d-02f6-46a4-b15c-0ec933b459e0}" id="id-0065-0000014b" kind="ConnectorObject" relid="0xe" role="ConnectorObject">
-                <name>DDS_State</name>
-                <attribute kind="PostPreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="PrePreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="UUID">
-                  <value>C61798A6-7C26-11DF-8000-000C2958D27B</value>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{85a0a8e1-d5b2-4c4f-8363-ae8abcd39b00}" id="id-0067-000002b1" kind="MirrorPort" referred="id-0065-0000014c" relid="0x0" role="MirrorPort">
-                  <name>push_state_observer</name>
-                </reference>
-                <reference guid="{fec38694-fe28-4669-be83-d7142ece8d92}" id="id-0067-000002b2" kind="MirrorPort" referred="id-0065-0000014e" relid="0x0" role="MirrorPort">
-                  <name>push_observer</name>
-                </reference>
-                <reference guid="{f8de4b83-cc7c-45f7-aa09-c444b91f1945}" id="id-0067-000002b3" kind="MirrorPort" referred="id-0065-00000150" relid="0x0" role="MirrorPort">
-                  <name>pull_observer</name>
-                </reference>
-                <reference guid="{e09832c6-f7fb-436c-91fb-b89d677a9261}" id="id-0067-000002b4" kind="MirrorPort" referred="id-0065-00000152" relid="0x0" role="MirrorPort">
-                  <name>passive_observer</name>
-                </reference>
-                <reference guid="{f37bfb4b-b88a-4815-94f7-8cd699d13e8c}" id="id-0067-000002b5" kind="MirrorPort" referred="id-0065-00000154" relid="0x0" role="MirrorPort">
-                  <name>observable</name>
-                </reference>
-              </model>
-              <model childrelidcntr="0x2" guid="{824566cf-5c31-4bc4-b7f0-08f3e194df43}" id="id-0065-0000014c" kind="PortType" relid="0xd" role="PortType">
-                <name>DDS_StateListen</name>
-                <attribute kind="PostPreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="PrePreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <model childrelidcntr="0x1" guid="{8037acb0-12ad-40b1-94bb-69c1bee6b6b9}" id="id-0065-0000014d" kind="Attribute" relid="0x0" role="Attribute">
-                  <name>filter</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,560</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{eed9c788-7b5a-4c1f-9795-21704f2d8d96}" id="id-0067-00000066" kind="SetException" referred="id-0065-0000013e" relid="0x0" role="SetException">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>160,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{6b8ae559-da9a-4a03-95b7-fcc3996051dc}" id="id-0067-00000067" kind="AttributeMember" referred="id-0065-00000143" relid="0x0" role="AttributeMember">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-                <reference guid="{b462f37c-4f66-4b08-84a6-59c2abe46a4a}" id="id-0067-00000068" kind="RequiredRequestPort" referred="id-0065-0000013c" relid="0x1" role="RequiredRequestPort">
-                  <name>filter_config</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,660</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="exclusiveProvider" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="exclusiveUser" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="multiple_connections">
-                    <value>true</value>
-                  </attribute>
-                  <attribute kind="optional" status="meta">
-                    <value>false</value>
-                  </attribute>
-                </reference>
-                <reference guid="{6b1da435-fdcc-4081-a454-a6e227c098b3}" id="id-0067-00000069" kind="ProvidedRequestPort" referred="id-0065-00000121" relid="0x0" role="ProvidedRequestPort">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,460</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="exclusiveProvider" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="exclusiveUser" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="optional" status="meta">
-                    <value>false</value>
-                  </attribute>
-                </reference>
-                <reference guid="{e3f7233f-8283-4539-9f9d-df4eac67aafe}" id="id-0067-0000006a" kind="RequiredRequestPort" referred="id-0065-000000cc" relid="0x0" role="RequiredRequestPort">
-                  <name>dds_entity</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,360</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="exclusiveProvider" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="exclusiveUser" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="multiple_connections">
-                    <value>true</value>
-                  </attribute>
-                  <attribute kind="optional" status="meta">
-                    <value>false</value>
-                  </attribute>
-                </reference>
-                <reference guid="{11b899d0-7064-4e27-b20e-b8a5e24f3548}" id="id-0067-0000006b" kind="RequiredRequestPort" referred="id-0065-0000011d" relid="0x0" role="RequiredRequestPort">
-                  <name>data_control</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,160</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="exclusiveProvider" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="exclusiveUser" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="multiple_connections">
-                    <value>true</value>
-                  </attribute>
-                  <attribute kind="optional" status="meta">
-                    <value>false</value>
-                  </attribute>
-                </reference>
-                <reference guid="{b7888fd0-b0c0-4ca4-8013-70d865278be2}" id="id-0067-000002b6" kind="ProvidedRequestPort" referred="id-0065-00000156" relid="0x0" role="ProvidedRequestPort">
-                  <name>data_listener</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,260</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="exclusiveProvider" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="exclusiveUser" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="optional" status="meta">
-                    <value>false</value>
-                  </attribute>
-                </reference>
-                <reference guid="{c6ee3ff0-c5b4-4ef5-990a-4c47dcc5b655}" id="id-0067-000002b7" kind="RequiredRequestPort" referred="id-0065-00000163" relid="0x0" role="RequiredRequestPort">
-                  <name>data</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="exclusiveProvider" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="exclusiveUser" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="multiple_connections">
-                    <value>true</value>
-                  </attribute>
-                  <attribute kind="optional" status="meta">
-                    <value>false</value>
-                  </attribute>
-                </reference>
-              </model>
-              <model childrelidcntr="0x2" guid="{aea302e1-40ee-45b5-91e4-5b78deb209e5}" id="id-0065-0000014e" kind="PortType" relid="0xc" role="PortType">
-                <name>DDS_Listen</name>
-                <attribute kind="PostPreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="PrePreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <model childrelidcntr="0x1" guid="{3266e8d4-569a-479c-b9a8-9cc5b04e4f0c}" id="id-0065-0000014f" kind="Attribute" relid="0x0" role="Attribute">
-                  <name>filter</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,560</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{106b5a2c-d7e6-4cea-9a93-df7bd5ce260d}" id="id-0067-0000006c" kind="SetException" referred="id-0065-0000013e" relid="0x0" role="SetException">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>160,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{c71df672-bb1c-4913-8ed6-e0ddafb2d3bd}" id="id-0067-0000006d" kind="AttributeMember" referred="id-0065-00000143" relid="0x0" role="AttributeMember">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-                <reference guid="{3833a4bb-b7ac-4a39-aa65-c4c0e8bd36a3}" id="id-0067-0000006e" kind="RequiredRequestPort" referred="id-0065-0000013c" relid="0x1" role="RequiredRequestPort">
-                  <name>filter_config</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,660</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="exclusiveProvider" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="exclusiveUser" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="multiple_connections">
-                    <value>true</value>
-                  </attribute>
-                  <attribute kind="optional" status="meta">
-                    <value>false</value>
-                  </attribute>
-                </reference>
-                <reference guid="{6c42a3a9-66e9-4e7c-9b8d-e9134cbc6f56}" id="id-0067-0000006f" kind="ProvidedRequestPort" referred="id-0065-00000121" relid="0x0" role="ProvidedRequestPort">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,460</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="exclusiveProvider" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="exclusiveUser" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="optional" status="meta">
-                    <value>false</value>
-                  </attribute>
-                </reference>
-                <reference guid="{a79437df-5339-40f8-854b-b46af2edaa40}" id="id-0067-00000070" kind="RequiredRequestPort" referred="id-0065-000000cc" relid="0x0" role="RequiredRequestPort">
-                  <name>dds_entity</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,360</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="exclusiveProvider" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="exclusiveUser" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="multiple_connections">
-                    <value>true</value>
-                  </attribute>
-                  <attribute kind="optional" status="meta">
-                    <value>false</value>
-                  </attribute>
-                </reference>
-                <reference guid="{a1c754a8-c82b-44ad-b713-92e20eec5675}" id="id-0067-00000071" kind="RequiredRequestPort" referred="id-0065-00000126" relid="0x0" role="RequiredRequestPort">
-                  <name>data_control</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,160</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="exclusiveProvider" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="exclusiveUser" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="multiple_connections">
-                    <value>true</value>
-                  </attribute>
-                  <attribute kind="optional" status="meta">
-                    <value>false</value>
-                  </attribute>
-                </reference>
-                <reference guid="{394c2257-6520-4469-92e3-8d0f4f74fc01}" id="id-0067-000002b8" kind="ProvidedRequestPort" referred="id-0065-0000015b" relid="0x0" role="ProvidedRequestPort">
-                  <name>data_listener</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,260</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="exclusiveProvider" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="exclusiveUser" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="optional" status="meta">
-                    <value>false</value>
-                  </attribute>
-                </reference>
-                <reference guid="{61e2a992-3538-4606-a1d1-24a25f88ca5d}" id="id-0067-000002b9" kind="RequiredRequestPort" referred="id-0065-00000163" relid="0x0" role="RequiredRequestPort">
-                  <name>data</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="exclusiveProvider" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="exclusiveUser" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="multiple_connections">
-                    <value>true</value>
-                  </attribute>
-                  <attribute kind="optional" status="meta">
-                    <value>false</value>
-                  </attribute>
-                </reference>
-              </model>
-              <model childrelidcntr="0x2" guid="{eec68a9a-758a-45d3-833f-c088cb078876}" id="id-0065-00000150" kind="PortType" relid="0xb" role="PortType">
-                <name>DDS_Get</name>
-                <attribute kind="PostPreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="PrePreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <model childrelidcntr="0x1" guid="{0f78654e-eb44-499d-9350-0839b4e63858}" id="id-0065-00000151" kind="Attribute" relid="0x0" role="Attribute">
-                  <name>filter</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,460</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{af5c09aa-0e28-4795-b9ea-3279f4ed9630}" id="id-0067-00000072" kind="SetException" referred="id-0065-0000013e" relid="0x0" role="SetException">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>160,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{b0f3941f-2b7b-4b50-89bc-c464e1075e64}" id="id-0067-00000073" kind="AttributeMember" referred="id-0065-00000143" relid="0x0" role="AttributeMember">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-                <reference guid="{ac904120-1317-4dbb-b291-8fe317fa5f13}" id="id-0067-00000074" kind="RequiredRequestPort" referred="id-0065-0000013c" relid="0x1" role="RequiredRequestPort">
-                  <name>filter_config</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,560</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="exclusiveProvider" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="exclusiveUser" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="multiple_connections">
-                    <value>true</value>
-                  </attribute>
-                  <attribute kind="optional" status="meta">
-                    <value>false</value>
-                  </attribute>
-                </reference>
-                <reference guid="{76519d1d-5f12-44f2-bb37-44aef358bf08}" id="id-0067-00000075" kind="ProvidedRequestPort" referred="id-0065-00000121" relid="0x0" role="ProvidedRequestPort">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,360</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="exclusiveProvider" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="exclusiveUser" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="optional" status="meta">
-                    <value>false</value>
-                  </attribute>
-                </reference>
-                <reference guid="{e04cbec6-6cd6-4218-990f-a887e7c3d456}" id="id-0067-00000076" kind="RequiredRequestPort" referred="id-0065-000000cc" relid="0x0" role="RequiredRequestPort">
-                  <name>dds_entity</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,260</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="exclusiveProvider" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="exclusiveUser" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="multiple_connections">
-                    <value>true</value>
-                  </attribute>
-                  <attribute kind="optional" status="meta">
-                    <value>false</value>
-                  </attribute>
-                </reference>
-                <reference guid="{7f9aae18-cc60-49ac-9c64-e8677dc82db1}" id="id-0067-000002ba" kind="RequiredRequestPort" referred="id-0065-0000015e" relid="0x0" role="RequiredRequestPort">
-                  <name>fresh_data</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,160</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="exclusiveProvider" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="exclusiveUser" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="multiple_connections">
-                    <value>true</value>
-                  </attribute>
-                  <attribute kind="optional" status="meta">
-                    <value>false</value>
-                  </attribute>
-                </reference>
-                <reference guid="{5e75a6e7-bfbe-4d84-ac64-bbbdb4597a3a}" id="id-0067-000002bb" kind="RequiredRequestPort" referred="id-0065-00000163" relid="0x0" role="RequiredRequestPort">
-                  <name>data</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="exclusiveProvider" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="exclusiveUser" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="multiple_connections">
-                    <value>true</value>
-                  </attribute>
-                  <attribute kind="optional" status="meta">
-                    <value>false</value>
-                  </attribute>
-                </reference>
-              </model>
-              <model childrelidcntr="0x2" guid="{3dddee43-c914-43c0-810a-ebcc47971a9d}" id="id-0065-00000152" kind="PortType" relid="0xa" role="PortType">
-                <name>DDS_Read</name>
-                <attribute kind="PostPreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="PrePreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <model childrelidcntr="0x1" guid="{5bf211cb-da7e-481a-a999-bc5c6c65993c}" id="id-0065-00000153" kind="Attribute" relid="0x0" role="Attribute">
-                  <name>filter</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,360</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{e4350f70-6dce-4fd6-a3ef-6b5df46e16fe}" id="id-0067-00000077" kind="SetException" referred="id-0065-0000013e" relid="0x0" role="SetException">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>160,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{aaf5cbf1-3594-4a38-b409-95bb4ad994ad}" id="id-0067-00000078" kind="AttributeMember" referred="id-0065-00000143" relid="0x0" role="AttributeMember">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-                <reference guid="{bb4a7c18-32e6-4393-b5ad-cbbdc1af1d08}" id="id-0067-00000079" kind="RequiredRequestPort" referred="id-0065-0000013c" relid="0x1" role="RequiredRequestPort">
-                  <name>filter_config</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,460</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="exclusiveProvider" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="exclusiveUser" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="multiple_connections">
-                    <value>true</value>
-                  </attribute>
-                  <attribute kind="optional" status="meta">
-                    <value>false</value>
-                  </attribute>
-                </reference>
-                <reference guid="{96e30ab7-5c98-41ab-ae48-48d3c443c5e1}" id="id-0067-0000007a" kind="ProvidedRequestPort" referred="id-0065-00000121" relid="0x0" role="ProvidedRequestPort">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,260</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="exclusiveProvider" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="exclusiveUser" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="optional" status="meta">
-                    <value>false</value>
-                  </attribute>
-                </reference>
-                <reference guid="{1525c918-c01b-482f-a278-b466237da990}" id="id-0067-0000007b" kind="RequiredRequestPort" referred="id-0065-000000cc" relid="0x0" role="RequiredRequestPort">
-                  <name>dds_entity</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,160</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="exclusiveProvider" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="exclusiveUser" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="multiple_connections">
-                    <value>true</value>
-                  </attribute>
-                  <attribute kind="optional" status="meta">
-                    <value>false</value>
-                  </attribute>
-                </reference>
-                <reference guid="{4812a509-ba1f-4611-aa3b-1d20d3315187}" id="id-0067-000002bc" kind="RequiredRequestPort" referred="id-0065-00000163" relid="0x0" role="RequiredRequestPort">
-                  <name>data</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="exclusiveProvider" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="exclusiveUser" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="multiple_connections">
-                    <value>true</value>
-                  </attribute>
-                  <attribute kind="optional" status="meta">
-                    <value>false</value>
-                  </attribute>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{619861da-4c85-4e91-b5fb-93ecabbb6911}" id="id-0065-00000154" kind="PortType" relid="0x9" role="PortType">
-                <name>DDS_Update</name>
-                <attribute kind="PostPreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="PrePreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{3b2998ec-5de6-45bb-8c02-39d49bceee9d}" id="id-0067-0000007c" kind="RequiredRequestPort" referred="id-0065-000000e0" relid="0x0" role="RequiredRequestPort">
-                  <name>dds_entity</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,160</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="exclusiveProvider" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="exclusiveUser" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="multiple_connections">
-                    <value>true</value>
-                  </attribute>
-                  <attribute kind="optional" status="meta">
-                    <value>false</value>
-                  </attribute>
-                </reference>
-                <reference guid="{6334db56-7834-4a77-9551-8e78c0fb870c}" id="id-0067-000002bd" kind="RequiredRequestPort" referred="id-0065-00000169" relid="0x0" role="RequiredRequestPort">
-                  <name>data</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="exclusiveProvider" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="exclusiveUser" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="multiple_connections">
-                    <value>true</value>
-                  </attribute>
-                  <attribute kind="optional" status="meta">
-                    <value>false</value>
-                  </attribute>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{bf7f6820-3670-48c1-a350-fe275461d999}" id="id-0065-00000155" kind="PortType" relid="0x8" role="PortType">
-                <name>DDS_Write</name>
-                <attribute kind="PostPreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="PrePreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{b8a368fc-cdb8-4419-9284-e9f121fd368c}" id="id-0067-0000007d" kind="RequiredRequestPort" referred="id-0065-000000e0" relid="0x0" role="RequiredRequestPort">
-                  <name>dds_entity</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,160</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="exclusiveProvider" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="exclusiveUser" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="multiple_connections">
-                    <value>true</value>
-                  </attribute>
-                  <attribute kind="optional" status="meta">
-                    <value>false</value>
-                  </attribute>
-                </reference>
-                <reference guid="{cbd3c158-008a-494f-ae24-f5f3666759b9}" id="id-0067-000002be" kind="RequiredRequestPort" referred="id-0065-00000172" relid="0x0" role="RequiredRequestPort">
-                  <name>data</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="exclusiveProvider" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="exclusiveUser" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="multiple_connections">
-                    <value>true</value>
-                  </attribute>
-                  <attribute kind="optional" status="meta">
-                    <value>false</value>
-                  </attribute>
-                </reference>
-              </model>
-              <model childrelidcntr="0x4" guid="{25604677-e315-48da-a2b8-1b382b98f532}" id="id-0065-00000156" kind="Object" relid="0x7" role="Object">
-                <name>StateListener</name>
-                <attribute kind="InterfaceSemantics">
-                  <value>local</value>
-                </attribute>
-                <attribute kind="PostPreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="PrePreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="PrefixTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <model childrelidcntr="0x1" guid="{d013b562-3c78-426d-bce0-b6b180150028}" id="id-0065-00000157" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-                  <name>on_deletion</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,360</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{3602e7ae-be1e-4ba2-b7a0-2cdad7239406}" id="id-0067-0000007e" kind="InParameter" referred="id-0065-00000144" relid="0x0" role="InParameter">
-                    <name>info</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>160,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{65ac5876-8892-407c-accf-fd563e016a58}" id="id-0067-000002bf" kind="InParameter" referred="id-0066-0000003c" relid="0x0" role="InParameter">
-                    <name>datum</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-                <model childrelidcntr="0x1" guid="{cf530e97-b8da-4cd7-aa64-1361f9f7054e}" id="id-0065-00000158" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-                  <name>on_many_updates</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,260</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{76d2a292-1e27-47f0-b329-db0d1c3d7d63}" id="id-0067-0000007f" kind="InParameter" referred="id-0067-00000065" relid="0x0" role="InParameter">
-                    <name>infos</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>160,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{c7fcbef5-e941-4acb-8abd-3d5a8395e6fb}" id="id-0067-000002c0" kind="InParameter" referred="id-0067-000000ac" relid="0x0" role="InParameter">
-                    <name>data</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-                <model childrelidcntr="0x1" guid="{de2eea24-bfb6-4b50-a248-71049b862d6f}" id="id-0065-00000159" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                  <name>on_one_update</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,160</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{57b4b0a1-44c5-41d2-aca7-a2f50070eead}" id="id-0067-00000080" kind="InParameter" referred="id-0065-00000144" relid="0x0" role="InParameter">
-                    <name>info</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>160,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{cb2395ef-477c-44c6-92b1-91c2b4b223f7}" id="id-0067-000002c1" kind="InParameter" referred="id-0066-0000003c" relid="0x0" role="InParameter">
-                    <name>datum</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-                <model childrelidcntr="0x1" guid="{028d00f7-5b8e-461b-8284-98e662135fe4}" id="id-0065-0000015a" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                  <name>on_creation</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{ca1a067d-37e4-4f0b-8a49-529b420f6ee9}" id="id-0067-00000081" kind="InParameter" referred="id-0065-00000144" relid="0x0" role="InParameter">
-                    <name>info</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>160,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{e4c1f87d-4c5c-4a5d-8ebc-a93908c6e7a5}" id="id-0067-000002c2" kind="InParameter" referred="id-0066-0000003c" relid="0x0" role="InParameter">
-                    <name>datum</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-              </model>
-              <model childrelidcntr="0x2" guid="{6250051f-0f23-46a4-84b2-6b44fc5782db}" id="id-0065-0000015b" kind="Object" relid="0x6" role="Object">
-                <name>Listener</name>
-                <attribute kind="InterfaceSemantics">
-                  <value>local</value>
-                </attribute>
-                <attribute kind="PostPreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="PrePreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="PrefixTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <model childrelidcntr="0x1" guid="{21fbe98c-805b-41dc-a052-c2e5b6bce679}" id="id-0065-0000015c" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                  <name>on_many_data</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,160</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{84537cd4-be78-4b29-9e66-98e28837a6ea}" id="id-0067-00000082" kind="InParameter" referred="id-0067-00000065" relid="0x0" role="InParameter">
-                    <name>infos</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>160,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{dbfd6cdc-9219-4b29-bb1a-e91da13dc31a}" id="id-0067-000002c3" kind="InParameter" referred="id-0067-000000ac" relid="0x0" role="InParameter">
-                    <name>data</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-                <model childrelidcntr="0x1" guid="{ccd1e971-4e02-49f3-ae51-fd2cc9c351ed}" id="id-0065-0000015d" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                  <name>on_one_data</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{41dcc038-4baa-45af-b5ff-e2ca817eb149}" id="id-0067-00000083" kind="InParameter" referred="id-0065-00000144" relid="0x0" role="InParameter">
-                    <name>info</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>160,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{7a78080c-3b7c-46e2-8cbc-f5bd78abdb0e}" id="id-0067-000002c4" kind="InParameter" referred="id-0066-0000003c" relid="0x0" role="InParameter">
-                    <name>datum</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-              </model>
-              <model childrelidcntr="0x4" guid="{4e697921-f915-4dcc-91fc-489f76ea9a82}" id="id-0065-0000015e" kind="Object" relid="0x5" role="Object">
-                <name>Getter</name>
-                <attribute kind="InterfaceSemantics">
-                  <value>local</value>
-                </attribute>
-                <attribute kind="PostPreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="PrePreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="PrefixTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <model childrelidcntr="0x1" guid="{06f018e7-9d1a-49ed-acb5-f28f1b79f1c7}" id="id-0065-0000015f" kind="Attribute" relid="0x3" role="Attribute">
-                  <name>max_delivered_data</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,360</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{b689cc61-d959-414b-9307-709982762a1d}" id="id-0067-000002c5" kind="AttributeMember" referred="id-0067-000002ad" relid="0x0" role="AttributeMember">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-                <model childrelidcntr="0x1" guid="{1e6a1ff3-f4d2-4e19-966b-d94e9d7d91db}" id="id-0065-00000160" kind="Attribute" relid="0x2" role="Attribute">
-                  <name>time_out</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,260</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{8bb061eb-7eb2-422e-8970-0328d48c7286}" id="id-0067-00000084" kind="AttributeMember" referred="id-0065-00000119" relid="0x0" role="AttributeMember">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-                <model childrelidcntr="0x1" guid="{24b3532a-b438-49bc-a36b-40b6d0bb3e7a}" id="id-0065-00000161" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                  <name>get_many</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,160</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{e4c3692f-190e-4f31-8e9f-00d740adb36a}" id="id-0067-00000085" kind="ExceptionRef" referred="id-0065-0000013f" relid="0x0" role="ExceptionRef">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>360,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{7a774978-975a-4ad0-9a75-f6b75fb58374}" id="id-0067-00000086" kind="InoutParameter" referred="id-0067-00000065" relid="0x0" role="InoutParameter">
-                    <name>infos</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>260,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{bee572a0-8c5f-47a5-8b5a-541311ce3bdf}" id="id-0067-000002c6" kind="ReturnType" referred="id-0066-0000004e" relid="0x0" role="ReturnType">
-                    <name>ReturnType</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{b3b72284-6df7-4267-9ed5-2733b7035e46}" id="id-0067-000002c7" kind="InoutParameter" referred="id-0067-000000ac" relid="0x0" role="InoutParameter">
-                    <name>data</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>160,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-                <model childrelidcntr="0x1" guid="{bf64b05a-ab7e-4060-bc7c-af69eee2c826}" id="id-0065-00000162" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                  <name>get_one</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{caef1103-880d-4e62-8dc3-dbb59d376a2c}" id="id-0067-00000087" kind="ExceptionRef" referred="id-0065-0000013f" relid="0x0" role="ExceptionRef">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>360,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{08ee158f-0d69-4c00-bcfd-eecdf17e21c4}" id="id-0067-00000088" kind="OutParameter" referred="id-0065-00000144" relid="0x0" role="OutParameter">
-                    <name>info</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>260,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{339639f5-9e87-4fb1-931d-bb0d1b40c3e7}" id="id-0067-000002c8" kind="ReturnType" referred="id-0066-0000004e" relid="0x0" role="ReturnType">
-                    <name>ReturnType</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{c5253db0-34fd-4107-966a-2a36bad3fc2b}" id="id-0067-000002c9" kind="OutParameter" referred="id-0066-0000003c" relid="0x0" role="OutParameter">
-                    <name>datum</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>160,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-              </model>
-              <model childrelidcntr="0x5" guid="{fbaae8e6-f7e9-44c0-a2d8-23c772e7e80f}" id="id-0065-00000163" kind="Object" relid="0x4" role="Object">
-                <name>Reader</name>
-                <attribute kind="InterfaceSemantics">
-                  <value>local</value>
-                </attribute>
-                <attribute kind="PostPreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="PrePreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="PrefixTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <model childrelidcntr="0x1" guid="{4e4d040f-210e-4478-a09c-0e616a3cbb37}" id="id-0065-00000164" kind="Attribute" relid="0x4" role="Attribute">
-                  <name>query</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,460</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{e7510491-305f-4e28-83de-378dd549b65e}" id="id-0067-00000089" kind="SetException" referred="id-0065-0000013f" relid="0x0" role="SetException">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>160,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{e52d1685-755d-4ad3-9983-6c33af87848e}" id="id-0067-0000008a" kind="AttributeMember" referred="id-0065-00000143" relid="0x0" role="AttributeMember">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-                <model childrelidcntr="0x1" guid="{9d4c9094-2e65-4998-837d-853704667ed7}" id="id-0065-00000165" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-                  <name>read_one_all</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,360</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{0267af8d-e264-4a6b-b8ef-93af18391f02}" id="id-0067-0000008b" kind="ExceptionRef" referred="id-0065-0000013f" relid="0x0" role="ExceptionRef">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>560,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{05dcdca9-f31c-4606-b538-c93caf965ba2}" id="id-0067-0000008c" kind="ExceptionRef" referred="id-0065-00000140" relid="0x0" role="ExceptionRef">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>460,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{7e0af45b-784f-4c63-9f38-bc5b076d395e}" id="id-0067-0000008d" kind="InParameter" referred="id-0067-0000000e" relid="0x0" role="InParameter">
-                    <name>instance_handle</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>360,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{7c0fb1d1-b030-4a03-bd3c-cdf2cd1cd5a5}" id="id-0067-0000008e" kind="InoutParameter" referred="id-0067-00000065" relid="0x0" role="InoutParameter">
-                    <name>infos</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>260,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{51e5a25b-df5e-4ac0-87e3-ec768a239f35}" id="id-0067-000002ca" kind="InoutParameter" referred="id-0067-000000ac" relid="0x0" role="InoutParameter">
-                    <name>data</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>160,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{bef80ff6-3ee7-440a-ab11-b28cb887ba9c}" id="id-0067-000002cb" kind="InParameter" referred="id-0066-0000003c" relid="0x0" role="InParameter">
-                    <name>datum</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-                <model childrelidcntr="0x1" guid="{962a6c2b-4d26-4297-955b-f5fe7ce399ec}" id="id-0065-00000166" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-                  <name>read_one_last</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,260</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{5b88a936-0604-4801-84a1-9af6bac59f5a}" id="id-0067-0000008f" kind="ExceptionRef" referred="id-0065-0000013f" relid="0x0" role="ExceptionRef">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>460,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{10b9d7e0-3a2c-4373-a218-8d82a3d20af2}" id="id-0067-00000090" kind="ExceptionRef" referred="id-0065-00000140" relid="0x0" role="ExceptionRef">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>360,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{485e3452-096b-45cd-aed9-17b92c1d2418}" id="id-0067-00000091" kind="InParameter" referred="id-0067-0000000e" relid="0x0" role="InParameter">
-                    <name>instance_handle</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>260,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{0cbc06f2-3bd6-4dac-9375-c6fc7fb0bacc}" id="id-0067-00000092" kind="OutParameter" referred="id-0065-00000144" relid="0x0" role="OutParameter">
-                    <name>info</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>160,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{bf72e9ae-e767-4a3f-9b71-25d90d3347e5}" id="id-0067-000002cc" kind="InoutParameter" referred="id-0066-0000003c" relid="0x0" role="InoutParameter">
-                    <name>datum</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-                <model childrelidcntr="0x1" guid="{d5f05976-af23-4514-8d05-cb38cf76944c}" id="id-0065-00000167" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                  <name>read_all</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,160</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{5debda2b-712e-4ac1-9802-7c7fddd419a3}" id="id-0067-00000093" kind="ExceptionRef" referred="id-0065-0000013f" relid="0x0" role="ExceptionRef">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>260,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{b92ab869-0388-49dc-9a84-f093613a8098}" id="id-0067-00000094" kind="InoutParameter" referred="id-0067-00000065" relid="0x0" role="InoutParameter">
-                    <name>infos</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>160,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{ea094b3f-dd2f-4827-ae5e-5e6e0144ee8c}" id="id-0067-000002cd" kind="InoutParameter" referred="id-0067-000000ac" relid="0x0" role="InoutParameter">
-                    <name>data</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-                <model childrelidcntr="0x1" guid="{9c80ff59-7621-4f27-8b70-09686b72e054}" id="id-0065-00000168" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                  <name>read_last</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{10375f16-b46e-4ff3-895d-8b43cf7e4c22}" id="id-0067-00000095" kind="ExceptionRef" referred="id-0065-0000013f" relid="0x0" role="ExceptionRef">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>260,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{93632f7b-130a-420b-8dbb-b2ae03eda7dd}" id="id-0067-00000096" kind="InoutParameter" referred="id-0067-00000065" relid="0x0" role="InoutParameter">
-                    <name>infos</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>160,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{9c922906-3e03-4154-bc7c-130c56a1f5fb}" id="id-0067-000002ce" kind="InoutParameter" referred="id-0067-000000ac" relid="0x0" role="InoutParameter">
-                    <name>data</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-              </model>
-              <model childrelidcntr="0x9" guid="{66f2b8ec-262f-4de9-8f85-47d751509c36}" id="id-0065-00000169" kind="Object" relid="0x3" role="Object">
-                <name>Updater</name>
-                <attribute kind="InterfaceSemantics">
-                  <value>local</value>
-                </attribute>
-                <attribute kind="PostPreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="PrePreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="PrefixTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <model childrelidcntr="0x1" guid="{94b21c7e-dfd6-4f18-97d2-6441336af003}" id="id-0065-0000016a" kind="Attribute" relid="0x7" role="Attribute">
-                  <name>is_coherent_write</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,760</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{9e483357-6b07-4e20-b357-efb37fcd53e3}" id="id-0067-000002cf" kind="AttributeMember" referred="id-0066-0000004e" relid="0x0" role="AttributeMember">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-                <model childrelidcntr="0x1" guid="{10fafe01-6de0-4ece-b0d3-fe89ef7f4835}" id="id-0065-0000016b" kind="ReadonlyAttribute" relid="0x6" role="ReadonlyAttribute">
-                  <name>is_global_scope</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,660</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{87a9c6ed-1501-4c88-a20d-2feae9cde5b1}" id="id-0067-000002d0" kind="AttributeMember" referred="id-0066-0000004e" relid="0x0" role="AttributeMember">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-                <model childrelidcntr="0x1" guid="{813df944-1459-43e8-bbc8-88acc57a1fa5}" id="id-0065-0000016c" kind="TwowayOperation" relid="0x5" role="TwowayOperation">
-                  <name>delete_many</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,560</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{b524aac1-b976-40f9-a64f-2d4ddfa61438}" id="id-0067-00000097" kind="ExceptionRef" referred="id-0065-0000013f" relid="0x0" role="ExceptionRef">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>260,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{5e770cfe-e15a-4a80-99fa-3e0406d7acf9}" id="id-0067-00000098" kind="ExceptionRef" referred="id-0065-00000140" relid="0x0" role="ExceptionRef">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>160,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{e8ca1bc7-caab-440e-b1fa-3201e467791e}" id="id-0067-000002d1" kind="InParameter" referred="id-0067-000000ac" relid="0x0" role="InParameter">
-                    <name>data</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-                <model childrelidcntr="0x1" guid="{95bde85e-e757-49b2-a908-a83f2c188fbd}" id="id-0065-0000016d" kind="TwowayOperation" relid="0x4" role="TwowayOperation">
-                  <name>update_many</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,460</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{d06d9371-0088-4dd8-9752-a18b3063c69b}" id="id-0067-00000099" kind="ExceptionRef" referred="id-0065-0000013f" relid="0x0" role="ExceptionRef">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>260,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{379470f8-0040-4e10-b8a6-8fa2b34fddf9}" id="id-0067-0000009a" kind="ExceptionRef" referred="id-0065-00000140" relid="0x0" role="ExceptionRef">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>160,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{8caec0b7-d5fe-4556-9b87-15dc20896ff8}" id="id-0067-000002d2" kind="InParameter" referred="id-0067-000000ac" relid="0x0" role="InParameter">
-                    <name>data</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-                <model childrelidcntr="0x1" guid="{cb8e328d-38a4-4f2a-b717-8d8374d68daf}" id="id-0065-0000016e" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-                  <name>create_many</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,360</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{b7b7c6d5-bc8e-4fd3-bd58-45cbf201756e}" id="id-0067-0000009b" kind="ExceptionRef" referred="id-0065-0000013f" relid="0x0" role="ExceptionRef">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>260,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{02de4bb7-fa93-4aa6-ab0e-d1e6286f4dec}" id="id-0067-0000009c" kind="ExceptionRef" referred="id-0065-00000141" relid="0x0" role="ExceptionRef">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>160,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{7256c665-bf07-4a9c-ab2a-256e4f3c50f2}" id="id-0067-000002d3" kind="InParameter" referred="id-0067-000000ac" relid="0x0" role="InParameter">
-                    <name>data</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-                <model childrelidcntr="0x1" guid="{f537077f-f387-4192-8a26-5596277a3f2a}" id="id-0065-0000016f" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-                  <name>delete_one</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,260</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{f530443c-3e1b-4ad5-95ed-cd0eb0573d2a}" id="id-0067-0000009d" kind="ExceptionRef" referred="id-0065-0000013f" relid="0x0" role="ExceptionRef">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>360,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{c27b475f-efca-4407-9a21-7f4285994efb}" id="id-0067-0000009e" kind="ExceptionRef" referred="id-0065-00000140" relid="0x0" role="ExceptionRef">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>260,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{5b50bc69-f23a-4111-9846-c32dd6f9815a}" id="id-0067-0000009f" kind="InParameter" referred="id-0067-0000000e" relid="0x0" role="InParameter">
-                    <name>instance_handle</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>160,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{4a256ca6-114e-400d-8770-c41736da19d8}" id="id-0067-000002d4" kind="InParameter" referred="id-0066-0000003c" relid="0x0" role="InParameter">
-                    <name>datum</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-                <model childrelidcntr="0x1" guid="{f66c8596-6cc6-4cbf-ae36-721f1bf0480e}" id="id-0065-00000170" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                  <name>update_one</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,160</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{1943cc4b-c1e0-44c4-abda-6e7414de060f}" id="id-0067-000000a0" kind="ExceptionRef" referred="id-0065-0000013f" relid="0x0" role="ExceptionRef">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>360,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{ef9152da-cdfc-4865-a315-ed95202698fe}" id="id-0067-000000a1" kind="ExceptionRef" referred="id-0065-00000140" relid="0x0" role="ExceptionRef">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>260,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{7df5fc97-60cf-4d88-8700-f566ecbcc8bb}" id="id-0067-000000a2" kind="InParameter" referred="id-0067-0000000e" relid="0x0" role="InParameter">
-                    <name>instance_handle</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>160,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{5d7dad55-48e4-4a8a-bf93-a2f306a04cdb}" id="id-0067-000002d5" kind="InParameter" referred="id-0066-0000003c" relid="0x0" role="InParameter">
-                    <name>datum</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-                <model childrelidcntr="0x1" guid="{6cb43fd0-0169-4d67-b9c6-824a1f499f8e}" id="id-0065-00000171" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                  <name>create_one</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{7864288f-9093-48f9-bb10-60ebe95e73ca}" id="id-0067-000000a3" kind="ExceptionRef" referred="id-0065-0000013f" relid="0x0" role="ExceptionRef">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>260,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{1cd4fb1d-7e9b-48c2-b941-cd533753fc27}" id="id-0067-000000a4" kind="ExceptionRef" referred="id-0065-00000141" relid="0x0" role="ExceptionRef">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>160,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{38e44026-f094-4559-9f59-4866d65c2e57}" id="id-0067-000002d6" kind="InParameter" referred="id-0066-0000003c" relid="0x0" role="InParameter">
-                    <name>datum</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-                <reference guid="{43974de2-add7-4185-afb2-14c0c6ce5460}" id="id-0067-000002d7" kind="Inherits" referred="id-0065-00000176" relid="0x8" role="Inherits">
-                  <name>Inherits</name>
-                </reference>
-              </model>
-              <model childrelidcntr="0x4" guid="{6354d461-c223-4732-a44a-6994bbc2400c}" id="id-0065-00000172" kind="Object" relid="0x2" role="Object">
-                <name>Writer</name>
-                <attribute kind="InterfaceSemantics">
-                  <value>local</value>
-                </attribute>
-                <attribute kind="PostPreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="PrePreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="PrefixTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <model childrelidcntr="0x1" guid="{325bb065-4fba-4e0b-b9cd-e71d659f8c91}" id="id-0065-00000173" kind="Attribute" relid="0x2" role="Attribute">
-                  <name>is_coherent_write</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,260</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{dcaf8484-6535-4f33-882f-fae5f083fbc8}" id="id-0067-000002d8" kind="AttributeMember" referred="id-0066-0000004e" relid="0x0" role="AttributeMember">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-                <model childrelidcntr="0x1" guid="{fc0a0deb-7c8b-45d9-ac99-98465ecc30e7}" id="id-0065-00000174" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                  <name>write_many</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,160</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{47f91bb8-abf7-4b0d-a96c-00d0379e9636}" id="id-0067-000000a5" kind="ExceptionRef" referred="id-0065-0000013f" relid="0x0" role="ExceptionRef">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>160,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{b96601ec-2773-418a-8d88-4ccb0a1e455e}" id="id-0067-000002d9" kind="InParameter" referred="id-0067-000000ac" relid="0x0" role="InParameter">
-                    <name>data</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-                <model childrelidcntr="0x1" guid="{762b9f68-9fca-4e2d-bf86-c03de77cdad1}" id="id-0065-00000175" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                  <name>write_one</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{3848e2f2-a990-45be-a164-14edae3f0ec0}" id="id-0067-000000a6" kind="ExceptionRef" referred="id-0065-0000013f" relid="0x0" role="ExceptionRef">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>260,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{1c7934af-9cce-4084-9f1a-e2fa632bde07}" id="id-0067-000000a7" kind="InParameter" referred="id-0067-0000000e" relid="0x0" role="InParameter">
-                    <name>instance_handle</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>160,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{39d3f530-7b40-40a5-a378-2c0859e5308e}" id="id-0067-000002da" kind="InParameter" referred="id-0066-0000003c" relid="0x0" role="InParameter">
-                    <name>datum</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-                <reference guid="{7f8ce04c-e7fa-4476-8cda-4f3917f455dc}" id="id-0067-000002db" kind="Inherits" referred="id-0065-00000176" relid="0x3" role="Inherits">
-                  <name>Inherits</name>
-                </reference>
-              </model>
-              <model childrelidcntr="0x2" guid="{31f0e62f-0265-4cf5-b71d-5990577117be}" id="id-0065-00000176" kind="Object" relid="0x1" role="Object">
-                <name>InstanceHandleManager</name>
-                <attribute kind="InterfaceSemantics">
-                  <value>local</value>
-                </attribute>
-                <attribute kind="PostPreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="PrePreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="PrefixTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <model childrelidcntr="0x1" guid="{45fd16b9-8789-4bf2-b463-9fdb00d2c384}" id="id-0065-00000177" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                  <name>unregister_instance</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,160</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{9075612e-91a1-421c-9bee-841dd0fffe72}" id="id-0067-000000a8" kind="ExceptionRef" referred="id-0065-0000013f" relid="0x0" role="ExceptionRef">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>260,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{684865be-9ec3-4cf2-800c-def69ba0ecc5}" id="id-0067-000000a9" kind="InParameter" referred="id-0067-0000000e" relid="0x0" role="InParameter">
-                    <name>instance_handle</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>160,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{ac8c14ed-8e35-425b-8cf2-a6f5ba489e97}" id="id-0067-000002dc" kind="InParameter" referred="id-0066-0000003c" relid="0x0" role="InParameter">
-                    <name>datum</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-                <model childrelidcntr="0x1" guid="{92ba42fc-d09f-4927-b1cf-1e3ffa873740}" id="id-0065-00000178" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                  <name>register_instance</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{fd5c661f-a1b2-4762-9415-bbdf2d17fce7}" id="id-0067-000000aa" kind="ExceptionRef" referred="id-0065-0000013f" relid="0x0" role="ExceptionRef">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>260,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{74c76ece-44ea-43ef-ba15-87a7d8f07e97}" id="id-0067-000000ab" kind="ReturnType" referred="id-0067-0000000e" relid="0x0" role="ReturnType">
-                    <name>ReturnType</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{a4ab3f39-b211-43b3-83d9-4fcfedf38985}" id="id-0067-000002dd" kind="InParameter" referred="id-0066-0000003c" relid="0x0" role="InParameter">
-                    <name>datum</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>160,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-              </model>
-              <atom guid="{f7eae334-9a8a-46fa-859b-a1306b0f717c}" id="id-0066-0000003c" kind="NameParameter" relid="0x0" role="NameParameter">
-                <name>T</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="TemplateParameters">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-              <reference guid="{4a4d7fb8-c4c9-4bce-934f-302e9df8fa56}" id="id-0067-000000ac" kind="CollectionParameter" referred="id-0066-0000003c" relid="0x1" role="CollectionParameter">
-                <name>TSeq</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="TemplateParameters">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-          </model>
-        </model>
-      </folder>
-      <folder childrelidcntr="0x0" guid="{69574031-9f39-4d8e-823d-d29fd48aa072}" id="id-006a-00000008" kind="ImplementationArtifacts" relid="0x1">
-        <name>ImplementationArtifacts</name>
-      </folder>
-      <folder childrelidcntr="0x0" guid="{761a1f97-c812-44a4-95d4-bedbffef5e88}" id="id-006a-00000009" kind="ComponentImplementations" relid="0x2">
-        <name>ComponentImplementations</name>
-      </folder>
-      <folder childrelidcntr="0x12" guid="{dddb800b-cb2d-44c1-8565-04c55466865d}" id="id-006a-0000000a" kind="PredefinedTypes" relid="0x3">
-        <name>PredefinedTypes</name>
-        <atom guid="{e783ca74-1607-4282-996b-f76573af40f4}" id="id-0066-0000003d" kind="WideString" relid="0x11">
-          <name>WideString</name>
-        </atom>
-        <atom guid="{27e3d44c-6193-4866-b3af-e20dff54bbab}" id="id-0066-0000003e" kind="String" relid="0x10">
-          <name>String</name>
-        </atom>
-        <atom guid="{78214cf5-c763-4757-8021-1f4048f149db}" id="id-0066-0000003f" kind="GenericValueObject" relid="0xf">
-          <name>GenericValueObject</name>
-        </atom>
-        <atom guid="{f8a3717c-66ac-4036-82ca-cd1ae722f2f5}" id="id-0066-00000040" kind="GenericValue" relid="0xe">
-          <name>GenericValue</name>
-        </atom>
-        <atom guid="{9febfeb2-0029-4e17-863a-95ce95fc96c8}" id="id-0066-00000041" kind="GenericObject" relid="0xd">
-          <name>GenericObject</name>
-        </atom>
-        <atom guid="{2ff7e056-4843-4aa2-92b3-7a63d5f05f7e}" id="id-0066-00000042" kind="LongDoubleNumber" relid="0xc">
-          <name>LongDoubleNumber</name>
-        </atom>
-        <atom guid="{31da4bfa-4cdd-4aa3-a2b2-ca4565fe6c5e}" id="id-0066-00000043" kind="DoubleNumber" relid="0xb">
-          <name>DoubleNumber</name>
-        </atom>
-        <atom guid="{86abaec4-275b-4557-b7fc-3c37162e4c88}" id="id-0066-00000044" kind="FloatNumber" relid="0xa">
-          <name>FloatNumber</name>
-        </atom>
-        <atom guid="{4088faaa-acb3-4f25-8e02-facd710cffc6}" id="id-0066-00000045" kind="UnsignedLongLongInteger" relid="0x9">
-          <name>UnsignedLongLongInteger</name>
-        </atom>
-        <atom guid="{9007bf15-29fc-4b32-a84a-7b7d37391b84}" id="id-0066-00000046" kind="UnsignedLongInteger" relid="0x8">
-          <name>UnsignedLongInteger</name>
-        </atom>
-        <atom guid="{db80209c-37a2-4682-b082-c7e6c836e85a}" id="id-0066-00000047" kind="UnsignedShortInteger" relid="0x7">
-          <name>UnsignedShortInteger</name>
-        </atom>
-        <atom guid="{74476a32-4e8e-4476-9386-c18ca08b7169}" id="id-0066-00000048" kind="LongLongInteger" relid="0x6">
-          <name>LongLongInteger</name>
-        </atom>
-        <atom guid="{82e9b301-b8d9-4ed6-adde-3f6fa870a4e1}" id="id-0066-00000049" kind="LongInteger" relid="0x5">
-          <name>LongInteger</name>
-        </atom>
-        <atom guid="{5bded188-b1f8-4aad-b46f-44c70302479c}" id="id-0066-0000004a" kind="ShortInteger" relid="0x4">
-          <name>ShortInteger</name>
-        </atom>
-        <atom guid="{05b11570-71e1-448c-828f-834dfe5843da}" id="id-0066-0000004b" kind="WideChar" relid="0x3">
-          <name>WideChar</name>
-        </atom>
-        <atom guid="{8193fe8f-a5af-40a1-b393-de6c5d54c352}" id="id-0066-0000004c" kind="Char" relid="0x2">
-          <name>Char</name>
-        </atom>
-        <atom guid="{e4f7be2e-25d8-4a0b-9645-28580fe6b533}" id="id-0066-0000004d" kind="Byte" relid="0x1">
-          <name>Byte</name>
-        </atom>
-        <atom guid="{fb202a59-8bd9-4a7e-aada-1816868d4387}" id="id-0066-0000004e" kind="Boolean" relid="0x0">
-          <name>Boolean</name>
-        </atom>
-      </folder>
-    </folder>
-    <folder childrelidcntr="0x4" guid="{dcf2ae2f-94b5-41a4-8798-28318fff8fb8}" id="id-006a-00000005" kind="RootFolder" libref="MGA=E:/proj/vc9/ACE_TAO_CIAO/CIAO/connectors/dds4ccm/models/dds4ccm.mga" relid="0x1">
-      <name>dds4ccm</name>
-      <folder childrelidcntr="0x12" guid="{6d852a9e-1977-4a6a-8943-64c549a2db8b}" id="id-006a-00000006" kind="InterfaceDefinitions" relid="0x0">
-        <name>InterfaceDefinitions</name>
-        <model childrelidcntr="0x1" guid="{c15ffee3-4e42-4415-b8d3-2c6eb6f273bb}" id="id-0065-00000160" kind="File" relid="0x0">
-          <name>ccm_dds</name>
-          <attribute kind="Path">
-            <value>connectors/dds4ccm/idl</value>
-          </attribute>
-          <attribute kind="PostPreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrePreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrefixTag" status="meta">
-            <value/>
-          </attribute>
-          <model childrelidcntr="0x1" guid="{34a2a80d-dd8a-4ebf-9e5d-3eedeef2764d}" id="id-0065-00000161" kind="Package" relid="0x0" role="Package">
-            <name>CCM_DDS</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrefixTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <model childrelidcntr="0x10" guid="{973858e2-a3a5-47b4-84b6-7dccd553eafe}" id="id-0065-00000162" kind="Package" relid="0x0" role="Package">
-              <name>Typed</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x2" guid="{31f0e62f-0265-4cf5-b71d-5990577117be}" id="id-0065-00000163" kind="Object" relid="0x1" role="Object">
-                <name>InstanceHandleManager</name>
-                <attribute kind="InterfaceSemantics">
-                  <value>local</value>
-                </attribute>
-                <attribute kind="PostPreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="PrePreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="PrefixTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <model childrelidcntr="0x1" guid="{92ba42fc-d09f-4927-b1cf-1e3ffa873740}" id="id-0065-00000164" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                  <name>register_instance</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{a4ab3f39-b211-43b3-83d9-4fcfedf38985}" id="id-0067-0000035f" kind="InParameter" referred="id-0066-00000034" relid="0x0" role="InParameter">
-                    <name>datum</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>160,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{74c76ece-44ea-43ef-ba15-87a7d8f07e97}" id="id-0067-00000360" kind="ReturnType" referred="id-0067-000006bc" relid="0x0" role="ReturnType">
-                    <name>ReturnType</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{fd5c661f-a1b2-4762-9415-bbdf2d17fce7}" id="id-0067-00000361" kind="ExceptionRef" referred="id-0065-0000019b" relid="0x0" role="ExceptionRef">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>260,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-                <model childrelidcntr="0x1" guid="{45fd16b9-8789-4bf2-b463-9fdb00d2c384}" id="id-0065-00000165" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                  <name>unregister_instance</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,160</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{ac8c14ed-8e35-425b-8cf2-a6f5ba489e97}" id="id-0067-00000362" kind="InParameter" referred="id-0066-00000034" relid="0x0" role="InParameter">
-                    <name>datum</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{684865be-9ec3-4cf2-800c-def69ba0ecc5}" id="id-0067-00000363" kind="InParameter" referred="id-0067-000006bc" relid="0x0" role="InParameter">
-                    <name>instance_handle</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>160,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{9075612e-91a1-421c-9bee-841dd0fffe72}" id="id-0067-00000364" kind="ExceptionRef" referred="id-0065-0000019b" relid="0x0" role="ExceptionRef">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>260,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-              </model>
-              <model childrelidcntr="0x4" guid="{6354d461-c223-4732-a44a-6994bbc2400c}" id="id-0065-00000166" kind="Object" relid="0x2" role="Object">
-                <name>Writer</name>
-                <attribute kind="InterfaceSemantics">
-                  <value>local</value>
-                </attribute>
-                <attribute kind="PostPreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="PrePreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="PrefixTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <model childrelidcntr="0x1" guid="{762b9f68-9fca-4e2d-bf86-c03de77cdad1}" id="id-0065-00000167" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                  <name>write_one</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{39d3f530-7b40-40a5-a378-2c0859e5308e}" id="id-0067-00000365" kind="InParameter" referred="id-0066-00000034" relid="0x0" role="InParameter">
-                    <name>datum</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{1c7934af-9cce-4084-9f1a-e2fa632bde07}" id="id-0067-00000366" kind="InParameter" referred="id-0067-000006bc" relid="0x0" role="InParameter">
-                    <name>instance_handle</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>160,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{3848e2f2-a990-45be-a164-14edae3f0ec0}" id="id-0067-00000367" kind="ExceptionRef" referred="id-0065-0000019b" relid="0x0" role="ExceptionRef">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>260,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-                <model childrelidcntr="0x1" guid="{fc0a0deb-7c8b-45d9-ac99-98465ecc30e7}" id="id-0065-00000168" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                  <name>write_many</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,160</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{b96601ec-2773-418a-8d88-4ccb0a1e455e}" id="id-0067-00000368" kind="InParameter" referred="id-0067-000003d5" relid="0x0" role="InParameter">
-                    <name>data</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{47f91bb8-abf7-4b0d-a96c-00d0379e9636}" id="id-0067-00000369" kind="ExceptionRef" referred="id-0065-0000019b" relid="0x0" role="ExceptionRef">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>160,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-                <model childrelidcntr="0x1" guid="{325bb065-4fba-4e0b-b9cd-e71d659f8c91}" id="id-0065-00000169" kind="Attribute" relid="0x2" role="Attribute">
-                  <name>is_coherent_write</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,260</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{dcaf8484-6535-4f33-882f-fae5f083fbc8}" id="id-0067-0000036a" kind="AttributeMember" referred="id-0066-00000056" relid="0x0" role="AttributeMember">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-                <reference guid="{7f8ce04c-e7fa-4476-8cda-4f3917f455dc}" id="id-0067-0000036b" kind="Inherits" referred="id-0065-00000163" relid="0x3" role="Inherits">
-                  <name>Inherits</name>
-                </reference>
-              </model>
-              <model childrelidcntr="0x9" guid="{66f2b8ec-262f-4de9-8f85-47d751509c36}" id="id-0065-0000016a" kind="Object" relid="0x3" role="Object">
-                <name>Updater</name>
-                <attribute kind="InterfaceSemantics">
-                  <value>local</value>
-                </attribute>
-                <attribute kind="PostPreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="PrePreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="PrefixTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <model childrelidcntr="0x1" guid="{6cb43fd0-0169-4d67-b9c6-824a1f499f8e}" id="id-0065-0000016b" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                  <name>create_one</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{38e44026-f094-4559-9f59-4866d65c2e57}" id="id-0067-0000036c" kind="InParameter" referred="id-0066-00000034" relid="0x0" role="InParameter">
-                    <name>datum</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{1cd4fb1d-7e9b-48c2-b941-cd533753fc27}" id="id-0067-0000036d" kind="ExceptionRef" referred="id-0065-00000199" relid="0x0" role="ExceptionRef">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>160,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{7864288f-9093-48f9-bb10-60ebe95e73ca}" id="id-0067-0000036e" kind="ExceptionRef" referred="id-0065-0000019b" relid="0x0" role="ExceptionRef">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>260,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-                <model childrelidcntr="0x1" guid="{f66c8596-6cc6-4cbf-ae36-721f1bf0480e}" id="id-0065-0000016c" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                  <name>update_one</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,160</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{5d7dad55-48e4-4a8a-bf93-a2f306a04cdb}" id="id-0067-0000036f" kind="InParameter" referred="id-0066-00000034" relid="0x0" role="InParameter">
-                    <name>datum</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{7df5fc97-60cf-4d88-8700-f566ecbcc8bb}" id="id-0067-00000370" kind="InParameter" referred="id-0067-000006bc" relid="0x0" role="InParameter">
-                    <name>instance_handle</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>160,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{ef9152da-cdfc-4865-a315-ed95202698fe}" id="id-0067-00000371" kind="ExceptionRef" referred="id-0065-0000019a" relid="0x0" role="ExceptionRef">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>260,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{1943cc4b-c1e0-44c4-abda-6e7414de060f}" id="id-0067-00000372" kind="ExceptionRef" referred="id-0065-0000019b" relid="0x0" role="ExceptionRef">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>360,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-                <model childrelidcntr="0x1" guid="{f537077f-f387-4192-8a26-5596277a3f2a}" id="id-0065-0000016d" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-                  <name>delete_one</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,260</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{4a256ca6-114e-400d-8770-c41736da19d8}" id="id-0067-00000373" kind="InParameter" referred="id-0066-00000034" relid="0x0" role="InParameter">
-                    <name>datum</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{5b50bc69-f23a-4111-9846-c32dd6f9815a}" id="id-0067-00000374" kind="InParameter" referred="id-0067-000006bc" relid="0x0" role="InParameter">
-                    <name>instance_handle</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>160,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{c27b475f-efca-4407-9a21-7f4285994efb}" id="id-0067-00000375" kind="ExceptionRef" referred="id-0065-0000019a" relid="0x0" role="ExceptionRef">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>260,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{f530443c-3e1b-4ad5-95ed-cd0eb0573d2a}" id="id-0067-00000376" kind="ExceptionRef" referred="id-0065-0000019b" relid="0x0" role="ExceptionRef">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>360,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-                <model childrelidcntr="0x1" guid="{cb8e328d-38a4-4f2a-b717-8d8374d68daf}" id="id-0065-0000016e" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-                  <name>create_many</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,360</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{7256c665-bf07-4a9c-ab2a-256e4f3c50f2}" id="id-0067-00000377" kind="InParameter" referred="id-0067-000003d5" relid="0x0" role="InParameter">
-                    <name>data</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{02de4bb7-fa93-4aa6-ab0e-d1e6286f4dec}" id="id-0067-00000378" kind="ExceptionRef" referred="id-0065-00000199" relid="0x0" role="ExceptionRef">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>160,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{b7b7c6d5-bc8e-4fd3-bd58-45cbf201756e}" id="id-0067-00000379" kind="ExceptionRef" referred="id-0065-0000019b" relid="0x0" role="ExceptionRef">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>260,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-                <model childrelidcntr="0x1" guid="{95bde85e-e757-49b2-a908-a83f2c188fbd}" id="id-0065-0000016f" kind="TwowayOperation" relid="0x4" role="TwowayOperation">
-                  <name>update_many</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,460</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{8caec0b7-d5fe-4556-9b87-15dc20896ff8}" id="id-0067-0000037a" kind="InParameter" referred="id-0067-000003d5" relid="0x0" role="InParameter">
-                    <name>data</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{379470f8-0040-4e10-b8a6-8fa2b34fddf9}" id="id-0067-0000037b" kind="ExceptionRef" referred="id-0065-0000019a" relid="0x0" role="ExceptionRef">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>160,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{d06d9371-0088-4dd8-9752-a18b3063c69b}" id="id-0067-0000037c" kind="ExceptionRef" referred="id-0065-0000019b" relid="0x0" role="ExceptionRef">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>260,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-                <model childrelidcntr="0x1" guid="{813df944-1459-43e8-bbc8-88acc57a1fa5}" id="id-0065-00000170" kind="TwowayOperation" relid="0x5" role="TwowayOperation">
-                  <name>delete_many</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,560</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{e8ca1bc7-caab-440e-b1fa-3201e467791e}" id="id-0067-0000037d" kind="InParameter" referred="id-0067-000003d5" relid="0x0" role="InParameter">
-                    <name>data</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{5e770cfe-e15a-4a80-99fa-3e0406d7acf9}" id="id-0067-0000037e" kind="ExceptionRef" referred="id-0065-0000019a" relid="0x0" role="ExceptionRef">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>160,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{b524aac1-b976-40f9-a64f-2d4ddfa61438}" id="id-0067-0000037f" kind="ExceptionRef" referred="id-0065-0000019b" relid="0x0" role="ExceptionRef">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>260,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-                <model childrelidcntr="0x1" guid="{10fafe01-6de0-4ece-b0d3-fe89ef7f4835}" id="id-0065-00000171" kind="ReadonlyAttribute" relid="0x6" role="ReadonlyAttribute">
-                  <name>is_global_scope</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,660</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{87a9c6ed-1501-4c88-a20d-2feae9cde5b1}" id="id-0067-00000380" kind="AttributeMember" referred="id-0066-00000056" relid="0x0" role="AttributeMember">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-                <model childrelidcntr="0x1" guid="{94b21c7e-dfd6-4f18-97d2-6441336af003}" id="id-0065-00000172" kind="Attribute" relid="0x7" role="Attribute">
-                  <name>is_coherent_write</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,760</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{9e483357-6b07-4e20-b357-efb37fcd53e3}" id="id-0067-00000381" kind="AttributeMember" referred="id-0066-00000056" relid="0x0" role="AttributeMember">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-                <reference guid="{43974de2-add7-4185-afb2-14c0c6ce5460}" id="id-0067-00000382" kind="Inherits" referred="id-0065-00000163" relid="0x8" role="Inherits">
-                  <name>Inherits</name>
-                </reference>
-              </model>
-              <model childrelidcntr="0x5" guid="{fbaae8e6-f7e9-44c0-a2d8-23c772e7e80f}" id="id-0065-00000173" kind="Object" relid="0x4" role="Object">
-                <name>Reader</name>
-                <attribute kind="InterfaceSemantics">
-                  <value>local</value>
-                </attribute>
-                <attribute kind="PostPreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="PrePreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="PrefixTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <model childrelidcntr="0x1" guid="{9c80ff59-7621-4f27-8b70-09686b72e054}" id="id-0065-00000174" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                  <name>read_last</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{9c922906-3e03-4154-bc7c-130c56a1f5fb}" id="id-0067-00000383" kind="InoutParameter" referred="id-0067-000003d5" relid="0x0" role="InoutParameter">
-                    <name>data</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{93632f7b-130a-420b-8dbb-b2ae03eda7dd}" id="id-0067-00000384" kind="InoutParameter" referred="id-0067-000003e2" relid="0x0" role="InoutParameter">
-                    <name>infos</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>160,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{10375f16-b46e-4ff3-895d-8b43cf7e4c22}" id="id-0067-00000385" kind="ExceptionRef" referred="id-0065-0000019b" relid="0x0" role="ExceptionRef">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>260,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-                <model childrelidcntr="0x1" guid="{d5f05976-af23-4514-8d05-cb38cf76944c}" id="id-0065-00000175" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                  <name>read_all</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,160</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{ea094b3f-dd2f-4827-ae5e-5e6e0144ee8c}" id="id-0067-00000386" kind="InoutParameter" referred="id-0067-000003d5" relid="0x0" role="InoutParameter">
-                    <name>data</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{b92ab869-0388-49dc-9a84-f093613a8098}" id="id-0067-00000387" kind="InoutParameter" referred="id-0067-000003e2" relid="0x0" role="InoutParameter">
-                    <name>infos</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>160,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{5debda2b-712e-4ac1-9802-7c7fddd419a3}" id="id-0067-00000388" kind="ExceptionRef" referred="id-0065-0000019b" relid="0x0" role="ExceptionRef">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>260,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-                <model childrelidcntr="0x1" guid="{962a6c2b-4d26-4297-955b-f5fe7ce399ec}" id="id-0065-00000176" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-                  <name>read_one_last</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,260</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{bf72e9ae-e767-4a3f-9b71-25d90d3347e5}" id="id-0067-00000389" kind="InoutParameter" referred="id-0066-00000034" relid="0x0" role="InoutParameter">
-                    <name>datum</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{0cbc06f2-3bd6-4dac-9375-c6fc7fb0bacc}" id="id-0067-0000038a" kind="OutParameter" referred="id-0065-00000196" relid="0x0" role="OutParameter">
-                    <name>info</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>160,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{485e3452-096b-45cd-aed9-17b92c1d2418}" id="id-0067-0000038b" kind="InParameter" referred="id-0067-000006bc" relid="0x0" role="InParameter">
-                    <name>instance_handle</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>260,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{10b9d7e0-3a2c-4373-a218-8d82a3d20af2}" id="id-0067-0000038c" kind="ExceptionRef" referred="id-0065-0000019a" relid="0x0" role="ExceptionRef">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>360,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{5b88a936-0604-4801-84a1-9af6bac59f5a}" id="id-0067-0000038d" kind="ExceptionRef" referred="id-0065-0000019b" relid="0x0" role="ExceptionRef">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>460,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-                <model childrelidcntr="0x1" guid="{9d4c9094-2e65-4998-837d-853704667ed7}" id="id-0065-00000177" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-                  <name>read_one_all</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,360</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{bef80ff6-3ee7-440a-ab11-b28cb887ba9c}" id="id-0067-0000038e" kind="InParameter" referred="id-0066-00000034" relid="0x0" role="InParameter">
-                    <name>datum</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{51e5a25b-df5e-4ac0-87e3-ec768a239f35}" id="id-0067-0000038f" kind="InoutParameter" referred="id-0067-000003d5" relid="0x0" role="InoutParameter">
-                    <name>data</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>160,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{7c0fb1d1-b030-4a03-bd3c-cdf2cd1cd5a5}" id="id-0067-00000390" kind="InoutParameter" referred="id-0067-000003e2" relid="0x0" role="InoutParameter">
-                    <name>infos</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>260,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{7e0af45b-784f-4c63-9f38-bc5b076d395e}" id="id-0067-00000391" kind="InParameter" referred="id-0067-000006bc" relid="0x0" role="InParameter">
-                    <name>instance_handle</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>360,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{05dcdca9-f31c-4606-b538-c93caf965ba2}" id="id-0067-00000392" kind="ExceptionRef" referred="id-0065-0000019a" relid="0x0" role="ExceptionRef">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>460,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{0267af8d-e264-4a6b-b8ef-93af18391f02}" id="id-0067-00000393" kind="ExceptionRef" referred="id-0065-0000019b" relid="0x0" role="ExceptionRef">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>560,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-                <model childrelidcntr="0x1" guid="{4e4d040f-210e-4478-a09c-0e616a3cbb37}" id="id-0065-00000178" kind="Attribute" relid="0x4" role="Attribute">
-                  <name>query</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,460</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{e52d1685-755d-4ad3-9983-6c33af87848e}" id="id-0067-00000394" kind="AttributeMember" referred="id-0065-00000197" relid="0x0" role="AttributeMember">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{e7510491-305f-4e28-83de-378dd549b65e}" id="id-0067-00000395" kind="SetException" referred="id-0065-0000019b" relid="0x0" role="SetException">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>160,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-              </model>
-              <model childrelidcntr="0x4" guid="{4e697921-f915-4dcc-91fc-489f76ea9a82}" id="id-0065-00000179" kind="Object" relid="0x5" role="Object">
-                <name>Getter</name>
-                <attribute kind="InterfaceSemantics">
-                  <value>local</value>
-                </attribute>
-                <attribute kind="PostPreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="PrePreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="PrefixTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <model childrelidcntr="0x1" guid="{bf64b05a-ab7e-4060-bc7c-af69eee2c826}" id="id-0065-0000017a" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                  <name>get_one</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{c5253db0-34fd-4107-966a-2a36bad3fc2b}" id="id-0067-00000396" kind="OutParameter" referred="id-0066-00000034" relid="0x0" role="OutParameter">
-                    <name>datum</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>160,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{339639f5-9e87-4fb1-931d-bb0d1b40c3e7}" id="id-0067-00000397" kind="ReturnType" referred="id-0066-00000056" relid="0x0" role="ReturnType">
-                    <name>ReturnType</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{08ee158f-0d69-4c00-bcfd-eecdf17e21c4}" id="id-0067-00000398" kind="OutParameter" referred="id-0065-00000196" relid="0x0" role="OutParameter">
-                    <name>info</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>260,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{caef1103-880d-4e62-8dc3-dbb59d376a2c}" id="id-0067-00000399" kind="ExceptionRef" referred="id-0065-0000019b" relid="0x0" role="ExceptionRef">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>360,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-                <model childrelidcntr="0x1" guid="{24b3532a-b438-49bc-a36b-40b6d0bb3e7a}" id="id-0065-0000017b" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                  <name>get_many</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,160</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{b3b72284-6df7-4267-9ed5-2733b7035e46}" id="id-0067-0000039a" kind="InoutParameter" referred="id-0067-000003d5" relid="0x0" role="InoutParameter">
-                    <name>data</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>160,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{bee572a0-8c5f-47a5-8b5a-541311ce3bdf}" id="id-0067-0000039b" kind="ReturnType" referred="id-0066-00000056" relid="0x0" role="ReturnType">
-                    <name>ReturnType</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{7a774978-975a-4ad0-9a75-f6b75fb58374}" id="id-0067-0000039c" kind="InoutParameter" referred="id-0067-000003e2" relid="0x0" role="InoutParameter">
-                    <name>infos</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>260,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{e4c3692f-190e-4f31-8e9f-00d740adb36a}" id="id-0067-0000039d" kind="ExceptionRef" referred="id-0065-0000019b" relid="0x0" role="ExceptionRef">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>360,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-                <model childrelidcntr="0x1" guid="{1e6a1ff3-f4d2-4e19-966b-d94e9d7d91db}" id="id-0065-0000017c" kind="Attribute" relid="0x2" role="Attribute">
-                  <name>time_out</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,260</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{8bb061eb-7eb2-422e-8970-0328d48c7286}" id="id-0067-0000039e" kind="AttributeMember" referred="id-0065-000001c1" relid="0x0" role="AttributeMember">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-                <model childrelidcntr="0x1" guid="{06f018e7-9d1a-49ed-acb5-f28f1b79f1c7}" id="id-0065-0000017d" kind="Attribute" relid="0x3" role="Attribute">
-                  <name>max_delivered_data</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,360</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{b689cc61-d959-414b-9307-709982762a1d}" id="id-0067-0000039f" kind="AttributeMember" referred="id-0067-000003e3" relid="0x0" role="AttributeMember">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-              </model>
-              <model childrelidcntr="0x2" guid="{6250051f-0f23-46a4-84b2-6b44fc5782db}" id="id-0065-0000017e" kind="Object" relid="0x6" role="Object">
-                <name>Listener</name>
-                <attribute kind="InterfaceSemantics">
-                  <value>local</value>
-                </attribute>
-                <attribute kind="PostPreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="PrePreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="PrefixTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <model childrelidcntr="0x1" guid="{ccd1e971-4e02-49f3-ae51-fd2cc9c351ed}" id="id-0065-0000017f" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                  <name>on_one_data</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{7a78080c-3b7c-46e2-8cbc-f5bd78abdb0e}" id="id-0067-000003a0" kind="InParameter" referred="id-0066-00000034" relid="0x0" role="InParameter">
-                    <name>datum</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{41dcc038-4baa-45af-b5ff-e2ca817eb149}" id="id-0067-000003a1" kind="InParameter" referred="id-0065-00000196" relid="0x0" role="InParameter">
-                    <name>info</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>160,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-                <model childrelidcntr="0x1" guid="{21fbe98c-805b-41dc-a052-c2e5b6bce679}" id="id-0065-00000180" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                  <name>on_many_data</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,160</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{dbfd6cdc-9219-4b29-bb1a-e91da13dc31a}" id="id-0067-000003a2" kind="InParameter" referred="id-0067-000003d5" relid="0x0" role="InParameter">
-                    <name>data</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{84537cd4-be78-4b29-9e66-98e28837a6ea}" id="id-0067-000003a3" kind="InParameter" referred="id-0067-000003e2" relid="0x0" role="InParameter">
-                    <name>infos</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>160,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-              </model>
-              <model childrelidcntr="0x4" guid="{25604677-e315-48da-a2b8-1b382b98f532}" id="id-0065-00000181" kind="Object" relid="0x7" role="Object">
-                <name>StateListener</name>
-                <attribute kind="InterfaceSemantics">
-                  <value>local</value>
-                </attribute>
-                <attribute kind="PostPreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="PrePreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="PrefixTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <model childrelidcntr="0x1" guid="{028d00f7-5b8e-461b-8284-98e662135fe4}" id="id-0065-00000182" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                  <name>on_creation</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{e4c1f87d-4c5c-4a5d-8ebc-a93908c6e7a5}" id="id-0067-000003a4" kind="InParameter" referred="id-0066-00000034" relid="0x0" role="InParameter">
-                    <name>datum</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{ca1a067d-37e4-4f0b-8a49-529b420f6ee9}" id="id-0067-000003a5" kind="InParameter" referred="id-0065-00000196" relid="0x0" role="InParameter">
-                    <name>info</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>160,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-                <model childrelidcntr="0x1" guid="{de2eea24-bfb6-4b50-a248-71049b862d6f}" id="id-0065-00000183" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                  <name>on_one_update</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,160</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{cb2395ef-477c-44c6-92b1-91c2b4b223f7}" id="id-0067-000003a6" kind="InParameter" referred="id-0066-00000034" relid="0x0" role="InParameter">
-                    <name>datum</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{57b4b0a1-44c5-41d2-aca7-a2f50070eead}" id="id-0067-000003a7" kind="InParameter" referred="id-0065-00000196" relid="0x0" role="InParameter">
-                    <name>info</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>160,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-                <model childrelidcntr="0x1" guid="{cf530e97-b8da-4cd7-aa64-1361f9f7054e}" id="id-0065-00000184" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-                  <name>on_many_updates</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,260</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{c7fcbef5-e941-4acb-8abd-3d5a8395e6fb}" id="id-0067-000003a8" kind="InParameter" referred="id-0067-000003d5" relid="0x0" role="InParameter">
-                    <name>data</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{76d2a292-1e27-47f0-b329-db0d1c3d7d63}" id="id-0067-000003a9" kind="InParameter" referred="id-0067-000003e2" relid="0x0" role="InParameter">
-                    <name>infos</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>160,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-                <model childrelidcntr="0x1" guid="{d013b562-3c78-426d-bce0-b6b180150028}" id="id-0065-00000185" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-                  <name>on_deletion</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,360</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{65ac5876-8892-407c-accf-fd563e016a58}" id="id-0067-000003aa" kind="InParameter" referred="id-0066-00000034" relid="0x0" role="InParameter">
-                    <name>datum</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{3602e7ae-be1e-4ba2-b7a0-2cdad7239406}" id="id-0067-000003ab" kind="InParameter" referred="id-0065-00000196" relid="0x0" role="InParameter">
-                    <name>info</name>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>160,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-              </model>
-              <model childrelidcntr="0x1" guid="{bf7f6820-3670-48c1-a350-fe275461d999}" id="id-0065-00000186" kind="PortType" relid="0x8" role="PortType">
-                <name>DDS_Write</name>
-                <attribute kind="PostPreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="PrePreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{cbd3c158-008a-494f-ae24-f5f3666759b9}" id="id-0067-000003ac" kind="RequiredRequestPort" referred="id-0065-00000166" relid="0x0" role="RequiredRequestPort">
-                  <name>data</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="exclusiveProvider" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="exclusiveUser" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="multiple_connections">
-                    <value>true</value>
-                  </attribute>
-                  <attribute kind="optional" status="meta">
-                    <value>false</value>
-                  </attribute>
-                </reference>
-                <reference guid="{b8a368fc-cdb8-4419-9284-e9f121fd368c}" id="id-0067-000003ad" kind="RequiredRequestPort" referred="id-0065-000001ec" relid="0x0" role="RequiredRequestPort">
-                  <name>dds_entity</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,160</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="exclusiveProvider" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="exclusiveUser" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="multiple_connections">
-                    <value>true</value>
-                  </attribute>
-                  <attribute kind="optional" status="meta">
-                    <value>false</value>
-                  </attribute>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{619861da-4c85-4e91-b5fb-93ecabbb6911}" id="id-0065-00000187" kind="PortType" relid="0x9" role="PortType">
-                <name>DDS_Update</name>
-                <attribute kind="PostPreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="PrePreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{6334db56-7834-4a77-9551-8e78c0fb870c}" id="id-0067-000003ae" kind="RequiredRequestPort" referred="id-0065-0000016a" relid="0x0" role="RequiredRequestPort">
-                  <name>data</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="exclusiveProvider" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="exclusiveUser" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="multiple_connections">
-                    <value>true</value>
-                  </attribute>
-                  <attribute kind="optional" status="meta">
-                    <value>false</value>
-                  </attribute>
-                </reference>
-                <reference guid="{3b2998ec-5de6-45bb-8c02-39d49bceee9d}" id="id-0067-000003af" kind="RequiredRequestPort" referred="id-0065-000001ec" relid="0x0" role="RequiredRequestPort">
-                  <name>dds_entity</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,160</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="exclusiveProvider" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="exclusiveUser" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="multiple_connections">
-                    <value>true</value>
-                  </attribute>
-                  <attribute kind="optional" status="meta">
-                    <value>false</value>
-                  </attribute>
-                </reference>
-              </model>
-              <model childrelidcntr="0x2" guid="{3dddee43-c914-43c0-810a-ebcc47971a9d}" id="id-0065-00000188" kind="PortType" relid="0xa" role="PortType">
-                <name>DDS_Read</name>
-                <attribute kind="PostPreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="PrePreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <model childrelidcntr="0x1" guid="{5bf211cb-da7e-481a-a999-bc5c6c65993c}" id="id-0065-00000189" kind="Attribute" relid="0x0" role="Attribute">
-                  <name>filter</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,360</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{aaf5cbf1-3594-4a38-b409-95bb4ad994ad}" id="id-0067-000003b0" kind="AttributeMember" referred="id-0065-00000197" relid="0x0" role="AttributeMember">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{e4350f70-6dce-4fd6-a3ef-6b5df46e16fe}" id="id-0067-000003b1" kind="SetException" referred="id-0065-0000019c" relid="0x0" role="SetException">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>160,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-                <reference guid="{4812a509-ba1f-4611-aa3b-1d20d3315187}" id="id-0067-000003b2" kind="RequiredRequestPort" referred="id-0065-00000173" relid="0x0" role="RequiredRequestPort">
-                  <name>data</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="exclusiveProvider" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="exclusiveUser" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="multiple_connections">
-                    <value>true</value>
-                  </attribute>
-                  <attribute kind="optional" status="meta">
-                    <value>false</value>
-                  </attribute>
-                </reference>
-                <reference guid="{1525c918-c01b-482f-a278-b466237da990}" id="id-0067-000003b3" kind="RequiredRequestPort" referred="id-0065-000001fb" relid="0x0" role="RequiredRequestPort">
-                  <name>dds_entity</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,160</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="exclusiveProvider" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="exclusiveUser" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="multiple_connections">
-                    <value>true</value>
-                  </attribute>
-                  <attribute kind="optional" status="meta">
-                    <value>false</value>
-                  </attribute>
-                </reference>
-                <reference guid="{96e30ab7-5c98-41ab-ae48-48d3c443c5e1}" id="id-0067-000003b4" kind="ProvidedRequestPort" referred="id-0065-000001b7" relid="0x0" role="ProvidedRequestPort">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,260</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="exclusiveProvider" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="exclusiveUser" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="optional" status="meta">
-                    <value>false</value>
-                  </attribute>
-                </reference>
-                <reference guid="{bb4a7c18-32e6-4393-b5ad-cbbdc1af1d08}" id="id-0067-000003b5" kind="RequiredRequestPort" referred="id-0065-0000019d" relid="0x1" role="RequiredRequestPort">
-                  <name>filter_config</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,460</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="exclusiveProvider" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="exclusiveUser" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="multiple_connections">
-                    <value>true</value>
-                  </attribute>
-                  <attribute kind="optional" status="meta">
-                    <value>false</value>
-                  </attribute>
-                </reference>
-              </model>
-              <model childrelidcntr="0x2" guid="{eec68a9a-758a-45d3-833f-c088cb078876}" id="id-0065-0000018a" kind="PortType" relid="0xb" role="PortType">
-                <name>DDS_Get</name>
-                <attribute kind="PostPreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="PrePreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <model childrelidcntr="0x1" guid="{0f78654e-eb44-499d-9350-0839b4e63858}" id="id-0065-0000018b" kind="Attribute" relid="0x0" role="Attribute">
-                  <name>filter</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,460</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{b0f3941f-2b7b-4b50-89bc-c464e1075e64}" id="id-0067-000003b6" kind="AttributeMember" referred="id-0065-00000197" relid="0x0" role="AttributeMember">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{af5c09aa-0e28-4795-b9ea-3279f4ed9630}" id="id-0067-000003b7" kind="SetException" referred="id-0065-0000019c" relid="0x0" role="SetException">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>160,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-                <reference guid="{5e75a6e7-bfbe-4d84-ac64-bbbdb4597a3a}" id="id-0067-000003b8" kind="RequiredRequestPort" referred="id-0065-00000173" relid="0x0" role="RequiredRequestPort">
-                  <name>data</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="exclusiveProvider" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="exclusiveUser" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="multiple_connections">
-                    <value>true</value>
-                  </attribute>
-                  <attribute kind="optional" status="meta">
-                    <value>false</value>
-                  </attribute>
-                </reference>
-                <reference guid="{7f9aae18-cc60-49ac-9c64-e8677dc82db1}" id="id-0067-000003b9" kind="RequiredRequestPort" referred="id-0065-00000179" relid="0x0" role="RequiredRequestPort">
-                  <name>fresh_data</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,160</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="exclusiveProvider" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="exclusiveUser" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="multiple_connections">
-                    <value>true</value>
-                  </attribute>
-                  <attribute kind="optional" status="meta">
-                    <value>false</value>
-                  </attribute>
-                </reference>
-                <reference guid="{e04cbec6-6cd6-4218-990f-a887e7c3d456}" id="id-0067-000003ba" kind="RequiredRequestPort" referred="id-0065-000001fb" relid="0x0" role="RequiredRequestPort">
-                  <name>dds_entity</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,260</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="exclusiveProvider" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="exclusiveUser" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="multiple_connections">
-                    <value>true</value>
-                  </attribute>
-                  <attribute kind="optional" status="meta">
-                    <value>false</value>
-                  </attribute>
-                </reference>
-                <reference guid="{76519d1d-5f12-44f2-bb37-44aef358bf08}" id="id-0067-000003bb" kind="ProvidedRequestPort" referred="id-0065-000001b7" relid="0x0" role="ProvidedRequestPort">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,360</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="exclusiveProvider" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="exclusiveUser" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="optional" status="meta">
-                    <value>false</value>
-                  </attribute>
-                </reference>
-                <reference guid="{ac904120-1317-4dbb-b291-8fe317fa5f13}" id="id-0067-000003bc" kind="RequiredRequestPort" referred="id-0065-0000019d" relid="0x1" role="RequiredRequestPort">
-                  <name>filter_config</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,560</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="exclusiveProvider" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="exclusiveUser" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="multiple_connections">
-                    <value>true</value>
-                  </attribute>
-                  <attribute kind="optional" status="meta">
-                    <value>false</value>
-                  </attribute>
-                </reference>
-              </model>
-              <model childrelidcntr="0x2" guid="{aea302e1-40ee-45b5-91e4-5b78deb209e5}" id="id-0065-0000018c" kind="PortType" relid="0xc" role="PortType">
-                <name>DDS_Listen</name>
-                <attribute kind="PostPreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="PrePreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <model childrelidcntr="0x1" guid="{3266e8d4-569a-479c-b9a8-9cc5b04e4f0c}" id="id-0065-0000018d" kind="Attribute" relid="0x0" role="Attribute">
-                  <name>filter</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,560</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{c71df672-bb1c-4913-8ed6-e0ddafb2d3bd}" id="id-0067-000003bd" kind="AttributeMember" referred="id-0065-00000197" relid="0x0" role="AttributeMember">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{106b5a2c-d7e6-4cea-9a93-df7bd5ce260d}" id="id-0067-000003be" kind="SetException" referred="id-0065-0000019c" relid="0x0" role="SetException">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>160,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-                <reference guid="{61e2a992-3538-4606-a1d1-24a25f88ca5d}" id="id-0067-000003bf" kind="RequiredRequestPort" referred="id-0065-00000173" relid="0x0" role="RequiredRequestPort">
-                  <name>data</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="exclusiveProvider" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="exclusiveUser" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="multiple_connections">
-                    <value>true</value>
-                  </attribute>
-                  <attribute kind="optional" status="meta">
-                    <value>false</value>
-                  </attribute>
-                </reference>
-                <reference guid="{394c2257-6520-4469-92e3-8d0f4f74fc01}" id="id-0067-000003c0" kind="ProvidedRequestPort" referred="id-0065-0000017e" relid="0x0" role="ProvidedRequestPort">
-                  <name>data_listener</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,260</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="exclusiveProvider" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="exclusiveUser" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="optional" status="meta">
-                    <value>false</value>
-                  </attribute>
-                </reference>
-                <reference guid="{a1c754a8-c82b-44ad-b713-92e20eec5675}" id="id-0067-000003c1" kind="RequiredRequestPort" referred="id-0065-000001b2" relid="0x0" role="RequiredRequestPort">
-                  <name>data_control</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,160</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="exclusiveProvider" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="exclusiveUser" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="multiple_connections">
-                    <value>true</value>
-                  </attribute>
-                  <attribute kind="optional" status="meta">
-                    <value>false</value>
-                  </attribute>
-                </reference>
-                <reference guid="{a79437df-5339-40f8-854b-b46af2edaa40}" id="id-0067-000003c2" kind="RequiredRequestPort" referred="id-0065-000001fb" relid="0x0" role="RequiredRequestPort">
-                  <name>dds_entity</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,360</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="exclusiveProvider" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="exclusiveUser" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="multiple_connections">
-                    <value>true</value>
-                  </attribute>
-                  <attribute kind="optional" status="meta">
-                    <value>false</value>
-                  </attribute>
-                </reference>
-                <reference guid="{6c42a3a9-66e9-4e7c-9b8d-e9134cbc6f56}" id="id-0067-000003c3" kind="ProvidedRequestPort" referred="id-0065-000001b7" relid="0x0" role="ProvidedRequestPort">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,460</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="exclusiveProvider" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="exclusiveUser" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="optional" status="meta">
-                    <value>false</value>
-                  </attribute>
-                </reference>
-                <reference guid="{3833a4bb-b7ac-4a39-aa65-c4c0e8bd36a3}" id="id-0067-000003c4" kind="RequiredRequestPort" referred="id-0065-0000019d" relid="0x1" role="RequiredRequestPort">
-                  <name>filter_config</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,660</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="exclusiveProvider" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="exclusiveUser" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="multiple_connections">
-                    <value>true</value>
-                  </attribute>
-                  <attribute kind="optional" status="meta">
-                    <value>false</value>
-                  </attribute>
-                </reference>
-              </model>
-              <model childrelidcntr="0x2" guid="{824566cf-5c31-4bc4-b7f0-08f3e194df43}" id="id-0065-0000018e" kind="PortType" relid="0xd" role="PortType">
-                <name>DDS_StateListen</name>
-                <attribute kind="PostPreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="PrePreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <model childrelidcntr="0x1" guid="{8037acb0-12ad-40b1-94bb-69c1bee6b6b9}" id="id-0065-0000018f" kind="Attribute" relid="0x0" role="Attribute">
-                  <name>filter</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,560</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <reference guid="{6b8ae559-da9a-4a03-95b7-fcc3996051dc}" id="id-0067-000003c5" kind="AttributeMember" referred="id-0065-00000197" relid="0x0" role="AttributeMember">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>60,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                  <reference guid="{eed9c788-7b5a-4c1f-9795-21704f2d8d96}" id="id-0067-000003c6" kind="SetException" referred="id-0065-0000019c" relid="0x0" role="SetException">
-                    <name/>
-                    <regnode isopaque="yes" name="PartRegs">
-                      <value/>
-                      <regnode isopaque="yes" name="InterfaceDefinition">
-                        <value/>
-                        <regnode isopaque="yes" name="Position">
-                          <value>160,60</value>
-                        </regnode>
-                      </regnode>
-                    </regnode>
-                  </reference>
-                </model>
-                <reference guid="{c6ee3ff0-c5b4-4ef5-990a-4c47dcc5b655}" id="id-0067-000003c7" kind="RequiredRequestPort" referred="id-0065-00000173" relid="0x0" role="RequiredRequestPort">
-                  <name>data</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="exclusiveProvider" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="exclusiveUser" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="multiple_connections">
-                    <value>true</value>
-                  </attribute>
-                  <attribute kind="optional" status="meta">
-                    <value>false</value>
-                  </attribute>
-                </reference>
-                <reference guid="{b7888fd0-b0c0-4ca4-8013-70d865278be2}" id="id-0067-000003c8" kind="ProvidedRequestPort" referred="id-0065-00000181" relid="0x0" role="ProvidedRequestPort">
-                  <name>data_listener</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,260</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="exclusiveProvider" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="exclusiveUser" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="optional" status="meta">
-                    <value>false</value>
-                  </attribute>
-                </reference>
-                <reference guid="{11b899d0-7064-4e27-b20e-b8a5e24f3548}" id="id-0067-000003c9" kind="RequiredRequestPort" referred="id-0065-000001bc" relid="0x0" role="RequiredRequestPort">
-                  <name>data_control</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,160</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="exclusiveProvider" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="exclusiveUser" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="multiple_connections">
-                    <value>true</value>
-                  </attribute>
-                  <attribute kind="optional" status="meta">
-                    <value>false</value>
-                  </attribute>
-                </reference>
-                <reference guid="{e3f7233f-8283-4539-9f9d-df4eac67aafe}" id="id-0067-000003ca" kind="RequiredRequestPort" referred="id-0065-000001fb" relid="0x0" role="RequiredRequestPort">
-                  <name>dds_entity</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,360</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="exclusiveProvider" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="exclusiveUser" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="multiple_connections">
-                    <value>true</value>
-                  </attribute>
-                  <attribute kind="optional" status="meta">
-                    <value>false</value>
-                  </attribute>
-                </reference>
-                <reference guid="{6b1da435-fdcc-4081-a454-a6e227c098b3}" id="id-0067-000003cb" kind="ProvidedRequestPort" referred="id-0065-000001b7" relid="0x0" role="ProvidedRequestPort">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,460</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="exclusiveProvider" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="exclusiveUser" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="optional" status="meta">
-                    <value>false</value>
-                  </attribute>
-                </reference>
-                <reference guid="{b462f37c-4f66-4b08-84a6-59c2abe46a4a}" id="id-0067-000003cc" kind="RequiredRequestPort" referred="id-0065-0000019d" relid="0x1" role="RequiredRequestPort">
-                  <name>filter_config</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,660</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                  <attribute kind="SpecifyIdTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="VersionTag" status="meta">
-                    <value/>
-                  </attribute>
-                  <attribute kind="exclusiveProvider" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="exclusiveUser" status="meta">
-                    <value>false</value>
-                  </attribute>
-                  <attribute kind="multiple_connections">
-                    <value>true</value>
-                  </attribute>
-                  <attribute kind="optional" status="meta">
-                    <value>false</value>
-                  </attribute>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{9ba0875d-02f6-46a4-b15c-0ec933b459e0}" id="id-0065-00000190" kind="ConnectorObject" relid="0xe" role="ConnectorObject">
-                <name>DDS_State</name>
-                <attribute kind="PostPreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="PrePreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="UUID">
-                  <value>C61798A6-7C26-11DF-8000-000C2958D27B</value>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{f37bfb4b-b88a-4815-94f7-8cd699d13e8c}" id="id-0067-000003cd" kind="MirrorPort" referred="id-0065-00000187" relid="0x0" role="MirrorPort">
-                  <name>observable</name>
-                </reference>
-                <reference guid="{e09832c6-f7fb-436c-91fb-b89d677a9261}" id="id-0067-000003ce" kind="MirrorPort" referred="id-0065-00000188" relid="0x0" role="MirrorPort">
-                  <name>passive_observer</name>
-                </reference>
-                <reference guid="{f8de4b83-cc7c-45f7-aa09-c444b91f1945}" id="id-0067-000003cf" kind="MirrorPort" referred="id-0065-0000018a" relid="0x0" role="MirrorPort">
-                  <name>pull_observer</name>
-                </reference>
-                <reference guid="{fec38694-fe28-4669-be83-d7142ece8d92}" id="id-0067-000003d0" kind="MirrorPort" referred="id-0065-0000018c" relid="0x0" role="MirrorPort">
-                  <name>push_observer</name>
-                </reference>
-                <reference guid="{85a0a8e1-d5b2-4c4f-8363-ae8abcd39b00}" id="id-0067-000003d1" kind="MirrorPort" referred="id-0065-0000018e" relid="0x0" role="MirrorPort">
-                  <name>push_state_observer</name>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{a748a69a-9c98-4a2e-ae64-c98b9f684f0d}" id="id-0065-00000191" kind="ConnectorObject" relid="0xf" role="ConnectorObject">
-                <name>DDS_Event</name>
-                <attribute kind="PostPreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="PrePreprocessorDirectives" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="UUID">
-                  <value>C61798A6-7C26-11DF-8001-000C2958D27B</value>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{97bf7da7-c669-4858-84bd-a5e0d55f03c9}" id="id-0067-000003d2" kind="MirrorPort" referred="id-0065-00000186" relid="0x0" role="MirrorPort">
-                  <name>supplier</name>
-                </reference>
-                <reference guid="{a9eda479-9be6-4d13-bfe1-d48d8793a55b}" id="id-0067-000003d3" kind="MirrorPort" referred="id-0065-0000018a" relid="0x0" role="MirrorPort">
-                  <name>pull_consumer</name>
-                </reference>
-                <reference guid="{ac9efffe-2746-401f-8e5f-d87a31348854}" id="id-0067-000003d4" kind="MirrorPort" referred="id-0065-0000018c" relid="0x0" role="MirrorPort">
-                  <name>push_consumer</name>
-                </reference>
-              </model>
-              <atom guid="{f7eae334-9a8a-46fa-859b-a1306b0f717c}" id="id-0066-00000034" kind="NameParameter" relid="0x0" role="NameParameter">
-                <name>T</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="TemplateParameters">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-              <reference guid="{4a4d7fb8-c4c9-4bce-934f-302e9df8fa56}" id="id-0067-000003d5" kind="CollectionParameter" referred="id-0066-00000034" relid="0x1" role="CollectionParameter">
-                <name>TSeq</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="TemplateParameters">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-          </model>
-        </model>
-        <model childrelidcntr="0x1" guid="{efa14826-304a-4575-8733-94aaa271dfd6}" id="id-0065-00000192" kind="File" relid="0x1">
-          <name>dds4ccm_Base</name>
-          <attribute kind="Path">
-            <value>connectors/dds4ccm/idl</value>
-          </attribute>
-          <attribute kind="PostPreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrePreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrefixTag" status="meta">
-            <value/>
-          </attribute>
-          <model childrelidcntr="0xa" guid="{4591f46e-5f2b-484f-a218-955942cb37ea}" id="id-0065-00000193" kind="Package" relid="0x0" role="Package">
-            <name>CCM_DDS</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrefixTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <model childrelidcntr="0x2" guid="{8e40374e-5636-44e4-b1c5-8b9582a20307}" id="id-0065-00000194" kind="Enum" relid="0x0" role="Enum">
-              <name>AccessStatus</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <atom guid="{56069827-6a1a-40dc-be8d-25077dd54f1d}" id="id-0066-00000035" kind="EnumValue" relid="0x0" role="EnumValue">
-                <name>FRESH_INFO</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-              <atom guid="{b3796768-7a7a-4e15-83f0-f7771da88f6b}" id="id-0066-00000036" kind="EnumValue" relid="0x1" role="EnumValue">
-                <name>ALREADY_SEEN</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-            </model>
-            <model childrelidcntr="0x5" guid="{dea334c6-b3b5-4676-97a4-897ea6fe6f79}" id="id-0065-00000195" kind="Enum" relid="0x1" role="Enum">
-              <name>InstanceStatus</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <atom guid="{8b04876e-8fed-4a1e-ac7a-416ccd590f7a}" id="id-0066-00000037" kind="EnumValue" relid="0x0" role="EnumValue">
-                <name>INSTANCE_CREATED</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-              <atom guid="{3fe5e3c0-9b4c-4120-95b8-1a04abedbb8f}" id="id-0066-00000038" kind="EnumValue" relid="0x1" role="EnumValue">
-                <name>INSTANCE_FILTERED_IN</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-              <atom guid="{ae72f4b8-1e2a-4dbe-af7a-63d6ea4db75d}" id="id-0066-00000039" kind="EnumValue" relid="0x2" role="EnumValue">
-                <name>INSTANCE_UPDATED</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-              <atom guid="{a683b070-f079-4d71-a397-02f96217692d}" id="id-0066-0000003a" kind="EnumValue" relid="0x3" role="EnumValue">
-                <name>INSTANCE_FILTERED_OUT</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-              <atom guid="{096fd7f6-203b-4001-ac47-8e5beafc141c}" id="id-0066-0000003b" kind="EnumValue" relid="0x4" role="EnumValue">
-                <name>INSTANCE_DELETED</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-            </model>
-            <model childrelidcntr="0x1" guid="{f0154a87-3f3a-40e5-86ca-9b2391830453}" id="id-0065-00000196" kind="Aggregate" relid="0x2" role="Aggregate">
-              <name>ReadInfo</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{d9028ef2-afdc-4373-8888-a8b497a5c11a}" id="id-0067-000003d6" kind="Member" referred="id-0065-00000194" relid="0x0" role="Member">
-                <name>access_status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{a5d48ef3-faf3-45b2-ba9e-53dc324eab36}" id="id-0067-000003d7" kind="Member" referred="id-0065-00000195" relid="0x0" role="Member">
-                <name>instance_status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{6c2866c9-c87c-4407-ab26-4766db5a4901}" id="id-0067-000003d8" kind="Member" referred="id-0067-000006bc" relid="0x0" role="Member">
-                <name>instance_handle</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{df90510b-d2e5-4813-95a8-8bb0d03fb27f}" id="id-0067-000003d9" kind="Member" referred="id-0065-000001c2" relid="0x0" role="Member">
-                <name>source_timestamp</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{0361de1d-4c0e-4a9d-a52b-a1ce50fb2994}" id="id-0065-00000197" kind="Aggregate" relid="0x3" role="Aggregate">
-              <name>QueryFilter</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{ec7a4b7b-1534-4911-927a-856d030d3486}" id="id-0067-000003da" kind="Member" referred="id-0066-00000066" relid="0x0" role="Member">
-                <name>expression</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{fae65ed4-c5fc-42b8-a3bc-09fb7b14c4f1}" id="id-0067-000003db" kind="Member" referred="id-0067-00000655" relid="0x0" role="Member">
-                <name>parameters</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x3" guid="{65805011-4422-4420-a30d-c077f21e0757}" id="id-0065-00000198" kind="Enum" relid="0x4" role="Enum">
-              <name>ListenerMode</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <atom guid="{9f0cb3a2-eaf5-4e36-a2c2-3cddd6efba01}" id="id-0066-0000003c" kind="EnumValue" relid="0x0" role="EnumValue">
-                <name>NOT_ENABLED</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-              <atom guid="{e0d9ffaf-1236-40bd-96d6-6378d3c1c763}" id="id-0066-0000003d" kind="EnumValue" relid="0x1" role="EnumValue">
-                <name>ONE_BY_ONE</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-              <atom guid="{86aa0e66-ffc2-4fc1-a48d-19bb13bdb106}" id="id-0066-0000003e" kind="EnumValue" relid="0x2" role="EnumValue">
-                <name>MANY_BY_MANY</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-            </model>
-            <model childrelidcntr="0x1" guid="{3efaef2a-246b-4597-8332-e21a55903433}" id="id-0065-00000199" kind="Exception" relid="0x5" role="Exception">
-              <name>AlreadyCreated</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{451b5926-5f07-4742-ab1e-75050787ab46}" id="id-0067-000003dc" kind="Member" referred="id-0067-000003e4" relid="0x0" role="Member">
-                <name>indexes</name>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{8b15e311-1ddc-4f0f-9542-3532990fe642}" id="id-0065-0000019a" kind="Exception" relid="0x6" role="Exception">
-              <name>NonExistent</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{73592d82-e3ff-4933-983a-d97298f6de1c}" id="id-0067-000003dd" kind="Member" referred="id-0067-000003e4" relid="0x0" role="Member">
-                <name>indexes</name>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{2acfcd50-3fae-47a3-8fef-cb659f920f4a}" id="id-0065-0000019b" kind="Exception" relid="0x7" role="Exception">
-              <name>InternalError</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{f78229fc-61d5-4fd3-a9a2-5a9cba818528}" id="id-0067-000003de" kind="Member" referred="id-0067-000003e3" relid="0x0" role="Member">
-                <name>index</name>
-              </reference>
-              <reference guid="{4730d586-61aa-4f85-b670-e8271bfd2931}" id="id-0067-000003df" kind="Member" referred="id-0067-00000653" relid="0x0" role="Member">
-                <name>error_code</name>
-              </reference>
-            </model>
-            <model childrelidcntr="0x0" guid="{dab7a9cd-b69c-4cf3-ac7e-599d6ecb5ff1}" id="id-0065-0000019c" kind="Exception" relid="0x8" role="Exception">
-              <name>NonChangeable</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-            </model>
-            <model childrelidcntr="0x1" guid="{db1f229a-c7d8-4b0a-8ba5-18dd8c151409}" id="id-0065-0000019d" kind="Object" relid="0x9" role="Object">
-              <name>ContentFilterSetting</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{0f5be5ce-59fc-4b43-9379-00bfa3b1c732}" id="id-0065-0000019e" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>set_filter_parameters</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{fa19a987-a133-40e6-b6f0-47ec09d31075}" id="id-0067-000003e0" kind="ExceptionRef" referred="id-0065-0000019b" relid="0x0" role="ExceptionRef">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{b7f67965-829b-430e-8998-f274bff8993b}" id="id-0067-000003e1" kind="InParameter" referred="id-0067-00000655" relid="0x0" role="InParameter">
-                  <name>parameters</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-            </model>
-            <reference guid="{18679629-7b2e-42c7-ba12-ee4d4f0c3111}" id="id-0067-000003e2" kind="Collection" referred="id-0065-00000196" relid="0x3" role="Collection">
-              <name>ReadInfoSeq</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="bound" status="meta">
-                <value/>
-              </attribute>
-            </reference>
-            <reference guid="{ebc3aec5-b0aa-4ea9-9a6f-63fb408599e7}" id="id-0067-000003e3" kind="Alias" referred="id-0066-0000005e" relid="0x0" role="Alias">
-              <name>DataNumber_t</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-            </reference>
-            <reference guid="{8becee46-56cf-4276-9592-0da89f0c64b0}" id="id-0067-000003e4" kind="Collection" referred="id-0067-000003e3" relid="0x0" role="Collection">
-              <name>DataNumberSeq</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="bound" status="meta">
-                <value/>
-              </attribute>
-            </reference>
-            <reference guid="{91bde20c-4789-4717-9d53-80b7beb0491a}" id="id-0067-000003e5" kind="Constant" referred="id-0066-0000005e" relid="0x0" role="Constant">
-              <name>UNLIMITED</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>0</value>
-              </attribute>
-            </reference>
-          </model>
-        </model>
-        <model childrelidcntr="0x1" guid="{829aaff6-dcd8-4f11-827b-7d212e9a904b}" id="id-0065-0000019f" kind="File" relid="0x3">
-          <name>dds4ccm_Connector</name>
-          <attribute kind="Path">
-            <value>connectors/dds4ccm/idl</value>
-          </attribute>
-          <attribute kind="PostPreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrePreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrefixTag" status="meta">
-            <value/>
-          </attribute>
-          <model childrelidcntr="0x2" guid="{cd22e550-5212-470e-a781-7bb0ff31444f}" id="id-0065-000001a0" kind="Package" relid="0x0" role="Package">
-            <name>CCM_DDS</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrefixTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <model childrelidcntr="0x2" guid="{b29cc787-8b26-4d1b-9b29-d80ec94e1613}" id="id-0065-000001a1" kind="ConnectorObject" relid="0x0" role="ConnectorObject">
-              <name>DDS_Base</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="UUID">
-                <value>C61798A6-7C26-11DF-8002-000C2958D27B</value>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{93fde27e-0d57-4d0e-8200-f5236f0e8dd4}" id="id-0065-000001a2" kind="Attribute" relid="0x0" role="Attribute">
-                <name>domain_id</name>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{b3efb2e0-0e56-4b69-a959-99b4768435a8}" id="id-0067-000003e6" kind="SetException" referred="id-0065-0000019c" relid="0x0" role="SetException">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{0118c12e-990e-4960-a783-f07bf3baa3b3}" id="id-0067-000003e7" kind="AttributeMember" referred="id-0067-00000652" relid="0x0" role="AttributeMember">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{41269dd5-2c55-459c-9016-7fed7a1052fb}" id="id-0065-000001a3" kind="Attribute" relid="0x1" role="Attribute">
-                <name>qos_profile</name>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{e2f5b0fc-ccb0-4ad8-9844-98230252382c}" id="id-0067-000003e8" kind="SetException" referred="id-0065-0000019c" relid="0x0" role="SetException">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{70efda93-3154-472d-8f61-921da307c5b9}" id="id-0067-000003e9" kind="AttributeMember" referred="id-0066-00000066" relid="0x0" role="AttributeMember">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <reference guid="{9eaa85f3-f263-4b31-9982-c0f9092ea95c}" id="id-0067-000003ea" kind="RequiredRequestPort" referred="id-0065-000001a9" relid="0x0" role="RequiredRequestPort">
-                <name>error_listener</name>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="exclusiveProvider" status="meta">
-                  <value>false</value>
-                </attribute>
-                <attribute kind="exclusiveUser" status="meta">
-                  <value>false</value>
-                </attribute>
-                <attribute kind="multiple_connections">
-                  <value>true</value>
-                </attribute>
-                <attribute kind="optional" status="meta">
-                  <value>false</value>
-                </attribute>
-              </reference>
-            </model>
-            <model childrelidcntr="0x2" guid="{929df5a6-7abe-4e80-854e-d7eb0e88a1a1}" id="id-0065-000001a4" kind="ConnectorObject" relid="0x1" role="ConnectorObject">
-              <name>DDS_TopicBase</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="UUID">
-                <value>C61798A6-7C26-11DF-8003-000C2958D27B</value>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{ad843b0c-e8eb-4ed6-b132-436f53ff200b}" id="id-0065-000001a5" kind="Attribute" relid="0x0" role="Attribute">
-                <name>topic_name</name>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{a5efd038-e5a5-49b1-8ea2-8db89abe9df8}" id="id-0067-000003eb" kind="SetException" referred="id-0065-0000019c" relid="0x0" role="SetException">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{d6f8da99-e195-4c2f-bebf-8a3ddeb926ac}" id="id-0067-000003ec" kind="AttributeMember" referred="id-0066-00000066" relid="0x0" role="AttributeMember">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{c8f93226-f80b-4012-af94-2bf47910895c}" id="id-0065-000001a6" kind="Attribute" relid="0x1" role="Attribute">
-                <name>key_fields</name>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{79cecbcd-2c05-49ff-a801-658b232ceecd}" id="id-0067-000003ed" kind="SetException" referred="id-0065-0000019c" relid="0x0" role="SetException">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{bbb0cd1e-b990-4ae0-b1a0-625c26dfb166}" id="id-0067-000003ee" kind="AttributeMember" referred="id-0067-00000655" relid="0x0" role="AttributeMember">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-            </model>
-          </model>
-        </model>
-        <model childrelidcntr="0x1" guid="{f6ec2990-716f-4726-bd1a-49dce16c903e}" id="id-0065-000001a7" kind="File" relid="0x5">
-          <name>dds4ccm_ConnectorStatusListener</name>
-          <attribute kind="Path">
-            <value>connectors/dds4ccm/idl</value>
-          </attribute>
-          <attribute kind="PostPreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrePreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrefixTag" status="meta">
-            <value/>
-          </attribute>
-          <model childrelidcntr="0x1" guid="{633dfb10-2b6b-45bb-8d08-638ab70494bd}" id="id-0065-000001a8" kind="Package" relid="0x0" role="Package">
-            <name>CCM_DDS</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrefixTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <model childrelidcntr="0x6" guid="{da8dd74e-a925-4f3e-a1fa-cac45ace8b9d}" id="id-0065-000001a9" kind="Object" relid="0x0" role="Object">
-              <name>ConnectorStatusListener</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{7882cc5e-046d-4ae3-b649-6a2cfbf01fee}" id="id-0065-000001aa" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>on_inconsistent_topic</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{29b91f00-b74a-4af2-aa2d-42926cff9580}" id="id-0067-000003ef" kind="InParameter" referred="id-0065-000001dd" relid="0x0" role="InParameter">
-                  <name>the_topic</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{1d815fc2-2786-4e43-9ff3-a28d51deb9c1}" id="id-0067-000003f0" kind="InParameter" referred="id-0065-000001c3" relid="0x0" role="InParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{82972328-0c93-4fb1-ad63-4e57650477da}" id="id-0065-000001ab" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                <name>on_requested_incompatible_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{1c10e95c-e083-470e-be27-e77b278f0824}" id="id-0067-000003f1" kind="InParameter" referred="id-0065-000001fb" relid="0x0" role="InParameter">
-                  <name>the_reader</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{f5f6cd3b-d3c6-47ea-b77c-9ed5e65d28fe}" id="id-0067-000003f2" kind="InParameter" referred="id-0065-000001cd" relid="0x0" role="InParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{258f94e3-04b2-4921-87b3-413d9ab90951}" id="id-0065-000001ac" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-                <name>on_sample_rejected</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{79345a69-2280-4a78-9056-afe5ad2416a5}" id="id-0067-000003f3" kind="InParameter" referred="id-0065-000001fb" relid="0x0" role="InParameter">
-                  <name>the_reader</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{5a4bd54e-b7b6-4f90-9e81-c2586c53e138}" id="id-0067-000003f4" kind="InParameter" referred="id-0065-000001c6" relid="0x0" role="InParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{7d1c8df9-94c6-4eef-aa87-94732c3629e8}" id="id-0065-000001ad" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-                <name>on_offered_deadline_missed</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{42a71a0c-224d-434a-b72a-3bda842434c9}" id="id-0067-000003f5" kind="InParameter" referred="id-0065-000001ec" relid="0x0" role="InParameter">
-                  <name>the_writer</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{75bd9949-8a22-49a5-8455-4d68126de471}" id="id-0067-000003f6" kind="InParameter" referred="id-0065-000001c9" relid="0x0" role="InParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{e693cdd9-32f6-426f-86b8-b28388d10d68}" id="id-0065-000001ae" kind="TwowayOperation" relid="0x4" role="TwowayOperation">
-                <name>on_offered_incompatible_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{3d43c29a-58bd-42c4-ba24-f57332333d20}" id="id-0067-000003f7" kind="InParameter" referred="id-0065-000001ec" relid="0x0" role="InParameter">
-                  <name>the_writer</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{538bd74f-1d95-4dc5-8e5c-17151a92b55e}" id="id-0067-000003f8" kind="InParameter" referred="id-0065-000001cc" relid="0x0" role="InParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{ae770844-b851-4227-94ad-e215a124851e}" id="id-0065-000001af" kind="TwowayOperation" relid="0x5" role="TwowayOperation">
-                <name>on_unexpected_status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{3348c215-8940-4e9e-980f-5cc34bede3b1}" id="id-0067-000003f9" kind="InParameter" referred="id-0065-000001d4" relid="0x0" role="InParameter">
-                  <name>the_entity</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{957ae072-6620-4b92-91aa-18ad29d341a3}" id="id-0067-000003fa" kind="InParameter" referred="id-0067-0000066a" relid="0x0" role="InParameter">
-                  <name>status_kind</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-            </model>
-          </model>
-        </model>
-        <model childrelidcntr="0x1" guid="{4f3adb2a-cc9a-4398-8540-a53bd472e5df}" id="id-0065-000001b0" kind="File" relid="0x7">
-          <name>dds4ccm_DataListenerControl</name>
-          <attribute kind="Path">
-            <value>connectors/dds4ccm/idl</value>
-          </attribute>
-          <attribute kind="PostPreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrePreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrefixTag" status="meta">
-            <value/>
-          </attribute>
-          <model childrelidcntr="0x1" guid="{dff4a2e0-25d9-412d-b2b7-82ceebb363e4}" id="id-0065-000001b1" kind="Package" relid="0x0" role="Package">
-            <name>CCM_DDS</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrefixTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <model childrelidcntr="0x2" guid="{090ff77c-89cb-41d6-a927-b6aa4bc482b6}" id="id-0065-000001b2" kind="Object" relid="0x0" role="Object">
-              <name>DataListenerControl</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{7b1a3436-61c1-48d3-a3f1-536487457d81}" id="id-0065-000001b3" kind="Attribute" relid="0x0" role="Attribute">
-                <name>mode</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{9f8f84d9-8d4e-4739-959a-8a4c61ab4387}" id="id-0067-000003fb" kind="AttributeMember" referred="id-0065-00000198" relid="0x0" role="AttributeMember">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{c6536dfa-cc90-4e97-98ac-174c6892deab}" id="id-0065-000001b4" kind="Attribute" relid="0x1" role="Attribute">
-                <name>max_delivered_data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{f9fc391e-7816-4e7d-b8e3-2b463077dbc3}" id="id-0067-000003fc" kind="AttributeMember" referred="id-0067-000003e3" relid="0x0" role="AttributeMember">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-            </model>
-          </model>
-        </model>
-        <model childrelidcntr="0x1" guid="{2a99f802-8c2c-4a0c-be0f-f323a7f359f2}" id="id-0065-000001b5" kind="File" relid="0x9">
-          <name>dds4ccm_PortStatusListener</name>
-          <attribute kind="Path">
-            <value>connectors/dds4ccm/idl</value>
-          </attribute>
-          <attribute kind="PostPreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrePreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrefixTag" status="meta">
-            <value/>
-          </attribute>
-          <model childrelidcntr="0x1" guid="{9c2ac504-a781-4b30-a43b-9820a96d033d}" id="id-0065-000001b6" kind="Package" relid="0x0" role="Package">
-            <name>CCM_DDS</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrefixTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <model childrelidcntr="0x2" guid="{846970af-1676-4855-a75f-38bea43c18b4}" id="id-0065-000001b7" kind="Object" relid="0x0" role="Object">
-              <name>PortStatusListener</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{e2aba88a-e59a-4a1d-a740-caf533037a94}" id="id-0065-000001b8" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>on_requested_deadline_missed</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{495fcba1-fa62-49a3-9d80-9f186311b9b3}" id="id-0067-000003fd" kind="InParameter" referred="id-0065-000001fb" relid="0x0" role="InParameter">
-                  <name>the_reader</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{8b892cb7-97f5-4e8e-bd50-f9f3abf4aa33}" id="id-0067-000003fe" kind="InParameter" referred="id-0065-000001ca" relid="0x0" role="InParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{64478210-d18a-471b-be3f-3ace98685c27}" id="id-0065-000001b9" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                <name>on_sample_lost</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{04b72909-7452-4933-b6cd-b90efe528b3e}" id="id-0067-000003ff" kind="InParameter" referred="id-0065-000001fb" relid="0x0" role="InParameter">
-                  <name>the_reader</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{2a95c9d6-ab99-4f97-a742-55189ecfbb55}" id="id-0067-00000400" kind="InParameter" referred="id-0065-000001c4" relid="0x0" role="InParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-            </model>
-          </model>
-        </model>
-        <model childrelidcntr="0x1" guid="{768e2924-97d0-49e4-b182-d580695d585b}" id="id-0065-000001ba" kind="File" relid="0xb">
-          <name>dds4ccm_StateListenerControl</name>
-          <attribute kind="Path">
-            <value>connectors/dds4ccm/idl</value>
-          </attribute>
-          <attribute kind="PostPreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrePreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrefixTag" status="meta">
-            <value/>
-          </attribute>
-          <model childrelidcntr="0x1" guid="{af3c382b-cfef-4c8e-872b-6784d3580514}" id="id-0065-000001bb" kind="Package" relid="0x0" role="Package">
-            <name>CCM_DDS</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrefixTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <model childrelidcntr="0x2" guid="{c5c6d8fb-caaa-4e16-a1d2-46560b3ba292}" id="id-0065-000001bc" kind="Object" relid="0x0" role="Object">
-              <name>StateListenerControl</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{cb32524d-b746-4462-9a83-47bc84c72aba}" id="id-0065-000001bd" kind="Attribute" relid="0x0" role="Attribute">
-                <name>is_filter_interpreted</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{cd30567b-74f9-4aae-97a1-9f58e29f2b23}" id="id-0067-00000401" kind="AttributeMember" referred="id-0066-00000056" relid="0x0" role="AttributeMember">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <reference guid="{a73c26e3-7c5f-4e12-97e7-c1aa98be57f2}" id="id-0067-00000402" kind="Inherits" referred="id-0065-000001b2" relid="0x1" role="Inherits">
-                <name>Inherits</name>
-              </reference>
-            </model>
-          </model>
-        </model>
-        <model childrelidcntr="0x1" guid="{b752d754-9e41-4e14-a36e-919b1ee7cd89}" id="id-0065-000001be" kind="File" relid="0xd">
-          <name>dds_rtf2_dcps</name>
-          <attribute kind="Path">
-            <value>connectors/dds4ccm/idl</value>
-          </attribute>
-          <attribute kind="PostPreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrePreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrefixTag" status="meta">
-            <value/>
-          </attribute>
-          <model childrelidcntr="0x56" guid="{6159b4d6-7d7b-4f62-acbd-b40c9258f224}" id="id-0065-000001bf" kind="Package" relid="0x0" role="Package">
-            <name>DDS</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrefixTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <model childrelidcntr="0x1" guid="{a5b03cad-ef21-4083-922b-2ab35bb09683}" id="id-0065-000001c0" kind="Aggregate" relid="0x0" role="Aggregate">
-              <name>BuiltinTopicKey_t</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{963202a2-5e3c-498c-b606-79df39a64df7}" id="id-0067-00000403" kind="ArrayMember" referred="id-0066-0000005b" relid="0x0" role="ArrayMember">
-                <name>value</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="Size">
-                  <value>3</value>
-                </attribute>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{c25f412d-47d0-4004-82a1-97aca23f80c2}" id="id-0065-000001c1" kind="Aggregate" relid="0x1" role="Aggregate">
-              <name>Duration_t</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{4249a059-015c-4349-9139-c647a1fa2d40}" id="id-0067-00000404" kind="Member" referred="id-0066-0000005b" relid="0x0" role="Member">
-                <name>sec</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{1f465721-a2e5-4476-85c8-187f26c707b0}" id="id-0067-00000405" kind="Member" referred="id-0066-0000005e" relid="0x0" role="Member">
-                <name>nanosec</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{d7b87f17-977a-4be0-9091-944d13e2abef}" id="id-0065-000001c2" kind="Aggregate" relid="0x2" role="Aggregate">
-              <name>Time_t</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{a0263a6d-9891-4948-be8c-8b143eb61ebc}" id="id-0067-00000406" kind="Member" referred="id-0066-0000005b" relid="0x0" role="Member">
-                <name>sec</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{dbaf34cb-cfac-42d4-aaed-03350e4224e3}" id="id-0067-00000407" kind="Member" referred="id-0066-0000005e" relid="0x0" role="Member">
-                <name>nanosec</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{8d4c6c71-0536-4c64-9850-775867425145}" id="id-0065-000001c3" kind="Aggregate" relid="0x3" role="Aggregate">
-              <name>InconsistentTopicStatus</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{e184c237-4a17-48c5-8959-4114ffcbd4ad}" id="id-0067-00000408" kind="Member" referred="id-0066-0000005b" relid="0x0" role="Member">
-                <name>total_count</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{81bac9f7-c709-43bd-8a49-66513505d5a7}" id="id-0067-00000409" kind="Member" referred="id-0066-0000005b" relid="0x0" role="Member">
-                <name>total_count_change</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{477c1c4d-6625-4047-ad1b-049f98ea2c66}" id="id-0065-000001c4" kind="Aggregate" relid="0x4" role="Aggregate">
-              <name>SampleLostStatus</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{a26d5d65-edb9-4f2d-8c1a-fc92878f82c3}" id="id-0067-0000040a" kind="Member" referred="id-0066-0000005b" relid="0x0" role="Member">
-                <name>total_count</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{47b47e09-61d7-49ac-a95c-3e31690da56c}" id="id-0067-0000040b" kind="Member" referred="id-0066-0000005b" relid="0x0" role="Member">
-                <name>total_count_change</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x4" guid="{41e84200-639f-4863-9cc4-525be2ee68fe}" id="id-0065-000001c5" kind="Enum" relid="0x5" role="Enum">
-              <name>SampleRejectedStatusKind</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <atom guid="{1ca8c1cc-a038-44a2-8fe6-8012da8f2d3b}" id="id-0066-0000003f" kind="EnumValue" relid="0x0" role="EnumValue">
-                <name>NOT_REJECTED</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-              <atom guid="{5c62b917-c1a5-44c4-bf43-a62d8fc5ed69}" id="id-0066-00000040" kind="EnumValue" relid="0x1" role="EnumValue">
-                <name>REJECTED_BY_INSTANCES_LIMIT</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-              <atom guid="{2fd82d72-0967-419a-851b-512f4fb4386f}" id="id-0066-00000041" kind="EnumValue" relid="0x2" role="EnumValue">
-                <name>REJECTED_BY_SAMPLES_LIMIT</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-              <atom guid="{fac2dfa4-72a9-4188-8bab-56473e6dec96}" id="id-0066-00000042" kind="EnumValue" relid="0x3" role="EnumValue">
-                <name>REJECTED_BY_SAMPLES_PER_INSTANCE_LIMIT</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-            </model>
-            <model childrelidcntr="0x1" guid="{f2a168c3-4719-4d0a-b560-b46dac88b5be}" id="id-0065-000001c6" kind="Aggregate" relid="0x6" role="Aggregate">
-              <name>SampleRejectedStatus</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{2747eab6-65b3-48f8-bdc2-07a15a0da61b}" id="id-0067-0000040c" kind="Member" referred="id-0065-000001c5" relid="0x0" role="Member">
-                <name>last_reason</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{d0e39512-4e45-435e-8284-7a7233e5a757}" id="id-0067-0000040d" kind="Member" referred="id-0066-0000005b" relid="0x0" role="Member">
-                <name>total_count</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{5654f0f9-6fbf-4f0e-a540-63987c47380e}" id="id-0067-0000040e" kind="Member" referred="id-0066-0000005b" relid="0x0" role="Member">
-                <name>total_count_change</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{14c0ee38-4c2f-43bf-9124-563e0abc2b0b}" id="id-0067-0000040f" kind="Member" referred="id-0067-000006bc" relid="0x0" role="Member">
-                <name>last_instance_handle</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{d0dc1307-a10d-4a65-b01f-aa1a0d6ed20a}" id="id-0065-000001c7" kind="Aggregate" relid="0x7" role="Aggregate">
-              <name>LivelinessLostStatus</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{9453bb3b-d71a-425c-9c15-cc87630f5c4e}" id="id-0067-00000410" kind="Member" referred="id-0066-0000005b" relid="0x0" role="Member">
-                <name>total_count</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{3d412127-8425-48d4-8dc5-a5e739d3c7cc}" id="id-0067-00000411" kind="Member" referred="id-0066-0000005b" relid="0x0" role="Member">
-                <name>total_count_change</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{9254f504-2700-4569-93f3-c03d9b61ed81}" id="id-0065-000001c8" kind="Aggregate" relid="0x8" role="Aggregate">
-              <name>LivelinessChangedStatus</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{4b14f82d-bb06-42fd-8162-787055f30596}" id="id-0067-00000412" kind="Member" referred="id-0066-0000005b" relid="0x0" role="Member">
-                <name>alive_count</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{49bd96aa-52e4-4912-91ef-dda97895c3a3}" id="id-0067-00000413" kind="Member" referred="id-0066-0000005b" relid="0x0" role="Member">
-                <name>not_alive_count</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{c30d7c42-fb36-4109-bad2-91bd904173bf}" id="id-0067-00000414" kind="Member" referred="id-0066-0000005b" relid="0x0" role="Member">
-                <name>alive_count_change</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{11957c4f-c294-456e-be08-9677f4370e81}" id="id-0067-00000415" kind="Member" referred="id-0066-0000005b" relid="0x0" role="Member">
-                <name>not_alive_count_change</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{4d321c30-dccc-4f1f-9f5b-666417af0d1b}" id="id-0067-00000416" kind="Member" referred="id-0067-000006bc" relid="0x0" role="Member">
-                <name>last_publication_handle</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{ff404a73-66eb-4bb8-a94e-b11c999b79ee}" id="id-0065-000001c9" kind="Aggregate" relid="0x9" role="Aggregate">
-              <name>OfferedDeadlineMissedStatus</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{40978a0e-e00b-42e5-bc09-e565784b221c}" id="id-0067-00000417" kind="Member" referred="id-0066-0000005b" relid="0x0" role="Member">
-                <name>total_count</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{b5e7ff62-6ad1-4ea3-a1ad-4be218ba0a75}" id="id-0067-00000418" kind="Member" referred="id-0066-0000005b" relid="0x0" role="Member">
-                <name>total_count_change</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{9e7ec43a-270d-4403-aece-470e6f84c159}" id="id-0067-00000419" kind="Member" referred="id-0067-000006bc" relid="0x0" role="Member">
-                <name>last_instance_handle</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{43d167dc-af08-4dcb-ad53-82442cb9eed9}" id="id-0065-000001ca" kind="Aggregate" relid="0xa" role="Aggregate">
-              <name>RequestedDeadlineMissedStatus</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{659375ea-d3d6-4a59-8176-671dac36def7}" id="id-0067-0000041a" kind="Member" referred="id-0066-0000005b" relid="0x0" role="Member">
-                <name>total_count</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{cc844a3b-91d3-45bc-8534-71a9b174f452}" id="id-0067-0000041b" kind="Member" referred="id-0066-0000005b" relid="0x0" role="Member">
-                <name>total_count_change</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{2c893c41-ac52-4ddc-993f-fbee4caa1603}" id="id-0067-0000041c" kind="Member" referred="id-0067-000006bc" relid="0x0" role="Member">
-                <name>last_instance_handle</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{e89fea34-133b-4b0c-bce3-7d283cd5af96}" id="id-0065-000001cb" kind="Aggregate" relid="0xb" role="Aggregate">
-              <name>QosPolicyCount</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{a78c98e1-d747-463c-a1d7-af5d695e1e0e}" id="id-0067-0000041d" kind="Member" referred="id-0067-00000654" relid="0x0" role="Member">
-                <name>policy_id</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{680f80fb-bf72-4d79-8897-d35a225f9368}" id="id-0067-0000041e" kind="Member" referred="id-0066-0000005b" relid="0x0" role="Member">
-                <name>count</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{c88e3a59-17ff-4108-875b-7535cb293858}" id="id-0065-000001cc" kind="Aggregate" relid="0xc" role="Aggregate">
-              <name>OfferedIncompatibleQosStatus</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{53f69b13-a147-47af-8558-f9b6c3129f9d}" id="id-0067-0000041f" kind="Member" referred="id-0067-0000064e" relid="0x0" role="Member">
-                <name>policies</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{01aafd7d-429f-495a-ae47-fd37ed99122a}" id="id-0067-00000420" kind="Member" referred="id-0066-0000005b" relid="0x0" role="Member">
-                <name>total_count</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{e52be414-0737-4bb8-9ee1-fe8f17cae070}" id="id-0067-00000421" kind="Member" referred="id-0066-0000005b" relid="0x0" role="Member">
-                <name>total_count_change</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{f8707b10-8d0c-4add-90ea-a4fd6422cf04}" id="id-0067-00000422" kind="Member" referred="id-0067-00000654" relid="0x0" role="Member">
-                <name>last_policy_id</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{56377413-92e4-472a-90a9-71c28539f15b}" id="id-0065-000001cd" kind="Aggregate" relid="0xd" role="Aggregate">
-              <name>RequestedIncompatibleQosStatus</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{ddf0bbc1-8477-4303-b7ca-0d358c381535}" id="id-0067-00000423" kind="Member" referred="id-0067-0000064e" relid="0x0" role="Member">
-                <name>policies</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{ec6e0a1c-f3b4-4152-8c0f-cf1688878463}" id="id-0067-00000424" kind="Member" referred="id-0066-0000005b" relid="0x0" role="Member">
-                <name>total_count</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{2d002650-9d63-48d5-a296-bf41ee91abf2}" id="id-0067-00000425" kind="Member" referred="id-0066-0000005b" relid="0x0" role="Member">
-                <name>total_count_change</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{5ed8833c-ac09-4483-9ed2-01c8b0d0a39d}" id="id-0067-00000426" kind="Member" referred="id-0067-00000654" relid="0x0" role="Member">
-                <name>last_policy_id</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{2c2c71b4-dddf-4f35-bfd1-50b65509ebdd}" id="id-0065-000001ce" kind="Aggregate" relid="0xe" role="Aggregate">
-              <name>PublicationMatchedStatus</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{eb99edd9-bcd8-483a-b588-ae830734ed0e}" id="id-0067-00000427" kind="Member" referred="id-0066-0000005b" relid="0x0" role="Member">
-                <name>total_count</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{f12a6ed0-8be3-4aaa-93b0-b1ed1cf009c2}" id="id-0067-00000428" kind="Member" referred="id-0066-0000005b" relid="0x0" role="Member">
-                <name>total_count_change</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{62c7e48b-ae99-43fa-8218-d054c79f6dcd}" id="id-0067-00000429" kind="Member" referred="id-0066-0000005b" relid="0x0" role="Member">
-                <name>current_count</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{501da5cb-155e-4954-94e2-4cefec1109d6}" id="id-0067-0000042a" kind="Member" referred="id-0066-0000005b" relid="0x0" role="Member">
-                <name>current_count_change</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{74cd297f-c4c3-48b1-9ef0-784b0e30c5d6}" id="id-0067-0000042b" kind="Member" referred="id-0067-000006bc" relid="0x0" role="Member">
-                <name>last_subscription_handle</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{a3904686-138a-4a85-83ec-0d91c721912a}" id="id-0065-000001cf" kind="Aggregate" relid="0xf" role="Aggregate">
-              <name>SubscriptionMatchedStatus</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{37a0d63c-fcc2-4ec0-bd04-0445d48c120e}" id="id-0067-0000042c" kind="Member" referred="id-0066-0000005b" relid="0x0" role="Member">
-                <name>total_count</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{7b6a054b-ecf3-4dfa-ba59-14dfbe089576}" id="id-0067-0000042d" kind="Member" referred="id-0066-0000005b" relid="0x0" role="Member">
-                <name>total_count_change</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{cb21e320-eb39-49dd-aea1-a456bea93be6}" id="id-0067-0000042e" kind="Member" referred="id-0066-0000005b" relid="0x0" role="Member">
-                <name>current_count</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{dbf559ef-9da3-4929-89c9-7d3a4d9f46eb}" id="id-0067-0000042f" kind="Member" referred="id-0066-0000005b" relid="0x0" role="Member">
-                <name>current_count_change</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{601d70a5-e20d-4ec6-b055-4f91a6c89285}" id="id-0067-00000430" kind="Member" referred="id-0067-000006bc" relid="0x0" role="Member">
-                <name>last_publication_handle</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{763fd3a6-9b56-4284-93d5-1544fb78a6c2}" id="id-0065-000001d0" kind="Aggregate" relid="0x10" role="Aggregate">
-              <name>ReliableReaderActivityChangedStatus</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{6d73f6f0-4b2a-4d36-85e3-37f3c0ded980}" id="id-0067-00000431" kind="Member" referred="id-0066-0000005b" relid="0x0" role="Member">
-                <name>active_count</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{13945772-0a96-4cba-ae2e-e5b168075ee3}" id="id-0067-00000432" kind="Member" referred="id-0066-0000005b" relid="0x0" role="Member">
-                <name>inactive_count</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{4f05037b-b956-4b09-9c52-30f891dd4849}" id="id-0067-00000433" kind="Member" referred="id-0066-0000005b" relid="0x0" role="Member">
-                <name>active_count_change</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{c39f1a60-aacc-4450-b3f2-7786959cf62b}" id="id-0067-00000434" kind="Member" referred="id-0066-0000005b" relid="0x0" role="Member">
-                <name>inactive_count_change</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{3e56fe6b-bf13-4dcc-9296-42a5b6e0f6b4}" id="id-0067-00000435" kind="Member" referred="id-0067-000006bc" relid="0x0" role="Member">
-                <name>last_instance_handle</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{189a004d-1843-4899-8fa7-10a12c89fcab}" id="id-0065-000001d1" kind="Aggregate" relid="0x11" role="Aggregate">
-              <name>ReliableWriterCacheEventCount</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{5eb39167-0ac1-4736-bd26-c155bcd56a85}" id="id-0067-00000436" kind="Member" referred="id-0066-0000005b" relid="0x0" role="Member">
-                <name>total_count</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{222fb828-d06c-47d4-9db6-adaad3a0ba3a}" id="id-0067-00000437" kind="Member" referred="id-0066-0000005b" relid="0x0" role="Member">
-                <name>total_count_change</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{438dc305-e48b-42eb-b104-295744b3b57b}" id="id-0065-000001d2" kind="Aggregate" relid="0x12" role="Aggregate">
-              <name>ReliableWriterCacheChangedStatus</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{254a14d0-36de-4b30-bfe5-3e6b1e383613}" id="id-0067-00000438" kind="Member" referred="id-0065-000001d1" relid="0x0" role="Member">
-                <name>empty_reliable_writer_cache</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{12c63f1a-c9aa-4b27-9e7d-b78a381183e5}" id="id-0067-00000439" kind="Member" referred="id-0065-000001d1" relid="0x0" role="Member">
-                <name>full_reliable_writer_cache</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{928fd414-705b-4bd9-82fa-62db0e7c2a62}" id="id-0067-0000043a" kind="Member" referred="id-0065-000001d1" relid="0x0" role="Member">
-                <name>low_watermark_reliable_writer_cache</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{f7f2e72d-9d9d-453b-be78-79fb5f5c4744}" id="id-0067-0000043b" kind="Member" referred="id-0065-000001d1" relid="0x0" role="Member">
-                <name>high_watermark_reliable_writer_cache</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{c93d2194-f2e8-4024-8318-cae098b46aca}" id="id-0067-0000043c" kind="Member" referred="id-0066-0000005b" relid="0x0" role="Member">
-                <name>unacknowledged_sample_count</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{9ac5831c-f9bd-4d4b-9963-f7e01fc0b141}" id="id-0067-0000043d" kind="Member" referred="id-0066-0000005b" relid="0x0" role="Member">
-                <name>unacknowledged_sample_count_peak</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x0" guid="{f8027bdb-3f5e-42e8-8ab5-09488c655dda}" id="id-0065-000001d3" kind="Object" relid="0x13" role="Object">
-              <name>Listener</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-            </model>
-            <model childrelidcntr="0x4" guid="{3fc48051-8ef3-4e8f-a50f-aca9fa66774d}" id="id-0065-000001d4" kind="Object" relid="0x14" role="Object">
-              <name>Entity</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{37f77090-3e8c-4924-a64a-378829cdbf7b}" id="id-0065-000001d5" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>enable</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{c38bcd20-1e89-4657-94cc-5efa85b9c2f8}" id="id-0067-0000043e" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{4fdecb27-0c35-4eb8-8286-947bb4e0fe5b}" id="id-0065-000001d6" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                <name>get_statuscondition</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{14c67b3e-0e96-453f-9a16-a69ed9615ffe}" id="id-0067-0000043f" kind="ReturnType" referred="id-0065-00000252" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{79239a78-be48-45db-8ae8-0592dca31355}" id="id-0065-000001d7" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-                <name>get_status_changes</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{6acfc95d-65f9-4cda-a0ed-62dd3f2374c5}" id="id-0067-00000440" kind="ReturnType" referred="id-0067-0000066b" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{77725c52-dc35-4efe-a66c-633af883860a}" id="id-0065-000001d8" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-                <name>get_instance_handle</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{b8866053-8666-4021-815c-e623148034dd}" id="id-0067-00000441" kind="ReturnType" referred="id-0067-000006bc" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-            </model>
-            <model childrelidcntr="0x3" guid="{7acee41b-3015-491c-a696-bfedaa9963e1}" id="id-0065-000001d9" kind="Object" relid="0x15" role="Object">
-              <name>TopicDescription</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{47f9ef74-bb3c-44c2-a901-5b67615f168c}" id="id-0065-000001da" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>get_type_name</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{f4b8d2dc-c32d-4112-b4a3-c7c3a3f0e69d}" id="id-0067-00000442" kind="ReturnType" referred="id-0066-00000066" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{ce550fbe-44e3-4d1f-8a83-36113be0bf40}" id="id-0065-000001db" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                <name>get_name</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{8f7e62ff-51c5-4125-9aeb-e9f40044a1f3}" id="id-0067-00000443" kind="ReturnType" referred="id-0066-00000066" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{aebbe005-9458-4808-a804-68743be3b8da}" id="id-0065-000001dc" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-                <name>get_participant</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{0afcd804-47fe-4c8c-bfbd-16b81cf907b3}" id="id-0067-00000444" kind="ReturnType" referred="id-0065-00000287" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-            </model>
-            <model childrelidcntr="0x6" guid="{1513a26f-41cf-4f33-bc0d-453acf586e69}" id="id-0065-000001dd" kind="Object" relid="0x16" role="Object">
-              <name>Topic</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{7c385dbf-8514-4e9f-9b8d-e4036f71b57a}" id="id-0065-000001de" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>set_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{7e8c5d5a-8861-430d-b509-5cafd8118cc3}" id="id-0067-00000445" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{d4e3d371-a644-4ed5-a1ba-8801ce340a9d}" id="id-0067-00000446" kind="InParameter" referred="id-0065-0000027e" relid="0x0" role="InParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{2c8512d5-aef0-4292-8ec3-5578e9bd97c0}" id="id-0065-000001df" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                <name>get_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{52a9e0ae-f407-4e21-b24c-0f27102fce7d}" id="id-0067-00000447" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{7e95ac3b-ad35-4e30-b741-4d2029bc1153}" id="id-0067-00000448" kind="InoutParameter" referred="id-0065-0000027e" relid="0x0" role="InoutParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{9cdc4a9b-cdce-42d3-b440-b803850fa319}" id="id-0065-000001e0" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-                <name>set_listener</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{07bcd3c9-f216-418f-99c3-86b56c601eae}" id="id-0067-00000449" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{f4c3cae0-5b5c-4238-9f7b-6ecdcf5b8b89}" id="id-0067-0000044a" kind="InParameter" referred="id-0065-00000234" relid="0x0" role="InParameter">
-                  <name>a_listener</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{64a2df6d-e0a0-4d65-9c33-ec2da6f921a1}" id="id-0067-0000044b" kind="InParameter" referred="id-0067-0000066b" relid="0x0" role="InParameter">
-                  <name>mask</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{9537ee1d-3a24-4448-95a7-362da20940ce}" id="id-0065-000001e1" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-                <name>get_listener</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{e482526c-2533-49e4-8a38-9a899057428f}" id="id-0067-0000044c" kind="ReturnType" referred="id-0065-00000234" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{b2ffb576-5688-4807-b934-4f44f570d63c}" id="id-0065-000001e2" kind="TwowayOperation" relid="0x4" role="TwowayOperation">
-                <name>get_inconsistent_topic_status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{f4c39c16-4506-45c0-9c24-c51267f78f51}" id="id-0067-0000044d" kind="InoutParameter" referred="id-0065-000001c3" relid="0x0" role="InoutParameter">
-                  <name>a_status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{c36ce585-f418-43ac-8890-d430daa2c078}" id="id-0067-0000044e" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <reference guid="{05ff6b9f-53a9-4836-a396-33ca2d536404}" id="id-0067-0000044f" kind="Inherits" referred="id-0065-000001d4" relid="0x5" role="Inherits">
-                <name>Inherits</name>
-              </reference>
-              <reference guid="{0b7b4c65-7f41-4aee-9f49-d1cb418ed5bd}" id="id-0067-00000450" kind="Inherits" referred="id-0065-000001d9" relid="0x5" role="Inherits">
-                <name>Inherits</name>
-              </reference>
-            </model>
-            <model childrelidcntr="0x5" guid="{4519d714-cb1e-4ecb-bfad-1efad7a5148e}" id="id-0065-000001e3" kind="Object" relid="0x17" role="Object">
-              <name>ContentFilteredTopic</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{f74964a8-b61b-437c-a1d8-3092e88c392b}" id="id-0065-000001e4" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>get_filter_expression</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{5b987a95-3d0b-418c-8ca8-f2e65ee355d8}" id="id-0067-00000451" kind="ReturnType" referred="id-0066-00000066" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{ced05860-39f6-4a16-a2ae-04fc3bb5015a}" id="id-0065-000001e5" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                <name>get_expression_parameters</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{f9164bd9-18e0-4f3c-bb91-f57d1727a055}" id="id-0067-00000452" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{be1a771a-f6ad-49ca-8d37-b5ba85078272}" id="id-0067-00000453" kind="InoutParameter" referred="id-0067-00000655" relid="0x0" role="InoutParameter">
-                  <name>expression_parameters</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{62800662-7ae4-48a1-837e-07a83ab4d863}" id="id-0065-000001e6" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-                <name>set_expression_parameters</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{29f41b68-9d52-47ad-a07c-3c227fe54954}" id="id-0067-00000454" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{6ba3e11c-de03-49cb-98c8-0b732bbda9ef}" id="id-0067-00000455" kind="InParameter" referred="id-0067-00000655" relid="0x0" role="InParameter">
-                  <name>expression_parameters</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{f89c4835-6002-4e00-b33d-02ecddfe8b71}" id="id-0065-000001e7" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-                <name>get_related_topic</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{cc3d38e3-2e8a-4b95-9159-a408db3f4cf8}" id="id-0067-00000456" kind="ReturnType" referred="id-0065-000001dd" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <reference guid="{6227c533-9113-45c3-bac0-550d056c3c9e}" id="id-0067-00000457" kind="Inherits" referred="id-0065-000001d9" relid="0x4" role="Inherits">
-                <name>Inherits</name>
-              </reference>
-            </model>
-            <model childrelidcntr="0x4" guid="{0f4b4aa3-418d-424e-8be1-2311617dcbf2}" id="id-0065-000001e8" kind="Object" relid="0x18" role="Object">
-              <name>MultiTopic</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{98bec281-8398-46f9-af91-4f4220b9fd80}" id="id-0065-000001e9" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>get_subscription_expression</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{35c1f5b1-72f9-4651-8a22-2f79041ddc4e}" id="id-0067-00000458" kind="ReturnType" referred="id-0066-00000066" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{614b535e-aaa3-4539-b615-6e4818bad6f0}" id="id-0065-000001ea" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                <name>get_expression_parameters</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{c174c042-2ead-46b5-812e-f933a9e431f8}" id="id-0067-00000459" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{8743fd10-4d33-4f47-8e99-29a35214f615}" id="id-0067-0000045a" kind="InoutParameter" referred="id-0067-00000655" relid="0x0" role="InoutParameter">
-                  <name>expression_parameters</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{d90029a3-0ce6-4b5a-a5f0-6b35cf55adcf}" id="id-0065-000001eb" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-                <name>set_expression_parameters</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{87dd0a91-9db6-4325-b320-5aec593dd698}" id="id-0067-0000045b" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{34737b11-e434-4d96-a3d8-c09985a95ff7}" id="id-0067-0000045c" kind="InParameter" referred="id-0067-00000655" relid="0x0" role="InParameter">
-                  <name>expression_parameters</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <reference guid="{cf64023a-355c-4206-970d-78254da32458}" id="id-0067-0000045d" kind="Inherits" referred="id-0065-000001d9" relid="0x3" role="Inherits">
-                <name>Inherits</name>
-              </reference>
-            </model>
-            <model childrelidcntr="0xf" guid="{b06f71dd-0286-4ae8-af83-414fd2f115e1}" id="id-0065-000001ec" kind="Object" relid="0x19" role="Object">
-              <name>DataWriter</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{03e60fae-d7ec-4096-a3e0-308a9ac0684e}" id="id-0065-000001ed" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>set_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{66921089-3b93-420d-9d09-e983d0c3fccb}" id="id-0067-0000045e" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{40be1f9d-d188-4b06-b3d8-d019165a2031}" id="id-0067-0000045f" kind="InParameter" referred="id-0065-0000027f" relid="0x0" role="InParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{1be41d0f-9bea-4f28-afe8-fd0f97234fed}" id="id-0065-000001ee" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                <name>get_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{a172233d-bf1e-4669-821d-f80937375164}" id="id-0067-00000460" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{a260f328-f446-4d9c-9704-d68f156d3d50}" id="id-0067-00000461" kind="InoutParameter" referred="id-0065-0000027f" relid="0x0" role="InoutParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{d541075f-8cad-4036-869d-47204ccd947d}" id="id-0065-000001ef" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-                <name>set_listener</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{8aca85ab-f235-4a2d-88ca-fa93c53483d0}" id="id-0067-00000462" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{0a53e61f-3a3f-4a58-a868-df00a3ef2a13}" id="id-0067-00000463" kind="InParameter" referred="id-0065-00000236" relid="0x0" role="InParameter">
-                  <name>a_listener</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{86f347c1-0283-4d58-bd0b-eb50215dfaf8}" id="id-0067-00000464" kind="InParameter" referred="id-0067-0000066b" relid="0x0" role="InParameter">
-                  <name>mask</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{e960875e-f4de-4dbe-807f-96ff38898542}" id="id-0065-000001f0" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-                <name>get_listener</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{3f1e29b1-c420-4588-b32b-8b176bb7625c}" id="id-0067-00000465" kind="ReturnType" referred="id-0065-00000236" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{21be9e68-5bbb-4898-8d96-cff5e882597c}" id="id-0065-000001f1" kind="TwowayOperation" relid="0x4" role="TwowayOperation">
-                <name>get_topic</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{88cf4104-533a-42e2-9532-14ade65ada92}" id="id-0067-00000466" kind="ReturnType" referred="id-0065-000001dd" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{11d1d9c9-263c-4cfd-a6f7-33b47dcb8736}" id="id-0065-000001f2" kind="TwowayOperation" relid="0x5" role="TwowayOperation">
-                <name>get_publisher</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{6a12959c-234a-46b8-89ea-923efc30c87d}" id="id-0067-00000467" kind="ReturnType" referred="id-0065-00000221" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{c98e7e74-8fcf-415f-bd37-c97cd4f7182f}" id="id-0065-000001f3" kind="TwowayOperation" relid="0x6" role="TwowayOperation">
-                <name>wait_for_acknowledgments</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,660</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{27a2f532-fede-463a-a5dc-f8cbb9fde023}" id="id-0067-00000468" kind="InParameter" referred="id-0065-000001c1" relid="0x0" role="InParameter">
-                  <name>max_wait</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{e3f34ddd-cefd-409c-8a37-080012a60cd2}" id="id-0067-00000469" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{54cadb57-5f14-41e7-9f7c-b0af1097dc14}" id="id-0065-000001f4" kind="TwowayOperation" relid="0x7" role="TwowayOperation">
-                <name>get_liveliness_lost_status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,760</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{07cf7dba-714b-48cf-a8c5-599ae57c3941}" id="id-0067-0000046a" kind="InoutParameter" referred="id-0065-000001c7" relid="0x0" role="InoutParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{588ee479-1971-4d22-99b4-fda31545c49a}" id="id-0067-0000046b" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{9546b16e-5df7-40fc-b2f9-5710df09a4da}" id="id-0065-000001f5" kind="TwowayOperation" relid="0x8" role="TwowayOperation">
-                <name>get_offered_deadline_missed_status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,860</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{3285d48a-a6ba-4c99-880b-c0563ed2da97}" id="id-0067-0000046c" kind="InoutParameter" referred="id-0065-000001c9" relid="0x0" role="InoutParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{1212d1c6-f9c6-4d27-8461-e5b06ba811bd}" id="id-0067-0000046d" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{0c5e9011-e170-44b4-ac2e-450219040898}" id="id-0065-000001f6" kind="TwowayOperation" relid="0x9" role="TwowayOperation">
-                <name>get_offered_incompatible_qos_status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,960</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{8bbe6930-9292-46d7-a01e-60f8c6ac69fe}" id="id-0067-0000046e" kind="InoutParameter" referred="id-0065-000001cc" relid="0x0" role="InoutParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{58d3582f-037b-4be8-aa65-f39993307301}" id="id-0067-0000046f" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{b7413953-2322-422b-b920-ac083e2e442f}" id="id-0065-000001f7" kind="TwowayOperation" relid="0xa" role="TwowayOperation">
-                <name>get_publication_matched_status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1060</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{3cd41ec7-c494-43d7-b9e2-f13e0e008c9d}" id="id-0067-00000470" kind="InoutParameter" referred="id-0065-000001ce" relid="0x0" role="InoutParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{5478d02f-8641-4493-801c-72f72e3d7513}" id="id-0067-00000471" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{d508c7f9-ce6f-480f-981c-9ae6984b38b0}" id="id-0065-000001f8" kind="TwowayOperation" relid="0xb" role="TwowayOperation">
-                <name>assert_liveliness</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{402cfdd7-adf7-44f5-aeeb-69c088ce010f}" id="id-0067-00000472" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{51711f31-8793-4171-ad92-715c15b342a7}" id="id-0065-000001f9" kind="TwowayOperation" relid="0xc" role="TwowayOperation">
-                <name>get_matched_subscriptions</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{d1a4d556-9a9c-42a3-a693-a04cd53e0a6f}" id="id-0067-00000473" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{376a6c69-0e21-40b6-96d9-5126c4983691}" id="id-0067-00000474" kind="InoutParameter" referred="id-0067-000006bd" relid="0x0" role="InoutParameter">
-                  <name>subscription_handles</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{3180ae88-c33d-4ad9-8eb5-e12f78ff97f4}" id="id-0065-000001fa" kind="TwowayOperation" relid="0xd" role="TwowayOperation">
-                <name>get_matched_subscription_data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{80b2092b-af96-4601-9823-3990c3aa0577}" id="id-0067-00000475" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{07f081be-d49c-453a-a416-c9104a68f015}" id="id-0067-00000476" kind="InoutParameter" referred="id-0065-00000286" relid="0x0" role="InoutParameter">
-                  <name>subscription_data</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{3e4fe32d-6220-4369-9f62-bfffbf45b2f1}" id="id-0067-00000477" kind="InParameter" referred="id-0067-000006bc" relid="0x0" role="InParameter">
-                  <name>subscription_handle</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <reference guid="{235fc104-2ce5-4b65-af6c-7b6925c8eef2}" id="id-0067-00000478" kind="Inherits" referred="id-0065-000001d4" relid="0xe" role="Inherits">
-                <name>Inherits</name>
-              </reference>
-            </model>
-            <model childrelidcntr="0x14" guid="{fdc8bf1e-e6c9-414a-aae8-714cae79f77d}" id="id-0065-000001fb" kind="Object" relid="0x1a" role="Object">
-              <name>DataReader</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{8364c0c8-5ebe-4e07-a39b-f421840d182b}" id="id-0065-000001fc" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>create_readcondition</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{4f24a7ec-5131-4418-addf-5e0196357674}" id="id-0067-00000479" kind="ReturnType" referred="id-0065-00000256" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{2510d978-6f92-4dff-abb6-17f3f5cff5f7}" id="id-0067-0000047a" kind="InParameter" referred="id-0067-0000067e" relid="0x0" role="InParameter">
-                  <name>sample_states</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{da663271-0415-4a50-a029-882464ba26f1}" id="id-0067-0000047b" kind="InParameter" referred="id-0067-00000683" relid="0x0" role="InParameter">
-                  <name>view_states</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{f6fa2b6d-c993-42db-9dec-0fc8c2b72b6d}" id="id-0067-0000047c" kind="InParameter" referred="id-0067-00000689" relid="0x0" role="InParameter">
-                  <name>instance_states</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>360,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{366fb55c-2487-452e-9b75-cb3b4f59e662}" id="id-0065-000001fd" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                <name>create_querycondition</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{52e4d1ae-1206-4481-a20f-102fa6dfea60}" id="id-0067-0000047d" kind="ReturnType" referred="id-0065-0000025b" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{a145acb8-6446-4d02-8797-cf7254ce6ab7}" id="id-0067-0000047e" kind="InParameter" referred="id-0066-00000066" relid="0x0" role="InParameter">
-                  <name>query_expression</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>460,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{b06736dc-9e54-41fc-afac-4e99bb3223b2}" id="id-0067-0000047f" kind="InParameter" referred="id-0067-00000655" relid="0x0" role="InParameter">
-                  <name>query_parameters</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>560,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{c1095bab-1aca-4140-b46a-e3709a6e4da3}" id="id-0067-00000480" kind="InParameter" referred="id-0067-0000067e" relid="0x0" role="InParameter">
-                  <name>sample_states</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{a606eec2-53b4-450d-8e33-fcba20eaef10}" id="id-0067-00000481" kind="InParameter" referred="id-0067-00000683" relid="0x0" role="InParameter">
-                  <name>view_states</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{df2c621c-a512-41e6-a5a6-d595bd8a0622}" id="id-0067-00000482" kind="InParameter" referred="id-0067-00000689" relid="0x0" role="InParameter">
-                  <name>instance_states</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>360,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{ca9b0360-b989-4013-9ce5-1cf10de5e498}" id="id-0065-000001fe" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-                <name>delete_readcondition</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{282d5486-b054-42f4-8780-375153252f41}" id="id-0067-00000483" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{ef05c440-391f-405a-a776-ce9f2a730c8b}" id="id-0067-00000484" kind="InParameter" referred="id-0065-00000256" relid="0x0" role="InParameter">
-                  <name>a_condition</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{bbe5c7d5-792e-4c19-839f-26a79eb0ea3a}" id="id-0065-000001ff" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-                <name>delete_contained_entities</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{98589b6b-47c5-424a-8325-88b6c6b8ddf9}" id="id-0067-00000485" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{78a49b0e-0668-48ae-bb70-f1c739f5d501}" id="id-0065-00000200" kind="TwowayOperation" relid="0x4" role="TwowayOperation">
-                <name>set_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{85583779-1ee1-42a2-b29c-d17d41a90ba5}" id="id-0067-00000486" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{b4c2cd01-c6c5-4803-9652-27e44b271449}" id="id-0067-00000487" kind="InParameter" referred="id-0065-00000281" relid="0x0" role="InParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{1226b0b4-f9a7-48e6-a60f-90d18d32fb6b}" id="id-0065-00000201" kind="TwowayOperation" relid="0x5" role="TwowayOperation">
-                <name>get_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{88a30702-5c90-4a78-b8f9-fbb64efe5c6d}" id="id-0067-00000488" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{0c1e6def-dd0d-4ff9-9c39-bb4ca7affbb6}" id="id-0067-00000489" kind="InoutParameter" referred="id-0065-00000281" relid="0x0" role="InoutParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{850308ef-c9a2-479c-9f4c-8351d2622eee}" id="id-0065-00000202" kind="TwowayOperation" relid="0x6" role="TwowayOperation">
-                <name>set_listener</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,660</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{0c8d5a79-55fe-423d-a93d-407f1521af88}" id="id-0067-0000048a" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{865b5c00-d3fa-49e0-911b-8693599905c5}" id="id-0067-0000048b" kind="InParameter" referred="id-0065-0000023e" relid="0x0" role="InParameter">
-                  <name>a_listener</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{a821d230-c7d8-4f84-b429-de12810f0dcc}" id="id-0067-0000048c" kind="InParameter" referred="id-0067-0000066b" relid="0x0" role="InParameter">
-                  <name>mask</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{7baa6334-727a-45eb-8bc8-acdb0ad2b540}" id="id-0065-00000203" kind="TwowayOperation" relid="0x7" role="TwowayOperation">
-                <name>get_listener</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,760</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{f502b17e-d2b7-464e-bd39-9412dd43606b}" id="id-0067-0000048d" kind="ReturnType" referred="id-0065-0000023e" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{d2af0371-d9d1-428f-8bfb-802afdf9359e}" id="id-0065-00000204" kind="TwowayOperation" relid="0x8" role="TwowayOperation">
-                <name>get_topicdescription</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,860</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{a268a2b0-c39d-4647-a1ce-efabc5dcf561}" id="id-0067-0000048e" kind="ReturnType" referred="id-0065-000001d9" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{8a7e2afe-5ab1-4cfe-b674-aacd0fd4c738}" id="id-0065-00000205" kind="TwowayOperation" relid="0x9" role="TwowayOperation">
-                <name>get_subscriber</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,960</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{9ce8b5ad-c5a6-4ca0-aea6-360d84a46e7b}" id="id-0067-0000048f" kind="ReturnType" referred="id-0065-0000020f" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{908884b0-ec2f-4f93-9d92-35676ec68618}" id="id-0065-00000206" kind="TwowayOperation" relid="0xa" role="TwowayOperation">
-                <name>get_sample_rejected_status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1060</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{83bc4080-3dd2-4fc0-ab27-1b165be5d9d7}" id="id-0067-00000490" kind="InoutParameter" referred="id-0065-000001c6" relid="0x0" role="InoutParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{f9a9e169-86e9-4445-8806-62d620053a24}" id="id-0067-00000491" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{20d01bb3-85db-4f54-91c8-e86d17646904}" id="id-0065-00000207" kind="TwowayOperation" relid="0xb" role="TwowayOperation">
-                <name>get_liveliness_changed_status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{d7f892f0-21d5-4859-9740-eeb548de58ee}" id="id-0067-00000492" kind="InoutParameter" referred="id-0065-000001c8" relid="0x0" role="InoutParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{b3ca04b8-3317-4a38-b73f-7bc61ef0b153}" id="id-0067-00000493" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{e07c8a90-1bb4-415d-a61f-e84d832cde82}" id="id-0065-00000208" kind="TwowayOperation" relid="0xc" role="TwowayOperation">
-                <name>get_requested_deadline_missed_status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{b8b86714-2293-424e-b89c-638dc177aba7}" id="id-0067-00000494" kind="InoutParameter" referred="id-0065-000001ca" relid="0x0" role="InoutParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{3325465b-0890-48b6-9e0f-30e321a8a143}" id="id-0067-00000495" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{8fbc76bf-a8dc-41d1-bbbd-d950354e7fad}" id="id-0065-00000209" kind="TwowayOperation" relid="0xd" role="TwowayOperation">
-                <name>get_requested_incompatible_qos_status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{8ea78cd1-84d0-414a-9a39-280656bae196}" id="id-0067-00000496" kind="InoutParameter" referred="id-0065-000001cd" relid="0x0" role="InoutParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{17a44ee7-0ea9-401d-898d-2bdc0e33f7b2}" id="id-0067-00000497" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{2ca658fc-8e90-4e7d-ab2d-2690f5298858}" id="id-0065-0000020a" kind="TwowayOperation" relid="0xe" role="TwowayOperation">
-                <name>get_subscription_matched_status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{29026bb4-fe9d-444d-887e-ae6562a04e82}" id="id-0067-00000498" kind="InoutParameter" referred="id-0065-000001cf" relid="0x0" role="InoutParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{b3915b89-c92a-4982-9188-3484fe4784eb}" id="id-0067-00000499" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{88c6b525-6df9-413a-b781-9bc5393b5977}" id="id-0065-0000020b" kind="TwowayOperation" relid="0xf" role="TwowayOperation">
-                <name>get_sample_lost_status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{5cbe2df3-9bc6-4df7-a410-43ab45db51e9}" id="id-0067-0000049a" kind="InoutParameter" referred="id-0065-000001c4" relid="0x0" role="InoutParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{7a9a3452-d0c6-4893-8c1f-1e796ba00329}" id="id-0067-0000049b" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{be4f3287-cd07-4eb7-b6c7-b6896851149d}" id="id-0065-0000020c" kind="TwowayOperation" relid="0x10" role="TwowayOperation">
-                <name>wait_for_historical_data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1660</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{e3586331-a04c-48d6-96b6-fea0ce63a58b}" id="id-0067-0000049c" kind="InParameter" referred="id-0065-000001c1" relid="0x0" role="InParameter">
-                  <name>max_wait</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{f1748b53-c1f1-4fdd-9202-bf3388f88eee}" id="id-0067-0000049d" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{f7385d65-dd28-4743-8666-44afdc0129b1}" id="id-0065-0000020d" kind="TwowayOperation" relid="0x11" role="TwowayOperation">
-                <name>get_matched_publications</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1760</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{7d346b0a-c905-4a28-849e-fc2b86d70de4}" id="id-0067-0000049e" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{20acc5d7-554a-4dec-b47f-3bedea1bd78b}" id="id-0067-0000049f" kind="InoutParameter" referred="id-0067-000006bd" relid="0x0" role="InoutParameter">
-                  <name>publication_handles</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{0f133d49-abcd-45ba-9745-f48be5734e60}" id="id-0065-0000020e" kind="TwowayOperation" relid="0x12" role="TwowayOperation">
-                <name>get_matched_publication_data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1860</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{1ac6aab5-ab51-4304-af34-64a5ba64ba97}" id="id-0067-000004a0" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{70174954-be47-435a-9205-a9490ea902c8}" id="id-0067-000004a1" kind="InoutParameter" referred="id-0065-00000285" relid="0x0" role="InoutParameter">
-                  <name>publication_data</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{b5649232-92e1-4d70-a805-8bff7b23cd18}" id="id-0067-000004a2" kind="InParameter" referred="id-0067-000006bc" relid="0x0" role="InParameter">
-                  <name>publication_handle</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <reference guid="{862fa6bf-24a5-468a-aab3-85bb4ea3344c}" id="id-0067-000004a3" kind="Inherits" referred="id-0065-000001d4" relid="0x13" role="Inherits">
-                <name>Inherits</name>
-              </reference>
-            </model>
-            <model childrelidcntr="0x12" guid="{a113f8ff-f511-492e-8f3e-73fbfa24baef}" id="id-0065-0000020f" kind="Object" relid="0x1b" role="Object">
-              <name>Subscriber</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{bbf7de78-8d06-4ea2-9c05-f229f25c2db0}" id="id-0065-00000210" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>create_datareader</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{a24c2fc7-3ec8-42e7-98ec-0437cbc8ddcd}" id="id-0067-000004a4" kind="ReturnType" referred="id-0065-000001fb" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{eb1c9be3-ab4b-40e3-913d-cce3d47abccb}" id="id-0067-000004a5" kind="InParameter" referred="id-0065-000001d9" relid="0x0" role="InParameter">
-                  <name>a_topic</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{f2e089d5-e473-457d-80fc-66d8bea290b3}" id="id-0067-000004a6" kind="InParameter" referred="id-0065-00000281" relid="0x0" role="InParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{a88d13a8-95b4-43a2-b336-6e9389267b0c}" id="id-0067-000004a7" kind="InParameter" referred="id-0065-0000023e" relid="0x0" role="InParameter">
-                  <name>a_listener</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>360,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{31fcbf32-00a5-4877-bdfa-0381fb4a38a9}" id="id-0067-000004a8" kind="InParameter" referred="id-0067-0000066b" relid="0x0" role="InParameter">
-                  <name>mask</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>460,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{a832090b-f734-4b0b-b203-71aad2fadae9}" id="id-0065-00000211" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                <name>create_datareader_with_profile</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{38be5418-98f9-434a-9d16-d83296d16c3c}" id="id-0067-000004a9" kind="ReturnType" referred="id-0065-000001fb" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{1dcde549-a8e2-4dda-8ee8-09b6cc9f0640}" id="id-0067-000004aa" kind="InParameter" referred="id-0065-000001d9" relid="0x0" role="InParameter">
-                  <name>a_topic</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{fa32da6b-e51b-42d7-a141-f2ee67c52780}" id="id-0067-000004ab" kind="InParameter" referred="id-0066-00000066" relid="0x0" role="InParameter">
-                  <name>library_name</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{962da721-9691-4709-afaa-c515be44a833}" id="id-0067-000004ac" kind="InParameter" referred="id-0066-00000066" relid="0x0" role="InParameter">
-                  <name>profile_name</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>360,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{903a65c7-0c8d-49ed-a4e6-af4481a3f7e1}" id="id-0067-000004ad" kind="InParameter" referred="id-0065-0000023e" relid="0x0" role="InParameter">
-                  <name>a_listener</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>460,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{b5733249-8332-4dc6-85ba-97c59fd37ac4}" id="id-0067-000004ae" kind="InParameter" referred="id-0067-0000066b" relid="0x0" role="InParameter">
-                  <name>mask</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>560,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{56a03b42-9fad-4041-8a90-0c653e30677d}" id="id-0065-00000212" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-                <name>delete_datareader</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{d823a347-0491-469b-a106-c455478bb667}" id="id-0067-000004af" kind="InParameter" referred="id-0065-000001fb" relid="0x0" role="InParameter">
-                  <name>a_datareader</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{39555b40-9e6a-428c-91df-8ba60a80b0fa}" id="id-0067-000004b0" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{218763d2-572d-4185-a2f8-b96b6ba1edc1}" id="id-0065-00000213" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-                <name>delete_contained_entities</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{cb5cdb85-f31f-449a-874b-12745dedeca7}" id="id-0067-000004b1" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{36b1e64f-1d4b-4503-b025-65f4d3c0f093}" id="id-0065-00000214" kind="TwowayOperation" relid="0x4" role="TwowayOperation">
-                <name>lookup_datareader</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{37c3f4e8-20bd-4f6a-ae4e-aeec521ab3b2}" id="id-0067-000004b2" kind="ReturnType" referred="id-0065-000001fb" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{640f5837-4ffe-4a5d-b2c7-6a8b5c68060e}" id="id-0067-000004b3" kind="InParameter" referred="id-0066-00000066" relid="0x0" role="InParameter">
-                  <name>topic_name</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{5ae59d40-bd26-405e-9e83-97614689543e}" id="id-0065-00000215" kind="TwowayOperation" relid="0x5" role="TwowayOperation">
-                <name>get_datareaders</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{b5899b66-4d78-4072-85e9-164f8db37ed8}" id="id-0067-000004b4" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{3d3b90a6-59ba-4b88-b424-e2bc6f1517e3}" id="id-0067-000004b5" kind="InoutParameter" referred="id-0067-0000064f" relid="0x0" role="InoutParameter">
-                  <name>readers</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{028f06b5-ed5e-444e-acf1-dfdf163f5850}" id="id-0067-000004b6" kind="InParameter" referred="id-0067-0000067e" relid="0x0" role="InParameter">
-                  <name>sample_states</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{5b0c5ed6-21a3-40cb-b017-6c4ce9ece9c5}" id="id-0067-000004b7" kind="InParameter" referred="id-0067-00000683" relid="0x0" role="InParameter">
-                  <name>view_states</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>360,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{2a80dc59-0e77-42cb-8a13-024122aafdb0}" id="id-0067-000004b8" kind="InParameter" referred="id-0067-00000689" relid="0x0" role="InParameter">
-                  <name>instance_states</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>460,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{48db7971-bd50-43f9-84e0-26d3e3798b40}" id="id-0065-00000216" kind="TwowayOperation" relid="0x6" role="TwowayOperation">
-                <name>notify_datareaders</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,660</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{a979f694-aa7d-426e-b4ac-083295d17694}" id="id-0067-000004b9" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{2b8f29ad-5481-4930-b64c-458a7cb68b79}" id="id-0065-00000217" kind="TwowayOperation" relid="0x7" role="TwowayOperation">
-                <name>set_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,760</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{badc2a99-847c-4197-8328-11cfc16bb01e}" id="id-0067-000004ba" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{08fe8b5f-56af-4a23-a7e8-43186b10525c}" id="id-0067-000004bb" kind="InParameter" referred="id-0065-00000282" relid="0x0" role="InParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{214ee0c6-04bd-4bcf-8cda-9b9e748a5964}" id="id-0065-00000218" kind="TwowayOperation" relid="0x8" role="TwowayOperation">
-                <name>get_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,860</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{617ac9bb-8e8f-4723-9042-66937b916c6f}" id="id-0067-000004bc" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{1d17d063-a724-4aef-b623-d5210eac0d53}" id="id-0067-000004bd" kind="InoutParameter" referred="id-0065-00000282" relid="0x0" role="InoutParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{f80fee9e-c13c-4c8a-bf9d-e3f6516ccf93}" id="id-0065-00000219" kind="TwowayOperation" relid="0x9" role="TwowayOperation">
-                <name>set_listener</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,960</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{4b24d435-ed88-4ef3-a254-7f9fbd7ba88c}" id="id-0067-000004be" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{f4c07ebd-16e2-4e17-b5d9-0c65b175de31}" id="id-0067-000004bf" kind="InParameter" referred="id-0065-00000246" relid="0x0" role="InParameter">
-                  <name>a_listener</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{26414354-b5c6-422d-882b-2c217fdb3e65}" id="id-0067-000004c0" kind="InParameter" referred="id-0067-0000066b" relid="0x0" role="InParameter">
-                  <name>mask</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{68723394-e823-4e51-abdf-6be53b7cdf9a}" id="id-0065-0000021a" kind="TwowayOperation" relid="0xa" role="TwowayOperation">
-                <name>get_listener</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1060</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{453c2c55-363e-44fe-afc8-dd4c27456b65}" id="id-0067-000004c1" kind="ReturnType" referred="id-0065-00000246" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{10f5ae9e-1189-4942-b4fe-b4d8bfc8834c}" id="id-0065-0000021b" kind="TwowayOperation" relid="0xb" role="TwowayOperation">
-                <name>begin_access</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{737ddcc9-63ef-4dd6-89e2-9692ae6d55e8}" id="id-0067-000004c2" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{ca070b7c-2035-4501-a173-913adb2de7af}" id="id-0065-0000021c" kind="TwowayOperation" relid="0xc" role="TwowayOperation">
-                <name>end_access</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{a13f205e-d755-4713-a9a9-ab01cc26f656}" id="id-0067-000004c3" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{8335259a-d72c-4c44-811f-3f9df0e84b6e}" id="id-0065-0000021d" kind="TwowayOperation" relid="0xd" role="TwowayOperation">
-                <name>get_participant</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{65f9d75e-ccc8-4abc-b161-d4d609fbe1c6}" id="id-0067-000004c4" kind="ReturnType" referred="id-0065-00000287" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{f3371ab8-af13-44e8-b0a5-dd29f3e977c6}" id="id-0065-0000021e" kind="TwowayOperation" relid="0xe" role="TwowayOperation">
-                <name>set_default_datareader_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{171e9191-5944-4e5f-b7b8-84234331f3d9}" id="id-0067-000004c5" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{401654fe-a2f6-459b-b6c0-0113e70be839}" id="id-0067-000004c6" kind="InParameter" referred="id-0065-00000281" relid="0x0" role="InParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{10a13d5c-af2a-4a99-960b-6ce6b033b957}" id="id-0065-0000021f" kind="TwowayOperation" relid="0xf" role="TwowayOperation">
-                <name>get_default_datareader_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{716daca9-9c40-4155-a00d-be826b5cfc4e}" id="id-0067-000004c7" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{c134bb48-d9e8-44fc-8e1e-f3f78406833c}" id="id-0067-000004c8" kind="InoutParameter" referred="id-0065-00000281" relid="0x0" role="InoutParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{6f1547e5-e8de-4537-80e4-a53bed927dbf}" id="id-0065-00000220" kind="TwowayOperation" relid="0x10" role="TwowayOperation">
-                <name>copy_from_topic_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1660</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{7bc581f7-89fd-4916-8939-3b9e01f3dbd1}" id="id-0067-000004c9" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{5b5f3cad-0276-4fd1-a5a8-3e025a696bd2}" id="id-0067-000004ca" kind="InoutParameter" referred="id-0065-00000281" relid="0x0" role="InoutParameter">
-                  <name>a_datareader_qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{0664ad23-1a72-45d3-9c08-0ad871bf29a3}" id="id-0067-000004cb" kind="InParameter" referred="id-0065-0000027e" relid="0x0" role="InParameter">
-                  <name>a_topic_qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <reference guid="{4a00ae57-4ab2-4cff-b63f-0116e1ca0432}" id="id-0067-000004cc" kind="Inherits" referred="id-0065-000001d4" relid="0x11" role="Inherits">
-                <name>Inherits</name>
-              </reference>
-            </model>
-            <model childrelidcntr="0x13" guid="{4f5eebbb-cf9a-4547-88c3-68b4139798b5}" id="id-0065-00000221" kind="Object" relid="0x1c" role="Object">
-              <name>Publisher</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{d4a98d8d-7f33-41b7-98b5-4cc3572f0731}" id="id-0065-00000222" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>create_datawriter</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{cdd7167e-c07c-4afe-b134-209d53aabd6e}" id="id-0067-000004cd" kind="ReturnType" referred="id-0065-000001ec" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{34f51ff6-670d-4eff-8ed6-e811c6b38717}" id="id-0067-000004ce" kind="InParameter" referred="id-0065-000001dd" relid="0x0" role="InParameter">
-                  <name>a_topic</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{bf0a5c44-eb8a-41f4-869b-f7bf96c77dec}" id="id-0067-000004cf" kind="InParameter" referred="id-0065-0000027f" relid="0x0" role="InParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{ea51d174-903a-43f3-9023-e38848c4d448}" id="id-0067-000004d0" kind="InParameter" referred="id-0065-00000236" relid="0x0" role="InParameter">
-                  <name>a_listener</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>360,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{188b0667-16f2-4bcd-bc77-964e2366d0fe}" id="id-0067-000004d1" kind="InParameter" referred="id-0067-0000066b" relid="0x0" role="InParameter">
-                  <name>mask</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>460,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{afa7274d-6817-4601-9deb-d710d43e40d0}" id="id-0065-00000223" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                <name>create_datawriter_with_profile</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{0e08f6b6-76ad-4b40-82d3-b3024f8e751e}" id="id-0067-000004d2" kind="ReturnType" referred="id-0065-000001ec" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{a918d624-2e7b-4cc8-83a2-7368cc29ef3c}" id="id-0067-000004d3" kind="InParameter" referred="id-0065-000001dd" relid="0x0" role="InParameter">
-                  <name>a_topic</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{6981d70d-ddbb-4140-8259-ed8ba6c74c34}" id="id-0067-000004d4" kind="InParameter" referred="id-0066-00000066" relid="0x0" role="InParameter">
-                  <name>library_name</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{2421b119-5e27-4379-86f6-308f67a223c2}" id="id-0067-000004d5" kind="InParameter" referred="id-0066-00000066" relid="0x0" role="InParameter">
-                  <name>probile_name</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>360,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{79540497-9b9e-48a9-89e3-58c7e8d86aa4}" id="id-0067-000004d6" kind="InParameter" referred="id-0065-00000236" relid="0x0" role="InParameter">
-                  <name>a_listener</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>460,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{e46386b3-7971-4061-b9d9-e6aa0ae129af}" id="id-0067-000004d7" kind="InParameter" referred="id-0067-0000066b" relid="0x0" role="InParameter">
-                  <name>mask</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>560,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{b90ffda6-2051-4a0a-95ab-37a59a19edf9}" id="id-0065-00000224" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-                <name>delete_datawriter</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{02aa4e05-ae68-4033-9419-74c767cdafad}" id="id-0067-000004d8" kind="InParameter" referred="id-0065-000001ec" relid="0x0" role="InParameter">
-                  <name>a_datawriter</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{8e4d973b-95e8-4308-8793-2e3a6cdb5fb3}" id="id-0067-000004d9" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{d7ddfcd8-0fb8-4bba-bed4-87b098e094a9}" id="id-0065-00000225" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-                <name>lookup_datawriter</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{00e37ecc-0ea0-4d8b-9235-fa67204c2a02}" id="id-0067-000004da" kind="ReturnType" referred="id-0065-000001ec" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{44de8d28-5be1-4cf7-aefb-43ad2397a6fe}" id="id-0067-000004db" kind="InParameter" referred="id-0066-00000066" relid="0x0" role="InParameter">
-                  <name>topic_name</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{8d2971dc-bd0f-450c-a657-8e7d55ad7bd4}" id="id-0065-00000226" kind="TwowayOperation" relid="0x4" role="TwowayOperation">
-                <name>delete_contained_entities</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{3be19ff5-37af-4fe5-8a39-baabcc2fd8cf}" id="id-0067-000004dc" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{179d9a18-c488-4307-88d2-9f57797fb88d}" id="id-0065-00000227" kind="TwowayOperation" relid="0x5" role="TwowayOperation">
-                <name>set_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{dfd9f22b-b22f-4f6b-bb06-103200df3b51}" id="id-0067-000004dd" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{12663ac4-c11d-46e2-b1b7-fb490b1011db}" id="id-0067-000004de" kind="InParameter" referred="id-0065-00000280" relid="0x0" role="InParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{fb86cfc0-06ba-4804-8150-bf09edab5a9b}" id="id-0065-00000228" kind="TwowayOperation" relid="0x6" role="TwowayOperation">
-                <name>get_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,660</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{945ebf05-6a30-41f7-834d-e10b1d75060f}" id="id-0067-000004df" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{733a97ee-941d-4148-9821-c0f89a193f3b}" id="id-0067-000004e0" kind="InoutParameter" referred="id-0065-00000280" relid="0x0" role="InoutParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{cda3d7c2-d517-4ebc-bbba-88e79be7d0d0}" id="id-0065-00000229" kind="TwowayOperation" relid="0x7" role="TwowayOperation">
-                <name>set_listener</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,760</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{4cae743d-7e86-4885-8090-0e47849879cb}" id="id-0067-000004e1" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{5736a6b7-874a-4338-bc81-75ee9a951225}" id="id-0067-000004e2" kind="InParameter" referred="id-0065-0000023d" relid="0x0" role="InParameter">
-                  <name>a_listener</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{64528804-81a9-4bce-9624-c344e1b7516a}" id="id-0067-000004e3" kind="InParameter" referred="id-0067-0000066b" relid="0x0" role="InParameter">
-                  <name>mask</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{f4d17e9a-58fd-4fa5-9749-2161c13877e9}" id="id-0065-0000022a" kind="TwowayOperation" relid="0x8" role="TwowayOperation">
-                <name>get_listener</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,860</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{4418ea4f-36c0-44b2-96cc-928bfac92f54}" id="id-0067-000004e4" kind="ReturnType" referred="id-0065-0000023d" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{e7385d87-75fc-461e-b864-015eec341af5}" id="id-0065-0000022b" kind="TwowayOperation" relid="0x9" role="TwowayOperation">
-                <name>suspend_publications</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,960</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{60dc06b1-7275-4cd8-98be-9c7632266e9e}" id="id-0067-000004e5" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{0f6efba4-a689-4d3f-b7e9-cef7fa4bbd8c}" id="id-0065-0000022c" kind="TwowayOperation" relid="0xa" role="TwowayOperation">
-                <name>resume_publications</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1060</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{040979b6-4257-4fd0-b06c-2a9f887c4ec6}" id="id-0067-000004e6" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{09792629-4fdb-4c0e-b596-718cfbb74571}" id="id-0065-0000022d" kind="TwowayOperation" relid="0xb" role="TwowayOperation">
-                <name>begin_coherent_changes</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{dcc3bae7-db81-4fd1-8540-b8892c32513e}" id="id-0067-000004e7" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{66214d0a-29a9-4bf1-a24e-eddd7d3b4398}" id="id-0065-0000022e" kind="TwowayOperation" relid="0xc" role="TwowayOperation">
-                <name>end_coherent_changes</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{325fcbf1-6cb7-4152-a8fe-ad543c4d6f11}" id="id-0067-000004e8" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{d5293866-6ed6-4f2d-b42b-22fbca744fd4}" id="id-0065-0000022f" kind="TwowayOperation" relid="0xd" role="TwowayOperation">
-                <name>wait_for_acknowledgments</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{c9e98644-418c-4f72-bbf0-55362ec76bcd}" id="id-0067-000004e9" kind="InParameter" referred="id-0065-000001c1" relid="0x0" role="InParameter">
-                  <name>max_wait</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{641d952c-266b-4a75-95ab-77dd3f516a57}" id="id-0067-000004ea" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{c9f8ec8f-69a9-4c5b-885c-974b20297674}" id="id-0065-00000230" kind="TwowayOperation" relid="0xe" role="TwowayOperation">
-                <name>get_participant</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{9d3b8308-1b73-45f2-8b20-b0c0d7105af5}" id="id-0067-000004eb" kind="ReturnType" referred="id-0065-00000287" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{c122be64-e057-4bce-b70e-c911a0ef18d3}" id="id-0065-00000231" kind="TwowayOperation" relid="0xf" role="TwowayOperation">
-                <name>set_default_datawriter_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{ebcedb62-f5f4-4dd3-b652-5f8f6ae28093}" id="id-0067-000004ec" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{e201161b-3245-4c3e-87ff-54935e71b731}" id="id-0067-000004ed" kind="InParameter" referred="id-0065-0000027f" relid="0x0" role="InParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{f75d0811-ff01-4500-8125-4fc76004c532}" id="id-0065-00000232" kind="TwowayOperation" relid="0x10" role="TwowayOperation">
-                <name>get_default_datawriter_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1660</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{74d27c57-f92d-4af0-a090-c3acdb17ff21}" id="id-0067-000004ee" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{d4685544-1f06-459b-81a5-c618cce73903}" id="id-0067-000004ef" kind="InoutParameter" referred="id-0065-0000027f" relid="0x0" role="InoutParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{bac79da3-694b-4630-b0e8-b0e1c6588d5a}" id="id-0065-00000233" kind="TwowayOperation" relid="0x11" role="TwowayOperation">
-                <name>copy_from_topic_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1760</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{1577cab5-647c-4da4-84cf-4126946ffae7}" id="id-0067-000004f0" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{c7f99d7f-4ff0-43d6-9549-5e4f0fe584e7}" id="id-0067-000004f1" kind="InoutParameter" referred="id-0065-0000027f" relid="0x0" role="InoutParameter">
-                  <name>a_datawriter_qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{5d3895b6-c2d6-4015-af00-5465948508ef}" id="id-0067-000004f2" kind="InParameter" referred="id-0065-0000027e" relid="0x0" role="InParameter">
-                  <name>a_topic_qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <reference guid="{e4183a64-c3c8-4f7f-8d5c-cb8d262353a7}" id="id-0067-000004f3" kind="Inherits" referred="id-0065-000001d4" relid="0x12" role="Inherits">
-                <name>Inherits</name>
-              </reference>
-            </model>
-            <model childrelidcntr="0x2" guid="{b96f7fda-6a45-47d2-b103-11ad5bd524d4}" id="id-0065-00000234" kind="Object" relid="0x1d" role="Object">
-              <name>TopicListener</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{251c4042-ea65-4042-b536-b8a43990aa0c}" id="id-0065-00000235" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>on_inconsistent_topic</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{8e0de7d7-b5b0-49bf-a8c1-32ee4dca0cd2}" id="id-0067-000004f4" kind="InParameter" referred="id-0065-000001dd" relid="0x0" role="InParameter">
-                  <name>the_topic</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{667f44e5-472d-4fa2-b9ef-b4cbfab49c8d}" id="id-0067-000004f5" kind="InParameter" referred="id-0065-000001c3" relid="0x0" role="InParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <reference guid="{e1aef13f-a614-4c9b-82f6-d23fcbf62ffb}" id="id-0067-000004f6" kind="Inherits" referred="id-0065-000001d3" relid="0x1" role="Inherits">
-                <name>Inherits</name>
-              </reference>
-            </model>
-            <model childrelidcntr="0x7" guid="{6ec642f5-e2c2-4b1b-ad6b-c7589f6124ab}" id="id-0065-00000236" kind="Object" relid="0x1e" role="Object">
-              <name>DataWriterListener</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{4853b54d-7248-433c-ad29-dfaa7a701549}" id="id-0065-00000237" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>on_offered_deadline_missed</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{74c70e9f-b9ff-4924-95a1-d325adec0f18}" id="id-0067-000004f7" kind="InParameter" referred="id-0065-000001ec" relid="0x0" role="InParameter">
-                  <name>writer</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{1d4cc92e-9eff-41d3-a609-80026f5123df}" id="id-0067-000004f8" kind="InParameter" referred="id-0065-000001c9" relid="0x0" role="InParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{8ddaf5b7-f2a4-4bce-b2aa-62afaaf4a8fd}" id="id-0065-00000238" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                <name>on_offered_incompatible_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{826506ef-7504-4bf7-86c4-1a909979cced}" id="id-0067-000004f9" kind="InParameter" referred="id-0065-000001ec" relid="0x0" role="InParameter">
-                  <name>writer</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{30780cf3-8476-44da-bc3a-8dd199c42853}" id="id-0067-000004fa" kind="InParameter" referred="id-0065-000001cc" relid="0x0" role="InParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{65ac6074-64e3-4b24-92a0-d7f90c511e4e}" id="id-0065-00000239" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-                <name>on_liveliness_lost</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{1132162b-706b-4e7e-bb43-3bdf83c4c761}" id="id-0067-000004fb" kind="InParameter" referred="id-0065-000001ec" relid="0x0" role="InParameter">
-                  <name>writer</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{4b722d31-7fa2-415d-83c7-39a18d7ae812}" id="id-0067-000004fc" kind="InParameter" referred="id-0065-000001c7" relid="0x0" role="InParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{296dafd2-3702-44d9-ab7a-f929d72fbf65}" id="id-0065-0000023a" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-                <name>on_publication_matched</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{c2e910b4-b861-4d01-a709-989a53a053f3}" id="id-0067-000004fd" kind="InParameter" referred="id-0065-000001ec" relid="0x0" role="InParameter">
-                  <name>writer</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{ce1e5a71-12f7-406e-94b7-4b3ac2a2ef42}" id="id-0067-000004fe" kind="InParameter" referred="id-0065-000001ce" relid="0x0" role="InParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{b11529b5-a0d8-4003-9974-51497c3abaab}" id="id-0065-0000023b" kind="TwowayOperation" relid="0x4" role="TwowayOperation">
-                <name>on_reliable_writer_cache_changed</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{73023405-7e9b-4a0b-ad70-78c4aa8d80d2}" id="id-0067-000004ff" kind="InParameter" referred="id-0065-000001ec" relid="0x0" role="InParameter">
-                  <name>writer</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{bb850eb5-7830-4ce9-88cb-a8344d424b5d}" id="id-0067-00000500" kind="InParameter" referred="id-0065-000001d2" relid="0x0" role="InParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{32206b40-6314-4acb-a78f-f0aeb4218877}" id="id-0065-0000023c" kind="TwowayOperation" relid="0x5" role="TwowayOperation">
-                <name>on_reliable_reader_activity_changed</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{2974bfbf-5852-4460-8473-e59140fd694f}" id="id-0067-00000501" kind="InParameter" referred="id-0065-000001ec" relid="0x0" role="InParameter">
-                  <name>writer</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{2c9ad149-a03c-452e-ab6e-9b7e9336968b}" id="id-0067-00000502" kind="InParameter" referred="id-0065-000001d0" relid="0x0" role="InParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <reference guid="{d6f48dce-0393-45a5-af20-3d76bab7e49a}" id="id-0067-00000503" kind="Inherits" referred="id-0065-000001d3" relid="0x6" role="Inherits">
-                <name>Inherits</name>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{e4699243-959f-4fce-8308-d6fb2a3ba60c}" id="id-0065-0000023d" kind="Object" relid="0x1f" role="Object">
-              <name>PublisherListener</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{b19e72bd-4670-4fe6-b0f4-b571561e68f0}" id="id-0067-00000504" kind="Inherits" referred="id-0065-00000236" relid="0x0" role="Inherits">
-                <name>Inherits</name>
-              </reference>
-            </model>
-            <model childrelidcntr="0x8" guid="{21482efd-7490-4df3-bd59-af5c783e3468}" id="id-0065-0000023e" kind="Object" relid="0x20" role="Object">
-              <name>DataReaderListener</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{f152534c-add7-4f9d-91a6-ad53cb298618}" id="id-0065-0000023f" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>on_requested_deadline_missed</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{3a3ec0f6-3bed-4f2a-b03f-ab31f579d132}" id="id-0067-00000505" kind="InParameter" referred="id-0065-000001fb" relid="0x0" role="InParameter">
-                  <name>the_reader</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{7693b0f3-2e6a-4190-b460-1537d2b25b04}" id="id-0067-00000506" kind="InParameter" referred="id-0065-000001ca" relid="0x0" role="InParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{92c9b989-c372-49c2-a59f-5324d7779a4a}" id="id-0065-00000240" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                <name>on_requested_incompatible_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{bd247fbc-54fa-4eb9-92da-2bff562cd95f}" id="id-0067-00000507" kind="InParameter" referred="id-0065-000001fb" relid="0x0" role="InParameter">
-                  <name>the_reader</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{f496b174-7bc3-43c7-8bd6-b8d7c02a40e8}" id="id-0067-00000508" kind="InParameter" referred="id-0065-000001cd" relid="0x0" role="InParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{ab1169ab-0f50-4b35-bbb1-da177461bec7}" id="id-0065-00000241" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-                <name>on_sample_rejected</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{2e19fa4e-30af-4a38-8a07-83c6e50e848f}" id="id-0067-00000509" kind="InParameter" referred="id-0065-000001fb" relid="0x0" role="InParameter">
-                  <name>the_reader</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{1fa64424-331f-4dc3-8801-cae23da11c7c}" id="id-0067-0000050a" kind="InParameter" referred="id-0065-000001c6" relid="0x0" role="InParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{0163a50f-8169-4ccf-b200-89dbb6e3da85}" id="id-0065-00000242" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-                <name>on_liveliness_changed</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{72986913-c2cd-4987-b638-a01efe9cfb7a}" id="id-0067-0000050b" kind="InParameter" referred="id-0065-000001fb" relid="0x0" role="InParameter">
-                  <name>the_reader</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{94ddd20b-f16b-4ee6-895b-ad9c5bb5070b}" id="id-0067-0000050c" kind="InParameter" referred="id-0065-000001c8" relid="0x0" role="InParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{707b7440-d471-4b40-9cea-01a2d07993e9}" id="id-0065-00000243" kind="TwowayOperation" relid="0x4" role="TwowayOperation">
-                <name>on_data_available</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{5fcc73b8-51c8-4f68-a130-67d9ee8ff7e3}" id="id-0067-0000050d" kind="InParameter" referred="id-0065-000001fb" relid="0x0" role="InParameter">
-                  <name>the_reader</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{5d373a8d-d337-44cc-a28e-c3822dc7719a}" id="id-0065-00000244" kind="TwowayOperation" relid="0x5" role="TwowayOperation">
-                <name>on_subscription_matched</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{5339ea05-93ed-42f3-bf5a-e650aa6386cf}" id="id-0067-0000050e" kind="InParameter" referred="id-0065-000001fb" relid="0x0" role="InParameter">
-                  <name>the_reader</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{22bbcafe-f6a8-43b0-b9ec-da82617a9034}" id="id-0067-0000050f" kind="InParameter" referred="id-0065-000001cf" relid="0x0" role="InParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{ef0ed577-2fe7-41e2-9d84-01b3a7ac5ac2}" id="id-0065-00000245" kind="TwowayOperation" relid="0x6" role="TwowayOperation">
-                <name>on_sample_lost</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,660</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{99dfc069-394a-4586-8af3-f6b8d1ae62e9}" id="id-0067-00000510" kind="InParameter" referred="id-0065-000001fb" relid="0x0" role="InParameter">
-                  <name>the_reader</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{3a2275ba-2b65-4f7c-9b49-5d93a4b4916e}" id="id-0067-00000511" kind="InParameter" referred="id-0065-000001c4" relid="0x0" role="InParameter">
-                  <name>status</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <reference guid="{f6a27cc0-3122-4857-8022-6391beb021c3}" id="id-0067-00000512" kind="Inherits" referred="id-0065-000001d3" relid="0x7" role="Inherits">
-                <name>Inherits</name>
-              </reference>
-            </model>
-            <model childrelidcntr="0x2" guid="{4c9f54ce-366e-4d5b-8e0c-d733f62e3b94}" id="id-0065-00000246" kind="Object" relid="0x21" role="Object">
-              <name>SubscriberListener</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{77606d1b-4d11-4ffa-a143-6eaffb7108e4}" id="id-0065-00000247" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>on_data_on_readers</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{a84e3704-da57-47b7-81ad-9ca5d3083444}" id="id-0067-00000513" kind="InParameter" referred="id-0065-0000020f" relid="0x0" role="InParameter">
-                  <name>the_subscriber</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <reference guid="{3df2b316-f31a-4c9f-ba84-3a93a8eb0f8d}" id="id-0067-00000514" kind="Inherits" referred="id-0065-0000023e" relid="0x1" role="Inherits">
-                <name>Inherits</name>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{f9d59fe3-9616-4806-833d-2a15868c3cae}" id="id-0065-00000248" kind="Object" relid="0x22" role="Object">
-              <name>DomainParticipantListener</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{f2584eaf-ef06-4ad5-87ba-810c016187da}" id="id-0067-00000515" kind="Inherits" referred="id-0065-00000234" relid="0x0" role="Inherits">
-                <name>Inherits</name>
-              </reference>
-              <reference guid="{02f1a8ab-9785-494b-8445-ec77f5cdbcf7}" id="id-0067-00000516" kind="Inherits" referred="id-0065-000001d3" relid="0x0" role="Inherits">
-                <name>Inherits</name>
-              </reference>
-              <reference guid="{a56eb686-b35a-4881-a923-f6aff8c00ba7}" id="id-0067-00000517" kind="Inherits" referred="id-0065-0000023d" relid="0x0" role="Inherits">
-                <name>Inherits</name>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{20c8b739-65af-41ec-8d86-d821626a2a0e}" id="id-0065-00000249" kind="Object" relid="0x23" role="Object">
-              <name>Condition</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{90f43f6f-85b5-4226-ad3e-affd7916af2b}" id="id-0065-0000024a" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>get_trigger_value</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{7090f7d6-516d-4f5a-b12e-3c2a0aaf1b4f}" id="id-0067-00000518" kind="ReturnType" referred="id-0066-00000056" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-            </model>
-            <model childrelidcntr="0x4" guid="{963ea670-e2d4-4b71-b455-a310e1a8c32e}" id="id-0065-0000024b" kind="Object" relid="0x24" role="Object">
-              <name>WaitSet</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{2bec1971-a06d-49a1-b11f-dd4583830a2e}" id="id-0065-0000024c" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>wait</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{79266214-f81a-421a-bdb5-7e8e3203a7f0}" id="id-0067-00000519" kind="InoutParameter" referred="id-0067-00000650" relid="0x0" role="InoutParameter">
-                  <name>active_conditions</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{d9d9632b-67bf-4cc4-81f6-3e56f1537b3d}" id="id-0067-0000051a" kind="InParameter" referred="id-0065-000001c1" relid="0x0" role="InParameter">
-                  <name>timeout</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{87bff5ae-af9c-4ae1-8671-cdb4258dc924}" id="id-0067-0000051b" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{180796f6-b238-4fb1-b53d-95a62d74c7c7}" id="id-0065-0000024d" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                <name>attach_condition</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{cc5892e9-6b25-4a8f-be23-b23185a8fed5}" id="id-0067-0000051c" kind="InParameter" referred="id-0065-00000249" relid="0x0" role="InParameter">
-                  <name>cond</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{be03b66e-ce78-4793-9760-502027a66357}" id="id-0067-0000051d" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{f111c931-37a1-4b4b-a8ab-1b1d21ebe53f}" id="id-0065-0000024e" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-                <name>detach_condition</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{f718c48d-f98d-4e3b-9b3b-17abd3d1998c}" id="id-0067-0000051e" kind="InParameter" referred="id-0065-00000249" relid="0x0" role="InParameter">
-                  <name>cond</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{a1cec342-59b0-48ca-9fcd-e36a8ac60acf}" id="id-0067-0000051f" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{1444279c-ee95-4c33-9e1d-b4adde514038}" id="id-0065-0000024f" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-                <name>get_conditions</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{e27cb3cf-160d-440b-97c9-0e779c719ae6}" id="id-0067-00000520" kind="InoutParameter" referred="id-0067-00000650" relid="0x0" role="InoutParameter">
-                  <name>attached_conditions</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{3bb459d2-17c8-48c9-980b-29187643ed0d}" id="id-0067-00000521" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-            </model>
-            <model childrelidcntr="0x2" guid="{80afdb19-9426-44ec-a1e6-d7d81b6ec892}" id="id-0065-00000250" kind="Object" relid="0x25" role="Object">
-              <name>GuardCondition</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{ca4365c0-7848-43e7-815b-cda458caf3e2}" id="id-0065-00000251" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>set_trigger_value</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{adfa5c45-4218-405c-a892-35ea698c8f7d}" id="id-0067-00000522" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{316e1617-c876-4c5d-85a1-4c42b205e7d5}" id="id-0067-00000523" kind="InParameter" referred="id-0066-00000056" relid="0x0" role="InParameter">
-                  <name>value</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <reference guid="{38506d9c-3d34-4866-a783-f75d14a7a74f}" id="id-0067-00000524" kind="Inherits" referred="id-0065-00000249" relid="0x1" role="Inherits">
-                <name>Inherits</name>
-              </reference>
-            </model>
-            <model childrelidcntr="0x4" guid="{ad67a803-70ff-4d6e-967b-990b5e6c9e7f}" id="id-0065-00000252" kind="Object" relid="0x26" role="Object">
-              <name>StatusCondition</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{b7a09a16-8c83-4c45-b89b-2e323d17198b}" id="id-0065-00000253" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>get_enabled_statuses</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{4a0b2011-450f-48de-977e-a6bf358aff39}" id="id-0067-00000525" kind="ReturnType" referred="id-0067-0000066b" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{4706f066-fb65-49ce-9f68-f7c41a719ac1}" id="id-0065-00000254" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                <name>set_enabled_statuses</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{6de57292-4752-4277-b663-859fb467b851}" id="id-0067-00000526" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{3b21d514-9639-48b5-9416-b388ca4ca93e}" id="id-0067-00000527" kind="InParameter" referred="id-0067-0000066b" relid="0x0" role="InParameter">
-                  <name>mask</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{70d00df7-c473-441d-a716-cb05b29a4cf2}" id="id-0065-00000255" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-                <name>get_entity</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{99718575-6fb6-4a21-8e8e-cbfd521c869e}" id="id-0067-00000528" kind="ReturnType" referred="id-0065-000001d4" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <reference guid="{8f2a90d9-5b79-4c30-b0a4-9a152fda0bff}" id="id-0067-00000529" kind="Inherits" referred="id-0065-00000249" relid="0x3" role="Inherits">
-                <name>Inherits</name>
-              </reference>
-            </model>
-            <model childrelidcntr="0x5" guid="{64561bb2-bbd1-4a4c-90c7-d4e94b5b0c86}" id="id-0065-00000256" kind="Object" relid="0x27" role="Object">
-              <name>ReadCondition</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{08ef321e-fe40-447f-9bc6-8cd61417375b}" id="id-0065-00000257" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>get_sample_state_mask</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{61ec1fe6-5488-4dcd-9de0-7d9650927c6a}" id="id-0067-0000052a" kind="ReturnType" referred="id-0067-0000067e" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{35102179-2176-4e02-a59a-012ea18cd27b}" id="id-0065-00000258" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                <name>get_view_state_mask</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{331a9701-847d-4307-900a-71d242fdbe19}" id="id-0067-0000052b" kind="ReturnType" referred="id-0067-00000683" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{597df2bf-444d-4ef5-9016-790a7c639e41}" id="id-0065-00000259" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-                <name>get_instance_state_mask</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{83dc1818-b6aa-413e-9966-4a62cf8d9aba}" id="id-0067-0000052c" kind="ReturnType" referred="id-0067-00000689" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{7dfd7c28-b9d7-47b3-9156-e7402dfc6424}" id="id-0065-0000025a" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-                <name>get_datareader</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{9d0a0fce-db19-4a2a-bc5d-aa07a31d7d45}" id="id-0067-0000052d" kind="ReturnType" referred="id-0065-000001fb" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <reference guid="{4ac38eff-3932-4e71-a37c-20baa0295035}" id="id-0067-0000052e" kind="Inherits" referred="id-0065-00000249" relid="0x4" role="Inherits">
-                <name>Inherits</name>
-              </reference>
-            </model>
-            <model childrelidcntr="0x4" guid="{fb4c57c7-0d18-4743-873b-9f444650dd32}" id="id-0065-0000025b" kind="Object" relid="0x28" role="Object">
-              <name>QueryCondition</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{834abc4d-407d-40e2-93a6-6411f0a7e826}" id="id-0065-0000025c" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>get_query_expression</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{5983d075-b2ce-4cf5-b567-1cf4936a7486}" id="id-0067-0000052f" kind="ReturnType" referred="id-0066-00000066" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{0fb3b601-7e6c-4f02-9178-624d03577090}" id="id-0065-0000025d" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                <name>get_query_parameters</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{522fcbb6-90c7-40e2-af2e-f550658b2792}" id="id-0067-00000530" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{aa2e4b34-ec63-4eeb-a430-e191519b6275}" id="id-0067-00000531" kind="InoutParameter" referred="id-0067-00000655" relid="0x0" role="InoutParameter">
-                  <name>query_parameters</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{0a953f9e-5d4c-4249-b695-e32385783cbf}" id="id-0065-0000025e" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-                <name>set_query_parameters</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{af4a8656-a5fa-4d09-b08d-7e51d3320c6c}" id="id-0067-00000532" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{ae451663-d878-4598-a1df-6d0c6546cfd0}" id="id-0067-00000533" kind="InParameter" referred="id-0067-00000655" relid="0x0" role="InParameter">
-                  <name>query_parameters</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <reference guid="{c9fce9c4-515f-47f1-a2ed-3238a98e6e7e}" id="id-0067-00000534" kind="Inherits" referred="id-0065-00000256" relid="0x3" role="Inherits">
-                <name>Inherits</name>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{5d0b0d21-0174-4a3f-a4b1-4810b9b03867}" id="id-0065-0000025f" kind="Aggregate" relid="0x29" role="Aggregate">
-              <name>UserDataQosPolicy</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{cd833cb5-c474-4de6-82bd-f5813899e78a}" id="id-0067-00000535" kind="Member" referred="id-0067-000006b8" relid="0x0" role="Member">
-                <name>value</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{31e7ed51-9481-4d36-8b4c-1143ae45140b}" id="id-0065-00000260" kind="Aggregate" relid="0x2a" role="Aggregate">
-              <name>TopicDataQosPolicy</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{0d4a3355-a817-412a-8ea7-9cd4192fe166}" id="id-0067-00000536" kind="Member" referred="id-0067-000006b8" relid="0x0" role="Member">
-                <name>value</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{a1453d77-ab8f-49f1-854f-53aca2b29f30}" id="id-0065-00000261" kind="Aggregate" relid="0x2b" role="Aggregate">
-              <name>GroupDataQosPolicy</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{cc6206d6-92db-42f9-ae85-1f10fc8fcc5a}" id="id-0067-00000537" kind="Member" referred="id-0067-000006b8" relid="0x0" role="Member">
-                <name>value</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{8f8dfe08-4063-42d2-a314-927a6aba1826}" id="id-0065-00000262" kind="Aggregate" relid="0x2c" role="Aggregate">
-              <name>TransportPriorityQosPolicy</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{09ac6238-520c-4c56-9ec6-8a4afc0f4357}" id="id-0067-00000538" kind="Member" referred="id-0066-0000005b" relid="0x0" role="Member">
-                <name>value</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{d0473b4d-657b-4a9a-9b78-6119c51060ea}" id="id-0065-00000263" kind="Aggregate" relid="0x2d" role="Aggregate">
-              <name>LifespanQosPolicy</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{92a37816-156e-4678-b977-791074f4683c}" id="id-0067-00000539" kind="Member" referred="id-0065-000001c1" relid="0x0" role="Member">
-                <name>duration</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x4" guid="{640d2a39-4edc-4d30-84c1-3015943c36c1}" id="id-0065-00000264" kind="Enum" relid="0x2e" role="Enum">
-              <name>DurabilityQosPolicyKind</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <atom guid="{e250443e-7189-42c1-af22-aa7e3e62bf4b}" id="id-0066-00000043" kind="EnumValue" relid="0x0" role="EnumValue">
-                <name>VOLATILE_DURABILITY_QOS</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-              <atom guid="{6ec098c3-f16b-43c0-b632-3e6f83d4fd72}" id="id-0066-00000044" kind="EnumValue" relid="0x1" role="EnumValue">
-                <name>TRANSIENT_LOCAL_DURABILITY_QOS</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-              <atom guid="{72b79f7c-e86f-4718-9a41-00be9c925290}" id="id-0066-00000045" kind="EnumValue" relid="0x2" role="EnumValue">
-                <name>TRANSIENT_DURABILITY_QOS</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-              <atom guid="{cc39bfcd-d61c-466e-8320-328d1c9f05c3}" id="id-0066-00000046" kind="EnumValue" relid="0x3" role="EnumValue">
-                <name>PERSISTENT_DURABILITY_QOS</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-            </model>
-            <model childrelidcntr="0x1" guid="{5af9d5af-d54e-482b-8e8c-c8bbcbf3b030}" id="id-0065-00000265" kind="Aggregate" relid="0x2f" role="Aggregate">
-              <name>DurabilityQosPolicy</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{6cb4e11e-f909-43c8-af97-acddef43abf8}" id="id-0067-0000053a" kind="Member" referred="id-0065-00000264" relid="0x0" role="Member">
-                <name>kind</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x3" guid="{6bfe912d-b9e1-4a25-93a0-b44eb90e129d}" id="id-0065-00000266" kind="Enum" relid="0x30" role="Enum">
-              <name>PresentationQosPolicyAccessScopeKind</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <atom guid="{9673971f-2e34-46de-8ec8-73798197d0bd}" id="id-0066-00000047" kind="EnumValue" relid="0x0" role="EnumValue">
-                <name>INSTANCE_PRESENTATION_QOS</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-              <atom guid="{ce53e6e7-5e3b-46f5-b79f-795c4b48e0ad}" id="id-0066-00000048" kind="EnumValue" relid="0x1" role="EnumValue">
-                <name>TOPIC_PRESENTATION_QOS</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-              <atom guid="{90f403f0-3368-4050-aef9-2ae0da24c2c9}" id="id-0066-00000049" kind="EnumValue" relid="0x2" role="EnumValue">
-                <name>GROUP_PRESENTATION_QOS</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-            </model>
-            <model childrelidcntr="0x1" guid="{ca630852-9aea-4553-8cb2-041012ae8aec}" id="id-0065-00000267" kind="Aggregate" relid="0x31" role="Aggregate">
-              <name>PresentationQosPolicy</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{d481933b-86f0-492a-b029-8288e8a6b97c}" id="id-0067-0000053b" kind="Member" referred="id-0065-00000266" relid="0x0" role="Member">
-                <name>access_scope</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{1a77a076-e8af-4a83-bdc7-e3dbe8e6079e}" id="id-0067-0000053c" kind="Member" referred="id-0066-00000056" relid="0x0" role="Member">
-                <name>coherent_access</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{95f21377-62b7-4462-a043-98094379ebb7}" id="id-0067-0000053d" kind="Member" referred="id-0066-00000056" relid="0x0" role="Member">
-                <name>ordered_access</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{7d1121ef-12bb-4158-8d1c-c83e92792f6a}" id="id-0065-00000268" kind="Aggregate" relid="0x32" role="Aggregate">
-              <name>DeadlineQosPolicy</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{973f4fac-415a-4c29-99ee-0c8cff77b894}" id="id-0067-0000053e" kind="Member" referred="id-0065-000001c1" relid="0x0" role="Member">
-                <name>period</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{cf2d355a-ac71-42e8-974e-2991e17d4819}" id="id-0065-00000269" kind="Aggregate" relid="0x33" role="Aggregate">
-              <name>LatencyBudgetQosPolicy</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{9497318d-e203-47fc-8222-76fee855c609}" id="id-0067-0000053f" kind="Member" referred="id-0065-000001c1" relid="0x0" role="Member">
-                <name>duration</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x2" guid="{13267686-3ead-49f5-9b7d-db38a7ba7d6c}" id="id-0065-0000026a" kind="Enum" relid="0x34" role="Enum">
-              <name>OwnershipQosPolicyKind</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <atom guid="{35bbee33-3cfb-4100-9f13-2089c07e8708}" id="id-0066-0000004a" kind="EnumValue" relid="0x0" role="EnumValue">
-                <name>SHARED_OWNERSHIP_QOS</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-              <atom guid="{f66082d0-4e9f-4361-a26d-6d6050d83b9c}" id="id-0066-0000004b" kind="EnumValue" relid="0x1" role="EnumValue">
-                <name>EXCLUSIVE_OWNERSHIP_QOS</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-            </model>
-            <model childrelidcntr="0x1" guid="{40c1b881-6f39-4bf5-9073-bea84cfcae9a}" id="id-0065-0000026b" kind="Aggregate" relid="0x35" role="Aggregate">
-              <name>OwnershipQosPolicy</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{7c40efef-88c4-4943-a5c1-f2bf1669fbf8}" id="id-0067-00000540" kind="Member" referred="id-0065-0000026a" relid="0x0" role="Member">
-                <name>kind</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{44e1dafc-c12e-486c-9196-a18a5e346bbf}" id="id-0065-0000026c" kind="Aggregate" relid="0x36" role="Aggregate">
-              <name>OwnershipStrengthQosPolicy</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{99a7f461-8cbe-4576-b104-37bc31847fa6}" id="id-0067-00000541" kind="Member" referred="id-0066-0000005b" relid="0x0" role="Member">
-                <name>value</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x3" guid="{7038e581-f25e-4142-bd4c-60e4dde8a414}" id="id-0065-0000026d" kind="Enum" relid="0x37" role="Enum">
-              <name>LivelinessQosPolicyKind</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <atom guid="{eeb954a4-8770-4151-a626-e4adc5aa10a6}" id="id-0066-0000004c" kind="EnumValue" relid="0x0" role="EnumValue">
-                <name>AUTOMATIC_LIVELINESS_QOS</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-              <atom guid="{327f4ac0-ec1a-4eb9-a118-3af2a9076ed5}" id="id-0066-0000004d" kind="EnumValue" relid="0x1" role="EnumValue">
-                <name>MANUAL_BY_PARTICIPANT_LIVELINESS_QOS</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-              <atom guid="{09db2b95-ea2f-4c62-aee6-38106f64e4c5}" id="id-0066-0000004e" kind="EnumValue" relid="0x2" role="EnumValue">
-                <name>MANUAL_BY_TOPIC_LIVELINESS_QOS</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-            </model>
-            <model childrelidcntr="0x1" guid="{9edb5275-ff34-4335-8293-ffbff6839c8a}" id="id-0065-0000026e" kind="Aggregate" relid="0x38" role="Aggregate">
-              <name>LivelinessQosPolicy</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{47b83650-1752-455a-819e-af36e2a02141}" id="id-0067-00000542" kind="Member" referred="id-0065-0000026d" relid="0x0" role="Member">
-                <name>kind</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{290d189e-21d9-4a89-bc2d-c146e577531a}" id="id-0067-00000543" kind="Member" referred="id-0065-000001c1" relid="0x0" role="Member">
-                <name>lease_duration</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{b6a1a384-bb33-4f77-8481-c99115ff8f75}" id="id-0065-0000026f" kind="Aggregate" relid="0x39" role="Aggregate">
-              <name>TimeBasedFilterQosPolicy</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{bdba4cf2-1773-454f-9848-e77539c6047d}" id="id-0067-00000544" kind="Member" referred="id-0065-000001c1" relid="0x0" role="Member">
-                <name>minimum_separation</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{9d41c454-c99c-437c-adba-ad1734d0de96}" id="id-0065-00000270" kind="Aggregate" relid="0x3a" role="Aggregate">
-              <name>PartitionQosPolicy</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{6bdaee44-0810-4fac-b0d7-83d06edf56b1}" id="id-0067-00000545" kind="Member" referred="id-0067-00000655" relid="0x0" role="Member">
-                <name>name</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x2" guid="{58736bb3-17e7-4d63-94c9-6fbdcf891236}" id="id-0065-00000271" kind="Enum" relid="0x3b" role="Enum">
-              <name>ReliabilityQosPolicyKind</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <atom guid="{67c74094-0213-40ca-95a5-944d3ec6bbe1}" id="id-0066-0000004f" kind="EnumValue" relid="0x0" role="EnumValue">
-                <name>BEST_EFFORT_RELIABILITY_QOS</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-              <atom guid="{415114cd-5195-489f-bd3d-62da3c346ce5}" id="id-0066-00000050" kind="EnumValue" relid="0x1" role="EnumValue">
-                <name>RELIABLE_RELIABILITY_QOS</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-            </model>
-            <model childrelidcntr="0x1" guid="{23dcaea5-1b19-4696-9f88-59597b375aea}" id="id-0065-00000272" kind="Aggregate" relid="0x3c" role="Aggregate">
-              <name>ReliabilityQosPolicy</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{2d463ec8-1f8b-413d-b901-2877be67a0d9}" id="id-0067-00000546" kind="Member" referred="id-0065-00000271" relid="0x0" role="Member">
-                <name>kind</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{48e76418-260b-4186-b8f5-b58fe85f0efd}" id="id-0067-00000547" kind="Member" referred="id-0065-000001c1" relid="0x0" role="Member">
-                <name>max_blocking_time</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x2" guid="{8591eaca-32e4-44e4-bebb-b3e52d458ce1}" id="id-0065-00000273" kind="Enum" relid="0x3d" role="Enum">
-              <name>DestinationOrderQosPolicyKind</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <atom guid="{80c44981-7092-43c8-9e6f-34e5e0dd7506}" id="id-0066-00000051" kind="EnumValue" relid="0x0" role="EnumValue">
-                <name>BY_RECEPTION_TIMESTAMP_DESTINATIONORDER_QOS</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-              <atom guid="{0c071810-7892-4c4c-bdb8-a77fafb75faf}" id="id-0066-00000052" kind="EnumValue" relid="0x1" role="EnumValue">
-                <name>BY_SOURCE_TIMESTAMP_DESTINATIONORDER_QOS</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-            </model>
-            <model childrelidcntr="0x1" guid="{196945c2-043f-4a8f-bfb1-7d05a359ed03}" id="id-0065-00000274" kind="Aggregate" relid="0x3e" role="Aggregate">
-              <name>DestinationOrderQosPolicy</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{9bde85a2-fd0a-4bf3-978c-4673d1e5e12c}" id="id-0067-00000548" kind="Member" referred="id-0065-00000273" relid="0x0" role="Member">
-                <name>kind</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x2" guid="{08af6c5f-caa3-4ca1-a4d1-b9d54310c697}" id="id-0065-00000275" kind="Enum" relid="0x3f" role="Enum">
-              <name>HistoryQosPolicyKind</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <atom guid="{7fc1b160-a621-440a-a680-dcb03426eda0}" id="id-0066-00000053" kind="EnumValue" relid="0x0" role="EnumValue">
-                <name>KEEP_LAST_HISTORY_QOS</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-              <atom guid="{ed898fc4-b4d7-4d8b-9ec7-4e18b78f8d47}" id="id-0066-00000054" kind="EnumValue" relid="0x1" role="EnumValue">
-                <name>KEEP_ALL_HISTORY_QOS</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </atom>
-            </model>
-            <model childrelidcntr="0x1" guid="{0ac088b7-d4d1-45e3-b138-3de5e5f8ca51}" id="id-0065-00000276" kind="Aggregate" relid="0x40" role="Aggregate">
-              <name>HistoryQosPolicy</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{7217533c-d1f2-4c3b-b3d9-61d2045ea106}" id="id-0067-00000549" kind="Member" referred="id-0065-00000275" relid="0x0" role="Member">
-                <name>kind</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{433081f8-8617-42fd-9abe-b688bbcf98ce}" id="id-0067-0000054a" kind="Member" referred="id-0066-0000005b" relid="0x0" role="Member">
-                <name>depth</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{f8a00190-2a75-41c2-b5a0-682d61568931}" id="id-0065-00000277" kind="Aggregate" relid="0x41" role="Aggregate">
-              <name>ResourceLimitsQosPolicy</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{cc496538-8bd6-43a0-9c79-36cb89801e41}" id="id-0067-0000054b" kind="Member" referred="id-0066-0000005b" relid="0x0" role="Member">
-                <name>max_samples</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{ca3c745f-ba26-4d08-b621-951177cb1687}" id="id-0067-0000054c" kind="Member" referred="id-0066-0000005b" relid="0x0" role="Member">
-                <name>max_instances</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{f744660b-bf6d-4b72-a07f-857e5f8fce68}" id="id-0067-0000054d" kind="Member" referred="id-0066-0000005b" relid="0x0" role="Member">
-                <name>max_samples_per_instance</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{fb47bdf9-902a-4e57-8f13-c418ec0265c6}" id="id-0065-00000278" kind="Aggregate" relid="0x42" role="Aggregate">
-              <name>EntityFactoryQosPolicy</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{3b58eef4-8165-466a-afbb-5560964f1031}" id="id-0067-0000054e" kind="Member" referred="id-0066-00000056" relid="0x0" role="Member">
-                <name>autoenable_created_entities</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{a6461d6d-7852-4fc0-9ae7-e5d889df27f7}" id="id-0065-00000279" kind="Aggregate" relid="0x43" role="Aggregate">
-              <name>WriterDataLifecycleQosPolicy</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{10690b87-d46c-433c-9f98-8840fe0ba8d9}" id="id-0067-0000054f" kind="Member" referred="id-0066-00000056" relid="0x0" role="Member">
-                <name>autodispose_unregistered_instances</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{dd3409b2-3697-4a11-bdf1-8678ac54106b}" id="id-0065-0000027a" kind="Aggregate" relid="0x44" role="Aggregate">
-              <name>ReaderDataLifecycleQosPolicy</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{1ddfb830-8f41-4f6f-b977-7338cd722230}" id="id-0067-00000550" kind="Member" referred="id-0065-000001c1" relid="0x0" role="Member">
-                <name>autopurge_nowriter_samples_delay</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{cfde8b31-af5b-4977-8087-860ff997669b}" id="id-0067-00000551" kind="Member" referred="id-0065-000001c1" relid="0x0" role="Member">
-                <name>autopurge_disposed_samples_delay</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{66cb25d0-4e81-4929-a939-d2e4008a3c0d}" id="id-0065-0000027b" kind="Aggregate" relid="0x45" role="Aggregate">
-              <name>DurabilityServiceQosPolicy</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{975eed39-aa06-4b1c-b3a3-5981dac1db8a}" id="id-0067-00000552" kind="Member" referred="id-0065-000001c1" relid="0x0" role="Member">
-                <name>service_cleanup_delay</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{2822bd5d-8275-416a-916e-fb16379386a8}" id="id-0067-00000553" kind="Member" referred="id-0065-00000275" relid="0x0" role="Member">
-                <name>history_kind</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{9a11855b-e433-47b7-bc08-05028dd0d5ab}" id="id-0067-00000554" kind="Member" referred="id-0066-0000005b" relid="0x0" role="Member">
-                <name>history_depth</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{028068fb-4140-47a0-82a3-7481a1fd5f55}" id="id-0067-00000555" kind="Member" referred="id-0066-0000005b" relid="0x0" role="Member">
-                <name>max_samples</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{443d629e-763c-4995-9222-0aa69f824604}" id="id-0067-00000556" kind="Member" referred="id-0066-0000005b" relid="0x0" role="Member">
-                <name>max_instances</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{7cf79540-2e2c-4b32-a441-9c6f0448d7e2}" id="id-0067-00000557" kind="Member" referred="id-0066-0000005b" relid="0x0" role="Member">
-                <name>max_samples_per_instance</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{e01cafd0-be06-4610-bff3-cf897ea84212}" id="id-0065-0000027c" kind="Aggregate" relid="0x46" role="Aggregate">
-              <name>DomainParticipantFactoryQos</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{7adb24c4-6ca5-4543-85ac-a114f06ef16a}" id="id-0067-00000558" kind="Member" referred="id-0065-00000278" relid="0x0" role="Member">
-                <name>entity_factory</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{80880e1a-6bf3-4fad-8983-6703f02306de}" id="id-0065-0000027d" kind="Aggregate" relid="0x47" role="Aggregate">
-              <name>DomainParticipantQos</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{38a14857-e704-4a13-ad7b-d54be2b3ae21}" id="id-0067-00000559" kind="Member" referred="id-0065-0000025f" relid="0x0" role="Member">
-                <name>user_data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{ae9c7b4c-817a-4eeb-9ac6-442d42d6ac8c}" id="id-0067-0000055a" kind="Member" referred="id-0065-00000278" relid="0x0" role="Member">
-                <name>entity_factory</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{d3a0c983-29d0-43c8-8bd8-29d44ba1f655}" id="id-0065-0000027e" kind="Aggregate" relid="0x48" role="Aggregate">
-              <name>TopicQos</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{d104f47a-95f8-4d58-aad8-19e32111c9f1}" id="id-0067-0000055b" kind="Member" referred="id-0065-00000260" relid="0x0" role="Member">
-                <name>topic_data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{8cd8f79d-6a29-471e-b0bb-cc5d6b7ffe34}" id="id-0067-0000055c" kind="Member" referred="id-0065-00000265" relid="0x0" role="Member">
-                <name>durability</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{ef026d4c-df93-4537-862c-1f6d6e96f209}" id="id-0067-0000055d" kind="Member" referred="id-0065-0000027b" relid="0x0" role="Member">
-                <name>durability_service</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{ceea4172-e125-48b6-af32-c92321bcb497}" id="id-0067-0000055e" kind="Member" referred="id-0065-00000268" relid="0x0" role="Member">
-                <name>deadline</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{fce43b52-4868-4e1f-a9b0-d113954a6e1e}" id="id-0067-0000055f" kind="Member" referred="id-0065-00000269" relid="0x0" role="Member">
-                <name>latency_budget</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{2c72abea-95b5-48ba-8778-92dcf8ea5212}" id="id-0067-00000560" kind="Member" referred="id-0065-0000026e" relid="0x0" role="Member">
-                <name>liveliness</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{9070def0-791b-4252-ba41-0fe9742ff8fd}" id="id-0067-00000561" kind="Member" referred="id-0065-00000272" relid="0x0" role="Member">
-                <name>reliability</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,660</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{65e2a28d-1333-461f-8fce-fc49b1255cc3}" id="id-0067-00000562" kind="Member" referred="id-0065-00000274" relid="0x0" role="Member">
-                <name>destination_order</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,760</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{7061f8ed-86da-493c-a821-871b8b50983d}" id="id-0067-00000563" kind="Member" referred="id-0065-00000276" relid="0x0" role="Member">
-                <name>history</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,860</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{fc6db77a-da19-4c24-9b38-f4adaf495ea0}" id="id-0067-00000564" kind="Member" referred="id-0065-00000277" relid="0x0" role="Member">
-                <name>resource_limits</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,960</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{1621cc44-b1e0-4e97-a19c-4d8cffdb85a8}" id="id-0067-00000565" kind="Member" referred="id-0065-00000262" relid="0x0" role="Member">
-                <name>transport_priority</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1060</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{a1a4d783-fc7d-4b24-b6c5-7dd4ceb8f78d}" id="id-0067-00000566" kind="Member" referred="id-0065-00000263" relid="0x0" role="Member">
-                <name>lifespan</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{94a5ca2d-6006-413c-9599-7b78c7ae6318}" id="id-0067-00000567" kind="Member" referred="id-0065-0000026b" relid="0x0" role="Member">
-                <name>ownership</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{142090e7-4afa-40f9-a7b7-acca45b58f89}" id="id-0065-0000027f" kind="Aggregate" relid="0x49" role="Aggregate">
-              <name>DataWriterQos</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{dbc6fe81-1bc3-4cac-acd0-8d819637963a}" id="id-0067-00000568" kind="Member" referred="id-0065-00000265" relid="0x0" role="Member">
-                <name>durability</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{40bb7cad-1c21-4c1c-97d5-74e80222eb35}" id="id-0067-00000569" kind="Member" referred="id-0065-0000027b" relid="0x0" role="Member">
-                <name>durability_service</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{161dce72-3f95-4cc7-9a75-da9564ca3aea}" id="id-0067-0000056a" kind="Member" referred="id-0065-00000268" relid="0x0" role="Member">
-                <name>deadline</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{9d9aa4a9-e988-4b14-b328-862ee8be23e3}" id="id-0067-0000056b" kind="Member" referred="id-0065-00000269" relid="0x0" role="Member">
-                <name>latency_budget</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{dd5d7b74-74d4-4f7f-8110-a098f5052b14}" id="id-0067-0000056c" kind="Member" referred="id-0065-0000026e" relid="0x0" role="Member">
-                <name>liveliness</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{872e8c21-6318-4ab5-a1d4-890ee96fc4ce}" id="id-0067-0000056d" kind="Member" referred="id-0065-00000272" relid="0x0" role="Member">
-                <name>reliability</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{318a73ee-29f7-4651-b9b7-654d6b956ac9}" id="id-0067-0000056e" kind="Member" referred="id-0065-00000274" relid="0x0" role="Member">
-                <name>destination_order</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,660</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{cae97f14-b966-4b09-852d-3f3112b8a57e}" id="id-0067-0000056f" kind="Member" referred="id-0065-00000276" relid="0x0" role="Member">
-                <name>history</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,760</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{2f93bc29-54a3-41cc-adb4-f54c99330b5a}" id="id-0067-00000570" kind="Member" referred="id-0065-00000277" relid="0x0" role="Member">
-                <name>resource_limits</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,860</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{74fdb0e3-5d0e-481f-9985-f8d33b72b238}" id="id-0067-00000571" kind="Member" referred="id-0065-00000262" relid="0x0" role="Member">
-                <name>transport_priority</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,960</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{43b72f95-f755-4253-9693-34052ad1b3dc}" id="id-0067-00000572" kind="Member" referred="id-0065-00000263" relid="0x0" role="Member">
-                <name>lifespan</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1060</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{5323a935-6a62-44c5-9149-ccabb2ee80ba}" id="id-0067-00000573" kind="Member" referred="id-0065-0000025f" relid="0x0" role="Member">
-                <name>user_data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{82ac8d4d-96de-401e-9a0d-09f02332e7ca}" id="id-0067-00000574" kind="Member" referred="id-0065-0000026b" relid="0x0" role="Member">
-                <name>ownership</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{6eb4257c-6a47-42dd-9585-971b6f1e591b}" id="id-0067-00000575" kind="Member" referred="id-0065-0000026c" relid="0x0" role="Member">
-                <name>ownership_strength</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{2a7f428e-f781-4d5a-8614-6fbab50ec1f9}" id="id-0067-00000576" kind="Member" referred="id-0065-00000279" relid="0x0" role="Member">
-                <name>writer_data_lifecycle</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{05f323d2-bea1-4cd9-97d2-9d2d15244fbc}" id="id-0065-00000280" kind="Aggregate" relid="0x4a" role="Aggregate">
-              <name>PublisherQos</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{507c41be-ceb6-4a51-960b-f79f086b46e9}" id="id-0067-00000577" kind="Member" referred="id-0065-00000267" relid="0x0" role="Member">
-                <name>presentation</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{6fa8ae61-0ba5-4fcd-b0dc-0f3f94fb0903}" id="id-0067-00000578" kind="Member" referred="id-0065-00000270" relid="0x0" role="Member">
-                <name>partition</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{96603f31-1a32-43d3-955c-7de1350608af}" id="id-0067-00000579" kind="Member" referred="id-0065-00000261" relid="0x0" role="Member">
-                <name>group_data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{95c00a23-9a51-4bbd-b7b2-8b10a62bb323}" id="id-0067-0000057a" kind="Member" referred="id-0065-00000278" relid="0x0" role="Member">
-                <name>entity_factory</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{5d8504b8-9924-4d9f-8454-057da8c34ac6}" id="id-0065-00000281" kind="Aggregate" relid="0x4b" role="Aggregate">
-              <name>DataReaderQos</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{a8a7970b-a25c-45af-9e9e-65d1d36f8b25}" id="id-0067-0000057b" kind="Member" referred="id-0065-00000265" relid="0x0" role="Member">
-                <name>durability</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{2e3cb73e-6c5b-4166-8d8d-80586358ce71}" id="id-0067-0000057c" kind="Member" referred="id-0065-00000268" relid="0x0" role="Member">
-                <name>deadline</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{16d3543d-99da-4ab2-982e-b307a74938c7}" id="id-0067-0000057d" kind="Member" referred="id-0065-00000269" relid="0x0" role="Member">
-                <name>latency_budget</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{2748857a-a261-47a7-8697-43989a3016c9}" id="id-0067-0000057e" kind="Member" referred="id-0065-0000026e" relid="0x0" role="Member">
-                <name>liveliness</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{c598c25e-4b38-40ac-9481-73d226446408}" id="id-0067-0000057f" kind="Member" referred="id-0065-00000272" relid="0x0" role="Member">
-                <name>reliability</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{d06b2587-7836-47a3-8db4-0fd9b1a35cc4}" id="id-0067-00000580" kind="Member" referred="id-0065-00000274" relid="0x0" role="Member">
-                <name>destination_order</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{1af79dc4-80df-44b4-b755-b78c130504c9}" id="id-0067-00000581" kind="Member" referred="id-0065-00000276" relid="0x0" role="Member">
-                <name>history</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,660</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{9ea85702-c298-499e-b8d5-a3a5119c6ad8}" id="id-0067-00000582" kind="Member" referred="id-0065-00000277" relid="0x0" role="Member">
-                <name>resource_limits</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,760</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{75038eb6-12d7-4b05-a3ca-0b56c09289de}" id="id-0067-00000583" kind="Member" referred="id-0065-0000025f" relid="0x0" role="Member">
-                <name>user_data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,860</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{8d486a1b-fc87-44bd-a0dd-43269adae313}" id="id-0067-00000584" kind="Member" referred="id-0065-0000026b" relid="0x0" role="Member">
-                <name>ownership</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,960</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{ae2ac85f-4ca8-4719-9b75-d1eb2f8d6d64}" id="id-0067-00000585" kind="Member" referred="id-0065-0000026f" relid="0x0" role="Member">
-                <name>time_based_filter</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1060</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{066817f2-148d-4524-a7dc-03864e563b7c}" id="id-0067-00000586" kind="Member" referred="id-0065-0000027a" relid="0x0" role="Member">
-                <name>reader_data_lifecycle</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{ad48c95c-f86c-4bd5-b12c-c7eba6432e44}" id="id-0065-00000282" kind="Aggregate" relid="0x4c" role="Aggregate">
-              <name>SubscriberQos</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{aa9100b8-993a-44c6-8a8b-60e102804fdf}" id="id-0067-00000587" kind="Member" referred="id-0065-00000267" relid="0x0" role="Member">
-                <name>presentation</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{a8cd770b-55e5-4041-a5cd-fdacf4c2ed66}" id="id-0067-00000588" kind="Member" referred="id-0065-00000270" relid="0x0" role="Member">
-                <name>partition</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{1eceadee-ea1a-4f28-b95e-da8b38db62eb}" id="id-0067-00000589" kind="Member" referred="id-0065-00000261" relid="0x0" role="Member">
-                <name>group_data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{beecdcab-928f-4f06-baeb-b36efa54fb4f}" id="id-0067-0000058a" kind="Member" referred="id-0065-00000278" relid="0x0" role="Member">
-                <name>entity_factory</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{6d7fa318-c5c6-452d-9ece-ca1ab5aef753}" id="id-0065-00000283" kind="Aggregate" relid="0x4d" role="Aggregate">
-              <name>ParticipantBuiltinTopicData</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{fbeff137-5e5f-40ec-a672-6a2bbcce8923}" id="id-0067-0000058b" kind="Member" referred="id-0065-000001c0" relid="0x0" role="Member">
-                <name>key</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{0647706a-1b80-4ef7-b901-cb14181598ee}" id="id-0067-0000058c" kind="Member" referred="id-0065-0000025f" relid="0x0" role="Member">
-                <name>user_data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{2bd37d3a-9a67-4ef1-a1f8-fbbc2b51723f}" id="id-0065-00000284" kind="Aggregate" relid="0x4e" role="Aggregate">
-              <name>TopicBuiltinTopicData</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{6b3ce870-f78f-4fd2-a63e-797f9e6a650e}" id="id-0067-0000058d" kind="Member" referred="id-0065-000001c0" relid="0x0" role="Member">
-                <name>key</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{86c5afa3-a1be-41eb-b069-e380608e8e48}" id="id-0067-0000058e" kind="Member" referred="id-0065-00000265" relid="0x0" role="Member">
-                <name>durability</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{d7753d28-9a6d-4df6-bb22-2f8b2de38c2c}" id="id-0067-0000058f" kind="Member" referred="id-0065-0000027b" relid="0x0" role="Member">
-                <name>durability_service</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{640eeb42-3323-4378-8704-f8cfebb5d9e4}" id="id-0067-00000590" kind="Member" referred="id-0065-00000268" relid="0x0" role="Member">
-                <name>deadline</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{b3976ba1-0d26-4df7-a64e-0a564b1ed436}" id="id-0067-00000591" kind="Member" referred="id-0065-00000269" relid="0x0" role="Member">
-                <name>latency_budget</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,660</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{237cc5ca-046d-45c1-929f-1ae92e859ecc}" id="id-0067-00000592" kind="Member" referred="id-0065-0000026e" relid="0x0" role="Member">
-                <name>liveliness</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,760</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{fa16155c-7949-4ba1-b8aa-0fc8d9f4e491}" id="id-0067-00000593" kind="Member" referred="id-0065-00000272" relid="0x0" role="Member">
-                <name>reliability</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,860</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{76c22efb-eda4-4f76-8c13-a79d5ca4cb9b}" id="id-0067-00000594" kind="Member" referred="id-0065-00000262" relid="0x0" role="Member">
-                <name>transport_priority</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,960</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{6ec7265a-72e8-4982-bd02-c55a2d5d9c00}" id="id-0067-00000595" kind="Member" referred="id-0065-00000263" relid="0x0" role="Member">
-                <name>lifespan</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1060</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{89f2277c-d997-4259-a91e-a752f9d9aaf4}" id="id-0067-00000596" kind="Member" referred="id-0065-00000274" relid="0x0" role="Member">
-                <name>destination_order</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{10465536-fc3b-4701-9d0a-3159e43be578}" id="id-0067-00000597" kind="Member" referred="id-0065-00000276" relid="0x0" role="Member">
-                <name>history</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{8ac6eb4f-2f26-4ed0-a667-133233092ea1}" id="id-0067-00000598" kind="Member" referred="id-0065-00000277" relid="0x0" role="Member">
-                <name>resource_limits</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{737fb5c5-07d8-4862-8519-c1299ddcb421}" id="id-0067-00000599" kind="Member" referred="id-0065-0000026b" relid="0x0" role="Member">
-                <name>ownership</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{f19a9151-2614-4a85-bd89-66e0ff11416d}" id="id-0067-0000059a" kind="Member" referred="id-0065-00000260" relid="0x0" role="Member">
-                <name>topic_data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{be5ded00-6080-42ca-a729-ef08939b5bef}" id="id-0067-0000059b" kind="Member" referred="id-0066-00000066" relid="0x0" role="Member">
-                <name>name</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{6e203ff9-56a2-4e0d-b13b-46eb029b618d}" id="id-0067-0000059c" kind="Member" referred="id-0066-00000066" relid="0x0" role="Member">
-                <name>type_name</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{d6a2cf29-0b4f-4e8c-aea7-874f14043462}" id="id-0065-00000285" kind="Aggregate" relid="0x4f" role="Aggregate">
-              <name>PublicationBuiltinTopicData</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{322986af-0d46-44fa-93fc-edc57452abe6}" id="id-0067-0000059d" kind="Member" referred="id-0065-000001c0" relid="0x0" role="Member">
-                <name>key</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{b0007b0a-29e8-48c6-a7dd-83b56c723775}" id="id-0067-0000059e" kind="Member" referred="id-0065-000001c0" relid="0x0" role="Member">
-                <name>participant_key</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{19aee622-60df-40f6-8434-979ee6000124}" id="id-0067-0000059f" kind="Member" referred="id-0065-00000265" relid="0x0" role="Member">
-                <name>durability</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{435a2530-9905-4a2a-9dc0-8293d3f1f658}" id="id-0067-000005a0" kind="Member" referred="id-0065-0000027b" relid="0x0" role="Member">
-                <name>durability_service</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{f66233b3-97f0-4183-97a5-1f5fc9a7744f}" id="id-0067-000005a1" kind="Member" referred="id-0065-00000268" relid="0x0" role="Member">
-                <name>deadline</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,660</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{18d212a7-81d6-493e-a187-2f2269007044}" id="id-0067-000005a2" kind="Member" referred="id-0065-00000269" relid="0x0" role="Member">
-                <name>latency_budget</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,760</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{098876d8-a496-4f36-910d-bd4ae426180a}" id="id-0067-000005a3" kind="Member" referred="id-0065-0000026e" relid="0x0" role="Member">
-                <name>liveliness</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,860</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{e1164fd0-8a8d-4a14-a558-a43e92a7535c}" id="id-0067-000005a4" kind="Member" referred="id-0065-00000272" relid="0x0" role="Member">
-                <name>reliability</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,960</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{5acc1014-0f9c-4aaa-b162-3d464fd6ab4a}" id="id-0067-000005a5" kind="Member" referred="id-0065-00000263" relid="0x0" role="Member">
-                <name>lifespan</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1060</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{6f0f0e3e-ca32-4c18-9147-e2fb6ba365d6}" id="id-0067-000005a6" kind="Member" referred="id-0065-0000025f" relid="0x0" role="Member">
-                <name>user_data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{3e571104-51ea-42fb-9d97-5cac48a97bd7}" id="id-0067-000005a7" kind="Member" referred="id-0065-0000026b" relid="0x0" role="Member">
-                <name>ownership</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{e654a5f6-b0bf-4d6b-9488-04ea35ba6172}" id="id-0067-000005a8" kind="Member" referred="id-0065-0000026c" relid="0x0" role="Member">
-                <name>ownership_strength</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{caf54c3f-127a-42a0-9284-51e89cb34f2a}" id="id-0067-000005a9" kind="Member" referred="id-0065-00000274" relid="0x0" role="Member">
-                <name>destination_order</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{df1cc389-715b-49b5-a3da-fa14045eb638}" id="id-0067-000005aa" kind="Member" referred="id-0065-00000267" relid="0x0" role="Member">
-                <name>presentation</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{04d93761-36bc-46f7-9181-c18877c2fc8c}" id="id-0067-000005ab" kind="Member" referred="id-0065-00000270" relid="0x0" role="Member">
-                <name>partition</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1660</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{55315601-9b0b-4c16-99f9-bf75b54b075e}" id="id-0067-000005ac" kind="Member" referred="id-0065-00000260" relid="0x0" role="Member">
-                <name>topic_data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1760</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{fb4beee6-479d-4b40-9156-a995c06774f1}" id="id-0067-000005ad" kind="Member" referred="id-0065-00000261" relid="0x0" role="Member">
-                <name>group_data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1860</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{94428c6c-cef2-4092-b960-b153c7e4dea8}" id="id-0067-000005ae" kind="Member" referred="id-0066-00000066" relid="0x0" role="Member">
-                <name>topic_name</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{0a141642-e12e-4ac5-a872-a970a8ffbe4c}" id="id-0067-000005af" kind="Member" referred="id-0066-00000066" relid="0x0" role="Member">
-                <name>type_name</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{c26aeb2a-96c1-4b36-940d-42eec8123db6}" id="id-0065-00000286" kind="Aggregate" relid="0x50" role="Aggregate">
-              <name>SubscriptionBuiltinTopicData</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{4e51c86b-f1e9-4739-8438-076ef6b1e16e}" id="id-0067-000005b0" kind="Member" referred="id-0065-000001c0" relid="0x0" role="Member">
-                <name>key</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{ec72bb7a-e715-4ccd-a5e5-52582cdd4beb}" id="id-0067-000005b1" kind="Member" referred="id-0065-000001c0" relid="0x0" role="Member">
-                <name>participant_key</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{6402f6f6-6348-4450-b54f-0c546cfa5b8f}" id="id-0067-000005b2" kind="Member" referred="id-0065-00000265" relid="0x0" role="Member">
-                <name>durability</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{309c21a6-5f73-40e0-a332-97718d42617f}" id="id-0067-000005b3" kind="Member" referred="id-0065-00000268" relid="0x0" role="Member">
-                <name>deadline</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{1647c2c4-22bb-42a7-bec7-d3e24031bc32}" id="id-0067-000005b4" kind="Member" referred="id-0065-00000269" relid="0x0" role="Member">
-                <name>latency_budget</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,660</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{99ec8a4b-f7f8-460e-b8e0-9a5708343f4e}" id="id-0067-000005b5" kind="Member" referred="id-0065-0000026e" relid="0x0" role="Member">
-                <name>liveliness</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,760</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{49bad0fb-0561-4ce2-9689-8ecfdcc4866f}" id="id-0067-000005b6" kind="Member" referred="id-0065-00000272" relid="0x0" role="Member">
-                <name>reliability</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,860</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{1cc8aa76-8048-4119-97f8-b591845ad95a}" id="id-0067-000005b7" kind="Member" referred="id-0065-0000026b" relid="0x0" role="Member">
-                <name>ownership</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,960</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{8d2c75aa-031c-4a8e-8bc9-5771fa5198ee}" id="id-0067-000005b8" kind="Member" referred="id-0065-00000274" relid="0x0" role="Member">
-                <name>destination_order</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1060</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{7ae8363a-13a0-4c1e-be9a-3e5923dbe1c3}" id="id-0067-000005b9" kind="Member" referred="id-0065-0000025f" relid="0x0" role="Member">
-                <name>user_data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{268b0ea6-c4c9-439f-bc05-663169532974}" id="id-0067-000005ba" kind="Member" referred="id-0065-0000026f" relid="0x0" role="Member">
-                <name>time_based_filter</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{29d7e235-fe4b-40ce-8377-d2dc327847be}" id="id-0067-000005bb" kind="Member" referred="id-0065-00000267" relid="0x0" role="Member">
-                <name>presentation</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{812b0b1d-cf37-4f78-80fb-1a5082067c90}" id="id-0067-000005bc" kind="Member" referred="id-0065-00000270" relid="0x0" role="Member">
-                <name>partition</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{f5d49385-2094-4b5f-b689-6f486d9434f5}" id="id-0067-000005bd" kind="Member" referred="id-0065-00000260" relid="0x0" role="Member">
-                <name>topic_data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{3a2f2a70-a965-4044-8ac7-4198d7b7b45e}" id="id-0067-000005be" kind="Member" referred="id-0065-00000261" relid="0x0" role="Member">
-                <name>group_data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1660</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{62f7f8e6-0422-4dc9-a981-62585849a9c3}" id="id-0067-000005bf" kind="Member" referred="id-0066-00000066" relid="0x0" role="Member">
-                <name>topic_name</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{9342c04a-4f17-4418-a928-08406abad35a}" id="id-0067-000005c0" kind="Member" referred="id-0066-00000066" relid="0x0" role="Member">
-                <name>type_name</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x28" guid="{adbad2ab-fe31-4027-b268-34d81e9b40bb}" id="id-0065-00000287" kind="Object" relid="0x51" role="Object">
-              <name>DomainParticipant</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{c8fde55c-1bc5-43ee-a1ad-d0128c992d70}" id="id-0065-00000288" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>create_publisher</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{3a6369f1-9ffa-42af-abf1-17d0cecb3264}" id="id-0067-000005c1" kind="ReturnType" referred="id-0065-00000221" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{4f7cb5a1-4b55-4990-8cb7-30805bdcbaf8}" id="id-0067-000005c2" kind="InParameter" referred="id-0065-00000280" relid="0x0" role="InParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{87e3fc46-8293-489c-afac-d5b63f899fe4}" id="id-0067-000005c3" kind="InParameter" referred="id-0065-0000023d" relid="0x0" role="InParameter">
-                  <name>a_listener</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{27367b8e-01b0-46a8-9601-bd17713a19e1}" id="id-0067-000005c4" kind="InParameter" referred="id-0067-0000066b" relid="0x0" role="InParameter">
-                  <name>mask</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>360,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{97adace4-5ab0-4f2c-be4a-54f3e413816d}" id="id-0065-00000289" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                <name>create_publisher_with_profile</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{fa3c8080-819f-40b6-a9b9-07982de8837a}" id="id-0067-000005c5" kind="ReturnType" referred="id-0065-00000221" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{d2b69164-88fd-487f-bbf6-801ace2a21cb}" id="id-0067-000005c6" kind="InParameter" referred="id-0065-0000023d" relid="0x0" role="InParameter">
-                  <name>a_listener</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>360,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{a84cdc29-91b8-4e23-925d-31eee31bd934}" id="id-0067-000005c7" kind="InParameter" referred="id-0066-00000066" relid="0x0" role="InParameter">
-                  <name>library_name</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{afdac122-bee2-484c-9a50-099abadbbbfa}" id="id-0067-000005c8" kind="InParameter" referred="id-0066-00000066" relid="0x0" role="InParameter">
-                  <name>profile_name</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{534a2637-1b2a-42ec-ba93-ef97cddaee5f}" id="id-0067-000005c9" kind="InParameter" referred="id-0067-0000066b" relid="0x0" role="InParameter">
-                  <name>mask</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>460,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{514c959c-2e91-47d1-93aa-727d7655aea5}" id="id-0065-0000028a" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-                <name>delete_publisher</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{1dbd09f1-2033-4370-b145-384ed4240df7}" id="id-0067-000005ca" kind="InParameter" referred="id-0065-00000221" relid="0x0" role="InParameter">
-                  <name>p</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{28a89f80-e0be-4ff1-bb5b-6bb6f42fd1b3}" id="id-0067-000005cb" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{92f68ffe-d20d-4e41-b4f3-fa409878e14a}" id="id-0065-0000028b" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-                <name>create_subscriber</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{c3f95a33-4686-4aef-8310-034e358030ca}" id="id-0067-000005cc" kind="ReturnType" referred="id-0065-0000020f" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{6f2085f7-30ab-48ef-be30-25d267d1486c}" id="id-0067-000005cd" kind="InParameter" referred="id-0065-00000282" relid="0x0" role="InParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{f34ba127-eb23-4977-9469-007cc1d5d551}" id="id-0067-000005ce" kind="InParameter" referred="id-0065-00000246" relid="0x0" role="InParameter">
-                  <name>a_listener</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{92ada6e9-5fda-40d4-b92d-af48cd36dc53}" id="id-0067-000005cf" kind="InParameter" referred="id-0067-0000066b" relid="0x0" role="InParameter">
-                  <name>mask</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>360,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{4a0f5f77-add2-4a39-b8f2-5914531b73a8}" id="id-0065-0000028c" kind="TwowayOperation" relid="0x4" role="TwowayOperation">
-                <name>create_subscriber_with_profile</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{9f1b2807-bc7b-42ea-8fcc-c6f8d54c496e}" id="id-0067-000005d0" kind="ReturnType" referred="id-0065-0000020f" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{ff25f43b-1477-40b9-819b-3601b505e3a8}" id="id-0067-000005d1" kind="InParameter" referred="id-0065-00000246" relid="0x0" role="InParameter">
-                  <name>a_listener</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>360,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{f6e61b84-c21d-4753-a82d-62a5c43c832a}" id="id-0067-000005d2" kind="InParameter" referred="id-0066-00000066" relid="0x0" role="InParameter">
-                  <name>library_name</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{c902f4b3-5c28-496c-8445-ee3c8dd28a2d}" id="id-0067-000005d3" kind="InParameter" referred="id-0066-00000066" relid="0x0" role="InParameter">
-                  <name>profile_name</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{4b5e21cb-a0a4-4d52-b411-9178b9559637}" id="id-0067-000005d4" kind="InParameter" referred="id-0067-0000066b" relid="0x0" role="InParameter">
-                  <name>mask</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>460,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{b3f885a3-5f06-4f80-ac51-76e2354a5f71}" id="id-0065-0000028d" kind="TwowayOperation" relid="0x5" role="TwowayOperation">
-                <name>delete_subscriber</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{ffed51e2-201b-4634-b99a-274d9fafe3b8}" id="id-0067-000005d5" kind="InParameter" referred="id-0065-0000020f" relid="0x0" role="InParameter">
-                  <name>s</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{491fe4b7-1197-4b25-aa39-d73d9289d017}" id="id-0067-000005d6" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{088936e8-802f-48cc-8fb8-704514d1ff74}" id="id-0065-0000028e" kind="TwowayOperation" relid="0x6" role="TwowayOperation">
-                <name>get_builtin_subscriber</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,660</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{20169755-3c31-4477-967c-e0b7ad76a87e}" id="id-0067-000005d7" kind="ReturnType" referred="id-0065-0000020f" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{5af04129-2734-46d2-babf-d6a6b4316fad}" id="id-0065-0000028f" kind="TwowayOperation" relid="0x7" role="TwowayOperation">
-                <name>create_topic</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,760</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{6cd0a48f-b5af-4db6-9c63-a79ba779a488}" id="id-0067-000005d8" kind="ReturnType" referred="id-0065-000001dd" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{907b5437-39ce-4fc4-974d-41e00266b640}" id="id-0067-000005d9" kind="InParameter" referred="id-0065-0000027e" relid="0x0" role="InParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>360,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{0ab3874c-d2bf-4462-8000-ab8b4f3b02ce}" id="id-0067-000005da" kind="InParameter" referred="id-0065-00000234" relid="0x0" role="InParameter">
-                  <name>a_listener</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>460,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{c62c0c58-6204-473b-b78f-5719d007aa4e}" id="id-0067-000005db" kind="InParameter" referred="id-0066-00000066" relid="0x0" role="InParameter">
-                  <name>topic_name</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{56602453-5cac-4a29-bf15-7361b730be6d}" id="id-0067-000005dc" kind="InParameter" referred="id-0066-00000066" relid="0x0" role="InParameter">
-                  <name>type_name</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{e74035a6-c8c4-405a-8051-8c4d11735cc8}" id="id-0067-000005dd" kind="InParameter" referred="id-0067-0000066b" relid="0x0" role="InParameter">
-                  <name>mask</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>560,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{0f940ffb-b482-4581-baed-cc7a1b0bf9a1}" id="id-0065-00000290" kind="TwowayOperation" relid="0x8" role="TwowayOperation">
-                <name>create_topic_with_profile</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,860</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{83c05f2e-78aa-4e93-8e62-64fb7b698c7b}" id="id-0067-000005de" kind="ReturnType" referred="id-0065-000001dd" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{73475718-4991-4669-a54e-5205f10de2c6}" id="id-0067-000005df" kind="InParameter" referred="id-0065-00000234" relid="0x0" role="InParameter">
-                  <name>a_listener</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>560,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{029f4052-ee01-4d95-9ad2-444fc1d30603}" id="id-0067-000005e0" kind="InParameter" referred="id-0066-00000066" relid="0x0" role="InParameter">
-                  <name>topic_name</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{da0571fb-0964-48ec-b26e-5dcd45a14581}" id="id-0067-000005e1" kind="InParameter" referred="id-0066-00000066" relid="0x0" role="InParameter">
-                  <name>type_name</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{ad625c85-07d5-4bdf-8943-3efec1ca7b49}" id="id-0067-000005e2" kind="InParameter" referred="id-0066-00000066" relid="0x0" role="InParameter">
-                  <name>library_name</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>360,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{28c9cfdd-3e8a-4a1a-b74a-1e31de095c8e}" id="id-0067-000005e3" kind="InParameter" referred="id-0066-00000066" relid="0x0" role="InParameter">
-                  <name>profile_name</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>460,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{a6419720-dba3-428b-9dbb-120f57066c87}" id="id-0067-000005e4" kind="InParameter" referred="id-0067-0000066b" relid="0x0" role="InParameter">
-                  <name>mask</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>660,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{e640ed42-df31-4f81-93d6-aaee63fdceb4}" id="id-0065-00000291" kind="TwowayOperation" relid="0x9" role="TwowayOperation">
-                <name>delete_topic</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,960</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{905ab556-9e6b-4425-b83c-bc83aff9a7d1}" id="id-0067-000005e5" kind="InParameter" referred="id-0065-000001dd" relid="0x0" role="InParameter">
-                  <name>a_topic</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{38dff28f-ed5a-45d8-89cc-edfc6581f0dd}" id="id-0067-000005e6" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{58160d02-77ed-4143-a960-ecce9f570018}" id="id-0065-00000292" kind="TwowayOperation" relid="0xa" role="TwowayOperation">
-                <name>find_topic</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1060</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{884e3058-2897-4e00-8a29-01ef193d4e08}" id="id-0067-000005e7" kind="ReturnType" referred="id-0065-000001dd" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{f3c31cc8-7f69-4310-9c3d-ee0aafb573f5}" id="id-0067-000005e8" kind="InParameter" referred="id-0065-000001c1" relid="0x0" role="InParameter">
-                  <name>timeout</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{d859af0b-492b-4ced-bfab-cd360c038fe2}" id="id-0067-000005e9" kind="InParameter" referred="id-0066-00000066" relid="0x0" role="InParameter">
-                  <name>topic_name</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{91c52ba0-87a4-44bd-983e-8bb82915a40d}" id="id-0065-00000293" kind="TwowayOperation" relid="0xb" role="TwowayOperation">
-                <name>lookup_topicdescription</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{a99b4bd1-fed9-4b6f-b30a-1a6873368964}" id="id-0067-000005ea" kind="ReturnType" referred="id-0065-000001d9" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{16006c5d-9f58-4ae2-8ed0-2a29932677f9}" id="id-0067-000005eb" kind="InParameter" referred="id-0066-00000066" relid="0x0" role="InParameter">
-                  <name>name</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{12d37d0c-69c4-4aa0-9213-7af9034e957d}" id="id-0065-00000294" kind="TwowayOperation" relid="0xc" role="TwowayOperation">
-                <name>create_contentfilteredtopic</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{21a67334-ad16-4f72-b547-cccc13ab10fa}" id="id-0067-000005ec" kind="ReturnType" referred="id-0065-000001e3" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{24750656-187f-4b50-8341-8d821758acdf}" id="id-0067-000005ed" kind="InParameter" referred="id-0065-000001dd" relid="0x0" role="InParameter">
-                  <name>related_topic</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{17b7cf4a-2a8e-413b-915c-57a94636138d}" id="id-0067-000005ee" kind="InParameter" referred="id-0066-00000066" relid="0x0" role="InParameter">
-                  <name>name</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{d9ad90ee-d6b8-403d-bbc4-5455880a6be6}" id="id-0067-000005ef" kind="InParameter" referred="id-0066-00000066" relid="0x0" role="InParameter">
-                  <name>filter_expression</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>360,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{1a23c6bb-ab8d-4230-91ba-4e9690a3e514}" id="id-0067-000005f0" kind="InParameter" referred="id-0067-00000655" relid="0x0" role="InParameter">
-                  <name>expression_parameters</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>460,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{1338efef-c90f-45bf-a65b-b25776d9bd99}" id="id-0065-00000295" kind="TwowayOperation" relid="0xd" role="TwowayOperation">
-                <name>delete_contentfilteredtopic</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{31fae1fa-5c38-4f82-9ac7-c798999fa6fa}" id="id-0067-000005f1" kind="InParameter" referred="id-0065-000001e3" relid="0x0" role="InParameter">
-                  <name>a_contentfilteredtopic</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{3674aaaa-5fd1-4c05-98c4-c99689e3e1df}" id="id-0067-000005f2" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{2dc11291-40d1-4b2c-ae97-2594c9096575}" id="id-0065-00000296" kind="TwowayOperation" relid="0xe" role="TwowayOperation">
-                <name>create_multitopic</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{3d5b5a6b-2c10-40ec-a45d-e4f97399ff98}" id="id-0067-000005f3" kind="ReturnType" referred="id-0065-000001e8" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{f700a488-b10c-4821-8977-3c0ecd98c844}" id="id-0067-000005f4" kind="InParameter" referred="id-0066-00000066" relid="0x0" role="InParameter">
-                  <name>name</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{ca454e0f-bcbc-4862-9c41-0bdf6e7a3ed2}" id="id-0067-000005f5" kind="InParameter" referred="id-0066-00000066" relid="0x0" role="InParameter">
-                  <name>type_name</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{b553f4ca-68fe-42ea-9f52-dad935a546f5}" id="id-0067-000005f6" kind="InParameter" referred="id-0066-00000066" relid="0x0" role="InParameter">
-                  <name>subscription_expression</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>360,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{89695eec-c9da-4338-8666-7bee3106ff37}" id="id-0067-000005f7" kind="InParameter" referred="id-0067-00000655" relid="0x0" role="InParameter">
-                  <name>expression_parameters</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>460,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{db0538ac-f8b4-44e9-baa3-6e574059167b}" id="id-0065-00000297" kind="TwowayOperation" relid="0xf" role="TwowayOperation">
-                <name>delete_multitopic</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{7d35df1b-d557-41f3-ba90-0248bff6defe}" id="id-0067-000005f8" kind="InParameter" referred="id-0065-000001e8" relid="0x0" role="InParameter">
-                  <name>a_multitopic</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{a8516b15-6769-456d-ae17-2c5ee99c8871}" id="id-0067-000005f9" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{c2f044a0-dc38-42fd-9a91-55ebf9acccde}" id="id-0065-00000298" kind="TwowayOperation" relid="0x10" role="TwowayOperation">
-                <name>delete_contained_entities</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1660</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{e40a1f57-fd01-420a-b3fd-305b4ad47113}" id="id-0067-000005fa" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{086f4f5f-e13c-4513-9f2d-7de2e3d30ec5}" id="id-0065-00000299" kind="TwowayOperation" relid="0x11" role="TwowayOperation">
-                <name>set_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1760</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{13199f31-14a6-49b0-86c9-486ef7c4b832}" id="id-0067-000005fb" kind="InParameter" referred="id-0065-0000027d" relid="0x0" role="InParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{1fa31447-a789-41ce-a73e-fb616592267f}" id="id-0067-000005fc" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{543868eb-2b6e-496c-b4c2-176c5c7970a3}" id="id-0065-0000029a" kind="TwowayOperation" relid="0x12" role="TwowayOperation">
-                <name>get_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1860</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{9b1a4dab-78a5-4685-9cbc-c0c42e948804}" id="id-0067-000005fd" kind="InoutParameter" referred="id-0065-0000027d" relid="0x0" role="InoutParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{45196a75-f961-415c-a9a7-b08bd15bbe5c}" id="id-0067-000005fe" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{12fc8be7-116f-46ec-b564-9d18d897a11a}" id="id-0065-0000029b" kind="TwowayOperation" relid="0x13" role="TwowayOperation">
-                <name>set_listener</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1960</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{251691d4-8b12-4fa6-b684-d8cfdbb80282}" id="id-0067-000005ff" kind="InParameter" referred="id-0065-00000248" relid="0x0" role="InParameter">
-                  <name>a_listener</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{938c4114-7ac8-4790-b4a6-8e7c5b2ebe7e}" id="id-0067-00000600" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{e54d1be9-7537-4c5c-b740-9b889e9a7e76}" id="id-0067-00000601" kind="InParameter" referred="id-0067-0000066b" relid="0x0" role="InParameter">
-                  <name>mask</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{dc55a1b3-396d-4ac4-9847-90bfd30093d2}" id="id-0065-0000029c" kind="TwowayOperation" relid="0x14" role="TwowayOperation">
-                <name>get_listener</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,2060</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{d15e7d8d-9d46-4ae1-9ac2-2e8c499e1ee2}" id="id-0067-00000602" kind="ReturnType" referred="id-0065-00000248" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{4d4b8f5f-cf81-449b-b2f6-872bd32bd5db}" id="id-0065-0000029d" kind="TwowayOperation" relid="0x15" role="TwowayOperation">
-                <name>ignore_participant</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,2160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{59b7b008-db35-42c3-b56f-d8d68dfcbdef}" id="id-0067-00000603" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{01539cc7-a2c2-42bb-92a6-3fd2203d0e41}" id="id-0067-00000604" kind="InParameter" referred="id-0067-000006bc" relid="0x0" role="InParameter">
-                  <name>handle</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{d5bb24d4-d4e4-4876-b5f6-7508240446d9}" id="id-0065-0000029e" kind="TwowayOperation" relid="0x16" role="TwowayOperation">
-                <name>ignore_topic</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,2260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{0b124489-8800-48fd-b332-de8667926465}" id="id-0067-00000605" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{394d409f-bdc7-4f59-9831-6617430cb682}" id="id-0067-00000606" kind="InParameter" referred="id-0067-000006bc" relid="0x0" role="InParameter">
-                  <name>handle</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{7d2a36ce-29c2-430a-ac9c-7cdd65155b21}" id="id-0065-0000029f" kind="TwowayOperation" relid="0x17" role="TwowayOperation">
-                <name>ignore_publication</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,2360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{14a39626-16e8-42c2-bd35-5337c6d0fbb8}" id="id-0067-00000607" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{f479077b-2018-4917-945a-5ef5303baa57}" id="id-0067-00000608" kind="InParameter" referred="id-0067-000006bc" relid="0x0" role="InParameter">
-                  <name>handle</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{6337f55e-fc7f-4e61-8caa-5ee7ab8d7ba9}" id="id-0065-000002a0" kind="TwowayOperation" relid="0x18" role="TwowayOperation">
-                <name>ignore_subscription</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,2460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{7912ab17-7fb8-47ae-a2ea-d2dbc93e3887}" id="id-0067-00000609" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{4c616eea-1ab0-409e-b8eb-fe8697cef426}" id="id-0067-0000060a" kind="InParameter" referred="id-0067-000006bc" relid="0x0" role="InParameter">
-                  <name>handle</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{6c8fdbcd-9398-4275-b9bc-6f0fc879c3ea}" id="id-0065-000002a1" kind="TwowayOperation" relid="0x19" role="TwowayOperation">
-                <name>get_domain_id</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,2560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{9049c76f-05d4-4c5a-a9fd-8be554036db4}" id="id-0067-0000060b" kind="ReturnType" referred="id-0067-00000652" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{89d187b7-6e2d-4021-bf50-9299fc2fa4d3}" id="id-0065-000002a2" kind="TwowayOperation" relid="0x1a" role="TwowayOperation">
-                <name>assert_liveliness</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,2660</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{5fc1cbc0-8c47-42fc-a970-4e162834344c}" id="id-0067-0000060c" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{c329253d-b985-4bd5-b4ea-17bf5724fe00}" id="id-0065-000002a3" kind="TwowayOperation" relid="0x1b" role="TwowayOperation">
-                <name>set_default_publisher_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,2760</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{ff28657c-0e9b-4625-bf2f-d347fd2f7015}" id="id-0067-0000060d" kind="InParameter" referred="id-0065-00000280" relid="0x0" role="InParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{09d296d1-2f3c-4d49-9ab6-8e28716c9890}" id="id-0067-0000060e" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{c3bf1dff-8bb1-410a-8306-cd80c6fca52d}" id="id-0065-000002a4" kind="TwowayOperation" relid="0x1c" role="TwowayOperation">
-                <name>get_default_publisher_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,2860</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{0cfd0280-a5c3-4552-9cc2-7058cde5fdbf}" id="id-0067-0000060f" kind="InoutParameter" referred="id-0065-00000280" relid="0x0" role="InoutParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{32c5dd66-4144-4216-bd29-21c675888334}" id="id-0067-00000610" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{128b56ba-1d89-4305-88b1-a64ecb787178}" id="id-0065-000002a5" kind="TwowayOperation" relid="0x1d" role="TwowayOperation">
-                <name>set_default_subscriber_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,2960</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{115f6d99-04e5-48cd-95a3-32dcf2e70109}" id="id-0067-00000611" kind="InParameter" referred="id-0065-00000282" relid="0x0" role="InParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{490eed98-b30a-4ac1-8e9e-07533ab9f1d8}" id="id-0067-00000612" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{0cd5146d-a815-490c-b917-ddc9de5432aa}" id="id-0065-000002a6" kind="TwowayOperation" relid="0x1e" role="TwowayOperation">
-                <name>get_default_subscriber_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,3060</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{41a3db01-6842-49e4-8ec4-d6842b2013ff}" id="id-0067-00000613" kind="InoutParameter" referred="id-0065-00000282" relid="0x0" role="InoutParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{7a3120e1-df05-4389-a7cf-71c6d6e8ccb3}" id="id-0067-00000614" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{b416ad7f-4714-4a7d-a7c7-4ce5dfc70110}" id="id-0065-000002a7" kind="TwowayOperation" relid="0x1f" role="TwowayOperation">
-                <name>set_default_topic_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,3160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{fa1b9032-40e6-4b97-9732-924fd0d42d07}" id="id-0067-00000615" kind="InParameter" referred="id-0065-0000027e" relid="0x0" role="InParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{edbb3b4c-ad4b-40f6-b3f8-67d78a69610c}" id="id-0067-00000616" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{758fb5e5-b06c-4329-a90f-18960491b1b7}" id="id-0065-000002a8" kind="TwowayOperation" relid="0x20" role="TwowayOperation">
-                <name>get_default_topic_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,3260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{8837687d-ef75-465d-8257-b78fbab6bf91}" id="id-0067-00000617" kind="InoutParameter" referred="id-0065-0000027e" relid="0x0" role="InoutParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{fd2d8d09-c6b8-49c9-a0f8-cc292b81ce21}" id="id-0067-00000618" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{4e754f33-3463-4d8b-962a-a18fae66410d}" id="id-0065-000002a9" kind="TwowayOperation" relid="0x21" role="TwowayOperation">
-                <name>get_discovered_participants</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,3360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{a419422a-9344-4313-a4c4-14d24caab8ec}" id="id-0067-00000619" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{4b89bc26-a2b4-4934-a1dd-e1981eb2b099}" id="id-0067-0000061a" kind="InoutParameter" referred="id-0067-000006bd" relid="0x0" role="InoutParameter">
-                  <name>participant_handles</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{e0495d7e-8cd3-48d5-819c-a59fe3c40c04}" id="id-0065-000002aa" kind="TwowayOperation" relid="0x22" role="TwowayOperation">
-                <name>get_discovered_participant_data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,3460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{6b74548a-e564-43dc-9444-efd3bd2d7969}" id="id-0067-0000061b" kind="InoutParameter" referred="id-0065-00000283" relid="0x0" role="InoutParameter">
-                  <name>participant_data</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{de9dfffb-6b06-4193-8ee1-f5fd9feb18ba}" id="id-0067-0000061c" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{4e2a47e0-e14e-44c2-a00d-63ff9a58ac0f}" id="id-0067-0000061d" kind="InParameter" referred="id-0067-000006bc" relid="0x0" role="InParameter">
-                  <name>participant_handle</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{3dc43948-20e5-4a27-a2fb-6b4bbdf3cfa6}" id="id-0065-000002ab" kind="TwowayOperation" relid="0x23" role="TwowayOperation">
-                <name>get_discovered_topics</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,3560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{84876e6a-42a0-4d03-94aa-b308db0742b9}" id="id-0067-0000061e" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{c1f37e6b-4fa9-4f5a-afa7-2345eb1b60ae}" id="id-0067-0000061f" kind="InoutParameter" referred="id-0067-000006bd" relid="0x0" role="InoutParameter">
-                  <name>topic_handles</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{c27b14e7-4a67-4be7-a03c-66666c054971}" id="id-0065-000002ac" kind="TwowayOperation" relid="0x24" role="TwowayOperation">
-                <name>get_discovered_topic_data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,3660</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{f34c8437-0275-4ecc-92f6-5a0584fe5598}" id="id-0067-00000620" kind="InoutParameter" referred="id-0065-00000284" relid="0x0" role="InoutParameter">
-                  <name>topic_data</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{a97f7013-a8dd-4c41-8f26-1926fdebe300}" id="id-0067-00000621" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{49bfc992-f5df-4d43-b303-99633d71ed51}" id="id-0067-00000622" kind="InParameter" referred="id-0067-000006bc" relid="0x0" role="InParameter">
-                  <name>topic_handle</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{4dd82f0f-51b8-4b5a-a8dd-e48f8597365e}" id="id-0065-000002ad" kind="TwowayOperation" relid="0x25" role="TwowayOperation">
-                <name>contains_entity</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,3760</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{8ac61c0e-6fc7-4c14-9f8c-00fd2e7d6148}" id="id-0067-00000623" kind="ReturnType" referred="id-0066-00000056" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{ba1641bc-ee64-4012-b384-24463440f654}" id="id-0067-00000624" kind="InParameter" referred="id-0067-000006bc" relid="0x0" role="InParameter">
-                  <name>a_handle</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{6fce6d4c-c837-4b60-b354-26410f70df8a}" id="id-0065-000002ae" kind="TwowayOperation" relid="0x26" role="TwowayOperation">
-                <name>get_current_time</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,3860</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{bddfcd19-94cf-4091-aea2-f7cd16871403}" id="id-0067-00000625" kind="InoutParameter" referred="id-0065-000001c2" relid="0x0" role="InoutParameter">
-                  <name>current_time</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{05b63672-5cab-439b-9400-582bff97a774}" id="id-0067-00000626" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <reference guid="{5863ff9d-d433-44ba-a111-feabffd00e26}" id="id-0067-00000627" kind="Inherits" referred="id-0065-000001d4" relid="0x27" role="Inherits">
-                <name>Inherits</name>
-              </reference>
-            </model>
-            <model childrelidcntr="0x9" guid="{8618bd5c-69d6-4ba3-9b56-ad662f7efe94}" id="id-0065-000002af" kind="Object" relid="0x52" role="Object">
-              <name>DomainParticipantFactory</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{3ce1c5ab-14fe-4956-91a4-d6c6abea5d8b}" id="id-0065-000002b0" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>create_participant</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{a12326d2-f203-471b-92a1-11b422f87581}" id="id-0067-00000628" kind="ReturnType" referred="id-0065-00000287" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{b05cc2ff-337c-498f-8f1b-05cf478b5396}" id="id-0067-00000629" kind="InParameter" referred="id-0065-0000027d" relid="0x0" role="InParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{c5c06cfb-1ba1-4cf7-b3a1-2e6b2da7421d}" id="id-0067-0000062a" kind="InParameter" referred="id-0065-00000248" relid="0x0" role="InParameter">
-                  <name>a_listener</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>360,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{3f515376-3a1e-4294-ba80-168a2da40038}" id="id-0067-0000062b" kind="InParameter" referred="id-0067-00000652" relid="0x0" role="InParameter">
-                  <name>domain_id</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{2149a187-35d4-4345-84a1-1fe0acc7a272}" id="id-0067-0000062c" kind="InParameter" referred="id-0067-0000066b" relid="0x0" role="InParameter">
-                  <name>mask</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>460,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{0472a690-d2e1-4737-856e-3f411a1d5ea3}" id="id-0065-000002b1" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                <name>create_participant_with_profile</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{4082c988-87e8-4fa0-97b6-60d63ee3b35f}" id="id-0067-0000062d" kind="ReturnType" referred="id-0065-00000287" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{467268db-03b5-4e0c-985f-8594f6f662b7}" id="id-0067-0000062e" kind="InParameter" referred="id-0065-00000248" relid="0x0" role="InParameter">
-                  <name>a_listener</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>460,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{675917ad-7652-4f74-bad1-e2090aea6706}" id="id-0067-0000062f" kind="InParameter" referred="id-0067-00000652" relid="0x0" role="InParameter">
-                  <name>domain_id</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{d32f5a3a-5ae8-481f-8585-f526ad1440d0}" id="id-0067-00000630" kind="InParameter" referred="id-0066-00000066" relid="0x0" role="InParameter">
-                  <name>library_name</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{f8d0ed9a-fecd-4389-9300-6d95c6b41898}" id="id-0067-00000631" kind="InParameter" referred="id-0066-00000066" relid="0x0" role="InParameter">
-                  <name>profile_name</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>360,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{65e6a89e-3878-4fbe-8c1a-c3ff03037e12}" id="id-0067-00000632" kind="InParameter" referred="id-0067-0000066b" relid="0x0" role="InParameter">
-                  <name>mask</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>560,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{5e9db718-7dd8-4b78-8f29-7afce0c9ec81}" id="id-0065-000002b2" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-                <name>delete_participant</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{763b8624-0475-4e4e-98f5-b6c3211e6928}" id="id-0067-00000633" kind="InParameter" referred="id-0065-00000287" relid="0x0" role="InParameter">
-                  <name>a_participant</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{e390220e-a3ec-402e-b292-84a90c4589b7}" id="id-0067-00000634" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{4130315a-e18a-4551-b141-8cb58641b1c6}" id="id-0065-000002b3" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-                <name>lookup_participant</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{4bfd6543-86f1-400b-aab8-40cb3faffc6a}" id="id-0067-00000635" kind="ReturnType" referred="id-0065-00000287" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{776b9098-3954-4614-8e54-c79f85797d68}" id="id-0067-00000636" kind="InParameter" referred="id-0067-00000652" relid="0x0" role="InParameter">
-                  <name>domain_id</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{f54757de-ad62-481e-9a37-ab5a8dcdef9f}" id="id-0065-000002b4" kind="TwowayOperation" relid="0x4" role="TwowayOperation">
-                <name>set_default_participant_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{173433a3-cb80-465d-9960-3fd457352d60}" id="id-0067-00000637" kind="InParameter" referred="id-0065-0000027d" relid="0x0" role="InParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{8635d377-08f8-4219-86fb-c93d98d8e7f4}" id="id-0067-00000638" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{411a66ab-799d-4a25-8996-fc2bda71ebf7}" id="id-0065-000002b5" kind="TwowayOperation" relid="0x5" role="TwowayOperation">
-                <name>set_default_participant_qos_with_profile</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{6bbf23f6-fa96-4c5e-a493-fe60cb292c6f}" id="id-0067-00000639" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{b9e19955-7e65-4d6f-a400-f031912cc998}" id="id-0067-0000063a" kind="InParameter" referred="id-0066-00000066" relid="0x0" role="InParameter">
-                  <name>library_name</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{ead2634b-0cd4-4dfb-abb4-4d369c8a7c6e}" id="id-0067-0000063b" kind="InParameter" referred="id-0066-00000066" relid="0x0" role="InParameter">
-                  <name>profile_name</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{0ca98cb8-df82-4713-8767-0bb3a70335e7}" id="id-0065-000002b6" kind="TwowayOperation" relid="0x6" role="TwowayOperation">
-                <name>get_default_participant_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,660</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{125224c3-3b1a-46b1-80ee-ca9d65cc2425}" id="id-0067-0000063c" kind="InoutParameter" referred="id-0065-0000027d" relid="0x0" role="InoutParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{12cb18d4-431c-4808-8689-361558ef34d1}" id="id-0067-0000063d" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{f5e360dc-04db-4a5d-8763-82164e537ef1}" id="id-0065-000002b7" kind="TwowayOperation" relid="0x7" role="TwowayOperation">
-                <name>set_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,760</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{daa9299a-6902-49b4-9244-ee9be3197668}" id="id-0067-0000063e" kind="InParameter" referred="id-0065-0000027c" relid="0x0" role="InParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{36031c37-c807-4caf-9b94-69ed4cc7b275}" id="id-0067-0000063f" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{674d12cb-927b-4e2e-9770-92d5788c2abc}" id="id-0065-000002b8" kind="TwowayOperation" relid="0x8" role="TwowayOperation">
-                <name>get_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,860</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{8afd2ce7-31f6-4acf-86be-8847b772f8b8}" id="id-0067-00000640" kind="InoutParameter" referred="id-0065-0000027c" relid="0x0" role="InoutParameter">
-                  <name>qos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{57addb8d-c750-4a11-9680-b0db3239335d}" id="id-0067-00000641" kind="ReturnType" referred="id-0067-00000653" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-            </model>
-            <model childrelidcntr="0x0" guid="{14b976f7-962c-418e-b344-dd2ff78462cd}" id="id-0065-000002b9" kind="Object" relid="0x53" role="Object">
-              <name>TypeSupport</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-            </model>
-            <model childrelidcntr="0x1" guid="{2c714200-d641-462c-bf26-2293aad854a7}" id="id-0065-000002ba" kind="Aggregate" relid="0x54" role="Aggregate">
-              <name>SampleInfo</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{ee88b06b-cd8b-4a5a-9b8a-0d8af3e25b6a}" id="id-0067-00000642" kind="Member" referred="id-0065-000001c2" relid="0x0" role="Member">
-                <name>source_timestamp</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{16ccd183-b53b-4bd7-bc3c-490516d85f39}" id="id-0067-00000643" kind="Member" referred="id-0067-0000067b" relid="0x0" role="Member">
-                <name>sample_state</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{614b0fc2-c0a3-46e2-8b48-d11929ebc612}" id="id-0067-00000644" kind="Member" referred="id-0067-00000680" relid="0x0" role="Member">
-                <name>view_state</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{a8c50a2d-d410-473c-8c24-e229b970d707}" id="id-0067-00000645" kind="Member" referred="id-0067-00000685" relid="0x0" role="Member">
-                <name>instance_state</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{4c8d1441-a5a8-424f-baf6-707dbd0a9d24}" id="id-0067-00000646" kind="Member" referred="id-0067-000006bc" relid="0x0" role="Member">
-                <name>instance_handle</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{4fa5bb5e-3329-4877-848d-a26582bf4d50}" id="id-0067-00000647" kind="Member" referred="id-0067-000006bc" relid="0x0" role="Member">
-                <name>publication_handle</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{e74fea75-90c0-448f-9b58-9b3e905bbb87}" id="id-0067-00000648" kind="Member" referred="id-0066-0000005b" relid="0x0" role="Member">
-                <name>disposed_generation_count</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,660</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{3b58615b-6cc1-463d-972c-98a94d2e01c3}" id="id-0067-00000649" kind="Member" referred="id-0066-0000005b" relid="0x0" role="Member">
-                <name>no_writers_generation_count</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,760</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{290e16f9-124e-496c-8f46-7ed2a438b312}" id="id-0067-0000064a" kind="Member" referred="id-0066-0000005b" relid="0x0" role="Member">
-                <name>sample_rank</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,860</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{c6d029fb-0fa0-448a-bdf0-31a9450202e2}" id="id-0067-0000064b" kind="Member" referred="id-0066-0000005b" relid="0x0" role="Member">
-                <name>generation_rank</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,960</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{81356fa4-ada4-4164-af68-95365767a870}" id="id-0067-0000064c" kind="Member" referred="id-0066-0000005b" relid="0x0" role="Member">
-                <name>absolute_generation_rank</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1060</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{fba1a42c-2a85-44e3-ad4d-c04e21f2d664}" id="id-0067-0000064d" kind="Member" referred="id-0066-00000056" relid="0x0" role="Member">
-                <name>valid_data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,1160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <reference guid="{6d8fb54a-e172-4f46-a98a-abc0ec6e11d8}" id="id-0067-0000064e" kind="Collection" referred="id-0065-000001cb" relid="0xc" role="Collection">
-              <name>QosPolicyCountSeq</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="bound" status="meta">
-                <value/>
-              </attribute>
-            </reference>
-            <reference guid="{78e9e4ce-0c16-4926-9cab-98fca7f42340}" id="id-0067-0000064f" kind="Collection" referred="id-0065-000001fb" relid="0x1d" role="Collection">
-              <name>DataReaderSeq</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="bound" status="meta">
-                <value/>
-              </attribute>
-            </reference>
-            <reference guid="{ea4d831c-0b5d-4558-86cb-a1dbecede78d}" id="id-0067-00000650" kind="Collection" referred="id-0065-00000249" relid="0x24" role="Collection">
-              <name>ConditionSeq</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="bound" status="meta">
-                <value/>
-              </attribute>
-            </reference>
-            <reference guid="{bd00d3e2-536b-428c-9e03-cb8db4187959}" id="id-0067-00000651" kind="Collection" referred="id-0065-000002ba" relid="0x55" role="Collection">
-              <name>SampleInfoSeq</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="bound" status="meta">
-                <value/>
-              </attribute>
-            </reference>
-            <reference guid="{2fe5da52-96b2-4647-8938-ebb93f03845d}" id="id-0067-00000652" kind="Alias" referred="id-0066-0000005b" relid="0x0" role="Alias">
-              <name>DomainId_t</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-            </reference>
-            <reference guid="{7af80fb7-37be-44c8-b3be-fb071b3f8b98}" id="id-0067-00000653" kind="Alias" referred="id-0066-0000005b" relid="0x1" role="Alias">
-              <name>ReturnCode_t</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-            </reference>
-            <reference guid="{63648047-b328-4109-a598-d73b5c303abf}" id="id-0067-00000654" kind="Alias" referred="id-0066-0000005b" relid="0x1" role="Alias">
-              <name>QosPolicyId_t</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-            </reference>
-            <reference guid="{66e4851c-b1a2-4d81-b012-8e022cc217a6}" id="id-0067-00000655" kind="Collection" referred="id-0066-00000066" relid="0x1" role="Collection">
-              <name>StringSeq</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="bound" status="meta">
-                <value/>
-              </attribute>
-            </reference>
-            <reference guid="{47cb98dd-3048-4658-ba09-708cac3e5ee1}" id="id-0067-00000656" kind="Constant" referred="id-0066-0000005b" relid="0x3" role="Constant">
-              <name>LENGTH_UNLIMITED</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>-1</value>
-              </attribute>
-            </reference>
-            <reference guid="{71b0533d-dfa0-4c38-aef2-bbd79356393c}" id="id-0067-00000657" kind="Constant" referred="id-0066-0000005b" relid="0x3" role="Constant">
-              <name>DURATION_INFINITE_SEC</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>2147483647</value>
-              </attribute>
-            </reference>
-            <reference guid="{9f13e94e-e632-43e6-8845-35ae7a316311}" id="id-0067-00000658" kind="Constant" referred="id-0066-0000005e" relid="0x3" role="Constant">
-              <name>DURATION_INFINITE_NSEC</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>2147483647</value>
-              </attribute>
-            </reference>
-            <reference guid="{c00cbe0c-59f9-48bb-8ecb-0cc857d64131}" id="id-0067-00000659" kind="Constant" referred="id-0066-0000005b" relid="0x3" role="Constant">
-              <name>DURATION_ZERO_SEC</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>0</value>
-              </attribute>
-            </reference>
-            <reference guid="{a8512bf6-3e19-47a5-8c2a-4520e2b49e9c}" id="id-0067-0000065a" kind="Constant" referred="id-0066-0000005e" relid="0x3" role="Constant">
-              <name>DURATION_ZERO_NSEC</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>0</value>
-              </attribute>
-            </reference>
-            <reference guid="{822e18b5-55fe-484f-a1d7-d0b77d14be1d}" id="id-0067-0000065b" kind="Constant" referred="id-0066-0000005b" relid="0x3" role="Constant">
-              <name>TIME_INVALID_SEC</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>-1</value>
-              </attribute>
-            </reference>
-            <reference guid="{2b5c66eb-aac9-4e0e-bc66-7c7e2bf3fbc4}" id="id-0067-0000065c" kind="Constant" referred="id-0066-0000005e" relid="0x3" role="Constant">
-              <name>TIME_INVALID_NSEC</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>4294967295</value>
-              </attribute>
-            </reference>
-            <reference guid="{e7b59fbc-7ad2-4f0d-8d89-1b0318de9ed1}" id="id-0067-0000065d" kind="Constant" referred="id-0066-0000005b" relid="0x3" role="Constant">
-              <name>RETCODE_OK</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>0</value>
-              </attribute>
-            </reference>
-            <reference guid="{86342260-9134-4388-9af2-d239afc7dcbb}" id="id-0067-0000065e" kind="Constant" referred="id-0066-0000005b" relid="0x3" role="Constant">
-              <name>RETCODE_ERROR</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>1</value>
-              </attribute>
-            </reference>
-            <reference guid="{365e41c5-8103-423a-a0f1-7bcade5636c5}" id="id-0067-0000065f" kind="Constant" referred="id-0066-0000005b" relid="0x3" role="Constant">
-              <name>RETCODE_UNSUPPORTED</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>2</value>
-              </attribute>
-            </reference>
-            <reference guid="{f9ee7160-a3d9-4953-91bd-06a551332950}" id="id-0067-00000660" kind="Constant" referred="id-0066-0000005b" relid="0x3" role="Constant">
-              <name>RETCODE_BAD_PARAMETER</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>3</value>
-              </attribute>
-            </reference>
-            <reference guid="{a8d4855f-fe24-4c25-b0de-a4beeb6f2925}" id="id-0067-00000661" kind="Constant" referred="id-0066-0000005b" relid="0x3" role="Constant">
-              <name>RETCODE_PRECONDITION_NOT_MET</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>4</value>
-              </attribute>
-            </reference>
-            <reference guid="{88a50b74-c817-4b16-820d-3631a6292452}" id="id-0067-00000662" kind="Constant" referred="id-0066-0000005b" relid="0x3" role="Constant">
-              <name>RETCODE_OUT_OF_RESOURCES</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>5</value>
-              </attribute>
-            </reference>
-            <reference guid="{5c987617-b4c4-4971-943b-d34fd0f19847}" id="id-0067-00000663" kind="Constant" referred="id-0066-0000005b" relid="0x3" role="Constant">
-              <name>RETCODE_NOT_ENABLED</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>6</value>
-              </attribute>
-            </reference>
-            <reference guid="{f5f7a86f-d94f-438b-96d7-b6df65ba24a8}" id="id-0067-00000664" kind="Constant" referred="id-0066-0000005b" relid="0x3" role="Constant">
-              <name>RETCODE_IMMUTABLE_POLICY</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>7</value>
-              </attribute>
-            </reference>
-            <reference guid="{a52e4168-636b-44a7-8ba3-a11e22f9fb5a}" id="id-0067-00000665" kind="Constant" referred="id-0066-0000005b" relid="0x3" role="Constant">
-              <name>RETCODE_INCONSISTENT_POLICY</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>8</value>
-              </attribute>
-            </reference>
-            <reference guid="{e4ce1290-b724-4824-bb76-56ebc69ec16b}" id="id-0067-00000666" kind="Constant" referred="id-0066-0000005b" relid="0x3" role="Constant">
-              <name>RETCODE_ALREADY_DELETED</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>9</value>
-              </attribute>
-            </reference>
-            <reference guid="{7b36e470-9dfe-4cc5-a389-b4d0e30e0a9c}" id="id-0067-00000667" kind="Constant" referred="id-0066-0000005b" relid="0x3" role="Constant">
-              <name>RETCODE_TIMEOUT</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>10</value>
-              </attribute>
-            </reference>
-            <reference guid="{6de3ed4b-7ab1-4753-acfa-0f1114945d6b}" id="id-0067-00000668" kind="Constant" referred="id-0066-0000005b" relid="0x3" role="Constant">
-              <name>RETCODE_NO_DATA</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>11</value>
-              </attribute>
-            </reference>
-            <reference guid="{23a28218-3ff5-4be4-8295-01e195640efd}" id="id-0067-00000669" kind="Constant" referred="id-0066-0000005b" relid="0x3" role="Constant">
-              <name>RETCODE_ILLEGAL_OPERATION</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>12</value>
-              </attribute>
-            </reference>
-            <reference guid="{88ce6fba-c5b2-4c03-8df0-b6a327ebcba2}" id="id-0067-0000066a" kind="Alias" referred="id-0066-0000005e" relid="0x3" role="Alias">
-              <name>StatusKind</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-            </reference>
-            <reference guid="{992d1d26-1d82-4eea-8c98-6c3dd6a5a37b}" id="id-0067-0000066b" kind="Alias" referred="id-0066-0000005e" relid="0x3" role="Alias">
-              <name>StatusMask</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-            </reference>
-            <reference guid="{390c8e3d-7a61-4cb1-ab0c-97cbb3fd7a30}" id="id-0067-0000066c" kind="Constant" referred="id-0066-0000005e" relid="0x3" role="Constant">
-              <name>INCONSISTENT_TOPIC_STATUS</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>1</value>
-              </attribute>
-            </reference>
-            <reference guid="{3d3d20d7-9b0d-4cc5-8ffd-1a9731baedda}" id="id-0067-0000066d" kind="Constant" referred="id-0066-0000005e" relid="0x3" role="Constant">
-              <name>OFFERED_DEADLINE_MISSED_STATUS</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>2</value>
-              </attribute>
-            </reference>
-            <reference guid="{405c4afe-1866-4a0b-8468-b66f108c2ebd}" id="id-0067-0000066e" kind="Constant" referred="id-0066-0000005e" relid="0x3" role="Constant">
-              <name>REQUESTED_DEADLINE_MISSED_STATUS</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>4</value>
-              </attribute>
-            </reference>
-            <reference guid="{10b14bda-e0e1-4eeb-ba07-2a92fb7bfb07}" id="id-0067-0000066f" kind="Constant" referred="id-0066-0000005e" relid="0x3" role="Constant">
-              <name>OFFERED_INCOMPATIBLE_QOS_STATUS</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>32</value>
-              </attribute>
-            </reference>
-            <reference guid="{37e18cc5-9bbc-450b-bad4-0ff02873a212}" id="id-0067-00000670" kind="Constant" referred="id-0066-0000005e" relid="0x3" role="Constant">
-              <name>REQUESTED_INCOMPATIBLE_QOS_STATUS</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>64</value>
-              </attribute>
-            </reference>
-            <reference guid="{15e2b955-f873-4cad-b6c6-d94cce3f9685}" id="id-0067-00000671" kind="Constant" referred="id-0066-0000005e" relid="0x3" role="Constant">
-              <name>SAMPLE_LOST_STATUS</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>128</value>
-              </attribute>
-            </reference>
-            <reference guid="{2fee8117-c460-4931-abef-c01bfde44c49}" id="id-0067-00000672" kind="Constant" referred="id-0066-0000005e" relid="0x3" role="Constant">
-              <name>SAMPLE_REJECTED_STATUS</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>256</value>
-              </attribute>
-            </reference>
-            <reference guid="{983b235d-e54e-48c8-8c2f-97a936501285}" id="id-0067-00000673" kind="Constant" referred="id-0066-0000005e" relid="0x3" role="Constant">
-              <name>DATA_ON_READERS_STATUS</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>512</value>
-              </attribute>
-            </reference>
-            <reference guid="{0921cb80-552a-47d5-88ee-210c46ba266c}" id="id-0067-00000674" kind="Constant" referred="id-0066-0000005e" relid="0x3" role="Constant">
-              <name>DATA_AVAILABLE_STATUS</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>1024</value>
-              </attribute>
-            </reference>
-            <reference guid="{d5a8e220-5da9-48c0-b855-3da19c65a356}" id="id-0067-00000675" kind="Constant" referred="id-0066-0000005e" relid="0x3" role="Constant">
-              <name>LIVELINESS_LOST_STATUS</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>2048</value>
-              </attribute>
-            </reference>
-            <reference guid="{366574bb-4b22-43ec-b6c8-66eb202422b7}" id="id-0067-00000676" kind="Constant" referred="id-0066-0000005e" relid="0x3" role="Constant">
-              <name>LIVELINESS_CHANGED_STATUS</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>4096</value>
-              </attribute>
-            </reference>
-            <reference guid="{15265a69-3a8f-4070-a446-f4b7cb4ff669}" id="id-0067-00000677" kind="Constant" referred="id-0066-0000005e" relid="0x3" role="Constant">
-              <name>PUBLICATION_MATCHED_STATUS</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>8192</value>
-              </attribute>
-            </reference>
-            <reference guid="{7f72eea7-bb4f-4cb1-8ca1-05481e4fefc0}" id="id-0067-00000678" kind="Constant" referred="id-0066-0000005e" relid="0x3" role="Constant">
-              <name>SUBSCRIPTION_MATCHED_STATUS</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>16384</value>
-              </attribute>
-            </reference>
-            <reference guid="{c385cc93-bf7c-4209-8588-a989d7a6041f}" id="id-0067-00000679" kind="Constant" referred="id-0066-0000005e" relid="0x3" role="Constant">
-              <name>RELIABLE_WRITER_CACHE_CHANGED_STATUS</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>16777216</value>
-              </attribute>
-            </reference>
-            <reference guid="{2f13072f-80e4-4fce-a346-016fc43f8e04}" id="id-0067-0000067a" kind="Constant" referred="id-0066-0000005e" relid="0x3" role="Constant">
-              <name>RELIABLE_READER_ACTIVITY_CHANGED_STATUS</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>33554432</value>
-              </attribute>
-            </reference>
-            <reference guid="{5ac8c882-8da5-48d1-8a51-8664de6b73d9}" id="id-0067-0000067b" kind="Alias" referred="id-0066-0000005e" relid="0x27" role="Alias">
-              <name>SampleStateKind</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-            </reference>
-            <reference guid="{5c97dd5c-e30a-4e5e-982b-5941ea736d23}" id="id-0067-0000067c" kind="Constant" referred="id-0066-0000005e" relid="0x27" role="Constant">
-              <name>READ_SAMPLE_STATE</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>1</value>
-              </attribute>
-            </reference>
-            <reference guid="{c6c1b717-4293-4ea5-8888-73283f554469}" id="id-0067-0000067d" kind="Constant" referred="id-0066-0000005e" relid="0x27" role="Constant">
-              <name>NOT_READ_SAMPLE_STATE</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>2</value>
-              </attribute>
-            </reference>
-            <reference guid="{e52a7097-2f47-4e71-8fbb-25708a6329ca}" id="id-0067-0000067e" kind="Alias" referred="id-0066-0000005e" relid="0x27" role="Alias">
-              <name>SampleStateMask</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-            </reference>
-            <reference guid="{9f6561a8-db66-4e2a-b809-e12d7d79f22e}" id="id-0067-0000067f" kind="Constant" referred="id-0066-0000005e" relid="0x27" role="Constant">
-              <name>ANY_SAMPLE_STATE</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>65535</value>
-              </attribute>
-            </reference>
-            <reference guid="{eae82e38-e6f6-4063-b0ef-b4fa45834f07}" id="id-0067-00000680" kind="Alias" referred="id-0066-0000005e" relid="0x27" role="Alias">
-              <name>ViewStateKind</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-            </reference>
-            <reference guid="{30af0b37-bb5b-44e3-ab35-5edf7b82f369}" id="id-0067-00000681" kind="Constant" referred="id-0066-0000005e" relid="0x27" role="Constant">
-              <name>NEW_VIEW_STATE</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>1</value>
-              </attribute>
-            </reference>
-            <reference guid="{dc6609b3-65aa-4a80-957f-b95df0b784c8}" id="id-0067-00000682" kind="Constant" referred="id-0066-0000005e" relid="0x27" role="Constant">
-              <name>NOT_NEW_VIEW_STATE</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>2</value>
-              </attribute>
-            </reference>
-            <reference guid="{04fab75a-961a-447b-bd69-c034886db852}" id="id-0067-00000683" kind="Alias" referred="id-0066-0000005e" relid="0x27" role="Alias">
-              <name>ViewStateMask</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-            </reference>
-            <reference guid="{627de5a1-3601-468b-b810-aa7558271c89}" id="id-0067-00000684" kind="Constant" referred="id-0066-0000005e" relid="0x27" role="Constant">
-              <name>ANY_VIEW_STATE</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>65535</value>
-              </attribute>
-            </reference>
-            <reference guid="{5c99fed6-c066-42b9-86ac-4a97f68bbf97}" id="id-0067-00000685" kind="Alias" referred="id-0066-0000005e" relid="0x27" role="Alias">
-              <name>InstanceStateKind</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-            </reference>
-            <reference guid="{bcc2e328-cbeb-4833-bf50-1df5d7434084}" id="id-0067-00000686" kind="Constant" referred="id-0066-0000005e" relid="0x27" role="Constant">
-              <name>ALIVE_INSTANCE_STATE</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>1</value>
-              </attribute>
-            </reference>
-            <reference guid="{e1c6fd6c-781c-49ff-8fde-9fabae35ea93}" id="id-0067-00000687" kind="Constant" referred="id-0066-0000005e" relid="0x27" role="Constant">
-              <name>NOT_ALIVE_DISPOSED_INSTANCE_STATE</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>2</value>
-              </attribute>
-            </reference>
-            <reference guid="{e0060c39-9494-44ff-a214-2f7921141c80}" id="id-0067-00000688" kind="Constant" referred="id-0066-0000005e" relid="0x27" role="Constant">
-              <name>NOT_ALIVE_NO_WRITERS_INSTANCE_STATE</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>4</value>
-              </attribute>
-            </reference>
-            <reference guid="{84c665d4-308d-4399-b82c-2c563536cc8d}" id="id-0067-00000689" kind="Alias" referred="id-0066-0000005e" relid="0x27" role="Alias">
-              <name>InstanceStateMask</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-            </reference>
-            <reference guid="{23d82ced-1d06-4d87-8fbe-6d1670269ac4}" id="id-0067-0000068a" kind="Constant" referred="id-0066-0000005e" relid="0x27" role="Constant">
-              <name>ANY_INSTANCE_STATE</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>65535</value>
-              </attribute>
-            </reference>
-            <reference guid="{e8c6d22f-e0e5-434f-a299-a99ea6cfa987}" id="id-0067-0000068b" kind="Constant" referred="id-0066-0000005e" relid="0x27" role="Constant">
-              <name>NOT_ALIVE_INSTANCE_STATE</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>6</value>
-              </attribute>
-            </reference>
-            <reference guid="{5f2172a2-f0a7-4b0c-8e2c-05302321d0bf}" id="id-0067-0000068c" kind="Constant" referred="id-0066-00000066" relid="0x29" role="Constant">
-              <name>USERDATA_QOS_POLICY_NAME</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>UserData</value>
-              </attribute>
-            </reference>
-            <reference guid="{342bfbee-3001-4713-a5ea-dddfca9b01cd}" id="id-0067-0000068d" kind="Constant" referred="id-0066-00000066" relid="0x29" role="Constant">
-              <name>DURABILITY_QOS_POLICY_NAME</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>Durability</value>
-              </attribute>
-            </reference>
-            <reference guid="{e865df56-22dc-4c6a-be4a-b1d323b7b4e5}" id="id-0067-0000068e" kind="Constant" referred="id-0066-00000066" relid="0x29" role="Constant">
-              <name>PRESENTATION_QOS_POLICY_NAME</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>Presentation</value>
-              </attribute>
-            </reference>
-            <reference guid="{960a135a-7067-4dd8-9729-9a36abcce18c}" id="id-0067-0000068f" kind="Constant" referred="id-0066-00000066" relid="0x29" role="Constant">
-              <name>DEADLINE_QOS_POLICY_NAME</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>Deadline</value>
-              </attribute>
-            </reference>
-            <reference guid="{885dfeed-2652-4be0-900f-abf60f93e712}" id="id-0067-00000690" kind="Constant" referred="id-0066-00000066" relid="0x29" role="Constant">
-              <name>LATENCYBUDGET_QOS_POLICY_NAME</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>LatencyBudget</value>
-              </attribute>
-            </reference>
-            <reference guid="{fc9eff9b-593b-45dd-84f6-3cdf5fc55aad}" id="id-0067-00000691" kind="Constant" referred="id-0066-00000066" relid="0x29" role="Constant">
-              <name>OWNERSHIP_QOS_POLICY_NAME</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>Ownership</value>
-              </attribute>
-            </reference>
-            <reference guid="{d595fd88-30b2-4603-aa2c-a57f65e22357}" id="id-0067-00000692" kind="Constant" referred="id-0066-00000066" relid="0x29" role="Constant">
-              <name>OWNERSHIPSTRENGTH_QOS_POLICY_NAME</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>OwnershipStrength</value>
-              </attribute>
-            </reference>
-            <reference guid="{2d6cb837-6e20-4313-a165-c586617b6349}" id="id-0067-00000693" kind="Constant" referred="id-0066-00000066" relid="0x29" role="Constant">
-              <name>LIVELINESS_QOS_POLICY_NAME</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>Liveliness</value>
-              </attribute>
-            </reference>
-            <reference guid="{07e31c0c-3231-42b3-98dc-a388ae679ae2}" id="id-0067-00000694" kind="Constant" referred="id-0066-00000066" relid="0x29" role="Constant">
-              <name>TIMEBASEDFILTER_QOS_POLICY_NAME</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>TimeBasedFilter</value>
-              </attribute>
-            </reference>
-            <reference guid="{b354cef1-9129-4ca3-8c48-258b0d804a5e}" id="id-0067-00000695" kind="Constant" referred="id-0066-00000066" relid="0x29" role="Constant">
-              <name>PARTITION_QOS_POLICY_NAME</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>Partition</value>
-              </attribute>
-            </reference>
-            <reference guid="{4b7d207f-8a78-4551-8aa7-02e74dc6f675}" id="id-0067-00000696" kind="Constant" referred="id-0066-00000066" relid="0x29" role="Constant">
-              <name>RELIABILITY_QOS_POLICY_NAME</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>Reliability</value>
-              </attribute>
-            </reference>
-            <reference guid="{70bd1a60-33c8-4a8a-9b17-38334ebddb3c}" id="id-0067-00000697" kind="Constant" referred="id-0066-00000066" relid="0x29" role="Constant">
-              <name>DESTINATIONORDER_QOS_POLICY_NAME</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>DestinationOrder</value>
-              </attribute>
-            </reference>
-            <reference guid="{cfd2bd41-b9af-417b-8354-94a13b32eed0}" id="id-0067-00000698" kind="Constant" referred="id-0066-00000066" relid="0x29" role="Constant">
-              <name>HISTORY_QOS_POLICY_NAME</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>History</value>
-              </attribute>
-            </reference>
-            <reference guid="{b59b8a19-89a4-4848-a844-14233b466053}" id="id-0067-00000699" kind="Constant" referred="id-0066-00000066" relid="0x29" role="Constant">
-              <name>RESOURCELIMITS_QOS_POLICY_NAME</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>ResourceLimits</value>
-              </attribute>
-            </reference>
-            <reference guid="{987c7a77-32a3-405e-b79c-0e4ffa535e83}" id="id-0067-0000069a" kind="Constant" referred="id-0066-00000066" relid="0x29" role="Constant">
-              <name>ENTITYFACTORY_QOS_POLICY_NAME</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>EntityFactory</value>
-              </attribute>
-            </reference>
-            <reference guid="{70754b78-bddf-4f69-9867-dfd284250706}" id="id-0067-0000069b" kind="Constant" referred="id-0066-00000066" relid="0x29" role="Constant">
-              <name>WRITERDATALIFECYCLE_QOS_POLICY_NAME</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>WriterDataLifecycle</value>
-              </attribute>
-            </reference>
-            <reference guid="{686913f1-452e-43e0-ab32-5586c0f0fed6}" id="id-0067-0000069c" kind="Constant" referred="id-0066-00000066" relid="0x29" role="Constant">
-              <name>READERDATALIFECYCLE_QOS_POLICY_NAME</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>ReaderDataLifecycle</value>
-              </attribute>
-            </reference>
-            <reference guid="{9e8145d3-32fd-469c-9ba2-5e1b37d28950}" id="id-0067-0000069d" kind="Constant" referred="id-0066-00000066" relid="0x29" role="Constant">
-              <name>TOPICDATA_QOS_POLICY_NAME</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>TopicData</value>
-              </attribute>
-            </reference>
-            <reference guid="{2f74cd87-7056-411e-8df5-ec3fde12f838}" id="id-0067-0000069e" kind="Constant" referred="id-0066-00000066" relid="0x29" role="Constant">
-              <name>GROUPDATA_QOS_POLICY_NAME</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>TransportPriority</value>
-              </attribute>
-            </reference>
-            <reference guid="{84431488-0616-42bb-b041-ff04f04afd4a}" id="id-0067-0000069f" kind="Constant" referred="id-0066-00000066" relid="0x29" role="Constant">
-              <name>LIFESPAN_QOS_POLICY_NAME</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>Lifespan</value>
-              </attribute>
-            </reference>
-            <reference guid="{25e9c88b-ecc3-49b5-856b-ce68ed556005}" id="id-0067-000006a0" kind="Constant" referred="id-0066-00000066" relid="0x29" role="Constant">
-              <name>DURABILITYSERVICE_POLICY_NAME</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>DurabilityService</value>
-              </attribute>
-            </reference>
-            <reference guid="{a5583f66-b4fd-41cb-bf8a-93f5a3ad592d}" id="id-0067-000006a1" kind="Constant" referred="id-0066-0000005b" relid="0x29" role="Constant">
-              <name>INVALID_QOS_POLICY_ID</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>0</value>
-              </attribute>
-            </reference>
-            <reference guid="{900018cf-41d6-4dd2-bc12-5519f7fa71af}" id="id-0067-000006a2" kind="Constant" referred="id-0066-0000005b" relid="0x29" role="Constant">
-              <name>USERDATA_QOS_POLICY_ID</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>1</value>
-              </attribute>
-            </reference>
-            <reference guid="{90cff5dc-65c5-4439-87f4-9ffe7c471ec3}" id="id-0067-000006a3" kind="Constant" referred="id-0066-0000005b" relid="0x29" role="Constant">
-              <name>DURABILITY_QOS_POLICY_ID</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>2</value>
-              </attribute>
-            </reference>
-            <reference guid="{5f9654da-90dd-4c64-bdf9-b54f9c22cee3}" id="id-0067-000006a4" kind="Constant" referred="id-0066-0000005b" relid="0x29" role="Constant">
-              <name>PRESENTATION_QOS_POLICY_ID</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>3</value>
-              </attribute>
-            </reference>
-            <reference guid="{f1351792-cb5c-420d-87ef-9a382e601e0f}" id="id-0067-000006a5" kind="Constant" referred="id-0066-0000005b" relid="0x29" role="Constant">
-              <name>DEADLINE_QOS_POLICY_ID</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>4</value>
-              </attribute>
-            </reference>
-            <reference guid="{5e24adef-84f2-4217-935c-7919ca41349f}" id="id-0067-000006a6" kind="Constant" referred="id-0066-0000005b" relid="0x29" role="Constant">
-              <name>LATENCYBUDGET_QOS_POLICY_ID</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>5</value>
-              </attribute>
-            </reference>
-            <reference guid="{04c3ccdd-029a-42b9-966c-03a39649c434}" id="id-0067-000006a7" kind="Constant" referred="id-0066-0000005b" relid="0x29" role="Constant">
-              <name>OWNERSHIP_QOS_POLICY_ID</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>6</value>
-              </attribute>
-            </reference>
-            <reference guid="{73353c2c-8b07-47b5-b1d2-bf8488a53abd}" id="id-0067-000006a8" kind="Constant" referred="id-0066-0000005b" relid="0x29" role="Constant">
-              <name>OWNERSHIPSTRENGTH_QOS_POLICY_ID</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>7</value>
-              </attribute>
-            </reference>
-            <reference guid="{3e13fcc4-1376-45ec-a75d-1fe3e3a21b32}" id="id-0067-000006a9" kind="Constant" referred="id-0066-0000005b" relid="0x29" role="Constant">
-              <name>LIVELINESS_QOS_POLICY_ID</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>8</value>
-              </attribute>
-            </reference>
-            <reference guid="{6cc25795-4a61-42b0-92ee-b178311f6685}" id="id-0067-000006aa" kind="Constant" referred="id-0066-0000005b" relid="0x29" role="Constant">
-              <name>TIMEBASEDFILTER_QOS_POLICY_ID</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>9</value>
-              </attribute>
-            </reference>
-            <reference guid="{8cc80712-a728-439a-97e9-01656d5f0798}" id="id-0067-000006ab" kind="Constant" referred="id-0066-0000005b" relid="0x29" role="Constant">
-              <name>PARTITION_QOS_POLICY_ID</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>10</value>
-              </attribute>
-            </reference>
-            <reference guid="{6fe0af61-4983-4eaf-a0e4-2f95c0e61ae4}" id="id-0067-000006ac" kind="Constant" referred="id-0066-0000005b" relid="0x29" role="Constant">
-              <name>RELIABILITY_QOS_POLICY_ID</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>11</value>
-              </attribute>
-            </reference>
-            <reference guid="{3d1b86b5-e1ef-44eb-a0a0-0a68b139696d}" id="id-0067-000006ad" kind="Constant" referred="id-0066-0000005b" relid="0x29" role="Constant">
-              <name>DESTINATIONORDER_QOS_POLICY_ID</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>12</value>
-              </attribute>
-            </reference>
-            <reference guid="{fa43c7d0-05ed-41f8-8209-b62c8275fafe}" id="id-0067-000006ae" kind="Constant" referred="id-0066-0000005b" relid="0x29" role="Constant">
-              <name>HISTORY_QOS_POLICY_ID</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>13</value>
-              </attribute>
-            </reference>
-            <reference guid="{20e774b6-a766-4159-b9a5-ddf2694e6819}" id="id-0067-000006af" kind="Constant" referred="id-0066-0000005b" relid="0x29" role="Constant">
-              <name>RESOURCELIMITS_QOS_POLICY_ID</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>14</value>
-              </attribute>
-            </reference>
-            <reference guid="{22c87c9f-59d2-4208-ac27-bf4e7ed3a26a}" id="id-0067-000006b0" kind="Constant" referred="id-0066-0000005b" relid="0x29" role="Constant">
-              <name>ENTITYFACTORY_QOS_POLICY_ID</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>15</value>
-              </attribute>
-            </reference>
-            <reference guid="{b47ce178-3002-41e4-b156-cd2859716e21}" id="id-0067-000006b1" kind="Constant" referred="id-0066-0000005b" relid="0x29" role="Constant">
-              <name>WRITERDATALIFECYCLE_QOS_POLICY_ID</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>16</value>
-              </attribute>
-            </reference>
-            <reference guid="{6444c694-b5c1-4f80-a898-3be27fb49b8e}" id="id-0067-000006b2" kind="Constant" referred="id-0066-0000005b" relid="0x29" role="Constant">
-              <name>READERDATALIFECYCLE_QOS_POLICY_ID</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>17</value>
-              </attribute>
-            </reference>
-            <reference guid="{a62f9110-3577-4424-8204-d55f86b042fd}" id="id-0067-000006b3" kind="Constant" referred="id-0066-0000005b" relid="0x29" role="Constant">
-              <name>TOPICDATA_QOS_POLICY_ID</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>18</value>
-              </attribute>
-            </reference>
-            <reference guid="{c40ef8d5-414f-463b-b547-477523ea9ac7}" id="id-0067-000006b4" kind="Constant" referred="id-0066-0000005b" relid="0x29" role="Constant">
-              <name>GROUPDATA_QOS_POLICY_ID</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>19</value>
-              </attribute>
-            </reference>
-            <reference guid="{d4477e99-5985-489d-9609-b8f294c8a149}" id="id-0067-000006b5" kind="Constant" referred="id-0066-0000005b" relid="0x29" role="Constant">
-              <name>TRANSPORTPRIORITY_QOS_POLICY_ID</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>20</value>
-              </attribute>
-            </reference>
-            <reference guid="{6ea3d1b9-4d9c-422d-b840-dd7dbdc687c1}" id="id-0067-000006b6" kind="Constant" referred="id-0066-0000005b" relid="0x29" role="Constant">
-              <name>LIFESPAN_QOS_POLICY_ID</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>21</value>
-              </attribute>
-            </reference>
-            <reference guid="{9a3f8cd3-6297-4271-bff0-5df4d6ef4e86}" id="id-0067-000006b7" kind="Constant" referred="id-0066-0000005b" relid="0x29" role="Constant">
-              <name>DURABILITYSERVICE_QOS_POLICY_ID</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="value">
-                <value>22</value>
-              </attribute>
-            </reference>
-            <reference guid="{3d739258-d430-4f96-965e-b0712419b322}" id="id-0067-000006b8" kind="Collection" referred="id-0066-00000057" relid="0x29" role="Collection">
-              <name>OctetSeq</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="bound" status="meta">
-                <value/>
-              </attribute>
-            </reference>
-          </model>
-        </model>
-        <model childrelidcntr="0x1" guid="{ab5b259b-a53c-4e92-a982-85860248d4ce}" id="id-0065-000002bb" kind="File" relid="0xf">
-          <name>dds_rtf2_dcps_instance_handle</name>
-          <attribute kind="Path">
-            <value>connectors/dds4ccm/idl</value>
-          </attribute>
-          <attribute kind="PostPreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrePreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrefixTag" status="meta">
-            <value/>
-          </attribute>
-          <model childrelidcntr="0x1" guid="{639af11c-9d1e-4f6e-bb6f-90cfd4a688e1}" id="id-0065-000002bc" kind="Package" relid="0x0" role="Package">
-            <name>DDS</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrefixTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <atom guid="{d0de930c-c067-42ed-b568-847c0dcbde68}" id="id-0066-00000055" kind="NativeValue" relid="0x0" role="NativeValue">
-              <name>HANDLE_NIL</name>
-            </atom>
-          </model>
-        </model>
-        <model childrelidcntr="0x1" guid="{5f33e8ef-85f4-49ef-bcbb-a2ef7ac61eb3}" id="id-0065-000002bd" kind="File" relid="0x10">
-          <name>dds_rtf2_dcps_i_handle</name>
-          <attribute kind="Path">
-            <value>connectors/dds4ccm/idl</value>
-          </attribute>
-          <attribute kind="PostPreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrePreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrefixTag" status="meta">
-            <value/>
-          </attribute>
-          <model childrelidcntr="0x2" guid="{38efb2d6-c5ac-47be-ae87-cb4afe74bdeb}" id="id-0065-000002be" kind="Package" relid="0x0" role="Package">
-            <name>DDS</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrefixTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <model childrelidcntr="0x1" guid="{d669c2b7-7879-4d7c-953d-5e3241428e92}" id="id-0065-000002bf" kind="Aggregate" relid="0x0" role="Aggregate">
-              <name>NativeInstanceHandle_t</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{8bac54ad-db49-4c71-8611-018b48d10830}" id="id-0067-000006b9" kind="ArrayMember" referred="id-0066-00000057" relid="0x0" role="ArrayMember">
-                <name>value</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="Size">
-                  <value>16</value>
-                </attribute>
-              </reference>
-              <reference guid="{8136fdb0-7dbb-4225-8755-2577a3e773db}" id="id-0067-000006ba" kind="Member" referred="id-0066-0000005e" relid="0x0" role="Member">
-                <name>length</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{5a1128c6-a81c-48e0-bb50-5a582a1cd3ba}" id="id-0067-000006bb" kind="Member" referred="id-0066-0000005e" relid="0x0" role="Member">
-                <name>isValid</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <reference guid="{ff971609-3de5-4dfd-92d3-5c05a80afaa9}" id="id-0067-000006bc" kind="Alias" referred="id-0065-000002bf" relid="0x1" role="Alias">
-              <name>InstanceHandle_t</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-            </reference>
-            <reference guid="{d18bc8f7-a45e-4fbb-a5f2-d48f872f7ecd}" id="id-0067-000006bd" kind="Collection" referred="id-0067-000006bc" relid="0x1" role="Collection">
-              <name>InstanceHandleSeq</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="bound" status="meta">
-                <value/>
-              </attribute>
-            </reference>
-          </model>
-        </model>
-      </folder>
-      <folder childrelidcntr="0x0" guid="{69574031-9f39-4d8e-823d-d29fd48aa072}" id="id-006a-00000007" kind="ImplementationArtifacts" relid="0x1">
-        <name>ImplementationArtifacts</name>
-      </folder>
-      <folder childrelidcntr="0x0" guid="{761a1f97-c812-44a4-95d4-bedbffef5e88}" id="id-006a-00000008" kind="ComponentImplementations" relid="0x2">
-        <name>ComponentImplementations</name>
-      </folder>
-      <folder childrelidcntr="0x12" guid="{dddb800b-cb2d-44c1-8565-04c55466865d}" id="id-006a-00000009" kind="PredefinedTypes" relid="0x3">
-        <name>PredefinedTypes</name>
-        <atom guid="{fb202a59-8bd9-4a7e-aada-1816868d4387}" id="id-0066-00000056" kind="Boolean" relid="0x0">
-          <name>Boolean</name>
-        </atom>
-        <atom guid="{e4f7be2e-25d8-4a0b-9645-28580fe6b533}" id="id-0066-00000057" kind="Byte" relid="0x1">
-          <name>Byte</name>
-        </atom>
-        <atom guid="{8193fe8f-a5af-40a1-b393-de6c5d54c352}" id="id-0066-00000058" kind="Char" relid="0x2">
-          <name>Char</name>
-        </atom>
-        <atom guid="{05b11570-71e1-448c-828f-834dfe5843da}" id="id-0066-00000059" kind="WideChar" relid="0x3">
-          <name>WideChar</name>
-        </atom>
-        <atom guid="{5bded188-b1f8-4aad-b46f-44c70302479c}" id="id-0066-0000005a" kind="ShortInteger" relid="0x4">
-          <name>ShortInteger</name>
-        </atom>
-        <atom guid="{82e9b301-b8d9-4ed6-adde-3f6fa870a4e1}" id="id-0066-0000005b" kind="LongInteger" relid="0x5">
-          <name>LongInteger</name>
-        </atom>
-        <atom guid="{74476a32-4e8e-4476-9386-c18ca08b7169}" id="id-0066-0000005c" kind="LongLongInteger" relid="0x6">
-          <name>LongLongInteger</name>
-        </atom>
-        <atom guid="{db80209c-37a2-4682-b082-c7e6c836e85a}" id="id-0066-0000005d" kind="UnsignedShortInteger" relid="0x7">
-          <name>UnsignedShortInteger</name>
-        </atom>
-        <atom guid="{9007bf15-29fc-4b32-a84a-7b7d37391b84}" id="id-0066-0000005e" kind="UnsignedLongInteger" relid="0x8">
-          <name>UnsignedLongInteger</name>
-        </atom>
-        <atom guid="{4088faaa-acb3-4f25-8e02-facd710cffc6}" id="id-0066-0000005f" kind="UnsignedLongLongInteger" relid="0x9">
-          <name>UnsignedLongLongInteger</name>
-        </atom>
-        <atom guid="{86abaec4-275b-4557-b7fc-3c37162e4c88}" id="id-0066-00000060" kind="FloatNumber" relid="0xa">
-          <name>FloatNumber</name>
-        </atom>
-        <atom guid="{31da4bfa-4cdd-4aa3-a2b2-ca4565fe6c5e}" id="id-0066-00000061" kind="DoubleNumber" relid="0xb">
-          <name>DoubleNumber</name>
-        </atom>
-        <atom guid="{2ff7e056-4843-4aa2-92b3-7a63d5f05f7e}" id="id-0066-00000062" kind="LongDoubleNumber" relid="0xc">
-          <name>LongDoubleNumber</name>
-        </atom>
-        <atom guid="{9febfeb2-0029-4e17-863a-95ce95fc96c8}" id="id-0066-00000063" kind="GenericObject" relid="0xd">
-          <name>GenericObject</name>
-        </atom>
-        <atom guid="{f8a3717c-66ac-4036-82ca-cd1ae722f2f5}" id="id-0066-00000064" kind="GenericValue" relid="0xe">
-          <name>GenericValue</name>
-        </atom>
-        <atom guid="{78214cf5-c763-4757-8021-1f4048f149db}" id="id-0066-00000065" kind="GenericValueObject" relid="0xf">
-          <name>GenericValueObject</name>
-        </atom>
-        <atom guid="{27e3d44c-6193-4866-b3af-e20dff54bbab}" id="id-0066-00000066" kind="String" relid="0x10">
-          <name>String</name>
-        </atom>
-        <atom guid="{e783ca74-1607-4282-996b-f76573af40f4}" id="id-0066-00000067" kind="WideString" relid="0x11">
-          <name>WideString</name>
-        </atom>
-      </folder>
-    </folder>
-  </folder>
-
-</project>
diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/Base/Shapes_Base.idl b/CIAO/connectors/dds4ccm/examples/ShapesContr/Base/Shapes_Base.idl
deleted file mode 100644
index c7e8bc65bc8..00000000000
--- a/CIAO/connectors/dds4ccm/examples/ShapesContr/Base/Shapes_Base.idl
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * @file Shapes_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef SHAPES_BASE_IDL
-#define SHAPES_BASE_IDL
-
-#pragma ndds typesupport "Base/Shapes_BaseSupport.h"
-#pragma opendds typesupport "Base/Shapes_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "org::omg::dds::demo::ShapeType"
-#pragma DCPS_DATA_KEY "org::omg::dds::demo::ShapeType color"
-
-module org {
-  module omg {
-    module dds {
-      module demo {
-        struct ShapeType {
-          string color; //@key
-          long x;
-          long y;
-          long shapesize;
-        };
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-        typedef sequence<ShapeType> ShapeTypeSeq;
-#endif
-      };
-    };
-  };
-};
-
-
-#pragma keylist ShapeType color
-
-#pragma DCPS_DATA_TYPE "org::omg::dds::demo::Attributes"
-#pragma DCPS_DATA_KEY "org::omg::dds::demo::Attributes shape"
-#pragma DCPS_DATA_KEY "org::omg::dds::demo::Attributes color"
-
-module org {
-  module omg {
-    module dds {
-      module demo {
-        struct Attributes {
-          string shape; //@key
-          string color; //@key
-          float speed;
-        };
-      };
-    };
-  };
-};
-
-// #pragma DCPS_DATA_SEQUENCE_TYPE "AttributesSeq"
-// typedef sequence<Attributes> AttributesSeq;
-
-
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/Base/Shapes_Base.mpc b/CIAO/connectors/dds4ccm/examples/ShapesContr/Base/Shapes_Base.mpc
deleted file mode 100644
index 8fb79f0b5c5..00000000000
--- a/CIAO/connectors/dds4ccm/examples/ShapesContr/Base/Shapes_Base.mpc
+++ /dev/null
@@ -1,101 +0,0 @@
-project (ShapesContr_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = ShapesContr_Base_stub
-  dynamicflags += SHAPES_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=SHAPES_BASE_STUB_Export \
-              -Wb,stub_export_include=Shapes_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    Shapes_Base.idl
-  }
-
-  opendds_ts_flags += --export=SHAPES_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    Shapes_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
-project(Shapes_Contr_Base_idl_gen) : componentidldefaults {
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SHAPE_CONTR_BASE_STUB_Export \
-              -Wb,stub_export_include=Shapes_Contr_Base_stub_export.h \
-              -Wb,skel_export_macro=SHAPE_CONTR_BASE_SVNT_Export \
-              -Wb,skel_export_include=Shapes_Contr_Base_svnt_export.h \
-              -Wb,svnt_export_macro=SHAPE_CONTR_BASE_SVNT_Export \
-              -Wb,svnt_export_include=Shapes_Contr_Base_svnt_export.h
-
-
-  IDL_Files {
-    Shapes_Contr_Base.idl
-  }
-}
-
-project(Shapes_Contr_Base_lem_gen) : ciaoidldefaults {
-  custom_only = 1
-  after += Shapes_Contr_Base_idl_gen
-  idlflags += -Wb,export_macro=SHAPE_CONTR_BASE_STUB_Export \
-              -Wb,export_include=Shapes_Contr_Base_stub_export.h
-
-  IDL_Files {
-    Shapes_Contr_BaseE.idl
-  }
-}
-
-project(Shapes_Contr_Base_stub) : ccm_stub {
-  after += Shapes_Contr_Base_lem_gen
-  libout = ../lib
-  sharedname = Shapes_Contr_Base_stub
-  dynamicflags += SHAPE_CONTR_BASE_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Shapes_Contr_BaseC.cpp
-    Shapes_Contr_BaseEC.cpp
-  }
-
-  Header_Files {
-    Shapes_Contr_BaseC.h
-    Shapes_Contr_Base_stub_export.h
-  }
-
-  Inline_Files {
-    Shapes_Contr_BaseC.inl
-  }
-}
-
-
-project(Shapes_Contr_Base_svnt) : ciao_servant {
-  after      +=   Shapes_Contr_Base_stub
-  sharedname  = Shapes_Contr_Base_svnt
-  libs       += Shapes_Contr_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SHAPE_CONTR_BASE_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Shapes_Contr_BaseS.cpp
-    Shapes_Contr_Base_svnt.cpp
-  }
-
-  Header_Files {
-    Shapes_Contr_BaseS.h
-    Shapes_Contr_Base_svnt.h
-    Shapes_Contr_Base_svnt_export.h
-  }
-
-  Inline_Files {
-  }
- }
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/Base/Shapes_Contr_Base.idl b/CIAO/connectors/dds4ccm/examples/ShapesContr/Base/Shapes_Contr_Base.idl
deleted file mode 100644
index dc8acc64199..00000000000
--- a/CIAO/connectors/dds4ccm/examples/ShapesContr/Base/Shapes_Contr_Base.idl
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * @file Shapes_Contr_Base.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef SHAPES_CONTR_BASE_IDL
-#define SHAPES_CONTR_BASE_IDL
-
-
-#pragma ciao lem "../Base/Shapes_Contr_BaseE.idl"
-
-interface shape_attributes_get
-{
-  unsigned short max_size ();
-  unsigned short max_x ();
-  unsigned short max_y ();
-  boolean resize ();
-  unsigned long publish_rate ();
-};
-
-interface shape_attributes_set
-{
-  void max_size(in unsigned short ms);
-  void max_x(in unsigned short mx);
-  void max_y(in unsigned short my);
-  void resize(in boolean rs);
-  void publish_rate (in unsigned long pr);
-
-  void get_attr_values (out unsigned short max_size, out  unsigned short max_x, out unsigned short max_y, out  unsigned long publish_rate, out boolean resize);
-  void update_changes ();
-};
-
-interface shape_changes
-{
-  void pass_change_event();
-};
-
-struct shape_info
-{
-  string shape;
-  string color;
-  unsigned short size;
-  unsigned short posX;
-  unsigned short posY;
-};
-
-typedef sequence<shape_info> ShapeInfoSeq;
-
-interface shape_received
-{
-    unsigned short number_of_shapes();
-    ShapeInfoSeq get_info_shapes();
-};
-
-struct shape_aggr
-{
-  string shape;
-  string color;
-  unsigned long  number_of_shapes;
-  unsigned short last_size;
-  unsigned short last_posX;
-  unsigned short last_posY;
-};
-
-typedef sequence<shape_aggr> ShapeAggrSeq;
-
-interface shapes_aggregates
-{
-  ShapeAggrSeq get_aggr_shapes();
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/Connector/Shapes_Connector.idl b/CIAO/connectors/dds4ccm/examples/ShapesContr/Connector/Shapes_Connector.idl
deleted file mode 100644
index 9669a787727..00000000000
--- a/CIAO/connectors/dds4ccm/examples/ShapesContr/Connector/Shapes_Connector.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file Shapes_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef SHAPES_CONNECTOR_IDL_
-#define SHAPES_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Shapes_Base.idl"
-
-#pragma ciao lem "Connector/Shapes_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/Shapes_BaseTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::org::omg::dds::demo::ShapeType, ::org::omg::dds::demo::ShapeTypeSeq> Shapes;
-
-#endif /* SHAPES_CONNECTOR_IDL_ */
-
-
diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/Connector/Shapes_Connector.mpc b/CIAO/connectors/dds4ccm/examples/ShapesContr/Connector/Shapes_Connector.mpc
deleted file mode 100644
index f340f65ffcb..00000000000
--- a/CIAO/connectors/dds4ccm/examples/ShapesContr/Connector/Shapes_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p ShapesContr_Base -l .. -o ../lib -u DDS Shapes_Connector"
-
-project(ShapesContr_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen ShapesContr_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SHAPES_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=Shapes_Connector_stub_export.h \
-              -Wb,skel_export_macro=SHAPES_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=Shapes_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=SHAPES_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=Shapes_Connector_svnt_export.h \
-              -Wb,conn_export_macro=SHAPES_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Shapes_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Shapes_Connector.idl
-  }
-}
-
-project(ShapesContr_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += ShapesContr_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=SHAPES_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=Shapes_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    Shapes_ConnectorE.idl
-  }
-}
-
-project(ShapesContr_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += ShapesContr_Connector_lem_gen ShapesContr_Connector_stub ShapesContr_Base_stub
-  libs  += ShapesContr_Base_stub ShapesContr_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = ShapesContr_Connector_lem_stub
-  dynamicflags += SHAPES_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Shapes_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    Shapes_ConnectorEC.h
-    Shapes_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Shapes_ConnectorEC.inl
-  }
-}
-
-project(ShapesContr_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += ShapesContr_Connector_idl_gen ShapesContr_Base_stub
-  libs  += ShapesContr_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = ShapesContr_Connector_stub
-  dynamicflags += SHAPES_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Shapes_ConnectorC.cpp
-  }
-
-  Header_Files {
-    Shapes_ConnectorC.h
-    Shapes_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    Shapes_ConnectorC.inl
-  }
-}
-
-project(ShapesContr_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += ShapesContr_Connector_lem_stub ShapesContr_Connector_stub
-  sharedname = ShapesContr_Connector_exec
-  libs += ShapesContr_Connector_stub ShapesContr_Connector_lem_stub ShapesContr_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SHAPES_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Shapes_Connector_conn.cpp
-  }
-
-  Header_Files {
-    Shapes_Connector_conn.h
-    Shapes_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(ShapesContr_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += ShapesContr_Connector_lem_stub ShapesContr_Connector_exec ShapesContr_Connector_stub
-  sharedname  = ShapesContr_Connector_svnt
-  libs       += ShapesContr_Connector_stub \
-                ShapesContr_Connector_lem_stub  \
-                ShapesContr_Base_stub \
-                ShapesContr_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SHAPES_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Shapes_ConnectorS.cpp
-    Shapes_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    Shapes_ConnectorS.h
-    Shapes_Connector_svnt.h
-    Shapes_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller.idl b/CIAO/connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller.idl
deleted file mode 100644
index 46d54bab0f3..00000000000
--- a/CIAO/connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller.idl
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef SHAPES_CONTROLLER_IDL
-#define SHAPES_CONTROLLER_IDL
-
-#include <Components.idl>
-
-#include "../Base/Shapes_Contr_Base.idl"
-
-
-module Shapes
-{
-  component ShapesController
-  {
-    provides shape_attributes_set shapeAttribsSet;
-    provides shape_attributes_get shapeAttribsPub;
-    uses shape_changes shapeChangesSub;
-    //attribute unsigned long rate;
-    attribute unsigned long publish_rate;
-    attribute unsigned short max_size;
-    attribute unsigned short max_x;
-    attribute unsigned short max_y;
-    attribute boolean resize_shape;
-    attribute boolean use_web_interface;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller.mpc b/CIAO/connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller.mpc
deleted file mode 100644
index f4cd67ea274..00000000000
--- a/CIAO/connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller.mpc
+++ /dev/null
@@ -1,136 +0,0 @@
-project(ShapesContr_Controller_idl_gen) : componentidldefaults{
-   custom_only = 1
-  after += Shapes_Contr_Base_stub
-  idlflags += -Wb,stub_export_macro=CONTROLLER_STUB_Export \
-              -Wb,stub_export_include=Controller_stub_export.h \
-              -Wb,skel_export_macro=CONTROLLER_SVNT_Export \
-              -Wb,skel_export_include=Controller_svnt_export.h \
-              -Wb,svnt_export_macro=CONTROLLER_SVNT_Export \
-              -Wb,svnt_export_include=Controller_svnt_export.h \
-              -Wb,exec_export_macro=CONTROLLER_EXEC_Export \
-              -Wb,exec_export_include=Controller_exec_export.h \
-              -I..
-
-  IDL_Files {
-    Shapes_Controller.idl
-  }
-}
-
-project(ShapesContr_Controller_lem_gen) : ciaoidldefaults {
-  after += ShapesContr_Controller_idl_gen Shapes_Contr_Base_lem_gen
-  custom_only = 1
-  idlflags += -Wb,export_macro=CONTROLLER_EXEC_Export \
-              -Wb,export_include=Controller_exec_export.h \
-              -SS
-
-  IDL_Files {
-    Shapes_ControllerE.idl
-  }
-}
-
-project(ShapesContr_Controller_stub) : ccm_stub {
-  after += ShapesContr_Controller_idl_gen Shapes_Contr_Base_stub
-  libs  += Shapes_Contr_Base_stub
-  libout = ../lib
-  libpaths += ../lib
-
-  sharedname = ShapesContr_Controller_stub
-  dynamicflags += CONTROLLER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Shapes_ControllerC.cpp
-  }
-
-  Header_Files {
-    Shapes_ControllerC.h
-    Shapes_Controller_stub_export.h
-  }
-
-  Inline_Files {
-    Shapes_ControllerC.inl
-  }
-}
-
-project(ShapesContr_Controller_exec) : ciao_executor {
-  after   += ShapesContr_Controller_lem_gen ShapesContr_Controller_stub
-  sharedname = ShapesContr_Controller_exec
-  libs += ShapesContr_Controller_stub Shapes_Contr_Base_stub
-  libout = ../lib
-  libpaths += ../lib
-
-  dynamicflags += CONTROLLER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Shapes_ControllerEC.cpp
-    Shapes_Controller_exec.cpp
-  }
-
-  Header_Files {
-    Shapes_ControllerEC.h
-    Shapes_Controller_exec.h
-    Shapes_Controller_exec_export.h
-  }
-
-  Inline_Files {
-    Shapes_ControllerEC.inl
-  }
-}
-
-
-project(ShapesContr_Controller_svnt) : ciao_servant {
-  after      += Shapes_Contr_Base_skel ShapesContr_Controller_exec Shapes_Contr_Base_svnt Shapes_Contr_Base_stub
-  sharedname  = ShapesContr_Controller_svnt
-  libs       += ShapesContr_Controller_exec \
-                ShapesContr_Controller_stub \
-                Shapes_Contr_Base_svnt \
-                Shapes_Contr_Base_stub
-  libout = ../lib
-  libpaths += ../lib
-
-  dynamicflags += CONTROLLER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Shapes_ControllerS.cpp
-    Shapes_Controller_svnt.cpp
-  }
-
-  Header_Files {
-    Shapes_ControllerS.h
-    Shapes_Controller_svnt.h
-    Shapes_Controller_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-//project (Thread_starter) : ccm_stub, valuetype {
-//  exename = starter
-//  after += ShapesContr_Controller_stub
-//  libs  += ShapesContr_Controller_stub Shapes_Contr_Base_stub
-//  libout = ../lib
-//  libpaths += ../lib
-
-//  IDL_Files {
-//  }
-
-//  Source_Files {
-//    starter.cpp
-//  }
-
-//  Header_Files {
-//  }
-
-//  Inline_Files {
-//  }
-//}
-
diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller_exec.cpp b/CIAO/connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller_exec.cpp
deleted file mode 100644
index b083f93f6ea..00000000000
--- a/CIAO/connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller_exec.cpp
+++ /dev/null
@@ -1,276 +0,0 @@
-// -*- C++ -*-
-/**
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-
-#include "Shapes_Controller_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_Shapes_ShapesController_Impl
-{
-  CORBA::UShort
-  shape_attributes_get_i::max_size ()
-  {
-    return component_.max_size ();
-  }
-
-  CORBA::UShort
-  shape_attributes_get_i::max_x ()
-  {
-    return component_.max_x ();
-  }
-
-  CORBA::UShort
-  shape_attributes_get_i::max_y ()
-  {
-    return component_.max_y ();
-  }
-
-  CORBA::Boolean
-  shape_attributes_get_i::resize ()
-  {
-    return component_.resize_shape();
-  }
-  CORBA::ULong
-  shape_attributes_get_i::publish_rate ()
-  {
-    return (component_.publish_rate());
-  }
-
-  void
-  shape_attributes_set_i::max_size ( CORBA::UShort max_size)
-  {
-    component_.max_size (max_size);
-  }
-
-  void
-  shape_attributes_set_i::max_x ( CORBA::UShort max_x)
-  {
-    component_.max_x (max_x);
-  }
-
-  void
-  shape_attributes_set_i::max_y ( CORBA::UShort max_y)
-  {
-    component_.max_y (max_y);
-  }
-
-  void
-  shape_attributes_set_i::resize (CORBA::Boolean resize)
-  {
-    component_.resize_shape(resize);
-  }
-
-  void
-  shape_attributes_set_i::publish_rate (CORBA::ULong pub_rate)
-  {
-    component_.publish_rate(pub_rate);
-  }
-
-  void
-  shape_attributes_set_i::get_attr_values (CORBA::UShort_out max_size,
-                                           CORBA::UShort_out max_x,
-                                           CORBA::UShort_out max_y,
-                                           CORBA::ULong_out publish_rate,
-                                           CORBA::Boolean_out resize)
-  {
-    max_size = component_.max_size ();
-    max_x = component_.max_x ();
-    max_y = component_.max_y ();
-    publish_rate = component_.publish_rate ();
-    resize = component_.resize_shape();
-  }
-
-  void
-  shape_attributes_set_i::update_changes ()
-  {
-    component_.invoke_shape_changes ();
-  }
-
-  /**
-   * Component Executor Implementation Class: Controller_exec_i
-   */
-
-  Controller_exec_i::Controller_exec_i (void)
-      : publish_rate_ (0)
-      , max_size_ (50)
-      , max_x_ (200)
-      , max_y_ (200)
-      , resize_shape_ (false)
-      , use_web_interface_ (true)
-  {
-  }
-
-  Controller_exec_i::~Controller_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-
-  // Component attributes and port operations.
-
-  ::CORBA::ULong
-  Controller_exec_i::publish_rate (void)
-  {
-    return this->publish_rate_;
-  }
-
-  void
-   Controller_exec_i::publish_rate (
-     const ::CORBA::ULong publish_rate)
-   {
-     this->publish_rate_ = publish_rate;
-   }
-
-  ::CORBA::UShort
-  Controller_exec_i::max_size (void)
-  {
-    return this->max_size_;
-  }
-
-  void
-  Controller_exec_i::max_size (
-    const ::CORBA::UShort max_size)
-  {
-    this->max_size_ = max_size;
-  }
-
-  ::CORBA::UShort
-  Controller_exec_i::max_x (void)
-  {
-    return this->max_x_;
-  }
-
-  void
-  Controller_exec_i::max_x (
-     const ::CORBA::UShort max_x)
-  {
-    this->max_x_ = max_x;
-  }
-
-  ::CORBA::UShort
-  Controller_exec_i::max_y (void)
-  {
-    return this->max_y_;
-  }
-
-  void
-  Controller_exec_i::max_y (
-    const ::CORBA::UShort max_y)
-  {
-    this->max_y_ = max_y;
-  }
-
-  ::CORBA::Boolean
-  Controller_exec_i::resize_shape (void)
-  {
-    return this->resize_shape_;
-  }
-
-  void
-  Controller_exec_i::resize_shape (
-    const ::CORBA::Boolean resize_shape)
-  {
-    this->resize_shape_ = resize_shape;
-  }
-
-  ::CORBA::Boolean
-   Controller_exec_i::use_web_interface (void)
-   {
-     return this->use_web_interface_;
-   }
-
-   void
-   Controller_exec_i::use_web_interface (
-     const ::CORBA::Boolean use_web_interface)
-   {
-     this->use_web_interface_ = use_web_interface;
-   }
-
-  void
-  Controller_exec_i::invoke_shape_changes (void)
-  {
-    shape_changes_var invoker =
-      this->ciao_context_->get_connection_shapeChangesSub ();
-
-     invoker->pass_change_event ();
-  }
-
-  CCM_shape_attributes_get*
-  Controller_exec_i::get_shapeAttribsPub ()
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Controller_exec_i::get_shapeAttribsPub\n")));
-    return ( new shape_attributes_get_i (*this) );
-
-  }
-
-  CCM_shape_attributes_set*
-  Controller_exec_i::get_shapeAttribsSet ()
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Controller_exec_i::get_shapeAttribsSet\n")));
-    return ( new shape_attributes_set_i (*this) );
-
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Controller_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Controller_exec_i::set_session_context\n")));
-
-    this->ciao_context_ =
-      ::Shapes::CCM_ShapesController_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Controller_exec_i::configuration_complete (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Controller_exec_i::configuration_complete\n")));
-  }
-
-  void
-  Controller_exec_i::ccm_activate (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Controller_exec_i::ccm_activate\n")));
-    // If no extern web interface is used to start and stop  publishing,
-    // start publishing now.
-    if (!use_web_interface_)
-    {
-      this->publish_rate_ = 1;
-      this->invoke_shape_changes();
-    }
-  }
-
-  void
-  Controller_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Controller_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" CONTROLLER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Shapes_Controller_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Controller_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller_exec.h b/CIAO/connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller_exec.h
deleted file mode 100644
index 28c77145b44..00000000000
--- a/CIAO/connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller_exec.h
+++ /dev/null
@@ -1,163 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_SHAPES_CONTROLLER_EXEC_ETSDUL_H_
-#define CIAO_SHAPES_CONTROLLER_EXEC_ETSDUL_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Shapes_ControllerEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Controller_exec_export.h"
-#include "tao/LocalObject.h"
-
-
-namespace CIAO_Shapes_ShapesController_Impl
-{
-
-  class Controller_exec_i;
-
-  class shape_attributes_get_i
-      : public virtual CCM_shape_attributes_get,
-        public virtual ::CORBA::LocalObject
-  {
-  public:
-    shape_attributes_get_i (Controller_exec_i& component)
-          : component_ (component)
-    {
-    }
-
-    CORBA::UShort max_size (void);
-    CORBA::UShort max_x (void);
-    CORBA::UShort max_y (void);
-    CORBA::Boolean resize (void);
-    CORBA::ULong publish_rate (void);
-
-  private:
-    Controller_exec_i& component_;
-  };
-
-  class shape_attributes_set_i
-        : public virtual CCM_shape_attributes_set,
-          public virtual ::CORBA::LocalObject
-  {
-  public:
-    shape_attributes_set_i (Controller_exec_i& component)
-          : component_ (component)
-    {
-    }
-
-    void max_size (CORBA::UShort);
-    void max_x (CORBA::UShort);
-    void max_y (CORBA::UShort);
-    void resize (CORBA::Boolean);
-    void publish_rate (CORBA::ULong);
-
-    void get_attr_values (CORBA::UShort_out max_size,
-                          CORBA::UShort_out max_x,
-                          CORBA::UShort_out max_y,
-                          CORBA::ULong_out publish_rate,
-                          CORBA::Boolean_out resize);
-
-    void update_changes ();
-
-  private:
-    Controller_exec_i& component_;
-   };
-
-  /**
-   * Component Executor Implementation Class: Controller_exec_i
-   */
-
-  class Controller_exec_i
-    : public virtual ShapesController_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Controller_exec_i (void);
-    virtual ~Controller_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CORBA::ULong publish_rate (void);
-
-    virtual void publish_rate (::CORBA::ULong publish_rate);
-
-    virtual ::CORBA::UShort max_size (void);
-
-    virtual void max_size (::CORBA::UShort max_size);
-
-    virtual ::CORBA::UShort max_x (void);
-
-    virtual void max_x (::CORBA::UShort max_x);
-
-    virtual ::CORBA::UShort max_y (void);
-
-    virtual void max_y (::CORBA::UShort max_y);
-
-    virtual ::CORBA::Boolean resize_shape (void);
-
-    virtual void resize_shape (::CORBA::Boolean resize_shape);
-
-    virtual ::CORBA::Boolean use_web_interface (void);
-
-    virtual void use_web_interface (::CORBA::Boolean use_web_interface);
-
-    virtual CCM_shape_attributes_get* get_shapeAttribsPub (void);
-
-    virtual CCM_shape_attributes_set* get_shapeAttribsSet (void);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    virtual void invoke_shape_changes (void);
-
-    //@}
-
-  private:
-    ::Shapes::CCM_ShapesController_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::CORBA::ULong publish_rate_;
-    ::CORBA::UShort max_size_;
-    ::CORBA::UShort max_x_;
-    ::CORBA::UShort max_y_;
-    ::CORBA::Boolean resize_shape_;
-    ::CORBA::Boolean use_web_interface_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    //@}
-  };
-}
-
-extern "C" CONTROLLER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Shapes_Controller_Impl (void);
-
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/ControllerR/Shapes_ControllerR.idl b/CIAO/connectors/dds4ccm/examples/ShapesContr/ControllerR/Shapes_ControllerR.idl
deleted file mode 100644
index e6fdf878053..00000000000
--- a/CIAO/connectors/dds4ccm/examples/ShapesContr/ControllerR/Shapes_ControllerR.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef SHAPES_CONTROLLERR_IDL
-#define SHAPES_CONTROLLERR_IDL
-
-#include <Components.idl>
-
-#include "../Base/Shapes_Contr_Base.idl"
-
-
-module Shapes
-{
-  component ShapesControllerR
-  {
-    uses shape_received shapeReceivedSub;
-    provides shapes_aggregates shapeAggrPub;
-    attribute unsigned short rate;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/ControllerR/Shapes_ControllerR.mpc b/CIAO/connectors/dds4ccm/examples/ShapesContr/ControllerR/Shapes_ControllerR.mpc
deleted file mode 100644
index bd947e04fc2..00000000000
--- a/CIAO/connectors/dds4ccm/examples/ShapesContr/ControllerR/Shapes_ControllerR.mpc
+++ /dev/null
@@ -1,116 +0,0 @@
-project(ShapesContr_ContrR_idl_gen) : componentidldefaults{
-   custom_only = 1
-  after += Shapes_Contr_Base_stub
-  idlflags += -Wb,stub_export_macro=CONTROLLERR_STUB_Export \
-              -Wb,stub_export_include=ControllerR_stub_export.h \
-              -Wb,skel_export_macro=CONTROLLERR_SVNT_Export \
-              -Wb,skel_export_include=ControllerR_svnt_export.h \
-              -Wb,svnt_export_macro=CONTROLLERR_SVNT_Export \
-              -Wb,svnt_export_include=ControllerR_svnt_export.h \
-              -Wb,exec_export_macro=CONTROLLERR_EXEC_Export \
-              -Wb,exec_export_include=ControllerR_exec_export.h \
-              -I..
-
-  IDL_Files {
-    Shapes_ControllerR.idl
-  }
-}
-
-project(ShapesContr_ContrR_lem_gen) : ciaoidldefaults {
-  after += ShapesContr_ContrR_idl_gen Shapes_Contr_Base_lem_gen
-  custom_only = 1
-  idlflags += -Wb,export_macro=CONTROLLERR_EXEC_Export \
-              -Wb,export_include=ControllerR_exec_export.h \
-              -SS
-
-  IDL_Files {
-    Shapes_ControllerRE.idl
-  }
-}
-
-project(ShapesContr_ContrR_stub) : ccm_stub {
-  after += ShapesContr_ContrR_idl_gen Shapes_Contr_Base_stub
-  libs  += Shapes_Contr_Base_stub
-  libout = ../lib
-  libpaths += ../lib
-
-  sharedname = ShapesContr_ContrR_stub
-  dynamicflags += CONTROLLERR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Shapes_ControllerRC.cpp
-  }
-
-  Header_Files {
-    Shapes_ControllerRC.h
-    Shapes_ControllerR_stub_export.h
-  }
-
-  Inline_Files {
-    Shapes_ControllerRC.inl
-  }
-}
-
-project(ShapesContr_ContrR_exec) : ciao_executor {
-  after   += ShapesContr_ContrR_lem_gen ShapesContr_ContrR_stub
-  sharedname = ShapesContr_ContrR_exec
-  libs += ShapesContr_ContrR_stub Shapes_Contr_Base_stub
-  libout = ../lib
-  libpaths += ../lib
-
-  dynamicflags += CONTROLLERR_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Shapes_ControllerREC.cpp
-    Shapes_ControllerR_exec.cpp
-  }
-
-  Header_Files {
-    Shapes_ControllerREC.h
-    Shapes_ControllerR_exec.h
-    Shapes_ControllerR_exec_export.h
-  }
-
-  Inline_Files {
-    Shapes_ControllerREC.inl
-  }
-}
-
-
-project(ShapesContr_ContrRr_svnt) : ciao_servant {
-  after      += Shapes_Contr_Base_skel ShapesContr_ContrR_exec Shapes_Contr_Base_svnt Shapes_Contr_Base_stub
-  sharedname  = ShapesContr_ContrR_svnt
-  libs       += ShapesContr_ContrR_exec \
-                ShapesContr_ContrR_stub \
-                Shapes_Contr_Base_svnt \
-                Shapes_Contr_Base_stub
-  libout = ../lib
-  libpaths += ../lib
-
-  dynamicflags += CONTROLLERR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Shapes_ControllerRS.cpp
-    Shapes_ControllerR_svnt.cpp
-  }
-
-  Header_Files {
-    Shapes_ControllerRS.h
-    Shapes_ControllerR_svnt.h
-    Shapes_ControllerR_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/ControllerR/Shapes_ControllerR_exec.cpp b/CIAO/connectors/dds4ccm/examples/ShapesContr/ControllerR/Shapes_ControllerR_exec.cpp
deleted file mode 100644
index 1ab2ccb3972..00000000000
--- a/CIAO/connectors/dds4ccm/examples/ShapesContr/ControllerR/Shapes_ControllerR_exec.cpp
+++ /dev/null
@@ -1,249 +0,0 @@
-// -*- C++ -*-
-/**
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-
-#include "Shapes_ControllerR_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_Shapes_ShapesControllerR_Impl
-{
-  ShapeAggrSeq *
-  shapes_aggregates_i::get_aggr_shapes()
-  {
-    ShapeAggrSeq_var info_seq = component_.get_shapes_list();
-    return info_seq._retn ();
-  }
-
-  /**
-    * Write action generator
-    */
-  pulse_Generator::pulse_Generator (ControllerR_exec_i &callback)
-    : pulse_callback_ (callback)
-  {
-  }
-
-  pulse_Generator::~pulse_Generator ()
-  {
-  }
-
-  int
-  pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    this->pulse_callback_.get_received_shapes ();
-    return 0;
-    }
-
-  /**
-   * Component Executor Implementation Class: ControllerR_exec_i
-   */
-
-  ControllerR_exec_i::ControllerR_exec_i (void)
-      : rate_ (10)
-  {
-    shape_aggr_seq_.length(0);
-    ACE_NEW_THROW_EX (this->ticker_,
-                       pulse_Generator (*this),
-                       ::CORBA::NO_MEMORY ());
-
-  }
-
-  ControllerR_exec_i::~ControllerR_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  ControllerR_exec_i::reactor (void)
-   {
-     ACE_Reactor* reactor = 0;
-     ::CORBA::Object_var ccm_object =
-       this->ciao_context_->get_CCM_object();
-     if (! ::CORBA::is_nil (ccm_object.in ()))
-       {
-         ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-         if (! ::CORBA::is_nil (orb.in ()))
-           {
-             reactor = orb->orb_core ()->reactor ();
-           }
-       }
-     if (reactor == 0)
-       {
-         throw ::CORBA::INTERNAL ();
-       }
-     return reactor;
-   }
-
-
-  // Component attributes and port operations.
-  ::CORBA::UShort
-  ControllerR_exec_i::rate (void)
-  {
-    return this->rate_;
-  }
-
-  void
-  ControllerR_exec_i::rate (
-    const ::CORBA::UShort rate)
-  {
-    this->rate_ = rate;
-  }
-
-  void
-  ControllerR_exec_i::get_received_shapes (void)
-  {
-    shape_received_var invoker =
-      this->ciao_context_->get_connection_shapeReceivedSub ();
-
-    if (!::CORBA::is_nil(invoker))
-    {
-      ShapeInfoSeq_var info_seq = invoker->get_info_shapes();
-      if (!::CORBA::is_nil(info_seq))
-      {
-        for (unsigned int i = 0; i < info_seq->length(); i ++)
-        {
-          ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ControllerR_exec_i::get_received_shapes: ")
-                  ACE_TEXT ("received shapes_info <%C> for <%C> at X <%u> Y <%u> size <%u>\n"),
-                  info_seq[i].shape.in(),
-                  info_seq[i].color.in(),
-                  info_seq[i].posY,
-                  info_seq[i].posX,
-                  info_seq[i].size));
-
-        }
-        //aggregate received samples, sort on color
-        aggregate_samples(info_seq.in());
-      }
-    }
-  }
-
-  void
-  ControllerR_exec_i::aggregate_samples(const ShapeInfoSeq &info_seq)
-  {
-    ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard,
-                       this->mutex_, CORBA::INTERNAL ());
-
-    //handle all records
-    for (unsigned int i = 0; i < info_seq.length(); i++)
-    {
-      CORBA::Boolean color_found = false;
-      //color exists?
-      for (unsigned int y = 0; y < shape_aggr_seq_.length(); y++)
-      {
-        if (ACE_OS::strcmp (info_seq[i].color,this->shape_aggr_seq_[y].color )== 0)
-        {
-          color_found = true;
-          this->shape_aggr_seq_[y].number_of_shapes++;
-          this->shape_aggr_seq_[y].last_size = info_seq[i].size;
-          this->shape_aggr_seq_[y].last_posX = info_seq[i].posX;
-          this->shape_aggr_seq_[y].last_posY = info_seq[i].posY;
-        }
-      }
-      if (!color_found)
-      {
-        CORBA::ULong seq_length = this->shape_aggr_seq_.length();
-        this->shape_aggr_seq_.length(seq_length + 1);
-        this->shape_aggr_seq_[seq_length].shape = info_seq[i].shape;
-        this->shape_aggr_seq_[seq_length].color = info_seq[i].color;
-        this->shape_aggr_seq_[seq_length].number_of_shapes++;
-        this->shape_aggr_seq_[seq_length].last_size = info_seq[i].size;
-        this->shape_aggr_seq_[seq_length].last_posX = info_seq[i].posX;
-        this->shape_aggr_seq_[seq_length].last_posY = info_seq[i].posY;
-      }
-
-    }
-  }
-
-  ShapeAggrSeq*
-  ControllerR_exec_i::get_shapes_list(void)
-  {
-    ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard,
-                       this->mutex_, CORBA::INTERNAL ());
-    ShapeAggrSeq_var info_seq = new ShapeAggrSeq(this->shape_aggr_seq_);
-    this->shape_aggr_seq_.length(0);
-    return info_seq._retn ();
-  }
-
-  void
-  ControllerR_exec_i::clear_shape_list ()
-  {
-    ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard,
-                       this->mutex_, CORBA::INTERNAL ());
-    this->shape_aggr_seq_.length(0);
-  }
-
-  CCM_shapes_aggregates*
-  ControllerR_exec_i::get_shapeAggrPub ()
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ControllerR_exec_i::get_shapeAggrPub\n")));
-    return ( new shapes_aggregates_i (*this) );
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  ControllerR_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ControllerR_exec_i::set_session_context\n")));
-
-    this->ciao_context_ =
-      ::Shapes::CCM_ShapesControllerR_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  ControllerR_exec_i::configuration_complete (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ControllerR_exec_i::configuration_complete\n")));
-  }
-
-  void
-  ControllerR_exec_i::ccm_activate (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ControllerR_exec_i::ccm_activate\n")));
-    // calculate the interval time
-    long const usec = 1000000 / this->rate_;
-    if (this->reactor ()->schedule_timer (
-                this->ticker_,
-                0,
-                ACE_Time_Value (0, usec),
-                ACE_Time_Value (0, usec)) == -1)
-    {
-      ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                             ACE_TEXT ("Error scheduling timer")));
-    }
-  }
-
-  void
-  ControllerR_exec_i::ccm_passivate (void)
-  {
-    this->reactor ()->cancel_timer (this->ticker_);
-  }
-
-  void
-  ControllerR_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" CONTROLLERR_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Shapes_ControllerR_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      ControllerR_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/ControllerR/Shapes_ControllerR_exec.h b/CIAO/connectors/dds4ccm/examples/ShapesContr/ControllerR/Shapes_ControllerR_exec.h
deleted file mode 100644
index e7d3b9c425b..00000000000
--- a/CIAO/connectors/dds4ccm/examples/ShapesContr/ControllerR/Shapes_ControllerR_exec.h
+++ /dev/null
@@ -1,125 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_SHAPES_CONTROLLERR_EXEC_ETSDUL_H_
-#define CIAO_SHAPES_CONTROLLERR_EXEC_ETSDUL_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Shapes_ControllerREC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "ControllerR_exec_export.h"
-#include "tao/LocalObject.h"
-
-
-namespace CIAO_Shapes_ShapesControllerR_Impl
-{
-
-  class ControllerR_exec_i;
-
-  class shapes_aggregates_i
-    : public virtual CCM_shapes_aggregates,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    shapes_aggregates_i (ControllerR_exec_i& component)
-            : component_ (component)
-    {
-    }
-
-    virtual ShapeAggrSeq* get_aggr_shapes();
-
-  private:
-    ControllerR_exec_i& component_;
-  };
-
-  class pulse_Generator : public ACE_Event_Handler
-  {
-  public:
-    pulse_Generator (ControllerR_exec_i &callback);
-
-    virtual ~pulse_Generator ();
-
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                  const void *arg);
-  private:
-      ControllerR_exec_i &pulse_callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Controller_exec_i
-   */
-
-  class ControllerR_exec_i
-    : public virtual ShapesControllerR_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ControllerR_exec_i (void);
-    virtual ~ControllerR_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CORBA::UShort rate (void);
-
-    virtual void rate (::CORBA::UShort rate);
-
-    virtual CCM_shapes_aggregates* get_shapeAggrPub (void);
-
-   //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    virtual void get_received_shapes (void);
-    virtual ShapeAggrSeq* get_shapes_list(void);
-    virtual void clear_shape_list();
-    //@}
-
-  private:
-    ::Shapes::CCM_ShapesControllerR_Context_var ciao_context_;
-    ShapeAggrSeq shape_aggr_seq_;
-    TAO_SYNCH_MUTEX mutex_;
-
-    //@{
-    /** Component attributes. */
-    ::CORBA::UShort rate_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    pulse_Generator * ticker_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    /// Get the ACE_Reactor
-     ACE_Reactor* reactor (void);
-     void aggregate_samples(const ShapeInfoSeq &info_seq);
-    //@}
-  };
-}
-
-extern "C" CONTROLLERR_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Shapes_ControllerR_Impl (void);
-
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/README b/CIAO/connectors/dds4ccm/examples/ShapesContr/README
deleted file mode 100644
index d17a085216d..00000000000
--- a/CIAO/connectors/dds4ccm/examples/ShapesContr/README
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-This test uses a Controller component  to start and stop publishing of shapes by the Sender component.
-The Receiver component receives these samples and collects them.
-The ControllerR component get the collected samples from the receiver and aggregates the samples, sort on color.
-The ControllerR component also provides a  CORBA port (interface) to get the aggregate samples.
-
-
-If the Controller attribute use_web_interface == false (as used in plan.cdp) , then the Controller component triggers the Sender
-to start publishing.
-
-If the Controller attribute use_web_interface == true (default, if not set in deployment plan, as used in plan_no_pub.cdp),
-then with the use of the Controller component provided CORBA port (interface) , an extern CORBA client,
-by example a R2CORBA client,  can be used to change the attributes shape resizing,
-shape max_size, shape max_x , shape max_y and publish_rate.
-Starting and stopping of publishing can be controlled by the extern client, by setting publish_rate resp. greater then 0 or equal to 0.
-The CORBA port (interface) provided  by the ControllerR component can, for example,  be used by a R2CORBA client to get the aggregate samples,
-which in turn can be used to show the received samples with a GUI.
-
-
-In plan.cdp there are used 3 Controller-, 3 Sender-, 3 Receiver- and 3 ControllerR- components for resp. a SQUARE,TRIANGLE and CIRCLE.
-In plan_nopub.cdp there are used 3 Controller-, 3 Sender-, 3 Receiver- and 3 ControllerR- components for resp. a SQUARE,
-TRIANGLE and CIRCLE, for the TRIANGLE there is an incompatible <reliability>, defined in the QoS file,  between Publisher and Subscriber.
diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/Receiver/Shapes_Receiver.idl b/CIAO/connectors/dds4ccm/examples/ShapesContr/Receiver/Shapes_Receiver.idl
deleted file mode 100644
index aafbd686bd3..00000000000
--- a/CIAO/connectors/dds4ccm/examples/ShapesContr/Receiver/Shapes_Receiver.idl
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/Shapes_Connector.idl"
-#include "../Base/Shapes_Contr_Base.idl"
-
-module Shapes
-{
-  component Receiver
-  {
-    port Shapes::DDS_Listen info_out;
-    port Shapes::DDS_Get info_get;
-    provides shape_received shapeReceivedPub;
-    attribute unsigned long rate;
-    attribute boolean get_data; //if true, get_one and get_all are invoked
-    attribute boolean read_data;//if true, read_one and read_all are invoked.
-    attribute boolean raw_listen; //if true, raw listen port is enabled.
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/Receiver/Shapes_Receiver.mpc b/CIAO/connectors/dds4ccm/examples/ShapesContr/Receiver/Shapes_Receiver.mpc
deleted file mode 100644
index cce6c036767..00000000000
--- a/CIAO/connectors/dds4ccm/examples/ShapesContr/Receiver/Shapes_Receiver.mpc
+++ /dev/null
@@ -1,140 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -l ../lib -o ../lib -u DDS -b dds4ccm_base Receiver"
-
-project(ShapesContr_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += ShapesContr_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h \
-              -I..
-
-  IDL_Files {
-    Shapes_Receiver.idl
-  }
-}
-
-project(ShapesContr_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += ShapesContr_Receiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    Shapes_ReceiverE.idl
-  }
-}
-
-project(ShapesContr_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += ShapesContr_Receiver_lem_gen ShapesContr_Receiver_stub  ShapesContr_Connector_stub ShapesContr_Base_stub
-  libs  +=  Receiver_stub ShapesContr_Connector_stub ShapesContr_Base_stub Shapes_Contr_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Shapes_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    Shapes_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Shapes_ReceiverEC.inl
-  }
-}
-
-project(ShapesContr_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += ShapesContr_Receiver_idl_gen  ShapesContr_Connector_stub ShapesContr_Base_stub ShapesContr_Connector_lem_gen
-  libs  += ShapesContr_Connector_stub ShapesContr_Base_stub Shapes_Contr_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Shapes_ReceiverC.cpp
-  }
-
-  Header_Files {
-    Shapes_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    Shapes_ReceiverC.inl
-  }
-}
-
-project(ShapesContr_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += ShapesContr_Receiver_lem_stub ShapesContr_Receiver_stub ShapesContr_Base_stub ShapesContr_Connector_stub ShapesContr_Connector_lem_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub ShapesContr_Base_stub ShapesContr_Connector_stub ShapesContr_Connector_lem_stub Shapes_Contr_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Shapes_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    Shapes_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(ShapesContr_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   ShapesContr_Receiver_lem_stub Shapes_Contr_Base_svnt ShapesContr_Base_stub ShapesContr_Connector_stub ShapesContr_Connector_svnt ShapesContr_Receiver_exec ShapesContr_Connector_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub ShapesContr_Base_stub ShapesContr_Connector_stub ShapesContr_Connector_svnt Receiver_exec ShapesContr_Connector_lem_stub \
-                Shapes_Contr_Base_svnt \
-                Shapes_Contr_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Shapes_ReceiverS.cpp
-    Shapes_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    Shapes_ReceiverS.h
-    Shapes_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/Receiver/Shapes_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/examples/ShapesContr/Receiver/Shapes_Receiver_exec.cpp
deleted file mode 100644
index 4bbe7874404..00000000000
--- a/CIAO/connectors/dds4ccm/examples/ShapesContr/Receiver/Shapes_Receiver_exec.cpp
+++ /dev/null
@@ -1,660 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.0
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "Shapes_Receiver_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-#include "ace/OS_NS_time.h"
-#include "dds4ccm/impl/TimeUtilities.h"
-
-namespace CIAO_Shapes_Receiver_Impl
-{
-
-   shape_received_i::shape_received_i (Receiver_exec_i& callback)
-   : callback_ (callback)
-   {
-   }
-   CORBA::UShort
-   shape_received_i::number_of_shapes ()
-   {
-     return callback_.length_shape_list();
-   }
-
-   //return all collected shapes
-   ShapeInfoSeq *
-   shape_received_i::get_info_shapes()
-   {
-     ShapeInfoSeq_var info_seq = callback_.get_shapes_list();
-     return info_seq._retn ();
-   }
-
-  /**
-   * Read action generator
-   */
-
-  read_action_Generator::read_action_Generator (Receiver_exec_i &callback)
-    : pulse_callback_ (callback)
-  {
-  }
-
-  read_action_Generator::~read_action_Generator ()
-  {
-  }
-
-  int
-  read_action_Generator::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    if (pulse_callback_.read_data ())
-      {
-        this->pulse_callback_.read_one();
-        this->pulse_callback_.read_all();
-      }
-    if (pulse_callback_.get_data ())
-      {
-        this->pulse_callback_.get_one ();
-      }
-    return 0;
-  }
-
-
-  /**
-   * Facet Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  info_out_data_listener_exec_i::info_out_data_listener_exec_i (
-        ::Shapes::CCM_Receiver_Context_ptr ctx,
-         Receiver_exec_i & callback)
-    : ciao_context_ (
-        ::Shapes::CCM_Receiver_Context::_duplicate (ctx))
-      , callback_ (callback)
-  {
-  }
-
-  info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::Shapes::Listener
-
-  void
-  info_out_data_listener_exec_i::on_one_data (const ::ShapeType & datum,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    ::Shapes::Reader_var reader =
-      this->ciao_context_->get_connection_info_out_data ();
-    ::CORBA::Object_var cmp = reader->_get_component ();
-    if (::CORBA::is_nil (cmp.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: info_out_data_listener_exec_i::on_one_data - "
-                              "Unable to get component interface\n"));
-        throw ::CORBA::INTERNAL ();
-      }
-    ::Shapes::CCM_DDS_Event_var conn =
-      ::Shapes::CCM_DDS_Event::_narrow (cmp.in ());
-    if (::CORBA::is_nil (conn.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: info_out_data_listener_exec_i::on_one_data - "
-                              "Unable to narrow connector interface\n"));
-        throw ::CORBA::INTERNAL ();
-      }
-    CORBA::String_var topic = conn->topic_name ();
-
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ShapeType_Listener: ")
-            ACE_TEXT ("received shape_info <%C> for <%C> at X <%u> Y <%u> size <%u>\n"),
-            topic.in (),
-            datum.color.in (),
-            datum.x,
-            datum.y,
-            datum.shapesize));
-
-    //Save all received shape's
-    callback_.add_shape_to_list(topic.in (), datum.color.in (),
-                                datum.shapesize, datum.x,datum.y );
-
-  }
-
-  void
-  info_out_data_listener_exec_i::on_many_data (const ::ShapeTypeSeq & /* data */,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_status_exec_i
-   */
-
-  info_out_status_exec_i::info_out_status_exec_i (
-        ::Shapes::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::Shapes::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_status_exec_i::~info_out_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_get_status_exec_i
-   */
-
-  info_get_status_exec_i::info_get_status_exec_i (
-        ::Shapes::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::Shapes::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_get_status_exec_i::~info_get_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_get_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_get_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : rate_ (0)
-      , get_data_ (true)
-      , read_data_ (true)
-      , raw_listen_ (false)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      read_action_Generator (*this),
-                      ::CORBA::NO_MEMORY ());
-    shape_info_seq_.length(0);
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Receiver_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Receiver_exec_i::read_one (void)
-  {
-    ShapeType  shape_info;
-    shape_info.color = "GREEN";
-    ::CCM_DDS::ReadInfo readinfo;
-
-    try
-      {
-        ::Shapes::Reader_var reader =
-          this->ciao_context_->get_connection_info_out_data ();
-        if (! ::CORBA::is_nil (reader.in ()))
-          {
-            ::CORBA::Object_var cmp = reader->_get_component ();
-            if (::CORBA::is_nil (cmp.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::read_one - "
-                                      "Unable to get component interface\n"));
-                throw ::CORBA::INTERNAL ();
-              }
-            ::Shapes::CCM_DDS_Event_var conn =
-              ::Shapes::CCM_DDS_Event::_narrow (cmp.in ());
-            if (::CORBA::is_nil (conn.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::read_one - "
-                                      "Unable to narrow connector interface\n"));
-                throw ::CORBA::INTERNAL ();
-              }
-            CORBA::String_var topic = conn->topic_name ();
-
-            reader->read_one_last (shape_info, readinfo, ::DDS::HANDLE_NIL);
-            ACE_Time_Value time;
-            time <<= readinfo.source_timestamp;
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ONE Read_Info ")
-                      ACE_TEXT (" -> date = %#T\n"), &time));
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ ON shape info : ")
-                ACE_TEXT ("received shape_info <%C> for <%C> at X <%u> Y <%u> size <%u>\n"),
-                topic.in (),
-                shape_info.color.in (),
-                shape_info.x,
-                shape_info.y,
-                shape_info.shapesize));
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "Receiver_exec_i::read_one - "
-                      "ERROR: reader seems to be nil.\n"));
-          }
-      }
-    catch(const CCM_DDS::NonExistent& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ShapeType_Read_One: ")
-                  ACE_TEXT ("no shape_info received\n")));
-      }
-
-  }
-
-  void
-  Receiver_exec_i::read_all (void)
-  {
-    ShapeTypeSeq shape_infos;
-    ::CCM_DDS::ReadInfoSeq readinfoseq;
-    ::Shapes::Reader_var reader =
-      this->ciao_context_->get_connection_info_out_data ();
-    if (! ::CORBA::is_nil (reader.in ()))
-      {
-        ::CORBA::Object_var cmp = reader->_get_component ();
-        if (::CORBA::is_nil (cmp.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::read_all - "
-                                  "Unable to get component interface\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-        ::Shapes::CCM_DDS_Event_var conn =
-          ::Shapes::CCM_DDS_Event::_narrow (cmp.in ());
-        if (::CORBA::is_nil (conn.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::read_all - "
-                                  "Unable to narrow connector interface\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-        CORBA::String_var topic = conn->topic_name ();
-
-        reader->read_all(shape_infos, readinfoseq);
-        for(CORBA::ULong i = 0; i < readinfoseq.length(); ++i)
-          {
-            ACE_Time_Value time;
-            time <<= readinfoseq[i].source_timestamp;
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL ReadInfo ")
-                ACE_TEXT ("-> UTC date = %#T\n"), &time));
-          }
-        for(CORBA::ULong i = 0; i < shape_infos.length(); ++i)
-          {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL Shape Info : ")
-                ACE_TEXT ("received shape_info <%C> for <%C> at X <%u> Y <%u> size <%u>\n"),
-                topic.in (),
-                shape_infos[i].color.in (),
-                shape_infos[i].x,
-                shape_infos[i].y,
-                shape_infos[i].shapesize));
-          }
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::read_all - "
-                  "ERROR: reader seems to be nil.\n"));
-      }
-
-  }
-
-  void
-  Receiver_exec_i::get_one (void)
-  {
-    ShapeType_var shape_info;
-    ::CCM_DDS::ReadInfo_var readinfo;
-
-    try
-      {
-        ::Shapes::Getter_var getter =
-          this->ciao_context_->get_connection_info_get_fresh_data ();
-        if (! ::CORBA::is_nil (getter.in ()))
-          {
-            ::CORBA::Object_var cmp = getter->_get_component ();
-            if (::CORBA::is_nil (cmp.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::get_one - "
-                                      "Unable to get component interface\n"));
-                throw ::CORBA::INTERNAL ();
-              }
-            ::Shapes::CCM_DDS_Event_var conn =
-              ::Shapes::CCM_DDS_Event::_narrow (cmp.in ());
-            if (::CORBA::is_nil (conn.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::get_one - "
-                                      "Unable to narrow connector interface\n"));
-                throw ::CORBA::INTERNAL ();
-              }
-            CORBA::String_var topic = conn->topic_name ();
-
-            if (getter->get_one (shape_info.out (), readinfo.out ()))
-              {
-                ACE_Time_Value time;
-                time <<= readinfo->source_timestamp;
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("GET_ONE ReadInfo -> ")
-                                      ACE_TEXT ("date = %#T\n"), &time));
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("GET_ONE ShapeType : ")
-                    ACE_TEXT ("received shape_info <%C> for <%C> at X <%u> Y <%u> size <%u>\n"),
-                    topic.in (),
-                    shape_info->color.in (),
-                    shape_info->x,
-                    shape_info->y,
-                    shape_info->shapesize));
-              }
-            else
-              {
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("GET_ONE No data available for <%C>\n"),
-                        shape_info->color.in ()));
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_one - "
-                      "ERROR: Getter seems nil\n"));
-          }
-      }
-    catch(const CCM_DDS::NonExistent& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ShapeType_Read_One: no shape_info receieved\n")));
-      }
-
-  }
-
-  // Component attributes and port operations.
-
-  ::Shapes::CCM_Listener_ptr
-  Receiver_exec_i::get_info_out_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ()))
-      {
-        info_out_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_data_listener_exec_i (
-            this->ciao_context_.in (),
-            (*this)),
-            ::Shapes::CCM_Listener::_nil ());
-
-          this->ciao_info_out_data_listener_ = tmp;
-      }
-
-    return
-      ::Shapes::CCM_Listener::_duplicate (
-        this->ciao_info_out_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ()))
-      {
-        info_out_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_out_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_out_status_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_get_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_get_status_.in ()))
-      {
-        info_get_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_get_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_get_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_get_status_.in ());
-  }
-
-  CCM_shape_received*
-  Receiver_exec_i::get_shapeReceivedPub ()
-  {
-    return ( new shape_received_i (*this) );
-  }
-
-  ::CORBA::ULong
-  Receiver_exec_i::rate (void)
-  {
-    return this->rate_;
-  }
-
-  void
-  Receiver_exec_i::rate (
-    const ::CORBA::ULong rate)
-  {
-    this->rate_ = rate;
-  }
-
-  ::CORBA::Boolean
-  Receiver_exec_i::get_data (void)
-  {
-    return this->get_data_;
-  }
-
-  void
-  Receiver_exec_i::get_data (
-    const ::CORBA::Boolean get_data)
-  {
-    this->get_data_ = get_data;
-  }
-
-  ::CORBA::Boolean
-  Receiver_exec_i::read_data (void)
-  {
-    return this->read_data_;
-  }
-
-  void
-  Receiver_exec_i::read_data (
-    const ::CORBA::Boolean read_data)
-  {
-    this->read_data_ = read_data;
-  }
-
-  ::CORBA::Boolean
-  Receiver_exec_i::raw_listen (void)
-  {
-    return this->raw_listen_;
-  }
-
-  void
-  Receiver_exec_i::raw_listen (
-    const ::CORBA::Boolean raw_listen)
-  {
-    this->raw_listen_ = raw_listen;
-  }
-
-  void
-  Receiver_exec_i::add_shape_to_list (const char* topic, const char* color, CORBA::UShort size,
-                                      CORBA::UShort pos_x, CORBA::UShort pos_y)
-  {
-    ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard,
-                        this->mutex_, CORBA::INTERNAL ());
-
-    CORBA::ULong seq_length = this->shape_info_seq_.length();
-    this->shape_info_seq_.length(seq_length + 1);
-    this->shape_info_seq_[seq_length].shape = CORBA::string_dup (topic);
-    this->shape_info_seq_[seq_length].color = CORBA::string_dup (color);
-    this->shape_info_seq_[seq_length].size = size;
-    this->shape_info_seq_[seq_length].posX = pos_x;
-    this->shape_info_seq_[seq_length].posY = pos_y;
-  }
-
-  void
-  Receiver_exec_i::clear_shape_list ()
-  {
-    ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard,
-                        this->mutex_, CORBA::INTERNAL ());
-    this->shape_info_seq_.length(0);
-  }
-
-  //get all collected shapes from list and then empty
-  // list .
-  ShapeInfoSeq*
-  Receiver_exec_i::get_shapes_list(void)
-  {
-    ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard,
-                        this->mutex_, CORBA::INTERNAL ());
-    ShapeInfoSeq_var info_seq = new ShapeInfoSeq(this->shape_info_seq_);
-    this->shape_info_seq_.length(0);
-    return info_seq._retn ();
-  }
-
-  CORBA::UShort
-  Receiver_exec_i::length_shape_list ()
-  {
-      ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard,
-                        this->mutex_, CORBA::INTERNAL ());
-      return this->shape_info_seq_.length();
-  }
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Shapes::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    ::CCM_DDS::DataListenerControl_var lc =
-      this->ciao_context_->get_connection_info_out_data_control ();
-
-    if (::CORBA::is_nil (lc.in ()))
-      {
-        ACE_ERROR ((LM_INFO, ACE_TEXT ("Error:  Listener control receptacle is null!\n")));
-        throw ::CORBA::INTERNAL ();
-      }
-
-    lc->mode (this->raw_listen_ ? ::CCM_DDS::ONE_BY_ONE : ::CCM_DDS::NOT_ENABLED);
-
-    //if using only raw_listen, the timer isn't needed.
-    if (this->get_data_ || this->read_data_)
-    {
-      // calculate the interval time
-      long const usec = 1000000 / this->rate_;
-      if (this->reactor ()->schedule_timer (this->ticker_,
-                                            0,
-                                            ACE_Time_Value(0, usec),
-                                            ACE_Time_Value(0, usec)) == -1)
-        {
-          ACE_ERROR ((LM_ERROR, "Unable to schedule Timer\n"));
-        }
-    }
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    this->reactor ()->cancel_timer (this->ticker_);
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Shapes_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/Receiver/Shapes_Receiver_exec.h b/CIAO/connectors/dds4ccm/examples/ShapesContr/Receiver/Shapes_Receiver_exec.h
deleted file mode 100644
index 3f5887454ab..00000000000
--- a/CIAO/connectors/dds4ccm/examples/ShapesContr/Receiver/Shapes_Receiver_exec.h
+++ /dev/null
@@ -1,291 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.0
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_SHAPES_RECEIVER_EXEC_4YQX0E_H_
-#define CIAO_SHAPES_RECEIVER_EXEC_4YQX0E_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Shapes_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-// 2013 version of the DDS shapes example moves
-// the ShapeType to a nested module
-using org::omg::dds::demo::ShapeType;
-using org::omg::dds::demo::ShapeTypeSeq;
-using org::omg::dds::demo::ShapeType_var;
-
-namespace CIAO_Shapes_Receiver_Impl
-{
-  typedef ACE_Atomic_Op<TAO_SYNCH_MUTEX, ShapeInfoSeq> Atomic_ShapeInfoSeq;
-
-  class Receiver_exec_i;
-
-
-  class shape_received_i
-     : public virtual CCM_shape_received,
-       public virtual ::CORBA::LocalObject
-   {
-   public:
-    shape_received_i (Receiver_exec_i& callback);
-    virtual CORBA::UShort number_of_shapes ();
-    virtual ShapeInfoSeq * get_info_shapes();
-
-   private:
-       Receiver_exec_i& callback_;
-   };
-
-  /**
-  * @class reader activity generator
-  *
-  * @brief an active object used by Receiver to perform a periodical read action
-  *
-  */
-  class read_action_Generator
-    : public ACE_Event_Handler
-  {
-  public:
-    read_action_Generator (Receiver_exec_i &callback);
-
-    ~read_action_Generator ();
-
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-
-  private:
-    Receiver_exec_i &pulse_callback_;
-
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  class info_out_data_listener_exec_i
-    : public virtual ::Shapes::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_data_listener_exec_i (
-      ::Shapes::CCM_Receiver_Context_ptr ctx,
-      Receiver_exec_i & callback);
-    virtual ~info_out_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from Shapes::Listener. */
-
-    virtual
-    void on_one_data (const ::ShapeType & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (const ::ShapeTypeSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    ::Shapes::CCM_Receiver_Context_var ciao_context_;
-    Receiver_exec_i &callback_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_status_exec_i
-   */
-
-  class info_out_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_status_exec_i (
-      ::Shapes::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::Shapes::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_get_status_exec_i
-   */
-
-  class info_get_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_get_status_exec_i (
-      ::Shapes::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_get_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::Shapes::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::Shapes::CCM_Listener_ptr
-    get_info_out_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_status (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_get_status (void);
-
-    virtual ::CORBA::ULong rate (void);
-
-    virtual void rate (::CORBA::ULong rate);
-
-    virtual ::CORBA::Boolean get_data (void);
-
-    virtual void get_data (::CORBA::Boolean get_data);
-
-    virtual ::CORBA::Boolean read_data (void);
-
-    virtual void read_data (::CORBA::Boolean read_data);
-
-    virtual ::CORBA::Boolean raw_listen (void);
-
-    virtual void raw_listen (::CORBA::Boolean raw_listen);
-
-    virtual CCM_shape_received* get_shapeReceivedPub ();
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void read_one (void);
-    void read_all (void);
-    void get_one (void);
-    void add_shape_to_list (const char* topic,
-                            const char* color,
-                            ::CORBA::UShort size,
-                            ::CORBA::UShort pos_x,
-                            ::CORBA::UShort pos_y);
-
-    void clear_shape_list (void);
-    ShapeInfoSeq* get_shapes_list(void);
-    CORBA::UShort length_shape_list (void);
-
-    //@}
-
-  private:
-    ::Shapes::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::Shapes::CCM_Listener_var ciao_info_out_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_get_status_;
-
-    ::CORBA::ULong rate_;
-
-    ::CORBA::Boolean get_data_;
-
-    ::CORBA::Boolean read_data_;
-
-    ::CORBA::Boolean raw_listen_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    read_action_Generator * ticker_;
-    ShapeInfoSeq shape_info_seq_;
-    TAO_SYNCH_MUTEX mutex_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Shapes_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/Sender/Shapes_Sender.idl b/CIAO/connectors/dds4ccm/examples/ShapesContr/Sender/Shapes_Sender.idl
deleted file mode 100644
index e504a7c9166..00000000000
--- a/CIAO/connectors/dds4ccm/examples/ShapesContr/Sender/Shapes_Sender.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef DDS_SHAPES_SENDER_IDL
-#define DDS_SHAPES_SENDER_IDL
-
-#include "Connector/Shapes_Connector.idl"
-#include "../Base/Shapes_Contr_Base.idl"
-
-module Shapes
-{
-  component Sender
-  {
-    port Shapes::DDS_Write info_write;
-    uses shape_attributes_get shapeAttribsSub;
-    provides shape_changes shapeChangesPub;
-    attribute string color;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/Sender/Shapes_Sender.mpc b/CIAO/connectors/dds4ccm/examples/ShapesContr/Sender/Shapes_Sender.mpc
deleted file mode 100644
index 942763b7b94..00000000000
--- a/CIAO/connectors/dds4ccm/examples/ShapesContr/Sender/Shapes_Sender.mpc
+++ /dev/null
@@ -1,140 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p ShapesContr_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(ShapesContr_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += ShapesContr_Connector_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I..
-
-  IDL_Files {
-    Shapes_Sender.idl
-  }
-}
-
-project(ShapesContr_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += ShapesContr_Sender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    Shapes_SenderE.idl
-  }
-}
-
-project(ShapesContr_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += ShapesContr_Sender_lem_gen ShapesContr_Sender_stub ShapesContr_Base_stub
-  libs  += ShapesContr_Base_stub Shapes_Contr_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Shapes_SenderEC.cpp
-  }
-
-  Header_Files {
-    Shapes_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Shapes_SenderEC.inl
-  }
-}
-
-project(ShapesContr_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += ShapesContr_Sender_idl_gen ShapesContr_Base_stub ShapesContr_Connector_stub
-  libs  += ShapesContr_Base_stub Shapes_Contr_Base_stub ShapesContr_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Shapes_SenderC.cpp
-  }
-
-  Header_Files {
-    Shapes_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    Shapes_SenderC.inl
-  }
-}
-
-project(ShapesContr_Sender_exec) : ciao_executor, dds4ccm_base {
-  after   += ShapesContr_Sender_lem_stub ShapesContr_Sender_stub ShapesContr_Connector_lem_stub ShapesContr_Connector_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub ShapesContr_Base_stub Shapes_Contr_Base_stub ShapesContr_Connector_lem_stub ShapesContr_Connector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Shapes_Sender_exec.cpp
-  }
-
-  Header_Files {
-    Shapes_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(ShapesContr_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += ShapesContr_Base_stub Shapes_Contr_Base_svnt ShapesContr_Sender_lem_stub ShapesContr_Connector_stub ShapesContr_Connector_svnt  ShapesContr_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                ShapesContr_Base_stub ShapesContr_Connector_stub ShapesContr_Connector_svnt ShapesContr_Connector_lem_stub \
-                Shapes_Contr_Base_svnt \
-                Shapes_Contr_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Shapes_SenderS.cpp
-    Shapes_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    Shapes_SenderS.h
-    Shapes_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/Sender/Shapes_Sender_exec.cpp b/CIAO/connectors/dds4ccm/examples/ShapesContr/Sender/Shapes_Sender_exec.cpp
deleted file mode 100644
index 6c3ae2be1df..00000000000
--- a/CIAO/connectors/dds4ccm/examples/ShapesContr/Sender/Shapes_Sender_exec.cpp
+++ /dev/null
@@ -1,411 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.0
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "Shapes_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_Shapes_Sender_Impl
-{
-  shape_changes_i::shape_changes_i (Sender_exec_i& callback)
-     : callback_ (callback)
-  {
-  }
-
-  void
-  shape_changes_i::pass_change_event()
-  {
-    //there is a change in shape attributes, so get the new atrributes
-     this->callback_.get_shape_attributes_get();
-  }
-
-  /**
-   * Write action generator
-   */
-  pulse_Generator::pulse_Generator (Sender_exec_i &callback)
-    : pulse_callback_ (callback)
-  {
-  }
-
-  pulse_Generator::~pulse_Generator ()
-  {
-  }
-
-  int
-  pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    this->pulse_callback_.tick ();
-    return 0;
-  }
-
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-  Sender_exec_i::Sender_exec_i (void)
-    : rate_ (0)
-      , max_x_ (100)
-      , max_y_ (100)
-      , max_size_ (25)
-      , resize_shape_ (false)
-      , color_ ("CYAN")
-      , x_increasing_ (false)
-      , y_increasing_ (false)
-      , size_increasing_ (false)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      pulse_Generator (*this),
-                      ::CORBA::NO_MEMORY ());
-    ACE_NEW_THROW_EX (this->shape_,
-                      ShapeType,
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->ticker_;
-    delete this->shape_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Sender_exec_i::tick ()
-  {
-    if (this->x_increasing_)
-      {
-        ++this->shape_->x;
-        this->x_increasing_ = this->shape_->x + 1 <= this->max_x_;
-      }
-    else
-      {
-        --this->shape_->x;
-        this->x_increasing_ = this->shape_->x - 1 < 0;
-      }
-    if (this->y_increasing_)
-      {
-        ++this->shape_->y;
-        this->y_increasing_ = this->shape_->y + 1 <= this->max_y_;
-      }
-    else
-      {
-        --this->shape_->y;
-        this->y_increasing_ = this->shape_->y - 1 < 0;
-      }
-
-    if (this->resize_shape_)
-      {
-        if (this->size_increasing_)
-          {
-            ++this->shape_->shapesize;
-            this->size_increasing_ = this->shape_->shapesize + 1 <= this->max_size_;
-          }
-        else
-          {
-            --this->shape_->shapesize;
-            this->size_increasing_ = this->shape_->shapesize - 1 < 0;
-          }
-      }
-
-    try
-    {
-      Shapes::Writer_var writer =
-        this->ciao_context_->get_connection_info_write_data ();
-      if (! ::CORBA::is_nil (writer.in ()))
-        {
-          ::CORBA::Object_var cmp = writer->_get_component ();
-          if (::CORBA::is_nil (cmp.in ()))
-            {
-              ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::tick - "
-                                    "Unable to get component interface\n"));
-              throw ::CORBA::INTERNAL ();
-            }
-          ::Shapes::CCM_DDS_Event_var conn =
-            ::Shapes::CCM_DDS_Event::_narrow (cmp.in ());
-          if (::CORBA::is_nil (conn.in ()))
-            {
-              ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::tick - "
-                                    "Unable to narrow connector interface\n"));
-              throw ::CORBA::INTERNAL ();
-            }
-          CORBA::String_var topic = conn->topic_name ();
-
-          writer->write_one (*this->shape_, this->instance_handle_);
-          ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("UPDATED Shape_info <%C> for <%C> %u:%u:%u\n"),
-                    topic.in (),
-                    this->shape_->color.in (),
-                    this->shape_->x,
-                    this->shape_->y,
-                    this->shape_->shapesize));
-        }
-      else
-        {
-          ACE_ERROR ((LM_ERROR, "Sender_exec_i::tick - "
-                    "ERROR: Writer seems nil.\n"));
-        }
-    }
-    catch (const CCM_DDS::NonExistent& )
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("Shape_info for <%C> not updated: didn't exist.\n"),
-                  this->shape_->color.in ()));
-    }
-    catch (const CCM_DDS::InternalError& )
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("Internal Error while updating Shape_info for <%C>.\n"),
-                  this->shape_->color.in ()));
-    }
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-
-    // calculate the interval time
-    long const usec = 1000000 / this->rate_;
-    if (this->reactor ()->schedule_timer (
-                this->ticker_,
-                0,
-                ACE_Time_Value (0, usec),
-                ACE_Time_Value (0, usec)) == -1)
-    {
-      ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                             ACE_TEXT ("Error scheduling timer")));
-    }
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::start : Timer started.\n")));
-
-  }
-  void
-  Sender_exec_i::register_topic()
-  {
-  // Register shape with dds.
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("REGISTER Shape_info for <%C> %u:%u:%u\n"),
-                  this->shape_->color.in (),
-                  this->shape_->x,
-                  this->shape_->y,
-                  this->shape_->shapesize));
-    try
-      {
-        Shapes::Writer_var writer =
-          this->ciao_context_->get_connection_info_write_data ();
-        if (! ::CORBA::is_nil (writer.in ()))
-          {
-            this->instance_handle_ =
-              writer->register_instance (*this->shape_);
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "Sender_exec_i::ccm_activate - "
-                      "ERROR: Writer seems nil.\n"));
-          }
-      }
-    catch (const CCM_DDS::AlreadyCreated& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Shape_info for <%C> already created.\n"),
-                    this->shape_->color.in ()));
-      }
-    catch (const CCM_DDS::InternalError& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while creating Shape_info for <%C>.\n"),
-                      this->shape_->color.in ()));
-      }
-  }
-
-  void
-  Sender_exec_i::stop (void)
-  {
-    this->reactor ()->cancel_timer (this->ticker_);
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n")));
-
-  }
-
-  void
-  Sender_exec_i::unregister_topic()
-  {
-    try
-    {
-      Shapes::Writer_var writer =
-        this->ciao_context_->get_connection_info_write_data ();
-      if (! ::CORBA::is_nil (writer.in ()))
-        {
-          writer->unregister_instance (*this->shape_,
-                                       this->instance_handle_);
-        }
-      else
-        {
-          ACE_ERROR ((LM_ERROR, "Sender_exec_i::stop - "
-                    "ERROR: Writer seems nil.\n"));
-        }
-    }
-    catch (const CCM_DDS::NonExistent& )
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("Shape_info for <%C> not deleted: <%C> didn't exist.\n"),
-                  this->shape_->color.in (), this->shape_->color.in ()));
-    }
-    catch (const CCM_DDS::InternalError& )
-    {
-      ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while deleting Shape_info for <%C>.\n"),
-                  this->shape_->color.in ()));
-    }
-
-  }
-
-  void
-  Sender_exec_i::get_shape_attributes_get()
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::get_shape_attributes\n")));
-    shape_attributes_get_var shape_attrib_ = this->ciao_context_->get_connection_shapeAttribsSub ();
-    if (CORBA::is_nil (shape_attrib_.in ()))
-      throw CORBA::BAD_INV_ORDER ();
-
-    //CORBA::String_var color_ = shape_attrib_->color ();
-    CORBA::UShort rate = shape_attrib_->publish_rate();
-    this->max_size_ = shape_attrib_->max_size();
-    this->max_x_ = shape_attrib_->max_x();
-    this->max_y_ = shape_attrib_->max_y();
-    this->resize_shape_ = shape_attrib_->resize();
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::get_shape_attributes ")
-                          ACE_TEXT (" color = %C, rate= %d, resize = %d, max_size = %d, max_x = %d, max_y = %d, resize = %d \n"),
-                          color_.in(), rate, this->resize_shape_, this->max_size_,
-                          this->max_x_, this->max_y_, this->resize_shape_));
-
-
-    this->shape_->color = CORBA::string_dup(color_);
-
-    if (rate != this->rate_)
-    {
-      //rate of publishing is changed so stop and start timer.
-      this->stop();
-      this->rate_ = rate;
-      if (this->rate_ != 0)
-      {
-        this->start();
-      }
-    }
-
-  }
-
-  // Component attributes and port operations.
-  char*
-  Sender_exec_i::color (void)
-  {
-    return ::CORBA::string_dup (this->color_);
-  }
-
-  void
-  Sender_exec_i::color (const char* color)
-  {
-    this->color_ = ::CORBA::string_dup (color);
-  }
-
-  CCM_shape_changes*
-  Sender_exec_i::get_shapeChangesPub ()
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::get_shapeChangesPub\n")));
-    return ( new shape_changes_i (*this) );
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::set_session_context\n")));
-    this->ciao_context_ =
-      ::Shapes::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::configuration_complete\n")));
-    // Set the initial square properties right now
-    this->shape_->x = ACE_OS::rand () % this->max_x_;
-    this->shape_->y = ACE_OS::rand () % this->max_y_;
-    this->shape_->shapesize = this->max_size_;
-    this->shape_->color = CORBA::string_dup(this->color_);
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::ccm_activate\n")));
-    this->register_topic();
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    this->stop ();
-    this->unregister_topic();
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Shapes_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/Sender/Shapes_Sender_exec.h b/CIAO/connectors/dds4ccm/examples/ShapesContr/Sender/Shapes_Sender_exec.h
deleted file mode 100644
index 35c4f961e16..00000000000
--- a/CIAO/connectors/dds4ccm/examples/ShapesContr/Sender/Shapes_Sender_exec.h
+++ /dev/null
@@ -1,173 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.0
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_SHAPES_SENDER_EXEC_ETSDUL_H_
-#define CIAO_SHAPES_SENDER_EXEC_ETSDUL_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Shapes_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-using org::omg::dds::demo::ShapeType;
-using org::omg::dds::demo::ShapeTypeSeq;
-using org::omg::dds::demo::ShapeType_var;
-
-namespace CIAO_Shapes_Sender_Impl
-{
-  class Sender_exec_i;
-
-
-  class shape_changes_i
-    : public virtual CCM_shape_changes,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    shape_changes_i (Sender_exec_i& callback);
-
-    virtual void pass_change_event(void);
-
-  private:
-      Sender_exec_i& callback_;
-  };
-
-  /**
-   * Write action generator
-   */
-
-  class pulse_Generator : public ACE_Event_Handler
-  {
-  public:
-    pulse_Generator (Sender_exec_i &callback);
-
-    virtual ~pulse_Generator ();
-
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    Sender_exec_i &pulse_callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-    virtual void get_shape_attributes_get();
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-    virtual char *color (void);
-
-    virtual void color (const char* color);
-
-    virtual CCM_shape_changes* get_shapeChangesPub ();
-
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void tick (void);
-
-    //@}
-
-  private:
-    ::Shapes::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-
-    ::CORBA::ULong rate_;
-
-    ::CORBA::UShort max_x_;
-
-    ::CORBA::UShort max_y_;
-
-    ::CORBA::UShort max_size_;
-
-    ::CORBA::Boolean resize_shape_;
-
-    ::CORBA::String_var color_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    void start (void);
-    void stop (void);
-    void unregister_topic (void);
-    void register_topic (void);
-
-    pulse_Generator * ticker_;
-
-    bool x_increasing_;
-    bool y_increasing_;
-    bool size_increasing_;
-
-    ShapeType* shape_;
-
-    ::DDS::InstanceHandle_t instance_handle_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Shapes_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/examples/ShapesContr/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index ba339827d6a..00000000000
--- a/CIAO/connectors/dds4ccm/examples/ShapesContr/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-Description
-XML QoS Profile
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="plan_nopub">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="square" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-          <reliability>
-               <kind>RELIABLE_RELIABILITY_QOS</kind>
-         </reliability>
-      </datawriter_qos>
-      <datareader_qos>
-          <reliability>
-               <kind>RELIABLE_RELIABILITY_QOS</kind>
-          </reliability>
-      </datareader_qos>
-    </qos_profile>
-    <qos_profile name="circle">
-      <datawriter_qos>
-          <reliability>
-               <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-         </reliability>
-      </datawriter_qos>
-      <datareader_qos>
-          <reliability>
-               <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-          </reliability>
-      </datareader_qos>
-    </qos_profile>
-    <qos_profile name="triangle">
-     <datawriter_qos>
-          <reliability>
-               <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-         </reliability>
-     </datawriter_qos>
-     <datareader_qos>
-          <reliability>
-               <kind>RELIABLE_RELIABILITY_QOS</kind>
-          </reliability>
-     </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/descriptors/plan.cdp b/CIAO/connectors/dds4ccm/examples/ShapesContr/descriptors/plan.cdp
deleted file mode 100644
index b463e33d7e4..00000000000
--- a/CIAO/connectors/dds4ccm/examples/ShapesContr/descriptors/plan.cdp
+++ /dev/null
@@ -1,1576 +0,0 @@
-<!--  -->
-<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>Shapes_Depl_1</label>
-  <UUID>Shapes_Depl_1</UUID>
-
-  <implementation xmi:id="CompSvrImpl">
-    <name>CompSvr</name>
-    <source />
-    <artifact xmi:idref="CompSvrArt" />
-    <execParameter>
-      <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>edu.vanderbilt.dre.DAnCE.LocalityManager</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Shapes_ConnectorComponentImplementation">
-    <name>Shapes_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Shapes_Connector_ExecArtifact" />
-    <artifact xmi:idref="Shapes_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shapes_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shapes_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
- <implementation xmi:id="ControllerComponentImplementation">
-    <name>ControllerComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Controller_ExecArtifact" />
-    <artifact xmi:idref="Controller_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint  as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Controller_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_ShapesController_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Controller_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Controller_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="ControllerRComponentImplementation">
-    <name>ControllerRComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="ControllerR_ExecArtifact" />
-    <artifact xmi:idref="ControllerR_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_ControllerR_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_ShapesControllerR_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ControllerR_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ControllerR_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="CompSvrReceiverInst">
-    <name>ComponentServerReceiverInstance</name>
-    <node>ReceiverNode</node>
-    <source />
-    <implementation xmi:idref="CompSvrImpl" />
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.LocalityArguments</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>-ORBDottedDecimalAddresses 1</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="SquareReceiverComponentInstance">
-    <name>SquareReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>1</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>get_data</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>read_data</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>raw_listen</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>true</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="CircleReceiverComponentInstance">
-    <name>CircleReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>1</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>get_data</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>read_data</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>raw_listen</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>true</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="TriangleReceiverComponentInstance">
-    <name>TriangleReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>1</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>get_data</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>read_data</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>raw_listen</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>true</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="CompSvrSenderInst">
-    <name>ComponentServerSenderInstance</name>
-    <node>SenderNode</node>
-    <source />
-    <implementation xmi:idref="CompSvrImpl" />
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.LocalityArguments</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>-ORBDottedDecimalAddresses 1</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="SquareShapes_ConnectorComponentInstance">
-    <name>SquareShapes_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Shapes_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Square</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>type_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ShapeType</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="CircleShapes_ConnectorComponentInstance">
-    <name>CircleShapes_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Shapes_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Circle</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>type_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ShapeType</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="TriangleShapes_ConnectorComponentInstance">
-    <name>TriangleShapes_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Shapes_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Triangle</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>type_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ShapeType</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SquareShapes_ConnectorComponentInstance2">
-    <name>SquareShapes_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Shapes_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Square</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>type_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ShapeType</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="CircleShapes_ConnectorComponentInstance2">
-    <name>CircleShapes_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Shapes_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Circle</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>type_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ShapeType</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="TriangleShapes_ConnectorComponentInstance2">
-    <name>TriangleShapes_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Shapes_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Triangle</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>type_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ShapeType</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SquareControllerComponentInstance">
-    <name>SquareControllerComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ControllerComponentImplementation" />
-    <configProperty>
-      <name>publish_rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>0</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_size</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>50</ushort>
-        </value>
-      </value>
-    </configProperty>
-       <configProperty>
-      <name>max_x</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>225</ushort>
-        </value>
-      </value>
-    </configProperty>
-        <configProperty>
-      <name>max_y</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>250</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>resize_shape</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>use_web_interface</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Square</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="SquareSenderComponentInstance">
-    <name>SquareSenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>color</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ORANGE</string>
-        </value>
-      </value>
-    </configProperty>
-   </instance>
-
-  <instance xmi:id="CircleControllerComponentInstance">
-    <name>CircleControllerComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ControllerComponentImplementation" />
-    <configProperty>
-      <name>publish_rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>0</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_size</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>50</ushort>
-        </value>
-      </value>
-    </configProperty>
-       <configProperty>
-      <name>max_x</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>225</ushort>
-        </value>
-      </value>
-    </configProperty>
-        <configProperty>
-      <name>max_y</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>250</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>resize_shape</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>use_web_interface</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Circle</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="CircleSenderComponentInstance">
-    <name>CircleSenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>color</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ORANGE</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="TriangleControllerComponentInstance">
-    <name>TriangleControllerComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ControllerComponentImplementation" />
-    <configProperty>
-      <name>publish_rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>0</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_size</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>50</ushort>
-        </value>
-      </value>
-    </configProperty>
-       <configProperty>
-      <name>max_x</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>225</ushort>
-        </value>
-      </value>
-    </configProperty>
-        <configProperty>
-      <name>max_y</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>250</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>resize_shape</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-        <configProperty>
-      <name>use_web_interface</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Triangle</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="TriangleSenderComponentInstance">
-    <name>TriangleSenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>color</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ORANGE</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
- <instance xmi:id="SquareControllerRComponentInstance">
-    <name>SquareControllerRComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ControllerRComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReceiverSquare</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="CircleControllerRComponentInstance">
-    <name>CircleControllerRComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ControllerRComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReceiverCircle</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="TriangleControllerRComponentInstance">
-    <name>TriangleControllerRComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ControllerRComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReceiverTriangle</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-   <name>square_control_shape_attribs</name>
-     <internalEndpoint>
-      <portName>shapeAttribsSub</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SquareSenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>shapeAttribsPub</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SquareControllerComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-   <name>square_control_change_changed</name>
-     <internalEndpoint>
-      <portName>shapeChangesPub</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SquareSenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>shapeChangesSub</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SquareControllerComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-   <name>shape_received_square</name>
-     <internalEndpoint>
-      <portName>shapeReceivedPub</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SquareReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>shapeReceivedSub</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SquareControllerRComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-   <name>shape_received_circle</name>
-     <internalEndpoint>
-      <portName>shapeReceivedPub</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CircleReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>shapeReceivedSub</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CircleControllerRComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-   <name>shape_received_triangle</name>
-     <internalEndpoint>
-      <portName>shapeReceivedPub</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="TriangleReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>shapeReceivedSub</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="TriangleControllerRComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-
-  <connection>
-   <name>triangle_control_shape_attribs</name>
-     <internalEndpoint>
-      <portName>shapeAttribsSub</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="TriangleSenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>shapeAttribsPub</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="TriangleControllerComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-   <name>triangle_control_change_changed</name>
-     <internalEndpoint>
-      <portName>shapeChangesPub</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="TriangleSenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>shapeChangesSub</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="TriangleControllerComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-   <name>circle_control_shape_attribs</name>
-     <internalEndpoint>
-      <portName>shapeAttribsSub</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CircleSenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>shapeAttribsPub</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CircleControllerComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-   <name>circle_control_change_changed</name>
-     <internalEndpoint>
-      <portName>shapeChangesPub</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CircleSenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>shapeChangesSub</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CircleControllerComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>square_info_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SquareReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SquareShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>square_listenercontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SquareReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SquareShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>square_portstatuslistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SquareReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SquareShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>square_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SquareReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SquareShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>circle_info_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CircleReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CircleShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>circle_listenercontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CircleReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CircleShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>circle_portstatuslistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CircleReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CircleShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>circle_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CircleReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CircleShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>triangle_info_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="TriangleReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="TriangleShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>triangle_listenercontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="TriangleReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="TriangleShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>triangle_portstatuslistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="TriangleReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="TriangleShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>triangle_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="TriangleReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="TriangleShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>square_writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SquareSenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SquareShapes_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>circle_writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CircleSenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CircleShapes_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>triangle_writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="TriangleSenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="TriangleShapes_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-
-  <artifact xmi:id="CompSvrArt">
-    <name>CompoSvrArtifactName</name>
-    <source />
-    <node />
-    <location>dance_locality_manager</location>
-  </artifact>
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="Shapes_Connector_ExecArtifact">
-    <name>Shapes_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>ShapesContr_Connector_exec</location>
-  </artifact>
-
-  <artifact xmi:id="Controller_ExecArtifact">
-    <name>Controller_exec</name>
-    <source/>
-    <node/>
-    <location>ShapesContr_Controller_exec</location>
-  </artifact>
-  <artifact xmi:id="Controller_SvntArtifact">
-    <name>Controller_svnt</name>
-    <source/>
-    <node/>
-    <location>ShapesContr_Controller_svnt</location>
-  </artifact>
-  <!--artifact xmi:id="Controller_StubArtifact">
-    <name>Controller_stub</name>
-    <source/>
-    <node/>
-    <location>ShapesContr_Controller_stub</location>
-  </artifact-->
-  <artifact xmi:id="ControllerR_ExecArtifact">
-    <name>ControllerR_exec</name>
-    <source/>
-    <node/>
-    <location>ShapesContr_ContrR_exec</location>
-  </artifact>
-  <artifact xmi:id="ControllerR_SvntArtifact">
-    <name>ControllerR_svnt</name>
-    <source/>
-    <node/>
-    <location>ShapesContr_ContrR_svnt</location>
-  </artifact>
-  <!--artifact xmi:id="ControllerR_StubArtifact">
-    <name>ControllerR_stub</name>
-    <source/>
-    <node/>
-    <location>ShapesContr_ContrR_stub</location>
-  </artifact-->
-  <artifact xmi:id="Shapes_Connector_SvntArtifact">
-    <name>Shapes_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>ShapesContr_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Shapes_Connector_StubArtifact">
-    <name>Shapes_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>ShapesContr_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/descriptors/plan_nopub.cdp b/CIAO/connectors/dds4ccm/examples/ShapesContr/descriptors/plan_nopub.cdp
deleted file mode 100644
index e646f3e1117..00000000000
--- a/CIAO/connectors/dds4ccm/examples/ShapesContr/descriptors/plan_nopub.cdp
+++ /dev/null
@@ -1,1609 +0,0 @@
-<!--  -->
-<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>Shapes_Depl_1</label>
-  <UUID>Shapes_Depl_1</UUID>
-
-  <implementation xmi:id="CompSvrImpl">
-    <name>CompSvr</name>
-    <source />
-    <artifact xmi:idref="CompSvrArt" />
-    <execParameter>
-      <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>edu.vanderbilt.dre.DAnCE.LocalityManager</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Shapes_ConnectorComponentImplementation">
-    <name>Shapes_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Shapes_Connector_ExecArtifact" />
-    <artifact xmi:idref="Shapes_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shapes_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shapes_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
- <implementation xmi:id="ControllerComponentImplementation">
-    <name>ControllerComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Controller_ExecArtifact" />
-    <artifact xmi:idref="Controller_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Controller_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_ShapesController_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Controller_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Controller_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="ControllerRComponentImplementation">
-    <name>ControllerRComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="ControllerR_ExecArtifact" />
-    <artifact xmi:idref="ControllerR_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_ControllerR_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_ShapesControllerR_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ControllerR_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ControllerR_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="CompSvrReceiverInst">
-    <name>ComponentServerReceiverInstance</name>
-    <node>ReceiverNode</node>
-    <source />
-    <implementation xmi:idref="CompSvrImpl" />
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.LocalityArguments</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>-ORBDottedDecimalAddresses 1</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="SquareReceiverComponentInstance">
-    <name>SquareReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>1</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>get_data</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>read_data</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>raw_listen</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>true</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="CircleReceiverComponentInstance">
-    <name>CircleReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>1</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>get_data</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>read_data</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>raw_listen</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>true</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="TriangleReceiverComponentInstance">
-    <name>TriangleReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>1</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>get_data</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>read_data</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>raw_listen</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>true</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="CompSvrSenderInst">
-    <name>ComponentServerSenderInstance</name>
-    <node>SenderNode</node>
-    <source />
-    <implementation xmi:idref="CompSvrImpl" />
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.LocalityArguments</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>-ORBDottedDecimalAddresses 1</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="SquareShapes_ConnectorComponentInstance">
-    <name>SquareShapes_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Shapes_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>plan_nopub#square</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Square</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>type_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ShapeType</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="CircleShapes_ConnectorComponentInstance">
-    <name>CircleShapes_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Shapes_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>plan_nopub#circle</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Circle</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>type_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ShapeType</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="TriangleShapes_ConnectorComponentInstance">
-    <name>TriangleShapes_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Shapes_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>plan_nopub#triangle</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Triangle</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>type_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ShapeType</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SquareShapes_ConnectorComponentInstance2">
-    <name>SquareShapes_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Shapes_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>plan_nopub#square</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Square</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>type_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ShapeType</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="CircleShapes_ConnectorComponentInstance2">
-    <name>CircleShapes_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Shapes_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>plan_nopub#circle</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Circle</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>type_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ShapeType</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="TriangleShapes_ConnectorComponentInstance2">
-    <name>TriangleShapes_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Shapes_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>plan_nopub#triangle</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Triangle</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>type_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ShapeType</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SquareControllerComponentInstance">
-    <name>SquareControllerComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ControllerComponentImplementation" />
-    <configProperty>
-      <name>publish_rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>0</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_size</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>50</ushort>
-        </value>
-      </value>
-    </configProperty>
-       <configProperty>
-      <name>max_x</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>225</ushort>
-        </value>
-      </value>
-    </configProperty>
-        <configProperty>
-      <name>max_y</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>250</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>resize_shape</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-       <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Square</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="SquareSenderComponentInstance">
-    <name>SquareSenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>color</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ORANGE</string>
-        </value>
-      </value>
-    </configProperty>
-   </instance>
-
-  <instance xmi:id="CircleControllerComponentInstance">
-    <name>CircleControllerComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ControllerComponentImplementation" />
-    <configProperty>
-      <name>publish_rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>0</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_size</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>50</ushort>
-        </value>
-      </value>
-    </configProperty>
-       <configProperty>
-      <name>max_x</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>225</ushort>
-        </value>
-      </value>
-    </configProperty>
-        <configProperty>
-      <name>max_y</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>250</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>resize_shape</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-       <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Circle</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="CircleSenderComponentInstance">
-    <name>CircleSenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>color</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ORANGE</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="TriangleControllerComponentInstance">
-    <name>TriangleControllerComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ControllerComponentImplementation" />
-    <configProperty>
-      <name>publish_rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>0</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_size</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>50</ushort>
-        </value>
-      </value>
-    </configProperty>
-       <configProperty>
-      <name>max_x</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>225</ushort>
-        </value>
-      </value>
-    </configProperty>
-        <configProperty>
-      <name>max_y</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>250</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>resize_shape</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-       <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Triangle</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="TriangleSenderComponentInstance">
-    <name>TriangleSenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>color</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ORANGE</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
- <instance xmi:id="SquareControllerRComponentInstance">
-    <name>SquareControllerRComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ControllerRComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReceiverSquare</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="CircleControllerRComponentInstance">
-    <name>CircleControllerRComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ControllerRComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReceiverCircle</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="TriangleControllerRComponentInstance">
-    <name>TriangleControllerRComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ControllerRComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReceiverTriangle</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-   <name>square_control_shape_attribs</name>
-     <internalEndpoint>
-      <portName>shapeAttribsSub</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SquareSenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>shapeAttribsPub</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SquareControllerComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-   <name>square_control_change_changed</name>
-     <internalEndpoint>
-      <portName>shapeChangesPub</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SquareSenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>shapeChangesSub</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SquareControllerComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-   <name>shape_received_square</name>
-     <internalEndpoint>
-      <portName>shapeReceivedPub</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SquareReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>shapeReceivedSub</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SquareControllerRComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-   <name>shape_received_circle</name>
-     <internalEndpoint>
-      <portName>shapeReceivedPub</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CircleReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>shapeReceivedSub</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CircleControllerRComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-   <name>shape_received_triangle</name>
-     <internalEndpoint>
-      <portName>shapeReceivedPub</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="TriangleReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>shapeReceivedSub</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="TriangleControllerRComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-
-  <connection>
-   <name>triangle_control_shape_attribs</name>
-     <internalEndpoint>
-      <portName>shapeAttribsSub</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="TriangleSenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>shapeAttribsPub</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="TriangleControllerComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-   <name>triangle_control_change_changed</name>
-     <internalEndpoint>
-      <portName>shapeChangesPub</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="TriangleSenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>shapeChangesSub</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="TriangleControllerComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-   <name>circle_control_shape_attribs</name>
-     <internalEndpoint>
-      <portName>shapeAttribsSub</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CircleSenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>shapeAttribsPub</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CircleControllerComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-   <name>circle_control_change_changed</name>
-     <internalEndpoint>
-      <portName>shapeChangesPub</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CircleSenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>shapeChangesSub</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CircleControllerComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>square_info_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SquareReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SquareShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>square_listenercontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SquareReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SquareShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>square_portstatuslistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SquareReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SquareShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>square_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SquareReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SquareShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>circle_info_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CircleReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CircleShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>circle_listenercontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CircleReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CircleShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>circle_portstatuslistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CircleReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CircleShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>circle_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CircleReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CircleShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>triangle_info_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="TriangleReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="TriangleShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>triangle_listenercontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="TriangleReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="TriangleShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>triangle_portstatuslistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="TriangleReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="TriangleShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>triangle_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="TriangleReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="TriangleShapes_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>square_writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SquareSenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SquareShapes_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>circle_writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CircleSenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CircleShapes_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>triangle_writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="TriangleSenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="TriangleShapes_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-
-  <artifact xmi:id="CompSvrArt">
-    <name>CompoSvrArtifactName</name>
-    <source />
-    <node />
-    <location>dance_locality_manager</location>
-  </artifact>
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="Shapes_Connector_ExecArtifact">
-    <name>Shapes_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>ShapesContr_Connector_exec</location>
-  </artifact>
-
-  <artifact xmi:id="Controller_ExecArtifact">
-    <name>Controller_exec</name>
-    <source/>
-    <node/>
-    <location>ShapesContr_Controller_exec</location>
-  </artifact>
-  <artifact xmi:id="Controller_SvntArtifact">
-    <name>Controller_svnt</name>
-    <source/>
-    <node/>
-    <location>ShapesContr_Controller_svnt</location>
-  </artifact>
-  <!--artifact xmi:id="Controller_StubArtifact">
-    <name>Controller_stub</name>
-    <source/>
-    <node/>
-    <location>ShapesContr_Controller_stub</location>
-  </artifact-->
-  <artifact xmi:id="ControllerR_ExecArtifact">
-    <name>ControllerR_exec</name>
-    <source/>
-    <node/>
-    <location>ShapesContr_ContrR_exec</location>
-  </artifact>
-  <artifact xmi:id="ControllerR_SvntArtifact">
-    <name>ControllerR_svnt</name>
-    <source/>
-    <node/>
-    <location>ShapesContr_ContrR_svnt</location>
-  </artifact>
-  <!--artifact xmi:id="ControllerR_StubArtifact">
-    <name>ControllerR_stub</name>
-    <source/>
-    <node/>
-    <location>ShapesContr_ContrR_stub</location>
-  </artifact-->
-  <artifact xmi:id="Shapes_Connector_SvntArtifact">
-    <name>Shapes_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>ShapesContr_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Shapes_Connector_StubArtifact">
-    <name>Shapes_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>ShapesContr_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/descriptors/plan_nopub.xml b/CIAO/connectors/dds4ccm/examples/ShapesContr/descriptors/plan_nopub.xml
deleted file mode 100644
index d4fb8fcce40..00000000000
--- a/CIAO/connectors/dds4ccm/examples/ShapesContr/descriptors/plan_nopub.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-  <qos_profile name="square">
-     <datawriter_qos>
-          <reliability>
-               <kind>RELIABLE_RELIABILITY_QOS</kind>
-         </reliability>
-     </datawriter_qos>
-    <datareader_qos>
-          <reliability>
-               <kind>RELIABLE_RELIABILITY_QOS</kind>
-          </reliability>
-     </datareader_qos>
-  </qos_profile>
-  <qos_profile name="circle">
-     <datawriter_qos>
-          <reliability>
-               <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-         </reliability>
-     </datawriter_qos>
-    <datareader_qos>
-          <reliability>
-               <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-          </reliability>
-     </datareader_qos>
-  </qos_profile>
-  <qos_profile name="triangle">
-     <datawriter_qos>
-          <reliability>
-               <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-         </reliability>
-     </datawriter_qos>
-    <datareader_qos>
-          <reliability>
-               <kind>RELIABLE_RELIABILITY_QOS</kind>
-          </reliability>
-     </datareader_qos>
-  </qos_profile>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/examples/ShapesContr/descriptors/run_test.pl
deleted file mode 100755
index b7bc5581df6..00000000000
--- a/CIAO/connectors/dds4ccm/examples/ShapesContr/descriptors/run_test.pl
+++ /dev/null
@@ -1,293 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-$DDS_ROOT = "$ENV{'DDS_ROOT'}";
-
-#$ENV{'DANCE_LOG_LEVEL'}=10;
-#$ENV{'CIAO_LOG_LEVEL'}=10;
-#$ENV{'DANCE_TRACE_ENABLE'}=1;
-#$ENV{'CIAO_TRACE_ENABLE'}=1;
-
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file_pub = "plan.cdp";
-$cdp_file_nopub = "plan_nopub.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/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";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application for plan_nopub.cdp- NO PUBLISHING expected\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file_nopub -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file_nopub -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 10 seconds to allow task to complete\n";
-sleep (10);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file_nopub\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file_nopub -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-# Invoke executor - start the application -.
-print "Invoking executor - launch the application for plan.cdp- publishing expected\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file_pub -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file_pub -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 20 seconds to allow task to complete\n";
-sleep (20);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file_pub\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file_pub -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/idl/.gitignore b/CIAO/connectors/dds4ccm/idl/.gitignore
deleted file mode 100644
index c68776794a5..00000000000
--- a/CIAO/connectors/dds4ccm/idl/.gitignore
+++ /dev/null
@@ -1,75 +0,0 @@
-/ccm_ddsC.cpp
-/ccm_ddsC.h
-/ccm_ddsE.idl
-/ccm_ddsS.h
-/dds4ccm_Base_svnt.h
-/dds4ccm_BaseC.cpp
-/dds4ccm_BaseC.h
-/dds4ccm_BaseE.idl
-/dds4ccm_BaseEC.cpp
-/dds4ccm_BaseEC.h
-/dds4ccm_BaseES.h
-/dds4ccm_BaseS.h
-/dds4ccm_Connector_svnt.cpp
-/dds4ccm_Connector_svnt.h
-/dds4ccm_Connector_svnt_T.cpp
-/dds4ccm_Connector_svnt_T.h
-/dds4ccm_ConnectorC.cpp
-/dds4ccm_ConnectorC.h
-/dds4ccm_ConnectorC.inl
-/dds4ccm_ConnectorE.idl
-/dds4ccm_ConnectorEC.cpp
-/dds4ccm_ConnectorEC.h
-/dds4ccm_ConnectorES.h
-/dds4ccm_ConnectorS.cpp
-/dds4ccm_ConnectorS.h
-/dds4ccm_ConnectorStatusListener_svnt.h
-/dds4ccm_ConnectorStatusListenerC.cpp
-/dds4ccm_ConnectorStatusListenerC.h
-/dds4ccm_ConnectorStatusListenerE.idl
-/dds4ccm_ConnectorStatusListenerEC.cpp
-/dds4ccm_ConnectorStatusListenerEC.h
-/dds4ccm_ConnectorStatusListenerES.h
-/dds4ccm_ConnectorStatusListenerS.h
-/dds4ccm_DataListenerControl_svnt.h
-/dds4ccm_DataListenerControlC.cpp
-/dds4ccm_DataListenerControlC.h
-/dds4ccm_DataListenerControlE.idl
-/dds4ccm_DataListenerControlEC.cpp
-/dds4ccm_DataListenerControlEC.h
-/dds4ccm_DataListenerControlES.h
-/dds4ccm_DataListenerControlS.h
-/dds4ccm_EntityC.cpp
-/dds4ccm_EntityC.h
-/dds4ccm_EntityS.h
-/dds4ccm_lem_stub_export.h
-/dds4ccm_PortStatusListener_svnt.h
-/dds4ccm_PortStatusListenerC.cpp
-/dds4ccm_PortStatusListenerC.h
-/dds4ccm_PortStatusListenerE.idl
-/dds4ccm_PortStatusListenerEC.cpp
-/dds4ccm_PortStatusListenerEC.h
-/dds4ccm_PortStatusListenerES.h
-/dds4ccm_PortStatusListenerS.h
-/dds4ccm_QueryFilterC.cpp
-/dds4ccm_QueryFilterC.h
-/dds4ccm_QueryFilterS.h
-/dds4ccm_skel_export.h
-/dds4ccm_StateListenerControl_svnt.h
-/dds4ccm_StateListenerControlC.cpp
-/dds4ccm_StateListenerControlC.h
-/dds4ccm_StateListenerControlE.idl
-/dds4ccm_StateListenerControlEC.cpp
-/dds4ccm_StateListenerControlEC.h
-/dds4ccm_StateListenerControlES.h
-/dds4ccm_StateListenerControlS.h
-/dds4ccm_stub_export.h
-/dds_rtf2_dcps_i_handleE.idl
-/dds_rtf2_dcps_svnt.h
-/dds_rtf2_dcpsC.cpp
-/dds_rtf2_dcpsC.h
-/dds_rtf2_dcpsE.idl
-/dds_rtf2_dcpsEC.cpp
-/dds_rtf2_dcpsEC.h
-/dds_rtf2_dcpsES.h
-/dds_rtf2_dcpsS.h
diff --git a/CIAO/connectors/dds4ccm/idl/ccm_dds.idl b/CIAO/connectors/dds4ccm/idl/ccm_dds.idl
deleted file mode 100644
index 829697f1dd5..00000000000
--- a/CIAO/connectors/dds4ccm/idl/ccm_dds.idl
+++ /dev/null
@@ -1,281 +0,0 @@
-#ifndef CCM_DDS_BASE_IDL
-#define CCM_DDS_BASE_IDL
-
-#include <Components.idl>
-#include "connectors/dds4ccm/idl/dds4ccm_DataListenerControl.idl"
-#include "connectors/dds4ccm/idl/dds4ccm_StateListenerControl.idl"
-#include "connectors/dds4ccm/idl/dds4ccm_PortStatusListener.idl"
-#include "connectors/dds4ccm/idl/dds4ccm_ConnectorStatusListener.idl"
-#include "connectors/dds4ccm/idl/dds4ccm_Connector.idl"
-#include "connectors/dds4ccm/idl/dds4ccm_Entity.idl"
-
-#pragma dds4ccm impl "connectors/dds4ccm/impl/DDS_Event_Connector_T.h"
-#pragma dds4ccm impl "connectors/dds4ccm/impl/DDS_State_Connector_T.h"
-
-module CCM_DDS
-{
-  module Typed <typename T, sequence<T> TSeq> {
-    alias DDS_Entity<T, TSeq> DDS_Typed_Entity;
-    typedef DDS_Typed_Entity::DataReader DataReader;
-    typedef DDS_Typed_Entity::DataWriter DataWriter;
-
-    // Gathers all the constructs that are dependent on the data type (T),
-    // either directly -- interfaces making use of T or TSeq,
-    // or indirectly -- porttypes using or providing those intefaces.
-    // TSeq is passed as a second parameter to avoid creating a new sequence type.
-
-    // -------------------------------------
-    // Interfaces to be 'used' or 'provided'
-    // -------------------------------------
-
-        // Data access - publishing side
-        // -----------------------------
-
-        // -- InstanceHandle Manager
-        local interface InstanceHandleManager {
-                DDS::InstanceHandle_t register_instance (in T datum)
-                        raises (InternalError);
-                void unregister_instance (in T datum, in DDS::InstanceHandle_t instance_handle)
-                        raises (InternalError);
-                };
-
-        // -- Writer: when the instance lifecycle is not a concern
-        local interface Writer : InstanceHandleManager {
-                void write_one (in T datum, in DDS::InstanceHandle_t instance_handle)
-                        raises (InternalError);
-                void write_many (in TSeq data)
-                        raises (InternalError);
-                attribute boolean is_coherent_write;            // FALSE by default
-                // behavior
-                // ---------
-                // - the handle is exactly managed as by DDS (cf. DDS spec for more details)
-                // - attempt to write_many is stopped at the first error
-                // - if is_coherent_write, DDS write orders issued by a write_many
-                //       are placed between begin/end coherent updates (even if an error occurs)
-                };
-
-        // -- Updater: when the instance lifecycle is a concern
-        local interface Updater : InstanceHandleManager {
-                void create_one (in T datum)
-                        raises (AlreadyCreated,
-                                InternalError);
-                void update_one (in T datum, in DDS::InstanceHandle_t instance_handle)
-                        raises (NonExistent,
-                                InternalError);
-                void delete_one (in T datum,in DDS::InstanceHandle_t instance_handle)
-                        raises (NonExistent,
-                                InternalError);
-
-                void create_many (in TSeq data)
-                        raises (AlreadyCreated,
-                                InternalError);
-                void update_many (in TSeq data)
-                        raises (NonExistent,
-                                InternalError);
-                void delete_many (in TSeq data)
-                        raises (NonExistent,
-                                InternalError);
-
-                readonly attribute boolean is_global_scope;                     // FALSE by default
-                attribute boolean is_coherent_write;                            // FALSE by default
-
-                // behavior
-                // --------
-                // - the handle is exactly managed as by DDS (cf. DDS spec for more details)
-                // - exceptions AlreadyCreated or NonExistent are raised at least if a local
-                //       conflict exists; in addition if is_global_scope is true, the test on
-                //       existence attempts to take into account the instances created outside
-                //              - note: this check requires to previously attempt to read (not free)
-                //              - note: this check is not 100% guaranteed as a creation or a deletion
-                //                may occur in the short time between the check and the DDS order
-                // - For *-many operations:
-                //              - global check is performed before actual write or dispose
-                //                (in case of error, all the erroneous instances are reported
-                //                in the exception)
-                //              - attempt to DDS write or dispose is stopped at the first error
-                //              - if is_coherent_write, DDS orders resulting from a *_many operation
-                //                are placed between begin/end coherent updates (even if an error
-                //                occurs)
-                };
-
-        // Data access - subscribing side
-        // ------------------------------
-
-        // -- Reader: to simply access to the available data (no wait)
-        local interface Reader {
-                void read_last (inout TSeq data, inout ReadInfoSeq infos)
-                        raises (InternalError);
-                void read_all (inout TSeq data, inout ReadInfoSeq infos)
-                        raises (InternalError);
-                void read_one_last (inout T datum, out ReadInfo info,
-                                in DDS::InstanceHandle_t instance_handle)
-                        raises (NonExistent,
-                                InternalError);
-                void read_one_all (in T datum, inout TSeq data, inout ReadInfoSeq infos,
-                                in DDS::InstanceHandle_t instance_handle)
-                        raises (NonExistent,
-                                InternalError);
-                attribute QueryFilter query
-                        setraises (InternalError);
-                // behavior
-                // --------
-                // - read operations are performed with the following parameters
-                //              - READ or NO_READ
-                //              - NEW or NOT_NEW
-                //              - ALIVE
-                //              - through the query as specified in the expression ("" means no query)
-                // - data returned:
-                //              - read_last returns for each living instance, its last sample
-                //              - read_all returns all the samples of all instances
-                //                ordered by instance first and then by sample
-                //              - read_one_last returns the last sample of the given instance
-                //              - read_one_all returns all the samples for the given instance
-                //      - read_one operations use the instance_handle the same way
-                //        the Writer or Updater *_one operations do
-                };
-
-        // -- Getter: to get new data (and wait for)
-        local interface Getter {
-                boolean get_one (out T datum, out ReadInfo info)
-                        raises (InternalError);
-                boolean get_many (inout TSeq data, inout ReadInfoSeq infos)
-                        raises (InternalError);
-                attribute DDS::Duration_t       time_out;
-                attribute DataNumber_t          max_delivered_data;     // default 0 (no limit)
-                // behavior
-                // --------
-                // - get operations are performed with the following parameters
-                //              - NO_READ
-                //              - NEW or NOT_NEW
-                //              - ALIVE or NOT_ALIVE
-                //              - through the query as specified in the associated Reader
-                //              - within the time limit specified in time_out
-                // - all operations returns TRUE if data are provided
-                //       or FALSE if time-out occurred
-                // - data returned:
-                //              - get_one returns each read sample one by one
-                //      - get_many returns all available samples within the
-                //                max_delivered_data limit
-                };
-
-        // -- Listener: similar to a Getter but in push mode
-        local interface Listener {
-                void on_one_data (in T datum, in ReadInfo info);
-                void on_many_data (in TSeq data, in ReadInfoSeq infos);
-                // behavior
-                // --------
-                // - on_one_data() trigered is the mode of the associated listener control
-                //       is ONE_BY_ONE (then similar to a get_one(), except that in push mode
-                //       instead of pull mode)
-                // - on_many_data() triggered if the listener mode is MANY_BY_MANY (then
-                //       similar to get_many() but in push mode)
-                // - query filter (if any) in the associated Reader
-                };
-
-        // -- StateListener: listener to be notified based on the instance lifecycle
-        local interface StateListener {
-                void on_creation (in T datum, in ReadInfo info);
-                void on_one_update (in T datum, in ReadInfo info);
-                void on_many_updates (in TSeq data, in ReadInfoSeq infos);
-                void on_deletion (in T datum, in ReadInfo info);
-                // behavior
-                // --------
-                // - no operations are trigerred if the mode of the associated listener
-                //       control is NOT_ENABLED
-                // - on_creation() is triggered if the instance is considered as new in the
-                //       component scope; note that in case there is a filter and the attribute
-                //       is_filter_interpreted of the listener control is TRUE, this gathers also
-                //       the case when the instance is filtered-in.
-                // - on_delation() is triggered if the instance is no more existing; note
-                //       that in case there is a filter  and the attribute
-                //       is_filter_interpreted of the listener control is TRUE, this gathers
-                //       also the case when the instance is filtered-out
-                // - on_one_update() is trigrered if neither on_creation() nor on_deletion()
-                //       are triggered and the mode of the associated listener control is
-                //       ONE_BY_ONE
-                // - on_many_updates()is triggered if neither on_creation() nor on_deletion()
-                //       are triggered and the mode of the associated listener control is
-                //       MANY_BY_MANY; the number of returned samples is within the limits of
-                //       max_delivered_data attribute of the associated listener control.
-                // - query filter (if any) in the associated Reader
-                };
-
-
-        // ---------
-        // DDS Ports
-        // ---------
-
-        porttype DDS_Write {
-                uses Writer              data;
-                uses DDS::DataWriter     dds_entity;
-                };
-
-        porttype DDS_Update {
-                uses Updater                    data;
-                uses DDS::DataWriter            dds_entity;
-                };
-
-        porttype DDS_Read {
-                uses Reader                     data;
-                uses DDS::DataReader            dds_entity;
-                provides PortStatusListener     status;
-                attribute QueryFilter           filter
-                  setraises (NonChangeable);
-                uses ContentFilterSetting       filter_config;
-                };
-
-        porttype DDS_Get {
-                uses Reader                     data;
-                uses Getter                     fresh_data;
-                uses DDS::DataReader            dds_entity;
-                provides PortStatusListener     status;
-                attribute QueryFilter           filter
-                  setraises (NonChangeable);
-                uses ContentFilterSetting       filter_config;
-                };
-
-        porttype DDS_Listen {
-                uses Reader                     data;
-                uses DataListenerControl        data_control;
-                provides Listener               data_listener;
-                uses DDS::DataReader            dds_entity;
-                provides PortStatusListener     status;
-                attribute QueryFilter           filter
-                  setraises (NonChangeable);
-                uses ContentFilterSetting       filter_config;
-                };
-
-        porttype DDS_StateListen {
-                uses Reader                     data;
-                uses StateListenerControl       data_control;
-                provides StateListener          data_listener;
-                uses DDS::DataReader            dds_entity;
-                provides PortStatusListener     status;
-                attribute QueryFilter           filter
-                  setraises (NonChangeable);
-                uses ContentFilterSetting       filter_config;
-                };
-
-        // ----------------------------
-        // Connectors
-        // (Correspond to DDS patterns)
-        // ----------------------------
-
-        connector DDS_State : DDS_TopicBase {
-                mirrorport DDS_Update           observable;
-                mirrorport DDS_Read             passive_observer;
-                mirrorport DDS_Get              pull_observer;
-                mirrorport DDS_Listen           push_observer;
-                mirrorport DDS_StateListen      push_state_observer;
-                };
-
-        connector DDS_Event : DDS_TopicBase {
-                mirrorport DDS_Write            supplier;
-                mirrorport DDS_Get              pull_consumer;
-                mirrorport DDS_Listen           push_consumer;
-                };
-        };
-};
-
-#endif
-
diff --git a/CIAO/connectors/dds4ccm/idl/dds/.gitignore b/CIAO/connectors/dds4ccm/idl/dds/.gitignore
deleted file mode 100644
index 95fd51432c1..00000000000
--- a/CIAO/connectors/dds4ccm/idl/dds/.gitignore
+++ /dev/null
@@ -1,26 +0,0 @@
-/DdsDcps_lem_stub_export.h
-/DdsDcpsDomain_svnt.h
-/DdsDcpsDomainE.idl
-/DdsDcpsDomainEC.cpp
-/DdsDcpsDomainEC.h
-/DdsDcpsDomainES.h
-/DdsDcpsInfrastructure_svnt.h
-/DdsDcpsInfrastructureE.idl
-/DdsDcpsInfrastructureEC.cpp
-/DdsDcpsInfrastructureEC.h
-/DdsDcpsInfrastructureES.h
-/DdsDcpsPublication_svnt.h
-/DdsDcpsPublicationE.idl
-/DdsDcpsPublicationEC.cpp
-/DdsDcpsPublicationEC.h
-/DdsDcpsPublicationES.h
-/DdsDcpsSubscription_svnt.h
-/DdsDcpsSubscriptionE.idl
-/DdsDcpsSubscriptionEC.cpp
-/DdsDcpsSubscriptionEC.h
-/DdsDcpsSubscriptionES.h
-/DdsDcpsTopic_svnt.h
-/DdsDcpsTopicE.idl
-/DdsDcpsTopicEC.cpp
-/DdsDcpsTopicEC.h
-/DdsDcpsTopicES.h
diff --git a/CIAO/connectors/dds4ccm/idl/dds/opendds_lem_stub.mpc b/CIAO/connectors/dds4ccm/idl/dds/opendds_lem_stub.mpc
deleted file mode 100644
index 362f1e12134..00000000000
--- a/CIAO/connectors/dds4ccm/idl/dds/opendds_lem_stub.mpc
+++ /dev/null
@@ -1,118 +0,0 @@
-project(CIAO_OpenDDS_Dcps_idl_gen): gen_ostream, ccm_lem_stub, ciaoidldefaults, \
-                               taobaseidldefaults, ccm_lw, ccm_noevent, ccm_direct_collocation {
-  requires   += dds4ccm_opendds
-  custom_only = 1
-  idlflags += -SS -Sci -Scc -Sch -Ssh -Ssc \
-              -I$(DDS_ROOT) -I.. \
-              -Glem -Gsv -Ssvntt -Ssvntc
-
-  IDL_Files {
-    gendir = .
-    idlflags += -Wb,stripped_filename=dds/DdsDcpsInfrastructure.idl
-    $(DDS_ROOT)/dds/DdsDcpsInfrastructure.idl >> DdsDcpsInfrastructureE.idl DdsDcpsInfrastructure_svnt.h
-  }
-
-  IDL_Files {
-    gendir = .
-    idlflags += -Wb,stripped_filename=dds/DdsDcpsDomain.idl
-    $(DDS_ROOT)/dds/DdsDcpsDomain.idl >> DdsDcpsDomainE.idl DdsDcpsDomain_svnt.h
-  }
-  IDL_Files {
-    gendir = .
-    idlflags += -Wb,stripped_filename=dds/DdsDcpsPublication.idl
-    $(DDS_ROOT)/dds/DdsDcpsPublication.idl >> DdsDcpsPublicationE.idl DdsDcpsPublication_svnt.h
-  }
-  IDL_Files {
-    gendir = .
-    idlflags += -Wb,stripped_filename=dds/DdsDcpsSubscription.idl
-    $(DDS_ROOT)/dds/DdsDcpsSubscription.idl >> DdsDcpsSubscriptionE.idl DdsDcpsSubscription_svnt.h
-  }
-  IDL_Files {
-    gendir = .
-    idlflags += -Wb,stripped_filename=dds/DdsDcpsTopic.idl
-    $(DDS_ROOT)/dds/DdsDcpsTopic.idl >> DdsDcpsTopicE.idl DdsDcpsTopic_svnt.h
-  }
-
-  specific {
-     install_dir = connectors/dds4ccm/idl/dds
-  }
-}
-
-project (CIAO_OpenDDS_Dcps_lem_gen) : taoidldefaults, install, \
-    ciaoidldefaults, taobaseidldefaults, ccm_lw, ccm_noevent, ccm_direct_collocation{
-  custom_only = 1
-  requires   += dds4ccm_opendds
-  after      += CIAO_OpenDDS_Dcps_idl_gen
-  idlflags   += -I$(CIAO_ROOT)/connectors\
-                -Wb,stub_export_macro=DDSDCPS_LEM_STUB_Export \
-                -Wb,stub_export_include=DdsDcps_lem_stub_export.h \
-                -SS -I$(DDS_ROOT) -Ssvntt -Ssvntc -Sci -I..
-
-  IDL_Files {
-     idlflags += -Gxhst
-     DdsDcpsDomainE.idl
-  }
-
-  IDL_Files {
-    // DDS specification defined
-    DdsDcpsInfrastructureE.idl
-    DdsDcpsPublicationE.idl
-    DdsDcpsSubscriptionE.idl
-    DdsDcpsTopicE.idl
-  }
-
-  Source_Files {
-  }
-
-  Header_Files {
-  }
-
-  Inline_Files {
-  }
-
-  specific {
-     install_dir = connectors/dds4ccm/idl/dds
-  }
-}
-
-project (CIAO_OpenDDS_Dcps_lem_stub) : taolib, valuetype, dds4ccm, \
-                                  gen_ostream, install, ciao_output, \
-                                  ccm_lem_stub, ciaoidldefaults, taobaseidldefaults, \
-                                  ccm_lw, ccm_noevent, ccm_direct_collocation {
-  requires += dds4ccm_opendds
-  after += CCM_stub_idl CCM_session_idl
-  sharedname = CIAO_OpenDDS_Dcps_lem_stub
-  dynamicflags += DDSDCPS_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    DdsDcpsDomainEC.cpp
-    DdsDcpsInfrastructureEC.cpp
-    DdsDcpsPublicationEC.cpp
-    DdsDcpsSubscriptionEC.cpp
-    DdsDcpsTopicEC.cpp
-  }
-
-  Header_Files {
-    DdsDcpsDomainEC.h
-    DdsDcpsInfrastructureEC.h
-    DdsDcpsPublicationEC.h
-    DdsDcpsSubscriptionEC.h
-    DdsDcpsTopicEC.h
-    DdsDcps_lem_stub_export.h
-    DdsDcpsDomain_svnt.h
-    DdsDcpsPublication_svnt.h
-    DdsDcpsSubscription_svnt.h
-    DdsDcpsTopic_svnt.h
-    DdsDcpsInfrastructure_svnt.h
-  }
-
-  Inline_Files {
-  }
-
-  specific {
-     install_dir = connectors/dds4ccm/idl/dds
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm_Base.idl b/CIAO/connectors/dds4ccm/idl/dds4ccm_Base.idl
deleted file mode 100644
index c060ebfab3f..00000000000
--- a/CIAO/connectors/dds4ccm/idl/dds4ccm_Base.idl
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * @file dds4ccm_Base.idl
- */
-
-#ifndef DDS4CCM_BASE_IDL3
-#define DDS4CCM_BASE_IDL3
-
-#include "connectors/dds4ccm/idl/dds_rtf2_dcps.idl"
-#include "connectors/dds4ccm/idl/dds4ccm_QueryFilter.idl"
-
-#pragma ciao lem "connectors/dds4ccm/idl/dds4ccm_BaseE.idl"
-
-module CCM_DDS
-{
-  typedef unsigned long DataNumber_t;   // count or index of data
-  typedef sequence<DataNumber_t> DataNumberSeq;
-  const DataNumber_t UNLIMITED = 0;
-
-  enum AccessStatus {
-    FRESH_INFO,
-    ALREADY_SEEN
-  };
-
-  enum InstanceStatus {
-    INSTANCE_CREATED,
-    INSTANCE_FILTERED_IN,
-    INSTANCE_UPDATED,
-    INSTANCE_FILTERED_OUT,
-    INSTANCE_DELETED
-  };
-
-  struct ReadInfo {
-    DDS::InstanceHandle_t instance_handle;
-    DDS::Time_t source_timestamp;
-    AccessStatus access_status;
-    InstanceStatus instance_status;
-  };
-  typedef sequence<ReadInfo> ReadInfoSeq;
-
-  enum ListenerMode {
-    NOT_ENABLED,
-    ONE_BY_ONE,
-    MANY_BY_MANY
-  };
-
-  exception AlreadyCreated {
-    DataNumberSeq indexes; // of the erroneous
-  };
-
-  exception NonExistent{
-    DataNumberSeq indexes; // of the erroneous
-  };
-
-  exception InternalError{
-    DDS::ReturnCode_t error_code;
-    DataNumber_t index; // of the erroneaous
-  };
-
-  exception NonChangeable {
-  };
-
-  local interface ContentFilterSetting {
-    void set_filter_parameters (in DDS::StringSeq parameters)
-      raises (InternalError);
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm_Connector.idl b/CIAO/connectors/dds4ccm/idl/dds4ccm_Connector.idl
deleted file mode 100644
index ad91514b2c9..00000000000
--- a/CIAO/connectors/dds4ccm/idl/dds4ccm_Connector.idl
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef DDS4CCM_CONNECTOR_IDL
-#define DDS4CCM_CONNECTOR_IDL
-
-#include <Components.idl>
-#include "connectors/dds4ccm/idl/dds4ccm_Base.idl"
-#include "connectors/dds4ccm/idl/dds4ccm_ConnectorStatusListener.idl"
-
-#pragma ciao lem "connectors/dds4ccm/idl/dds4ccm_ConnectorE.idl"
-
-module CCM_DDS
-{
-  connector DDS_Base {
-    uses ConnectorStatusListener error_listener;
-    attribute DDS::DomainId_t domain_id
-      setraises (NonChangeable);
-    attribute string qos_profile
-      setraises (NonChangeable);
-  };
-  connector DDS_TopicBase : DDS_Base {
-    attribute string topic_name
-      setraises (NonChangeable);
-    attribute DDS::StringSeq key_fields
-      setraises (NonChangeable);
-    /// The type_name that will be used by DDS4CCM when
-    /// registering the topic to DDS. If empty the default
-    /// typename from the DDS typesupport will be used, this
-    /// default typename is vendor specific
-    attribute string type_name;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm_ConnectorStatusListener.idl b/CIAO/connectors/dds4ccm/idl/dds4ccm_ConnectorStatusListener.idl
deleted file mode 100644
index 487f3e5d2ea..00000000000
--- a/CIAO/connectors/dds4ccm/idl/dds4ccm_ConnectorStatusListener.idl
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * @file dds4ccm_ConnectorStatusListener.idl
- */
-
-#ifndef DDS4CCM_CONNECTORSTATUSLISTNER_IDL3
-#define DDS4CCM_CONNECTORSTATUSLISTNER_IDL3
-
-#include "connectors/dds4ccm/idl/dds4ccm_Base.idl"
-
-#pragma ciao lem "connectors/dds4ccm/idl/dds4ccm_ConnectorStatusListenerE.idl"
-
-module CCM_DDS
-{
-  local interface ConnectorStatusListener {
-    // status that are relevant system-wide
-    void on_inconsistent_topic(in DDS::Topic the_topic,
-                               in DDS::InconsistentTopicStatus status);
-    void on_requested_incompatible_qos(in DDS::DataReader the_reader,
-                                       in DDS::RequestedIncompatibleQosStatus status);
-    void on_sample_rejected(in DDS::DataReader the_reader,
-                            in DDS::SampleRejectedStatus status);
-    void on_offered_deadline_missed(in DDS::DataWriter the_writer,
-                                    in DDS::OfferedDeadlineMissedStatus status);
-    void on_offered_incompatible_qos(in DDS::DataWriter the_writer,
-                                     in DDS::OfferedIncompatibleQosStatus status);
-    void on_unexpected_status (in DDS::Entity the_entity,
-                               in DDS::StatusKind status_kind);
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm_DataListenerControl.idl b/CIAO/connectors/dds4ccm/idl/dds4ccm_DataListenerControl.idl
deleted file mode 100644
index 9fe611810bf..00000000000
--- a/CIAO/connectors/dds4ccm/idl/dds4ccm_DataListenerControl.idl
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * @file dds4ccm_DataListenerControl.idl
- */
-
-#ifndef DDS4CCM_LISTENERCONTROL_IDL3
-#define DDS4CCM_LISTENERCONTROL_IDL3
-
-#include "connectors/dds4ccm/idl/dds4ccm_Base.idl"
-
-#pragma ciao lem "connectors/dds4ccm/idl/dds4ccm_DataListenerControlE.idl"
-
-module CCM_DDS
-{
-  local interface DataListenerControl {
-    attribute ListenerMode mode;
-    attribute DataNumber_t max_delivered_data;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm_Entity.idl b/CIAO/connectors/dds4ccm/idl/dds4ccm_Entity.idl
deleted file mode 100644
index 0535eecae1c..00000000000
--- a/CIAO/connectors/dds4ccm/idl/dds4ccm_Entity.idl
+++ /dev/null
@@ -1,145 +0,0 @@
-#ifndef DDS4CCM_ENTITY
-#define DDS4CCM_ENTITY
-
-#include "connectors/dds4ccm/idl/dds_rtf2_dcps.idl"
-
-/**
-  * Typed DDS apis defined in IDL, CIAO specific extension
-  */
-module DDS_Entity <typename T, sequence<T> TSeq> {
-  local interface DataWriter : ::DDS::DataWriter {
-    DDS::InstanceHandle_t register_instance(
-        in T instance_data);
-    DDS::InstanceHandle_t register_instance_w_timestamp(
-        in T instance_data,
-        in DDS::Time_t source_timestamp);
-    DDS::ReturnCode_t unregister_instance(
-        in T instance_data,
-        in DDS::InstanceHandle_t  handle);
-    DDS::ReturnCode_t unregister_instance_w_timestamp(
-        in T instance_data,
-        in DDS::InstanceHandle_t  handle,
-        in DDS::Time_t source_timestamp);
-    DDS::ReturnCode_t write(
-        in T instance_data,
-        in DDS::InstanceHandle_t handle);
-    DDS::ReturnCode_t write_w_timestamp(
-        in T instance_data,
-        in DDS::InstanceHandle_t handle,
-        in DDS::Time_t source_timestamp);
-    DDS::ReturnCode_t dispose(
-        in T instance_data,
-        in DDS::InstanceHandle_t instance_handle);
-    DDS::ReturnCode_t dispose_w_timestamp(
-        in T instance_data,
-        in DDS::InstanceHandle_t instance_handle,
-        in DDS::Time_t source_timestamp);
-    DDS::ReturnCode_t get_key_value(
-        inout T key_holder,
-        in DDS::InstanceHandle_t handle);
-    DDS::InstanceHandle_t lookup_instance(
-        in T instance_data);
-  };
-
-  local interface DataReader : ::DDS::DataReader {
-    DDS::ReturnCode_t read(
-        inout TSeq data_values,
-        inout DDS::SampleInfoSeq sample_infos,
-        in long max_samples,
-        in DDS::SampleStateMask sample_states,
-        in DDS::ViewStateMask view_states,
-        in DDS::InstanceStateMask instance_states);
-
-    DDS::ReturnCode_t take(
-        inout TSeq data_values,
-        inout DDS::SampleInfoSeq sample_infos,
-        in long max_samples,
-        in DDS::SampleStateMask sample_states,
-        in DDS::ViewStateMask view_states,
-        in DDS::InstanceStateMask instance_states);
-
-    DDS::ReturnCode_t read_w_condition(
-        inout TSeq data_values,
-        inout DDS::SampleInfoSeq sample_infos,
-        in long max_samples,
-        in DDS::ReadCondition a_condition);
-
-    DDS::ReturnCode_t take_w_condition(
-        inout TSeq data_values,
-        inout DDS::SampleInfoSeq sample_infos,
-        in long max_samples,
-        in DDS::ReadCondition a_condition);
-
-    DDS::ReturnCode_t read_next_sample(
-        inout T data_values,
-        inout DDS::SampleInfo sample_info);
-
-    DDS::ReturnCode_t take_next_sample(
-        inout T data_values,
-        inout DDS::SampleInfo sample_info);
-
-    DDS::ReturnCode_t read_instance(
-        inout TSeq data_values,
-        inout DDS::SampleInfoSeq sample_infos,
-        in long max_samples,
-        in DDS::InstanceHandle_t a_handle,
-        in DDS::SampleStateMask sample_states,
-        in DDS::ViewStateMask view_states,
-        in DDS::InstanceStateMask instance_states);
-
-    DDS::ReturnCode_t take_instance(
-        inout TSeq data_values,
-        inout DDS::SampleInfoSeq sample_infos,
-        in long max_samples,
-        in DDS::InstanceHandle_t a_handle,
-        in DDS::SampleStateMask sample_states,
-        in DDS::ViewStateMask view_states,
-        in DDS::InstanceStateMask instance_states);
-
-    DDS::ReturnCode_t read_next_instance(
-        inout TSeq data_values,
-        inout DDS::SampleInfoSeq sample_infos,
-        in long max_samples,
-        in DDS::InstanceHandle_t previous_handle,
-        in DDS::SampleStateMask sample_states,
-        in DDS::ViewStateMask view_states,
-        in DDS::InstanceStateMask instance_states);
-
-    DDS::ReturnCode_t take_next_instance(
-        inout TSeq data_values,
-        inout DDS::SampleInfoSeq sample_infos,
-        in long max_samples,
-        in DDS::InstanceHandle_t previous_handle,
-        in DDS::SampleStateMask sample_states,
-        in DDS::ViewStateMask view_states,
-        in DDS::InstanceStateMask instance_states);
-
-    DDS::ReturnCode_t read_next_instance_w_condition(
-        inout TSeq data_values,
-        inout DDS::SampleInfoSeq sample_infos,
-        in long max_samples,
-        in DDS::InstanceHandle_t previous_handle,
-        in DDS::ReadCondition a_condition);
-
-    DDS::ReturnCode_t take_next_instance_w_condition(
-        inout TSeq data_values,
-        inout DDS::SampleInfoSeq sample_infos,
-        in long max_samples,
-        in DDS::InstanceHandle_t previous_handle,
-        in DDS::ReadCondition a_condition);
-
-    DDS::ReturnCode_t return_loan (
-        inout TSeq data_values,
-        inout DDS::SampleInfoSeq sample_infos);
-
-    DDS::ReturnCode_t get_key_value(
-        inout T key_holder,
-        in DDS::InstanceHandle_t handle);
-
-    DDS::InstanceHandle_t lookup_instance(
-        in T instance_data);
-  };
-};
-
-#endif
-
diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm_PortStatusListener.idl b/CIAO/connectors/dds4ccm/idl/dds4ccm_PortStatusListener.idl
deleted file mode 100644
index eadc949c6f9..00000000000
--- a/CIAO/connectors/dds4ccm/idl/dds4ccm_PortStatusListener.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file dds4ccm_PortStatusListener.idl
- */
-
-#ifndef DDS4CCM_PORTSTATUSLISTNER_IDL3
-#define DDS4CCM_PORTSTATUSLISTNER_IDL3
-
-#include "connectors/dds4ccm/idl/dds4ccm_Base.idl"
-
-#pragma ciao lem "connectors/dds4ccm/idl/dds4ccm_PortStatusListenerE.idl"
-
-module CCM_DDS
-{
-  local interface PortStatusListener {
-    void on_requested_deadline_missed(in DDS::DataReader the_reader,
-                                      in DDS::RequestedDeadlineMissedStatus status);
-    void on_sample_lost(in DDS::DataReader the_reader,
-                        in DDS::SampleLostStatus status);
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm_QueryFilter.idl b/CIAO/connectors/dds4ccm/idl/dds4ccm_QueryFilter.idl
deleted file mode 100644
index 885eab03aec..00000000000
--- a/CIAO/connectors/dds4ccm/idl/dds4ccm_QueryFilter.idl
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * @file dds4ccm_QueryFilter.idl
- */
-
-#ifndef DDS4CCM_QUERYFILTER_IDL3
-#define DDS4CCM_QUERYFILTER_IDL3
-
-#include "connectors/dds4ccm/idl/dds_rtf2_dcps.idl"
-
-module CCM_DDS
-{
-  struct QueryFilter {
-    string            expression;
-    ::DDS::StringSeq  parameters;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm_StateListenerControl.idl b/CIAO/connectors/dds4ccm/idl/dds4ccm_StateListenerControl.idl
deleted file mode 100644
index 521fbf8c70a..00000000000
--- a/CIAO/connectors/dds4ccm/idl/dds4ccm_StateListenerControl.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @file dds4ccm_StateListenerControl.idl
- */
-
-#ifndef DDS4CCM_STATELISTENERCONTROL_IDL
-#define DDS4CCM_STATELISTENERCONTROL_IDL
-
-#include "connectors/dds4ccm/idl/dds4ccm_DataListenerControl.idl"
-
-#pragma ciao lem "connectors/dds4ccm/idl/dds4ccm_StateListenerControlE.idl"
-
-module CCM_DDS
-{
-  local interface StateListenerControl : DataListenerControl {
-    attribute boolean is_filter_interpreted;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm_lem_stub.mpc b/CIAO/connectors/dds4ccm/idl/dds4ccm_lem_stub.mpc
deleted file mode 100644
index 25451e58bf9..00000000000
--- a/CIAO/connectors/dds4ccm/idl/dds4ccm_lem_stub.mpc
+++ /dev/null
@@ -1,68 +0,0 @@
-// -*- MPC -*-
-project (DDS4CCM_lem_gen) : install, dds4ccm, ciaoidldefaults {
-  custom_only = 1
-  after += DDS4CCM_idl_gen
-  idlflags += -I$(CIAO_ROOT)/connectors \
-              -Wb,stub_export_macro=DDS4CCM_LEM_STUB_Export \
-              -Wb,stub_export_include=dds4ccm_lem_stub_export.h -SS -Sci
-
-  IDL_Files {
-     idlflags += -Gxhst -Sci
-     dds_rtf2_dcpsE.idl
-  }
-
-  IDL_Files {
-     dds4ccm_BaseE.idl
-     dds4ccm_PortStatusListenerE.idl
-     dds4ccm_DataListenerControlE.idl
-     dds4ccm_ConnectorStatusListenerE.idl
-     dds4ccm_StateListenerControlE.idl
-     dds4ccm_ConnectorE.idl
-  }
-
-  specific {
-     install_dir = connectors/dds4ccm/idl
-  }
-}
-
-project (DDS4CCM_lem_stub) : install, dds4ccm, ccm_lem_stub, ccm_session_stub, \
-                            ciaolib_with_idl, ciao_output, taolib, valuetype, \
-                            ifr_client {
-  after += DDS4CCM_stub DDS4CCM_lem_gen CIAO_NDDS_lem_stub CIAO_OpenDDS_Dcps_lem_stub
-  libs  += DDS4CCM_stub
-  includes += $(CIAO_ROOT)/connectors
-  sharedname = DDS4CCM_lem_stub
-  dynamicflags += DDS4CCM_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-   dds4ccm_BaseEC.cpp
-   dds_rtf2_dcpsEC.cpp
-   dds4ccm_PortStatusListenerEC.cpp
-   dds4ccm_DataListenerControlEC.cpp
-   dds4ccm_ConnectorStatusListenerEC.cpp
-   dds4ccm_StateListenerControlEC.cpp
-   dds4ccm_ConnectorEC.cpp
-  }
-
-  Header_Files {
-   dds4ccm_BaseEC.h
-   dds_rtf2_dcpsEC.h
-   dds4ccm_PortStatusListenerEC.h
-   dds4ccm_DataListenerControlEC.h
-   dds4ccm_ConnectorStatusListenerEC.h
-   dds4ccm_StateListenerControlEC.h
-   dds4ccm_ConnectorEC.h
-   dds4ccm_lem_stub_export.h
-  }
-
-  Inline_Files {
-  }
-
-  specific {
-   install_dir = connectors/dds4ccm/idl
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm_skel.mpc b/CIAO/connectors/dds4ccm/idl/dds4ccm_skel.mpc
deleted file mode 100644
index 929fb16e33c..00000000000
--- a/CIAO/connectors/dds4ccm/idl/dds4ccm_skel.mpc
+++ /dev/null
@@ -1,48 +0,0 @@
-project (DDS4CCM_skel) : install, dds4ccm_lem_stub, ciaolib_with_idl, \
-                        ciao_output, taolib, portableserver, ciao_servant {
-  includes += $(CIAO_ROOT)/connectors
-
-  dynamicflags += DDS4CCM_SKEL_BUILD_DLL
-  IDL_Files {
-  }
-
-  Header_Files {
-    dds4ccm_skel_export.h
-    dds4ccm_EntityS.h
-    ccm_ddsS.h
-    dds4ccm_BaseS.h
-    dds4ccm_QueryFilterS.h
-    dds4ccm_PortStatusListenerS.h
-    dds4ccm_DataListenerControlS.h
-    dds4ccm_StateListenerControlS.h
-    dds4ccm_ConnectorStatusListenerS.h
-    dds4ccm_ConnectorS.h
-    dds_rtf2_dcpsS.h
-    dds4ccm_Base_svnt.h
-    dds4ccm_Connector_svnt.h
-    dds4ccm_Connector_svnt_T.h
-    dds4ccm_PortStatusListener_svnt.h
-    dds4ccm_DataListenerControl_svnt.h
-    dds4ccm_ConnectorStatusListener_svnt.h
-    dds4ccm_StateListenerControl_svnt.h
-  }
-
-  Source_Files {
-    dds4ccm_ConnectorS.cpp
-    dds4ccm_Connector_svnt.cpp
-  }
-
-  Inline_Files {
-  }
-
-  Template_Files {
-    dds4ccm_Connector_svnt_T.cpp
-  }
-
-  Inline_Files {
-  }
-
-  specific {
-    install_dir = connectors/dds4ccm/idl
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm_stub.mpc b/CIAO/connectors/dds4ccm/idl/dds4ccm_stub.mpc
deleted file mode 100644
index 051d64d5762..00000000000
--- a/CIAO/connectors/dds4ccm/idl/dds4ccm_stub.mpc
+++ /dev/null
@@ -1,89 +0,0 @@
-project (DDS4CCM_idl_gen) : install, dds4ccm, componentidldefaults {
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=DDS4CCM_STUB_Export \
-              -Wb,stub_export_include=dds4ccm_stub_export.h \
-              -Wb,skel_export_macro=DDS4CCM_SKEL_Export \
-              -Wb,skel_export_include=dds4ccm_skel_export.h \
-              -I$(CIAO_ROOT)/connectors
-
-  IDL_Files {
-    idlflags += -Gxhst -Gxhsk -SS -Ssvntc -Ssvntt -Sci
-    dds4ccm_Base.idl
-  }
-
-  IDL_Files {
-    idlflags -= -Gxhst -Gxhsk -Gsv -Glem
-    idlflags -= -St -Sa
-    idlflags += -SS -Sci
-    dds4ccm_QueryFilter.idl
-  }
-
-  IDL_Files {
-    idlflags -= -Gxhst -Gxhsk -Gsv -Glem
-    idlflags += -Sci -SS
-    dds4ccm_Entity.idl
-    ccm_dds.idl
-  }
-
-  IDL_Files {
-    idlflags -= -Gxhst -Gxhsk
-    dds4ccm_Connector.idl
-  }
-
-  IDL_Files {
-    idlflags -= -Gxhst -Gxhsk
-    idlflags += -Ssvntc -Ssvntt -SS -Sci
-    dds4ccm_ConnectorStatusListener.idl
-    dds4ccm_DataListenerControl.idl
-    dds4ccm_PortStatusListener.idl
-    dds4ccm_StateListenerControl.idl
-    dds_rtf2_dcps.idl
-  }
-
-  specific {
-    install_dir = connectors/dds4ccm/idl
-  }
-}
-
-project (DDS4CCM_stub) : install, dds4ccm, ccm_stub, ciaolib_with_idl, ciao_output, taolib {
-  after += DDS4CCM_idl_gen
-  includes += $(CIAO_ROOT)/connectors
-
-  dynamicflags += DDS4CCM_STUB_BUILD_DLL
-  IDL_Files {
-  }
-
-  Header_Files {
-    dds4ccm_stub_export.h
-    dds4ccm_EntityC.h
-    ccm_ddsC.h
-    dds4ccm_BaseC.h
-    dds4ccm_QueryFilterC.h
-    dds4ccm_PortStatusListenerC.h
-    dds4ccm_DataListenerControlC.h
-    dds4ccm_ConnectorStatusListenerC.h
-    dds4ccm_StateListenerControlC.h
-    dds4ccm_ConnectorC.h
-    dds_rtf2_dcpsC.h
-  }
-
-  Source_Files {
-    dds4ccm_BaseC.cpp
-    dds4ccm_QueryFilterC.cpp
-    dds4ccm_PortStatusListenerC.cpp
-    dds4ccm_DataListenerControlC.cpp
-    dds4ccm_ConnectorStatusListenerC.cpp
-    dds4ccm_StateListenerControlC.cpp
-    dds4ccm_ConnectorC.cpp
-    dds_rtf2_dcpsC.cpp
-  }
-
-  Inline_Files {
-    dds4ccm_ConnectorC.inl
-  }
-
-  specific {
-    install_dir = connectors/dds4ccm/idl
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl b/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl
deleted file mode 100644
index fe8ab421af0..00000000000
--- a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef DDS_RFT2_DCPS_IDL
-#define DDS_RFT2_DCPS_IDL
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "dds/DdsDcps.idl"
-#endif
-
-#if (CIAO_DDS4CCM_NDDS==1)
-# include "connectors/dds4ccm/idl/ndds/ndds_dcps.idl"
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps.idl b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps.idl
deleted file mode 100644
index 64e62203ec8..00000000000
--- a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps.idl
+++ /dev/null
@@ -1,1254 +0,0 @@
-#ifndef NDDS_DCPS_IDL
-#define NDDS_DCPS_IDL
-
-#pragma ciao lem "connectors/dds4ccm/idl/ndds/ndds_dcpsE.idl"
-
-# define DOMAINID_TYPE_NATIVE           long
-# define HANDLE_TYPE_NATIVE             long
-# define HANDLE_NIL_NATIVE              0
-# define BUILTIN_TOPIC_KEY_TYPE_NATIVE  long
-
-#define TheParticipantFactory
-#define PARTICIPANT_QOS_DEFAULT
-#define TOPIC_QOS_DEFAULT
-#define PUBLISHER_QOS_DEFAULT
-#define SUBSCRIBER_QOS_DEFAULT
-#define DATAWRITER_QOS_DEFAULT
-#define DATAREADER_QOS_DEFAULT
-#define DATAWRITER_QOS_USE_TOPIC_QOS
-#define DATAREADER_QOS_USE_TOPIC_QOS
-
-#include "tao/StringSeq.pidl"
-#include "connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handle.idl"
-
-module DDS {
-    typedef long DomainId_t;
-    typedef long long_3[3];
-
-    struct BuiltinTopicKey_t {
-        long_3 value;
-    };
-
-    typedef long ReturnCode_t;
-    typedef long QosPolicyId_t;
-    typedef sequence<string> StringSeq;
-
-    struct Duration_t {
-        long sec;
-        unsigned long nanosec;
-    };
-
-    struct Time_t {
-        long sec;
-        unsigned long nanosec;
-    };
-
-    // ----------------------------------------------------------------------
-    // Pre-defined values
-    // ----------------------------------------------------------------------
-    //const InstanceHandle_t HANDLE_NIL = 0;
-
-    const long LENGTH_UNLIMITED = -1;
-
-    const long            DURATION_INFINITE_SEC   = 0x7fffffff;
-    const unsigned long   DURATION_INFINITE_NSEC  = 0x7fffffff;
-
-    const long            DURATION_ZERO_SEC       = 0;
-    const unsigned long   DURATION_ZERO_NSEC      = 0;
-
-    const long            TIME_INVALID_SEC        = -1;
-    const unsigned long   TIME_INVALID_NSEC       = 0xffffffff;
-
-    // ----------------------------------------------------------------------
-    // Return codes
-    // ----------------------------------------------------------------------
-    const ReturnCode_t RETCODE_OK                    = 0;
-    const ReturnCode_t RETCODE_ERROR                 = 1;
-    const ReturnCode_t RETCODE_UNSUPPORTED           = 2;
-    const ReturnCode_t RETCODE_BAD_PARAMETER         = 3;
-    const ReturnCode_t RETCODE_PRECONDITION_NOT_MET  = 4;
-    const ReturnCode_t RETCODE_OUT_OF_RESOURCES      = 5;
-    const ReturnCode_t RETCODE_NOT_ENABLED           = 6;
-    const ReturnCode_t RETCODE_IMMUTABLE_POLICY      = 7;
-    const ReturnCode_t RETCODE_INCONSISTENT_POLICY   = 8;
-    const ReturnCode_t RETCODE_ALREADY_DELETED       = 9;
-    const ReturnCode_t RETCODE_TIMEOUT               = 10;
-    const ReturnCode_t RETCODE_NO_DATA               = 11;
-    const ReturnCode_t RETCODE_ILLEGAL_OPERATION     = 12;
-
-    // ----------------------------------------------------------------------
-    // Status to support listeners and conditions
-    // ----------------------------------------------------------------------
-
-    typedef unsigned long StatusKind;
-    typedef unsigned long StatusMask;    // bit-mask StatusKind
-
-    const StatusKind INCONSISTENT_TOPIC_STATUS                = 0x0001 << 0;
-    const StatusKind OFFERED_DEADLINE_MISSED_STATUS           = 0x0001 << 1;
-    const StatusKind REQUESTED_DEADLINE_MISSED_STATUS         = 0x0001 << 2;
-    const StatusKind OFFERED_INCOMPATIBLE_QOS_STATUS          = 0x0001 << 5;
-    const StatusKind REQUESTED_INCOMPATIBLE_QOS_STATUS        = 0x0001 << 6;
-    const StatusKind SAMPLE_LOST_STATUS                       = 0x0001 << 7;
-    const StatusKind SAMPLE_REJECTED_STATUS                   = 0x0001 << 8;
-    const StatusKind DATA_ON_READERS_STATUS                   = 0x0001 << 9;
-    const StatusKind DATA_AVAILABLE_STATUS                    = 0x0001 << 10;
-    const StatusKind LIVELINESS_LOST_STATUS                   = 0x0001 << 11;
-    const StatusKind LIVELINESS_CHANGED_STATUS                = 0x0001 << 12;
-    const StatusKind PUBLICATION_MATCHED_STATUS               = 0x0001 << 13;
-    const StatusKind SUBSCRIPTION_MATCHED_STATUS              = 0x0001 << 14;
-    const StatusKind RELIABLE_WRITER_CACHE_CHANGED_STATUS     = 0x00000001 << 24;
-    const StatusKind RELIABLE_READER_ACTIVITY_CHANGED_STATUS  = 0x00000001 << 25;
-
-    struct InconsistentTopicStatus {
-        long total_count;
-        long total_count_change;
-    };
-
-    struct SampleLostStatus {
-        long total_count;
-        long total_count_change;
-    };
-
-    enum SampleRejectedStatusKind {
-        NOT_REJECTED,
-        REJECTED_BY_INSTANCES_LIMIT,
-        REJECTED_BY_SAMPLES_LIMIT,
-        REJECTED_BY_SAMPLES_PER_INSTANCE_LIMIT,
-        REJECTED_BY_REMOTE_WRITERS_LIMIT, /* RTI Extension */
-        REJECTED_BY_REMOTE_WRITERS_PER_INSTANCE_LIMIT, /* RTI Extension */
-        REJECTED_BY_SAMPLES_PER_REMOTE_WRITER_LIMIT, /* RTI Extension */
-        REJECTED_BY_VIRTUAL_WRITERS_LIMIT, /* RTI DDS 5.0.0 Extension */
-        REJECTED_BY_REMOTE_WRITERS_PER_SAMPLE_LIMIT, /* RTI DDS 5.0.0 Extension */
-        REJECTED_BY_REMOTE_WRITER_SAMPLES_PER_VIRTUAL_QUEUE_LIMIT /* RTI DDS 5.0.0 Extension */
-    };
-
-    struct SampleRejectedStatus {
-        long                         total_count;
-        long                         total_count_change;
-        SampleRejectedStatusKind     last_reason;
-        InstanceHandle_t             last_instance_handle;
-    };
-
-    struct LivelinessLostStatus {
-        long                 total_count;
-        long                 total_count_change;
-    };
-
-    struct LivelinessChangedStatus {
-        long                 alive_count;
-        long                 not_alive_count;
-        long                 alive_count_change;
-        long                 not_alive_count_change;
-        InstanceHandle_t     last_publication_handle;
-    };
-
-    struct OfferedDeadlineMissedStatus {
-        long                 total_count;
-        long                 total_count_change;
-        InstanceHandle_t     last_instance_handle;
-    };
-
-    struct RequestedDeadlineMissedStatus {
-        long                 total_count;
-        long                 total_count_change;
-        InstanceHandle_t     last_instance_handle;
-    };
-
-    struct QosPolicyCount {
-        QosPolicyId_t        policy_id;
-        long                 count;
-    };
-
-    typedef sequence<QosPolicyCount> QosPolicyCountSeq;
-
-    struct OfferedIncompatibleQosStatus {
-        long                 total_count;
-        long                 total_count_change;
-        QosPolicyId_t        last_policy_id;
-        QosPolicyCountSeq    policies;
-    };
-
-    struct RequestedIncompatibleQosStatus {
-        long                 total_count;
-        long                 total_count_change;
-        QosPolicyId_t        last_policy_id;
-        QosPolicyCountSeq    policies;
-    };
-
-    struct PublicationMatchedStatus {
-        long                 total_count;
-        long                 total_count_change;
-        long                 current_count;
-        long                 current_count_change;
-        InstanceHandle_t     last_subscription_handle;
-    };
-
-    struct SubscriptionMatchedStatus {
-        long                 total_count;
-        long                 total_count_change;
-        long                 current_count;
-        long                 current_count_change;
-        InstanceHandle_t     last_publication_handle;
-    };
-
-    struct ReliableReaderActivityChangedStatus {
-        long                 active_count;
-        long                 inactive_count;
-        long                 active_count_change;
-        long                 inactive_count_change;
-        InstanceHandle_t     last_instance_handle;
-    };
-
-    struct ReliableWriterCacheEventCount {
-        long                 total_count;
-        long                 total_count_change;
-    };
-
-    struct ReliableWriterCacheChangedStatus {
-        ReliableWriterCacheEventCount       empty_reliable_writer_cache;
-        ReliableWriterCacheEventCount       full_reliable_writer_cache;
-        ReliableWriterCacheEventCount       low_watermark_reliable_writer_cache;
-        ReliableWriterCacheEventCount       high_watermark_reliable_writer_cache;
-        long                                unacknowledged_sample_count;
-        long                                unacknowledged_sample_count_peak;
-    };
-
-    enum TypeConsistencyKind {
-      DISALLOW_TYPE_COERCION,
-      ALLOW_TYPE_COERCION
-    };
-
-    struct TypeConsistencyEnforcementQosPolicy {
-      TypeConsistencyKind kind;
-    };
-
-    // ----------------------------------------------------------------------
-    // Listeners
-    // ----------------------------------------------------------------------
-
-    local interface Listener;
-    local interface Entity;
-    local interface TopicDescription;
-    local interface Topic;
-    local interface ContentFilteredTopic;
-    local interface MultiTopic;
-    local interface DataWriter;
-    local interface DataReader;
-    local interface Subscriber;
-    local interface Publisher;
-
-    typedef sequence<DataReader> DataReaderSeq;
-
-    local interface Listener {};
-
-    local interface TopicListener : Listener {
-        void on_inconsistent_topic(in Topic the_topic,
-            in InconsistentTopicStatus status);
-    };
-
-    local interface DataWriterListener : Listener {
-        void on_offered_deadline_missed(
-            in DataWriter writer,
-            in OfferedDeadlineMissedStatus status);
-        void on_offered_incompatible_qos(
-            in DataWriter writer,
-            in OfferedIncompatibleQosStatus status);
-        void on_liveliness_lost(
-            in DataWriter writer,
-            in LivelinessLostStatus status);
-        void on_publication_matched(
-            in DataWriter writer,
-            in PublicationMatchedStatus status);
-        void on_reliable_writer_cache_changed (
-            in DataWriter writer,
-            in ReliableWriterCacheChangedStatus status);
-        void on_reliable_reader_activity_changed (
-            in DataWriter writer,
-            in ReliableReaderActivityChangedStatus status);
-    };
-
-    local interface PublisherListener : DataWriterListener {
-    };
-
-    local interface DataReaderListener : Listener {
-        void on_requested_deadline_missed(
-            in DataReader the_reader,
-            in RequestedDeadlineMissedStatus status);
-        void on_requested_incompatible_qos(
-            in DataReader the_reader,
-            in RequestedIncompatibleQosStatus status);
-        void on_sample_rejected(
-            in DataReader the_reader,
-            in SampleRejectedStatus status);
-        void on_liveliness_changed(
-            in DataReader the_reader,
-            in LivelinessChangedStatus status);
-        void on_data_available(
-            in DataReader the_reader);
-        void on_subscription_matched(
-            in DataReader the_reader,
-            in SubscriptionMatchedStatus status);
-        void on_sample_lost(
-            in DataReader the_reader,
-            in SampleLostStatus status);
-    };
-
-    local interface SubscriberListener : DataReaderListener {
-        void on_data_on_readers(
-            in Subscriber the_subscriber);
-    };
-
-
-    local interface DomainParticipantListener : TopicListener,
-                                      PublisherListener,
-                                      SubscriberListener {
-    };
-
-
-    // ----------------------------------------------------------------------
-    // Conditions
-    // ----------------------------------------------------------------------
-
-    local interface Condition {
-        boolean get_trigger_value();
-    };
-
-    typedef sequence<Condition> ConditionSeq;
-
-    local interface WaitSet {
-        ReturnCode_t wait(
-            inout ConditionSeq active_conditions,
-            in Duration_t timeout);
-        ReturnCode_t attach_condition(
-            in Condition cond);
-        ReturnCode_t detach_condition(
-            in Condition cond);
-        ReturnCode_t get_conditions(
-            inout ConditionSeq attached_conditions);
-    };
-
-    local interface GuardCondition : Condition {
-        ReturnCode_t set_trigger_value(
-            in boolean value);
-    };
-
-    local interface StatusCondition : Condition {
-        StatusMask get_enabled_statuses();
-        ReturnCode_t set_enabled_statuses(
-            in StatusMask mask);
-        Entity get_entity();
-    };
-
-    /// Sample states to support reads
-    typedef unsigned long SampleStateKind;
-    const SampleStateKind READ_SAMPLE_STATE                     = 0x0001 << 0;
-    const SampleStateKind NOT_READ_SAMPLE_STATE                 = 0x0001 << 1;
-
-    /// This is a bit-mask SampleStateKind
-    typedef unsigned long SampleStateMask;
-    const SampleStateMask ANY_SAMPLE_STATE                      = 0xffff;
-
-    /// View states to support reads
-    typedef unsigned long ViewStateKind;
-    const ViewStateKind NEW_VIEW_STATE                          = 0x0001 << 0;
-    const ViewStateKind NOT_NEW_VIEW_STATE                      = 0x0001 << 1;
-
-    /// This is a bit-mask ViewStateKind
-    typedef unsigned long ViewStateMask;
-    const ViewStateMask ANY_VIEW_STATE                          = 0xffff;
-
-    /// Instance states to support reads
-    typedef unsigned long InstanceStateKind;
-    const InstanceStateKind ALIVE_INSTANCE_STATE                = 0x0001 << 0;
-    const InstanceStateKind NOT_ALIVE_DISPOSED_INSTANCE_STATE   = 0x0001 << 1;
-    const InstanceStateKind NOT_ALIVE_NO_WRITERS_INSTANCE_STATE = 0x0001 << 2;
-
-    /// This is a bit-mask InstanceStateKind
-    typedef unsigned long InstanceStateMask;
-    const InstanceStateMask ANY_INSTANCE_STATE                  = 0xffff;
-    const InstanceStateMask NOT_ALIVE_INSTANCE_STATE            = 0x006;
-
-    local interface ReadCondition : Condition {
-        SampleStateMask     get_sample_state_mask();
-        ViewStateMask       get_view_state_mask();
-        InstanceStateMask   get_instance_state_mask();
-        DataReader          get_datareader();
-    };
-
-    local interface QueryCondition : ReadCondition {
-        string         get_query_expression();
-        ReturnCode_t   get_query_parameters(
-            inout StringSeq query_parameters);
-        ReturnCode_t   set_query_parameters(
-            in StringSeq query_parameters);
-    };
-
-    // ----------------------------------------------------------------------
-    // Qos
-    // ----------------------------------------------------------------------
-    const string USERDATA_QOS_POLICY_NAME              = "UserData";
-    const string DURABILITY_QOS_POLICY_NAME            = "Durability";
-    const string PRESENTATION_QOS_POLICY_NAME          = "Presentation";
-    const string DEADLINE_QOS_POLICY_NAME              = "Deadline";
-    const string LATENCYBUDGET_QOS_POLICY_NAME         = "LatencyBudget";
-    const string OWNERSHIP_QOS_POLICY_NAME             = "Ownership";
-    const string OWNERSHIPSTRENGTH_QOS_POLICY_NAME     = "OwnershipStrength";
-    const string LIVELINESS_QOS_POLICY_NAME            = "Liveliness";
-    const string TIMEBASEDFILTER_QOS_POLICY_NAME       = "TimeBasedFilter";
-    const string PARTITION_QOS_POLICY_NAME             = "Partition";
-    const string RELIABILITY_QOS_POLICY_NAME           = "Reliability";
-    const string DESTINATIONORDER_QOS_POLICY_NAME      = "DestinationOrder";
-    const string HISTORY_QOS_POLICY_NAME               = "History";
-    const string RESOURCELIMITS_QOS_POLICY_NAME        = "ResourceLimits";
-    const string ENTITYFACTORY_QOS_POLICY_NAME         = "EntityFactory";
-    const string WRITERDATALIFECYCLE_QOS_POLICY_NAME   = "WriterDataLifecycle";
-    const string READERDATALIFECYCLE_QOS_POLICY_NAME   = "ReaderDataLifecycle";
-    const string TOPICDATA_QOS_POLICY_NAME             = "TopicData";
-    const string GROUPDATA_QOS_POLICY_NAME             = "TransportPriority";
-    const string LIFESPAN_QOS_POLICY_NAME              = "Lifespan";
-    const string DURABILITYSERVICE_POLICY_NAME         = "DurabilityService";
-
-    const QosPolicyId_t INVALID_QOS_POLICY_ID              = 0;
-    const QosPolicyId_t USERDATA_QOS_POLICY_ID             = 1;
-    const QosPolicyId_t DURABILITY_QOS_POLICY_ID           = 2;
-    const QosPolicyId_t PRESENTATION_QOS_POLICY_ID         = 3;
-    const QosPolicyId_t DEADLINE_QOS_POLICY_ID             = 4;
-    const QosPolicyId_t LATENCYBUDGET_QOS_POLICY_ID        = 5;
-    const QosPolicyId_t OWNERSHIP_QOS_POLICY_ID            = 6;
-    const QosPolicyId_t OWNERSHIPSTRENGTH_QOS_POLICY_ID    = 7;
-    const QosPolicyId_t LIVELINESS_QOS_POLICY_ID           = 8;
-    const QosPolicyId_t TIMEBASEDFILTER_QOS_POLICY_ID      = 9;
-    const QosPolicyId_t PARTITION_QOS_POLICY_ID            = 10;
-    const QosPolicyId_t RELIABILITY_QOS_POLICY_ID          = 11;
-    const QosPolicyId_t DESTINATIONORDER_QOS_POLICY_ID     = 12;
-    const QosPolicyId_t HISTORY_QOS_POLICY_ID              = 13;
-    const QosPolicyId_t RESOURCELIMITS_QOS_POLICY_ID       = 14;
-    const QosPolicyId_t ENTITYFACTORY_QOS_POLICY_ID        = 15;
-    const QosPolicyId_t WRITERDATALIFECYCLE_QOS_POLICY_ID  = 16;
-    const QosPolicyId_t READERDATALIFECYCLE_QOS_POLICY_ID  = 17;
-    const QosPolicyId_t TOPICDATA_QOS_POLICY_ID            = 18;
-    const QosPolicyId_t GROUPDATA_QOS_POLICY_ID            = 19;
-    const QosPolicyId_t TRANSPORTPRIORITY_QOS_POLICY_ID    = 20;
-    const QosPolicyId_t LIFESPAN_QOS_POLICY_ID             = 21;
-    const QosPolicyId_t DURABILITYSERVICE_QOS_POLICY_ID    = 22;
-    const QosPolicyId_t TYPE_CONSISTENCY_ENFORCEMENT_QOS_POLICY_ID = 24;
-
-    /* --- Extension QoS policies: --- */
-    const QosPolicyId_t WIREPROTOCOL_QOS_POLICY_ID      = 1000;
-    const QosPolicyId_t DISCOVERY_QOS_POLICY_ID      = 1001;
-    const QosPolicyId_t DATAREADERRESOURCELIMITS_QOS_POLICY_ID = 1003;
-    const QosPolicyId_t DATAWRITERRESOURCELIMITS_QOS_POLICY_ID = 1004;
-    const QosPolicyId_t DATAREADERPROTOCOL_QOS_POLICY_ID = 1005;
-    const QosPolicyId_t DATAWRITERPROTOCOL_QOS_POLICY_ID = 1006;
-    const QosPolicyId_t DOMAINPARTICIPANTRESOURCELIMITS_QOS_POLICY_ID = 1007;
-    const QosPolicyId_t EVENT_QOS_POLICY_ID = 1008;
-    const QosPolicyId_t DATABASE_QOS_POLICY_ID = 1009;
-    const QosPolicyId_t RECEIVERPOOL_QOS_POLICY_ID = 1010;
-    const QosPolicyId_t DISCOVERYCONFIG_QOS_POLICY_ID = 1011;
-    const QosPolicyId_t EXCLUSIVEAREA_QOS_POLICY_ID = 1012;
-    const QosPolicyId_t USEROBJECT_QOS_POLICY_ID = 1013;
-    const QosPolicyId_t SYSTEMRESOURCELIMITS_QOS_POLICY_ID = 1014;
-    const QosPolicyId_t TRANSPORTSELECTION_QOS_POLICY_ID = 1015;
-    const QosPolicyId_t TRANSPORTUNICAST_QOS_POLICY_ID = 1016;
-    const QosPolicyId_t TRANSPORTMULTICAST_QOS_POLICY_ID = 1017;
-    const QosPolicyId_t TRANSPORTBUILTIN_QOS_POLICY_ID = 1018;
-    const QosPolicyId_t TYPESUPPORT_QOS_POLICY_ID = 1019;
-    const QosPolicyId_t PROPERTY_QOS_POLICY_ID = 1020;
-    const QosPolicyId_t PUBLISHMODE_QOS_POLICY_ID = 1021;
-    const QosPolicyId_t ASYNCHRONOUSPUBLISHER_QOS_POLICY_ID = 1022;
-    const QosPolicyId_t ENTITYNAME_QOS_POLICY_ID = 1023;
-    const QosPolicyId_t SERVICE_QOS_POLICY_ID = 1025;
-    const QosPolicyId_t BATCH_QOS_POLICY_ID = 1026;
-    const QosPolicyId_t PROFILE_QOS_POLICY_ID = 1027;
-    const QosPolicyId_t LOCATORFILTER_QOS_POLICY_ID = 1028;
-    const QosPolicyId_t MULTICHANNEL_QOS_POLICY_ID = 1029;
-    const QosPolicyId_t TRANSPORTENCAPSULATION_QOS_POLICY_ID = 1030;
-    const QosPolicyId_t PUBLISHERPROTOCOL_QOS_POLICY_ID = 1031;
-    const QosPolicyId_t SUBSCRIBERPROTOCOL_QOS_POLICY_ID = 1032;
-    const QosPolicyId_t TOPICPROTOCOL_QOS_POLICY_ID = 1033;
-    const QosPolicyId_t DOMAINPARTICIPANTPROTOCOL_QOS_POLICY_ID = 1034;
-    const QosPolicyId_t AVAILABILITY_QOS_POLICY_ID = 1035;
-    const QosPolicyId_t TRANSPORTMULTICASTMAPPING_QOS_POLICY_ID = 1036;
-    const QosPolicyId_t LOGGING_QOS_POLICY_ID = 1037;
-
-    typedef sequence<octet> OctetSeq;
-    struct UserDataQosPolicy {
-        OctetSeq value;
-    };
-
-    struct TopicDataQosPolicy {
-        OctetSeq value;
-    };
-
-    struct GroupDataQosPolicy {
-        OctetSeq value;
-    };
-
-    struct TransportPriorityQosPolicy {
-        long value;
-    };
-
-    struct LifespanQosPolicy {
-        Duration_t duration;
-    };
-
-    enum DurabilityQosPolicyKind {
-        VOLATILE_DURABILITY_QOS,
-        TRANSIENT_LOCAL_DURABILITY_QOS,
-        TRANSIENT_DURABILITY_QOS,
-        PERSISTENT_DURABILITY_QOS
-    };
-    struct DurabilityQosPolicy {
-        DurabilityQosPolicyKind kind;
-    };
-
-    enum PresentationQosPolicyAccessScopeKind {
-        INSTANCE_PRESENTATION_QOS,
-        TOPIC_PRESENTATION_QOS,
-        GROUP_PRESENTATION_QOS,
-        HIGHEST_OFFERED_PRESENTATION_QOS /* RTI DDS 5.0.0 Extension */
-    };
-    struct PresentationQosPolicy {
-        PresentationQosPolicyAccessScopeKind access_scope;
-        boolean coherent_access;
-        boolean ordered_access;
-    };
-
-    struct DeadlineQosPolicy {
-        Duration_t period;
-    };
-
-    struct LatencyBudgetQosPolicy {
-        Duration_t duration;
-    };
-
-    enum OwnershipQosPolicyKind {
-        SHARED_OWNERSHIP_QOS,
-        EXCLUSIVE_OWNERSHIP_QOS
-    };
-    struct OwnershipQosPolicy {
-        OwnershipQosPolicyKind kind;
-    };
-
-    struct OwnershipStrengthQosPolicy {
-        long value;
-    };
-
-    enum LivelinessQosPolicyKind {
-        AUTOMATIC_LIVELINESS_QOS,
-        MANUAL_BY_PARTICIPANT_LIVELINESS_QOS,
-        MANUAL_BY_TOPIC_LIVELINESS_QOS
-    };
-
-    struct LivelinessQosPolicy {
-        LivelinessQosPolicyKind kind;
-        Duration_t lease_duration;
-    };
-
-    struct TimeBasedFilterQosPolicy {
-        Duration_t minimum_separation;
-    };
-
-    struct PartitionQosPolicy {
-        StringSeq name;
-    };
-
-    enum ReliabilityQosPolicyKind {
-        BEST_EFFORT_RELIABILITY_QOS,
-        RELIABLE_RELIABILITY_QOS
-    };
-
-    struct ReliabilityQosPolicy {
-        ReliabilityQosPolicyKind kind;
-        Duration_t max_blocking_time;
-    };
-
-    enum DestinationOrderQosPolicyKind {
-        BY_RECEPTION_TIMESTAMP_DESTINATIONORDER_QOS,
-        BY_SOURCE_TIMESTAMP_DESTINATIONORDER_QOS
-    };
-
-    enum DestinationOrderQosPolicyScopeKind {
-        INSTANCE_SCOPE_DESTINATIONORDER_QOS,
-        TOPIC_SCOPE_DESTINATIONORDER_QOS
-    };
-
-    enum DataWriterResourceLimitsInstanceReplacementKind {
-      UNREGISTERED_INSTANCE_REPLACEMENT,
-      ALIVE_INSTANCE_REPLACEMENT,
-      DISPOSED_INSTANCE_REPLACEMENT,
-      ALIVE_THEN_DISPOSED_INSTANCE_REPLACEMENT,
-      DISPOSED_THEN_ALIVE_INSTANCE_REPLACEMENT,
-      ALIVE_OR_DISPOSED_INSTANCE_REPLACEMENT
-    };
-
-    struct DestinationOrderQosPolicy {
-        DestinationOrderQosPolicyKind kind;
-        DestinationOrderQosPolicyScopeKind scope;
-        Duration_t source_timestamp_tolerance;
-    };
-
-    enum HistoryQosPolicyKind {
-        KEEP_LAST_HISTORY_QOS,
-        KEEP_ALL_HISTORY_QOS
-    };
-
-    enum RefilterQosPolicyKind {
-        NONE_REFILTER_QOS,
-        ALL_REFILTER_QOS,
-        ON_DEMAND_REFILTER_QOS
-    };
-
-    struct HistoryQosPolicy {
-        HistoryQosPolicyKind kind;
-        long depth;
-        RefilterQosPolicyKind refilter;
-    };
-
-    struct ResourceLimitsQosPolicy {
-        long max_samples;
-        long max_instances;
-        long max_samples_per_instance;
-        long initial_samples;
-        long initial_instances;
-        long instance_hash_buckets;
-    };
-
-    struct EntityFactoryQosPolicy {
-        boolean autoenable_created_entities;
-    };
-
-    struct WriterDataLifecycleQosPolicy {
-        boolean autodispose_unregistered_instances;
-    };
-
-    struct DataReaderResourceLimitsQosPolicy {
-      long max_remote_writers;
-      long max_remote_writers_per_instance;
-      long max_samples_per_remote_writer;
-      long max_infos;
-      long initial_remote_writers;
-      long initial_remote_writers_per_instance;
-      long initial_infos;
-      long initial_outstanding_reads;
-      long max_outstanding_reads;
-      long max_samples_per_read;
-      boolean disable_fragmentation_support;
-      long max_fragmented_samples;
-      long initial_fragmented_samples;
-      long max_fragmented_samples_per_remote_writer;
-      long max_fragments_per_sample;
-      boolean dynamically_allocate_fragmented_samples;
-      long max_total_instances;
-      long max_remote_virtual_writers_per_instance;
-      long initial_remote_virtual_writers_per_instance;
-      long max_query_condition_filters;
-    };
-
-    struct DataWriterResourceLimitsQosPolicy {
-      long initial_concurrent_blocking_threads;
-      long max_concurrent_blocking_threads;
-      long max_remote_reader_filters;
-      long initial_batches;
-      long max_batches;
-      long cookie_max_length;
-      DataWriterResourceLimitsInstanceReplacementKind instance_replacement;
-      boolean replace_empty_instances;
-      boolean autoregister_instances;
-    };
-
-    struct ReaderDataLifecycleQosPolicy {
-        Duration_t autopurge_nowriter_samples_delay;
-        Duration_t autopurge_disposed_samples_delay;
-    };
-
-    struct DurabilityServiceQosPolicy {
-        Duration_t              service_cleanup_delay;
-        HistoryQosPolicyKind    history_kind;
-        long                    history_depth;
-        long                    max_samples;
-        long                    max_instances;
-        long                    max_samples_per_instance;
-    };
-
-    struct DomainParticipantFactoryQos {
-        EntityFactoryQosPolicy entity_factory;
-    };
-
-    struct DomainParticipantQos {
-        UserDataQosPolicy  user_data;
-        EntityFactoryQosPolicy entity_factory;
-    };
-
-    struct TopicQos {
-        TopicDataQosPolicy                   topic_data;
-        DurabilityQosPolicy                  durability;
-        DurabilityServiceQosPolicy           durability_service;
-        DeadlineQosPolicy                    deadline;
-        LatencyBudgetQosPolicy               latency_budget;
-        LivelinessQosPolicy                  liveliness;
-        ReliabilityQosPolicy                 reliability;
-        DestinationOrderQosPolicy            destination_order;
-        HistoryQosPolicy                     history;
-        ResourceLimitsQosPolicy              resource_limits;
-        TransportPriorityQosPolicy           transport_priority;
-        LifespanQosPolicy                    lifespan;
-
-        OwnershipQosPolicy                   ownership;
-    };
-
-    struct DataWriterQos {
-        DurabilityQosPolicy                  durability;
-        DurabilityServiceQosPolicy           durability_service;
-        DeadlineQosPolicy                    deadline;
-        LatencyBudgetQosPolicy               latency_budget;
-        LivelinessQosPolicy                  liveliness;
-        ReliabilityQosPolicy                 reliability;
-        DestinationOrderQosPolicy            destination_order;
-        HistoryQosPolicy                     history;
-        ResourceLimitsQosPolicy              resource_limits;
-        TransportPriorityQosPolicy           transport_priority;
-        LifespanQosPolicy                    lifespan;
-
-        UserDataQosPolicy                    user_data;
-        OwnershipQosPolicy                   ownership;
-        OwnershipStrengthQosPolicy           ownership_strength;
-        WriterDataLifecycleQosPolicy         writer_data_lifecycle;
-
-        DataWriterResourceLimitsQosPolicy    writer_resource_limits;
-    };
-
-    struct PublisherQos {
-        PresentationQosPolicy                presentation;
-        PartitionQosPolicy                   partition;
-        GroupDataQosPolicy                   group_data;
-        EntityFactoryQosPolicy               entity_factory;
-    };
-
-    struct DataReaderQos {
-        DurabilityQosPolicy                  durability;
-        DeadlineQosPolicy                    deadline;
-        LatencyBudgetQosPolicy               latency_budget;
-        LivelinessQosPolicy                  liveliness;
-        ReliabilityQosPolicy                 reliability;
-        DestinationOrderQosPolicy            destination_order;
-        HistoryQosPolicy                     history;
-        ResourceLimitsQosPolicy              resource_limits;
-
-        UserDataQosPolicy                    user_data;
-        OwnershipQosPolicy                   ownership;
-        TimeBasedFilterQosPolicy             time_based_filter;
-        ReaderDataLifecycleQosPolicy         reader_data_lifecycle;
-
-        DataReaderResourceLimitsQosPolicy    reader_resource_limits;
-
-        TypeConsistencyEnforcementQosPolicy  type_consistency;
-    };
-
-    struct SubscriberQos {
-        PresentationQosPolicy                presentation;
-        PartitionQosPolicy                   partition;
-        GroupDataQosPolicy                   group_data;
-        EntityFactoryQosPolicy               entity_factory;
-    };
-
-    // ----------------------------------------------------------------------
-
-    struct ParticipantBuiltinTopicData {
-        BuiltinTopicKey_t                    key;
-        UserDataQosPolicy                    user_data;
-    };
-
-    struct TopicBuiltinTopicData {
-        BuiltinTopicKey_t                    key;
-        string                               name;
-        string                               type_name;
-        DurabilityQosPolicy                  durability;
-        DurabilityServiceQosPolicy           durability_service;
-        DeadlineQosPolicy                    deadline;
-        LatencyBudgetQosPolicy               latency_budget;
-        LivelinessQosPolicy                  liveliness;
-        ReliabilityQosPolicy                 reliability;
-        TransportPriorityQosPolicy           transport_priority;
-        LifespanQosPolicy                    lifespan;
-        DestinationOrderQosPolicy            destination_order;
-        HistoryQosPolicy                     history;
-        ResourceLimitsQosPolicy              resource_limits;
-        OwnershipQosPolicy                   ownership;
-        TopicDataQosPolicy                   topic_data;
-    };
-
-    struct PublicationBuiltinTopicData {
-        BuiltinTopicKey_t                    key;
-        BuiltinTopicKey_t                    participant_key;
-        string                               topic_name;
-        string                               type_name;
-
-        DurabilityQosPolicy                  durability;
-        DurabilityServiceQosPolicy           durability_service;
-        DeadlineQosPolicy                    deadline;
-        LatencyBudgetQosPolicy               latency_budget;
-        LivelinessQosPolicy                  liveliness;
-        ReliabilityQosPolicy                 reliability;
-        LifespanQosPolicy                    lifespan;
-        UserDataQosPolicy                    user_data;
-        OwnershipQosPolicy                   ownership;
-        OwnershipStrengthQosPolicy           ownership_strength;
-        DestinationOrderQosPolicy            destination_order;
-
-        PresentationQosPolicy                presentation;
-        PartitionQosPolicy                   partition;
-        TopicDataQosPolicy                   topic_data;
-        GroupDataQosPolicy                   group_data;
-    };
-
-    struct SubscriptionBuiltinTopicData {
-        BuiltinTopicKey_t                    key;
-        BuiltinTopicKey_t                    participant_key;
-        string                               topic_name;
-        string                               type_name;
-
-        DurabilityQosPolicy                  durability;
-        DeadlineQosPolicy                    deadline;
-        LatencyBudgetQosPolicy               latency_budget;
-        LivelinessQosPolicy                  liveliness;
-        ReliabilityQosPolicy                 reliability;
-        OwnershipQosPolicy                   ownership;
-        DestinationOrderQosPolicy            destination_order;
-        UserDataQosPolicy                    user_data;
-        TimeBasedFilterQosPolicy             time_based_filter;
-
-        PresentationQosPolicy                presentation;
-        PartitionQosPolicy                   partition;
-        TopicDataQosPolicy                   topic_data;
-        GroupDataQosPolicy                   group_data;
-    };
-
-    // ----------------------------------------------------------------------
-    local interface Entity {
-    //  ReturnCode_t set_qos(
-    //      in EntityQos qos);
-    //  ReturnCode_t get_qos(
-    //      inout EntityQos qos);
-    //  ReturnCode_t set_listener(
-    //      in Listener l,
-    //      in StatusMask mask);
-    //  Listener get_listener();
-
-        ReturnCode_t enable();
-
-        StatusCondition get_statuscondition();
-
-        StatusMask get_status_changes();
-
-        InstanceHandle_t get_instance_handle();
-    };
-
-    // ----------------------------------------------------------------------
-    local interface DomainParticipant : Entity {
-        // Factory interfaces
-        Publisher create_publisher(
-            in PublisherQos qos,
-            in PublisherListener a_listener,
-            in StatusMask mask);
-        Publisher create_publisher_with_profile(
-            in string qos_profile,
-            in PublisherListener a_listener,
-            in StatusMask mask);
-        ReturnCode_t delete_publisher(
-            in Publisher p);
-
-        Subscriber create_subscriber(
-            in SubscriberQos qos,
-            in SubscriberListener a_listener,
-            in StatusMask mask);
-        Subscriber create_subscriber_with_profile(
-            in string qos_profile,
-            in SubscriberListener a_listener,
-            in StatusMask mask);
-        ReturnCode_t delete_subscriber(
-            in Subscriber s);
-        Subscriber get_builtin_subscriber();
-
-        Topic create_topic(
-            in string topic_name,
-            in string type_name,
-            in TopicQos qos,
-            in TopicListener a_listener,
-            in StatusMask mask);
-        Topic create_topic_with_profile(
-            in string topic_name,
-            in string type_name,
-            in string qos_profile,
-            in TopicListener a_listener,
-            in StatusMask mask);
-
-        ReturnCode_t delete_topic(
-            in Topic a_topic);
-
-        Topic find_topic(
-            in string topic_name,
-            in Duration_t timeout);
-        TopicDescription lookup_topicdescription(
-            in string name);
-
-        ContentFilteredTopic create_contentfilteredtopic(
-            in string name,
-            in Topic related_topic,
-            in string filter_expression,
-            in StringSeq expression_parameters);
-
-        ReturnCode_t delete_contentfilteredtopic(
-            in ContentFilteredTopic a_contentfilteredtopic);
-
-        MultiTopic create_multitopic(
-            in string name,
-            in string type_name,
-            in string subscription_expression,
-            in StringSeq expression_parameters);
-
-        ReturnCode_t delete_multitopic(
-            in MultiTopic a_multitopic);
-
-        ReturnCode_t delete_contained_entities();
-
-        ReturnCode_t set_qos(
-            in DomainParticipantQos qos);
-        ReturnCode_t get_qos(
-            inout DomainParticipantQos qos);
-
-        ReturnCode_t set_listener(
-            in DomainParticipantListener a_listener,
-            in StatusMask mask);
-        DomainParticipantListener get_listener();
-
-        ReturnCode_t ignore_participant(
-            in InstanceHandle_t handle);
-        ReturnCode_t ignore_topic(
-            in InstanceHandle_t handle);
-        ReturnCode_t ignore_publication(
-            in InstanceHandle_t handle);
-        ReturnCode_t ignore_subscription(
-            in InstanceHandle_t handle);
-
-        DomainId_t get_domain_id();
-        ReturnCode_t assert_liveliness();
-
-        ReturnCode_t set_default_publisher_qos(
-            in PublisherQos qos);
-        ReturnCode_t get_default_publisher_qos(
-            inout PublisherQos qos);
-
-        ReturnCode_t set_default_subscriber_qos(
-            in SubscriberQos qos);
-        ReturnCode_t get_default_subscriber_qos(
-            inout SubscriberQos qos);
-
-        ReturnCode_t set_default_topic_qos(
-            in TopicQos qos);
-        ReturnCode_t get_default_topic_qos(
-            inout TopicQos qos);
-
-        ReturnCode_t get_discovered_participants(
-            inout InstanceHandleSeq participant_handles);
-        ReturnCode_t get_discovered_participant_data(
-            inout ParticipantBuiltinTopicData participant_data,
-            in InstanceHandle_t participant_handle);
-
-        ReturnCode_t get_discovered_topics(
-            inout InstanceHandleSeq topic_handles);
-        ReturnCode_t get_discovered_topic_data(
-            inout TopicBuiltinTopicData topic_data,
-            in InstanceHandle_t topic_handle);
-
-        boolean contains_entity(
-            in InstanceHandle_t a_handle);
-
-        ReturnCode_t get_current_time(
-            inout Time_t current_time);
-    };
-
-    local interface DomainParticipantFactory {
-        DomainParticipant create_participant(
-            in DomainId_t domain_id,
-            in DomainParticipantQos qos,
-            in DomainParticipantListener a_listener,
-            in StatusMask mask);
-        DomainParticipant create_participant_with_profile(
-            in DomainId_t domain_id,
-            in string qos_profile,
-            in DomainParticipantListener a_listener,
-            in StatusMask mask);
-        ReturnCode_t delete_participant(
-            in DomainParticipant a_participant);
-
-        DomainParticipant lookup_participant(
-            in DomainId_t domain_id);
-
-        ReturnCode_t set_default_participant_qos(
-            in DomainParticipantQos qos);
-        ReturnCode_t set_default_participant_qos_with_profile(
-            in string qos_profile);
-        ReturnCode_t get_default_participant_qos(
-            inout DomainParticipantQos qos);
-
-        ReturnCode_t set_qos(
-            in DomainParticipantFactoryQos qos);
-        ReturnCode_t get_qos(
-            inout DomainParticipantFactoryQos qos);
-    };
-
-    local interface TypeSupport {
-         ReturnCode_t register_type(
-             in DomainParticipant domain,
-             in string type_name);
-         string get_type_name();
-    };
-
-    // ----------------------------------------------------------------------
-    local interface TopicDescription {
-        string get_type_name();
-        string get_name();
-
-        DomainParticipant get_participant();
-    };
-
-    local interface Topic : Entity, TopicDescription {
-        ReturnCode_t set_qos(
-            in TopicQos qos);
-        ReturnCode_t get_qos(
-            inout TopicQos qos);
-        ReturnCode_t set_listener(
-            in TopicListener a_listener,
-            in StatusMask mask);
-        TopicListener get_listener();
-        // Access the status
-        ReturnCode_t get_inconsistent_topic_status(
-            inout InconsistentTopicStatus a_status);
-    };
-
-    local interface ContentFilteredTopic : TopicDescription {
-        string get_filter_expression();
-        ReturnCode_t get_expression_parameters(
-            inout StringSeq expression_parameters);
-        ReturnCode_t set_expression_parameters(
-            in StringSeq expression_parameters);
-        Topic get_related_topic();
-    };
-
-    local interface MultiTopic : TopicDescription {
-        string get_subscription_expression();
-        ReturnCode_t get_expression_parameters(
-            inout StringSeq expression_parameters);
-        ReturnCode_t set_expression_parameters(
-            in StringSeq expression_parameters);
-    };
-
-    // ----------------------------------------------------------------------
-    local interface Publisher : Entity {
-        DataWriter create_datawriter(
-            in Topic a_topic,
-            in DataWriterQos qos,
-            in DataWriterListener a_listener,
-            in StatusMask mask);
-        DataWriter create_datawriter_with_profile(
-            in Topic a_topic,
-            in string qos_profile,
-            in DataWriterListener a_listener,
-            in StatusMask mask);
-        ReturnCode_t delete_datawriter(
-            in DataWriter a_datawriter);
-        DataWriter lookup_datawriter(
-            in string topic_name);
-
-        ReturnCode_t delete_contained_entities();
-
-        ReturnCode_t set_qos(
-            in PublisherQos qos);
-        ReturnCode_t get_qos(
-            inout PublisherQos qos);
-
-        ReturnCode_t set_listener(
-            in PublisherListener a_listener,
-            in StatusMask mask);
-        PublisherListener get_listener();
-
-        ReturnCode_t suspend_publications();
-        ReturnCode_t resume_publications();
-
-        ReturnCode_t begin_coherent_changes();
-        ReturnCode_t end_coherent_changes();
-
-        ReturnCode_t wait_for_acknowledgments(
-            in Duration_t max_wait);
-
-        DomainParticipant get_participant();
-
-        ReturnCode_t set_default_datawriter_qos(
-            in DataWriterQos qos);
-        ReturnCode_t get_default_datawriter_qos(
-            inout DataWriterQos qos);
-
-        ReturnCode_t copy_from_topic_qos(
-            inout DataWriterQos a_datawriter_qos,
-            in TopicQos a_topic_qos);
-    };
-
-    local interface DataWriter : Entity {
-        ReturnCode_t set_qos(
-            in DataWriterQos qos);
-        ReturnCode_t get_qos(
-            inout DataWriterQos qos);
-
-        ReturnCode_t set_listener(
-            in DataWriterListener a_listener,
-            in StatusMask mask);
-        DataWriterListener get_listener();
-
-        Topic get_topic();
-        Publisher get_publisher();
-
-        ReturnCode_t wait_for_acknowledgments(
-            in Duration_t max_wait);
-
-        // Access the status
-        ReturnCode_t get_liveliness_lost_status(
-            inout LivelinessLostStatus status);
-        ReturnCode_t get_offered_deadline_missed_status(
-            inout OfferedDeadlineMissedStatus status);
-        ReturnCode_t get_offered_incompatible_qos_status(
-            inout OfferedIncompatibleQosStatus status);
-        ReturnCode_t get_publication_matched_status(
-            inout PublicationMatchedStatus status);
-
-        ReturnCode_t assert_liveliness();
-
-        ReturnCode_t get_matched_subscriptions(
-            inout InstanceHandleSeq subscription_handles);
-        ReturnCode_t get_matched_subscription_data(
-            inout SubscriptionBuiltinTopicData subscription_data,
-            in InstanceHandle_t subscription_handle);
-    };
-
-    // ----------------------------------------------------------------------
-    local interface Subscriber : Entity {
-        DataReader create_datareader(
-            in TopicDescription a_topic,
-            in DataReaderQos qos,
-            in DataReaderListener a_listener,
-            in StatusMask mask);
-        DataReader create_datareader_with_profile(
-            in TopicDescription a_topic,
-            in string qos_profile,
-            in DataReaderListener a_listener,
-            in StatusMask mask);
-        ReturnCode_t delete_datareader(
-            in DataReader a_datareader);
-        ReturnCode_t delete_contained_entities();
-        DataReader lookup_datareader(
-            in string topic_name);
-        ReturnCode_t get_datareaders(
-            inout DataReaderSeq readers,
-            in SampleStateMask sample_states,
-            in ViewStateMask view_states,
-            in InstanceStateMask instance_states);
-        ReturnCode_t notify_datareaders();
-
-        ReturnCode_t set_qos(
-            in SubscriberQos qos);
-        ReturnCode_t get_qos(
-            inout SubscriberQos qos);
-
-        ReturnCode_t set_listener(
-            in SubscriberListener a_listener,
-            in StatusMask mask);
-        SubscriberListener get_listener();
-
-        ReturnCode_t begin_access();
-        ReturnCode_t end_access();
-
-        DomainParticipant get_participant();
-
-        ReturnCode_t set_default_datareader_qos(
-            in DataReaderQos qos);
-        ReturnCode_t get_default_datareader_qos(
-            inout DataReaderQos qos);
-
-        ReturnCode_t copy_from_topic_qos(
-            inout DataReaderQos a_datareader_qos,
-            in TopicQos a_topic_qos);
-    };
-
-    local interface DataReader : Entity {
-        ReadCondition create_readcondition(
-            in SampleStateMask sample_states,
-            in ViewStateMask view_states,
-            in InstanceStateMask instance_states);
-
-        QueryCondition create_querycondition(
-            in SampleStateMask sample_states,
-            in ViewStateMask view_states,
-            in InstanceStateMask instance_states,
-            in string query_expression,
-            in StringSeq query_parameters);
-
-        ReturnCode_t delete_readcondition(
-            in ReadCondition a_condition);
-
-        ReturnCode_t delete_contained_entities();
-
-        ReturnCode_t set_qos(
-            in DataReaderQos qos);
-        ReturnCode_t get_qos(
-            inout DataReaderQos qos);
-
-        ReturnCode_t set_listener(
-            in DataReaderListener a_listener,
-            in StatusMask mask);
-        DataReaderListener get_listener();
-
-        TopicDescription get_topicdescription();
-        Subscriber get_subscriber();
-
-        ReturnCode_t get_sample_rejected_status(
-            inout SampleRejectedStatus status);
-        ReturnCode_t get_liveliness_changed_status(
-            inout LivelinessChangedStatus status);
-        ReturnCode_t get_requested_deadline_missed_status(
-            inout RequestedDeadlineMissedStatus status);
-        ReturnCode_t get_requested_incompatible_qos_status(
-            inout RequestedIncompatibleQosStatus status);
-        ReturnCode_t get_subscription_matched_status(
-            inout SubscriptionMatchedStatus status);
-        ReturnCode_t get_sample_lost_status(
-            inout SampleLostStatus status);
-
-        ReturnCode_t wait_for_historical_data(
-            in Duration_t max_wait);
-
-        ReturnCode_t get_matched_publications(
-            inout InstanceHandleSeq publication_handles);
-        ReturnCode_t get_matched_publication_data(
-            inout PublicationBuiltinTopicData publication_data,
-            in InstanceHandle_t publication_handle);
-    };
-
-    struct SampleInfo {
-        SampleStateKind      sample_state;
-        ViewStateKind        view_state;
-        InstanceStateKind    instance_state;
-        Time_t               source_timestamp;
-        InstanceHandle_t     instance_handle;
-        InstanceHandle_t     publication_handle;
-        long                 disposed_generation_count;
-        long                 no_writers_generation_count;
-        long                 sample_rank;
-        long                 generation_rank;
-        long                 absolute_generation_rank;
-        boolean              valid_data;
-    };
-
-    typedef sequence<SampleInfo> SampleInfoSeq;
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_i_handle.idl b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_i_handle.idl
deleted file mode 100644
index e165e42216e..00000000000
--- a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_i_handle.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef NDDS_DCPS_IDL_I
-#define NDDS_DCPS_IDL_I
-
-#pragma ciao lem "connectors/dds4ccm/idl/ndds/ndds_dcps_i_handleE.idl"
-
-module DDS {
-    typedef octet octet_value[16];
-    struct NativeInstanceHandle_t {
-        octet_value value;
-        unsigned long length;
-        unsigned long isValid;
-    };
-    typedef NativeInstanceHandle_t InstanceHandle_t;
-
-    typedef sequence<InstanceHandle_t> InstanceHandleSeq;
-};
-
-#endif
-
diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handle.idl b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handle.idl
deleted file mode 100644
index 2ca3586e6fe..00000000000
--- a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handle.idl
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef NDDS_DCPS_INSTANCE_HANDLE_IDL
-#define NDDS_DCPS_INSTANCE_HANDLE_IDL
-
-#include "connectors/dds4ccm/idl/ndds/ndds_dcps_i_handle.idl"
-
-module DDS {
-    native HANDLE_NIL;
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleC.cpp b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleC.cpp
deleted file mode 100644
index 51322d79dbf..00000000000
--- a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleC.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-// -*- C++ -*-
-#include "ndds_dcps_instance_handleC.h"
-
-static ::DDS::InstanceHandle_t S_HANDLE = { {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 16, 0};
-
-namespace DDS
-{
-  ::DDS::InstanceHandle_t const HANDLE_NIL = S_HANDLE;
-}
-
-
-bool
-operator== (const ::DDS::InstanceHandle_t & instancehandle1, const ::DDS::InstanceHandle_t & instancehandle2)
-{
-  DDS_InstanceHandle_t i1 = DDS_HANDLE_NIL;
-  DDS_InstanceHandle_t i2 = DDS_HANDLE_NIL;
-  i1 <<= instancehandle1;
-  i2 <<= instancehandle2;
-  if (DDS_InstanceHandle_is_nil(&instancehandle1))
-    {
-      return DDS_InstanceHandle_is_nil (&instancehandle2);
-    }
-  else if (DDS_InstanceHandle_is_nil(&instancehandle2))
-    {
-      return DDS_InstanceHandle_is_nil (&instancehandle1);
-    }
-  else
-    {
-      return DDS_InstanceHandle_equals (&i1, &i2);
-    }
-}
-
-bool
-operator!= (const ::DDS::InstanceHandle_t & instancehandle1, const ::DDS::InstanceHandle_t & instancehandle2)
-{
-  return !operator== (instancehandle1, instancehandle2);
-}
-
-void
-operator<<= (::DDS::InstanceHandle_t &ddsinstancehandle, const ::DDS_InstanceHandle_t & instancehandle)
-{
-  if (DDS_InstanceHandle_is_nil (&instancehandle))
-    {
-      ddsinstancehandle = DDS::HANDLE_NIL;
-    }
-  else
-    {
-      ACE_OS::memcpy (ddsinstancehandle.value, instancehandle.keyHash.value, sizeof (instancehandle.keyHash.value));
-      ddsinstancehandle.length = instancehandle.keyHash.length;
-      ddsinstancehandle.isValid = instancehandle.isValid;
-    }
-}
-
-void
-operator<<= (::DDS_InstanceHandle_t &ddsinstancehandle, const ::DDS::InstanceHandle_t & instancehandle)
-{
-  ACE_OS::memcpy (ddsinstancehandle.keyHash.value, instancehandle.value, sizeof (instancehandle.value));
-  ddsinstancehandle.keyHash.length = instancehandle.length;
-  ddsinstancehandle.isValid = instancehandle.isValid;
-}
diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleC.h b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleC.h
deleted file mode 100644
index 17440296b19..00000000000
--- a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleC.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// -*- C++ -*-
-#ifndef _TAO_IDL_DDS_RTF2_DCPSC_H_XX
-#define _TAO_IDL_DDS_RTF2_DCPSC_H_XX
-
-#include /**/ "ace/pre.h"
-
-#include /**/ "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-#include /**/ "ndds_stub_export.h"
-#include /**/ "tao/Versioned_Namespace.h"
-
-#include "ndds_dcps_i_handleC.h"
-#include "ndds/ndds_cpp.h"
-
-namespace DDS
-{
-  extern NDDS_STUB_Export ::DDS::InstanceHandle_t const HANDLE_NIL;
-}
-
-NDDS_STUB_Export bool
-operator== (const ::DDS::InstanceHandle_t & instancehandle1, const ::DDS::InstanceHandle_t & instancehandle2);
-
-NDDS_STUB_Export bool
-operator!= (const ::DDS::InstanceHandle_t & instancehandle1, const ::DDS::InstanceHandle_t & instancehandle2);
-
-NDDS_STUB_Export void
-operator<<= (::DDS::InstanceHandle_t &ddsinstancehandle, const ::DDS_InstanceHandle_t & instancehandle);
-
-NDDS_STUB_Export void
-operator<<= (::DDS_InstanceHandle_t &ddsinstancehandle, const ::DDS::InstanceHandle_t & instancehandle);
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleEC.h b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleEC.h
deleted file mode 100644
index b491e8235c4..00000000000
--- a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleEC.h
+++ /dev/null
@@ -1,64 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.7.4
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- *       http://doc.ece.uci.edu/
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-// TAO_IDL - Generated from
-// C:\ACE\latest\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:134
-
-#ifndef _TAO_IDL_DDS_RTF2_DCPSEC_H_XX
-#define _TAO_IDL_DDS_RTF2_DCPSEC_H_XX
-
-#include /**/ "ace/pre.h"
-
-
-#include /**/ "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-#include /**/ "ndds_lem_stub_export.h"
-#include "tao/AnyTypeCode/AnyTypeCode_methods.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Basic_Types.h"
-#include "tao/ORB_Constants.h"
-#include "tao/Object.h"
-#include "tao/AnyTypeCode/TypeCode.h"
-#include "tao/AnyTypeCode/TypeCode_Constants.h"
-#include "tao/String_Manager_T.h"
-#include "tao/Objref_VarOut_T.h"
-#include /**/ "tao/Versioned_Namespace.h"
-
-#include "ccm/CCM_ContainerC.h"
-#include "ndds_dcps_instance_handleC.h"
-
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleS.h b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleS.h
deleted file mode 100644
index c5945babcba..00000000000
--- a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleS.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.7.4
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- *       http://doc.ece.uci.edu/
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-// TAO_IDL - Generated from
-// C:\ACE\latest\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:471
-
-#ifndef _TAO_IDL_DDS_RTF2_DCPS_I_HANDLES_H_S
-#define _TAO_IDL_DDS_RTF2_DCPS_I_HANDLES_H_S
-
-#include /**/ "ace/pre.h"
-
-#include "ndds_dcps_i_handleC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-#include /**/ "ndds_skel_export.h"
-
-#include /**/ "ace/post.h"
-#endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_lem_stub.mpc b/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_lem_stub.mpc
deleted file mode 100644
index 3be068a5a94..00000000000
--- a/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_lem_stub.mpc
+++ /dev/null
@@ -1,49 +0,0 @@
-project (CIAO_NDDS_lem_gen) : install, ndds_idltocpp, ciaoidldefaults {
-  custom_only = 1
-  after += CIAO_NDDS_idl_gen
-  idlflags += -I$(CIAO_ROOT)/connectors \
-              -Wb,stub_export_macro=NDDS_LEM_STUB_Export \
-              -Wb,stub_export_include=ndds_lem_stub_export.h -SS -Sci
-
-  IDL_Files {
-     idlflags += -Gxhst
-     ndds_dcpsE.idl
-  }
-
-  IDL_Files {
-     idlflags += -Sci
-     ndds_dcps_i_handleE.idl
-  }
-
-  specific {
-     install_dir = connectors/dds4ccm/idl/ndds
-  }
-}
-
-project (CIAO_NDDS_lem_stub) : install, ndds_idltocpp_stub, ccm_lem_stub, ccm_session_stub, ciaolib_with_idl, ciao_output, taolib, valuetype, ifr_client {
-  after += CIAO_NDDS_lem_gen
-  sharedname = CIAO_NDDS_lem_stub
-  dynamicflags += NDDS_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-   ndds_dcpsEC.cpp
-   ndds_dcps_i_handleEC.cpp
-  }
-
-  Header_Files {
-   ndds_dcpsEC.h
-   ndds_lem_stub_export.h
-   ndds_dcps_i_handleEC.h
-  }
-
-  Inline_Files {
-  }
-
-  specific {
-   install_dir = connectors/dds4ccm/idl/ndds
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_skel.mpc b/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_skel.mpc
deleted file mode 100644
index 0bc50fa1d15..00000000000
--- a/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_skel.mpc
+++ /dev/null
@@ -1,29 +0,0 @@
-// -*- MPC -*-
-project (CIAO_NDDS_skel) : install, ndds_idltocpp_stub, ciaolib_with_idl, ciao_output, taolib, portableserver, ciao_servant {
-  includes += $(CIAO_ROOT)/connectors
-
-  dynamicflags += NDDS_SKEL_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Header_Files {
-    ndds_skel_export.h
-    ndds_dcpsS.h
-    ndds_dcps_i_handleS.h
-    ndds_dcps_instance_handleS.h
-    ndds_dcps_svnt.h
-    ndds_dcps_i_handle_svnt.h
-  }
-
-  Source_Files {
-    ndds_dcpsS.cpp
-  }
-
-  Inline_Files {
-  }
-
-  specific {
-    install_dir = connectors/dds4ccm/idl/ndds
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc b/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc
deleted file mode 100644
index a136a721cce..00000000000
--- a/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc
+++ /dev/null
@@ -1,73 +0,0 @@
-project (CIAO_NDDS_idl_gen) : install, ndds_idltocpp, componentidldefaults {
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=NDDS_STUB_Export \
-              -Wb,stub_export_include=ndds_stub_export.h \
-              -Wb,skel_export_macro=NDDS_SKEL_Export \
-              -Wb,skel_export_include=ndds_skel_export.h \
-              -I$(CIAO_ROOT)/connectors -Glem -Ssvntc -Ssvntt
-
-  IDL_Files {
-    ndds_dcps.idl
-  }
-
-  IDL_Files {
-    idlflags -= -Gxhst -Gxhsk -SS
-    ndds_dcps_i_handle.idl
-  }
-
-  specific {
-    install_dir = connectors/dds4ccm/idl/ndds
-  }
-
-  verbatim(gnuace, postinstall) {
-"	cp ndds_dcps_instance_handle.idl $(INSTALL_PREFIX)/include/connectors/dds4ccm/idl/ndds/"
-  }
-}
-
-project (CIAO_NDDS_stub) : install, ndds_idltocpp, ccm_stub, ciaolib_with_idl, ciao_output, taolib {
-
-  after += CIAO_NDDS_idl_gen
-  includes += $(CIAO_ROOT)/connectors
-
-  dynamicflags += NDDS_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Header_Files {
-    ndds_stub_export.h
-    ndds_dcpsC.h
-    ndds_dcps_i_handleC.h
-    ndds_dcps_instance_handleC.h
-    ndds_dcps_instance_handleEC.h
-  }
-
-  Source_Files {
-    ndds_dcpsC.cpp
-    ndds_dcps_i_handleC.cpp
-    ndds_dcps_instance_handleC.cpp
-  }
-
-  Inline_Files {
-    ndds_dcpsC.inl
-    ndds_dcps_i_handleC.inl
-  }
-
-  specific {
-    install_dir = connectors/dds4ccm/idl/ndds
-  }
-}
-
-project (CIAO_NDDS_idl_install_only) {
-
-  avoids += dds4ccm_opendds dds4ccm_ndds
-
-  custom_only = 1
-
-  verbatim(gnuace, bottom) {
-"install:"
-"	$(MKDIR) $(INSTALL_PREFIX)/share/ciao/connectors/dds4ccm/idl/ndds"
-"	cp *.idl $(INSTALL_PREFIX)/share/ciao/connectors/dds4ccm/idl/ndds"
-  }
-
-}
diff --git a/CIAO/connectors/dds4ccm/impl/CCM_DataReader.cpp b/CIAO/connectors/dds4ccm/impl/CCM_DataReader.cpp
deleted file mode 100644
index 5199451e5be..00000000000
--- a/CIAO/connectors/dds4ccm/impl/CCM_DataReader.cpp
+++ /dev/null
@@ -1,215 +0,0 @@
-#include "CCM_DataReader.h"
-#include "dds4ccm/impl/logger/Log_Macros.h"
-
-CIAO::DDS4CCM::CCM_DataReader::CCM_DataReader (void)
-{
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::CCM_DataReader::CCM_DataReader");
-}
-
-CIAO::DDS4CCM::CCM_DataReader::~CCM_DataReader (void)
-{
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::CCM_DataReader::~CCM_DataReader");
-}
-
-::DDS::ReturnCode_t
-CIAO::DDS4CCM::CCM_DataReader::enable (void)
-{
-  return this->dds_entity ()->enable ();
-}
-
-::DDS::StatusCondition_ptr
-CIAO::DDS4CCM::CCM_DataReader::get_statuscondition (void)
-{
-  return this->dds_entity ()->get_statuscondition ();
-}
-
-::DDS::StatusMask
-CIAO::DDS4CCM::CCM_DataReader::get_status_changes (void)
-{
-  return this->dds_entity ()->get_status_changes ();
-}
-
-::DDS::InstanceHandle_t
-CIAO::DDS4CCM::CCM_DataReader::get_instance_handle (void)
-{
-  return this->dds_entity ()->get_instance_handle ();
-}
-
-::DDS::ReadCondition_ptr
-CIAO::DDS4CCM::CCM_DataReader::create_readcondition (
-  ::DDS::SampleStateMask sample_states,
-  ::DDS::ViewStateMask view_states,
-  ::DDS::InstanceStateMask instance_states)
-{
-  return this->dds_entity ()->create_readcondition (sample_states,
-                                                    view_states,
-                                                    instance_states);
-}
-
-::DDS::QueryCondition_ptr
-CIAO::DDS4CCM::CCM_DataReader::create_querycondition (
-  ::DDS::SampleStateMask sample_states,
-  ::DDS::ViewStateMask view_states,
-  ::DDS::InstanceStateMask instance_states,
-  const char * query_expression,
-  const ::DDS::StringSeq & query_parameters)
-{
-  return this->dds_entity ()->create_querycondition (sample_states,
-                                                     view_states,
-                                                     instance_states,
-                                                     query_expression,
-                                                     query_parameters);
-}
-
-::DDS::ReturnCode_t
-CIAO::DDS4CCM::CCM_DataReader::delete_readcondition (
-  ::DDS::ReadCondition_ptr a_condition)
-{
-  return this->dds_entity ()->delete_readcondition (a_condition);
-}
-
-::DDS::ReturnCode_t
-CIAO::DDS4CCM::CCM_DataReader::delete_contained_entities (void)
-{
-  return this->dds_entity ()->delete_contained_entities ();
-}
-
-::DDS::ReturnCode_t
-CIAO::DDS4CCM::CCM_DataReader::set_qos (
-  const ::DDS::DataReaderQos & qos)
-{
-  return this->dds_entity ()->set_qos (qos);
-}
-
-::DDS::ReturnCode_t
-CIAO::DDS4CCM::CCM_DataReader::get_qos (
-  ::DDS::DataReaderQos & qos)
-{
-  return this->dds_entity ()->get_qos (qos);
-}
-
-::DDS::ReturnCode_t
-CIAO::DDS4CCM::CCM_DataReader::set_listener (
-  ::DDS::DataReaderListener_ptr a_listener,
-  ::DDS::StatusMask mask)
-{
-  return this->dds_entity ()->set_listener (a_listener, mask);
-}
-
-::DDS::DataReaderListener_ptr
-CIAO::DDS4CCM::CCM_DataReader::get_listener (void)
-{
-  return this->dds_entity ()->get_listener ();
-}
-
-::DDS::TopicDescription_ptr
-CIAO::DDS4CCM::CCM_DataReader::get_topicdescription (void)
-{
-  return this->dds_entity ()->get_topicdescription();
-}
-
-::DDS::Subscriber_ptr
-CIAO::DDS4CCM::CCM_DataReader::get_subscriber (void)
-{
-  return this->dds_entity ()->get_subscriber ();
-}
-
-::DDS::ReturnCode_t
-CIAO::DDS4CCM::CCM_DataReader::get_sample_rejected_status (
-  ::DDS::SampleRejectedStatus & status)
-{
-  return this->get_dds_entity ()->get_sample_rejected_status (status);
-}
-
-::DDS::ReturnCode_t
-CIAO::DDS4CCM::CCM_DataReader::get_liveliness_changed_status (
-  ::DDS::LivelinessChangedStatus & status)
-{
-  return this->dds_entity ()->get_liveliness_changed_status (status);
-}
-
-::DDS::ReturnCode_t
-CIAO::DDS4CCM::CCM_DataReader::get_requested_deadline_missed_status (
-  ::DDS::RequestedDeadlineMissedStatus & status)
-{
-  return this->dds_entity ()->get_requested_deadline_missed_status (status);
-}
-
-::DDS::ReturnCode_t
-CIAO::DDS4CCM::CCM_DataReader::get_requested_incompatible_qos_status (
-  ::DDS::RequestedIncompatibleQosStatus & status)
-{
-  return this->dds_entity ()->get_requested_incompatible_qos_status (status);
-}
-
-::DDS::ReturnCode_t
-CIAO::DDS4CCM::CCM_DataReader::get_subscription_matched_status (
-  ::DDS::SubscriptionMatchedStatus & status)
-{
-  return this->dds_entity ()->get_subscription_matched_status (status);
-}
-
-::DDS::ReturnCode_t
-CIAO::DDS4CCM::CCM_DataReader::get_sample_lost_status (
-  ::DDS::SampleLostStatus & status)
-{
-  return this->dds_entity ()->get_sample_lost_status (status);
-}
-
-::DDS::ReturnCode_t
-CIAO::DDS4CCM::CCM_DataReader::wait_for_historical_data (
-  const ::DDS::Duration_t & max_wait)
-{
-  return this->dds_entity ()->wait_for_historical_data (max_wait);
-}
-
-::DDS::ReturnCode_t
-CIAO::DDS4CCM::CCM_DataReader::get_matched_publications (
-  ::DDS::InstanceHandleSeq & publication_handles)
-{
-  return this->dds_entity ()->get_matched_publications (publication_handles);
-}
-
-#if !defined (DDS_HAS_MINIMUM_BIT)
-::DDS::ReturnCode_t
-CIAO::DDS4CCM::CCM_DataReader::get_matched_publication_data (
-  ::DDS::PublicationBuiltinTopicData & publication_data,
-  DDS_INSTANCE_HANDLE_T_IN publication_handle)
-{
-  return this->dds_entity ()->get_matched_publication_data (publication_data,
-                                                            publication_handle);
-}
-#endif
-
-void
-CIAO::DDS4CCM::CCM_DataReader::set_dds_entity (::DDS::DataReader_ptr dr)
-{
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::CCM_DataReader::set_dds_entity");
-  this->dds_entity_ = ::DDS::DataReader::_duplicate (dr);
-}
-
-::DDS::DataReader_ptr
-CIAO::DDS4CCM::CCM_DataReader::get_dds_entity (void)
-{
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::CCM_DataReader::get_dds_entity");
-
-  return ::DDS::DataReader::_duplicate (this->dds_entity_);
-}
-
-::DDS::DataReader_ptr
-CIAO::DDS4CCM::CCM_DataReader::dds_entity (void)
-{
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::CCM_DataReader::dds_entity");
-
-  if (::CORBA::is_nil (this->dds_entity_.in ()))
-    {
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG,
-                    "CIAO::DDS4CCM::CCM_DataReader::dds_entity - "
-                    "Throwing BAD_INV_ORDER.\n"));
-      throw ::CORBA::BAD_INV_ORDER ();
-    }
-  else
-    {
-      return this->dds_entity_.in ();
-    }
-}
diff --git a/CIAO/connectors/dds4ccm/impl/CCM_DataReader.h b/CIAO/connectors/dds4ccm/impl/CCM_DataReader.h
deleted file mode 100644
index 60f89160062..00000000000
--- a/CIAO/connectors/dds4ccm/impl/CCM_DataReader.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- *
- * Wrapper facade for DDS.
- */
-
-#ifndef CCM_DATAREADER_T_H_
-#define CCM_DATAREADER_T_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsEC.h"
-#include "dds4ccm/impl/dds4ccm_dds_impl_export.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-#include "dds4ccm/impl/LocalObject.h"
-
-namespace CIAO
-{
-  namespace DDS4CCM
-  {
-    class DDS4CCM_DDS_IMPL_Export CCM_DataReader
-      : public virtual ::DDS::CCM_DataReader,
-        public virtual LocalObject
-    {
-    public:
-      /// Constructor
-      CCM_DataReader (void);
-
-      /// Destructor
-      virtual ~CCM_DataReader (void);
-
-      virtual ::DDS::ReturnCode_t
-      enable (void);
-
-      virtual ::DDS::StatusCondition_ptr
-      get_statuscondition (void);
-
-      virtual ::DDS::StatusMask
-      get_status_changes (void);
-
-      virtual ::DDS::InstanceHandle_t
-      get_instance_handle (void);
-
-      virtual ::DDS::ReadCondition_ptr
-      create_readcondition (::DDS::SampleStateMask ,
-                            ::DDS::ViewStateMask ,
-                            ::DDS::InstanceStateMask);
-      virtual ::DDS::QueryCondition_ptr
-      create_querycondition (::DDS::SampleStateMask ,
-                             ::DDS::ViewStateMask ,
-                             ::DDS::InstanceStateMask ,
-                             const char * ,
-                             const ::DDS::StringSeq & );
-
-      virtual ::DDS::ReturnCode_t
-      delete_readcondition (::DDS::ReadCondition_ptr );
-
-      virtual ::DDS::ReturnCode_t delete_contained_entities (void);
-
-      virtual ::DDS::ReturnCode_t set_qos (const ::DDS::DataReaderQos & );
-
-      virtual ::DDS::ReturnCode_t get_qos (::DDS::DataReaderQos & );
-
-      virtual ::DDS::ReturnCode_t
-      set_listener (::DDS::DataReaderListener_ptr,
-                    ::DDS::StatusMask );
-
-      virtual ::DDS::DataReaderListener_ptr
-      get_listener (void);
-
-      virtual ::DDS::TopicDescription_ptr
-      get_topicdescription (void);
-
-      virtual ::DDS::Subscriber_ptr
-      get_subscriber (void);
-
-      virtual ::DDS::ReturnCode_t
-      get_sample_rejected_status (::DDS::SampleRejectedStatus & );
-
-      virtual ::DDS::ReturnCode_t
-      get_liveliness_changed_status (::DDS::LivelinessChangedStatus & );
-
-      virtual ::DDS::ReturnCode_t
-      get_requested_deadline_missed_status (::DDS::RequestedDeadlineMissedStatus & );
-
-      virtual ::DDS::ReturnCode_t
-      get_requested_incompatible_qos_status (::DDS::RequestedIncompatibleQosStatus &  );
-
-      virtual ::DDS::ReturnCode_t
-      get_subscription_matched_status (::DDS::SubscriptionMatchedStatus & );
-
-      virtual ::DDS::ReturnCode_t
-      get_sample_lost_status (::DDS::SampleLostStatus & );
-
-      virtual ::DDS::ReturnCode_t
-      wait_for_historical_data (const ::DDS::Duration_t & );
-
-      virtual ::DDS::ReturnCode_t
-      get_matched_publications (::DDS::InstanceHandleSeq & );
-
-#if !defined (DDS_HAS_MINIMUM_BIT)
-      virtual ::DDS::ReturnCode_t
-      get_matched_publication_data (::DDS::PublicationBuiltinTopicData & ,
-                                    DDS_INSTANCE_HANDLE_T_IN );
-#endif
-
-      void set_dds_entity (::DDS::DataReader_ptr dr);
-
-      ::DDS::DataReader_ptr get_dds_entity (void);
-
-    private:
-      ::DDS::DataReader_var dds_entity_;
-      ::DDS::DataReader_ptr dds_entity (void);
-    };
-  }
-}
-
-#endif /* CCM_DATAREADER_T_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/CCM_DataWriter.cpp b/CIAO/connectors/dds4ccm/impl/CCM_DataWriter.cpp
deleted file mode 100644
index 62d71e9f988..00000000000
--- a/CIAO/connectors/dds4ccm/impl/CCM_DataWriter.cpp
+++ /dev/null
@@ -1,160 +0,0 @@
-#include "CCM_DataWriter.h"
-#include "dds4ccm/impl/logger/Log_Macros.h"
-
-CIAO::DDS4CCM::CCM_DataWriter::CCM_DataWriter (void)
-{
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::CCM_DataWriter::CCM_DataWriter");
-}
-
-CIAO::DDS4CCM::CCM_DataWriter::~CCM_DataWriter (void)
-{
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::CCM_DataWriter::~CCM_DataWriter");
-}
-
-::DDS::ReturnCode_t
-CIAO::DDS4CCM::CCM_DataWriter::enable (void)
-{
-  return this->impl ()->enable ();
-}
-
-::DDS::StatusCondition_ptr
-CIAO::DDS4CCM::CCM_DataWriter::get_statuscondition (void)
-{
-  return this->impl ()->get_statuscondition ();
-}
-
-::DDS::StatusMask
-CIAO::DDS4CCM::CCM_DataWriter::get_status_changes (void)
-{
-  return this->impl ()->get_status_changes ();
-}
-
-::DDS::InstanceHandle_t
-CIAO::DDS4CCM::CCM_DataWriter::get_instance_handle (void)
-{
-  return this->impl ()->get_instance_handle ();
-}
-
-::DDS::ReturnCode_t
-CIAO::DDS4CCM::CCM_DataWriter::set_qos (
-  const ::DDS::DataWriterQos &qos)
-{
-  return this->impl ()->set_qos (qos);
-}
-
-::DDS::ReturnCode_t
-CIAO::DDS4CCM::CCM_DataWriter::get_qos (::DDS::DataWriterQos &qos)
-{
-  return this->impl ()->get_qos (qos);
-}
-
-::DDS::ReturnCode_t
-CIAO::DDS4CCM::CCM_DataWriter::set_listener (::DDS::DataWriterListener_ptr listener,
-  ::DDS::StatusMask mask)
-{
-  return this->impl ()->set_listener (listener, mask);
-}
-
-::DDS::DataWriterListener_ptr
-CIAO::DDS4CCM::CCM_DataWriter::get_listener (void)
-{
-  return this->impl ()->get_listener ();
-}
-
-::DDS::Topic_ptr
-CIAO::DDS4CCM::CCM_DataWriter::get_topic (void)
-{
-  return this->impl ()->get_topic ();
-}
-
-::DDS::Publisher_ptr
-CIAO::DDS4CCM::CCM_DataWriter::get_publisher (void)
-{
-  return this->impl ()->get_publisher ();
-}
-
-::DDS::ReturnCode_t
-CIAO::DDS4CCM::CCM_DataWriter::wait_for_acknowledgments (const ::DDS::Duration_t &duration)
-{
-  return this->impl ()->wait_for_acknowledgments (duration);
-}
-
-::DDS::ReturnCode_t
-CIAO::DDS4CCM::CCM_DataWriter::get_liveliness_lost_status (::DDS::LivelinessLostStatus &status)
-{
-  return this->impl ()->get_liveliness_lost_status (status);
-}
-
-::DDS::ReturnCode_t
-CIAO::DDS4CCM::CCM_DataWriter::get_offered_deadline_missed_status (::DDS::OfferedDeadlineMissedStatus &status)
-{
-  return this->impl ()->get_offered_deadline_missed_status (status);
-}
-
-::DDS::ReturnCode_t
-CIAO::DDS4CCM::CCM_DataWriter::get_offered_incompatible_qos_status (::DDS::OfferedIncompatibleQosStatus &status)
-{
-  return this->impl ()->get_offered_incompatible_qos_status (status);
-}
-
-::DDS::ReturnCode_t
-CIAO::DDS4CCM::CCM_DataWriter::get_publication_matched_status (::DDS::PublicationMatchedStatus &status)
-{
-  return this->impl ()->get_publication_matched_status (status);
-}
-
-::DDS::ReturnCode_t
-CIAO::DDS4CCM::CCM_DataWriter::assert_liveliness (void)
-{
-  return this->impl ()->assert_liveliness ();
-}
-
-#if !defined (DDS_HAS_MINIMUM_BIT)
-::DDS::ReturnCode_t
-CIAO::DDS4CCM::CCM_DataWriter::get_matched_subscriptions (::DDS::InstanceHandleSeq &seq)
-{
-  return this->impl ()->get_matched_subscriptions (seq);
-}
-#endif
-
-::DDS::ReturnCode_t
-CIAO::DDS4CCM::CCM_DataWriter::get_matched_subscription_data (
-  ::DDS::SubscriptionBuiltinTopicData & data,
-  DDS_INSTANCE_HANDLE_T_IN handle)
-{
-  return this->impl ()->get_matched_subscription_data (data, handle);
-}
-
-void
-CIAO::DDS4CCM::CCM_DataWriter::set_dds_entity (::DDS::DataWriter_ptr dw)
-{
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::CCM_DataWriter::set_dds_entity");
-
-  this->impl_ = ::DDS::DataWriter::_duplicate (dw);
-}
-
-::DDS::DataWriter_ptr
-CIAO::DDS4CCM::CCM_DataWriter::get_dds_entity (void)
-{
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::CCM_DataWriter::get_dds_entity");
-
-  return ::DDS::DataWriter::_duplicate (this->impl ());
-}
-
-::DDS::DataWriter_ptr
-CIAO::DDS4CCM::CCM_DataWriter::impl (void)
-{
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::CCM_DataWriter::impl");
-
-  if (::CORBA::is_nil (this->impl_.in ()))
-    {
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG,
-                    "CIAO::DDS4CCM::CCM_DataWriter::impl - "
-                    "Throwing BAD_INV_ORDER.\n"));
-      throw ::CORBA::BAD_INV_ORDER ();
-    }
-  else
-    {
-      return this->impl_.in ();
-    }
-}
diff --git a/CIAO/connectors/dds4ccm/impl/CCM_DataWriter.h b/CIAO/connectors/dds4ccm/impl/CCM_DataWriter.h
deleted file mode 100644
index 858606d78d5..00000000000
--- a/CIAO/connectors/dds4ccm/impl/CCM_DataWriter.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- *
- * Wrapper facade for DDS.
- */
-
-#ifndef CCM_DATAWRITER_T_H_
-#define CCM_DATAWRITER_T_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsEC.h"
-#include "dds4ccm/impl/dds4ccm_dds_impl_export.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-#include "dds4ccm/impl/LocalObject.h"
-
-namespace CIAO
-{
-  namespace DDS4CCM
-  {
-    class DDS4CCM_DDS_IMPL_Export CCM_DataWriter
-      : public virtual ::DDS::CCM_DataWriter,
-        public virtual LocalObject
-    {
-    public:
-      /// Constructor
-      CCM_DataWriter (void);
-
-      /// Destructor
-      virtual ~CCM_DataWriter (void);
-
-      virtual ::DDS::ReturnCode_t
-      enable (void);
-
-      virtual ::DDS::StatusCondition_ptr
-      get_statuscondition (void);
-
-      virtual ::DDS::StatusMask
-      get_status_changes (void);
-
-      virtual ::DDS::InstanceHandle_t
-      get_instance_handle (void);
-
-      virtual ::DDS::ReturnCode_t
-      set_qos (const ::DDS::DataWriterQos & );
-
-      virtual ::DDS::ReturnCode_t
-      get_qos (::DDS::DataWriterQos & );
-
-      virtual ::DDS::ReturnCode_t
-      set_listener (::DDS::DataWriterListener_ptr ,
-                    ::DDS::StatusMask );
-
-      virtual ::DDS::DataWriterListener_ptr
-      get_listener (void);
-
-      virtual ::DDS::Topic_ptr
-      get_topic (void);
-
-      virtual ::DDS::Publisher_ptr
-      get_publisher (void);
-
-      virtual ::DDS::ReturnCode_t
-      wait_for_acknowledgments (const ::DDS::Duration_t & );
-
-      virtual ::DDS::ReturnCode_t
-      get_liveliness_lost_status (::DDS::LivelinessLostStatus & );
-
-      virtual ::DDS::ReturnCode_t
-      get_offered_deadline_missed_status (::DDS::OfferedDeadlineMissedStatus & );
-
-      virtual ::DDS::ReturnCode_t
-      get_offered_incompatible_qos_status (::DDS::OfferedIncompatibleQosStatus & );
-
-      virtual ::DDS::ReturnCode_t
-      get_publication_matched_status (::DDS::PublicationMatchedStatus & );
-
-      virtual ::DDS::ReturnCode_t
-      assert_liveliness (void);
-
-      virtual ::DDS::ReturnCode_t
-      get_matched_subscriptions (::DDS::InstanceHandleSeq & );
-
-#if !defined (DDS_HAS_MINIMUM_BIT)
-      virtual ::DDS::ReturnCode_t
-      get_matched_subscription_data (::DDS::SubscriptionBuiltinTopicData & ,
-                                     DDS_INSTANCE_HANDLE_T_IN);
-#endif
-
-      void set_dds_entity (::DDS::DataWriter_ptr dw);
-
-      ::DDS::DataWriter_ptr
-      get_dds_entity (void);
-
-    private:
-      ::DDS::DataWriter_var impl_;
-      ::DDS::DataWriter_ptr impl (void);
-    };
-  }
-}
-
-#endif /* CCM_DATAREADER_T_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/Coherent_Changes_Guard.cpp b/CIAO/connectors/dds4ccm/impl/Coherent_Changes_Guard.cpp
deleted file mode 100644
index ad574ed8726..00000000000
--- a/CIAO/connectors/dds4ccm/impl/Coherent_Changes_Guard.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#include "dds4ccm/impl/Coherent_Changes_Guard.h"
-
-CIAO::DDS4CCM::Coherent_Changes_Guard::Coherent_Changes_Guard (
-  ::DDS::Publisher_ptr p,
-  bool coherent_write) :
-    p_ (::DDS::Publisher::_duplicate (p)),
-    coherent_write_ (coherent_write)
-{
-  if (this->coherent_write_)
-    {
-      p_->begin_coherent_changes ();
-    }
-}
-
-CIAO::DDS4CCM::Coherent_Changes_Guard::~Coherent_Changes_Guard ()
-{
-  if (this->coherent_write_)
-    {
-      this->p_->end_coherent_changes ();
-    }
-}
-
diff --git a/CIAO/connectors/dds4ccm/impl/Coherent_Changes_Guard.h b/CIAO/connectors/dds4ccm/impl/Coherent_Changes_Guard.h
deleted file mode 100644
index 0ab277eba33..00000000000
--- a/CIAO/connectors/dds4ccm/impl/Coherent_Changes_Guard.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * @author William R. Otte <wotte@dre.vanderbilt.edu>
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef _CIAO_COHERENT_CHANGES_GUARD
-#define _CIAO_COHERENT_CHANGES_GUARD
-
-#include "ace/Copy_Disabled.h"
-#include "dds4ccm/impl/dds4ccm_dds_impl_export.h"
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-
-namespace CIAO
-{
-  namespace DDS4CCM
-  {
-    /**
-     * Guard class which calls begin_coherent_changes() on
-     * construction and end_coherent_changes() at destruction
-     */
-    class DDS4CCM_DDS_IMPL_Export Coherent_Changes_Guard :
-      private ACE_Copy_Disabled
-    {
-      public:
-        Coherent_Changes_Guard (::DDS::Publisher_ptr p, bool coherent_write);
-        ~Coherent_Changes_Guard ();
-      private:
-        ::DDS::Publisher_var p_;
-        bool const coherent_write_;
-    };
-  }
-}
-
-#endif /* _CIAO_COHERENT_CHANGES_GUARD */
-
diff --git a/CIAO/connectors/dds4ccm/impl/ConditionManager.cpp b/CIAO/connectors/dds4ccm/impl/ConditionManager.cpp
deleted file mode 100644
index 4fa50f0eb49..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ConditionManager.cpp
+++ /dev/null
@@ -1,523 +0,0 @@
-#include "dds4ccm/impl/logger/Log_Macros.h"
-#include "dds4ccm/impl/ConditionManager.h"
-#include "dds4ccm/impl/Utils.h"
-#include "dds4ccm/impl/TimeUtilities.h"
-#include "ace/OS_NS_sys_time.h"
-
-namespace CIAO
-{
-  namespace DDS4CCM
-  {
-    ConditionManager::ConditionManager (void)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::ConditionManager::ConditionManager");
-    }
-
-    ConditionManager::~ConditionManager (void)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::ConditionManager::~ConditionManager");
-    }
-
-    ::DDS::ReadCondition_ptr
-    ConditionManager::get_readcondition (void)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::ConditionManager::get_readcondition");
-
-      return ::DDS::ReadCondition::_duplicate (this->rd_condition_.in ());
-    }
-
-    ::DDS::QueryCondition_ptr
-    ConditionManager::get_querycondition_getter (void)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::ConditionManager::get_querycondition_getter");
-
-      return ::DDS::QueryCondition::_duplicate (this->qc_getter_.in ());
-    }
-
-    ::DDS::QueryCondition_ptr
-    ConditionManager::get_querycondition_listener (void)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::ConditionManager::get_querycondition_listener");
-
-      return ::DDS::QueryCondition::_duplicate (this->qc_listener_.in ());
-    }
-
-    ::DDS::QueryCondition_ptr
-    ConditionManager::get_querycondition_reader (void)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::ConditionManager::get_querycondition_reader");
-
-      return ::DDS::QueryCondition::_duplicate (this->qc_reader_.in ());
-    }
-
-    ::DDS::InstanceHandle_t
-    ConditionManager::check_handle (DDS_INSTANCE_HANDLE_T_IN instance_handle,
-                                    DDS_INSTANCE_HANDLE_T_IN lookup_handle)
-    {
-      bool error = false;
-      bool non_existent = false;
-#if (CIAO_DDS4CCM_NDDS==1)
-      ::DDS::InstanceHandle_t ret = this->ws_.check_handle (instance_handle,
-                                                            lookup_handle,
-                                                            error,
-                                                            non_existent);
-#else
-      ::DDS::InstanceHandle_t ret = lookup_handle;
-      error = instance_handle != ::DDS::HANDLE_NIL && instance_handle != lookup_handle;
-      non_existent = lookup_handle == ::DDS::HANDLE_NIL;
-#endif
-      if (error)
-        throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0);
-      if (non_existent)
-        throw ::CCM_DDS::NonExistent ();
-      return ret;
-    }
-
-    void
-    ConditionManager::init_readcondition (void)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::ConditionManager::init_readcondition");
-
-#if (CIAO_DDS4CCM_NDDS==1)
-      if (!this->ws_.get_rti_entity ())
-        {
-          // Waitset is created when a query condition is attached.
-          // when this is the case, no need to create a read condition
-          // (including its proxy).
-          this->ws_.init ();
-        }
-#endif
-      if ( ::CORBA::is_nil (this->rd_condition_.in ()))
-        {
-          this->rd_condition_ = this->dds_entity ()->create_readcondition (
-                                  ::DDS::NOT_READ_SAMPLE_STATE,
-                                  ::DDS::NEW_VIEW_STATE | ::DDS::NOT_NEW_VIEW_STATE,
-                                  ::DDS::ALIVE_INSTANCE_STATE | ::DDS::NOT_ALIVE_INSTANCE_STATE);
-
-          if ( ::CORBA::is_nil (this->rd_condition_.in ()))
-            {
-              DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                            ACE_TEXT ("ConditionManager::init_readcondition - ")
-                            ACE_TEXT ("Error creating read condition.\n")));
-              throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0);
-            }
-        }
-
-      ::DDS::ReturnCode_t const retcode =
-        this->ws_.attach_condition (this->rd_condition_.in ());
-
-      if (retcode != ::DDS::RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        ACE_TEXT ("ConditionManager::init_readcondition - ")
-                        ACE_TEXT ("Unable to attach read condition to waitset. Error <%C>\n"),
-                        translate_retcode (retcode)));
-          throw ::CCM_DDS::InternalError (retcode, 0);
-        }
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                    ACE_TEXT ("ConditionManager::init_readcondition - ")
-                    ACE_TEXT ("Read condition created and attached to Waitset.\n")));
-    }
-
-    ::CCM_DDS::QueryFilter *
-    ConditionManager::query (void)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::ConditionManager::query");
-
-      if (! ::CORBA::is_nil (this->rd_condition_.in ()))
-        {
-          // When a query condition is set, the rd_condition is not set
-          // and therefor nil.
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        ACE_TEXT ("ConditionManager::query - ")
-                        ACE_TEXT ("Error: No QueryCondition set yet, ")
-                        ACE_TEXT ("first set a filter.\n")));
-          throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0);
-        }
-      if (::CORBA::is_nil (this->qc_reader_.in ()))
-        {
-          // qc reader is nil
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        ACE_TEXT ("ConditionManager::query - ")
-                        ACE_TEXT ("Error: qc reader is nil.\n")));
-          throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0);
-        }
-      ::CCM_DDS::QueryFilter_var filter;
-      ACE_NEW_THROW_EX (filter,
-                        ::CCM_DDS::QueryFilter(),
-                        ::CORBA::NO_MEMORY ());
-      filter->expression = this->qc_reader_->get_query_expression ();
-      this->qc_reader_->get_query_parameters (filter->parameters);
-      return filter._retn ();
-    }
-
-    void
-    ConditionManager::query (
-      const ::CCM_DDS::QueryFilter & filter)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::ConditionManager::query");
-
-      // Since the readcondition for the getter is always created (at start up),
-      // this should be removed first. Instead of a readcondition, there should
-      // be a QueryCondition attached to the waitset
-      if (! ::CORBA::is_nil (this->rd_condition_.in ()))
-        {
-          // Getter functionality
-          // First remove the existing conditions from the waitset
-          // Than create a new (query) condition and attach it to the waitset
-          // instead of the readcondition
-          this->remove_conditions ();
-        }
-
-      if (::CORBA::is_nil (this->qc_reader_.in ()))
-        {
-          // We're sure the query is not set yet.
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                        ACE_TEXT ("Creating query condition for the reader: ")
-                        ACE_TEXT ("expression <%C>\n"),
-                        filter.expression.in ()));
-          this->qc_reader_ = this->dds_entity ()->create_querycondition (
-                                ::DDS::READ_SAMPLE_STATE | ::DDS::NOT_READ_SAMPLE_STATE,
-                                ::DDS::NEW_VIEW_STATE | ::DDS::NOT_NEW_VIEW_STATE,
-                                ::DDS::ALIVE_INSTANCE_STATE,
-                                filter.expression,
-                                filter.parameters);
-          if ( ::CORBA::is_nil (this->qc_getter_.in ()))
-            {
-              DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                            ACE_TEXT ("Creating query condition for the getter: ")
-                            ACE_TEXT ("expression <%C>\n"),
-                            filter.expression.in ()));
-              this->qc_getter_ = this->dds_entity ()->create_querycondition (
-                                    ::DDS::NOT_READ_SAMPLE_STATE,
-                                    ::DDS::NEW_VIEW_STATE | ::DDS::NOT_NEW_VIEW_STATE,
-                                    ::DDS::ALIVE_INSTANCE_STATE | ::DDS::NOT_ALIVE_INSTANCE_STATE,
-                                    filter.expression,
-                                    filter.parameters);
-              // attach the query condition for the getter to the waitset.
-              // creates a waitset if not already created.
-              this->attach_querycondition ();
-            }
-          if ( ::CORBA::is_nil (this->qc_listener_.in ()))
-            {
-              DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                            ACE_TEXT ("Creating query condition for the listener: ")
-                            ACE_TEXT ("expression <%C>\n"),
-                            filter.expression.in ()));
-              this->qc_listener_ = this->dds_entity ()->create_querycondition (
-                                          ::DDS::NOT_READ_SAMPLE_STATE,
-                                          ::DDS::NEW_VIEW_STATE | ::DDS::NOT_NEW_VIEW_STATE,
-                                          ::DDS::ANY_INSTANCE_STATE,
-                                          filter.expression,
-                                          filter.parameters);
-            }
-          if (::CORBA::is_nil (this->qc_reader_.in ()) ||
-              ::CORBA::is_nil (this->qc_getter_.in ()) ||
-              ::CORBA::is_nil (this->qc_listener_.in ()))
-            {
-              DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                            ACE_TEXT ("ConditionManager::query - ")
-                            ACE_TEXT ("Error creating query conditions ")
-                            ACE_TEXT ("reader <%@> - getter <%@> - listener <%@>.\n"),
-                            this->qc_reader_.in (),
-                            this->qc_getter_.in (),
-                            this->qc_listener_.in ()));
-
-              throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0);
-            }
-          else
-            {
-              DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                            ACE_TEXT ("ConditionManager::query - ")
-                            ACE_TEXT ("All query conditions created successfully: ")
-                            ACE_TEXT ("expression <%C>\n"),
-                            filter.expression.in ()));
-            }
-        }
-      else if (ACE_OS::strlen (filter.expression.in ()) > 0)
-        {
-          // Filter has been set. Change the parameters of this filter.
-          this->set_parameters (filter, this->qc_reader_.in ());
-          this->set_parameters (filter, this->qc_getter_.in ());
-          this->set_parameters (filter, this->qc_listener_.in ());
-        }
-      else
-        {
-          // No expression set so remove the query conditions and
-          // create the read condition again. ConditionManager has
-          // the same state as at start up.
-          this->remove_conditions ();
-          this->init_readcondition ();
-        }
-    }
-
-    void
-    ConditionManager::set_parameters (
-      const ::CCM_DDS::QueryFilter & filter,
-      ::DDS::QueryCondition_ptr qc)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::ConditionManager::set_parameters");
-
-      ::DDS::ReturnCode_t const retval = qc->set_query_parameters (filter.parameters);
-      if (retval != ::DDS::RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        ACE_TEXT ("ConditionManager::set_parameters - ")
-                        ACE_TEXT ("Error setting expression_parameters. ")
-                        ACE_TEXT ("Retval is %C\n"),
-                        translate_retcode(retval)));
-          throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, retval);
-        }
-    }
-
-    void
-    ConditionManager::attach_querycondition (void)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::ConditionManager::attach_querycondition");
-
-#if (CIAO_DDS4CCM_NDDS==1)
-      if (!this->ws_.get_rti_entity ())
-        {
-          this->ws_.init ();
-        }
-#endif
-
-      ::DDS::ReturnCode_t const retcode =
-        this->ws_.attach_condition (this->qc_getter_.in ());
-      if (retcode != ::DDS::RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        "ConditionManager::attach_querycondition - "
-                        "Unable to attach query condition to waitset. "
-                        "Error <%C>\n",
-                        translate_retcode (retcode)));
-          throw ::CCM_DDS::InternalError (retcode, 1);
-        }
-      else
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                        "ConditionManager::attach_querycondition - "
-                        "Query condition created and attached to Waitset.\n"));
-        }
-    }
-
-    bool
-    ConditionManager::wait (const ::DDS::Duration_t & time_out)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::ConditionManager::wait");
-
-    #if !defined (DDS4CCM_NLOGGING)
-      ACE_Time_Value const start = ACE_OS::gettimeofday ();
-    #endif
-
-      DDS::ConditionSeq active_conditions;
-      ::DDS::ReturnCode_t const retcode =
-        this->ws_.wait (active_conditions, time_out);
-
-    #if !defined (DDS4CCM_NLOGGING)
-      ACE_Time_Value const waited = ACE_OS::gettimeofday () - start;
-      ACE_Time_Value wait_time;
-      wait_time <<= time_out;
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                    ACE_TEXT ("ConditionManager::wait - ")
-                    ACE_TEXT ("to wait <%#T> waited <%#T> return code <%C>\n"),
-                    &wait_time, &waited, ::CIAO::DDS4CCM::translate_retcode (retcode)));
-    #endif
-
-      if (retcode == ::DDS::RETCODE_TIMEOUT)
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                        ACE_TEXT ("ConditionManager::wait - ")
-                        ACE_TEXT ("No data available after timeout.\n")));
-          return false;
-        }
-
-      ::DDS::ReadCondition_var rc = this->get_readcondition ();
-      if (!CORBA::is_nil (rc.in ()))
-        {
-          if (rc->get_trigger_value() == true)
-            {
-              return true;
-            }
-        }
-
-      ::DDS::QueryCondition_var qc = this->get_querycondition_getter ();
-      if (!CORBA::is_nil (qc.in ()))
-        {
-          if (qc->get_trigger_value() == true)
-            {
-              return true;
-            }
-        }
-
-      return false;
-    }
-
-    void
-    ConditionManager::remove_condition (
-      ::DDS::QueryCondition_ptr dds_qc,
-      const char * type)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::ConditionManager::remove_condition");
-      if (! ::CORBA::is_nil (dds_qc))
-        {
-          ::DDS::ReturnCode_t const retcode = this->dds_entity ()->delete_readcondition (dds_qc);
-          if (retcode == ::DDS::RETCODE_OK)
-            {
-              DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_CAST_SUCCESSFUL, (LM_DEBUG, DDS4CCM_INFO
-                            ACE_TEXT ("ConditionManager::remove_condition - ")
-                            ACE_TEXT ("Succesfully removed query condition for <%C>.\n"),
-                            type));
-            }
-          else
-            {
-              DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                            ACE_TEXT ("ConditionManager::remove_condition - ")
-                            ACE_TEXT ("Unable to remove query condition for <%C>.")
-                            ACE_TEXT ("Error <%C>\n"),
-                            type, translate_retcode (retcode)));
-            }
-        }
-    }
-
-    void
-    ConditionManager::remove_conditions ()
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::ConditionManager::remove_conditions");
-
-      // Save to remove the query conditions of the reader and listener since
-      // these are not attached to a waitset.
-      ::DDS::ReturnCode_t retcode = ::DDS::RETCODE_OK;
-      if (! ::CORBA::is_nil (this->qc_reader_.in ()))
-        {
-          ::DDS::QueryCondition_var qc = this->qc_reader_._retn ();
-          this->remove_condition (qc.in (), "reader");
-        }
-      if (! ::CORBA::is_nil (this->qc_listener_.in ()))
-        {
-          ::DDS::QueryCondition_var qc = this->qc_listener_._retn ();
-          this->remove_condition (qc.in (), "listener");
-        }
-
-#if (CIAO_DDS4CCM_NDDS==1)
-      if (this->ws_.get_rti_entity ())
-#endif
-        {
-          // Waitset is created. Therefor detach any condition
-          // from the waitset first (in this case, the query condition).
-          if (! ::CORBA::is_nil (this->qc_getter_.in ()))
-            {
-              retcode = this->ws_.detach_condition (this->qc_getter_.in ());
-              if (retcode == ::DDS::RETCODE_OK)
-                {
-                  DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_INFO, DDS4CCM_INFO
-                                ACE_TEXT ("ConditionManager::remove_conditions - ")
-                                ACE_TEXT ("Query condition successfully detached from waitset.\n")));
-                  // Query condition is detached. Now we can savely remove it.
-                  ::DDS::QueryCondition_var qc = this->qc_getter_._retn ();
-                  this->remove_condition (qc.in (), "getter");
-                }
-              else
-                {
-                  DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                                ACE_TEXT ("ConditionManager::remove_conditions - ")
-                                ACE_TEXT ("Unable to detach query condition from waitset: ")
-                                ACE_TEXT ("Error: <%C>\n"),
-                                translate_retcode (retcode) ));
-                }
-            }
-          else
-            {
-              // No query condition on of the getter.
-              // TODO: Check whether we can savely remove the following check:
-              ::DDS::QueryCondition_var q_condition = this->get_querycondition_getter ();
-              if (::CORBA::is_nil (q_condition.in ()))
-                {
-                  if (!::CORBA::is_nil (this->rd_condition_.in ()))
-                    {
-                      // Read condition should be attached to the waitset.
-                      retcode = this->ws_.detach_condition (this->rd_condition_.in ());
-                      if (retcode != ::DDS::RETCODE_OK)
-                        {
-                          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                                        ACE_TEXT ("ConditionManager::remove_conditions - ")
-                                        ACE_TEXT ("Unable to detach read condition ")
-                                        ACE_TEXT ("from waitset. Error <%C>\n"),
-                                        translate_retcode (retcode)));
-                        }
-                      else
-                        {
-                          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_INFO, DDS4CCM_INFO
-                                        ACE_TEXT ("ConditionManager::remove_conditions - ")
-                                        ACE_TEXT ("Read condition successfully detached from waitset.\n")));
-                        }
-                    }
-                }
-            }
-        }
-      // Now we can safely remove the read condition (in a thread safe manner)
-      if (! ::CORBA::is_nil (this->rd_condition_.in ()))
-        {
-          retcode = ::DDS::RETCODE_OK;
-          ::DDS::ReadCondition_var rd = this->rd_condition_._retn ();
-          if (!::CORBA::is_nil (rd.in ()))
-            {
-              retcode = this->dds_entity ()->delete_readcondition (rd.in ());
-            }
-          if (retcode != ::DDS::RETCODE_OK)
-            {
-              DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                            ACE_TEXT ("ConditionManager::remove_conditions - ")
-                            ACE_TEXT ("Unable to delete read condition from DDSDataReader.")
-                            ACE_TEXT ("Error <%C>\n"),
-                            translate_retcode (retcode)));
-            }
-          else
-            {
-              DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_INFO, DDS4CCM_INFO
-                            ACE_TEXT ("ConditionManager::remove_conditions - ")
-                            ACE_TEXT ("Read condition successfully deleted from DDSDataReader.\n")));
-            }
-        }
-    }
-
-    void
-    ConditionManager::passivate ()
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::ConditionManager::passivate");
-
-      this->remove_conditions ();
-    }
-
-    void
-    ConditionManager::set_dds_entity (
-      ::DDS::DataReader_ptr dr)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::ConditionManager::set_dds_entity");
-
-      this->dr_ = ::DDS::DataReader::_duplicate (dr);
-    }
-
-    ::DDS::DataReader_ptr
-    ConditionManager::get_dds_entity (void)
-    {
-      return ::DDS::DataReader::_duplicate (this->dr_.in ());
-    }
-
-    ::DDS::DataReader_ptr
-    ConditionManager::dds_entity (void)
-    {
-      if (! ::CORBA::is_nil (this->dr_.in ()))
-        {
-          return this->dr_.in ();
-        }
-      else
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG,
-                        "ConditionManager::dds_entity - "
-                        "Throwing BAD_INV_ORDER.\n"));
-          throw ::CORBA::BAD_INV_ORDER ();
-        }
-    }
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/impl/ConditionManager.h b/CIAO/connectors/dds4ccm/impl/ConditionManager.h
deleted file mode 100644
index d773e939af1..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ConditionManager.h
+++ /dev/null
@@ -1,200 +0,0 @@
-#ifndef CONDITIONMANAGER_H_
-#define CONDITIONMANAGER_H_
-
-#include "dds4ccm/idl/dds4ccm_BaseC.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-#if (CIAO_DDS4CCM_NDDS==1)
-#include "dds4ccm/impl/ndds/WaitSet.h"
-#elif (CIAO_DDS4CCM_OPENDDS==1)
-#include "dds/DCPS/WaitSet.h"
-#endif
-
-#include "dds4ccm/impl/dds4ccm_dds_impl_export.h"
-
-namespace CCM_DDS
-{
-  struct QueryFilter;
-}
-
-namespace CIAO
-{
-  namespace DDS4CCM
-  {
-    /**
-      * @class ConditionManager
-      *
-      * @brief Helper class
-      *
-      * Manages the read and query conditions for the Getter,
-      * Reader and listeners.
-      */
-    class DDS4CCM_DDS_IMPL_Export ConditionManager
-    {
-    public:
-      /// Constructor
-      ConditionManager (void);
-
-      /// Destructor
-      ~ConditionManager (void);
-
-      /// Returns the read condition in general
-      ::DDS::ReadCondition_ptr get_readcondition (void);
-
-      /// Returns the query condition for the getter
-      ::DDS::QueryCondition_ptr get_querycondition_getter (void);
-      /// Returns the query condition for the reader
-      ::DDS::QueryCondition_ptr get_querycondition_reader (void);
-      /// Returns the query condition for the listener
-      ::DDS::QueryCondition_ptr get_querycondition_listener (void);
-
-      /**
-        * Proxy method.
-        * See WaitSet::check_handle in ndds/WaitSet.h
-        * for more information on this.
-        *
-        * If WaitSet::check_handle set 'error' to true, a
-        * ::CCM_DDS::InternalError exception is called.
-        * Error will be ::DDS::RETCODE_ERROR
-        *
-        * If WaitSet::check_handle set 'non_existent' to true,
-        * a ::CCM_DDS::NonExistent exception is thrown.
-        */
-      ::DDS::InstanceHandle_t check_handle (
-        DDS_INSTANCE_HANDLE_T_IN instance_handle,
-        DDS_INSTANCE_HANDLE_T_IN lookup_handle);
-
-      /**
-        * Getter functionality.
-        * Creates a read_condition for the getter.
-        * It will also initialize the waitset and attaches the
-        * read_condition to the waitset.
-        */
-      void init_readcondition (void);
-
-      /**
-        * Getter functionality, waits for the attached conditions.
-        * Only returns true when one of the getter conditions has triggered
-        * and we have data
-        */
-      bool wait (const ::DDS::Duration_t & time_out);
-
-      /**
-        * Returns the internal filter. This is the DDS4CCM QueryFilter
-        * (a representation of the DDS query).
-        *
-        * If the QueryFilter hasn't been initialized, a ::CCM_DDS::InternalError
-        * exception with error code ::DDS::RETCODE_ERROR is thrown.
-        */
-      ::CCM_DDS::QueryFilter * query (void);
-
-      /**
-        * Sets the DDS4CCM query filter.
-        * The following rules apply when a filter is set:
-        *
-        * If there's a read condition set, this will be removed.
-        * The read condition is replaced by a query condition.
-        *
-        * If there're no query conditions yet (i.e. the filter hasn't
-        * been set before), three query conditions are created:
-        * 1. One for the Getter
-        * 2. One for the Reader
-        * 3. One for the Listener
-        * Each query condition has it's own sample_state,
-        * instance_state and view_state set but the filters are
-        * the same.
-        *
-        * Off course the query condition for the getter will be
-        * attached to the waitset.
-        *
-        * If the internal filter has already been set, this method sets
-        * the new parameters for this filter on all three query conditions.
-        *
-        * If the filter expression (the actual query) is empty, all three query
-        * conditions will be removed (the query condition for the getter will be
-        * detached from the waitset first) and the initial read condition will
-        * created (see init_readcondition()).
-        */
-      void query (const ::CCM_DDS::QueryFilter & filter);
-
-      /**
-        * Sets the internal datareader.
-        * Applies to Getter, Reader and Listener
-        */
-      void set_dds_entity (::DDS::DataReader_ptr dr);
-
-      /**
-        * Retrieves the internal datareader.
-        */
-      ::DDS::DataReader_ptr get_dds_entity (void);
-
-      /**
-        * Detaches conditions from the waitset and
-        * removes all conditions by calling
-        * delete_readcondition on the DataReader.
-        */
-      void passivate (void);
-
-    private:
-      ::DDS::DataReader_var dr_;
-
-      //TODO: Not allowed
-#if (CIAO_DDS4CCM_NDDS==1)
-      ::CIAO::NDDS::DDS_WaitSet_i ws_;
-#elif (CIAO_DDS4CCM_OPENDDS==1)
-      ::DDS::WaitSet ws_;
-#endif
-
-      /**
-        * Different QueryConditions since the sample mask
-        * differs for all entities.
-        */
-      ::DDS::QueryCondition_var qc_reader_;
-      ::DDS::QueryCondition_var qc_getter_;
-      ::DDS::QueryCondition_var qc_listener_;
-
-      ::DDS::ReadCondition_var rd_condition_;
-
-      /**
-        * Internal getter for the DataReader.
-        * If the internal dds_entity is not set before this method
-        * is called, a CORBA::BAD_INV_ORDER exception is thrown.
-        */
-      ::DDS::DataReader_ptr dds_entity (void);
-
-      /**
-        * Removes the internal (read/query) condition by invoking
-        * delete_condition on the DataReader.
-        */
-      void remove_condition (::DDS::QueryCondition_ptr qc,
-                             const char * type);
-
-      /**
-        * Calling 'remove_condition' for each query and read
-        * condition.
-        *
-        * The query condition for the getter will be detached from
-        * the waitset first.
-        */
-      void remove_conditions (void);
-
-      /**
-        * Getter functionality.
-        *
-        * Attaches the query condition for the getter to the
-        * waitset. It the waitset doesn't exist, it will be
-        * created.
-        */
-      void attach_querycondition (void);
-
-      /**
-        * Generic method which sets the parameters of the given
-        * filter on the given query condition.
-        */
-      void set_parameters (const ::CCM_DDS::QueryFilter & filter,
-                           ::DDS::QueryCondition_ptr qc);
-    };
-  }
-}
-
-#endif /* CONDITIONMANAGER_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/ContentFilterSetting.cpp b/CIAO/connectors/dds4ccm/impl/ContentFilterSetting.cpp
deleted file mode 100644
index 3ff0b3c939a..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ContentFilterSetting.cpp
+++ /dev/null
@@ -1,171 +0,0 @@
-#include "dds4ccm/impl/ContentFilterSetting.h"
-#include "dds4ccm/impl/logger/Log_Macros.h"
-#include "dds4ccm/impl/Utils.h"
-
-namespace CIAO
-{
-  namespace DDS4CCM
-  {
-    CCM_DDS_ContentFilterSetting_i::CCM_DDS_ContentFilterSetting_i ()
-    {
-      DDS4CCM_TRACE ("CCM_DDS_ContentFilterSetting_i::CCM_DDS_ContentFilterSetting_i");
-    }
-
-    CCM_DDS_ContentFilterSetting_i::~CCM_DDS_ContentFilterSetting_i ()
-    {
-      DDS4CCM_TRACE ("CCM_DDS_ContentFilterSetting_i::~CCM_DDS_ContentFilterSetting_i");
-    }
-
-    ::CCM_DDS::QueryFilter *
-    CCM_DDS_ContentFilterSetting_i::filter (void)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_ContentFilterSetting_i::filter");
-      ::CCM_DDS::QueryFilter* retval = new ::CCM_DDS::QueryFilter;
-      retval->expression = ::CORBA::string_dup (this->filter_.expression);
-      retval->parameters.length (this->filter_.parameters.length ());
-      for (::CORBA::ULong i = 0; i < this->filter_.parameters.length (); ++i)
-        {
-          retval->parameters[i] = ::CORBA::string_dup (this->filter_.parameters[i]);
-        }
-      return retval;
-    }
-
-    void
-    CCM_DDS_ContentFilterSetting_i::filter (
-      const ::CCM_DDS::QueryFilter & filter)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_ContentFilterSetting_i::filter");
-
-      this->filter_ = filter;
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                    "CCM_DDS_ContentFilterSetting_i::filter - "));
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG,
-                    "Expression : <%C>\t\n",
-                    filter.expression.in ()));
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                    "Parameters :\n"));
-      for (::CORBA::ULong i = 0; i < filter.parameters.length (); ++i)
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                        "\t<%C>\n",
-                        filter.parameters[i].in ()));
-        }
-    }
-
-    ::DDS::ContentFilteredTopic_ptr
-    CCM_DDS_ContentFilterSetting_i::create_contentfilteredtopic (
-      ::DDS::Topic_ptr topic,
-      ::DDS::Subscriber_ptr subscriber)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_ContentFilterSetting_i::create_contentfilteredtopic");
-
-      ::DDS::DomainParticipant_var dp = subscriber->get_participant ();
-      if (::CORBA::is_nil (dp.in ()))
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        "CCM_DDS_ContentFilterSetting_i::create_contentfilteredtopic: "
-                        "Unable to get DomainParticipant.\n"));
-          throw ::CORBA::INTERNAL ();
-        }
-
-      ACE_Auto_Array_Ptr <char> name;
-      {
-        char *name_bootstrap = 0;
-        ACE_NEW_THROW_EX (name_bootstrap,
-                          char[32],
-                          ::CORBA::NO_MEMORY ());
-        name.reset(name_bootstrap);
-      }
-      ACE_OS::sprintf (name.get (),
-                       "DDS4CCM_CFT_%ld",
-                       reinterpret_cast <unsigned long> (this));
-
-      this->cft_ = dp->create_contentfilteredtopic (name.get (),
-                                                    topic,
-                                                    this->filter_.expression,
-                                                    this->filter_.parameters);
-      if (::CORBA::is_nil (this->cft_.in ()))
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        "CCM_DDS_ContentFilterSetting_i::create_contentfilteredtopic: "
-                        "Error creating ContentFilteredTopic <%C>.\n",
-                        name.get ()));
-          throw ::CORBA::INTERNAL ();
-        }
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                    "CCM_DDS_ContentFilterSetting_i::create_contentfilteredtopic: "
-                    "successfully created ContentFilteredTopic <%C>\n",
-                    name.get ()));
-      return ::DDS::ContentFilteredTopic::_duplicate (this->cft_);
-    }
-
-    void
-    CCM_DDS_ContentFilterSetting_i::delete_contentfilteredtopic (
-      ::DDS::Subscriber_ptr subscriber)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_ContentFilterSetting_i::delete_contentfilteredtopic");
-
-      if (! ::CORBA::is_nil (subscriber))
-        {
-          ::DDS::DomainParticipant_var dp = subscriber->get_participant ();
-          ::DDS::ContentFilteredTopic_var cft = this->cft_._retn ();
-          if (! ::CORBA::is_nil (dp.in ()) && (! ::CORBA::is_nil (cft.in ())))
-            {
-              ::CORBA::String_var name = cft->get_name ();
-              ::DDS::ReturnCode_t const retcode =
-                dp->delete_contentfilteredtopic (cft.in ());
-
-              if (retcode == ::DDS::RETCODE_OK)
-                {
-                  DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                                "CCM_DDS_ContentFilterSetting_i::delete_contentfilteredtopic: "
-                                "successfully deleted ContentFilteredTopic <%C>\n",
-                                name.in ()));
-                }
-              else
-                {
-                  DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                                "CCM_DDS_ContentFilterSetting_i::delete_contentfilteredtopic: "
-                                "Error deleting ContentFilteredTopic <%C>: <%C>\n",
-                                name.in (),
-                                translate_retcode (retcode)));
-                  throw ::CCM_DDS::InternalError (retcode, 0);
-                }
-            }
-        }
-    }
-
-    void
-    CCM_DDS_ContentFilterSetting_i::set_filter_parameters (
-      const ::DDS::StringSeq & parameters)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_ContentFilterSetting_i::set_filter_parameters");
-      if (::CORBA::is_nil (this->cft_.in ()) ||
-          ACE_OS::strlen (this->filter_.expression.in ()) == 0)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        "CCM_DDS_ContentFilterSetting_i::set_filter_parameters: "
-                        "Calling set_filter_parameters without having set a filter\n"));
-          throw ::CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0);
-        }
-
-      ::DDS::ReturnCode_t const retcode =
-        this->cft_->set_expression_parameters (parameters);
-      if (retcode == ::DDS::RETCODE_OK)
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                        "CCM_DDS_ContentFilterSetting_i::set_filter_parameters: "
-                        "successfully set parameters on ContentFilteredTopic\n"));
-          this->filter_.parameters = parameters;
-        }
-      else
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        "CCM_DDS_ContentFilterSetting_i::set_filter_parameters: "
-                        "Error setting filter parameters: <%C>\n",
-                        translate_retcode (retcode)));
-          throw ::CCM_DDS::InternalError (retcode, 0);
-        }
-    }
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/impl/ContentFilterSetting.h b/CIAO/connectors/dds4ccm/impl/ContentFilterSetting.h
deleted file mode 100644
index 0411f28d476..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ContentFilterSetting.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef CCM_DDS_CONTENTFILTERSETTING_H
-#define CCM_DDS_CONTENTFILTERSETTING_H
-
-#include "dds4ccm/idl/dds4ccm_BaseC.h"
-#include "dds4ccm/idl/dds4ccm_BaseEC.h"
-#include "dds4ccm/impl/dds4ccm_dds_impl_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO
-{
-  namespace DDS4CCM
-  {
-    class DDS4CCM_DDS_IMPL_Export CCM_DDS_ContentFilterSetting_i
-      : public virtual ::CCM_DDS::CCM_ContentFilterSetting,
-        public virtual ::CORBA::LocalObject
-    {
-    public:
-      /// Constructor
-      CCM_DDS_ContentFilterSetting_i (void);
-
-      /// Destructor
-      virtual ~CCM_DDS_ContentFilterSetting_i (void);
-
-      virtual void set_filter_parameters (const ::DDS::StringSeq & parameters);
-
-      ::CCM_DDS::QueryFilter *filter (void);
-
-      void filter (const ::CCM_DDS::QueryFilter & filter);
-
-      ::DDS::ContentFilteredTopic_ptr
-      create_contentfilteredtopic (::DDS::Topic_ptr topic,
-                                   ::DDS::Subscriber_ptr subscriber);
-
-      void delete_contentfilteredtopic (::DDS::Subscriber_ptr subscriber);
-    private:
-      ::CCM_DDS::QueryFilter filter_;
-      ::DDS::ContentFilteredTopic_var cft_;
-    };
-  }
-}
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/impl/DDSCallbackStatusHandler.cpp b/CIAO/connectors/dds4ccm/impl/DDSCallbackStatusHandler.cpp
deleted file mode 100644
index 06e7db19130..00000000000
--- a/CIAO/connectors/dds4ccm/impl/DDSCallbackStatusHandler.cpp
+++ /dev/null
@@ -1,398 +0,0 @@
-#include "dds4ccm/impl/Utils.h"
-#include "dds4ccm/impl/DDSCallbackStatusHandler.h"
-#include "dds4ccm/impl/logger/Log_Macros.h"
-
-//============================================================
-// On_Unexpected_Status_Handler
-//============================================================
-namespace CIAO
-{
-  namespace DDS4CCM
-  {
-    DDSCallbackStatusHandlerBase::DDSCallbackStatusHandlerBase (void)
-    {
-      this->reference_counting_policy ().value
-        (ACE_Event_Handler::Reference_Counting_Policy::ENABLED);
-    }
-
-    DDSCallbackStatusHandlerBase::~DDSCallbackStatusHandlerBase (void)
-    {
-
-    }
-
-    OnUnexpectedStatusHandler::OnUnexpectedStatusHandler (
-      ::CCM_DDS::ConnectorStatusListener_ptr error_listener,
-      ::DDS::Entity_ptr entity,
-      ::DDS::StatusKind status_kind) :
-        error_listener_ (::CCM_DDS::ConnectorStatusListener::_duplicate (error_listener)),
-        entity_ (::DDS::Entity::_duplicate (entity)),
-        status_kind_ (status_kind)
-    {
-    }
-
-    OnUnexpectedStatusHandler::~OnUnexpectedStatusHandler (void)
-    {
-    }
-
-    int
-    OnUnexpectedStatusHandler::handle_exception (ACE_HANDLE)
-    {
-      try
-        {
-          this->error_listener_->on_unexpected_status (this->entity_, this->status_kind_);
-        }
-      catch (const ::CORBA::BAD_INV_ORDER& ex)
-        {
-          DDS4CCM_PRINT_DEBUG_CORBA_EXCEPTION (
-                                  DDS4CCM_LOG_LEVEL_ACTION,
-                                  ex,
-                                  "OnUnexpectedStatusHandler::handle_exception");
-        }
-      catch (const ::CORBA::Exception& ex)
-        {
-          DDS4CCM_PRINT_CORBA_EXCEPTION (
-                                  DDS4CCM_LOG_LEVEL_ERROR,
-                                  ex,
-                                  "OnUnexpectedStatusHandler::handle_exception");
-        }
-      catch (...)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-            "OnUnexpectedStatusHandler::handle_exception - "
-            "Unexpected exception caught for <%C>\n",
-            translate_statuskind (this->status_kind_)));
-
-        }
-      return 0;
-    }
-
-    //============================================================
-    // OnRequestedOncompatibleQosHandler
-    //============================================================
-    OnRequestedOncompatibleQosHandler::OnRequestedOncompatibleQosHandler (
-      ::CCM_DDS::ConnectorStatusListener_ptr csl,
-      ::DDS::DataReader_ptr dr,
-      const ::DDS::RequestedIncompatibleQosStatus &status) :
-        csl_ (::CCM_DDS::ConnectorStatusListener::_duplicate (csl)),
-        dr_ (::DDS::DataReader::_duplicate (dr)),
-        status_ (status)
-    {
-    }
-
-    OnRequestedOncompatibleQosHandler::~OnRequestedOncompatibleQosHandler (void)
-    {
-    }
-
-    int
-    OnRequestedOncompatibleQosHandler::handle_exception (ACE_HANDLE)
-    {
-      try
-        {
-          this->csl_->on_requested_incompatible_qos (this->dr_, this->status_);
-        }
-      catch (const ::CORBA::BAD_INV_ORDER& ex)
-        {
-          DDS4CCM_PRINT_DEBUG_CORBA_EXCEPTION (
-                                  DDS4CCM_LOG_LEVEL_ACTION,
-                                  ex,
-                                  "OnRequestedOncompatibleQosHandler::handle_exception");
-        }
-      catch (const ::CORBA::Exception& ex)
-        {
-          DDS4CCM_PRINT_CORBA_EXCEPTION (
-                                  DDS4CCM_LOG_LEVEL_ERROR,
-                                  ex,
-                                  "OnRequestedOncompatibleQosHandler::handle_exception");
-        }
-      catch (...)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-            "OnRequestedOncompatibleQosHandler::handle_exception - "
-            "Unexpected exception caught\n"));
-        }
-      return 0;
-    }
-
-    //============================================================
-    // OnSampleRejectedHandler
-    //============================================================
-    OnSampleRejectedHandler::OnSampleRejectedHandler (
-      ::CCM_DDS::ConnectorStatusListener_ptr csl,
-      ::DDS::DataReader_ptr dr,
-      const ::DDS::SampleRejectedStatus &status) :
-        csl_ (::CCM_DDS::ConnectorStatusListener::_duplicate (csl)),
-        dr_ (::DDS::DataReader::_duplicate (dr)),
-        status_ (status)
-    {
-    }
-
-    OnSampleRejectedHandler::~OnSampleRejectedHandler (void)
-    {
-    }
-
-    int
-    OnSampleRejectedHandler::handle_exception (ACE_HANDLE)
-    {
-      try
-        {
-          this->csl_->on_sample_rejected (this->dr_, this->status_);
-        }
-      catch (const ::CORBA::BAD_INV_ORDER& ex)
-        {
-          DDS4CCM_PRINT_DEBUG_CORBA_EXCEPTION (
-                                  DDS4CCM_LOG_LEVEL_ACTION,
-                                  ex,
-                                  "OnSampleRejectedHandler::handle_exception");
-        }
-      catch (const ::CORBA::Exception& ex)
-        {
-          DDS4CCM_PRINT_CORBA_EXCEPTION (
-                                  DDS4CCM_LOG_LEVEL_ERROR,
-                                  ex,
-                                  "OnSampleRejectedHandler::handle_exception");
-        }
-      catch (...)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-            "OnSampleRejectedHandler::handle_exception - "
-            "Unexpected exception caught\n"));
-        }
-      return 0;
-    }
-
-    //============================================================
-    // OnInconsistentTopicHandler
-    //============================================================
-    OnInconsistentTopicHandler::OnInconsistentTopicHandler (
-      ::CCM_DDS::ConnectorStatusListener_ptr csl,
-      ::DDS::Topic_ptr tp,
-      const ::DDS::InconsistentTopicStatus &status) :
-        csl_ (::CCM_DDS::ConnectorStatusListener::_duplicate (csl)),
-        tp_ (::DDS::Topic::_duplicate (tp)),
-        status_ (status)
-    {
-    }
-
-    OnInconsistentTopicHandler::~OnInconsistentTopicHandler (void)
-    {
-    }
-
-    int
-    OnInconsistentTopicHandler::handle_exception (ACE_HANDLE)
-    {
-      try
-        {
-          this->csl_->on_inconsistent_topic (this->tp_, this->status_);
-        }
-      catch (const ::CORBA::BAD_INV_ORDER& ex)
-        {
-          DDS4CCM_PRINT_DEBUG_CORBA_EXCEPTION (
-                                  DDS4CCM_LOG_LEVEL_ACTION,
-                                  ex,
-                                  "OnInconsistentTopicHandler::handle_exception");
-        }
-      catch (const ::CORBA::Exception& ex)
-        {
-          DDS4CCM_PRINT_CORBA_EXCEPTION (
-                                  DDS4CCM_LOG_LEVEL_ERROR,
-                                  ex,
-                                  "OnInconsistentTopicHandler::handle_exception");
-        }
-      catch (...)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-            "OnInconsistentTopicHandler::handle_exception - "
-            "Unexpected exception caught\n"));
-        }
-      return 0;
-    }
-
-    //============================================================
-    // OnOfferedDeadlineMissedHandler
-    //============================================================
-    OnOfferedDeadlineMissedHandler::OnOfferedDeadlineMissedHandler (
-      ::CCM_DDS::ConnectorStatusListener_ptr csl,
-      ::DDS::DataWriter_ptr dw,
-      const ::DDS::OfferedDeadlineMissedStatus &status) :
-        csl_ (::CCM_DDS::ConnectorStatusListener::_duplicate (csl)),
-        dw_ (::DDS::DataWriter::_duplicate (dw)),
-        status_ (status)
-    {
-    }
-
-    OnOfferedDeadlineMissedHandler::~OnOfferedDeadlineMissedHandler (void)
-    {
-    }
-
-    int
-    OnOfferedDeadlineMissedHandler::handle_exception (ACE_HANDLE)
-    {
-      try
-        {
-          this->csl_->on_offered_deadline_missed (this->dw_, this->status_);
-        }
-      catch (const ::CORBA::BAD_INV_ORDER& ex)
-        {
-          DDS4CCM_PRINT_DEBUG_CORBA_EXCEPTION (
-                                  DDS4CCM_LOG_LEVEL_ACTION,
-                                  ex,
-                                  "OnOfferedDeadlineMissedHandler::handle_exception");
-        }
-      catch (const ::CORBA::Exception& ex)
-        {
-          DDS4CCM_PRINT_CORBA_EXCEPTION (
-                                  DDS4CCM_LOG_LEVEL_ERROR,
-                                  ex,
-                                  "OnOfferedDeadlineMissedHandler::handle_exception");
-        }
-      catch (...)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-            "OnOfferedDeadlineMissedHandler::handle_exception - "
-            "Unexpected exception caught\n"));
-        }
-      return 0;
-    }
-
-    //============================================================
-    // OnOfferedIncompatibleQoSHandler
-    //============================================================
-    OnOfferedIncompatibleQoSHandler::OnOfferedIncompatibleQoSHandler (
-      ::CCM_DDS::ConnectorStatusListener_ptr csl,
-      ::DDS::DataWriter_ptr dw,
-      const ::DDS::OfferedIncompatibleQosStatus &status) :
-        csl_ (::CCM_DDS::ConnectorStatusListener::_duplicate (csl)),
-        dw_ (::DDS::DataWriter::_duplicate (dw)),
-        status_ (status)
-    {
-    }
-
-    OnOfferedIncompatibleQoSHandler::~OnOfferedIncompatibleQoSHandler (void)
-    {
-    }
-
-    int
-    OnOfferedIncompatibleQoSHandler::handle_exception (ACE_HANDLE)
-    {
-      try
-        {
-          this->csl_->on_offered_incompatible_qos (this->dw_, this->status_);
-        }
-      catch (const ::CORBA::BAD_INV_ORDER& ex)
-        {
-          DDS4CCM_PRINT_DEBUG_CORBA_EXCEPTION (
-                                  DDS4CCM_LOG_LEVEL_ACTION,
-                                  ex,
-                                  "OnOfferedIncompatibleQoSHandler::handle_exception");
-        }
-      catch (const ::CORBA::Exception& ex)
-        {
-          DDS4CCM_PRINT_CORBA_EXCEPTION (
-                                  DDS4CCM_LOG_LEVEL_ERROR,
-                                  ex,
-                                  "OnOfferedIncompatibleQoSHandler::handle_exception");
-        }
-      catch (...)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-            "OnOfferedIncompatibleQoSHandler::handle_exception - "
-            "Unexpected exception caught\n"));
-        }
-      return 0;
-    }
-
-    //============================================================
-    // OnRequestedDeadlineMissedHandler
-    //============================================================
-    OnRequestedDeadlineMissedHandler::OnRequestedDeadlineMissedHandler (
-      ::CCM_DDS::PortStatusListener_ptr psl,
-      ::DDS::DataReader_ptr dr,
-      const ::DDS::RequestedDeadlineMissedStatus & status) :
-        psl_ (::CCM_DDS::PortStatusListener::_duplicate (psl)),
-        dr_ (::DDS::DataReader::_duplicate (dr)),
-        status_ (status)
-    {
-    }
-
-    OnRequestedDeadlineMissedHandler::~OnRequestedDeadlineMissedHandler ()
-    {
-    }
-
-    int
-    OnRequestedDeadlineMissedHandler::handle_exception (ACE_HANDLE)
-    {
-      try
-        {
-          this->psl_->on_requested_deadline_missed (this->dr_, this->status_);
-        }
-      catch (const ::CORBA::BAD_INV_ORDER& ex)
-        {
-          DDS4CCM_PRINT_DEBUG_CORBA_EXCEPTION (
-                                  DDS4CCM_LOG_LEVEL_ACTION,
-                                  ex,
-                                  "OnRequestedDeadlineMissedHandler::handle_exception");
-        }
-      catch (const ::CORBA::Exception& ex)
-        {
-          DDS4CCM_PRINT_CORBA_EXCEPTION (
-                                  DDS4CCM_LOG_LEVEL_ERROR,
-                                  ex,
-                                  "OnRequestedDeadlineMissedHandler::handle_exception");
-        }
-      catch (...)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-            "OnRequestedDeadlineMissedHandler::handle_exception - "
-            "Unexpected exception caught\n"));
-        }
-      return 0;
-    }
-
-    //============================================================
-    // OnSampleLostHandler
-    //============================================================
-    OnSampleLostHandler::OnSampleLostHandler (
-      ::CCM_DDS::PortStatusListener_ptr psl,
-      ::DDS::DataReader_ptr dr,
-      const ::DDS::SampleLostStatus & status) :
-        psl_ (::CCM_DDS::PortStatusListener::_duplicate (psl)),
-        dr_ (::DDS::DataReader::_duplicate (dr)),
-        status_ (status)
-    {
-    }
-
-    OnSampleLostHandler::~OnSampleLostHandler ()
-    {
-    }
-
-    int
-    OnSampleLostHandler::handle_exception (ACE_HANDLE)
-    {
-      try
-        {
-          this->psl_->on_sample_lost (this->dr_, this->status_);
-        }
-      catch (const ::CORBA::BAD_INV_ORDER& ex)
-        {
-          DDS4CCM_PRINT_DEBUG_CORBA_EXCEPTION (
-                                  DDS4CCM_LOG_LEVEL_ACTION,
-                                  ex,
-                                  "OnSampleLostHandler::handle_exception");
-        }
-      catch (const ::CORBA::Exception& ex)
-        {
-          DDS4CCM_PRINT_CORBA_EXCEPTION (
-                                  DDS4CCM_LOG_LEVEL_ERROR,
-                                  ex,
-                                  "OnSampleLostHandler::handle_exception");
-        }
-      catch (...)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-            "OnSampleLostHandler::handle_exception - "
-            "Unexpected exception caught\n"));
-        }
-      return 0;
-    }
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/impl/DDSCallbackStatusHandler.h b/CIAO/connectors/dds4ccm/impl/DDSCallbackStatusHandler.h
deleted file mode 100644
index ef50ac24205..00000000000
--- a/CIAO/connectors/dds4ccm/impl/DDSCallbackStatusHandler.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/**
- * @author Johnny Willemsen  <jwillemsen@remedy.nl>
- *
- * Eventhandler on orb thread, handling the
- * received data from DDS.
- */
-
-#ifndef CIAO_DDS_CALLBACK_STATUS_HANDLER
-#define CIAO_DDS_CALLBACK_STATUS_HANDLER
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "dds4ccm/idl/dds4ccm_ConnectorStatusListenerC.h"
-#include "dds4ccm/idl/dds4ccm_PortStatusListenerC.h"
-#include "ace/Event_Handler.h"
-#include "dds4ccm/impl/dds4ccm_dds_impl_export.h"
-
-namespace CIAO
-{
-  namespace DDS4CCM
-  {
-    class DDSCallbackStatusHandlerBase
-      : public ACE_Event_Handler
-    {
-      public:
-        DDSCallbackStatusHandlerBase (void);
-        ~DDSCallbackStatusHandlerBase (void);
-    };
-
-    class DDS4CCM_DDS_IMPL_Export OnUnexpectedStatusHandler
-      : public DDSCallbackStatusHandlerBase
-    {
-      public:
-        OnUnexpectedStatusHandler (
-            ::CCM_DDS::ConnectorStatusListener_ptr error_listener,
-            ::DDS::Entity_ptr entity,
-            ::DDS::StatusKind status_kind);
-        virtual ~OnUnexpectedStatusHandler ();
-
-        virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
-      private:
-        ::CCM_DDS::ConnectorStatusListener_var error_listener_;
-        ::DDS::Entity_var entity_;
-        ::DDS::StatusKind status_kind_;
-    };
-
-    class DDS4CCM_DDS_IMPL_Export OnRequestedOncompatibleQosHandler
-      : public DDSCallbackStatusHandlerBase
-    {
-      public:
-        OnRequestedOncompatibleQosHandler (
-            ::CCM_DDS::ConnectorStatusListener_ptr csl,
-            ::DDS::DataReader_ptr dr,
-            const ::DDS::RequestedIncompatibleQosStatus &status);
-        virtual ~OnRequestedOncompatibleQosHandler ();
-        virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
-      private:
-        ::CCM_DDS::ConnectorStatusListener_var csl_;
-        ::DDS::DataReader_var dr_;
-        ::DDS::RequestedIncompatibleQosStatus const status_;
-    };
-
-    class DDS4CCM_DDS_IMPL_Export OnSampleRejectedHandler
-      : public DDSCallbackStatusHandlerBase
-    {
-      public:
-        OnSampleRejectedHandler (
-            ::CCM_DDS::ConnectorStatusListener_ptr csl,
-            ::DDS::DataReader_ptr dr,
-            const ::DDS::SampleRejectedStatus &status);
-        virtual ~OnSampleRejectedHandler ();
-        virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
-      private:
-        ::CCM_DDS::ConnectorStatusListener_var csl_;
-        ::DDS::DataReader_var dr_;
-        ::DDS::SampleRejectedStatus const status_;
-    };
-
-    class DDS4CCM_DDS_IMPL_Export OnInconsistentTopicHandler
-      : public DDSCallbackStatusHandlerBase
-    {
-      public:
-        OnInconsistentTopicHandler (
-            ::CCM_DDS::ConnectorStatusListener_ptr csl,
-            ::DDS::Topic_ptr tp,
-            const ::DDS::InconsistentTopicStatus &status);
-        virtual ~OnInconsistentTopicHandler ();
-        virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
-      private:
-        ::CCM_DDS::ConnectorStatusListener_var csl_;
-        ::DDS::Topic_var tp_;
-        ::DDS::InconsistentTopicStatus const status_;
-    };
-
-    class DDS4CCM_DDS_IMPL_Export OnOfferedDeadlineMissedHandler
-      : public DDSCallbackStatusHandlerBase
-    {
-      public:
-        OnOfferedDeadlineMissedHandler (
-            ::CCM_DDS::ConnectorStatusListener_ptr csl,
-            ::DDS::DataWriter_ptr dw,
-            const ::DDS::OfferedDeadlineMissedStatus &status);
-        virtual ~OnOfferedDeadlineMissedHandler ();
-        virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
-      private:
-        ::CCM_DDS::ConnectorStatusListener_var csl_;
-        ::DDS::DataWriter_var dw_;
-        ::DDS::OfferedDeadlineMissedStatus const status_;
-    };
-
-    class DDS4CCM_DDS_IMPL_Export OnOfferedIncompatibleQoSHandler
-      : public DDSCallbackStatusHandlerBase
-    {
-      public:
-        OnOfferedIncompatibleQoSHandler (
-            ::CCM_DDS::ConnectorStatusListener_ptr csl,
-            ::DDS::DataWriter_ptr dw,
-            const ::DDS::OfferedIncompatibleQosStatus &status);
-        virtual ~OnOfferedIncompatibleQoSHandler ();
-        virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
-      private:
-        ::CCM_DDS::ConnectorStatusListener_var csl_;
-        ::DDS::DataWriter_var dw_;
-        ::DDS::OfferedIncompatibleQosStatus const status_;
-    };
-
-    class DDS4CCM_DDS_IMPL_Export OnRequestedDeadlineMissedHandler
-      : public DDSCallbackStatusHandlerBase
-    {
-      public:
-        OnRequestedDeadlineMissedHandler (
-            ::CCM_DDS::PortStatusListener_ptr psl,
-            ::DDS::DataReader_ptr dr,
-            const ::DDS::RequestedDeadlineMissedStatus &status);
-        virtual ~OnRequestedDeadlineMissedHandler ();
-        virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
-      private:
-        ::CCM_DDS::PortStatusListener_var psl_;
-        ::DDS::DataReader_var dr_;
-        ::DDS::RequestedDeadlineMissedStatus const status_;
-    };
-
-    class DDS4CCM_DDS_IMPL_Export OnSampleLostHandler
-      : public DDSCallbackStatusHandlerBase
-    {
-      public:
-        OnSampleLostHandler (
-            ::CCM_DDS::PortStatusListener_ptr psl,
-            ::DDS::DataReader_ptr dr,
-            const ::DDS::SampleLostStatus &status);
-        virtual ~OnSampleLostHandler ();
-        virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
-      private:
-        ::CCM_DDS::PortStatusListener_var psl_;
-        ::DDS::DataReader_var dr_;
-        ::DDS::SampleLostStatus const status_;
-    };
-  }
-}
-
-#endif /* CIAO_DDS_CALLBACK_STATUS_HANDLER */
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp
deleted file mode 100644
index 7e325e5e60d..00000000000
--- a/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp
+++ /dev/null
@@ -1,1162 +0,0 @@
-// -*- C++ -*-
-#include "ace/Env_Value_T.h"
-#include "tao/ORB_Core.h"
-#include "dds4ccm/impl/Utils.h"
-#include "dds4ccm/impl/logger/Log_Macros.h"
-
-#include "dds4ccm/impl/TopicListener.h"
-#include "dds4ccm/impl/PublisherListener.h"
-#include "dds4ccm/impl/SubscriberListener.h"
-
-#include "dds4ccm/impl/DomainParticipantManager.h"
-
-#if (CIAO_DDS4CCM_NDDS==1)
-# include "dds4ccm/impl/ndds/TypeSupport.h"
-# include "dds4ccm/impl/ndds/DomainParticipant.h"
-#endif
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "dds/DCPS/Marked_Default_Qos.h"
-# include "dds/DCPS/RcHandle_T.h"
-# include "dds/DCPS/RTPS/RtpsDiscovery.h"
-# include "dds/DCPS/Discovery.h"
-# include "dds/DCPS/transport/framework/TransportType_rch.h"
-# include "dds/DCPS/transport/rtps_udp/RtpsUdpInst_rch.h"
-# include "dds/DCPS/transport/rtps_udp/RtpsUdpInst.h"
-# include "dds/DCPS/transport/framework/TransportRegistry.h"
-# include "dds/DCPS/transport/framework/TransportConfig_rch.h"
-#endif
-
-#if defined (GEN_OSTREAM_OPS)
-#include <sstream>
-#endif
-
-template <typename CCM_TYPE>
-DDS_Base_Connector_T<CCM_TYPE>::DDS_Base_Connector_T (void)
-  : domain_id_ (0)
-  , configuration_complete_ (false)
-  , dlf_ (0)
-  , qos_xml_ (0)
-{
-  DDS4CCM_TRACE ("DDS_Base_Connector_T<CCM_TYPE>::DDS_Base_Connector_T");
-
-  ACE_Env_Value<int> id (ACE_TEXT("DDS4CCM_DEFAULT_DOMAIN_ID"), this->domain_id_);
-  this->domain_id_ = id;
-#if (CIAO_DDS4CCM_OPENDDS==1)
-  ACE_Env_Value<int> oid (ACE_TEXT("OPENDDS_RTPS_DEFAULT_D0"), this->domain_id_);
-  this->domain_id_ = oid;
-#endif
-  this->dlf_ =
-    ACE_Dynamic_Service<CIAO::DDS4CCM::Logger_Service>::instance ("DDS4CCM_Logger");
-  if (this->dlf_)
-    {
-      this->dlf_->init ();
-    }
-  qos_xml_ = new DDS_XML_QOS_PARSER_TYPE;
-  this->create_dds_participant_factory ();
-}
-
-template <typename CCM_TYPE>
-DDS_Base_Connector_T<CCM_TYPE>::~DDS_Base_Connector_T (void)
-{
-  DDS4CCM_TRACE ("DDS_Base_Connector_T<CCM_TYPE>::~DDS_Base_Connector_T");
-
-  DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_TRACE, DDS4CCM_INFO
-                "DDS_Base_Connector_T::~DDS_Base_Connector_T - "
-                "Connector has been destructed\n"));
-  delete this->qos_xml_;
-  this->qos_xml_ = 0;
-
-  if (DPMANAGER->close())
-    {
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_TRACE, DDS4CCM_INFO
-                "DDS_Base_Connector_T"
-                "::~DDS_Base_Connector_T - "
-                "Closed the domain participant manager, DDS interaction "
-                "has been shutdown completely.\n"));
-    }
-  else
-    {
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_TRACE, DDS4CCM_INFO
-                "DDS_Base_Connector_T"
-                "::~DDS_Base_Connector_T - "
-                "Didn't shutdown the domain participant manager, DDS interaction "
-                "still active.\n"));
-    }
-}
-
-template <typename CCM_TYPE>
-void
-DDS_Base_Connector_T<CCM_TYPE>::create_dds_participant_factory (void)
-{
-  DDS4CCM_TRACE ("DDS_Base_Connector_T<CCM_TYPE>::create_dds_participant_factory");
-  try
-    {
-      if (::CORBA::is_nil (this->participant_factory_.in ()))
-        {
-#if (CIAO_DDS4CCM_OPENDDS==1)
-          this->participant_factory_ = TheParticipantFactory;
-          TheServiceParticipant->set_default_discovery (OpenDDS::DCPS::Discovery::DEFAULT_RTPS);
-
-          OpenDDS::RTPS::RtpsDiscovery_rch disc =
-            new OpenDDS::RTPS::RtpsDiscovery(OpenDDS::DCPS::Discovery::DEFAULT_RTPS);
-
-          TheServiceParticipant->add_discovery(OpenDDS::DCPS::static_rchandle_cast<OpenDDS::DCPS::Discovery>(disc));
-          TheServiceParticipant->set_repo_domain(this->domain_id (), disc->key());
-#else
-          this->participant_factory_ =
-            new ::CIAO::NDDS::DDS_DomainParticipantFactory_i;
-#endif
-        }
-    }
-  catch (const CORBA::Exception& e)
-    {
-      DDS4CCM_PRINT_CORBA_EXCEPTION (DDS4CCM_LOG_LEVEL_ERROR, e,
-          "DDS_Base_Connector_T::create_dds_participant_factory - "
-          "Exception caught whilst setting up dds participant factory");
-      throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0);
-    }
-}
-
-template <typename CCM_TYPE>
-::DDS::DomainId_t
-DDS_Base_Connector_T<CCM_TYPE>::domain_id (void)
-{
-  DDS4CCM_TRACE ("DDS_Base_Connector_T<CCM_TYPE>::domain_id");
-
-  return this->domain_id_;
-}
-
-template <typename CCM_TYPE>
-void
-DDS_Base_Connector_T<CCM_TYPE>::domain_id (
-  ::DDS::DomainId_t domain_id)
-{
-  DDS4CCM_TRACE ("DDS_Base_Connector_T<CCM_TYPE>::domain_id");
-
-  if (this->configuration_complete_)
-    {
-      throw ::CCM_DDS::NonChangeable ();
-    }
-  else
-    {
-      this->domain_id_ = domain_id;
-    }
-}
-
-template <typename CCM_TYPE>
-char *
-DDS_Base_Connector_T<CCM_TYPE>::qos_profile (void)
-{
-  DDS4CCM_TRACE ("DDS_Base_Connector_T<CCM_TYPE>::qos_profile");
-
-  return CORBA::string_dup (this->qos_profile_.in ());
-}
-
-template <typename CCM_TYPE>
-void
-DDS_Base_Connector_T<CCM_TYPE>::qos_profile (
-  const char * qos_profile)
-{
-  DDS4CCM_TRACE ("DDS_Base_Connector_T<CCM_TYPE>::qos_profile");
-
-  if (this->configuration_complete_)
-    {
-      throw ::CCM_DDS::NonChangeable ();
-    }
-  else
-    {
-      this->qos_profile_ = ::CORBA::string_dup (qos_profile);
-
-      if (this->qos_xml_)
-        {
-          DDS::ReturnCode_t const retcode = this->qos_xml_->init (qos_profile);
-          if (retcode != ::DDS::RETCODE_OK)
-            {
-              DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                  "DDS_Base_Connector_T::qos_profile - "
-                  "Error while initializing QOS Handler <%C>\n",
-                  ::CIAO::DDS4CCM::translate_retcode (retcode)));
-              throw ::CCM_DDS::InternalError (retcode, 0);
-            }
-        }
-    }
-}
-
-template <typename CCM_TYPE>
-void
-DDS_Base_Connector_T<CCM_TYPE>::init_domain (
-  ::DDS::DomainParticipant_ptr & participant)
-{
-  DDS4CCM_TRACE ("DDS_Base_Connector_T<CCM_TYPE>::init_domain");
-
-  DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_TRACE, DDS4CCM_INFO
-                "DDS_Base_Connector_T::init_domain - "
-                "Start configuring default domain <%d>\n",
-                this->domain_id_));
-
-#if (CIAO_DDS4CCM_NDDS==1)
-  if (this->qos_profile_.in () != 0)
-    {
-      this->participant_factory_->set_default_participant_qos_with_profile (
-                                      this->qos_profile_.in ());
-
-      DDS::DomainParticipant_var dds_dp =
-        DPMANAGER->get_participant (this->domain_id_, this->qos_profile_.in ());
-
-      if (::CORBA::is_nil (dds_dp.in ()))
-        {
-          // Create a new participant for this qos profile and domain ID.
-          participant = this->participant_factory_->create_participant_with_profile (
-                                          this->domain_id_,
-                                          this->qos_profile_.in (),
-                                          ::DDS::DomainParticipantListener::_nil (),
-                                          0);
-          if (!DPMANAGER->register_participant (
-            this->domain_id_, this->qos_profile_.in (), participant))
-            {
-              DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                          "DDS_Base_Connector_T::init_domain - "
-                          "Error: Unable to register DomainParticipant for domain <%d>\n",
-                          this->domain_id_));
-              throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0);
-            }
-        }
-      else
-        {
-          // Re-use the domain_participant for this QOS profile and domain ID
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_TRACE, DDS4CCM_INFO
-                        "DDS_Base_Connector_T::init_domain - "
-                        "Re-using domainparticipant "
-                        DDS_ENTITY_FORMAT_SPECIFIER
-                        " domain <%d> - "
-                        "qos_profile <%C>\n",
-                        DDS_ENTITY_LOG (dds_dp.in ()),
-                        this->domain_id_, this->qos_profile_.in ()));
-
-          participant = ::DDS::DomainParticipant::_duplicate (dds_dp.in ());
-        }
-    }
-  else
-#endif
-    {
-      ::DDS::DomainParticipantQos qos;
-      DDS::ReturnCode_t const retcode =
-        this->participant_factory_->get_default_participant_qos (qos);
-
-      if (retcode != DDS::RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-              "DDS_Base_Connector_T::init_domain - "
-              "Error: Unable to retrieve default_participant_qos: <%C>\n",
-              ::CIAO::DDS4CCM::translate_retcode (retcode)));
-          throw ::CCM_DDS::InternalError (retcode, 0);
-        }
-
-      if (this->qos_profile_.in () != 0 && this->qos_xml_)
-        {
-          DDS::ReturnCode_t const retcode_dp_qos =
-            this->qos_xml_->get_participant_qos (
-              qos,
-              this->qos_profile_.in ());
-
-          if (retcode_dp_qos != DDS::RETCODE_OK)
-            {
-              DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                  "DDS_Base_Connector_T::init_domain - "
-                  "Error: Unable to retrieve participant QOS from XML: <%C>\n",
-                  ::CIAO::DDS4CCM::translate_retcode (retcode_dp_qos)));
-              throw ::CCM_DDS::InternalError (retcode_dp_qos, 0);
-            }
-        }
-
-#if defined GEN_OSTREAM_OPS
-      if (DDS4CCM_debug_level >= DDS4CCM_LOG_LEVEL_DDS_STATUS)
-        {
-          std::stringstream output;
-          output << qos;
-          std::string message = output.str();
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_INFO, DDS4CCM_INFO
-                        ACE_TEXT ("DDS_Base_Connector_T::init_domain - ")
-                        ACE_TEXT ("Using participant QOS <%C>\n"), message.c_str()));
-        }
-#endif
-
-      DDS::DomainParticipant_var dds_dp =
-        DPMANAGER->get_participant (this->domain_id_, this->qos_profile_.in ());
-
-      if (::CORBA::is_nil (dds_dp.in ()))
-        {
-          // Create a new participant for this qos profile and domain ID.
-          participant = this->participant_factory_->create_participant (
-                                          this->domain_id_,
-                                          qos,
-                                          ::DDS::DomainParticipantListener::_nil (),
-                                          0);
-
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_TRACE, DDS4CCM_INFO
-                        "DDS_Base_Connector_T::init_domain - "
-                        "Created domainparticipant "
-                        DDS_ENTITY_FORMAT_SPECIFIER
-                        " domain <%d> - "
-                        "qos_profile <%C>\n",
-                        DDS_ENTITY_LOG (participant),
-                        this->domain_id_, this->qos_profile_.in ()));
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-          // Ok, we need to create a new domain participant, let us setup some
-          // special transport settings right now.
-          // Convert the domain id to a string and by concatenating the qos_profile
-          // string we get an unique string
-          char str_domain_id[10];
-          ACE_OS::itoa (this->domain_id (), str_domain_id, 10);
-          std::string config_name = str_domain_id;
-          std::string rtps_transport_name = str_domain_id;
-          config_name.append ("#");
-          rtps_transport_name.append ("#");
-          if (this->qos_profile_.in () != 0)
-            {
-              config_name.append (this->qos_profile_.in ());
-              rtps_transport_name.append (this->qos_profile_.in ());
-            }
-          rtps_transport_name.append ("#");
-          rtps_transport_name.append ("transport");
-
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_TRACE, DDS4CCM_INFO
-              "DDS_Base_Connector_T::init_domain - "
-              "Creating OpenDDS config <%C> for transport <%C>\n",
-              config_name.c_str(), rtps_transport_name.c_str ()));
-
-          OpenDDS::DCPS::TransportInst_rch inst =
-            OpenDDS::DCPS::TransportRegistry::instance()->get_inst(rtps_transport_name);
-
-          if (inst.is_nil())
-            {
-              inst =
-                OpenDDS::DCPS::TransportRegistry::instance()->create_inst(rtps_transport_name,
-                                                                          "rtps_udp");
-            }
-
-          OpenDDS::DCPS::TransportConfig_rch config =
-            OpenDDS::DCPS::TransportRegistry::instance()->get_config(config_name);
-
-          if (config.is_nil ())
-            {
-              config =
-                OpenDDS::DCPS::TransportRegistry::instance()->create_config(config_name);
-            }
-
-          config->instances_.push_back (inst);
-          TheTransportRegistry->bind_config(config, participant);
-#endif
-
-          if (!DPMANAGER->register_participant (
-                this->domain_id_, this->qos_profile_.in (), participant))
-            {
-              DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                          "DDS_Base_Connector_T::init_domain - "
-                          "Error: Unable to register DomainParticipant for domain <%d>\n",
-                          this->domain_id_));
-              throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0);
-            }
-        }
-      else
-        {
-          // Re-use the domain_participant for this QOS profile and domain ID
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_TRACE, DDS4CCM_INFO
-                        "DDS_Base_Connector_T::init_domain - "
-                        "Re-using domainparticipant "
-                        DDS_ENTITY_FORMAT_SPECIFIER
-                        ". domain <%d> - "
-                        "qos_profile <%C>\n",
-                        DDS_ENTITY_LOG (dds_dp.in ()),
-                        this->domain_id_, this->qos_profile_.in ()));
-          participant = ::DDS::DomainParticipant::_duplicate (dds_dp.in ());
-        }
-    }
-
-  if (::CORBA::is_nil (participant))
-    {
-      DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                  "DDS_Base_Connector_T::init_domain - "
-                  "Error: Unable to create DomainParticipant for domain <%d>\n",
-                  this->domain_id_));
-      throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0);
-    }
-}
-
-template <typename CCM_TYPE>
-void
-DDS_Base_Connector_T<CCM_TYPE>::set_session_context (
-  ::Components::SessionContext_ptr ctx)
-{
-  DDS4CCM_TRACE ("DDS_Base_Connector_T<CCM_TYPE>::set_session_context");
-
-  typename CCM_TYPE::context_type::_var_type lctx =
-    CCM_TYPE::context_type::_narrow (ctx);
-
-  if (::CORBA::is_nil (lctx.in ()))
-    {
-      throw ::CORBA::INTERNAL ();
-    }
-
-  this->context_ = lctx;
-}
-
-template <typename CCM_TYPE>
-void
-DDS_Base_Connector_T<CCM_TYPE>::configuration_complete (void)
-{
-  DDS4CCM_TRACE ("DDS_Base_Connector_T<CCM_TYPE>::configuration_complete");
-  this->init_domain (this->domain_participant_.inout ());
-  this->configuration_complete_ = true;
-}
-
-template <typename CCM_TYPE>
-void
-DDS_Base_Connector_T<CCM_TYPE>::ccm_activate (void)
-{
-  DDS4CCM_TRACE ("DDS_Base_Connector_T<CCM_TYPE>::ccm_activate");
-}
-
-template <typename CCM_TYPE>
-void
-DDS_Base_Connector_T<CCM_TYPE>::ccm_passivate (void)
-{
-  DDS4CCM_TRACE ("DDS_Base_Connector_T<CCM_TYPE>::ccm_passivate");
-}
-
-template <typename CCM_TYPE>
-void
-DDS_Base_Connector_T<CCM_TYPE>::ccm_remove (void)
-{
-  DDS4CCM_TRACE ("DDS_Base_Connector_T<CCM_TYPE>::ccm_remove");
-
-  ::DDS::DomainParticipant_var dp = this->domain_participant_._retn ();
-  if (!::CORBA::is_nil (dp.in ()))
-    {
-      this->remove_domain (dp.in ());
-    }
-}
-
-template <typename CCM_TYPE>
-ACE_Reactor*
-DDS_Base_Connector_T<CCM_TYPE>::reactor (void)
-{
-  DDS4CCM_TRACE ("DDS_Base_Connector_T<CCM_TYPE>::reactor");
-
-  ACE_Reactor* reactor = 0;
-
-#if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-  ::CORBA::Object_var ccm_object = this->context_->get_CCM_object();
-  if (!::CORBA::is_nil (ccm_object.in ()))
-    {
-      ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-      if (!::CORBA::is_nil (orb.in ()))
-        {
-          reactor = orb->orb_core ()->reactor ();
-          if (!reactor)
-            {
-              DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                            "DDS_Event_Connector_T::ccm_activate - "
-                            "No reactor to perform required context switch.\n"));
-              throw ::CORBA::INTERNAL ();
-            }
-        }
-    }
-#endif
-  return reactor;
-}
-
-/**
-  * Initialization
- **/
-template <typename CCM_TYPE>
-void
-DDS_Base_Connector_T<CCM_TYPE>::init_topic (
-  ::DDS::DomainParticipant_ptr participant,
-  ::DDS::Topic_ptr & topic,
-  const char * topic_name,
-  const char * type_name)
-{
-  DDS4CCM_TRACE ("DDS_Base_Connector_T::init_topic");
-
-  ::DDS::Duration_t timeout;
-  timeout.sec = 0;
-  timeout.nanosec = 0;
-
-  DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_TRACE, DDS4CCM_INFO
-                "DDS_Base_Connector_T::init_topic - "
-                "Finding existing topic "
-                "name <%C> for profile <%C> in participant "
-                DDS_ENTITY_FORMAT_SPECIFIER "\n",
-                topic_name, this->qos_profile_.in (),
-                DDS_ENTITY_LOG (participant)));
-
-  ::DDS::Topic_var dds_tp =
-    participant->find_topic (topic_name, timeout);
-
-  if (!CORBA::is_nil (dds_tp.in ()))
-    {
-      // Re-use topic.
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_TRACE, DDS4CCM_INFO
-                    "DDS_Base_Connector_T::init_topic - "
-                    "Re using topic <%C> for profile <%C>\n",
-                    topic_name, this->qos_profile_.in ()));
-
-      topic = ::DDS::Topic::_duplicate (dds_tp);
-      return;
-    }
-#if (CIAO_DDS4CCM_NDDS==1)
-  if (this->qos_profile_.in () != 0)
-    {
-      // Create a new topic
-      topic = participant->create_topic_with_profile (topic_name,
-                                          type_name,
-                                          this->qos_profile_.in (),
-                                          ::DDS::TopicListener::_nil (),
-                                          0);
-    }
-  else
-#endif
-    {
-      ::DDS::TopicQos tqos;
-      DDS::ReturnCode_t const retcode =
-        participant->get_default_topic_qos (tqos);
-
-      if (retcode != DDS::RETCODE_OK)
-      {
-        DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-            "DDS_Base_Connector_T::init_topic - "
-            "Error: Unable to retrieve default_topic_qos: <%C>\n",
-            ::CIAO::DDS4CCM::translate_retcode (retcode)));
-        throw ::CCM_DDS::InternalError (retcode, 0);
-      }
-
-      if (this->qos_profile_.in () != 0 && this->qos_xml_)
-        {
-          DDS::ReturnCode_t const retcode_tp_qos =
-            this->qos_xml_->get_topic_qos (
-                        tqos,
-                        this->qos_profile_.in (),
-                        topic_name);
-
-          if (retcode_tp_qos != DDS::RETCODE_OK)
-            {
-              DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                  "DDS_Base_Connector_T::init_topic - "
-                  "Error: Unable to retrieve topic QOS from XML: <%C>\n",
-                  ::CIAO::DDS4CCM::translate_retcode (retcode_tp_qos)));
-              throw ::CCM_DDS::InternalError (retcode_tp_qos, 0);
-            }
-        }
-
-#if defined GEN_OSTREAM_OPS
-      if (DDS4CCM_debug_level >= DDS4CCM_LOG_LEVEL_DDS_STATUS)
-        {
-          std::stringstream output;
-          output << tqos;
-          std::string message = output.str();
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_INFO, DDS4CCM_INFO
-                        ACE_TEXT ("DDS_Base_Connector_T::init_topic - ")
-                        ACE_TEXT ("Using topic QOS <%C>\n"), message.c_str()));
-        }
-#endif
-
-      // Create a new topic
-      topic = participant->create_topic (topic_name,
-                            type_name,
-                            tqos,
-                            ::DDS::TopicListener::_nil (),
-                            0);
-    }
-
-  if (!::CORBA::is_nil (topic))
-    {
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_TRACE, DDS4CCM_INFO
-                    "DDS_Base_Connector_T::init_topic - "
-                    "Created new topic "
-                    DDS_ENTITY_FORMAT_SPECIFIER
-                    " name <%C> type <%C> for profile <%C>\n",
-                    DDS_ENTITY_LOG (topic),
-                    topic_name, type_name, this->qos_profile_.in ()));
-    }
-  else
-    {
-      DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_DDS_NIL_RETURN, (LM_ERROR, DDS4CCM_INFO
-                    "DDS_Base_Connector_T::init_topic - "
-                    "Error: unable to create new topic <%C> for profile <%C>\n",
-                    topic_name, this->qos_profile_.in ()));
-      throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0);
-    }
-}
-
-template <typename CCM_TYPE>
-void
-DDS_Base_Connector_T<CCM_TYPE>::init_publisher (
-  ::DDS::DomainParticipant_ptr participant,
-  ::DDS::Publisher_ptr & publisher)
-{
-  DDS4CCM_TRACE ("DDS_Base_Connector_T::init_publisher");
-
-  if (::CORBA::is_nil (publisher))
-    {
-#if (CIAO_DDS4CCM_NDDS==1)
-      if (this->qos_profile_.in () != 0)
-        {
-          publisher = participant->create_publisher_with_profile (
-                                              this->qos_profile_.in (),
-                                              ::DDS::PublisherListener::_nil (),
-                                              0);
-        }
-      else
-#endif
-        {
-          ::DDS::PublisherQos pqos;
-          DDS::ReturnCode_t const retcode =
-            participant->get_default_publisher_qos (pqos);
-
-          if (retcode != DDS::RETCODE_OK)
-            {
-              DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                  "DDS_Base_Connector_T::init_publisher - "
-                  "Error: Unable to retrieve get_default_publisher_qos: <%C>\n",
-                  ::CIAO::DDS4CCM::translate_retcode (retcode)));
-              throw ::CCM_DDS::InternalError (retcode, 0);
-            }
-
-          if (this->qos_profile_.in () != 0 && this->qos_xml_)
-            {
-              DDS::ReturnCode_t const retcode_pub_qos =
-                this->qos_xml_->get_publisher_qos (
-                  pqos,
-                  this->qos_profile_.in ());
-
-              if (retcode_pub_qos != DDS::RETCODE_OK)
-                {
-                  DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                      "DDS_Base_Connector_T::init_publisher - "
-                      "Error: Unable to retrieve publisher QOS from XML: <%C>\n",
-                      ::CIAO::DDS4CCM::translate_retcode (retcode_pub_qos)));
-                  throw ::CCM_DDS::InternalError (retcode_pub_qos, 0);
-                }
-            }
-
-#if defined GEN_OSTREAM_OPS
-          if (DDS4CCM_debug_level >= DDS4CCM_LOG_LEVEL_DDS_STATUS)
-            {
-              std::stringstream output;
-              output << pqos;
-              std::string message = output.str();
-              DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_INFO, DDS4CCM_INFO
-                            ACE_TEXT ("DDS_Base_Connector_T::init_publisher - ")
-                            ACE_TEXT ("Using publisher QOS <%C>\n"), message.c_str()));
-            }
-#endif
-
-          publisher = participant->create_publisher (pqos,
-                                            ::DDS::PublisherListener::_nil (),
-                                            0);
-        }
-      if (!::CORBA::is_nil (publisher))
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_TRACE, DDS4CCM_INFO
-                      "DDS_Base_Connector_T::init_publisher - "
-                      "Created publisher "
-                      DDS_ENTITY_FORMAT_SPECIFIER
-                      " using participant "
-                      DDS_ENTITY_FORMAT_SPECIFIER
-                      "\n",
-                      DDS_ENTITY_LOG (publisher),
-                      DDS_ENTITY_LOG (participant)));
-        }
-      else
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_DDS_NIL_RETURN, (LM_ERROR, DDS4CCM_INFO
-                        "DDS_Base_Connector_T::init_publisher - "
-                        "Error: DDS returned a nil publisher.\n"));
-          throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0);
-        }
-    }
-}
-
-template <typename CCM_TYPE>
-void
-DDS_Base_Connector_T<CCM_TYPE>::init_subscriber (
-  ::DDS::DomainParticipant_ptr participant,
-  ::DDS::Subscriber_ptr & subscriber)
-{
-  DDS4CCM_TRACE ("DDS_Base_Connector_T::init_subscriber");
-
-  if (::CORBA::is_nil (subscriber))
-    {
-#if (CIAO_DDS4CCM_NDDS==1)
-      if (this->qos_profile_.in () != 0)
-        {
-          subscriber = participant->create_subscriber_with_profile (
-                                              this->qos_profile_.in (),
-                                              ::DDS::SubscriberListener::_nil (),
-                                              0);
-        }
-      else
-#endif
-        {
-          ::DDS::SubscriberQos sqos;
-          DDS::ReturnCode_t const retcode =
-            participant->get_default_subscriber_qos (sqos);
-
-          if (retcode != DDS::RETCODE_OK)
-            {
-              DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                  "DDS_Base_Connector_T::init_subscriber - "
-                  "Error: Unable to retrieve get_default_subscriber_qos: <%C>\n",
-                  ::CIAO::DDS4CCM::translate_retcode (retcode)));
-              throw ::CCM_DDS::InternalError (retcode, 0);
-            }
-
-          if (this->qos_profile_.in () != 0 && this->qos_xml_)
-            {
-              DDS::ReturnCode_t const retcode_sub_qos =
-                this->qos_xml_->get_subscriber_qos (
-                  sqos,
-                  this->qos_profile_.in ());
-
-              if (retcode_sub_qos != DDS::RETCODE_OK)
-                {
-                  DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                      "DDS_Base_Connector_T::init_subscriber - "
-                      "Error: Unable to retrieve subscriber QOS from XML: <%C>\n",
-                      ::CIAO::DDS4CCM::translate_retcode (retcode_sub_qos)));
-                  throw ::CCM_DDS::InternalError (retcode_sub_qos, 0);
-                }
-            }
-
-#if defined GEN_OSTREAM_OPS
-          if (DDS4CCM_debug_level >= DDS4CCM_LOG_LEVEL_DDS_STATUS)
-            {
-              std::stringstream output;
-              output << sqos;
-              std::string message = output.str();
-              DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_INFO, DDS4CCM_INFO
-                            ACE_TEXT ("DDS_Base_Connector_T::init_subscriber - ")
-                            ACE_TEXT ("Using subscriber QOS <%C>\n"), message.c_str()));
-            }
-#endif
-
-          subscriber = participant->create_subscriber (sqos,
-                                              ::DDS::SubscriberListener::_nil (),
-                                              0);
-        }
-      if (!::CORBA::is_nil (subscriber))
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_TRACE, DDS4CCM_INFO
-                      "DDS_Base_Connector_T::init_subscriber - "
-                      "Created subscriber "
-                      DDS_ENTITY_FORMAT_SPECIFIER
-                      " using participant "
-                      DDS_ENTITY_FORMAT_SPECIFIER
-                      "\n",
-                      DDS_ENTITY_LOG (subscriber),
-                      DDS_ENTITY_LOG (participant)));
-        }
-      else
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_DDS_NIL_RETURN, (LM_ERROR, DDS4CCM_INFO
-                        "DDS_Base_Connector_T::init_subscriber - "
-                        "Error: DDS returned a nil subscriber.\n"));
-          throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0);
-        }
-    }
-}
-
-/**
-  * Activation
- **/
-template <typename CCM_TYPE>
-void
-DDS_Base_Connector_T<CCM_TYPE>::activate_topic (
-  ACE_Reactor* reactor,
-  ::DDS::Topic_ptr topic,
-  ::DDS::TopicListener_ptr & listener)
-{
-  DDS4CCM_TRACE ("DDS_Base_Connector_T::activate_topic");
-
-  ::CCM_DDS::ConnectorStatusListener_var error_listener =
-    this->context_->get_connection_error_listener ();
-
-  ::DDS::StatusMask const mask =
-    ::CIAO::DDS4CCM::TopicListener::get_mask (error_listener.in ());
-
-  if (mask != 0)
-    {
-      // If no listener has been passed in we create the default
-      // topic listener
-      if (::CORBA::is_nil (listener))
-        {
-          ACE_NEW_THROW_EX (listener,
-                            ::CIAO::DDS4CCM::TopicListener (
-                              error_listener.in (),
-                              reactor),
-                            ::CORBA::NO_MEMORY ());
-        }
-
-      DDS::ReturnCode_t const retcode = topic->set_listener (listener, mask);
-
-      if (retcode != ::DDS::RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        "DDS_Base_Connector_T::activate_topic - "
-                        "Error while setting the listener on the topic - <%C>\n",
-                        ::CIAO::DDS4CCM::translate_retcode (retcode)));
-          throw ::CORBA::INTERNAL ();
-        }
-    }
-}
-
-template <typename CCM_TYPE>
-void
-DDS_Base_Connector_T<CCM_TYPE>::activate_publisher (
-  ACE_Reactor* reactor,
-  ::DDS::Publisher_ptr publisher,
-  ::DDS::PublisherListener_ptr & publisher_listener)
-{
-  DDS4CCM_TRACE ("DDS_Base_Connector_T::activate_publisher");
-
-  ::CCM_DDS::ConnectorStatusListener_var error_listener =
-    this->context_->get_connection_error_listener ();
-
-  ::DDS::StatusMask const mask =
-      ::CIAO::DDS4CCM::PublisherListener::get_mask (error_listener.in ());
-
-  if (mask != 0)
-    {
-      if (::CORBA::is_nil (publisher_listener))
-        {
-          ACE_NEW_THROW_EX (publisher_listener,
-                            ::CIAO::DDS4CCM::PublisherListener (
-                              error_listener.in (),
-                              reactor),
-                            ::CORBA::NO_MEMORY ());
-        }
-
-      DDS::ReturnCode_t const retcode = publisher->set_listener (publisher_listener,
-                                                                   mask);
-
-      if (retcode != ::DDS::RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        "DDS_Base_Connector_T::activate_publisher - "
-                        "Error while setting the listener on the publisher - <%C>\n",
-                        ::CIAO::DDS4CCM::translate_retcode (retcode)));
-          throw ::CORBA::INTERNAL ();
-        }
-    }
-}
-
-template <typename CCM_TYPE>
-void
-DDS_Base_Connector_T<CCM_TYPE>::activate_subscriber (
-  ACE_Reactor* reactor,
-  ::DDS::Subscriber_ptr subscriber,
-  ::DDS::SubscriberListener_ptr & subscriber_listener)
-{
-  DDS4CCM_TRACE ("DDS_Base_Connector_T::activate_subscriber");
-
-  ::CCM_DDS::ConnectorStatusListener_var error_listener =
-    this->context_->get_connection_error_listener ();
-
-  ::DDS::StatusMask const mask =
-    ::CIAO::DDS4CCM::SubscriberListener::get_mask (error_listener.in ());
-
-  if (mask != 0)
-    {
-      if (::CORBA::is_nil (subscriber_listener))
-        {
-          ACE_NEW_THROW_EX (subscriber_listener,
-                            ::CIAO::DDS4CCM::SubscriberListener (
-                              error_listener.in (),
-                              reactor),
-                            ::CORBA::NO_MEMORY ());
-        }
-
-      DDS::ReturnCode_t const retcode = subscriber->set_listener (subscriber_listener,
-                                                                    mask);
-
-      if (retcode != ::DDS::RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        "DDS_Base_Connector_T::activate_subscriber - "
-                        "Error while setting the listener on the subscriber - <%C>\n",
-                        ::CIAO::DDS4CCM::translate_retcode (retcode)));
-          throw ::CORBA::INTERNAL ();
-        }
-    }
-}
-
-/**
-  * Passivation
- **/
-template <typename CCM_TYPE>
-void
-DDS_Base_Connector_T<CCM_TYPE>::passivate_topic (
-  ::DDS::Topic_ptr topic,
-  ::DDS::TopicListener_ptr topic_listener)
-{
-  DDS4CCM_TRACE ("DDS_Base_Connector_T::passivate_topic");
-
-  if (!::CORBA::is_nil (topic_listener))
-    {
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                    "DDS_Base_Connector_T::passivate_topic - "
-                    "Setting the listener on the topic to nil\n"));
-
-      DDS::ReturnCode_t const retcode =
-        topic->set_listener (::DDS::TopicListener::_nil (), 0);
-      if (retcode != ::DDS::RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        "DDS_Base_Connector_T::passivate_topic - "
-                        "Error while setting the listener on the topic - <%C>\n",
-                        ::CIAO::DDS4CCM::translate_retcode (retcode)));
-          throw ::CORBA::INTERNAL ();
-        }
-    }
-}
-
-template <typename CCM_TYPE>
-void
-DDS_Base_Connector_T<CCM_TYPE>::passivate_publisher (
-  ::DDS::Publisher_ptr publisher,
-  ::DDS::PublisherListener_ptr publisher_listener)
-
-{
-  DDS4CCM_TRACE ("DDS_Base_Connector_T::passivate_publisher");
-
-  if (!::CORBA::is_nil (publisher_listener))
-    {
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                    "DDS_Base_Connector_T::passivate_publisher - "
-                    "Setting the listener on the publisher to nil\n"));
-
-      DDS::ReturnCode_t const retcode =
-        publisher->set_listener (::DDS::PublisherListener::_nil (), 0);
-
-      if (retcode != ::DDS::RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        "DDS_Base_Connector_T::passivate_publisher - "
-                        "Error while setting the listener on the publisher - <%C>\n",
-                        ::CIAO::DDS4CCM::translate_retcode (retcode)));
-          throw ::CORBA::INTERNAL ();
-        }
-    }
-}
-
-template <typename CCM_TYPE>
-void
-DDS_Base_Connector_T<CCM_TYPE>::passivate_subscriber (
-  ::DDS::Subscriber_ptr subscriber,
-  ::DDS::SubscriberListener_ptr subscriber_listener)
-{
-  DDS4CCM_TRACE ("DDS_Base_Connector_T::passivate_subscriber");
-
-  if (!::CORBA::is_nil (subscriber_listener))
-    {
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                    "DDS_Base_Connector_T::passivate_subscriber - "
-                    "Setting the listener on the subscriber to nil\n"));
-
-      DDS::ReturnCode_t const retcode =
-        subscriber->set_listener (::DDS::SubscriberListener::_nil (), 0);
-      if (retcode != ::DDS::RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        "DDS_Base_Connector_T::passivate_subscriber - "
-                        "Error while setting the listener on the subscriber - <%C>\n",
-                        ::CIAO::DDS4CCM::translate_retcode (retcode)));
-          throw ::CORBA::INTERNAL ();
-        }
-    }
-}
-
-/**
-  * Removal
- **/
-template <typename CCM_TYPE>
-void DDS_Base_Connector_T<CCM_TYPE>::remove_topic (
-  ::DDS::DomainParticipant_ptr participant,
-  ::DDS::Topic_ptr topic)
-{
-  DDS4CCM_TRACE ("DDS_Base_Connector_T::remove_topic");
-
-  CORBA::String_var name = topic->get_name ();
-
-  DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_TRACE, DDS4CCM_INFO
-                "DDS_Base_Connector_T::remove_topic - "
-                "Going to delete topic <%C> "
-                DDS_ENTITY_FORMAT_SPECIFIER
-                "from participant"
-                DDS_ENTITY_FORMAT_SPECIFIER
-                "\n",
-                name.in (),
-                DDS_ENTITY_LOG (topic),
-                DDS_ENTITY_LOG (participant)));
-
-  DDS::ReturnCode_t const retcode = participant->delete_topic (topic);
-
-  DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_TRACE, DDS4CCM_INFO
-                "DDS_Base_Connector_T::remove_topic - "
-                "Deleted topic <%C> "
-                DDS_ENTITY_FORMAT_SPECIFIER
-                "from "
-                DDS_ENTITY_FORMAT_SPECIFIER
-                " return code <%C>\n",
-                name.in (),
-                DDS_ENTITY_LOG (topic),
-                DDS_ENTITY_LOG (participant),
-                ::CIAO::DDS4CCM::translate_retcode (retcode)));
-
-  if (retcode != ::DDS::RETCODE_OK && retcode != ::DDS::RETCODE_PRECONDITION_NOT_MET)
-    {
-      throw ::CCM_DDS::InternalError (retcode, 0);
-    }
-}
-
-template <typename CCM_TYPE>
-void
-DDS_Base_Connector_T<CCM_TYPE>::remove_publisher (
-  ::DDS::DomainParticipant_ptr participant,
-  ::DDS::Publisher_ptr publisher)
-{
-  DDS4CCM_TRACE ("DDS_Base_Connector_T::remove_publisher");
-
-  DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_TRACE, DDS4CCM_INFO
-              "DDS_Base_Connector_T::remove_publisher - "
-              "Going to delete publisher "
-              DDS_ENTITY_FORMAT_SPECIFIER
-              " from participant"
-              DDS_ENTITY_FORMAT_SPECIFIER
-              "\n",
-              DDS_ENTITY_LOG (publisher),
-              DDS_ENTITY_LOG (participant)));
-
-  DDS::ReturnCode_t const retval =
-      participant->delete_publisher (publisher);
-
-  if (retval != ::DDS::RETCODE_OK)
-    {
-      DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-          "DDS_Base_Connector_T::remove_publisher - "
-          "Unable to delete publisher: <%C>\n",
-          ::CIAO::DDS4CCM::translate_retcode (retval)));
-      throw ::CORBA::INTERNAL ();
-    }
-  else
-    {
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_INFO, DDS4CCM_INFO
-          "DDS_Base_Connector_T::remove_publisher - "
-          "Deleted publisher\n"));
-    }
-}
-
-template <typename CCM_TYPE>
-void
-DDS_Base_Connector_T<CCM_TYPE>::remove_subscriber (
-  ::DDS::DomainParticipant_ptr participant,
-  ::DDS::Subscriber_ptr subscriber)
-{
-  DDS4CCM_TRACE ("DDS_Base_Connector_T::remove_subscriber");
-
-  DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_TRACE, DDS4CCM_INFO
-              "DDS_Base_Connector_T::remove_subscriber - "
-              "Going to delete subscriber "
-              DDS_ENTITY_FORMAT_SPECIFIER
-              " from participant"
-              DDS_ENTITY_FORMAT_SPECIFIER
-              "\n",
-              DDS_ENTITY_LOG (subscriber),
-              DDS_ENTITY_LOG (participant)));
-
-  DDS::ReturnCode_t const retval =
-    participant->delete_subscriber (subscriber);
-
-  if (retval != ::DDS::RETCODE_OK)
-    {
-      DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-          "DDS_Base_Connector_T::remove_subscriber - "
-          "Unable to delete subscriber: <%C>\n",
-          ::CIAO::DDS4CCM::translate_retcode (retval)));
-      throw ::CORBA::INTERNAL ();
-    }
-  else
-    {
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_INFO, DDS4CCM_INFO
-          "DDS_Base_Connector_T::remove_subscriber - "
-          "Deleted subscriber\n"));
-    }
-}
-
-template <typename CCM_TYPE>
-void
-DDS_Base_Connector_T<CCM_TYPE>::remove_domain (
-  ::DDS::DomainParticipant_ptr participant)
-{
-  DDS4CCM_TRACE ("DDS_Base_Connector_T::remove_domain");
-
-  DDS::ReturnCode_t retcode = DDS::RETCODE_OK;
-
-  if (DPMANAGER->unregister_participant (
-      this->domain_id_, this->qos_profile_.in (), participant))
-    {
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_TRACE, DDS4CCM_INFO
-                "DDS_Base_Connector_T"
-                "::remove_domain - "
-                "Going to delete contained entities of participant "
-                DDS_ENTITY_FORMAT_SPECIFIER
-                " for domain <%d> with qos <%C>.\n",
-                DDS_ENTITY_LOG (participant),
-                this->domain_id_, this->qos_profile_.in ()));
-
-      retcode = participant->delete_contained_entities ();
-
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_TRACE, DDS4CCM_INFO
-                "DDS_Base_Connector_T"
-                "::remove_domain - "
-                "Deleted contained entities for participant "
-                DDS_ENTITY_FORMAT_SPECIFIER
-                " remove_topic - Deleted topic for domain <%d> with qos <%C> "
-                "return code <%C>\n",
-                DDS_ENTITY_LOG (participant),
-                this->domain_id_, this->qos_profile_.in (),
-                ::CIAO::DDS4CCM::translate_retcode (retcode)));
-
-      if (retcode != ::DDS::RETCODE_OK)
-        {
-          throw ::CCM_DDS::InternalError (retcode, 0);
-        }
-
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_TRACE, DDS4CCM_INFO
-                "DDS_Base_Connector_T"
-                "::remove_domain - "
-                "Going to delete participant "
-                DDS_ENTITY_FORMAT_SPECIFIER
-                " for domain <%d> with qos <%C>.\n",
-                DDS_ENTITY_LOG (participant),
-                this->domain_id_, this->qos_profile_.in ()));
-
-      retcode = this->participant_factory_->delete_participant (participant);
-
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_TRACE, DDS4CCM_INFO
-                "DDS_Base_Connector_T"
-                "::remove_domain - "
-                "Deleted participant for domain <%d> with qos <%C> "
-                "return code <%C>\n",
-                this->domain_id_, this->qos_profile_.in (),
-                ::CIAO::DDS4CCM::translate_retcode (retcode)));
-    }
-
-  if (retcode != ::DDS::RETCODE_OK)
-    {
-      throw ::CCM_DDS::InternalError (retcode, 0);
-    }
-}
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.h b/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.h
deleted file mode 100644
index c9a6f84a13b..00000000000
--- a/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.h
+++ /dev/null
@@ -1,218 +0,0 @@
-/**
- * @author Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-#ifndef DDS_BASE_CONNECTOR_T_H_
-#define DDS_BASE_CONNECTOR_T_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "dds4ccm/impl/logger/Logger_Service.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-#include "ace/Copy_Disabled.h"
-
-#if (CIAO_DDS4CCM_NDDS==1)
-# include "dds4ccm/impl/ndds/DomainParticipantFactory.h"
-#elif (CIAO_DDS4CCM_OPENDDS==1)
-# include "dds/DCPS/Service_Participant.h"
-# include "dds/DCPS/QOS_XML_Handler/QOS_XML_Loader.h"
-#endif
-
-template <typename CCM_TYPE>
-class DDS_Base_Connector_T
-  : public virtual CCM_TYPE::base_type,
-    public virtual ::CORBA::LocalObject,
-    private virtual ACE_Copy_Disabled
-{
-public:
-  DDS_Base_Connector_T (void);
-  virtual ~DDS_Base_Connector_T (void);
-
-  /**
-   * @name domain_id
-   * Accessors for domain_id
-   */
-  //@{
-  virtual ::DDS::DomainId_t domain_id (void);
-
-  virtual void domain_id (::DDS::DomainId_t domain_id);
-  //@}
-
-  /**
-   * @name qos_profile
-   * Accessors for qos_profile
-   */
-  //@{
-  virtual char *qos_profile (void);
-
-  virtual void qos_profile (const char * qos_profile);
-  //@}
-
-  virtual void set_session_context (::Components::SessionContext_ptr ctx);
-
-  /**
-    *
-    * Interface methods for the Deployment and Configuration Framework
-    */
-  //@{
-  virtual void configuration_complete (void);
-  virtual void ccm_remove (void);
-  virtual void ccm_activate (void);
-  virtual void ccm_passivate (void);
-  //@}
-
-private:
-  /**
-   * Initialization of the domain participant factory.
-   */
-  void create_dds_participant_factory (void);
-
-protected:
-
-  /**
-   * Initialization of a connector.
-   *
-   * When one wants to use his own DDS::DomainParticipant, DDS::Topic,
-   * DDS::Subscriber and/or DDS::Publisher, these helper methods allows
-   * to create these, independent of the DDS vendor.
-   *
-   * See
-   * $CIAO_ROOT/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp
-   * on how to use these methods.
-   *
-   * These methods will create the DDS4CCM Entities (and therefor the DDS
-   * entities in DDS itself), like DomainParticipant, Topic, Subscriber and Publisher
-   *
-   */
-  //@{
-  void init_domain (::DDS::DomainParticipant_ptr & participant);
-
-  virtual void register_type (::DDS::DomainParticipant_ptr participant,
-                              const char * typesupport_name) = 0;
-
-  void init_topic (::DDS::DomainParticipant_ptr participant,
-                   ::DDS::Topic_ptr & topic,
-                   const char * topic_name,
-                   const char * type_name);
-  void init_publisher (::DDS::DomainParticipant_ptr participant,
-                       ::DDS::Publisher_ptr & publisher);
-  void init_subscriber (::DDS::DomainParticipant_ptr participant,
-                        ::DDS::Subscriber_ptr & subscriber);
-  //@}
-
-  /**
-   * Activation of a connector.
-   *
-   * Helper methods to create the DDS listeners and attach them to the DDS Entities.
-   * This will activate the DDS Entities.
-   *
-   */
-  //@{
-  void activate_topic (ACE_Reactor* reactor,
-                       ::DDS::Topic_ptr topic,
-                       ::DDS::TopicListener_ptr & listener);
-  void activate_publisher (ACE_Reactor* reactor,
-                           ::DDS::Publisher_ptr publisher,
-                           ::DDS::PublisherListener_ptr & publisher_listener);
-  void activate_subscriber (ACE_Reactor* reactor,
-                            ::DDS::Subscriber_ptr subscriber,
-                            ::DDS::SubscriberListener_ptr & subscriber_listener);
-  //@}
-
-  /**
-   * Passivation of a connector.
-   *
-   * Helper methods to detach the DDS listeners from the DDS Entities.
-   * This'll passivate the DDS Entities.
-   *
-   * In order to allow a thread safe and memory leak free passivation, one should
-   * use a temporary _var variable and assign this by using _retn () in the calling
-   * methods.
-   *
-   * For example:
-   *
-   * DDS::TopicListener_var tmp = this->topic_listener_._retn ();
-   * if (!::CORBA::is_nil (tmp.in ())) this->passivate_topi (this->topic_.in (),
-   *                                                         tmp.in ());
-   *
-   * Where topic_listener_ and topic_ are _var class members of a derived, user
-   * defined class.
-   *
-   * Again, see
-   * $CIAO_ROOT/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp
-   * on how to passivate a connector.
-   *
-   */
-  //@{
-  void passivate_topic (::DDS::Topic_ptr topic,
-                        ::DDS::TopicListener_ptr topic_listener);
-  void passivate_publisher (::DDS::Publisher_ptr publisher,
-                            ::DDS::PublisherListener_ptr publisher_listener);
-  void passivate_subscriber (::DDS::Subscriber_ptr subscriber,
-                             ::DDS::SubscriberListener_ptr subscriber_listener);
-  //@}
-
-  /**
-   * Removal of a connector.
-   *
-   * Helper methods to remove the DDS Entities from memory.
-   *
-   * Again, one should use a temporary _var variable and _retn () in order to
-   * remove the DDS Entities in a thread safe and memory leak free manner.
-   * See 'Passivation of a connector' in this file.
-   */
-  //@{
-  void remove_topic (::DDS::DomainParticipant_ptr participant,
-                     ::DDS::Topic_ptr topic);
-  void remove_publisher (::DDS::DomainParticipant_ptr participant,
-                         ::DDS::Publisher_ptr publisher);
-  void remove_subscriber (::DDS::DomainParticipant_ptr participant,
-                          ::DDS::Subscriber_ptr subscriber);
-  void remove_domain (::DDS::DomainParticipant_ptr participant);
-
-  virtual
-  void unregister_type (::DDS::DomainParticipant_ptr participant,
-                        const char * typesupport_name) = 0;
-  //@}
-
-  /// Get the reactor associated with this component
-  ACE_Reactor * reactor (void);
-
-  /**
-   * Attribute of DDS4CCM Base
-   */
-  //@{
-  ::DDS::DomainId_t domain_id_;
-  ::CORBA::String_var qos_profile_;
-  //@}
-
-  /**
-   * @name configuration_complete_
-   * Indicates whether configuration_complete has been invoked. Once invoked,
-   * changing a connectors attribute is not allowed anymore. If the user still
-   * wants to set an attribute, a NonChangeable exception is thrown.
-    */
-  bool configuration_complete_;
-
-  ::CIAO::DDS4CCM::Logger_Service * dlf_;
-
-  ::DDS::DomainParticipant_var domain_participant_;
-
-  /**
-    * Context of the connector. Used to make connection to the user component
-    * like the interface to the data listeners.
-    */
-  typename CCM_TYPE::context_type::_var_type context_;
-
-  /**
-    * DomainParticipantFactory. Administration of Domain Participants
-    */
-  ::DDS::DomainParticipantFactory_var participant_factory_;
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-  OpenDDS::DCPS::TransportImpl_rch transport_impl_;
-#endif
-  DDS_XML_QOS_PARSER_TYPE* qos_xml_;
-};
-
-#include "dds4ccm/impl/DDS_Base_Connector_T.cpp"
-
-#endif /* DDS_BASE_CONNECTOR_T_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp
deleted file mode 100644
index 34a86e07f1d..00000000000
--- a/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp
+++ /dev/null
@@ -1,572 +0,0 @@
-// -*- C++ -*-
-#include "dds4ccm/impl/DataReaderListener_T.h"
-#include "dds4ccm/impl/Writer_T.h"
-#include "dds4ccm/impl/Getter_T.h"
-#include "dds4ccm/impl/Reader_T.h"
-#include "dds4ccm/impl/DataListenerControl_T.h"
-
-#include "dds4ccm/impl/logger/Log_Macros.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::DDS_Event_Connector_T (void) :
-    TopicBaseConnector (),
-    supplier_obtained_ (false),
-    push_consumer_obtained_ (false),
-    pull_consumer_obtained_ (false),
-    supplier_ (),
-    push_consumer_ (),
-    pull_consumer_ ()
-{
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::~DDS_Event_Connector_T (void)
-{
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::supplier_traits::data_type::_ptr_type
-DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_supplier_data (void)
-{
-  DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_supplier_data");
-
-  this->supplier_obtained_ = true;
-  this->supplier_.set_component (this);
-  this->init_publisher_ |= this->supplier_obtained_;
-  return this->supplier_.get_data ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::supplier_traits::dds_entity_type::_ptr_type
-DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_supplier_dds_entity (void)
-{
-  DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_supplier_dds_entity");
-
-  this->supplier_obtained_ = true;
-  this->supplier_.set_component (this);
-  this->init_publisher_ |= this->supplier_obtained_;
-  return this->supplier_.get_dds_entity ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::pull_consumer_traits::fresh_data_type::_ptr_type
-DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_fresh_data (void)
-{
-  DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_fresh_data");
-
-  this->pull_consumer_obtained_ = true;
-  this->pull_consumer_.set_component (this);
-  this->init_subscriber_ |= this->pull_consumer_obtained_;
-  return this->pull_consumer_.get_fresh_data ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::push_consumer_traits::data_type::_ptr_type
-DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_data (void)
-{
-  DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_data");
-
-  this->push_consumer_obtained_ = true;
-  this->push_consumer_.set_component (this);
-  this->init_subscriber_ |= this->push_consumer_obtained_;
-  return this->push_consumer_.get_data ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::pull_consumer_traits::data_type::_ptr_type
-DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_data (void)
-{
-  DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_data");
-
-  this->pull_consumer_obtained_ = true;
-  this->pull_consumer_.set_component (this);
-  this->init_subscriber_ |= this->pull_consumer_obtained_;
-  return this->pull_consumer_.get_data ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-::CCM_DDS::CCM_ContentFilterSetting_ptr
-DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_filter_config (void)
-{
-  DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_filter_config");
-
-  this->pull_consumer_obtained_ = true;
-  this->pull_consumer_.set_component (this);
-  this->init_subscriber_ |= this->pull_consumer_obtained_;
-  return this->pull_consumer_.get_filter_config ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-::CCM_DDS::CCM_DataListenerControl_ptr
-DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_data_control (void)
-{
-  DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_data_control");
-
-  this->push_consumer_obtained_ = true;
-  this->push_consumer_.set_component (this);
-  this->init_subscriber_ |= this->push_consumer_obtained_;
-  return this->push_consumer_.get_data_control ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-::DDS::CCM_DataReader_ptr
-DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_dds_entity (void)
-{
-  DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_dds_entity");
-
-  this->pull_consumer_obtained_ = true;
-  this->pull_consumer_.set_component (this);
-  this->init_subscriber_ |= this->pull_consumer_obtained_;
-  return this->pull_consumer_.get_dds_entity ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-::CCM_DDS::QueryFilter*
-DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::pull_consumer_filter (void)
-{
-  DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::pull_consumer_filter");
-
-  return this->pull_consumer_.filter ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::pull_consumer_filter (
-  const ::CCM_DDS::QueryFilter & filter)
-{
-  DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::pull_consumer_filter");
-
-  this->pull_consumer_.filter (filter);
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-::DDS::CCM_DataReader_ptr
-DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_dds_entity (void)
-{
-  DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_dds_entity");
-
-  this->push_consumer_obtained_ = true;
-  this->push_consumer_.set_component (this);
-  this->init_subscriber_ |= this->push_consumer_obtained_;
-  return this->push_consumer_.get_dds_entity ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-::CCM_DDS::CCM_ContentFilterSetting_ptr
-DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_filter_config (void)
-{
-  DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_filter_config");
-
-  this->push_consumer_obtained_ = true;
-  this->push_consumer_.set_component (this);
-  this->init_subscriber_ |= this->push_consumer_obtained_;
-  return this->push_consumer_.get_filter_config ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-::CCM_DDS::QueryFilter*
-DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_consumer_filter (void)
-{
-  DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_consumer_filter");
-
-  return this->push_consumer_.filter ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_consumer_filter (
-  const ::CCM_DDS::QueryFilter & filter)
-{
-  DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_consumer_filter");
-
-  this->push_consumer_.filter (filter);
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::topic_name (
-  const char * topic_name)
-{
-  DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::topic_name");
-
-  if (this->stop_dds (topic_name))
-    {
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                    "DDS_Event_Connector_T::topic_name - "
-                    "Stopping DDS=>switching to new topic <%C>.\n",
-                    topic_name));
-      this->ccm_passivate ();
-      this->do_ccm_remove ();
-
-      if (ACE_OS::strlen (topic_name) > 0)
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                        "DDS_Event_Connector_T::topic_name - "
-                        "DDS is down. Setting new to <%C>.\n",
-                        topic_name));
-
-          TopicBaseConnector::topic_name (topic_name);
-
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                        "DDS_Event_Connector_T::topic_name - "
-                        "Initialize DDS again for topic <%C>.\n",
-                        topic_name));
-
-          this->do_configuration_complete ();
-          this->do_ccm_activate ();
-
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                        "DDS_Event_Connector_T::topic_name - "
-                        "DDS up and running for topic <%C>.\n",
-                        topic_name));
-        }
-      else
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                        "DDS_Event_Connector_T::topic_name - "
-                        "DDS is down.\n"));
-          TopicBaseConnector::topic_name (topic_name);
-        }
-    }
-  else if (this->late_binded (topic_name))
-    {
-      this->do_configuration_complete ();
-      this->do_ccm_activate ();
-    }
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-char *
-DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::topic_name (void)
-{
-  DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::topic_name");
-
-  return TopicBaseConnector::topic_name ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::do_configuration_complete (void)
-{
-  DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::do_configuration_complete");
-
-  typename CCM_TYPE::push_consumer_traits::data_listener_type::_var_type
-    push_consumer_data_listener =
-      this->context_->get_connection_push_consumer_data_listener ();
-
-  this->push_consumer_obtained_ |=
-    ! ::CORBA::is_nil (push_consumer_data_listener.in ());
-  ::CCM_DDS::PortStatusListener_var push_consumer_psl =
-    this->context_->get_connection_push_consumer_status ();
-  this->push_consumer_obtained_ |= ! ::CORBA::is_nil (push_consumer_psl.in ());
-  this->init_subscriber_ |= this->push_consumer_obtained_;
-
-  ::CCM_DDS::PortStatusListener_var pull_consumer_psl =
-    this->context_->get_connection_pull_consumer_status ();
-  this->pull_consumer_obtained_ |=
-    ! ::CORBA::is_nil (pull_consumer_psl.in ());
-  this->init_subscriber_ |= this->pull_consumer_obtained_;
-
-  TopicBaseConnector::configuration_complete ();
-
-  if (this->push_consumer_obtained_)
-    {
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                    "DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>"
-                    "::configuration_complete - "
-                    "Creating push consumer port.\n"));
-      this->push_consumer_.configuration_complete (
-        this->topic_.in (),
-        this->subscriber_.in (),
-        this->qos_profile_.in (),
-        this->qos_xml_);
-    }
-  else
-    {
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                    "DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>"
-                    "::configuration_complete - "
-                    "No need to create push consumer port.\n"));
-    }
-
-  if (this->supplier_obtained_)
-    {
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                    "DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>"
-                    "::configuration_complete - "
-                    "Creating supplier port.\n"));
-      this->supplier_.configuration_complete(
-        this->topic_.in (),
-        this->publisher_.in (),
-        this->qos_profile_.in (),
-        this->qos_xml_);
-    }
-  else
-    {
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                    "DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>"
-                    "::configuration_complete - "
-                    "No need to create supplier port.\n"));
-    }
-
-  if (this->pull_consumer_obtained_)
-    {
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                    "DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>"
-                    "::configuration_complete - "
-                    "Creating pull consumer port.\n"));
-      this->pull_consumer_.configuration_complete (
-        this->topic_.in (),
-        this->subscriber_.in (),
-        this->qos_profile_.in (),
-        this->qos_xml_);
-    }
-  else
-    {
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                    "DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>"
-                    "::configuration_complete - "
-                    "No need to create pull consumer port.\n"));
-    }
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::configuration_complete (void)
-{
-  DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::configuration_complete");
-
-  try
-    {
-      if (!this->late_binding ())
-        {
-          this->do_configuration_complete ();
-        }
-    }
-  catch (const ::CCM_DDS::InternalError &ex)
-    {
-      DDS4CCM_PRINT_INTERNAL_EXCEPTION (
-                              DDS4CCM_LOG_LEVEL_ERROR,
-                              ::CIAO::DDS4CCM::translate_retcode (ex.error_code),
-                              "DDS_Event_Connector_T::configuration_complete");
-      throw ::CORBA::INTERNAL ();
-    }
-  catch (const ::CORBA::Exception& ex)
-    {
-      DDS4CCM_PRINT_CORBA_EXCEPTION (
-                              DDS4CCM_LOG_LEVEL_ERROR,
-                              ex,
-                              "DDS_Event_Connector_T::configuration_complete");
-      throw;
-    }
-  catch (...)
-    {
-      DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                    "DDS_Event_Connector_T::configuration_complete - "
-                    "Caught unexpected exception.\n"));
-      throw ::CORBA::INTERNAL ();
-    }
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::do_ccm_activate (void)
-{
-  ACE_Reactor *reactor = this->reactor ();
-
-  TopicBaseConnector::ccm_activate ();
-
-  if (this->push_consumer_obtained_)
-    {
-      typename CCM_TYPE::push_consumer_traits::data_listener_type::_var_type push_consumer_data_listener =
-        this->context_->get_connection_push_consumer_data_listener ();
-      ::CCM_DDS::PortStatusListener_var push_consumer_psl =
-        this->context_->get_connection_push_consumer_status ();
-
-      this->push_consumer_.activate (
-        push_consumer_data_listener.in (),
-        push_consumer_psl.in (),
-        reactor);
-    }
-
-  if (this->supplier_obtained_)
-    {
-      this->supplier_.activate ();
-    }
-
-  if (this->pull_consumer_obtained_)
-    {
-      ::CCM_DDS::PortStatusListener_var pull_consumer_psl =
-        this->context_->get_connection_pull_consumer_status ();
-
-      this->pull_consumer_.activate (
-        pull_consumer_psl.in (),
-        reactor);
-    }
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_activate (void)
-{
-  DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_activate");
-
-  try
-    {
-      if (!this->late_binding ())
-        {
-          this->do_ccm_activate ();
-        }
-    }
-  catch (const ::CCM_DDS::InternalError &ex)
-    {
-      DDS4CCM_PRINT_INTERNAL_EXCEPTION (
-                              DDS4CCM_LOG_LEVEL_ERROR,
-                              ::CIAO::DDS4CCM::translate_retcode (ex.error_code),
-                              "DDS_Event_Connector_T::ccm_activate");
-      throw ::CORBA::INTERNAL ();
-    }
-  catch (const ::CORBA::Exception& ex)
-    {
-      DDS4CCM_PRINT_CORBA_EXCEPTION (
-                              DDS4CCM_LOG_LEVEL_ERROR,
-                              ex,
-                              "DDS_Event_Connector_T::ccm_activate");
-      throw;
-    }
-  catch (...)
-    {
-      DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                    "DDS_Event_Connector_T::ccm_activate - "
-                    "Caught unexpected exception.\n"));
-      throw ::CORBA::INTERNAL ();
-    }
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_passivate (void)
-{
-  DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_passivate");
-
-  try
-    {
-      if (ACE_OS::strlen (this->topic_name_) != 0)
-        {
-          if (this->push_consumer_obtained_)
-            {
-              this->push_consumer_.passivate ();
-            }
-
-          if (this->supplier_obtained_)
-            {
-              this->supplier_.passivate ();
-            }
-
-          if (this->pull_consumer_obtained_)
-            {
-              this->pull_consumer_.passivate ();
-            }
-          TopicBaseConnector::ccm_passivate ();
-        }
-    }
-  catch (const ::CCM_DDS::InternalError &ex)
-    {
-      DDS4CCM_PRINT_INTERNAL_EXCEPTION (
-                              DDS4CCM_LOG_LEVEL_ERROR,
-                              ::CIAO::DDS4CCM::translate_retcode (ex.error_code),
-                              "DDS_Event_Connector_T::ccm_passivate");
-      throw ::CORBA::INTERNAL ();
-    }
-  catch (const ::CORBA::Exception& ex)
-    {
-      DDS4CCM_PRINT_CORBA_EXCEPTION (
-                              DDS4CCM_LOG_LEVEL_ERROR,
-                              ex,
-                              "DDS_Event_Connector_T::ccm_passivate");
-      throw;
-    }
-  catch (...)
-    {
-      DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                    "DDS_Event_Connector_T::ccm_passivate - "
-                    "Caught unexpected exception.\n"));
-      throw ::CORBA::INTERNAL ();
-    }
-}
-
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::do_ccm_remove (void)
-{
-  DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::do_ccm_remove");
-  try
-    {
-      if (ACE_OS::strlen (this->topic_name_) != 0)
-        {
-          if (this->push_consumer_obtained_)
-            {
-              this->push_consumer_.remove (this->subscriber_.in ());
-            }
-
-          if (this->supplier_obtained_)
-            {
-              this->supplier_.remove (this->publisher_.in ());
-            }
-
-          if (this->pull_consumer_obtained_)
-            {
-              this->pull_consumer_.remove (this->subscriber_.in ());
-            }
-          TopicBaseConnector::ccm_remove ();
-        }
-    }
-  catch (const ::CCM_DDS::InternalError &ex)
-    {
-      DDS4CCM_PRINT_INTERNAL_EXCEPTION (
-                              DDS4CCM_LOG_LEVEL_ERROR,
-                              ::CIAO::DDS4CCM::translate_retcode (ex.error_code),
-                              "DDS_Event_Connector_T::do_ccm_remove");
-      throw ::CORBA::INTERNAL ();
-    }
-  catch (const ::CORBA::Exception& ex)
-    {
-      DDS4CCM_PRINT_CORBA_EXCEPTION (
-                              DDS4CCM_LOG_LEVEL_ERROR,
-                              ex,
-                              "DDS_Event_Connector_T::do_ccm_remove");
-      throw;
-    }
-  catch (...)
-    {
-      DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                    "DDS_Event_Connector_T::do_ccm_remove - "
-                    "Caught unexpected exception.\n"));
-      throw ::CORBA::INTERNAL ();
-    }
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_remove (void)
-{
-  DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_remove");
-  if (this->push_consumer_obtained_)
-    {
-      this->push_consumer_.set_component (::CORBA::Object::_nil ());
-    }
-
-  if (this->supplier_obtained_)
-    {
-      this->supplier_.set_component (::CORBA::Object::_nil ());
-    }
-
-  if (this->pull_consumer_obtained_)
-    {
-      this->pull_consumer_.set_component (::CORBA::Object::_nil ());
-    }
-
-  this->do_ccm_remove ();
-}
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.h b/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.h
deleted file mode 100644
index c83bbd5a426..00000000000
--- a/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- *
- * DDS Event Connector implementation
- */
-#ifndef DDS_EVENT_CONNECTOR_T_H_
-#define DDS_EVENT_CONNECTOR_T_H_
-
-#include "dds4ccm/impl/DDS_TopicBase_Connector_T.h"
-#include "dds4ccm/impl/DDS_Get_T.h"
-#include "dds4ccm/impl/DDS_Write_T.h"
-#include "dds4ccm/impl/DDS_Listen_T.h"
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-class DDS_Event_Connector_T
-  : public virtual DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE>
-{
-public:
-  DDS_Event_Connector_T (void);
-  virtual ~DDS_Event_Connector_T (void);
-
-  /**
-   * @name DDS_Write
-   * DDS_Write operations
-   */
-  //@{
-  virtual typename CCM_TYPE::supplier_traits::data_type::_ptr_type get_supplier_data (void);
-
-  virtual typename CCM_TYPE::supplier_traits::dds_entity_type::_ptr_type get_supplier_dds_entity (void);
-  //@}
-
-  /**
-   * @name DDS_Get
-   * DDS_Get operations
-   */
-  //@{
-  virtual typename CCM_TYPE::pull_consumer_traits::data_type::_ptr_type
-  get_pull_consumer_data (void);
-
-  virtual typename CCM_TYPE::pull_consumer_traits::fresh_data_type::_ptr_type
-  get_pull_consumer_fresh_data (void);
-
-  virtual ::DDS::CCM_DataReader_ptr get_pull_consumer_dds_entity (void);
-
-  virtual ::CCM_DDS::CCM_ContentFilterSetting_ptr
-  get_pull_consumer_filter_config (void);
-
-  virtual ::CCM_DDS::QueryFilter *pull_consumer_filter (void);
-
-  virtual void pull_consumer_filter (const ::CCM_DDS::QueryFilter & filter);
-  //@}
-
-  /**
-   * @name DDS_Listen
-   * DDS_Listen operations
-   */
-  //@{
-  virtual typename CCM_TYPE::push_consumer_traits::data_type::_ptr_type get_push_consumer_data (void);
-
-  virtual ::CCM_DDS::CCM_DataListenerControl_ptr get_push_consumer_data_control (void);
-
-  virtual ::DDS::CCM_DataReader_ptr get_push_consumer_dds_entity (void);
-
-  virtual ::CCM_DDS::CCM_ContentFilterSetting_ptr
-  get_push_consumer_filter_config (void);
-
-  virtual ::CCM_DDS::QueryFilter *push_consumer_filter (void);
-
-  virtual void push_consumer_filter (const ::CCM_DDS::QueryFilter & filter);
-  //@}
-
-  virtual void topic_name (const char * topic_name);
-  virtual char *topic_name (void);
-
-  virtual void configuration_complete (void);
-  virtual void ccm_activate (void);
-  virtual void ccm_passivate (void);
-  virtual void ccm_remove (void);
-
-private:
-  bool supplier_obtained_;
-  bool push_consumer_obtained_;
-  bool pull_consumer_obtained_;
-
-  /**
-   * DDS_Write supplier
-   */
-  //@{
-  DDS_Write_T <
-      typename CCM_TYPE::supplier_traits,
-      typename DDS_TYPE::typed_writer_type,
-      typename DDS_TYPE::value_type,
-      SEQ_TYPE>
-    supplier_;
-  //@}
-
-  /**
-   * DDS_Listen push_consumer
-   */
-  //@{
-  DDS_Listen_T <
-      typename CCM_TYPE::push_consumer_traits,
-      typename DDS_TYPE::typed_reader_type,
-      typename DDS_TYPE::value_type,
-      SEQ_TYPE,
-      CIAO::DDS4CCM::DDS4CCM_TAKE>
-    push_consumer_;
-  //@}
-
-  /**
-   * DDS_Get pull_consumer
-   */
-  //@{
-  DDS_Get_T <
-      typename CCM_TYPE::pull_consumer_traits,
-      typename DDS_TYPE::typed_reader_type,
-      typename DDS_TYPE::value_type,
-      SEQ_TYPE,
-      FIXED>
-    pull_consumer_;
-  //@}
-
-  void do_configuration_complete (void);
-  void do_ccm_activate (void);
-  void do_ccm_remove (void);
-
-  typedef DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE> TopicBaseConnector;
-};
-
-#include "dds4ccm/impl/DDS_Event_Connector_T.cpp"
-
-#endif /* DDS_EVENT_CONNECTOR_T_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Get_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Get_T.cpp
deleted file mode 100644
index 05d68c4e6ec..00000000000
--- a/CIAO/connectors/dds4ccm/impl/DDS_Get_T.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-// -*- C++ -*-
-#include "dds4ccm/impl/logger/Log_Macros.h"
-
-template <typename CCM_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE, bool FIXED>
-DDS_Get_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE, FIXED>::DDS_Get_T (void)
-{
-}
-
-template <typename CCM_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE, bool FIXED>
-DDS_Get_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE, FIXED>::~DDS_Get_T (void)
-{
-}
-
-template <typename CCM_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE, bool FIXED>
-void
-DDS_Get_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE, FIXED>::set_component (::CORBA::Object_ptr component)
-{
-  SubscriberBase_type::set_component (component);
-  this->dds_get_->_set_component (component);
-}
-
-template <typename CCM_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE, bool FIXED>
-void
-DDS_Get_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE, FIXED>::configuration_complete (
-  ::DDS::Topic_ptr topic,
-  ::DDS::Subscriber_ptr subscriber,
-  const char * qos_profile,
-  DDS_XML_QOS_PARSER_TYPE* qos_xml)
-{
-  DDS4CCM_TRACE ("DDS_Get_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE, FIXED>::configuration_complete");
-
-  SubscriberBase_type::configuration_complete (topic,
-                                               subscriber,
-                                               qos_profile,
-                                               qos_xml);
-
-  ::DDS::DataReader_var dr = this->dds_read_->get_dds_reader ();
-  this->dds_get_->set_dds_reader (dr.in (), &this->condition_manager_);
-}
-
-template <typename CCM_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE, bool FIXED>
-void
-DDS_Get_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE, FIXED>::remove (
-  ::DDS::Subscriber_ptr subscriber)
-{
-  DDS4CCM_TRACE ("DDS_Get_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE, FIXED>::remove");
-  SubscriberBase_type::remove (subscriber);
-}
-
-template <typename CCM_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE, bool FIXED>
-typename CCM_TYPE::fresh_data_type::_ptr_type
-DDS_Get_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE, FIXED>::get_fresh_data (void)
-{
-  DDS4CCM_TRACE ("DDS_Get_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE, FIXED>::get_fresh_data");
-
-  return CCM_TYPE::fresh_data_type::_duplicate (this->dds_get_);
-}
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Get_T.h b/CIAO/connectors/dds4ccm/impl/DDS_Get_T.h
deleted file mode 100644
index 2c7e9407e92..00000000000
--- a/CIAO/connectors/dds4ccm/impl/DDS_Get_T.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-#ifndef DDS_GET_T_H_
-#define DDS_GET_T_H_
-
-#include "dds4ccm/impl/DDS_Subscriber_Base_T.h"
-#include "dds4ccm/impl/Getter_T.h"
-
-template <typename CCM_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE,
-          typename SEQ_VALUE_TYPE, bool FIXED>
-class DDS_Get_T
-  : public DDS_Subscriber_Base_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>
-{
-public:
-  DDS_Get_T (void);
-  ~DDS_Get_T (void);
-
-  /**
-   * @name DDS_Get
-   * DDS_Get operations
-   */
-  //@{
-  typename CCM_TYPE::fresh_data_type::_ptr_type get_fresh_data (void);
-  //@}
-
-  void set_component (::CORBA::Object_ptr component);
-
-  void configuration_complete (
-    ::DDS::Topic_ptr topic,
-    ::DDS::Subscriber_ptr subscriber,
-    const char * qos_profile,
-    DDS_XML_QOS_PARSER_TYPE* qos_xml);
-
-  void remove (::DDS::Subscriber_ptr subscriber);
-
-private:
-  typedef DDS_Subscriber_Base_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>
-    SubscriberBase_type;
-
-  typedef ::CIAO::DDS4CCM::Getter_T<
-      typename CCM_TYPE::fresh_data_type,
-      TYPED_DDS_READER ,
-      VALUE_TYPE,
-      SEQ_VALUE_TYPE,
-      FIXED>
-    Getter_type;
-
-  /**
-   * DDS_Get
-   */
-  //@{
-  ::DDS::DataReaderListener_var listener_;
-  ::CIAO::DDS4CCM::LocalObject_Auto_Ptr_T<Getter_type> dds_get_;
-  //@}
-};
-
-#include "dds4ccm/impl/DDS_Get_T.cpp"
-
-#endif /* DDS_GET_T_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.cpp
deleted file mode 100644
index 42623aec1db..00000000000
--- a/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-// -*- C++ -*-
-#include "dds4ccm/impl/DataListenerControl_T.h"
-#include "dds4ccm/impl/DataReaderListener_T.h"
-#include "dds4ccm/impl/logger/Log_Macros.h"
-
-template <typename CCM_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE, CIAO::DDS4CCM::DDS4CCM_LISTENER_READ_TAKE LRT>
-DDS_Listen_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE, LRT>::DDS_Listen_T (void)
-{
-}
-
-template <typename CCM_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE, CIAO::DDS4CCM::DDS4CCM_LISTENER_READ_TAKE LRT>
-DDS_Listen_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE, LRT>::~DDS_Listen_T (void)
-{
-}
-
-template <typename CCM_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE, CIAO::DDS4CCM::DDS4CCM_LISTENER_READ_TAKE LRT>
-void
-DDS_Listen_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE, LRT>::set_component (
-    ::CORBA::Object_ptr component)
-{
-  DDS_Subscriber_Base_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::set_component (component);
-  this->data_control_->_set_component (component);
-}
-
-template <typename CCM_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE, CIAO::DDS4CCM::DDS4CCM_LISTENER_READ_TAKE LRT>
-void
-DDS_Listen_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE, LRT>::activate (
-  typename CCM_TYPE::data_listener_type::_ptr_type listener,
-  ::CCM_DDS::PortStatusListener_ptr status,
-  ACE_Reactor* reactor)
-{
-  DDS4CCM_TRACE ("DDS_Listen_T::activate");
-
-  ::DDS::StatusMask const mask =
-    DataReaderListener_type::get_mask (listener, status);
-
-  if (mask != 0)
-    {
-      if (::CORBA::is_nil (this->listener_.in ()))
-        {
-          ACE_NEW_THROW_EX (this->listener_,
-                            DataReaderListener_type (
-                              listener,
-                              status,
-                              this->data_control_,
-                              reactor,
-                              this->condition_manager_),
-                            ::CORBA::NO_MEMORY ());
-        }
-      ::DDS::DataReader_var dr = this->dds_read_->get_dds_reader ();
-      if (!::CORBA::is_nil (dr.in ()))
-        {
-          ::DDS::ReturnCode_t const retcode = dr->set_listener (
-            this->listener_.in (), mask);
-
-          if (retcode != ::DDS::RETCODE_OK)
-            {
-              DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                            "DDS_Listen_T::activate - "
-                            "Error while setting the listener on the listen - <%C>\n",
-                            ::CIAO::DDS4CCM::translate_retcode (retcode)));
-              throw ::CORBA::INTERNAL ();
-            }
-        }
-      else
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        "DDS_Listen_T::activate - "
-                        "Error while retrieving the DataReader\n"));
-          throw ::CORBA::INTERNAL ();
-        }
-    }
-}
-
-template <typename CCM_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE, CIAO::DDS4CCM::DDS4CCM_LISTENER_READ_TAKE LRT>
-void
-DDS_Listen_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE, LRT>::remove (
-  ::DDS::Subscriber_ptr subscriber)
-{
-  DDS4CCM_TRACE ("DDS_Listen_T::remove");
-
-  SubscriberBase_type::remove (subscriber);
-}
-
-template <typename CCM_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE, CIAO::DDS4CCM::DDS4CCM_LISTENER_READ_TAKE LRT>
-::CCM_DDS::CCM_DataListenerControl_ptr
-DDS_Listen_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE, LRT>::get_data_control (void)
-{
-  DDS4CCM_TRACE ("DDS_Listen_T::get_data_control");
-
-  return ::CCM_DDS::CCM_DataListenerControl::_duplicate (this->data_control_);
-}
-
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.h b/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.h
deleted file mode 100644
index 613328c610f..00000000000
--- a/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-#ifndef DDS_LISTEN_T_H_
-#define DDS_LISTEN_T_H_
-
-#include "dds4ccm/impl/DDS_Subscriber_Base_T.h"
-#include "dds4ccm/impl/DataReaderListener_T.h"
-#include "dds4ccm/impl/DataListenerControl_T.h"
-#include "dds4ccm/impl/Utils.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-class ACE_Reactor;
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-/**
-  * Template implementing the DDS4CCM Listen basic port
-  * @tparam CCM_TYPE Set of type traits for this basic port
-  * @tparam TYPED_DDS_READER The typed DDS DataReader type
-  * @tparam SEQ_TYPE The type of sequence
-  * @tparam LRT An enum indicating the read or take semantics of this port
-  */
-template <typename CCM_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE, CIAO::DDS4CCM::DDS4CCM_LISTENER_READ_TAKE LRT>
-class DDS_Listen_T
-  : public DDS_Subscriber_Base_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>
-{
-public:
-  DDS_Listen_T (void);
-  ~DDS_Listen_T (void);
-
-  /**
-   * @name DDS_Listen
-   * DDS_Listen operations
-   */
-  //@{
-  ::CCM_DDS::CCM_DataListenerControl_ptr get_data_control (void);
-  //@}
-
-  void set_component (::CORBA::Object_ptr component);
-
-  void activate (
-    typename CCM_TYPE::data_listener_type::_ptr_type listener,
-    ::CCM_DDS::PortStatusListener_ptr status,
-    ACE_Reactor* reactor);
-
-  void remove (::DDS::Subscriber_ptr subscriber);
-
-private:
-  typedef ::CIAO::DDS4CCM::DataReaderListener_T<CCM_TYPE, TYPED_DDS_READER, SEQ_VALUE_TYPE, LRT>
-    DataReaderListener_type;
-  typedef CCM_DDS_DataListenerControl_T< ::CCM_DDS::CCM_DataListenerControl>
-    DataListenerControl_type;
-  typedef DDS_Subscriber_Base_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>
-    SubscriberBase_type;
-
-  /**
-   * DDS_Listen
-   */
-  //@{
-  ::CIAO::DDS4CCM::LocalObject_Auto_Ptr_T<DataListenerControl_type> data_control_;
-  //@}
-};
-
-#include "dds4ccm/impl/DDS_Listen_T.cpp"
-
-#endif /* DDS_LISTEN_T_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Read_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Read_T.cpp
deleted file mode 100644
index 81688f74ce3..00000000000
--- a/CIAO/connectors/dds4ccm/impl/DDS_Read_T.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-// -*- C++ -*-
-#include "dds4ccm/impl/logger/Log_Macros.h"
-
-template <typename CCM_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-DDS_Read_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::DDS_Read_T (void)
-{
-}
-
-template <typename CCM_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-DDS_Read_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::~DDS_Read_T (void)
-{
-}
-
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Read_T.h b/CIAO/connectors/dds4ccm/impl/DDS_Read_T.h
deleted file mode 100644
index bba7d944bbf..00000000000
--- a/CIAO/connectors/dds4ccm/impl/DDS_Read_T.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-#ifndef DDS_READ_T_H_
-#define DDS_READ_T_H_
-
-#include "dds4ccm/impl/DDS_Subscriber_Base_T.h"
-
-template <typename CCM_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-class DDS_Read_T
-  : public DDS_Subscriber_Base_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>
-{
-public:
-  DDS_Read_T (void);
-  ~DDS_Read_T (void);
-};
-
-#include "dds4ccm/impl/DDS_Read_T.cpp"
-
-#endif /* DDS_READ_T_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.cpp
deleted file mode 100644
index e1f25b90760..00000000000
--- a/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-// -*- C++ -*-
-#include "dds4ccm/impl/DataReaderStateListener_T.h"
-#include "dds4ccm/impl/StateListenerControl_T.h"
-#include "dds4ccm/impl/logger/Log_Macros.h"
-
-template <typename CCM_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE, CIAO::DDS4CCM::DDS4CCM_LISTENER_READ_TAKE LRT>
-DDS_StateListen_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE, LRT>::DDS_StateListen_T (void)
-{
-}
-
-template <typename CCM_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE, CIAO::DDS4CCM::DDS4CCM_LISTENER_READ_TAKE LRT>
-DDS_StateListen_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE, LRT>::~DDS_StateListen_T (void)
-{
-}
-
-template <typename CCM_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE, CIAO::DDS4CCM::DDS4CCM_LISTENER_READ_TAKE LRT>
-void
-DDS_StateListen_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE, LRT>::set_component (
-    ::CORBA::Object_ptr component)
-{
-  DDS_Subscriber_Base_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::set_component (component);
-  this->data_control_->_set_component (component);
-}
-
-template <typename CCM_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE, CIAO::DDS4CCM::DDS4CCM_LISTENER_READ_TAKE LRT>
-void
-DDS_StateListen_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE, LRT>::activate (
-  typename CCM_TYPE::data_listener_type::_ptr_type listener,
-  ::CCM_DDS::PortStatusListener_ptr status,
-  ACE_Reactor* reactor)
-{
-  DDS4CCM_TRACE ("DDS_StateListen_T::activate");
-
-  ::DDS::StatusMask const mask =
-    DataReaderStateListener_type::get_mask (listener);
-
-  if (mask != 0)
-    {
-      if (::CORBA::is_nil (this->listener_.in ()))
-        {
-          ACE_NEW_THROW_EX (this->listener_,
-                            DataReaderStateListener_type (
-                              listener,
-                              status,
-                              this->data_control_,
-                              reactor,
-                              this->condition_manager_),
-                            ::CORBA::NO_MEMORY ());
-        }
-
-      ::DDS::DataReader_var dr = this->dds_read_->get_dds_reader ();
-      if (!::CORBA::is_nil (dr.in ()))
-        {
-          ::DDS::ReturnCode_t const retcode =
-            dr->set_listener (this->listener_.in (), mask);
-
-          if (retcode != ::DDS::RETCODE_OK)
-            {
-              DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                            "DDS_StateListen_T::activate - "
-                            "Error setting the listener on the DataReader - <%C>\n",
-                            ::CIAO::DDS4CCM::translate_retcode (retcode)));
-              throw ::CORBA::INTERNAL ();
-            }
-        }
-      else
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        "DDS_StateListen_T::activate - "
-                        "Error while retrieving the DataReader\n"));
-          throw ::CORBA::INTERNAL ();
-        }
-    }
-}
-
-template <typename CCM_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE, CIAO::DDS4CCM::DDS4CCM_LISTENER_READ_TAKE LRT>
-void
-DDS_StateListen_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE, LRT>::remove (
-  ::DDS::Subscriber_ptr subscriber)
-{
-  DDS4CCM_TRACE ("DDS_StateListen_T::remove");
-
-  SubscriberBase_type::remove (subscriber);
-}
-
-template <typename CCM_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE, CIAO::DDS4CCM::DDS4CCM_LISTENER_READ_TAKE LRT>
-::CCM_DDS::CCM_StateListenerControl_ptr
-DDS_StateListen_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE, LRT>::get_data_control (void)
-{
-  DDS4CCM_TRACE ("DDS_StateListen_T::get_data_control");
-
-  return ::CCM_DDS::CCM_StateListenerControl::_duplicate (this->data_control_);
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.h b/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.h
deleted file mode 100644
index d8971a3f1fc..00000000000
--- a/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- *
- * DDS4CCM StateListen port
- */
-#ifndef DDS_STATELISTEN_T_H_
-#define DDS_STATELISTEN_T_H_
-
-#include "dds4ccm/impl/DDS_Subscriber_Base_T.h"
-#include "dds4ccm/impl/StateListenerControl_T.h"
-#include "dds4ccm/impl/DataReaderStateListener_T.h"
-#include "dds4ccm/impl/Utils.h"
-
-template <typename CCM_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE, CIAO::DDS4CCM::DDS4CCM_LISTENER_READ_TAKE LRT>
-class DDS_StateListen_T
-  : public DDS_Subscriber_Base_T<CCM_TYPE,
-                                 TYPED_DDS_READER,
-                                 VALUE_TYPE,
-                                 SEQ_VALUE_TYPE>
-{
-public:
-  DDS_StateListen_T (void);
-  ~DDS_StateListen_T (void);
-
-  /**
-   * @name DDS_Listen
-   * DDS_Listen operations
-   */
-  //@{
-  ::CCM_DDS::CCM_StateListenerControl_ptr get_data_control (void);
-  //@}
-
-  void set_component (::CORBA::Object_ptr component);
-
-  void activate (
-    typename CCM_TYPE::data_listener_type::_ptr_type listener,
-    ::CCM_DDS::PortStatusListener_ptr status,
-    ACE_Reactor* reactor);
-
-  void remove (::DDS::Subscriber_ptr subscriber);
-
-private:
-  typedef ::CIAO::DDS4CCM::DataReaderStateListener_T<CCM_TYPE, TYPED_DDS_READER, SEQ_VALUE_TYPE, LRT>
-    DataReaderStateListener_type;
-  typedef CCM_DDS_StateListenerControl_T< ::CCM_DDS::CCM_StateListenerControl>
-    StateListenerControl_type;
-  typedef DDS_Subscriber_Base_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>
-    SubscriberBase_type;
-
-  /**
-   * DDS_StateListen
-   */
-  //@{
-  ::CIAO::DDS4CCM::LocalObject_Auto_Ptr_T<StateListenerControl_type> data_control_;
-  //@}
-};
-
-#include "dds4ccm/impl/DDS_StateListen_T.cpp"
-
-#endif /* DDS_STATELISTEN_T_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.cpp
deleted file mode 100644
index 0b099761033..00000000000
--- a/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.cpp
+++ /dev/null
@@ -1,744 +0,0 @@
-// -*- C++ -*-
-#include "dds4ccm/impl/DataReaderStateListener_T.h"
-#include "dds4ccm/impl/Updater_T.h"
-#include "dds4ccm/impl/Reader_T.h"
-#include "dds4ccm/impl/DataListenerControl_T.h"
-#include "dds4ccm/impl/StateListenerControl_T.h"
-
-#include "dds4ccm/impl/logger/Log_Macros.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::DDS_State_Connector_T (void) :
-    TopicBaseConnector (),
-    observable_obtained_ (false),
-    passive_observer_obtained_ (false),
-    pull_observer_obtained_ (false),
-    push_observer_obtained_ (false),
-    push_state_observer_obtained_ (false)
-{
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::~DDS_State_Connector_T (void)
-{
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::observable_traits::data_type::_ptr_type
-DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_observable_data (void)
-{
-  DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_observable_data");
-
-  this->observable_obtained_ = true;
-  this->observable_.set_component (this);
-  this->init_publisher_ |= this->observable_obtained_;
-  return this->observable_.get_data ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::observable_traits::dds_entity_type::_ptr_type
-DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_observable_dds_entity (void)
-{
-  DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_observable_dds_entity");
-
-  this->observable_obtained_ = true;
-  this->observable_.set_component (this);
-  this->init_publisher_ |= this->observable_obtained_;
-  return this->observable_.get_dds_entity ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::passive_observer_traits::data_type::_ptr_type
-DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_passive_observer_data (void)
-{
-  DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_passive_observer_data");
-
-  this->passive_observer_obtained_ = true;
-  this->passive_observer_.set_component (this);
-  this->init_subscriber_ |= this->passive_observer_obtained_;
-  return this->passive_observer_.get_data ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::passive_observer_traits::dds_entity_type::_ptr_type
-DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_passive_observer_dds_entity (void)
-{
-  DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_passive_observer_dds_entity");
-
-  this->passive_observer_obtained_ = true;
-  this->passive_observer_.set_component (this);
-  this->init_subscriber_ |= this->passive_observer_obtained_;
-  return this->passive_observer_.get_dds_entity ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::passive_observer_traits::filter_config_type::_ptr_type
-DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_passive_observer_filter_config (void)
-{
-  DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_passive_observer_filter_config");
-
-  this->passive_observer_obtained_ = true;
-  this->passive_observer_.set_component (this);
-  this->init_subscriber_ |= this->passive_observer_obtained_;
-  return this->passive_observer_.get_filter_config ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-::CCM_DDS::QueryFilter*
-DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::passive_observer_filter (void)
-{
-  DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::passive_observer_filter");
-
-  return this->passive_observer_.filter ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::passive_observer_filter (
-  const ::CCM_DDS::QueryFilter & filter)
-{
-  DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::passive_observer_filter");
-
-  this->passive_observer_.filter (filter);
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::pull_observer_traits::data_type::_ptr_type
-DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_observer_data (void)
-{
-  DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_observer_data");
-
-  this->pull_observer_obtained_ = true;
-  this->pull_observer_.set_component (this);
-  this->init_subscriber_ |= this->pull_observer_obtained_;
-  return this->pull_observer_.get_data ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::pull_observer_traits::fresh_data_type::_ptr_type
-DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_observer_fresh_data (void)
-{
-  DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_observer_fresh_data");
-
-  this->pull_observer_obtained_ = true;
-  this->pull_observer_.set_component (this);
-  this->init_subscriber_ |= this->pull_observer_obtained_;
-  return this->pull_observer_.get_fresh_data ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::pull_observer_traits::dds_entity_type::_ptr_type
-DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_observer_dds_entity (void)
-{
-  DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_observer_dds_entity");
-
-  this->pull_observer_obtained_ = true;
-  this->pull_observer_.set_component (this);
-  this->init_subscriber_ |= this->pull_observer_obtained_;
-  return this->pull_observer_.get_dds_entity ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::pull_observer_traits::filter_config_type::_ptr_type
-DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_observer_filter_config (void)
-{
-  DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_observer_filter_config");
-
-  this->pull_observer_obtained_ = true;
-  this->pull_observer_.set_component (this);
-  this->init_subscriber_ |= this->pull_observer_obtained_;
-  return this->pull_observer_.get_filter_config ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-::CCM_DDS::QueryFilter*
-DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::pull_observer_filter (void)
-{
-  DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::pull_observer_filter");
-
-  return this->pull_observer_.filter ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::pull_observer_filter (
-  const ::CCM_DDS::QueryFilter & filter)
-{
-  DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::pull_observer_filter");
-
-  this->pull_observer_.filter (filter);
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::push_observer_traits::data_type::_ptr_type
-DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_observer_data (void)
-{
-  DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_observer_data");
-
-  this->push_observer_obtained_ = true;
-  this->push_observer_.set_component (this);
-  this->init_subscriber_ |= this->push_observer_obtained_;
-  return this->push_observer_.get_data ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::push_observer_traits::data_control_type::_ptr_type
-DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_observer_data_control (void)
-{
-  DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_observer_data_control");
-
-  this->push_observer_obtained_ = true;
-  this->push_observer_.set_component (this);
-  this->init_subscriber_ |= this->push_observer_obtained_;
-  return this->push_observer_.get_data_control ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::push_observer_traits::dds_entity_type::_ptr_type
-DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_observer_dds_entity (void)
-{
-  DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_observer_dds_entity");
-
-  this->push_observer_obtained_ = true;
-  this->push_observer_.set_component (this);
-  this->init_subscriber_ |= this->push_observer_obtained_;
-  return this->push_observer_.get_dds_entity ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::push_observer_traits::filter_config_type::_ptr_type
-DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_observer_filter_config (void)
-{
-  DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_observer_filter_config");
-
-  this->push_observer_obtained_ = true;
-  this->push_observer_.set_component (this);
-  this->init_subscriber_ |= this->push_observer_obtained_;
-  return this->push_observer_.get_filter_config ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-::CCM_DDS::QueryFilter*
-DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_observer_filter (void)
-{
-  DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_observer_filter");
-
-  return this->push_observer_.filter ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_observer_filter (
-  const ::CCM_DDS::QueryFilter & filter)
-{
-  DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_observer_filter");
-
-  this->push_observer_.filter (filter);
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::push_state_observer_traits::data_type::_ptr_type
-DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_state_observer_data (void)
-{
-  DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_state_observer_data");
-
-  this->push_state_observer_obtained_ = true;
-  this->push_state_observer_.set_component (this);
-  this->init_subscriber_ |= this->push_state_observer_obtained_;
-  return this->push_state_observer_.get_data ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::push_state_observer_traits::data_control_type::_ptr_type
-DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_state_observer_data_control (void)
-{
-  DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_state_observer_data_control");
-
-  this->push_state_observer_obtained_ = true;
-  this->push_state_observer_.set_component (this);
-  this->init_subscriber_ |= this->push_state_observer_obtained_;
-  return this->push_state_observer_.get_data_control ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::push_state_observer_traits::dds_entity_type::_ptr_type
-DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_state_observer_dds_entity (void)
-{
-  DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_state_observer_dds_entity");
-
-  this->push_state_observer_obtained_ = true;
-  this->push_state_observer_.set_component (this);
-  this->init_subscriber_ |= this->push_state_observer_obtained_;
-  return this->push_state_observer_.get_dds_entity ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::push_state_observer_traits::filter_config_type::_ptr_type
-DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_state_observer_filter_config (void)
-{
-  DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_state_observer_filter_config");
-
-  this->push_state_observer_obtained_ = true;
-  this->push_state_observer_.set_component (this);
-  this->init_subscriber_ |= this->push_state_observer_obtained_;
-  return this->push_state_observer_.get_filter_config ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-::CCM_DDS::QueryFilter*
-DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_state_observer_filter (void)
-{
-  DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_state_observer_filter");
-
-  return this->push_state_observer_.filter ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_state_observer_filter (
-  const ::CCM_DDS::QueryFilter & filter)
-{
-  DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_state_observer_filter");
-
-  this->push_state_observer_.filter (filter);
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::topic_name (
-  const char * topic_name)
-{
-  DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::topic_name");
-
-  if (this->stop_dds (topic_name))
-    {
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                    "DDS_State_Connector_T::topic_name - "
-                    "Stopping DDS=>switching to new topic <%C>.\n",
-                    topic_name));
-      this->ccm_passivate ();
-      this->do_ccm_remove ();
-
-      if (ACE_OS::strlen (topic_name) > 0)
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                        "DDS_State_Connector_T::topic_name - "
-                        "DDS is down. Setting new to <%C>.\n",
-                        topic_name));
-
-          TopicBaseConnector::topic_name (topic_name);
-
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                        "DDS_State_Connector_T::topic_name - "
-                        "Initialize DDS again for topic <%C>.\n",
-                        topic_name));
-
-          this->do_configuration_complete ();
-          this->do_ccm_activate ();
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                        "DDS_State_Connector_T::topic_name - "
-                        "DDS up and running for topic <%C>.\n",
-                        topic_name));
-        }
-      else
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                        "DDS_Event_Connector_T::topic_name - "
-                        "DDS is down.\n"));
-          TopicBaseConnector::topic_name (topic_name);
-        }
-    }
-  else if (this->late_binded (topic_name))
-    {
-      this->do_configuration_complete ();
-      this->do_ccm_activate ();
-    }
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-char *
-DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::topic_name (void)
-{
-  DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::topic_name");
-
-  return TopicBaseConnector::topic_name ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::do_configuration_complete (void)
-{
-  DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::do_configuration_complete");
-
-  ::CCM_DDS::PortStatusListener_var push_observer_psl =
-    this->context_->get_connection_push_observer_status ();
-  typename CCM_TYPE::push_observer_traits::data_listener_type::_var_type push_observer_dl =
-    this->context_->get_connection_push_observer_data_listener ();
-  this->push_observer_obtained_ |= ! ::CORBA::is_nil (push_observer_psl.in ());
-  this->push_observer_obtained_ |= ! ::CORBA::is_nil (push_observer_dl.in ());
-  this->init_subscriber_ |= this->push_observer_obtained_;
-
-  ::CCM_DDS::PortStatusListener_var push_state_observer_psl =
-    this->context_->get_connection_push_state_observer_status ();
-  typename CCM_TYPE::push_state_observer_traits::data_listener_type::_var_type push_state_observer_dl =
-    this->context_->get_connection_push_state_observer_data_listener ();
-  this->push_state_observer_obtained_ |= ! ::CORBA::is_nil (push_state_observer_psl.in ());
-  this->push_state_observer_obtained_ |= ! ::CORBA::is_nil (push_state_observer_dl.in ());
-  this->init_subscriber_ |= this->push_state_observer_obtained_;
-
-  ::CCM_DDS::PortStatusListener_var pull_observer_psl =
-    this->context_->get_connection_pull_observer_status ();
-  this->pull_observer_obtained_ |= ! ::CORBA::is_nil (pull_observer_psl.in ());
-  this->init_subscriber_ |= this->pull_observer_obtained_;
-
-  ::CCM_DDS::PortStatusListener_var passive_observer_psl =
-    this->context_->get_connection_passive_observer_status ();
-  this->passive_observer_obtained_ |= ! ::CORBA::is_nil (passive_observer_psl.in ());
-  this->init_subscriber_ |= this->passive_observer_obtained_;
-
-  TopicBaseConnector::configuration_complete ();
-
-  if (this->observable_obtained_)
-    {
-      this->observable_.configuration_complete (
-        this->topic_.in (),
-        this->publisher_.in (),
-        this->qos_profile_.in (),
-        this->qos_xml_);
-    }
-
-  if (this->push_observer_obtained_)
-    {
-      this->push_observer_.configuration_complete (
-        this->topic_.in (),
-        this->subscriber_.in (),
-        this->qos_profile_.in (),
-        this->qos_xml_);
-    }
-
-  if (this->push_state_observer_obtained_)
-    {
-      this->push_state_observer_.configuration_complete (
-        this->topic_.in (),
-        this->subscriber_.in (),
-        this->qos_profile_.in (),
-        this->qos_xml_);
-    }
-
-  if (this->pull_observer_obtained_)
-    {
-      this->pull_observer_.configuration_complete (
-        this->topic_.in (),
-        this->subscriber_.in (),
-        this->qos_profile_.in (),
-        this->qos_xml_);
-    }
-
-  if (this->passive_observer_obtained_)
-    {
-      this->passive_observer_.configuration_complete (
-        this->topic_.in (),
-        this->subscriber_.in (),
-        this->qos_profile_.in (),
-        this->qos_xml_);
-    }
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::configuration_complete (void)
-{
-  DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::configuration_complete");
-
-  try
-    {
-      if (!this->late_binding ())
-        {
-          this->do_configuration_complete ();
-        }
-    }
-  catch (const ::CCM_DDS::InternalError &ex)
-    {
-      DDS4CCM_PRINT_INTERNAL_EXCEPTION (
-                              DDS4CCM_LOG_LEVEL_ERROR,
-                              ::CIAO::DDS4CCM::translate_retcode (ex.error_code),
-                              "DDS_State_Connector_T::configuration_complete");
-      throw ::CORBA::INTERNAL ();
-    }
-  catch (const ::CORBA::Exception& ex)
-    {
-      DDS4CCM_PRINT_CORBA_EXCEPTION (
-                              DDS4CCM_LOG_LEVEL_ERROR,
-                              ex,
-                              "DDS_State_Connector_T::configuration_complete");
-      throw;
-    }
-  catch (...)
-    {
-      DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                    "DDS_State_Connector_T::configuration_complete - "
-                    "Caught unexpected exception.\n"));
-      throw ::CORBA::INTERNAL ();
-    }
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::do_ccm_activate (void)
-{
-  DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::do_ccm_activate");
-
-  ACE_Reactor *reactor = this->reactor ();
-
-  TopicBaseConnector::ccm_activate ();
-
-  if (this->observable_obtained_)
-    {
-      this->observable_.activate ();
-    }
-
-  if (this->push_observer_obtained_)
-    {
-      typename CCM_TYPE::push_observer_traits::data_listener_type::_var_type push_observer_dl =
-        this->context_->get_connection_push_observer_data_listener ();
-      ::CCM_DDS::PortStatusListener_var push_observer_psl =
-        this->context_->get_connection_push_observer_status ();
-
-      this->push_observer_.activate (
-        push_observer_dl.in (),
-        push_observer_psl.in (),
-        reactor);
-    }
-
-  if (this->push_state_observer_obtained_)
-    {
-      typename CCM_TYPE::push_state_observer_traits::data_listener_type::_var_type push_state_observer_dl =
-        this->context_->get_connection_push_state_observer_data_listener ();
-
-      ::CCM_DDS::PortStatusListener_var push_state_observer_psl =
-        this->context_->get_connection_push_state_observer_status ();
-
-      this->push_state_observer_.activate (
-        push_state_observer_dl.in (),
-        push_state_observer_psl.in (),
-        reactor);
-    }
-
-  if (this->pull_observer_obtained_)
-    {
-      ::CCM_DDS::PortStatusListener_var pull_observer_psl =
-        this->context_->get_connection_pull_observer_status ();
-
-      this->pull_observer_.activate (
-        pull_observer_psl.in (),
-        reactor);
-    }
-
-  if (this->passive_observer_obtained_)
-    {
-      ::CCM_DDS::PortStatusListener_var passive_observer_psl =
-        this->context_->get_connection_passive_observer_status ();
-
-      this->passive_observer_.activate (
-        passive_observer_psl.in (),
-        reactor);
-    }
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_activate (void)
-{
-  DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_activate");
-
-  try
-    {
-      if (!this->late_binding ())
-        {
-          this->do_ccm_activate ();
-        }
-    }
-  catch (const ::CCM_DDS::InternalError &ex)
-    {
-      DDS4CCM_PRINT_INTERNAL_EXCEPTION (
-                              DDS4CCM_LOG_LEVEL_ERROR,
-                              ::CIAO::DDS4CCM::translate_retcode (ex.error_code),
-                              "DDS_State_Connector_T::ccm_activate");
-      throw ::CORBA::INTERNAL ();
-    }
-  catch (const ::CORBA::Exception& ex)
-    {
-      DDS4CCM_PRINT_CORBA_EXCEPTION (
-                              DDS4CCM_LOG_LEVEL_ERROR,
-                              ex,
-                              "DDS_State_Connector_T::ccm_activate");
-      throw;
-    }
-  catch (...)
-    {
-      DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                    "DDS_State_Connector_T::ccm_activate - "
-                    "Caught unexpected exception.\n"));
-      throw ::CORBA::INTERNAL ();
-    }
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_passivate (void)
-{
-  DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_passivate");
-
-  try
-    {
-      if (ACE_OS::strlen (this->topic_name_) != 0)
-        {
-          if (this->observable_obtained_)
-            {
-              this->observable_.passivate ();
-            }
-
-          if (this->push_observer_obtained_)
-            {
-              this->push_observer_.passivate ();
-            }
-
-          if (this->push_state_observer_obtained_)
-            {
-              this->push_state_observer_.passivate ();
-            }
-
-          if (this->pull_observer_obtained_)
-            {
-              this->pull_observer_.passivate ();
-            }
-
-          if (this->passive_observer_obtained_)
-            {
-              this->passive_observer_.passivate ();
-            }
-
-          TopicBaseConnector::ccm_passivate ();
-        }
-    }
-  catch (const ::CCM_DDS::InternalError &ex)
-    {
-      DDS4CCM_PRINT_INTERNAL_EXCEPTION (
-                              DDS4CCM_LOG_LEVEL_ERROR,
-                              ::CIAO::DDS4CCM::translate_retcode (ex.error_code),
-                              "DDS_State_Connector_T::ccm_passivate");
-      throw ::CORBA::INTERNAL ();
-    }
-  catch (const ::CORBA::Exception& ex)
-    {
-      DDS4CCM_PRINT_CORBA_EXCEPTION (
-                              DDS4CCM_LOG_LEVEL_ERROR,
-                              ex,
-                              "DDS_State_Connector_T::ccm_passivate");
-      throw;
-    }
-  catch (...)
-    {
-      DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                    "DDS_State_Connector_T::ccm_passivate - "
-                    "Caught unexpected exception.\n"));
-      throw ::CORBA::INTERNAL ();
-    }
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::do_ccm_remove (void)
-{
-  DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::do_ccm_remove");
-  try
-    {
-      if (ACE_OS::strlen (this->topic_name_) != 0)
-        {
-          if (this->observable_obtained_)
-            {
-              this->observable_.remove (this->publisher_.in ());
-            }
-
-          if (this->push_observer_obtained_)
-            {
-              this->push_observer_.remove (this->subscriber_.in ());
-            }
-
-          if (this->push_state_observer_obtained_)
-            {
-              this->push_state_observer_.remove (this->subscriber_.in ());
-            }
-
-          if (this->pull_observer_obtained_)
-            {
-              this->pull_observer_.remove (this->subscriber_.in ());
-            }
-
-          if (this->passive_observer_obtained_)
-            {
-              this->passive_observer_.remove (this->subscriber_.in ());
-            }
-          TopicBaseConnector::ccm_remove ();
-        }
-    }
-  catch (const ::CCM_DDS::InternalError &ex)
-    {
-      DDS4CCM_PRINT_INTERNAL_EXCEPTION (
-                              DDS4CCM_LOG_LEVEL_ERROR,
-                              ::CIAO::DDS4CCM::translate_retcode (ex.error_code),
-                              "DDS_State_Connector_T::do_ccm_remove");
-      throw ::CORBA::INTERNAL ();
-    }
-  catch (const ::CORBA::Exception& ex)
-    {
-      DDS4CCM_PRINT_CORBA_EXCEPTION (
-                              DDS4CCM_LOG_LEVEL_ERROR,
-                              ex,
-                              "DDS_State_Connector_T::do_ccm_remove");
-      throw;
-    }
-  catch (...)
-    {
-      DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                    "DDS_State_Connector_T::do_ccm_remove - "
-                    "Caught unexpected exception.\n"));
-      throw ::CORBA::INTERNAL ();
-    }
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_remove (void)
-{
-  DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_remove");
-
-  if (this->observable_obtained_)
-    {
-      this->observable_.set_component (::CORBA::Object::_nil ());
-    }
-
-  if (this->push_observer_obtained_)
-    {
-      this->push_observer_.set_component (::CORBA::Object::_nil ());
-    }
-
-  if (this->push_state_observer_obtained_)
-    {
-      this->push_state_observer_.set_component (::CORBA::Object::_nil ());
-    }
-
-  if (this->pull_observer_obtained_)
-    {
-      this->pull_observer_.set_component (::CORBA::Object::_nil ());
-    }
-
-  if (this->passive_observer_obtained_)
-    {
-      this->passive_observer_.set_component (::CORBA::Object::_nil ());
-    }
-
-  this->do_ccm_remove ();
-}
-
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.h b/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.h
deleted file mode 100644
index 40c54f3b1f7..00000000000
--- a/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.h
+++ /dev/null
@@ -1,209 +0,0 @@
-/**
- * @author Johnny Willemsen  <jwillemsen@remedy.nl>
- *
- * DDS State Connector implementation
- */
-#ifndef DDS_STATE_CONNECTOR_T_H_
-#define DDS_STATE_CONNECTOR_T_H_
-
-#include "dds4ccm/impl/DDS_TopicBase_Connector_T.h"
-#include "dds4ccm/impl/DDS_Get_T.h"
-#include "dds4ccm/impl/DDS_Listen_T.h"
-#include "dds4ccm/impl/DDS_StateListen_T.h"
-#include "dds4ccm/impl/DDS_Update_T.h"
-#include "dds4ccm/impl/DDS_Read_T.h"
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-class DDS_State_Connector_T
-  : public virtual DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE>
-{
-public:
-  DDS_State_Connector_T (void);
-  virtual ~DDS_State_Connector_T (void);
-
-  /**
-   * @name DDS_Update
-   * DDS_Update operations
-   */
-  //@{
-  virtual typename CCM_TYPE::observable_traits::data_type::_ptr_type
-  get_observable_data (void);
-
-  virtual typename CCM_TYPE::observable_traits::dds_entity_type::_ptr_type
-  get_observable_dds_entity (void);
-  //@}
-
-  /**
-   * @name DDS_Read
-   * DDS_Read operations
-   */
-  //@{
-  virtual typename CCM_TYPE::passive_observer_traits::data_type::_ptr_type
-  get_passive_observer_data (void);
-
-  virtual typename CCM_TYPE::passive_observer_traits::dds_entity_type::_ptr_type
-  get_passive_observer_dds_entity (void);
-
-  virtual typename CCM_TYPE::passive_observer_traits::filter_config_type::_ptr_type
-  get_passive_observer_filter_config (void);
-
-  virtual ::CCM_DDS::QueryFilter *passive_observer_filter (void);
-
-  virtual void passive_observer_filter (const ::CCM_DDS::QueryFilter & filter);
-//@}
-
-  /**
-   * @name DDS_Get
-   * DDS_Get operations
-   */
-  //@{
-  virtual typename CCM_TYPE::pull_observer_traits::data_type::_ptr_type
-  get_pull_observer_data (void);
-
-  virtual typename CCM_TYPE::pull_observer_traits::fresh_data_type::_ptr_type
-  get_pull_observer_fresh_data (void);
-
-  virtual typename CCM_TYPE::pull_observer_traits::dds_entity_type::_ptr_type
-  get_pull_observer_dds_entity (void);
-
-  virtual typename CCM_TYPE::pull_observer_traits::filter_config_type::_ptr_type
-  get_pull_observer_filter_config (void);
-
-  virtual ::CCM_DDS::QueryFilter *pull_observer_filter (void);
-
-  virtual void pull_observer_filter (const ::CCM_DDS::QueryFilter & filter);
-  //@}
-
-  /**
-   * @name DDS_Listen
-   * DDS_Listen operations
-   */
-  //@{
-  virtual typename CCM_TYPE::push_observer_traits::data_type::_ptr_type
-  get_push_observer_data (void);
-
-  virtual typename CCM_TYPE::push_observer_traits::data_control_type::_ptr_type
-  get_push_observer_data_control (void);
-
-  virtual typename CCM_TYPE::push_observer_traits::dds_entity_type::_ptr_type
-  get_push_observer_dds_entity (void);
-
-  virtual typename CCM_TYPE::push_observer_traits::filter_config_type::_ptr_type
-  get_push_observer_filter_config (void);
-
-  virtual ::CCM_DDS::QueryFilter *push_observer_filter (void);
-
-  virtual void push_observer_filter (const ::CCM_DDS::QueryFilter & filter);
-  //@}
-
-  /**
-   * @name DDS_StateListen
-   * DDS_StateListen operations
-   */
-  //@{
-  virtual typename CCM_TYPE::push_state_observer_traits::data_type::_ptr_type
-  get_push_state_observer_data (void);
-
-  virtual typename CCM_TYPE::push_state_observer_traits::data_control_type::_ptr_type
-  get_push_state_observer_data_control (void);
-
-  virtual typename CCM_TYPE::push_state_observer_traits::dds_entity_type::_ptr_type
-  get_push_state_observer_dds_entity (void);
-
-  virtual typename CCM_TYPE::push_state_observer_traits::filter_config_type::_ptr_type
-  get_push_state_observer_filter_config (void);
-
-  virtual ::CCM_DDS::QueryFilter *push_state_observer_filter (void);
-
-  virtual void
-  push_state_observer_filter (const ::CCM_DDS::QueryFilter & filter);
-  //@}
-
-  void topic_name (const char * topic_name);
-  virtual char *topic_name (void);
-
-  virtual void configuration_complete (void);
-  virtual void ccm_activate (void);
-  virtual void ccm_passivate (void);
-  virtual void ccm_remove (void);
-
-private:
-  bool observable_obtained_;
-  bool passive_observer_obtained_;
-  bool pull_observer_obtained_;
-  bool push_observer_obtained_;
-  bool push_state_observer_obtained_;
-
-  /**
-   * DDS_Update observable
-   */
-  //@{
-  DDS_Update_T <
-      typename CCM_TYPE::observable_traits,
-      typename DDS_TYPE::typed_writer_type,
-      typename DDS_TYPE::value_type,
-      SEQ_TYPE>
-    observable_;
-  //@}
-
-  /**
-   * DDS_Read passive_observer
-   */
-  //@{
-  DDS_Read_T <
-      typename CCM_TYPE::passive_observer_traits,
-      typename DDS_TYPE::typed_reader_type,
-      typename DDS_TYPE::value_type,
-      SEQ_TYPE>
-    passive_observer_;
-  //@}
-
-  /**
-   * DDS_Get pull_observer
-   */
-  //@{
-  DDS_Get_T <
-      typename CCM_TYPE::pull_observer_traits,
-      typename DDS_TYPE::typed_reader_type,
-      typename DDS_TYPE::value_type,
-      SEQ_TYPE,
-      FIXED>
-    pull_observer_;
-  //@}
-
-  /**
-   * DDS_Listen push_observer
-   */
-  //@{
-  DDS_Listen_T <
-      typename CCM_TYPE::push_observer_traits,
-      typename DDS_TYPE::typed_reader_type,
-      typename DDS_TYPE::value_type,
-      SEQ_TYPE,
-      CIAO::DDS4CCM::DDS4CCM_READ>
-  push_observer_;
-  //@}
-
-  /**
-   * DDS_StateListen push_state_observer
-   */
-  //@{
-  DDS_StateListen_T <
-      typename CCM_TYPE::push_state_observer_traits,
-      typename DDS_TYPE::typed_reader_type,
-      typename DDS_TYPE::value_type,
-      SEQ_TYPE,
-      CIAO::DDS4CCM::DDS4CCM_READ>
-    push_state_observer_;
-  //@}
-
-  void do_configuration_complete (void);
-  void do_ccm_activate (void);
-  void do_ccm_remove (void);
-
-  typedef DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE> TopicBaseConnector;
-};
-
-#include "dds4ccm/impl/DDS_State_Connector_T.cpp"
-
-#endif /* DDS_STATE_CONNECTOR_T_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp
deleted file mode 100644
index ae258d83fa4..00000000000
--- a/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp
+++ /dev/null
@@ -1,333 +0,0 @@
-// -*- C++ -*-
-#include "dds4ccm/impl/logger/Log_Macros.h"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-#include "dds/DCPS/Marked_Default_Qos.h"
-#endif
-
-template <typename CCM_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-DDS_Subscriber_Base_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::DDS_Subscriber_Base_T (void)
-  : configuration_complete_ (false)
-{
-}
-
-template <typename CCM_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-DDS_Subscriber_Base_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::~DDS_Subscriber_Base_T (void)
-{
-}
-
-template <typename CCM_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-void
-DDS_Subscriber_Base_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::set_component (
-    ::CORBA::Object_ptr component)
-{
-  this->dds_read_->_set_component (component);
-  this->ccm_data_reader_->_set_component (component);
-}
-
-template <typename CCM_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-void
-DDS_Subscriber_Base_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::configuration_complete (
-  ::DDS::Topic_ptr topic,
-  ::DDS::Subscriber_ptr subscriber,
-  const char * qos_profile,
-  DDS_XML_QOS_PARSER_TYPE* qos_xml)
-{
-  DDS4CCM_TRACE ("DDS_Subscriber_Base_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::configuration_complete");
-
-  this->configuration_complete_ = true;
-
-  ::DDS::DataReader_var dr = this->dds_read_->get_dds_reader ();
-  if (::CORBA::is_nil (dr.in ()))
-    {
-      ::DDS::TopicDescription_var td;
-
-      ::CCM_DDS::QueryFilter_var filter = this->cft_setting_->filter ();
-      if (ACE_OS::strlen (filter->expression.in ()) > 0)
-        {
-          ::DDS::ContentFilteredTopic_var cft =
-            this->cft_setting_->create_contentfilteredtopic (topic, subscriber);
-          if (CORBA::is_nil (cft.in ()))
-            {
-              DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR,
-                            "DDS_Subscriber_Base_T::configuration_complete: "
-                            "Error creating ContentFilteredTopic.\n"));
-              throw ::CORBA::INTERNAL ();
-            }
-          td = ::DDS::TopicDescription::_narrow (cft.in ());
-        }
-      else
-        {
-          td = ::DDS::TopicDescription::_narrow (topic);
-        }
-#if (CIAO_DDS4CCM_NDDS==1)
-      if (qos_profile)
-        {
-          dr = subscriber->create_datareader_with_profile (
-                                          td.in (),
-                                          qos_profile,
-                                          ::DDS::DataReaderListener::_nil (),
-                                          0);
-        }
-      else
-#endif
-        {
-          ::DDS::DataReaderQos drqos;
-          DDS::ReturnCode_t const retcode =
-            subscriber->get_default_datareader_qos (drqos);
-
-          if (retcode != DDS::RETCODE_OK)
-            {
-              DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                  "DDS_Subscriber_Base_T::configuration_complete - "
-                  "Error: Unable to retrieve get_default_datareader_qos: <%C>\n",
-                  ::CIAO::DDS4CCM::translate_retcode (retcode)));
-              throw ::CCM_DDS::InternalError (retcode, 0);
-            }
-
-          if (qos_profile && qos_xml)
-            {
-              CORBA::String_var name = topic->get_name ();
-              DDS::ReturnCode_t const retcode_dr_qos = qos_xml->get_datareader_qos (
-                                          drqos,
-                                          qos_profile,
-                                          name.in ());
-
-              if (retcode_dr_qos != DDS::RETCODE_OK)
-                {
-                  DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                      "DDS_Subscriber_Base_T::configuration_complete - "
-                      "Error: Unable to retrieve datawriter QOS from XML: <%C>\n",
-                      ::CIAO::DDS4CCM::translate_retcode (retcode_dr_qos)));
-                  throw ::CCM_DDS::InternalError (retcode_dr_qos, 0);
-                }
-            }
-
-#if defined GEN_OSTREAM_OPS
-          if (DDS4CCM_debug_level >= DDS4CCM_LOG_LEVEL_DDS_STATUS)
-            {
-              std::stringstream output;
-              output << drqos;
-              std::string message = output.str();
-              DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_INFO, DDS4CCM_INFO
-                            ACE_TEXT ("DDS_Subscriber_Base_T::configuration_complete - ")
-                            ACE_TEXT ("Using datareader QOS <%C>\n"), message.c_str()));
-            }
-#endif
-
-          dr = subscriber->create_datareader (
-                                          td.in (),
-                                          drqos,
-                                          ::DDS::DataReaderListener::_nil (),
-                                          0);
-        }
-      if (!::CORBA::is_nil (dr.in ()))
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_TRACE, DDS4CCM_INFO
-                      "DDS_Subscriber_Base_T::configuration_complete - "
-                      "Created DataReader "
-                      DDS_ENTITY_FORMAT_SPECIFIER
-                      " using subscriber "
-                      DDS_ENTITY_FORMAT_SPECIFIER
-                      "\n",
-                      DDS_ENTITY_LOG (dr.in ()),
-                      DDS_ENTITY_LOG (subscriber)));
-        }
-      else
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_DDS_NIL_RETURN, (LM_ERROR, DDS4CCM_INFO
-                        "DDS_Subscriber_Base_T::configuration_complete - "
-                        "Error: DDS returned a nil datareader.\n"));
-          throw ::CORBA::INTERNAL ();
-        }
-
-      this->dds_read_->set_dds_reader (dr.in (), &this->condition_manager_);
-      this->ccm_data_reader_->set_dds_entity (dr.in ());
-      this->condition_manager_.set_dds_entity (dr.in ());
-      this->condition_manager_.init_readcondition ();
-
-      DDS::ReturnCode_t const retcode = dr->enable ();
-      if (retcode != ::DDS::RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        "DDS_Subscriber_Base_T::configuration_complete - "
-                        "Error: Unable to enable the datareader: <%C>.\n",
-                        ::CIAO::DDS4CCM::translate_retcode (retcode)));
-          throw ::CORBA::INTERNAL ();
-        }
-    }
-}
-
-template <typename CCM_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-void
-DDS_Subscriber_Base_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::activate (
-  ::CCM_DDS::PortStatusListener_ptr status,
-  ACE_Reactor* reactor)
-{
-  DDS4CCM_TRACE ("DDS_Subscriber_Base_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::activate");
-
-  ::DDS::StatusMask const mask =
-      ::CIAO::DDS4CCM::PortStatusListener::get_mask (status);
-
-  if (mask != 0)
-    {
-      if (::CORBA::is_nil (this->listener_.in ()))
-        {
-          ACE_NEW_THROW_EX (this->listener_,
-                            ::CIAO::DDS4CCM::PortStatusListener (status, reactor),
-                            ::CORBA::NO_MEMORY ());
-        }
-
-      ::DDS::DataReader_var dr = this->dds_read_->get_dds_reader ();
-      if (!::CORBA::is_nil (dr.in ()))
-        {
-          DDS::ReturnCode_t const retcode = dr->set_listener (
-              this->listener_.in (), mask);
-
-          if (retcode != ::DDS::RETCODE_OK)
-            {
-              DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                            "DDS_Subscriber_Base_T::activate - "
-                            "Error while setting the listener on the subscriber - <%C>\n",
-                            ::CIAO::DDS4CCM::translate_retcode (retcode)));
-              throw ::CORBA::INTERNAL ();
-            }
-        }
-      else
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        "DDS_Subscriber_Base_T::activate - "
-                        "Error while retrieving the DataReader\n"));
-          throw ::CORBA::INTERNAL ();
-        }
-    }
-}
-
-template <typename CCM_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-void
-DDS_Subscriber_Base_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::passivate ()
-{
-  DDS4CCM_TRACE ("DDS_Subscriber_Base_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::passivate");
-
-  this->condition_manager_.passivate ();
-  ::DDS::DataReader_var reader = this->dds_read_->get_dds_reader ();
-  ::DDS::DataReaderListener_var reader_listener = this->listener_._retn ();
-  if (!::CORBA::is_nil (reader_listener.in ()) &&
-      !::CORBA::is_nil (reader.in ()) )
-    {
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                    "DDS_Subscriber_Base_T::passivate - "
-                    "Setting the listener on the reader to nil\n"));
-
-      DDS::ReturnCode_t const retcode =
-        reader->set_listener (::DDS::DataReaderListener::_nil (), 0);
-      if (retcode != ::DDS::RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        "DDS_Subscriber_Base_T::passivate - "
-                        "Error while setting the listener on the reader - <%C>\n",
-                        ::CIAO::DDS4CCM::translate_retcode (retcode)));
-          throw ::CORBA::INTERNAL ();
-        }
-    }
-}
-
-template <typename CCM_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-void
-DDS_Subscriber_Base_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::remove (
-  ::DDS::Subscriber_ptr subscriber)
-{
-  DDS4CCM_TRACE ("DDS_Subscriber_Base_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::remove");
-
-  ::DDS::DataReader_var dr = this->dds_read_->get_dds_reader ();
-
-  this->condition_manager_.set_dds_entity (::DDS::DataReader::_nil ());
-  this->dds_read_->set_dds_reader (::DDS::DataReader::_nil (), 0);
-  this->ccm_data_reader_->set_dds_entity (::DDS::DataReader::_nil ());
-
-  if (!::CORBA::is_nil (dr.in ()))
-    {
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_TRACE, DDS4CCM_INFO
-                  "DDS_Subscriber_Base_T::remove - "
-                  "Going to delete DataReader "
-                  DDS_ENTITY_FORMAT_SPECIFIER
-                  " from subscriber "
-                  DDS_ENTITY_FORMAT_SPECIFIER
-                  "\n",
-                  DDS_ENTITY_LOG (dr.in ()),
-                  DDS_ENTITY_LOG (subscriber)));
-
-      DDS::ReturnCode_t const retval =
-        subscriber->delete_datareader (dr.in ());
-
-      if (retval != ::DDS::RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        ACE_TEXT ("DDS_Subscriber_Base_T::remove - ")
-                        ACE_TEXT ("Unable to delete DataReader: <%C>\n"),
-                        ::CIAO::DDS4CCM::translate_retcode (retval)));
-          throw ::CORBA::INTERNAL ();
-        }
-      else
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_INFO, DDS4CCM_INFO
-              "DDS_Subscriber_Base_T::remove - "
-              "Deleted DataReader\n"));
-        }
-    }
-
-  dr = ::DDS::DataReader::_nil ();
-  this->cft_setting_->delete_contentfilteredtopic (subscriber);
-}
-
-template <typename CCM_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-typename CCM_TYPE::data_type::_ptr_type
-DDS_Subscriber_Base_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::get_data (void)
-{
-  DDS4CCM_TRACE ("DDS_Subscriber_Base_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::get_data");
-
-  return CCM_TYPE::data_type::_duplicate (this->dds_read_);
-}
-
-template <typename CCM_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-typename CCM_TYPE::dds_entity_type::_ptr_type
-DDS_Subscriber_Base_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::get_dds_entity (void)
-{
-  DDS4CCM_TRACE ("DDS_Subscriber_Base_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::get_dds_entity");
-
-  return CCM_TYPE::dds_entity_type::_duplicate (this->ccm_data_reader_);
-}
-
-template <typename CCM_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-typename CCM_TYPE::filter_config_type::_ptr_type
-DDS_Subscriber_Base_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::get_filter_config (void)
-{
-  DDS4CCM_TRACE ("DDS_Subscriber_Base_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::get_filter_config");
-
-  return ::CCM_DDS::CCM_ContentFilterSetting::_duplicate (this->cft_setting_);
-}
-
-template <typename CCM_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-::CCM_DDS::QueryFilter *
-DDS_Subscriber_Base_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::filter (void)
-{
-  DDS4CCM_TRACE ("DDS_Subscriber_Base_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::filter");
-
-  return this->cft_setting_->filter ();
-}
-
-template <typename CCM_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-void
-DDS_Subscriber_Base_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::filter (
-  const ::CCM_DDS::QueryFilter & filter)
-{
-  DDS4CCM_TRACE ("DDS_Subscriber_Base_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::filter");
-  if (this->configuration_complete_)
-    {
-      throw ::CCM_DDS::NonChangeable ();
-    }
-  else
-    {
-      this->cft_setting_->filter (filter);
-    }
-}
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h b/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h
deleted file mode 100644
index 537ae837873..00000000000
--- a/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- *
- * Base class for all ports, containing a reader
- */
-#ifndef DDS_SUBSCRIBER_BASE_T_H_
-#define DDS_SUBSCRIBER_BASE_T_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "dds4ccm/idl/dds4ccm_BaseC.h"
-#include "dds4ccm/impl/Reader_T.h"
-#include "dds4ccm/impl/PortStatusListener.h"
-#include "dds4ccm/impl/ContentFilterSetting.h"
-#include "dds4ccm/impl/ConditionManager.h"
-#include "dds4ccm/impl/CCM_DataReader.h"
-#include "dds4ccm/impl/LocalObject_T.h"
-
-template <typename CCM_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-class DDS_Subscriber_Base_T
-{
-public:
-  DDS_Subscriber_Base_T (void);
-  ~DDS_Subscriber_Base_T (void);
-
-  /**
-   * @name DDS_Read
-   * DDS_Subscriber_Base_T operations
-   */
-  //@{
-  typename CCM_TYPE::data_type::_ptr_type get_data (void);
-
-  typename CCM_TYPE::dds_entity_type::_ptr_type get_dds_entity (void);
-
-  typename CCM_TYPE::filter_config_type::_ptr_type get_filter_config (void);
-
-  ::CCM_DDS::QueryFilter *filter (void);
-
-  void filter (const ::CCM_DDS::QueryFilter & filter);
-  //@}
-
-  void set_component (::CORBA::Object_ptr component);
-
-  void configuration_complete (
-    ::DDS::Topic_ptr topic,
-    ::DDS::Subscriber_ptr subscriber,
-    const char * qos_profile,
-    DDS_XML_QOS_PARSER_TYPE* qos_xml);
-
-  void activate (
-    ::CCM_DDS::PortStatusListener_ptr listener,
-    ACE_Reactor* reactor);
-
-  void passivate (void);
-
-  void remove (::DDS::Subscriber_ptr subscriber);
-
-protected:
-  typedef ::CIAO::DDS4CCM::Reader_T<
-      typename CCM_TYPE::data_type,
-      TYPED_DDS_READER,
-      VALUE_TYPE,
-      SEQ_VALUE_TYPE>
-    Reader_type;
-  typedef ::CIAO::DDS4CCM::CCM_DDS_ContentFilterSetting_i
-    ContentFilterSetting_type;
-
-  /**
-   * DDS_Subscriber_Base_T
-   */
-  //@{
-  ::DDS::DataReaderListener_var listener_;
-  ::CIAO::DDS4CCM::LocalObject_Auto_Ptr_T<ContentFilterSetting_type> cft_setting_;
-  ::CIAO::DDS4CCM::LocalObject_Auto_Ptr_T<Reader_type> dds_read_;
-  ::CIAO::DDS4CCM::LocalObject_Auto_Ptr_T< ::CIAO::DDS4CCM::CCM_DataReader > ccm_data_reader_;
-
-  bool configuration_complete_;
-  //@}
-  ::CIAO::DDS4CCM::ConditionManager condition_manager_;
-};
-
-#include "dds4ccm/impl/DDS_Subscriber_Base_T.cpp"
-
-#endif /* DDS_SUBSCRIBER_BASE_T_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp
deleted file mode 100644
index a45d646fa34..00000000000
--- a/CIAO/connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp
+++ /dev/null
@@ -1,414 +0,0 @@
-// -*- C++ -*-
-#include "dds4ccm/impl/logger/Log_Macros.h"
-#include "ace/Reactor.h"
-
-template <typename CCM_TYPE, typename DDS_TYPE, typename SEQ_TYPE>
-DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE>::DDS_TopicBase_Connector_T (void) :
-    BaseConnector ()
-  , init_subscriber_ (false)
-  , init_publisher_(false)
-  , late_binding_ (false)
-{
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, typename SEQ_TYPE>
-DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE>::~DDS_TopicBase_Connector_T (void)
-{
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, typename SEQ_TYPE>
-bool
-DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE>::late_binding (void)
-{
-  DDS4CCM_TRACE ("DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE>::late_binding");
-  return this->late_binding_;
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, typename SEQ_TYPE>
-void
-DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE>::late_binding (bool late_binding)
-{
-  DDS4CCM_TRACE ("DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE>::late_binding");
-  this->late_binding_ |= late_binding;
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, typename SEQ_TYPE>
-bool
-DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE>::stop_dds (
-  const char * topic_name)
-{
-  DDS4CCM_TRACE ("DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE>::stop_dds");
-
-  if (this->topic_name_.in () != 0)
-    {
-      // Topic name already set
-      // Do not stop DDS when topic names are equal
-      if (ACE_OS::strlen (this->topic_name_.in ()) == 0)
-        return false;
-      return ACE_OS::strcmp (this->topic_name_.in (), topic_name) != 0;
-    }
-  else
-    {
-      // Topic is not set
-      return false;
-    }
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, typename SEQ_TYPE>
-bool
-DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE>::late_binded (
-  const char * topic_name)
-{
-  DDS4CCM_TRACE ("DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE>::late_binded");
-
-  this->late_binding (ACE_OS::strlen (topic_name) == 0);
-
-  if ((ACE_OS::strlen (topic_name) > 0) &&
-      (this->topic_name_.in () != 0) &&
-      (ACE_OS::strlen (this->topic_name_.in ()) == 0))
-    {
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                    ACE_TEXT ("DDS_TopicBase_Connector_T::late_binded - ")
-                    ACE_TEXT ("Topic <%C> is late binded.\n"), topic_name));
-      DDS_TopicBase_Connector_T::topic_name (topic_name);
-      return true;
-    }
-  else if (!this->configuration_complete_)
-    {
-      DDS_TopicBase_Connector_T::topic_name (topic_name);
-    }
-  DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                ACE_TEXT ("DDS_TopicBase_Connector_T::late_binded - ")
-                ACE_TEXT ("Topic <%C> is not late binded.\n"), topic_name));
-  return false;
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, typename SEQ_TYPE>
-void
-DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE>::configuration_complete (void)
-{
-  DDS4CCM_TRACE ("DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE>::configuration_complete");
-
-  BaseConnector::configuration_complete ();
-
-  // When the user has not set a type_name we default to the DDS
-  // vendor defined default type_name
-  if (this->type_name_.in () == 0 ||
-      ACE_OS::strlen (this->type_name_.in ()) == 0)
-    {
-#if (CIAO_DDS4CCM_NDDS==1)
-      this->type_name_ = ::CORBA::string_dup (DDS_TYPE::type_support::get_type_name ());
-#elif (CIAO_DDS4CCM_OPENDDS==1)
-      typename DDS_TYPE::type_support type;
-      this->type_name_ = type.get_type_name ();
-#endif
-    }
-
-  ::CCM_DDS::ConnectorStatusListener_var error_listener =
-    this->context_->get_connection_error_listener ();
-  this->init_subscriber_ |= ! ::CORBA::is_nil (error_listener.in ());
-  this->init_publisher_  |= ! ::CORBA::is_nil (error_listener.in ());
-
-  if (::CORBA::is_nil (this->topic_.in ()))
-    {
-      this->register_type (this->domain_participant_.in (),
-                           this->type_name_.in ());
-
-      this->init_topic (this->domain_participant_.in (),
-                        this->topic_.inout () ,
-                        this->topic_name_.in (),
-                        this->type_name_.in ());
-    }
-
-  if (this->init_subscriber_)
-    {
-      this->init_subscriber (this->domain_participant_.in (),
-                            this->subscriber_.inout ());
-    }
-  else
-    {
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                    "DDS_TopicBase_Connector_T::configuration_complete - "
-                    "No need to create a subscriber.\n"));
-    }
-
-  if (this->init_publisher_)
-    {
-      this->init_publisher (this->domain_participant_.in (),
-                            this->publisher_.inout ());
-    }
-  else
-    {
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                    "DDS_TopicBase_Connector_T::configuration_complete - "
-                    "No need to create a publisher.\n"));
-    }
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, typename SEQ_TYPE>
-void
-DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE>::ccm_activate (void)
-{
-  DDS4CCM_TRACE ("DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE>::ccm_activate");
-  BaseConnector::ccm_activate ();
-
-  ACE_Reactor *reactor = this->reactor ();
-  this->activate_topic (reactor,
-                        this->topic_.in (),
-                        this->topiclistener_.inout ());
-  if (this->init_subscriber_)
-    {
-      this->activate_subscriber (reactor,
-                                this->subscriber_.in (),
-                                this->subscriber_listener_.inout ());
-    }
-  if (this->init_publisher_)
-    {
-      this->activate_publisher (reactor,
-                                this->publisher_.in (),
-                                this->publisher_listener_.inout ());
-    }
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, typename SEQ_TYPE>
-void
-DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE>::ccm_passivate (void)
-{
-  DDS4CCM_TRACE ("DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE>::ccm_passivate");
-
-  ::DDS::TopicListener_var topiclistener =
-    this->topiclistener_._retn ();
-  if (! CORBA::is_nil (topiclistener.in ()))
-    {
-      this->passivate_topic (this->topic_.in (),
-                             topiclistener.in ());
-    }
-  ::DDS::SubscriberListener_var subscriber_listener =
-    this->subscriber_listener_._retn ();
-  if (! CORBA::is_nil (subscriber_listener.in ()))
-    {
-      this->passivate_subscriber (this->subscriber_.in (),
-                                  subscriber_listener.in ());
-    }
-  ::DDS::PublisherListener_var publisher_listener =
-    this->publisher_listener_._retn ();
-  if (!::CORBA::is_nil (publisher_listener.in ()))
-    {
-      this->passivate_publisher (this->publisher_.in (),
-                                 publisher_listener.in ());
-    }
-
-  BaseConnector::ccm_passivate ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, typename SEQ_TYPE>
-void
-DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE>::ccm_remove (void)
-{
-  DDS4CCM_TRACE ("DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE>::ccm_remove");
-  ::DDS::Topic_var topic = this->topic_._retn ();
-  if (! CORBA::is_nil (topic.in ()))
-    {
-      this->remove_topic (this->domain_participant_.in (),
-                          topic.in ());
-      topic = ::DDS::Topic::_nil ();
-    }
-
-  this->unregister_type (this->domain_participant_.in (),
-                         this->type_name_.in ());
-
-  ::DDS::Subscriber_var subscriber = this->subscriber_._retn ();
-  if (!::CORBA::is_nil (subscriber.in ()))
-    {
-      this->remove_subscriber (this->domain_participant_.in (),
-                               subscriber.in ());
-      subscriber = ::DDS::Subscriber::_nil ();
-    }
-  ::DDS::Publisher_var publisher = this->publisher_._retn ();
-  if (!::CORBA::is_nil (publisher.in ()))
-    {
-      this->remove_publisher (this->domain_participant_.in (),
-                              publisher.in ());
-      publisher = ::DDS::Publisher::_nil ();
-    }
-  BaseConnector::ccm_remove ();
-}
-
-
-/**
-  * Type registration
- **/
-template <typename CCM_TYPE, typename DDS_TYPE, typename SEQ_TYPE>
-void
-DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE>::register_type (
-  ::DDS::DomainParticipant_ptr participant,
-  const char * typesupport_name)
-{
-  DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::register_type");
-
-  DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                ACE_TEXT ("DDS_TopicBase_Connector_T::register_type - ")
-                ACE_TEXT ("Going to register type <%C>.\n"),
-                typesupport_name));
-
-  ::DDS::ReturnCode_t retcode = ::DDS::RETCODE_ERROR;
-#if (CIAO_DDS4CCM_NDDS==1)
-  ::CIAO::NDDS::DDS_DomainParticipant_i *part =
-    dynamic_cast< CIAO::NDDS::DDS_DomainParticipant_i * > (participant);
-  if (!part)
-    {
-      DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-          "DDS_TopicBase_Connector_T::register_type - "
-          "Unable to cast the DomainParticipant proxy to its internal "
-          "representation.\n"));
-      throw ::CORBA::INTERNAL ();
-    }
-
-  dds_type_factory *factory = 0;
-  ACE_NEW_THROW_EX (factory,
-                    dds_type_factory (),
-                    ::CORBA::NO_MEMORY ());
-
-  if (! ::CIAO::NDDS::DDS_TypeSupport_i::register_type (participant, typesupport_name, factory))
-    {
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                    ACE_TEXT ("DDS_TopicBase_Connector_T::register_type - ")
-                    ACE_TEXT ("Type <%C> is already registered or failed.\n"),
-                    typesupport_name));
-      delete factory;
-    }
-
-  retcode = DDS_TYPE::type_support::register_type(
-        part->get_rti_entity (), typesupport_name);
-#else
-  typename DDS_TYPE::type_support::_var_type ts = new typename DDS_TYPE::type_support;
-  retcode = ts->register_type (participant, typesupport_name);
-#endif
-  if (retcode != ::DDS::RETCODE_OK)
-    {
-      DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-          "DDS_TopicBase_Connector_T::register_type - "
-          "Error registering type <%C> in DDS\n",
-          ::CIAO::DDS4CCM::translate_retcode (retcode)));
-      throw ::CCM_DDS::InternalError (retcode, 0);
-    }
-}
-
-/**
-  * Unregister type
- **/
-template <typename CCM_TYPE, typename DDS_TYPE, typename SEQ_TYPE>
-void
-DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE>::unregister_type (
-  ::DDS::DomainParticipant_ptr participant,
-  const char * typesupport_name)
-{
-  DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::unregister_type");
-
-#if (CIAO_DDS4CCM_NDDS==1)
-  // Unregister the type from NDDS, it will delete the type factory when
-  // it is not used anymore
-  if (!::CIAO::NDDS::DDS_TypeSupport_i::unregister_type (participant, typesupport_name))
-    {
-      DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-          "DDS_TopicBase_Connector_T::unregister_type - "
-          "Error unregistering type <%C> from type support factory\n",
-          typesupport_name));
-      throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0);
-    }
-#else
-  ACE_UNUSED_ARG (participant);
-  ACE_UNUSED_ARG (typesupport_name);
-#endif
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, typename SEQ_TYPE>
-char *
-DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE>::topic_name (void)
-{
-  DDS4CCM_TRACE ("DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE>::topic_name");
-
-  return CORBA::string_dup (this->topic_name_.in ());
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, typename SEQ_TYPE>
-void
-DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE>::topic_name (
-  const char * topic_name)
-{
-  DDS4CCM_TRACE ("DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, FIXED>::topic_name");
-
-  this->topic_name_ = topic_name;
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, typename SEQ_TYPE>
-char *
-DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE>::type_name (void)
-{
-  DDS4CCM_TRACE ("DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE>::type_name");
-
-  return CORBA::string_dup (this->type_name_.in ());
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, typename SEQ_TYPE>
-void
-DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE>::type_name (
-  const char * type_name)
-{
-  DDS4CCM_TRACE ("DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, FIXED>::type_name");
-
-  this->type_name_ = type_name;
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, typename SEQ_TYPE>
-void
-DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE>::key_fields (
-  const ::DDS::StringSeq & key_fields)
-{
-  DDS4CCM_TRACE ("DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE>::key_fields");
-  if (this->configuration_complete_)
-    {
-      throw ::CCM_DDS::NonChangeable ();
-    }
-  else
-    {
-      this->key_fields_.length (key_fields.length ());
-      for (CORBA::ULong i = 0; i < key_fields.length (); ++i)
-        {
-          this->key_fields_.operator [](i) = CORBA::string_dup (key_fields[i]);
-        }
-    }
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, typename SEQ_TYPE>
-::DDS::StringSeq *
-DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE>::key_fields (void)
-{
-  DDS4CCM_TRACE ("DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE>::key_fields");
-/*
-    For future use, DDS_TYPE doesn't have get_typecode yet
-    ::DDS_TypeCode* ptr = ::DDS_TYPE::type_support::get_typecode ();
-    DDS_ExceptionCode_t ex;
-    DDS_UnsignedLong const number = ptr->member_count (ex);
-    for (DDS_UnsignedLong i = 0; i < number; i++)
-    {
-     if (ptr->is_member_key (i, ex))
-     {
-       const char* name = ptr->member_name (i, ex);
-       ACE_OS::printf ("Name: %s\n", name);
-     }
-    }
- */
-  ::DDS::StringSeq_var retval = 0;
-  ACE_NEW_THROW_EX (retval,
-                    ::DDS::StringSeq (this->key_fields_.length ()),
-                    ::CORBA::NO_MEMORY ());
-  retval->length (this->key_fields_.length ());
-
-  for (CORBA::ULong i = 0; i < this->key_fields_.length (); ++i)
-    {
-      (*retval)[i] = CORBA::string_dup (this->key_fields_[i]);
-    }
-  return retval._retn ();
-}
-
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h b/CIAO/connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h
deleted file mode 100644
index 91fce50b075..00000000000
--- a/CIAO/connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-#ifndef DDS_TOPICBASE_CONNECTOR_H
-#define DDS_TOPICBASE_CONNECTOR_H
-
-#include "ace/Copy_Disabled.h"
-
-#include "dds4ccm/impl/DDS_Base_Connector_T.h"
-
-template <typename CCM_TYPE, typename DDS_TYPE, typename SEQ_TYPE>
-class DDS_TopicBase_Connector_T
-  : public virtual DDS_Base_Connector_T<CCM_TYPE>
-{
-public:
-  DDS_TopicBase_Connector_T (void);
-  virtual ~DDS_TopicBase_Connector_T (void);
-
-  virtual ::DDS::StringSeq *key_fields (void);
-
-  virtual void topic_name (const char * topic_name);
-  virtual char *topic_name (void);
-
-  virtual void type_name (const char * type_name);
-  virtual char *type_name (void);
-
-  virtual void key_fields (const ::DDS::StringSeq & key_fields);
-
-  virtual void configuration_complete (void);
-  virtual void ccm_activate (void);
-  virtual void ccm_passivate (void);
-  virtual void ccm_remove (void);
-  virtual void register_type (::DDS::DomainParticipant_ptr participant,
-                              const char * typesupport_name);
-  virtual
-  void unregister_type (::DDS::DomainParticipant_ptr participant,
-                        const char * typesupport_name);
-
-
-protected:
-  bool late_binding (void);
-  void late_binding (bool late_binding);
-  bool late_binded (const char * topic_name);
-  bool stop_dds (const char * topic_name);
-
-  CORBA::String_var topic_name_;
-  CORBA::String_var type_name_;
-  DDS::StringSeq key_fields_;
-
-  ::DDS::Topic_var topic_;
-  ::DDS::TopicListener_var topiclistener_;
-
-  ::DDS::Publisher_var publisher_;
-  ::DDS::PublisherListener_var publisher_listener_;
-  ::DDS::Subscriber_var subscriber_;
-  ::DDS::SubscriberListener_var subscriber_listener_;
-
-  bool init_subscriber_;
-  bool init_publisher_;
-
-  typedef DDS_Base_Connector_T<CCM_TYPE> BaseConnector;
-
-#if (CIAO_DDS4CCM_NDDS==1)
-  typedef ::CIAO::NDDS::DDS_TypeFactory_T <DDS_TYPE, SEQ_TYPE> dds_type_factory;
-#endif
-
-private:
-  bool late_binding_;
-};
-
-#include "dds4ccm/impl/DDS_TopicBase_Connector_T.cpp"
-
-#endif /* DDS_TOPICBASE_CONNECTOR_H */
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp
deleted file mode 100644
index 392835b0384..00000000000
--- a/CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp
+++ /dev/null
@@ -1,212 +0,0 @@
-// -*- C++ -*-
-#include "dds4ccm/impl/DataReaderStateListener_T.h"
-#include "dds4ccm/impl/Updater_T.h"
-#include "dds4ccm/impl/logger/Log_Macros.h"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-#include "dds/DCPS/Marked_Default_Qos.h"
-#endif
-
-template <typename CCM_TYPE, typename TYPED_WRITER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-DDS_Update_T<CCM_TYPE, TYPED_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::DDS_Update_T (void)
-{
-}
-
-template <typename CCM_TYPE, typename TYPED_WRITER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-DDS_Update_T<CCM_TYPE, TYPED_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::~DDS_Update_T (void)
-{
-}
-
-template <typename CCM_TYPE, typename TYPED_WRITER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-void
-DDS_Update_T<CCM_TYPE, TYPED_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::set_component (::CORBA::Object_ptr component)
-{
-  this->dds_update_->_set_component (component);
-  this->ccm_data_writer_->_set_component (component);
-}
-
-template <typename CCM_TYPE, typename TYPED_WRITER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-void
-DDS_Update_T<CCM_TYPE, TYPED_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::configuration_complete (
-  ::DDS::Topic_ptr topic,
-  ::DDS::Publisher_ptr publisher,
-  const char * qos_profile,
-  DDS_XML_QOS_PARSER_TYPE* qos_xml)
-{
-  DDS4CCM_TRACE ("DDS_Update_T<CCM_TYPE, TYPED_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::configuration_complete");
-  ::DDS::DataWriter_var dw = this->dds_update_->get_dds_writer ();
-  if (::CORBA::is_nil (dw.in ()))
-    {
-      ::DDS::DataWriter_var dwv_tmp;
-#if (CIAO_DDS4CCM_NDDS==1)
-      if (qos_profile)
-        {
-          dwv_tmp = publisher->create_datawriter_with_profile (
-              topic,
-              qos_profile,
-              ::DDS::DataWriterListener::_nil (),
-              0);
-        }
-      else
-#endif
-        {
-          ::DDS::DataWriterQos dwqos;
-          DDS::ReturnCode_t const retcode =
-            publisher->get_default_datawriter_qos (dwqos);
-
-          if (retcode != DDS::RETCODE_OK)
-            {
-              DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                  "DDS_Update_T::configuration_complete - "
-                  "Error: Unable to retrieve get_default_datawriter_qos: <%C>\n",
-                  ::CIAO::DDS4CCM::translate_retcode (retcode)));
-              throw ::CCM_DDS::InternalError (retcode, 0);
-            }
-
-          if (qos_profile && qos_xml)
-            {
-              CORBA::String_var name = topic->get_name ();
-              DDS::ReturnCode_t const retcode_dw_qos = qos_xml->get_datawriter_qos (
-                                          dwqos,
-                                          qos_profile,
-                                          name.in ());
-              if (retcode_dw_qos != DDS::RETCODE_OK)
-                {
-                  DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                      "DDS_Update_T::configuration_complete - "
-                      "Error: Unable to retrieve datawriter QOS from XML: <%C>\n",
-                      ::CIAO::DDS4CCM::translate_retcode (retcode_dw_qos)));
-                  throw ::CCM_DDS::InternalError (retcode_dw_qos, 0);
-                }
-            }
-
-#if defined GEN_OSTREAM_OPS
-          if (DDS4CCM_debug_level >= DDS4CCM_LOG_LEVEL_DDS_STATUS)
-            {
-              std::stringstream output;
-              output << dwqos;
-              std::string message = output.str();
-              DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_INFO, DDS4CCM_INFO
-                            ACE_TEXT ("DDS_Update_T::configuration_complete - ")
-                            ACE_TEXT ("Using datawriter QOS <%C>\n"), message.c_str()));
-            }
-#endif
-
-          dwv_tmp = publisher->create_datawriter (
-              topic,
-              dwqos,
-              ::DDS::DataWriterListener::_nil (),
-              0);
-        }
-      if (!::CORBA::is_nil (dwv_tmp.in ()))
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_TRACE, DDS4CCM_INFO
-                      "DDS_Update_T::configuration_complete - "
-                      "Created datawriter "
-                      DDS_ENTITY_FORMAT_SPECIFIER
-                      " using publisher "
-                      DDS_ENTITY_FORMAT_SPECIFIER
-                      "\n",
-                      DDS_ENTITY_LOG (dwv_tmp.in ()),
-                      DDS_ENTITY_LOG (publisher)));
-        }
-      else
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_DDS_NIL_RETURN, (LM_ERROR, DDS4CCM_INFO
-                        "DDS_Update_T::configuration_complete - "
-                        "Error: DDS returned a nil datawriter.\n"));
-          throw ::CORBA::INTERNAL ();
-        }
-
-      this->dds_update_->set_dds_writer (dwv_tmp.in ());
-      this->ccm_data_writer_->set_dds_entity (dwv_tmp.in ());
-
-      DDS::ReturnCode_t const retcode = dwv_tmp->enable ();
-      if (retcode != ::DDS::RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        "DDS_Update_T::configuration_complete - "
-                        "Error: Unable to enable the datawriter: <%C>\n",
-                        ::CIAO::DDS4CCM::translate_retcode (retcode)));
-          throw ::CORBA::INTERNAL ();
-        }
-    }
-}
-
-template <typename CCM_TYPE, typename TYPED_WRITER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-void
-DDS_Update_T<CCM_TYPE, TYPED_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::activate ()
-{
-  DDS4CCM_TRACE ("DDS_Update_T<CCM_TYPE, TYPED_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::activate");
-}
-
-template <typename CCM_TYPE, typename TYPED_WRITER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-void
-DDS_Update_T<CCM_TYPE, TYPED_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::passivate ()
-{
-  DDS4CCM_TRACE ("DDS_Update_T<CCM_TYPE, TYPED_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::passivate");
-}
-
-template <typename CCM_TYPE, typename TYPED_WRITER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-void
-DDS_Update_T<CCM_TYPE, TYPED_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::remove (
-  ::DDS::Publisher_ptr publisher)
-{
-  DDS4CCM_TRACE ("DDS_Update_T<CCM_TYPE, TYPED_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::remove");
-
-  ::DDS::DataWriter_var writer = this->dds_update_->get_dds_writer ();
-
-  this->dds_update_->set_dds_writer (::DDS::DataWriter::_nil ());
-  this->ccm_data_writer_->set_dds_entity (::DDS::DataWriter::_nil ());
-
-  if (!::CORBA::is_nil (writer.in ()))
-    {
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_TRACE, DDS4CCM_INFO
-                  "DDS_Update_T::remove - "
-                  "Going to delete DataWriter "
-                  DDS_ENTITY_FORMAT_SPECIFIER
-                  " from publisher "
-                  DDS_ENTITY_FORMAT_SPECIFIER
-                  "\n",
-                  DDS_ENTITY_LOG (writer.in ()),
-                  DDS_ENTITY_LOG (publisher)));
-
-      DDS::ReturnCode_t const retval =
-          publisher->delete_datawriter (writer.in ());
-
-      if (retval != ::DDS::RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-              "DDS_Update_T::remove - "
-              "Unable to delete DataWriter: <%C>\n",
-              ::CIAO::DDS4CCM::translate_retcode (retval)));
-          throw ::CORBA::INTERNAL ();
-        }
-      else
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_INFO, DDS4CCM_INFO
-              "DDS_Update_T::remove - "
-              "Deleted DataWriter: <%C>\n",
-              ::CIAO::DDS4CCM::translate_retcode (retval)));
-        }
-    }
-}
-
-template <typename CCM_TYPE, typename TYPED_WRITER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-typename CCM_TYPE::data_type::_ptr_type
-DDS_Update_T<CCM_TYPE, TYPED_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::get_data (void)
-{
-  DDS4CCM_TRACE ("DDS_Update_T<CCM_TYPE, TYPED_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::get_data");
-
-  return CCM_TYPE::data_type::_duplicate (this->dds_update_);
-}
-
-template <typename CCM_TYPE, typename TYPED_WRITER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-typename CCM_TYPE::dds_entity_type::_ptr_type
-DDS_Update_T<CCM_TYPE, TYPED_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::get_dds_entity (void)
-{
-  DDS4CCM_TRACE ("DDS_Update_T<CCM_TYPE, TYPED_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::get_dds_entity");
-
-  return ::DDS::CCM_DataWriter::_duplicate (this->ccm_data_writer_);
-}
-
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Update_T.h b/CIAO/connectors/dds4ccm/impl/DDS_Update_T.h
deleted file mode 100644
index 888edbd5764..00000000000
--- a/CIAO/connectors/dds4ccm/impl/DDS_Update_T.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * @author Johnny Willemsen  <jwillemsen@remedy.nl>
- *
- * Wrapper facade for NDDS.
- */
-#ifndef DDS_UPDATE_T_H_
-#define DDS_UPDATE_T_H_
-
-#include "dds4ccm/impl/Updater_T.h"
-#include "dds4ccm/impl/CCM_DataWriter.h"
-
-template <typename CCM_TYPE, typename TYPED_WRITER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-class DDS_Update_T
-{
-public:
-  DDS_Update_T (void);
-  ~DDS_Update_T (void);
-
-  typename CCM_TYPE::data_type::_ptr_type get_data (void);
-
-  typename CCM_TYPE::dds_entity_type::_ptr_type get_dds_entity (void);
-
-  void set_component (::CORBA::Object_ptr component);
-
-  void configuration_complete (
-    ::DDS::Topic_ptr topic,
-    ::DDS::Publisher_ptr publisher,
-    const char * qos_profile,
-    DDS_XML_QOS_PARSER_TYPE* qos_xml);
-
-  void activate (void);
-
-  void passivate (void);
-
-  void remove (::DDS::Publisher_ptr publisher);
-
-private:
-  typedef ::CIAO::DDS4CCM::Updater_T<
-    typename CCM_TYPE::data_type,
-    TYPED_WRITER,
-    VALUE_TYPE,
-    SEQ_VALUE_TYPE>
-      Updater_type;
-
-    /**
-   * DDS_Update
-   */
-  //@{
-  ::CIAO::DDS4CCM::LocalObject_Auto_Ptr_T< Updater_type > dds_update_;
-  ::CIAO::DDS4CCM::LocalObject_Auto_Ptr_T< ::CIAO::DDS4CCM::CCM_DataWriter > ccm_data_writer_;
-  //@}
-};
-
-#include "dds4ccm/impl/DDS_Update_T.cpp"
-
-#endif /* DDS_UPDATE_T_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp
deleted file mode 100644
index 05c65a15183..00000000000
--- a/CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp
+++ /dev/null
@@ -1,210 +0,0 @@
-// -*- C++ -*-
-#include "dds4ccm/impl/DataReaderListener_T.h"
-#include "dds4ccm/impl/DataListenerControl_T.h"
-#include "dds4ccm/impl/logger/Log_Macros.h"
-
-
-template <typename CCM_TYPE, typename TYPED_WRITER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-DDS_Write_T<CCM_TYPE, TYPED_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::DDS_Write_T (void)
-{
-}
-
-template <typename CCM_TYPE, typename TYPED_WRITER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-DDS_Write_T<CCM_TYPE, TYPED_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::~DDS_Write_T (void)
-{
-}
-
-template <typename CCM_TYPE, typename TYPED_WRITER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-void
-DDS_Write_T<CCM_TYPE, TYPED_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::set_component (
-  ::CORBA::Object_ptr component)
-{
-  this->dds_write_->_set_component (component);
-  this->ccm_data_writer_->_set_component (component);
-}
-
-template <typename CCM_TYPE, typename TYPED_WRITER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-void
-DDS_Write_T<CCM_TYPE, TYPED_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::configuration_complete (
-  ::DDS::Topic_ptr topic,
-  ::DDS::Publisher_ptr publisher,
-  const char * qos_profile,
-  DDS_XML_QOS_PARSER_TYPE* qos_xml)
-{
-  DDS4CCM_TRACE ("DDS_Write_T<CCM_TYPE, TYPED_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::configuration_complete");
-  ::DDS::DataWriter_var dw = this->dds_write_->get_dds_writer ();
-  if (::CORBA::is_nil (dw.in ()))
-    {
-      ::DDS::DataWriter_var dwv_tmp;
-#if (CIAO_DDS4CCM_NDDS==1)
-      if (qos_profile)
-        {
-          dwv_tmp = publisher->create_datawriter_with_profile (
-              topic,
-              qos_profile,
-              ::DDS::DataWriterListener::_nil (),
-              0);
-        }
-      else
-#endif
-        {
-          ::DDS::DataWriterQos dwqos;
-          DDS::ReturnCode_t const retcode =
-            publisher->get_default_datawriter_qos (dwqos);
-
-          if (retcode != DDS::RETCODE_OK)
-            {
-              DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                  "DDS_Write_T::configuration_complete - "
-                  "Error: Unable to retrieve get_default_datawriter_qos: <%C>\n",
-                  ::CIAO::DDS4CCM::translate_retcode (retcode)));
-              throw ::CCM_DDS::InternalError (retcode, 0);
-            }
-
-          if (qos_profile && qos_xml)
-            {
-              CORBA::String_var name = topic->get_name ();
-              DDS::ReturnCode_t const retcode_dw_qos = qos_xml->get_datawriter_qos (
-                                          dwqos,
-                                          qos_profile,
-                                          name.in ());
-
-              if (retcode_dw_qos != DDS::RETCODE_OK)
-                {
-                  DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                      "DDS_Write_T::configuration_complete - "
-                      "Error: Unable to retrieve datawriter QOS from XML: <%C>\n",
-                      ::CIAO::DDS4CCM::translate_retcode (retcode_dw_qos)));
-                  throw ::CCM_DDS::InternalError (retcode_dw_qos, 0);
-                }
-            }
-
-#if defined GEN_OSTREAM_OPS
-          if (DDS4CCM_debug_level >= DDS4CCM_LOG_LEVEL_DDS_STATUS)
-            {
-              std::stringstream output;
-              output << dwqos;
-              std::string message = output.str();
-              DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_INFO, DDS4CCM_INFO
-                            ACE_TEXT ("DDS_Update_T::configuration_complete - ")
-                            ACE_TEXT ("Using datawriter QOS <%C>\n"), message.c_str()));
-            }
-#endif
-          dwv_tmp = publisher->create_datawriter (
-              topic,
-              dwqos,
-              ::DDS::DataWriterListener::_nil (),
-              0);
-        }
-      if (!::CORBA::is_nil (dwv_tmp.in ()))
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_TRACE, DDS4CCM_INFO
-                      "DDS_Write_T::configuration_complete - "
-                      "Created datawriter "
-                      DDS_ENTITY_FORMAT_SPECIFIER
-                      " using publisher "
-                      DDS_ENTITY_FORMAT_SPECIFIER
-                      "\n",
-                      DDS_ENTITY_LOG (dwv_tmp.in ()),
-                      DDS_ENTITY_LOG (publisher)));
-        }
-      else
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_DDS_NIL_RETURN, (LM_ERROR, DDS4CCM_INFO
-                        "DDS_Write_T::configuration_complete - "
-                        "Error: DDS returned a nil datawriter.\n"));
-          throw ::CORBA::INTERNAL ();
-        }
-
-      this->dds_write_->set_dds_writer (dwv_tmp.in ());
-      this->ccm_data_writer_->set_dds_entity (dwv_tmp.in ());
-
-      DDS::ReturnCode_t const retcode = dwv_tmp->enable ();
-      if (retcode != ::DDS::RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        "DDS_Write_T::configuration_complete - "
-                        "Error: Unable to enable the datawriter: <%C>\n",
-                        ::CIAO::DDS4CCM::translate_retcode (retcode)));
-          throw ::CORBA::INTERNAL ();
-        }
-
-    }
-}
-
-template <typename CCM_TYPE, typename TYPED_WRITER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-void
-DDS_Write_T<CCM_TYPE, TYPED_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::activate ()
-{
-  DDS4CCM_TRACE ("DDS_Write_T<CCM_TYPE, TYPED_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::activate");
-}
-
-template <typename CCM_TYPE, typename TYPED_WRITER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-void
-DDS_Write_T<CCM_TYPE, TYPED_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::passivate ()
-{
-  DDS4CCM_TRACE ("DDS_Write_T<CCM_TYPE, TYPED_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::passivate");
-}
-
-template <typename CCM_TYPE, typename TYPED_WRITER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-void
-DDS_Write_T<CCM_TYPE, TYPED_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::remove (
-  ::DDS::Publisher_ptr publisher)
-{
-  DDS4CCM_TRACE ("DDS_Write_T<CCM_TYPE, TYPED_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::remove");
-
-  ::DDS::DataWriter_var writer = this->dds_write_->get_dds_writer ();
-
-  this->dds_write_->set_dds_writer (::DDS::DataWriter::_nil ());
-  this->ccm_data_writer_->set_dds_entity (::DDS::DataWriter::_nil ());
-
-  if (!::CORBA::is_nil (writer.in ()))
-    {
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_TRACE, DDS4CCM_INFO
-                  "DDS_Write_T::remove - "
-                  "Going to delete DataWriter "
-                  DDS_ENTITY_FORMAT_SPECIFIER
-                  " from publisher "
-                  DDS_ENTITY_FORMAT_SPECIFIER
-                  "\n",
-                  DDS_ENTITY_LOG (writer.in ()),
-                  DDS_ENTITY_LOG (publisher)));
-
-      DDS::ReturnCode_t const retval =
-        publisher->delete_datawriter (writer.in ());
-
-      if (retval != ::DDS::RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-              "DDS_Write_T::remove - "
-              "Unable to delete DataWriter: <%C>\n",
-              ::CIAO::DDS4CCM::translate_retcode (retval)));
-          throw ::CORBA::INTERNAL ();
-        }
-      else
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_INFO, DDS4CCM_INFO
-              "DDS_Write_T::remove - "
-              "Deleted DataWriter: <%C>\n",
-              ::CIAO::DDS4CCM::translate_retcode (retval)));
-        }
-    }
-}
-
-template <typename CCM_TYPE, typename TYPED_WRITER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-typename CCM_TYPE::data_type::_ptr_type
-DDS_Write_T<CCM_TYPE, TYPED_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::get_data (void)
-{
-  DDS4CCM_TRACE ("DDS_Write_T<CCM_TYPE, TYPED_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::get_data");
-
-  return CCM_TYPE::data_type::_duplicate (this->dds_write_);
-}
-
-template <typename CCM_TYPE, typename TYPED_WRITER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-typename CCM_TYPE::dds_entity_type::_ptr_type
-DDS_Write_T<CCM_TYPE, TYPED_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::get_dds_entity (void)
-{
-  DDS4CCM_TRACE ("DDS_Write_T<CCM_TYPE, TYPED_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::get_dds_entity");
-  return ::DDS::CCM_DataWriter::_duplicate (this->ccm_data_writer_);
-}
-
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Write_T.h b/CIAO/connectors/dds4ccm/impl/DDS_Write_T.h
deleted file mode 100644
index 1aef87dec6f..00000000000
--- a/CIAO/connectors/dds4ccm/impl/DDS_Write_T.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-#ifndef DDS_WRITE_T_H_
-#define DDS_WRITE_T_H_
-
-#include "dds4ccm/impl/DDS_TopicBase_Connector_T.h"
-#include "dds4ccm/impl/Writer_T.h"
-#include "dds4ccm/impl/CCM_DataWriter.h"
-
-template <typename CCM_TYPE, typename TYPED_WRITER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-class DDS_Write_T
-{
-public:
-  DDS_Write_T (void);
-  ~DDS_Write_T (void);
-
-  /**
-   * @name DDS_Write
-   * DDS_Write operations
-   */
-  //@{
-  typename CCM_TYPE::data_type::_ptr_type get_data (void);
-
-  typename CCM_TYPE::dds_entity_type::_ptr_type get_dds_entity (void);
-  //@}
-
-  void set_component (::CORBA::Object_ptr component);
-
-  void configuration_complete (
-    ::DDS::Topic_ptr topic,
-    ::DDS::Publisher_ptr publisher,
-    const char * qos_profile,
-    DDS_XML_QOS_PARSER_TYPE* qos_xml);
-
-  void activate (void);
-
-  void passivate (void);
-
-  void remove (::DDS::Publisher_ptr publisher);
-
-private:
-  typedef ::CIAO::DDS4CCM::Writer_T<
-    typename CCM_TYPE::data_type,
-    TYPED_WRITER,
-    VALUE_TYPE,
-    SEQ_VALUE_TYPE>
-      Writer_type;
-
-  /**
-   * DDS_Write
-   */
-  //@{
-  ::CIAO::DDS4CCM::LocalObject_Auto_Ptr_T < Writer_type > dds_write_;
-  ::CIAO::DDS4CCM::LocalObject_Auto_Ptr_T < ::CIAO::DDS4CCM::CCM_DataWriter > ccm_data_writer_;
-  //@}
-
-};
-
-#include "dds4ccm/impl/DDS_Write_T.cpp"
-
-#endif /* DDS_WRITE_T_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/DataListenerControl_T.cpp b/CIAO/connectors/dds4ccm/impl/DataListenerControl_T.cpp
deleted file mode 100644
index 50d99b5489a..00000000000
--- a/CIAO/connectors/dds4ccm/impl/DataListenerControl_T.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-// -*- C++ -*-
-template <typename BASE_TYPE>
-CCM_DDS_DataListenerControl_T<BASE_TYPE>::CCM_DDS_DataListenerControl_T (void) :
-  mode_ (::CCM_DDS::NOT_ENABLED),
-  max_delivered_data_ (0)
-{
-  DDS4CCM_TRACE ("CCM_DDS_DataListenerControl_T::CCM_DDS_DataListenerControl_T");
-}
-
-template <typename BASE_TYPE>
-CCM_DDS_DataListenerControl_T<BASE_TYPE>::~CCM_DDS_DataListenerControl_T (void)
-{
-  DDS4CCM_TRACE ("CCM_DDS_DataListenerControl_T::~CCM_DDS_DataListenerControl_T");
-}
-
-template <typename BASE_TYPE>
-::CCM_DDS::ListenerMode
-CCM_DDS_DataListenerControl_T<BASE_TYPE>::mode (void)
-{
-  DDS4CCM_TRACE ("CCM_DDS_DataListenerControl_T::mode");
-  return this->mode_.value ();
-}
-
-template <typename BASE_TYPE>
-void
-CCM_DDS_DataListenerControl_T<BASE_TYPE>::mode (::CCM_DDS::ListenerMode mode)
-{
-  DDS4CCM_TRACE ("CCM_DDS_DataListenerControl_T::mode");
-  this->mode_ = mode;
-}
-
-template <typename BASE_TYPE>
-::CCM_DDS::DataNumber_t
-CCM_DDS_DataListenerControl_T<BASE_TYPE>::max_delivered_data (void)
-{
-  DDS4CCM_TRACE ("CCM_DDS_DataListenerControl_T::max_delivered_data");
-  return this->max_delivered_data_.value ();
-}
-
-template <typename BASE_TYPE>
-void
-CCM_DDS_DataListenerControl_T<BASE_TYPE>::max_delivered_data (
-  ::CCM_DDS::DataNumber_t max_delivered_data)
-{
-  DDS4CCM_TRACE ("CCM_DDS_DataListenerControl_T::max_delivered_data");
-  this->max_delivered_data_ = max_delivered_data;
-}
-
diff --git a/CIAO/connectors/dds4ccm/impl/DataListenerControl_T.h b/CIAO/connectors/dds4ccm/impl/DataListenerControl_T.h
deleted file mode 100644
index ba936757ef4..00000000000
--- a/CIAO/connectors/dds4ccm/impl/DataListenerControl_T.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// -*- C++ -*-
-#ifndef DATALISTENERCONTROL_T_H_
-#define DATALISTENERCONTROL_T_H_
-
-#include "dds4ccm/idl/dds4ccm_DataListenerControlEC.h"
-#include "dds4ccm/impl/LocalObject.h"
-
-#include "ace/Copy_Disabled.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-template <typename BASE_TYPE>
-class CCM_DDS_DataListenerControl_T
-  : public virtual BASE_TYPE,
-    public virtual ::CIAO::DDS4CCM::LocalObject,
-    private ACE_Copy_Disabled
-{
-public:
-  /// Constructor
-  CCM_DDS_DataListenerControl_T (void);
-
-  /// Destructor
-  virtual ~CCM_DDS_DataListenerControl_T (void);
-
-  /// Set the mode
-  virtual ::CCM_DDS::ListenerMode mode (void);
-
-  /// Get the mode
-  virtual void mode (::CCM_DDS::ListenerMode mode);
-
-  /// Set the max_delivered_data
-  virtual ::CCM_DDS::DataNumber_t max_delivered_data (void);
-
-  /// Get the max_delivered_data
-  virtual void max_delivered_data (::CCM_DDS::DataNumber_t max_delivered_data);
-
-protected:
-  ACE_Atomic_Op <TAO_SYNCH_MUTEX, ::CCM_DDS::ListenerMode> mode_;
-  ACE_Atomic_Op <TAO_SYNCH_MUTEX, ::CCM_DDS::DataNumber_t> max_delivered_data_;
-};
-
-#include "dds4ccm/impl/DataListenerControl_T.cpp"
-
-#endif /* DATALISTENERCONTROL_T_H_ */
-
diff --git a/CIAO/connectors/dds4ccm/impl/DataReaderHandler_T.cpp b/CIAO/connectors/dds4ccm/impl/DataReaderHandler_T.cpp
deleted file mode 100644
index 68ca4cf1a76..00000000000
--- a/CIAO/connectors/dds4ccm/impl/DataReaderHandler_T.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-#include "dds4ccm/impl/logger/Log_Macros.h"
-
-template <typename LISTENER>
-CIAO::DDS4CCM::DataReaderHandler_T<LISTENER>::DataReaderHandler_T (
-            LISTENER* drl,
-            ::DDS::DataReader_ptr dr)
-      : drl_ (drl)
-      , dr_ (::DDS::DataReader::_duplicate (dr))
-{
-  // Add a reference, this we're using the DataReaderListener_type
-  // again. This should prevent preliminary destruction of the listener
-  // while the reactor queue still got messages to handle.
-  this->drl_->_add_ref ();
-  this->reference_counting_policy ().value
-    (ACE_Event_Handler::Reference_Counting_Policy::ENABLED);
-}
-
-template <typename LISTENER>
-CIAO::DDS4CCM::DataReaderHandler_T<LISTENER>::~DataReaderHandler_T (void)
-{
-  this->drl_->_remove_ref ();
-}
-
-template <typename LISTENER>
-int
-CIAO::DDS4CCM::DataReaderHandler_T<LISTENER>::handle_exception (ACE_HANDLE)
-{
-  try
-    {
-      this->drl_->on_data_available_i (this->dr_.in ());
-    }
-  catch (const ::CORBA::BAD_INV_ORDER& ex)
-    {
-      DDS4CCM_PRINT_DEBUG_CORBA_EXCEPTION (
-                              DDS4CCM_LOG_LEVEL_ACTION,
-                              ex,
-                              "DataReaderHandler_T::handle_exception");
-    }
-  catch (const ::CORBA::Exception& ex)
-    {
-      DDS4CCM_PRINT_CORBA_EXCEPTION (
-                              DDS4CCM_LOG_LEVEL_ERROR,
-                              ex,
-                              "DataReaderHandler_T::handle_exception");
-    }
-  catch (...)
-    {
-      DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-        "DataReaderHandler_T::handle_exception - "
-        "Unexpected exception caught\n"));
-    }
-  return 0;
-}
diff --git a/CIAO/connectors/dds4ccm/impl/DataReaderHandler_T.h b/CIAO/connectors/dds4ccm/impl/DataReaderHandler_T.h
deleted file mode 100644
index dd15e414f5f..00000000000
--- a/CIAO/connectors/dds4ccm/impl/DataReaderHandler_T.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- *
- * Eventhandler on orb thread, handling the
- * received data from DDS.
- */
-
-#ifndef DATAREADERHANDLER_T_H_
-#define DATAREADERHANDLER_T_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ace/Event_Handler.h"
-
-namespace CIAO
-{
-  namespace DDS4CCM
-  {
-
-    template <typename LISTENER>
-    class DataReaderHandler_T :
-      public ACE_Event_Handler
-    {
-    public:
-      DataReaderHandler_T (LISTENER *drl,
-                          ::DDS::DataReader_ptr dr);
-      virtual ~DataReaderHandler_T (void);
-
-      virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
-
-    private:
-      LISTENER *drl_;
-      ::DDS::DataReader_var dr_;
-    };
-  }
-}
-
-#include "dds4ccm/impl/DataReaderHandler_T.cpp"
-
-#endif /* DATAREADERHANDLER_T_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/DataReaderListener_T.cpp b/CIAO/connectors/dds4ccm/impl/DataReaderListener_T.cpp
deleted file mode 100644
index 458491a6bf1..00000000000
--- a/CIAO/connectors/dds4ccm/impl/DataReaderListener_T.cpp
+++ /dev/null
@@ -1,292 +0,0 @@
-#include "dds4ccm/impl/Utils.h"
-#include "dds4ccm/impl/logger/Log_Macros.h"
-#include "ace/Reactor.h"
-
-namespace CIAO
-{
-  namespace DDS4CCM
-  {
-    template <typename CCM_TYPE, typename TYPED_DDS_READER, typename SEQ_TYPE, DDS4CCM_LISTENER_READ_TAKE LRT>
-    DataReaderListenerBase_T<CCM_TYPE, TYPED_DDS_READER, SEQ_TYPE, LRT>::DataReaderListenerBase_T (
-      typename CCM_TYPE::data_listener_type::_ptr_type listener,
-      ::CCM_DDS::PortStatusListener_ptr port_status_listener,
-      ::CCM_DDS::DataListenerControl_ptr control,
-      ACE_Reactor * reactor,
-      ConditionManager& condition_manager)
-      : PortStatusListener (port_status_listener, reactor) ,
-        listener_ (CCM_TYPE::data_listener_type::_duplicate (listener)),
-        control_ (::CCM_DDS::DataListenerControl::_duplicate (control)),
-        condition_manager_ (condition_manager)
-    {
-      DDS4CCM_TRACE ("DataReaderListenerBase_T::DataReaderListenerBase_T");
-    }
-
-    template <typename CCM_TYPE, typename TYPED_DDS_READER, typename SEQ_TYPE, DDS4CCM_LISTENER_READ_TAKE LRT>
-    DataReaderListenerBase_T<CCM_TYPE, TYPED_DDS_READER, SEQ_TYPE, LRT>::~DataReaderListenerBase_T (void)
-    {
-      DDS4CCM_TRACE ("DataReaderListenerBase_T::~DataReaderListenerBase_T");
-    }
-
-    template <typename CCM_TYPE, typename TYPED_DDS_READER, typename SEQ_TYPE, DDS4CCM_LISTENER_READ_TAKE LRT>
-    void
-    DataReaderListenerBase_T<CCM_TYPE, TYPED_DDS_READER, SEQ_TYPE, LRT>::on_data_available (
-      ::DDS::DataReader_ptr rdr)
-    {
-      DDS4CCM_TRACE ("DataReaderListenerBase_T::on_data_available");
-
-      if (!::CORBA::is_nil (rdr) &&
-          this->control_->mode () != ::CCM_DDS::NOT_ENABLED)
-        {
-          if (this->reactor_)
-            {
-              DataReaderHandler_type * rh = 0;
-              ACE_NEW (rh, DataReaderHandler_type (this, rdr));
-
-              ACE_Event_Handler_var safe_handler (rh);
-              if (this->reactor_->notify (rh) != 0)
-                {
-                  DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                                ACE_TEXT ("DataReaderListener_T::on_data_available - ")
-                                ACE_TEXT ("failed to use reactor.\n")));
-                }
-            }
-          else
-            {
-              this->on_data_available_i (rdr);
-            }
-        }
-    }
-
-    template <typename CCM_TYPE, typename TYPED_DDS_READER, typename SEQ_TYPE>
-    ::DDS::ReturnCode_t
-    DataReaderListener_T<CCM_TYPE, TYPED_DDS_READER, SEQ_TYPE, CIAO::DDS4CCM::DDS4CCM_TAKE>::get_data_i (
-      typename TYPED_DDS_READER::_ptr_type reader,
-      ::DDS::QueryCondition_ptr qc,
-      SEQ_TYPE &data,
-      ::DDS::SampleInfoSeq &sample_info,
-      ::CORBA::Long max_samples)
-    {
-      DDS4CCM_TRACE ("DataReaderListener_T::get_data_i");
-
-      ::DDS::ReturnCode_t result = ::DDS::RETCODE_OK;
-      if (! ::CORBA::is_nil (qc))
-        {
-          ::DDS::ReadCondition_var rd = ::DDS::ReadCondition::_narrow (qc);
-          result = reader->take_w_condition (data,
-                                             sample_info,
-                                             max_samples,
-                                             rd.in ());
-        }
-      else
-        {
-          result = reader->take (data,
-                                 sample_info,
-                                 max_samples,
-                                 ::DDS::NOT_READ_SAMPLE_STATE,
-                                 ::DDS::NEW_VIEW_STATE | ::DDS::NOT_NEW_VIEW_STATE,
-                                 ::DDS::ANY_INSTANCE_STATE);
-        }
-      return result;
-    }
-
-    template <typename CCM_TYPE, typename TYPED_DDS_READER, typename SEQ_TYPE>
-    ::DDS::ReturnCode_t
-    DataReaderListener_T<CCM_TYPE, TYPED_DDS_READER, SEQ_TYPE, CIAO::DDS4CCM::DDS4CCM_READ>::get_data_i (
-      typename TYPED_DDS_READER::_ptr_type reader,
-      ::DDS::QueryCondition_ptr qc,
-      SEQ_TYPE &data,
-      ::DDS::SampleInfoSeq &sample_info,
-      ::CORBA::Long max_samples)
-    {
-      DDS4CCM_TRACE ("DataReaderListener_T::get_data_i");
-
-      ::DDS::ReturnCode_t result = ::DDS::RETCODE_OK;
-      if (! ::CORBA::is_nil (qc))
-        {
-          ::DDS::ReadCondition_var rd = ::DDS::ReadCondition::_narrow (qc);
-          result = reader->read_w_condition (data,
-                                             sample_info,
-                                             max_samples,
-                                             rd.in ());
-        }
-      else
-        {
-          result = reader->read (data,
-                                 sample_info,
-                                 max_samples,
-                                 ::DDS::NOT_READ_SAMPLE_STATE,
-                                 ::DDS::NEW_VIEW_STATE | ::DDS::NOT_NEW_VIEW_STATE,
-                                 ::DDS::ANY_INSTANCE_STATE);
-        }
-      return result;
-    }
-
-    template <typename CCM_TYPE, typename TYPED_DDS_READER, typename SEQ_TYPE, DDS4CCM_LISTENER_READ_TAKE LRT>
-    void
-    DataReaderListenerBase_T<CCM_TYPE, TYPED_DDS_READER, SEQ_TYPE, LRT>::on_data_available_i (
-      ::DDS::DataReader_ptr rdr)
-    {
-      DDS4CCM_TRACE ("DataReaderListenerBase_T::on_data_available_i");
-
-      if (::CORBA::is_nil (rdr))
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                             ACE_TEXT ("DataReaderListenerBase_T::on_data_available_i - ")
-                             ACE_TEXT ("No datareader received.\n")));
-          return;
-        }
-
-      ::CCM_DDS::ListenerMode const mode = this->control_->mode ();
-      if (mode == ::CCM_DDS::NOT_ENABLED)
-        {
-          return;
-        }
-
-      typename TYPED_DDS_READER::_var_type reader;
-      reader = TYPED_DDS_READER::_narrow (rdr);
-
-      if (::CORBA::is_nil (reader.in ()))
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                             ACE_TEXT ("DataReaderListenerBase_T::on_data_available_i - ")
-                             ACE_TEXT ("Failed to narrow DataReader to a type ")
-                             ACE_TEXT ("specific DataReader.\n")));
-          return;
-        }
-
-      try
-        {
-          SEQ_TYPE data;
-          ::DDS::SampleInfoSeq sample_info;
-          ::CORBA::Long max_samples = 0;
-
-          mode == ::CCM_DDS::ONE_BY_ONE
-            ? max_samples = ::DDS::LENGTH_UNLIMITED
-            : this->control_->max_delivered_data() == 0
-              ? max_samples = ::DDS::LENGTH_UNLIMITED
-              : max_samples = this->control_->max_delivered_data ();
-
-          ::DDS::QueryCondition_var qc =
-            this->condition_manager_.get_querycondition_listener ();
-
-          ::DDS::ReturnCode_t const result =
-            this->get_data_i (reader, qc.in (), data, sample_info, max_samples);
-
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_INFO, DDS4CCM_INFO
-                              ACE_TEXT ("DataReaderListenerBase_T::on_data_available_i - ")
-                              ACE_TEXT ("Get data returned %C.\n"),
-                              translate_retcode (result)));
-
-          if (result == ::DDS::RETCODE_OK)
-            {
-              if (mode == ::CCM_DDS::ONE_BY_ONE)
-                {
-                  for (::CORBA::ULong i = 0; i < data.length (); ++i)
-                    {
-                      if (sample_info[i].valid_data)
-                        {
-                          ::CCM_DDS::ReadInfo info;
-                          info <<= sample_info[i];
-                          this->listener_->on_one_data (data[i], info);
-                        }
-                    }
-                }
-              else
-                {
-                  CORBA::ULong nr_of_samples = 0;
-                  for (::CORBA::ULong i = 0 ; i < sample_info.length(); i++)
-                    {
-                      if (sample_info[i].valid_data)
-                        {
-                          ++nr_of_samples;
-                        }
-                    }
-
-                  if (nr_of_samples > 0)
-                    {
-                      SEQ_TYPE inst_seq (nr_of_samples);
-                      ::CCM_DDS::ReadInfoSeq infoseq (nr_of_samples);
-
-                      infoseq.length (nr_of_samples);
-                      inst_seq.length (nr_of_samples);
-
-                      // Copy the valid samples
-                      CORBA::ULong ix = 0;
-                      for (::CORBA::ULong i = 0 ; i < sample_info.length(); i++)
-                        {
-                          if(sample_info[i].valid_data)
-                            {
-                              infoseq[ix] <<= sample_info[i];
-                              inst_seq[ix] = data[i];
-                              ++ix;
-                            }
-                        }
-                      this->listener_->on_many_data (inst_seq, infoseq);
-                    }
-                }
-            }
-
-          // Return the loan
-          DDS::ReturnCode_t const retval = reader->return_loan (data, sample_info);
-          if (retval != ::DDS::RETCODE_OK)
-            {
-              DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                            ACE_TEXT ("DataReaderListenerBase_T::on_data_available_i - ")
-                            ACE_TEXT ("Error returning loan to DDS - <%C>\n"),
-                            translate_retcode (retval)));
-              // No exception here since this the DDS vendor doesn't expect this.
-              // It will likely causes a crash in their implementation
-            }
-        }
-      catch (const ::CORBA::BAD_INV_ORDER& ex)
-        {
-          DDS4CCM_PRINT_DEBUG_CORBA_EXCEPTION (
-                                  DDS4CCM_LOG_LEVEL_ACTION,
-                                  ex,
-                                  "DataReaderListenerBase_T::on_data_available_i");
-        }
-      catch (const ::CORBA::Exception& ex)
-        {
-          DDS4CCM_PRINT_CORBA_EXCEPTION (
-                                  DDS4CCM_LOG_LEVEL_ERROR,
-                                  ex,
-                                  "DataReaderListenerBase_T::on_data_available_i");
-        }
-      catch (...)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        ACE_TEXT ("DataReaderListener_T::on_data_available_i - ")
-                        ACE_TEXT ("Unexpected exception caught\n")));
-        }
-    }
-
-    template <typename CCM_TYPE, typename TYPED_DDS_READER, typename SEQ_TYPE, DDS4CCM_LISTENER_READ_TAKE LRT>
-    ::DDS::StatusMask
-    DataReaderListenerBase_T<CCM_TYPE, TYPED_DDS_READER, SEQ_TYPE, LRT>::get_mask (
-      typename CCM_TYPE::data_listener_type::_ptr_type listener,
-      ::CCM_DDS::PortStatusListener_ptr status)
-    {
-      DDS4CCM_TRACE ("DataReaderListenerBase_T::get_mask");
-
-      ::DDS::StatusMask mask = 0;
-
-      if (! ::CORBA::is_nil (listener) ||
-          DDS4CCM_debug_level >= DDS4CCM_LOG_LEVEL_DDS_STATUS)
-        {
-          mask = ::DDS::DATA_AVAILABLE_STATUS;
-          mask |= ::CIAO::DDS4CCM::PortStatusListener::get_mask (status);
-        }
-
-      if (DDS4CCM_debug_level >= DDS4CCM_LOG_LEVEL_DDS_STATUS)
-        {
-          ACE_CString msk;
-          translate_statusmask (msk, mask);
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, DDS4CCM_INFO
-                        "DataReaderListenerBase_T::get_mask - "
-                        "Mask becomes %C\n",
-                        msk.c_str ()));
-        }
-      return mask;
-    }
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/impl/DataReaderListener_T.h b/CIAO/connectors/dds4ccm/impl/DataReaderListener_T.h
deleted file mode 100644
index ab98a59b4a2..00000000000
--- a/CIAO/connectors/dds4ccm/impl/DataReaderListener_T.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/**
- * @author William R. Otte <wotte@dre.vanderbilt.edu>
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DATAREADERLISTENER_T_H_
-#define DATAREADERLISTENER_T_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "dds4ccm/impl/PortStatusListener.h"
-#include "dds4ccm/impl/DataReaderHandler_T.h"
-#include "dds4ccm/impl/ConditionManager.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-class ACE_Reactor;
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-namespace CIAO
-{
-  namespace DDS4CCM
-  {
-    template <typename CCM_TYPE, typename TYPED_DDS_READER, typename SEQ_TYPE, DDS4CCM_LISTENER_READ_TAKE LRT>
-    class DataReaderListener_T;
-
-    template <typename CCM_TYPE, typename TYPED_DDS_READER, typename SEQ_TYPE, DDS4CCM_LISTENER_READ_TAKE LRT>
-    class DataReaderListenerBase_T :
-      public PortStatusListener
-    {
-    typedef DataReaderListenerBase_T<CCM_TYPE, TYPED_DDS_READER, SEQ_TYPE, LRT>
-      DataReaderListener_type;
-    typedef ::CIAO::DDS4CCM::DataReaderHandler_T<DataReaderListener_type>
-      DataReaderHandler_type;
-
-    public:
-      /// Constructor
-      DataReaderListenerBase_T (
-        typename CCM_TYPE::data_listener_type::_ptr_type listener,
-        ::CCM_DDS::PortStatusListener_ptr port_status_listener,
-        ::CCM_DDS::DataListenerControl_ptr control,
-        ACE_Reactor * reactor,
-        ConditionManager& condition_manager);
-
-      /// Destructor
-      virtual ~DataReaderListenerBase_T (void);
-
-      virtual void on_data_available (::DDS::DataReader_ptr rdr);
-
-      static ::DDS::StatusMask get_mask (
-        typename CCM_TYPE::data_listener_type::_ptr_type listener,
-        ::CCM_DDS::PortStatusListener_ptr status);
-
-      void on_data_available_i (::DDS::DataReader_ptr rdr);
-
-    private:
-      /// Helper method to get data from DDS
-      virtual ::DDS::ReturnCode_t get_data_i (
-        typename TYPED_DDS_READER::_ptr_type reader,
-        ::DDS::QueryCondition_ptr qc,
-        SEQ_TYPE &data,
-        ::DDS::SampleInfoSeq &sample_info,
-        ::CORBA::Long max_samples) = 0;
-
-      typename CCM_TYPE::data_listener_type::_var_type listener_;
-      ::CCM_DDS::DataListenerControl_var control_;
-      ConditionManager& condition_manager_;
-    };
-
-    template <typename CCM_TYPE, typename TYPED_DDS_READER, typename SEQ_TYPE>
-    class DataReaderListener_T <CCM_TYPE, TYPED_DDS_READER, SEQ_TYPE, CIAO::DDS4CCM::DDS4CCM_TAKE> :
-      public DataReaderListenerBase_T <CCM_TYPE, TYPED_DDS_READER, SEQ_TYPE, CIAO::DDS4CCM::DDS4CCM_TAKE>
-    {
-    public:
-      /// Constructor
-      DataReaderListener_T (
-        typename CCM_TYPE::data_listener_type::_ptr_type listener,
-        ::CCM_DDS::PortStatusListener_ptr port_status_listener,
-        ::CCM_DDS::DataListenerControl_ptr control,
-        ACE_Reactor * reactor,
-        ConditionManager& condition_manager) :
-        DataReaderListenerBase_T<CCM_TYPE, TYPED_DDS_READER, SEQ_TYPE, CIAO::DDS4CCM::DDS4CCM_TAKE> (
-          listener, port_status_listener, control, reactor, condition_manager)
-        {
-        }
-    private:
-      /// Helper method to get data from DDS
-      virtual ::DDS::ReturnCode_t get_data_i (
-        typename TYPED_DDS_READER::_ptr_type reader,
-        ::DDS::QueryCondition_ptr qc,
-        SEQ_TYPE &data,
-        ::DDS::SampleInfoSeq &sample_info,
-        ::CORBA::Long max_samples);
-    };
-
-    template <typename CCM_TYPE, typename TYPED_DDS_READER, typename SEQ_TYPE>
-    class DataReaderListener_T <CCM_TYPE, TYPED_DDS_READER, SEQ_TYPE, CIAO::DDS4CCM::DDS4CCM_READ> :
-      public DataReaderListenerBase_T <CCM_TYPE, TYPED_DDS_READER, SEQ_TYPE, CIAO::DDS4CCM::DDS4CCM_READ>
-    {
-    public:
-      /// Constructor
-      DataReaderListener_T (
-        typename CCM_TYPE::data_listener_type::_ptr_type listener,
-        ::CCM_DDS::PortStatusListener_ptr port_status_listener,
-        ::CCM_DDS::DataListenerControl_ptr control,
-        ACE_Reactor * reactor,
-        ConditionManager& condition_manager) :
-        DataReaderListenerBase_T<CCM_TYPE, TYPED_DDS_READER, SEQ_TYPE, CIAO::DDS4CCM::DDS4CCM_READ> (
-          listener, port_status_listener, control, reactor, condition_manager)
-        {
-        }
-    private:
-      /// Helper method to get data from DDS
-      virtual ::DDS::ReturnCode_t get_data_i (
-        typename TYPED_DDS_READER::_ptr_type reader,
-        ::DDS::QueryCondition_ptr qc,
-        SEQ_TYPE &data,
-        ::DDS::SampleInfoSeq &sample_info,
-        ::CORBA::Long max_samples);
-    };
-  }
-}
-
-#include "dds4ccm/impl/DataReaderListener_T.cpp"
-
-#endif /* DATAREADERLISTENER_T_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/DataReaderStateListener_T.cpp b/CIAO/connectors/dds4ccm/impl/DataReaderStateListener_T.cpp
deleted file mode 100644
index 80afa61f5e7..00000000000
--- a/CIAO/connectors/dds4ccm/impl/DataReaderStateListener_T.cpp
+++ /dev/null
@@ -1,344 +0,0 @@
-#include "dds4ccm/impl/Utils.h"
-
-#include "dds4ccm/impl/logger/Log_Macros.h"
-#include "dds4ccm/impl/DataReaderHandler_T.h"
-#include "tao/ORB_Core.h"
-
-#include <vector>
-
-namespace CIAO
-{
-  namespace DDS4CCM
-  {
-    template <typename CCM_TYPE, typename TYPED_DDS_READER, typename SEQ_TYPE, DDS4CCM_LISTENER_READ_TAKE LRT>
-    DataReaderStateListenerBase_T<CCM_TYPE, TYPED_DDS_READER, SEQ_TYPE, LRT>::DataReaderStateListenerBase_T (
-      typename CCM_TYPE::data_listener_type::_ptr_type listener,
-      ::CCM_DDS::PortStatusListener_ptr port_status_listener,
-      ::CCM_DDS::StateListenerControl_ptr control,
-      ACE_Reactor* reactor,
-      ConditionManager& condition_manager)
-      : PortStatusListener (port_status_listener, reactor) ,
-        listener_ (CCM_TYPE::data_listener_type::_duplicate (listener)),
-        control_ (::CCM_DDS::StateListenerControl::_duplicate (control)),
-        condition_manager_ (condition_manager)
-    {
-      DDS4CCM_TRACE ("DataReaderStateListenerBase_T::DataReaderStateListenerBase_T");
-    }
-
-    // Implementation skeleton destructor
-    template <typename CCM_TYPE, typename TYPED_DDS_READER, typename SEQ_TYPE, DDS4CCM_LISTENER_READ_TAKE LRT>
-    DataReaderStateListenerBase_T<CCM_TYPE, TYPED_DDS_READER, SEQ_TYPE, LRT>::~DataReaderStateListenerBase_T (void)
-    {
-      DDS4CCM_TRACE ("DataReaderStateListenerBase_T::~DataReaderStateListenerBase_T");
-    }
-
-    template <typename CCM_TYPE, typename TYPED_DDS_READER, typename SEQ_TYPE, DDS4CCM_LISTENER_READ_TAKE LRT>
-    void
-    DataReaderStateListenerBase_T<CCM_TYPE, TYPED_DDS_READER, SEQ_TYPE, LRT>::on_data_available(
-      ::DDS::DataReader_ptr rdr)
-    {
-      DDS4CCM_TRACE ("DataReaderStateListenerBase_T::on_data_available");
-
-      if (!::CORBA::is_nil (rdr) &&
-         this->control_->mode () != ::CCM_DDS::NOT_ENABLED)
-        {
-          if (this->reactor_)
-            {
-              DataReaderStateHandler_type* rh = 0;
-              ACE_NEW (rh, DataReaderStateHandler_type (this, rdr));
-              ACE_Event_Handler_var safe_handler (rh);
-              if (this->reactor_->notify (rh) != 0)
-                {
-                  DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                                ACE_TEXT ("DataReaderStateListenerBase_T::on_data_available")
-                                ACE_TEXT ("failed to use reactor.\n")));
-                }
-            }
-          else
-            {
-              this->on_data_available_i (rdr);
-            }
-        }
-    }
-
-    template <typename CCM_TYPE, typename TYPED_DDS_READER, typename SEQ_TYPE, DDS4CCM_LISTENER_READ_TAKE LRT>
-    void
-    DataReaderStateListenerBase_T<CCM_TYPE, TYPED_DDS_READER, SEQ_TYPE, LRT>::on_data_available_i (
-      ::DDS::DataReader_ptr rdr)
-    {
-      DDS4CCM_TRACE ("DataReaderStateListenerBase_T::on_data_available_i");
-
-      ::CCM_DDS::ListenerMode const mode = this->control_->mode ();
-      if (::CORBA::is_nil (rdr) ||
-          mode == ::CCM_DDS::NOT_ENABLED)
-        {
-          return;
-        }
-
-      typename TYPED_DDS_READER::_var_type reader;
-      reader = TYPED_DDS_READER::_narrow (rdr);
-
-      if (::CORBA::is_nil (reader.in ()))
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        ACE_TEXT ("DataReaderStateListenerBase_T::on_data_available_i - ")
-                        ACE_TEXT ("Failed to narrow DataReader to a type ")
-                        ACE_TEXT ("specific DataReader.\n")));
-          return;
-        }
-
-      try
-        {
-          SEQ_TYPE data;
-          ::DDS::SampleInfoSeq sample_info;
-          ::CORBA::Long max_samples = 0;
-
-          mode == ::CCM_DDS::ONE_BY_ONE
-            ? max_samples = ::DDS::LENGTH_UNLIMITED
-            : this->control_->max_delivered_data() == 0
-              ? max_samples = ::DDS::LENGTH_UNLIMITED
-              : max_samples = this->control_->max_delivered_data ();
-
-          ::DDS::QueryCondition_var qc =
-            this->condition_manager_.get_querycondition_listener ();
-
-          ::DDS::ReturnCode_t const result =
-            this->get_data_i (reader, qc.in (), data, sample_info, max_samples);
-
-          if (result == ::DDS::RETCODE_NO_DATA)
-            {
-              return;
-            }
-          else if (result != ::DDS::RETCODE_OK)
-            {
-              DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                            ACE_TEXT ("DataReaderStateListenerBase_T::on_data_available_i - ")
-                            ACE_TEXT ("Unable to get data from data reader, ")
-                            ACE_TEXT ("error %C.\n"), translate_retcode (result)));
-            }
-          if (mode == ::CCM_DDS::ONE_BY_ONE)
-            {
-              for (::CORBA::ULong i = 0; i < data.length (); ++i)
-                {
-                  // Sample data may not be valid anymore when
-                  // deleted so don't check the valid_data flag
-                  // here.
-                  ::CCM_DDS::ReadInfo readinfo;
-                  readinfo <<= sample_info[i];
-                  if (sample_info[i].instance_state ==
-                          ::DDS::NOT_ALIVE_DISPOSED_INSTANCE_STATE)
-                    {
-                      this->listener_->on_deletion (data[i], readinfo);
-                    }
-                  else if (sample_info[i].valid_data)
-                    {
-                      if (sample_info[i].view_state == ::DDS::NEW_VIEW_STATE)
-                        {
-                          this->listener_->on_creation (data[i], readinfo);
-                        }
-                      else
-                        {
-                          this->listener_->on_one_update (data[i], readinfo);
-                        }
-                    }
-                }
-            }
-          else if (mode == ::CCM_DDS::MANY_BY_MANY)
-            {
-              typedef std::vector< ::CORBA::Long > Updates;
-              Updates updates;
-
-              for (::CORBA::ULong i = 0 ; i < sample_info.length(); i++)
-                {
-                  if ((sample_info[i].valid_data &&
-                       sample_info[i].view_state == ::DDS::NEW_VIEW_STATE) ||
-                       sample_info[i].instance_state == ::DDS::NOT_ALIVE_DISPOSED_INSTANCE_STATE)
-                    {
-                      if (updates.size () > 0)
-                        {
-                          // Sample_new or sample_delete found -> first send out the
-                          // updated samples in one go
-                          SEQ_TYPE inst_seq (updates.size ());
-                          ::CCM_DDS::ReadInfoSeq infoseq (updates.size ());
-
-                          infoseq.length (updates.size ());
-                          inst_seq.length (updates.size ());
-                          CORBA::ULong ix = 0;
-                          for(Updates::iterator iter = updates.begin();
-                             iter != updates.end();
-                             ++iter)
-                           {
-                             infoseq[ix] <<= sample_info[*iter];
-                            inst_seq[ix] = data[*iter];
-                            ++ix;
-                          }
-                          this->listener_->on_many_updates (inst_seq, infoseq);
-                          // Clean up
-                          updates.clear ();
-                        }
-                      // Now invoke on_creation or on_deletion
-                      ::CCM_DDS::ReadInfo readinfo;
-                      readinfo <<= sample_info[i];
-                      if (sample_info[i].valid_data &&
-                          sample_info[i].view_state == ::DDS::NEW_VIEW_STATE)
-                        {
-                          this->listener_->on_creation (data[i], readinfo);
-                        }
-                      else if (sample_info[i].instance_state ==
-                               ::DDS::NOT_ALIVE_DISPOSED_INSTANCE_STATE)
-                        {
-                          this->listener_->on_deletion (data[i], readinfo);
-                        }
-                    }
-                  else if (sample_info[i].valid_data)
-                    {
-                      updates.push_back (i);
-                    }
-                }
-              // Send the latest updates.
-              if (updates.size () > 0)
-                {
-                  SEQ_TYPE inst_seq (updates.size ());
-                  ::CCM_DDS::ReadInfoSeq infoseq (updates.size ());
-
-                  infoseq.length (updates.size ());
-                  inst_seq.length (updates.size ());
-                  CORBA::ULong ix = 0;
-                  for(Updates::iterator iter = updates.begin();
-                      iter != updates.end();
-                      ++iter)
-                    {
-                      infoseq[ix] <<= sample_info[*iter];
-                      inst_seq[ix] = data[*iter];
-                      ++ix;
-                    }
-                  this->listener_->on_many_updates (inst_seq, infoseq);
-                }
-            }
-          // Return the loan
-          ::DDS::ReturnCode_t const retval = reader->return_loan (data, sample_info);
-          if (retval != ::DDS::RETCODE_OK)
-            {
-              DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                            ACE_TEXT ("DataReaderStateListenerBase_T::on_data_available_i - ")
-                            ACE_TEXT ("Error returning loan to DDS - <%C>\n"),
-                            translate_retcode (retval)));
-              // No exception here since this the DDS vendor doesn't expect this.
-              // It will likely causes a crash in their implementation
-            }
-        }
-      catch (const ::CORBA::BAD_INV_ORDER& ex)
-        {
-          DDS4CCM_PRINT_DEBUG_CORBA_EXCEPTION (
-                                  DDS4CCM_LOG_LEVEL_ACTION,
-                                  ex,
-                                  "DataReaderStateListenerBase_T::on_data_available_i");
-        }
-      catch (const ::CORBA::Exception& ex)
-        {
-          DDS4CCM_PRINT_CORBA_EXCEPTION (
-                                  DDS4CCM_LOG_LEVEL_ERROR,
-                                  ex,
-                                  "DataReaderStateListenerBase_T::on_data_available_i");
-        }
-      catch (...)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        ACE_TEXT ("DataReaderStateListenerBase_T::on_data_available_i - ")
-                        ACE_TEXT ("Unexpected exception caught\n")));
-        }
-    }
-
-    template <typename CCM_TYPE, typename TYPED_DDS_READER, typename SEQ_TYPE, DDS4CCM_LISTENER_READ_TAKE LRT>
-    ::DDS::StatusMask
-    DataReaderStateListenerBase_T<CCM_TYPE, TYPED_DDS_READER, SEQ_TYPE, LRT>::get_mask (
-      typename CCM_TYPE::data_listener_type::_ptr_type listener)
-    {
-      ::DDS::StatusMask mask = 0;
-
-      if (! ::CORBA::is_nil (listener) ||
-          DDS4CCM_debug_level >= DDS4CCM_LOG_LEVEL_DDS_STATUS)
-        {
-          mask = ::DDS::DATA_AVAILABLE_STATUS |
-                 ::DDS::REQUESTED_DEADLINE_MISSED_STATUS |
-                 ::DDS::SAMPLE_LOST_STATUS;
-        }
-
-      if (DDS4CCM_debug_level >= DDS4CCM_LOG_LEVEL_DDS_STATUS)
-        {
-          ACE_CString msk;
-          translate_statusmask (msk, mask);
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, DDS4CCM_INFO
-                        "DataReaderStateListenerBase_T::get_mask - "
-                        "Mask becomes %C\n",
-                        msk.c_str ()));
-        }
-      return mask;
-    }
-
-    template <typename CCM_TYPE, typename TYPED_DDS_READER, typename SEQ_TYPE>
-    ::DDS::ReturnCode_t
-    DataReaderStateListener_T<CCM_TYPE, TYPED_DDS_READER, SEQ_TYPE, CIAO::DDS4CCM::DDS4CCM_TAKE>::get_data_i (
-      typename TYPED_DDS_READER::_ptr_type reader,
-      ::DDS::QueryCondition_ptr qc,
-      SEQ_TYPE &data,
-      ::DDS::SampleInfoSeq &sample_info,
-      ::CORBA::Long max_samples)
-    {
-      DDS4CCM_TRACE ("DataReaderStateListener_T::get_data_i");
-
-      ::DDS::ReturnCode_t result = ::DDS::RETCODE_OK;
-      if (! ::CORBA::is_nil (qc))
-        {
-          ::DDS::ReadCondition_var rd = ::DDS::ReadCondition::_narrow (qc);
-          result = reader->take_w_condition (data,
-                                              sample_info,
-                                              max_samples,
-                                              rd.in ());
-        }
-      else
-        {
-          result = reader->take (data,
-                                  sample_info,
-                                  max_samples,
-                                  ::DDS::NOT_READ_SAMPLE_STATE,
-                                  ::DDS::NEW_VIEW_STATE | ::DDS::NOT_NEW_VIEW_STATE,
-                                  ::DDS::ANY_INSTANCE_STATE);
-        }
-      return result;
-    }
-
-    template <typename CCM_TYPE, typename TYPED_DDS_READER, typename SEQ_TYPE>
-    ::DDS::ReturnCode_t
-    DataReaderStateListener_T<CCM_TYPE, TYPED_DDS_READER, SEQ_TYPE, CIAO::DDS4CCM::DDS4CCM_READ>::get_data_i (
-      typename TYPED_DDS_READER::_ptr_type reader,
-      ::DDS::QueryCondition_ptr qc,
-      SEQ_TYPE &data,
-      ::DDS::SampleInfoSeq &sample_info,
-      ::CORBA::Long max_samples)
-    {
-      DDS4CCM_TRACE ("DataReaderStateListener_T::get_data_i");
-
-      ::DDS::ReturnCode_t result = ::DDS::RETCODE_OK;
-      if (! ::CORBA::is_nil (qc))
-        {
-          ::DDS::ReadCondition_var rd = ::DDS::ReadCondition::_narrow (qc);
-          result = reader->read_w_condition (data,
-                                             sample_info,
-                                             max_samples,
-                                             rd.in ());
-        }
-      else
-        {
-          result = reader->read (data,
-                                 sample_info,
-                                 max_samples,
-                                 ::DDS::NOT_READ_SAMPLE_STATE,
-                                 ::DDS::NEW_VIEW_STATE | ::DDS::NOT_NEW_VIEW_STATE,
-                                 ::DDS::ANY_INSTANCE_STATE);
-        }
-      return result;
-    }
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/impl/DataReaderStateListener_T.h b/CIAO/connectors/dds4ccm/impl/DataReaderStateListener_T.h
deleted file mode 100644
index a5c21a060a1..00000000000
--- a/CIAO/connectors/dds4ccm/impl/DataReaderStateListener_T.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/**
- * @author William R. Otte <wotte@dre.vanderbilt.edu>
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DATAREADERSTATELISTENER_T_H_
-#define DATAREADERSTATELISTENER_T_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "dds4ccm/impl/PortStatusListener.h"
-
-namespace CIAO
-{
-  namespace DDS4CCM
-  {
-    template <typename CCM_TYPE, typename TYPED_DDS_READER, typename SEQ_TYPE, DDS4CCM_LISTENER_READ_TAKE LRT>
-    class DataReaderStateListener_T;
-
-    /**
-     * Template implementing the DDS4CCM DataReaderStateListener basic port
-     * @tparam CCM_TYPE Set of type traits for this basic port
-     * @tparam TYPED_DDS_READER The typed DDS DataReader type
-     * @tparam SEQ_TYPE The type of sequence
-     * @tparam LRT An enum indicating the semantics of this port
-     */
-    template <typename CCM_TYPE, typename TYPED_DDS_READER, typename SEQ_TYPE, DDS4CCM_LISTENER_READ_TAKE LRT>
-    class DataReaderStateListenerBase_T :
-      public PortStatusListener
-    {
-    typedef DataReaderStateListenerBase_T<CCM_TYPE, TYPED_DDS_READER, SEQ_TYPE, LRT>
-      DataReaderStateListener_type;
-    typedef ::CIAO::DDS4CCM::DataReaderHandler_T<DataReaderStateListener_type>
-      DataReaderStateHandler_type;
-
-    public:
-      /// Constructor
-      DataReaderStateListenerBase_T (
-        typename CCM_TYPE::data_listener_type::_ptr_type listener,
-        ::CCM_DDS::PortStatusListener_ptr port_status_listener,
-        ::CCM_DDS::StateListenerControl_ptr control,
-        ACE_Reactor* reactor,
-        ConditionManager& condition_manager);
-
-      /// Destructor
-      virtual ~DataReaderStateListenerBase_T (void);
-
-      virtual void on_data_available (::DDS::DataReader_ptr rdr);
-
-      static ::DDS::StatusMask get_mask (
-        typename CCM_TYPE::data_listener_type::_ptr_type listener);
-
-      void on_data_available_i (::DDS::DataReader_ptr rdr);
-
-    private:
-      /// Helper method to get data from DDS
-      virtual ::DDS::ReturnCode_t get_data_i (
-        typename TYPED_DDS_READER::_ptr_type reader,
-        ::DDS::QueryCondition_ptr qc,
-        SEQ_TYPE &data,
-        ::DDS::SampleInfoSeq &sample_info,
-        ::CORBA::Long max_samples) = 0;
-
-      typename CCM_TYPE::data_listener_type::_var_type listener_;
-      ::CCM_DDS::StateListenerControl_var control_;
-      ConditionManager& condition_manager_;
-    };
-
-    template <typename CCM_TYPE, typename TYPED_DDS_READER, typename SEQ_TYPE>
-    class DataReaderStateListener_T <CCM_TYPE, TYPED_DDS_READER, SEQ_TYPE, CIAO::DDS4CCM::DDS4CCM_TAKE> :
-      public DataReaderStateListenerBase_T <CCM_TYPE, TYPED_DDS_READER, SEQ_TYPE, CIAO::DDS4CCM::DDS4CCM_TAKE>
-    {
-    public:
-      /// Constructor
-      DataReaderStateListener_T (
-        typename CCM_TYPE::data_listener_type::_ptr_type listener,
-        ::CCM_DDS::PortStatusListener_ptr port_status_listener,
-        ::CCM_DDS::StateListenerControl_ptr control,
-        ACE_Reactor* reactor,
-        ConditionManager& condition_manager) :
-        DataReaderStateListenerBase_T<CCM_TYPE, TYPED_DDS_READER, SEQ_TYPE, CIAO::DDS4CCM::DDS4CCM_TAKE> (
-          listener, port_status_listener, control, reactor, condition_manager)
-        {
-        }
-    private:
-      /// Helper method to get data from DDS
-      virtual ::DDS::ReturnCode_t get_data_i (
-        typename TYPED_DDS_READER::_ptr_type reader,
-        ::DDS::QueryCondition_ptr qc,
-        SEQ_TYPE &data,
-        ::DDS::SampleInfoSeq &sample_info,
-        ::CORBA::Long max_samples);
-    };
-
-    template <typename CCM_TYPE, typename TYPED_DDS_READER, typename SEQ_TYPE>
-    class DataReaderStateListener_T <CCM_TYPE, TYPED_DDS_READER, SEQ_TYPE, CIAO::DDS4CCM::DDS4CCM_READ> :
-      public DataReaderStateListenerBase_T <CCM_TYPE, TYPED_DDS_READER, SEQ_TYPE, CIAO::DDS4CCM::DDS4CCM_READ>
-    {
-    public:
-      /// Constructor
-      DataReaderStateListener_T (
-        typename CCM_TYPE::data_listener_type::_ptr_type listener,
-        ::CCM_DDS::PortStatusListener_ptr port_status_listener,
-        ::CCM_DDS::StateListenerControl_ptr control,
-        ACE_Reactor* reactor,
-        ConditionManager& condition_manager) :
-        DataReaderStateListenerBase_T<CCM_TYPE, TYPED_DDS_READER, SEQ_TYPE, CIAO::DDS4CCM::DDS4CCM_READ> (
-          listener, port_status_listener, control, reactor, condition_manager)
-        {
-        }
-    private:
-      /// Helper method to get data from DDS
-      virtual ::DDS::ReturnCode_t get_data_i (
-        typename TYPED_DDS_READER::_ptr_type reader,
-        ::DDS::QueryCondition_ptr qc,
-        SEQ_TYPE &data,
-        ::DDS::SampleInfoSeq &sample_info,
-        ::CORBA::Long max_samples);
-    };
-  }
-}
-
-#include "dds4ccm/impl/DataReaderStateListener_T.cpp"
-
-#endif /* DATAREADERSTATELISTENER_T_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/DomainParticipantManager.cpp b/CIAO/connectors/dds4ccm/impl/DomainParticipantManager.cpp
deleted file mode 100644
index c8ab1a84571..00000000000
--- a/CIAO/connectors/dds4ccm/impl/DomainParticipantManager.cpp
+++ /dev/null
@@ -1,291 +0,0 @@
-#include "dds4ccm/impl/DomainParticipantManager.h"
-#include "dds4ccm/impl/logger/Log_Macros.h"
-#include "dds4ccm/impl/Utils.h"
-#include "ace/Env_Value_T.h"
-
-#if (CIAO_DDS4CCM_NDDS==1)
-# include "ndds/convertors/InstanceHandle_t.h"
-#endif
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "dds/DCPS/transport/framework/TransportDebug.h"
-# include "dds/DCPS/Service_Participant.h"
-#endif
-
-namespace CIAO
-{
-  namespace DDS4CCM
-  {
-    //============================================================
-    // DomainParticipantManager::DDSParticipantTopic::DDSParticipantTopic
-    //============================================================
-    DomainParticipantManager::DDSParticipantTopic::DDSParticipantTopic (
-      DDS::DomainParticipant_ptr dp)
-      : ref_count_ (1),
-        dp_ (DDS::DomainParticipant::_duplicate(dp))
-    {
-      DDS4CCM_TRACE ("DomainParticipantManager::DDSParticipantTopic::DDSParticipantTopic");
-    }
-
-    DomainParticipantManager::DDSParticipantTopic::~DDSParticipantTopic (void)
-    {
-      DDS4CCM_TRACE ("DomainParticipantManager::DDSParticipantTopic::~DDSParticipantTopic");
-    }
-
-    DDS::DomainParticipant_ptr
-    DomainParticipantManager::DDSParticipantTopic::get_participant ()
-    {
-      DDS4CCM_TRACE ("DomainParticipantManager::DDSParticipantTopic::get_participant");
-
-      return DDS::DomainParticipant::_duplicate(this->dp_);
-    }
-
-    int
-    DomainParticipantManager::DDSParticipantTopic::_ref_count ()
-    {
-      DDS4CCM_TRACE ("DomainParticipantManager::DDSParticipantTopic::_ref_count");
-
-      return this->ref_count_;
-    }
-
-    void
-    DomainParticipantManager::DDSParticipantTopic::_inc_ref ()
-    {
-      DDS4CCM_TRACE ("DomainParticipantManager::DDSParticipantTopic::_inc_ref");
-
-      ++this->ref_count_;
-    }
-
-    void
-    DomainParticipantManager::DDSParticipantTopic::_dec_ref ()
-    {
-      DDS4CCM_TRACE ("DomainParticipantManager::DDSParticipantTopic::_dec_ref");
-
-      --this->ref_count_;
-    }
-
-    //============================================================
-    // DomainParticipantManager::DomainParticipantManager
-    //============================================================
-    DomainParticipantManager::DomainParticipantManager (void)
-    {
-      DDS4CCM_TRACE ("DomainParticipantManager::DomainParticipantManager");
-
-#if (CIAO_DDS4CCM_NDDS==1)
-      ACE_Env_Value<int> verbosity (ACE_TEXT("DDS4CCM_NDDS_LOG_VERBOSITY"),
-        NDDS_CONFIG_LOG_VERBOSITY_SILENT);
-
-      NDDS_Config_LogVerbosity n_verbosity =
-        static_cast <NDDS_Config_LogVerbosity> (verbosity.operator int());
-      NDDSConfigLogger::get_instance()->set_verbosity (n_verbosity);
-#elif (CIAO_DDS4CCM_OPENDDS==1)
-      ACE_Env_Value<int> dcpsdl (ACE_TEXT("DDS4CCM_OPENDDS_LOG_LEVEL"), 0);
-      OpenDDS::DCPS::DCPS_debug_level = dcpsdl;
-      ACE_Env_Value<int> dcpsdtl (ACE_TEXT("DDS4CCM_OPENDDS_TRANSPORT_LOG_LEVEL"), 0);
-      OpenDDS::DCPS::Transport_debug_level = dcpsdtl;
-#endif
-    }
-
-    DomainParticipantManager::~DomainParticipantManager (void)
-    {
-      DDS4CCM_TRACE ("DomainParticipantManager::~DomainParticipantManager");
-
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                    "DomainParticipantManager::~DomainParticipantManager\n"));
-    }
-
-    DDS::DomainParticipant_ptr
-    DomainParticipantManager::get_participant (const DDS::DomainId_t domain_id,
-      const char * qos_profile)
-    {
-      DDS4CCM_TRACE ("DomainParticipantManager::get_participant");
-
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                    "DomainParticipantManager::get_participant - "
-                    "Searching DomainParticipant for domain <%d> "
-                    "with profile <%C>\n",
-                    domain_id, qos_profile));
-
-      std::string profile;
-      if (qos_profile)
-        {
-          profile = qos_profile;
-        }
-      IdQosProfile idqos = std::make_pair (profile, domain_id);
-      DomainParticipants_iterator it_found = this->dps_.find (idqos);
-
-      if (it_found != this->dps_.end () && it_found->second)
-        {
-          ::DDS::DomainParticipant_var dp = it_found->second->get_participant ();
-          it_found->second->_inc_ref ();
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                        "DomainParticipantManager::get_participant - "
-                        "DomainParticipant found. domain <%d> - "
-                        "profile <%C> - ref_count <%d> - handle "
-                        DDS_ENTITY_FORMAT_SPECIFIER "\n",
-                        domain_id,
-                        qos_profile,
-                        it_found->second->_ref_count (),
-                        DDS_ENTITY_LOG (dp.in ())));
-
-          return dp._retn ();
-        }
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                    "DomainParticipantManager::get_participant - "
-                    "DomainParticipant for domain <%d> with profile <%C> "
-                    "does not exist.\n",
-                    domain_id, qos_profile));
-      return ::DDS::DomainParticipant::_nil ();
-    }
-
-    bool
-    DomainParticipantManager::register_participant (
-      DDS::DomainId_t domain_id,
-      const char * qos_profile,
-      DDS::DomainParticipant_ptr dp)
-    {
-      DDS4CCM_TRACE ("DomainParticipantManager::register_participant");
-
-      ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard,
-                      this->dps_mutex_, CORBA::INTERNAL ());
-
-      if (::CORBA::is_nil (dp))
-        {
-          return false;
-        }
-
-      std::string profile;
-      if (qos_profile)
-        {
-          profile = qos_profile;
-        }
-      IdQosProfile idqos = std::make_pair (profile, domain_id);
-      DomainParticipants_iterator it_found = this->dps_.find (idqos);
-
-      if (it_found == this->dps_.end())
-        {
-          DDSParticipantTopic * dpt = 0;
-          ACE_NEW_THROW_EX (dpt,
-                            DDSParticipantTopic (dp),
-                            ::CORBA::NO_MEMORY ());
-          std::pair <DomainParticipants_iterator, bool> to_insert =
-            this->dps_.insert (std::make_pair (idqos, dpt));
-          if (!to_insert.second)
-            {
-              DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                            "DomainParticipantManager::register_participant - "
-                            "Unable to insert a new DomainParticipant "
-                            "for domain <%d> with profile <%C>.\n",
-                            domain_id, qos_profile));
-              return false;
-            }
-
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                        "DomainParticipantManager::register_participant - "
-                        "Added a new DomainParticipant "
-                        "for domain <%d> with profile <%C> handle "
-                        DDS_ENTITY_FORMAT_SPECIFIER ".\n",
-                        domain_id, qos_profile,
-                        DDS_ENTITY_LOG (dp)));
-          return true;
-
-        }
-
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                    "DomainParticipantManager::register_participant - "
-                    "Don't add participant for domain <%d> with profile <%C> since it already "
-                    "exists as handle "
-                    DDS_ENTITY_FORMAT_SPECIFIER "\n",
-                    domain_id, qos_profile,
-                    DDS_ENTITY_LOG (dp)));
-      return false;
-    }
-
-    bool
-    DomainParticipantManager::unregister_participant (
-      DDS::DomainId_t domain_id,
-      const char * qos_profile,
-      DDS::DomainParticipant_ptr dp)
-    {
-      DDS4CCM_TRACE ("DomainParticipantManager::unregister_participant");
-
-      ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard,
-                      this->dps_mutex_, CORBA::INTERNAL ());
-
-      if (::CORBA::is_nil (dp))
-        {
-          return false;
-        }
-
-      std::string profile;
-      if (qos_profile)
-        {
-          profile = qos_profile;
-        }
-      IdQosProfile idqos = std::make_pair (profile, domain_id);
-      DomainParticipants_iterator iter = this->dps_.find (idqos);
-
-      if (iter != this->dps_.end ())
-        {
-          if (iter->second->_ref_count () == 1)
-            {
-              DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_UNIMP_ACTION, (LM_TRACE, DDS4CCM_INFO
-                            "DomainParticipantManager::unregister_participant - "
-                            "Delete participant "
-                            DDS_ENTITY_FORMAT_SPECIFIER
-                            " for domain <%d> with profile <%C> since ref_count is one.\n",
-                            DDS_ENTITY_LOG (dp),
-                            domain_id,
-                            qos_profile));
-              delete iter->second;
-
-              // Save to remove from list
-              this->dps_.erase (iter);
-            }
-          else
-            {
-              DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_UNIMP_ACTION, (LM_TRACE, DDS4CCM_INFO
-                            "DomainParticipantManager::unregister_participant - "
-                            "Don't delete participant "
-                            DDS_ENTITY_FORMAT_SPECIFIER
-                            " for domain <%d> with profile <%C> since "
-                            "it's still used - ref_count is <%d>\n",
-                            DDS_ENTITY_LOG (dp),
-                            domain_id,
-                            qos_profile,
-                            iter->second->_ref_count ()));
-              iter->second->_dec_ref ();
-              return false;
-            }
-        }
-
-      return true;
-    }
-
-    bool
-    DomainParticipantManager::close ()
-    {
-      DDS4CCM_TRACE ("DomainParticipantManager::close");
-
-      if (this->dps_.empty ())
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                        "DomainParticipantManager::close - "
-                        "No participants anymore, shutting down DDS.\n"));
-#if (CIAO_DDS4CCM_OPENDDS==1)
-          TheServiceParticipant->shutdown ();
-#elif (CIAO_DDS4CCM_NDDS==1)
-          DDSDomainParticipantFactory::finalize_instance ();
-#endif
-          return true;
-        }
-
-      return false;
-    }
-  }
-}
-
-#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
-template ACE_Singleton<CIAO::DDS4CCM::DomainParticipantManager, TAO_SYNCH_MUTEX> *
-         ACE_Singleton<CIAO::DDS4CCM::DomainParticipantManager, TAO_SYNCH_MUTEX>::singleton_;
-#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */
diff --git a/CIAO/connectors/dds4ccm/impl/DomainParticipantManager.h b/CIAO/connectors/dds4ccm/impl/DomainParticipantManager.h
deleted file mode 100644
index 10f058402a2..00000000000
--- a/CIAO/connectors/dds4ccm/impl/DomainParticipantManager.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/**
- * @author William R. Otte <wotte@dre.vanderbilt.edu>
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- */
-
-#ifndef DOMAINPARTICIPANTMANAGER_H_
-#define DOMAINPARTICIPANTMANAGER_H_
-
-#include "dds4ccm/impl/dds4ccm_dds_impl_export.h"
-
-#include "ace/Singleton.h"
-#include "tao/orbconf.h"
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-
-#include <map>
-#include <string>
-
-namespace CIAO
-{
-  namespace DDS4CCM
-  {
-    /**
-     *
-     * @class DomainParticipantManager
-     *
-     * @brief
-     *
-     * Stores a DDSParticipantTopic per domain ID and QOS profile string.
-     * When several connectors are joining the same domain ID, using the
-     * same QOS settings (ie have the same QOS profile string),
-     * the DomainParticipant for that combination is shared. This is done
-     * to save resources (running threads/memory usage).
-     *
-     * The DomainParticipantManager is a singleton.
-     *
-     */
-    class DDS4CCM_DDS_IMPL_Export DomainParticipantManager : private ACE_Copy_Disabled
-    {
-    friend class ACE_Singleton<DomainParticipantManager, TAO_SYNCH_MUTEX>;
-
-    /**
-     * @class DDSParticipantTopic
-     *
-     * Stores a list of topics for a specific domain. If
-     * several connectors run in the same process and those
-     * connectors are making use of the same topic, the topics
-     * are shared amongst the connectors.
-     *
-     * This class maintains a reference count. It's save to remove
-     * a topic once the reference count becomes one.
-     *
-     */
-    class DDSParticipantTopic
-    {
-      public:
-        DDSParticipantTopic (DDS::DomainParticipant_ptr dp);
-        ~DDSParticipantTopic (void);
-
-        DDS::DomainParticipant_ptr get_participant ();
-
-        /**
-         * Returns the reference count of this class
-         */
-        int _ref_count ();
-        /**
-         * Increments the reference count of this class
-         */
-        void _inc_ref ();
-        /**
-         * Decrements the reference count of this class
-         */
-        void _dec_ref ();
-
-      private:
-        int ref_count_;
-        DDS::DomainParticipant_var dp_;
-    };
-
-    private:
-      /// Constructor
-      DomainParticipantManager (void);
-
-    public:
-      /// Destructor
-      ~DomainParticipantManager (void);
-
-      /**
-       * Searches for the DomainParticipant_ptr in the internal map.
-       * Search is based on the given domain ID and the given QOS
-       * (QOS profile string). If found, it'll increment the
-       * reference count of the DDSParticipantTopic instance.
-       */
-      DDS::DomainParticipant_ptr get_participant (const DDS::DomainId_t domain_id,
-                                                  const char * qos_profile);
-
-      /**
-       * Adding a DDSParticipantTopic instance when the
-       * internal maps doesn't contain a reference. Returns
-       * false if there's already an DDSParticipantTopic
-       * available (base on domain ID and QOS)
-       */
-      bool register_participant (DDS::DomainId_t domain_id,
-                                 const char * qos_profile,
-                                 DDS::DomainParticipant_ptr dp);
-
-      /**
-       * Removes the DDSParticipantTopic instance when the
-       * reference count is one.
-       * Returns false if the reference count of the corresponding
-       * DDSParticipantTopic was not nil
-       */
-      bool unregister_participant (DDS::DomainId_t domain_id,
-                                 const char * qos_profile,
-                                 DDS::DomainParticipant_ptr dp);
-
-      /**
-       * Try to close the DPM, at the moment no domain participants are
-       * registered anymore we are going to shutdown DDS interaction
-       */
-      bool close();
-
-    private:
-      TAO_SYNCH_MUTEX dps_mutex_;
-
-      typedef std::pair <std::string, DDS::DomainId_t> IdQosProfile;
-      typedef std::map < IdQosProfile, DDSParticipantTopic *> DomainParticipants;
-      DomainParticipants dps_;
-
-      typedef DomainParticipants::iterator DomainParticipants_iterator;
-    };
-
-    typedef ACE_Singleton<DomainParticipantManager,
-              TAO_SYNCH_MUTEX> Domain_Participant_Manager;
-  }
-}
-
-#define DPMANAGER ::CIAO::DDS4CCM::Domain_Participant_Manager::instance ()
-
-/// Declare a process wide singleton
-DDS4CCM_DDS_IMPL_SINGLETON_DECLARE (ACE_Singleton,
-                                    ::CIAO::DDS4CCM::DomainParticipantManager,
-                                    TAO_SYNCH_MUTEX)
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/impl/Getter_T.cpp b/CIAO/connectors/dds4ccm/impl/Getter_T.cpp
deleted file mode 100644
index 85ee254e6ca..00000000000
--- a/CIAO/connectors/dds4ccm/impl/Getter_T.cpp
+++ /dev/null
@@ -1,448 +0,0 @@
-// #include "dds4ccm/impl/Utils.h"
-
-#include "dds4ccm/impl/logger/Log_Macros.h"
-
-namespace CIAO
-{
-  namespace DDS4CCM
-  {
-    template <typename GETTER_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    Getter_Base_T<GETTER_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::Getter_Base_T (void)
-      : condition_manager_ (0),
-        time_out_ (),
-        max_delivered_data_ (0)
-    {
-      DDS4CCM_TRACE ("Getter_Base_T::Getter_Base_T");
-    }
-
-    template <typename GETTER_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    Getter_Base_T<GETTER_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::~Getter_Base_T (void)
-    {
-      DDS4CCM_TRACE ("Getter_Base_T::~Getter_Base_T");
-    }
-
-    template <typename GETTER_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    typename TYPED_DDS_READER::_ptr_type
-    Getter_Base_T<GETTER_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::dds_reader (void)
-    {
-      if (this->dds_reader_)
-        {
-          return this->dds_reader_;
-        }
-      else
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG,
-                        "CIAO::DDS4CCM::Getter_Base_T::impl - "
-                        "Throwing BAD_INV_ORDER.\n"));
-          throw ::CORBA::BAD_INV_ORDER ();
-        }
-    }
-
-    template <typename GETTER_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    ::DDS::ReturnCode_t
-    Getter_Base_T<GETTER_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::get (
-      SEQ_VALUE_TYPE & data,
-      ::DDS::SampleInfoSeq & sample_info,
-      const ::CORBA::Long & max_samples)
-    {
-      DDS4CCM_TRACE ("Getter_Base_T::get");
-
-      ::DDS::ReadCondition_var rc = this->condition_manager_->get_readcondition ();
-      if (! ::CORBA::is_nil (rc.in ()))
-        {
-          // Read, using the read condition
-          return this->get (data,
-                            sample_info,
-                            max_samples,
-                            rc.in ());
-        }
-      else
-        {
-          // A filter has been set. Use the appropriate query condition
-          // to read data from DDS.
-          ::DDS::QueryCondition_var qc = this->condition_manager_->get_querycondition_getter ();
-          if (::CORBA::is_nil (qc.in ()))
-            {
-              DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                            "Getter_Base_T::get - "
-                            "Unable to retrieve QueryCondition from "
-                            "Condition manager\n"));
-              return ::DDS::RETCODE_ERROR;
-            }
-          return this->get (data,
-                            sample_info,
-                            max_samples,
-                            qc.in ());
-        }
-    }
-
-    template <typename GETTER_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    ::DDS::ReturnCode_t
-    Getter_Base_T<GETTER_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::get (
-      SEQ_VALUE_TYPE & data,
-      ::DDS::SampleInfoSeq & sample_info,
-      const ::CORBA::Long & max_samples,
-      ::DDS::QueryCondition_ptr qc)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::Getter_Base_T::get");
-
-      if (! ::CORBA::is_nil (qc))
-        {
-          return this->dds_reader ()->read_w_condition (data,
-                                                  sample_info,
-                                                  max_samples,
-                                                  qc);
-      }
-      return ::DDS::RETCODE_ERROR;
-    }
-
-    template <typename GETTER_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    ::DDS::ReturnCode_t
-    Getter_Base_T<GETTER_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::get (
-      SEQ_VALUE_TYPE & data,
-      ::DDS::SampleInfoSeq & sample_info,
-      const ::CORBA::Long & max_samples,
-      ::DDS::ReadCondition_ptr rd)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::Getter_Base_T::get");
-
-      if (! ::CORBA::is_nil (rd))
-        {
-          return this->dds_reader ()->read_w_condition (data,
-                                                  sample_info,
-                                                  max_samples,
-                                                  rd);
-        }
-      return ::DDS::RETCODE_ERROR;
-    }
-
-    template <typename GETTER_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    bool
-    Getter_Base_T<GETTER_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::get_many (
-      SEQ_VALUE_TYPE& instances,
-      ::CCM_DDS::ReadInfoSeq& infos)
-    {
-      DDS4CCM_TRACE ("Getter_Base_T::get_many");
-
-      if (!this->condition_manager_->wait (this->time_out_))
-        {
-          // Wait hasn't been triggered (no samples which match the attached
-          // conditions are received).
-          return false;
-        }
-
-      ::CORBA::Long max_samples = this->max_delivered_data_;
-      if (max_samples == 0)
-        {
-          max_samples = ::DDS::LENGTH_UNLIMITED;
-        }
-
-      ::DDS::SampleInfoSeq sample_info;
-      SEQ_VALUE_TYPE data;
-
-      ::DDS::ReturnCode_t const retcode = this->get (data,
-                                                     sample_info,
-                                                     max_samples);
-
-      if (retcode == ::DDS::RETCODE_OK && data.length () >= 1)
-        {
-          // Determine which samples are valid and return these to
-          // the caller.
-          ::CORBA::ULong number_read = 0;
-          for (::CORBA::ULong index = 0; index < sample_info.length (); index ++)
-            {
-              if (sample_info[index].valid_data)
-                {
-                  ++number_read;
-                }
-            }
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG,
-                        ACE_TEXT ("Getter_Base_T::get_many: ")
-                        ACE_TEXT ("read <%d> - valid <%d>\n"),
-                        sample_info.length (),
-                        number_read));
-          infos.length (number_read);
-          instances.length (number_read);
-          number_read = 0;
-          for (::CORBA::ULong j = 0; j < data.length (); j ++)
-            {
-              if (sample_info[j].valid_data)
-                {
-                  infos.operator[](number_read) <<= sample_info[j];
-                  instances.operator[](number_read) = data[j];
-                  ++number_read;
-                }
-            }
-        }
-      else
-        {
-          // RETCODE_NO_DATA should be an error
-          // because after a timeout there should be
-          // data.
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                "Getter_Base_T::get_many - "
-                "Error while reading from DDS: <%C>\n",
-                translate_retcode (retcode)));
-
-          ::DDS::ReturnCode_t const retval =
-            this->dds_reader ()->return_loan (data, sample_info);
-          if (retval != ::DDS::RETCODE_OK)
-            {
-              DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                "Getter_Base_T::get_many - "
-                "Error returning loan to DDS - <%C>\n",
-                translate_retcode (retval)));
-            }
-          throw ::CCM_DDS::InternalError (retcode, 0);
-        }
-
-      ::DDS::ReturnCode_t const retval =
-        this->dds_reader ()->return_loan (data, sample_info);
-      if (retval != ::DDS::RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-            "Getter_Base_T::get_many - "
-            "Error returning loan to DDS - <%C>\n",
-            translate_retcode (retval)));
-
-          throw ::CCM_DDS::InternalError (retcode, 0);
-        }
-
-      return true;
-    }
-
-    template <typename GETTER_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    ::DDS::Duration_t
-    Getter_Base_T<GETTER_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::time_out (void)
-    {
-      DDS4CCM_TRACE ("Getter_Base_T::time_out");
-
-      return this->time_out_;
-    }
-
-    template <typename GETTER_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    void
-    Getter_Base_T<GETTER_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::time_out (
-      const ::DDS::Duration_t & time_out)
-    {
-      this->time_out_ = time_out;
-    }
-
-    template <typename GETTER_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    ::CCM_DDS::DataNumber_t
-    Getter_Base_T<GETTER_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::max_delivered_data (void)
-    {
-      return this->max_delivered_data_;
-    }
-
-    template <typename GETTER_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    void
-    Getter_Base_T<GETTER_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::max_delivered_data (
-      ::CCM_DDS::DataNumber_t max_delivered_data)
-    {
-      this->max_delivered_data_ = max_delivered_data;
-    }
-
-    template <typename GETTER_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    void
-    Getter_Base_T<GETTER_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::set_dds_reader (
-      ::DDS::DataReader_ptr dr,
-      ::CIAO::DDS4CCM::ConditionManager * condition_manager)
-    {
-      DDS4CCM_TRACE ("Getter_Base_T::set_dds_reader");
-
-      this->dds_reader_ = TYPED_DDS_READER::_narrow (dr);
-      if (!::CORBA::is_nil (dr) && ::CORBA::is_nil (this->dds_reader_.in ()))
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        "Getter_Base_T::set_dds_reader - "
-                        "narrow failed.\n"));
-          throw ::CORBA::INTERNAL ();
-        }
-      this->condition_manager_ = condition_manager;
-    }
-
-    template <typename GETTER_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    ::DDS::DataReader_ptr
-    Getter_Base_T<GETTER_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::get_dds_reader (void)
-    {
-      return ::DDS::DataReader::_duplicate (this->dds_reader_.in ());
-    }
-
-    template <typename GETTER_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    bool
-    Getter_T<GETTER_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE, true>::get_one (
-      typename VALUE_TYPE::_out_type an_instance,
-      ::CCM_DDS::ReadInfo_out info)
-    {
-      DDS4CCM_TRACE ("Getter_T::get_one");
-
-      if (!this->condition_manager_->wait (this->time_out_))
-        {
-          // None of the attached conditions have triggered wait.
-          return false;
-        }
-
-      bool valid_data_read = false;
-
-      // Read the samples one by one until a valid sample
-      // has been found.
-      while (!valid_data_read)
-        {
-          ::DDS::SampleInfoSeq sample_info;
-          SEQ_VALUE_TYPE data;
-
-          ::DDS::ReturnCode_t const retcode = this->get (data, sample_info, 1);
-
-          if (retcode == ::DDS::RETCODE_NO_DATA)
-            {
-              DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                            "Getter_T::get_one - "
-                            "DDS returned <%C>. No data available in DDS.\n",
-                            translate_retcode (retcode)));
-              return false;
-            }
-          else if (retcode != ::DDS::RETCODE_OK)
-            {
-              // Something went wrong.
-              DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                    "Getter_T::get_one - "
-                    "Error while reading from DDS: <%C>\n",
-                    translate_retcode (retcode)));
-
-              ::DDS::ReturnCode_t const retval =
-                this->dds_reader ()->return_loan (data, sample_info);
-              if (retval != ::DDS::RETCODE_OK)
-                {
-                  DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                    "Getter_Base_T::get_one - "
-                    "Error returning loan to DDS - <%C>\n",
-                    translate_retcode (retval)));
-                }
-
-              throw ::CCM_DDS::InternalError (retcode, 0);
-            }
-          else if (data.length () == 1 && sample_info[0].valid_data)
-            {
-              DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                    "Getter_T::get_one - "
-                    "Read one valid sample from DDS.\n"));
-
-              // Add the valid sample to the list which will be returned
-              // to the caller
-              info <<= sample_info[0];
-              an_instance = data[0];
-              valid_data_read = true;
-            }
-          else
-            {
-              DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                    "Getter_T::get_one - "
-                    "No valid data available in DDS.\n"));
-            }
-
-          // Return the loan of each read.
-          ::DDS::ReturnCode_t const retval =
-            this->dds_reader ()->return_loan (data, sample_info);
-          if (retval != ::DDS::RETCODE_OK)
-            {
-              DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                "Getter_T::get_one - "
-                "Error returning loan to DDS - <%C>\n",
-                translate_retcode (retval)));
-
-              throw ::CCM_DDS::InternalError (retcode, 0);
-            }
-        }
-
-      return valid_data_read;
-    }
-
-    template <typename GETTER_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    bool
-    Getter_T<GETTER_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE, false>::get_one (
-      typename VALUE_TYPE::_out_type an_instance,
-      ::CCM_DDS::ReadInfo_out info)
-    {
-      DDS4CCM_TRACE ("Getter_T::get_one");
-
-      an_instance = 0;
-      ACE_NEW_THROW_EX (an_instance,
-                        VALUE_TYPE,
-                        ::CORBA::NO_MEMORY ());
-      if (!this->condition_manager_->wait (this->time_out_))
-        {
-          // None of the attached conditions have triggered wait.
-          return false;
-        }
-
-      bool valid_data_read = false;
-      ::DDS::SampleInfoSeq sample_info;
-      SEQ_VALUE_TYPE data;
-
-      // Read the samples one by one until a valid sample
-      // has been found.
-      while (!valid_data_read)
-        {
-          ::DDS::SampleInfoSeq sample_info;
-          SEQ_VALUE_TYPE data;
-          ::DDS::ReturnCode_t const retcode = this->get (data,
-                                                         sample_info,
-                                                         1);
-          if (retcode == ::DDS::RETCODE_NO_DATA)
-            {
-              DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                    "Getter_T::get_one - "
-                    "DDS returned <%C>. No data available in DDS.\n",
-                    translate_retcode (retcode)));
-              return false;
-            }
-          else if (retcode != ::DDS::RETCODE_OK)
-            {
-              DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                    "Getter_T::get_one - "
-                    "Error while reading from DDS: <%C>\n",
-                    translate_retcode (retcode)));
-
-              ::DDS::ReturnCode_t const retval =
-                this->dds_reader ()->return_loan (data, sample_info);
-              if (retval != ::DDS::RETCODE_OK)
-                {
-                  DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                    "Getter_T::get_one - "
-                    "Error returning loan to DDS - <%C>\n",
-                    translate_retcode (retval)));
-                }
-              throw ::CCM_DDS::InternalError (retcode, 0);
-            }
-          else if (data.length () == 1 && sample_info[0].valid_data)
-            {
-              // Add the valid sample to the list which will be returned
-              // to the caller
-              info <<= sample_info[0];
-              *an_instance = data[0];
-              valid_data_read = true;
-            }
-          else
-            {
-              DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                    "Getter_T::get_one - "
-                    "No valid available in DDS.\n"));
-            }
-          // Return the loan of each read.
-          ::DDS::ReturnCode_t const retval = this->dds_reader ()->return_loan (data, sample_info);
-          if (retval != ::DDS::RETCODE_OK)
-            {
-              DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                "Getter_T::get_one - "
-                "Error returning loan to DDS - <%C>\n",
-                translate_retcode (retval)));
-              throw ::CCM_DDS::InternalError (retval, 0);
-            }
-        }
-
-      return valid_data_read;
-    }
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/impl/Getter_T.h b/CIAO/connectors/dds4ccm/impl/Getter_T.h
deleted file mode 100644
index 9413db25fcc..00000000000
--- a/CIAO/connectors/dds4ccm/impl/Getter_T.h
+++ /dev/null
@@ -1,173 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef GETTER_T_H_
-#define GETTER_T_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ace/Copy_Disabled.h"
-
-#if (CIAO_DDS4CCM_NDDS==1)
-# include "dds4ccm/impl/ndds/Condition.h"
-# include "dds4ccm/impl/ndds/ReadCondition.h"
-# include "dds4ccm/impl/ndds/QueryCondition.h"
-#endif
-
-namespace CIAO
-{
-  namespace DDS4CCM
-  {
-    /**
-    * @class Getter_Base_T<GETTER_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>
-    *
-    * @brief Templated base class for the Getter port.
-    *
-    *        Spec:  Get operations are performed with the following parameters
-    *                . SampleStateMask: NO_READ,
-    *                . ViewStateMask: NEW or NOT_NEW,
-    *                . InstanceStateMask: ALIVE or NOT_ALIVE,
-    *                . Through the query (if any) of the Reader associated to the port,
-    *                . Within the time limit specified in time_out.
-    *
-    *               All methods return a boolean as result indicating whether actual data
-    *               are provided (TRUE) or if the time-out occurred (FALSE).
-    */
-    template <typename GETTER_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    class Getter_Base_T :
-        public virtual GETTER_TYPE,
-        public virtual LocalObject,
-        private virtual ACE_Copy_Disabled
-    {
-    public:
-      /// Constructor
-      Getter_Base_T (void);
-
-      /// Destructor
-      virtual ~Getter_Base_T (void);
-
-      /**
-        *  Spec : get_many returns all the available samples
-        *         in the limits set by the attribute max_delivered_data.
-        *         In case there are more available samples, the first
-        *         max_delivered_data are returned. The default value for
-        *         that attribute is UNLIMITED (0)
-        */
-      virtual bool get_many (
-        SEQ_VALUE_TYPE& instances,
-        ::CCM_DDS::ReadInfoSeq& infos);
-
-      /**
-        * @name time_out
-        * Accessors for time_out
-        */
-      //@{
-      virtual ::DDS::Duration_t time_out (void);
-      virtual void time_out (const ::DDS::Duration_t & time_out);
-      //@}
-
-      /**
-        * @name max_delivered_data
-        * Accessors for max_delivered_data
-        */
-      //@{
-      virtual ::CCM_DDS::DataNumber_t max_delivered_data (void);
-      virtual void max_delivered_data (
-        ::CCM_DDS::DataNumber_t max_delivered_data);
-      //@}
-
-      /**
-        * Set the actual pointer to DDS Datareader
-        */
-      void set_dds_reader (::DDS::DataReader_ptr reader,
-                           ::CIAO::DDS4CCM::ConditionManager * condition_manager);
-      ::DDS::DataReader_ptr get_dds_reader (void);
-    protected:
-      typename TYPED_DDS_READER::_var_type dds_reader_;
-      ::CIAO::DDS4CCM::ConditionManager * condition_manager_;
-
-      ::DDS::Duration_t time_out_;
-      ::CCM_DDS::DataNumber_t max_delivered_data_;
-
-      typename TYPED_DDS_READER::_ptr_type dds_reader (void);
-
-      /**
-        * @name get
-        *
-        * Generic helper methods which perform the actual
-        * DDS reading.
-        */
-      //@{
-      ::DDS::ReturnCode_t get (SEQ_VALUE_TYPE& data,
-                                ::DDS::SampleInfoSeq & sample_info,
-                                const ::CORBA::Long & max_samples);
-      ::DDS::ReturnCode_t get (
-        SEQ_VALUE_TYPE& data,
-        ::DDS::SampleInfoSeq & sample_info,
-        const ::CORBA::Long & max_samples,
-        ::DDS::QueryCondition_ptr qc);
-
-      ::DDS::ReturnCode_t get (
-        SEQ_VALUE_TYPE & data,
-        ::DDS::SampleInfoSeq & sample_info,
-        const ::CORBA::Long & max_samples,
-        ::DDS::ReadCondition_ptr rd);
-      //@}
-    };
-
-    template <typename GETTER_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE, bool FIXED>
-    class Getter_T;
-
-    /**
-      * @brief Implementation of the Getter port for variable sized data types.
-      */
-    template <typename GETTER_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    class Getter_T <GETTER_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE, false> :
-      public Getter_Base_T <GETTER_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>
-    {
-    public:
-      /**
-      *
-      * @brief  get_one implementation for variable sized datatypes.
-      *
-      *         Spec : get_one returns the next sample to be gotten.
-      *
-      * @retval false When 'wait' times out or when no valid data could be read
-      * from DDS.
-      * @retval true When 'wait' is triggered.
-      */
-      virtual bool get_one (
-        typename VALUE_TYPE::_out_type an_instance,
-        ::CCM_DDS::ReadInfo_out info);
-    };
-
-    /**
-    * @brief Implementation of the Getter port for fixed sized data types.
-    *
-    */
-    template <typename GETTER_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    class Getter_T <GETTER_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE, true> :
-      public Getter_Base_T <GETTER_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>
-    {
-    public:
-      /**
-      * @brief  get_one implementation for fixed sized datatypes.
-      *
-      *         Spec : get_one returns the next sample to be gotten.
-      *
-      * @retval false When 'wait' times out or when no valid data could be read
-      * from DDS.
-      * @retval true When 'wait' is triggered.
-      */
-      virtual bool get_one (
-        typename VALUE_TYPE::_out_type an_instance,
-        ::CCM_DDS::ReadInfo_out info);
-    };
-  }
-}
-
-#include "dds4ccm/impl/Getter_T.cpp"
-
-#endif /* GETTER_T_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/InstanceHandleManager_T.cpp b/CIAO/connectors/dds4ccm/impl/InstanceHandleManager_T.cpp
deleted file mode 100644
index 4dbe6e8780b..00000000000
--- a/CIAO/connectors/dds4ccm/impl/InstanceHandleManager_T.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-#include "dds4ccm/impl/Utils.h"
-#include "dds4ccm/impl/logger/Log_Macros.h"
-#include "CCM_DataReader.h"
-
-namespace CIAO
-{
-  namespace DDS4CCM
-  {
-    template <typename BASE_TYPE, typename WRITER_TYPE, typename VALUE_TYPE>
-    InstanceHandleManager_T<BASE_TYPE, WRITER_TYPE, VALUE_TYPE>::InstanceHandleManager_T (void)
-    {
-    }
-
-    template <typename BASE_TYPE, typename WRITER_TYPE, typename VALUE_TYPE>
-    InstanceHandleManager_T<BASE_TYPE, WRITER_TYPE, VALUE_TYPE>::~InstanceHandleManager_T (void)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::InstanceHandleManager_T::~InstanceHandleManager_T");
-    }
-
-    template <typename BASE_TYPE, typename WRITER_TYPE, typename VALUE_TYPE>
-    typename WRITER_TYPE::_ptr_type
-    InstanceHandleManager_T<BASE_TYPE, WRITER_TYPE, VALUE_TYPE>::dds_writer (void)
-    {
-      if (!::CORBA::is_nil (this->dds_writer_.in ()))
-        {
-          return this->dds_writer_.in ();
-        }
-      else
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        "InstanceHandleManager_T::dds_writer - "
-                        "Throwing BAD_INV_ORDER.\n"));
-          throw ::CORBA::BAD_INV_ORDER ();
-        }
-    }
-
-    template <typename BASE_TYPE, typename WRITER_TYPE, typename VALUE_TYPE>
-    ::DDS::InstanceHandle_t
-    InstanceHandleManager_T<BASE_TYPE, WRITER_TYPE, VALUE_TYPE>::register_instance (const VALUE_TYPE& datum)
-    {
-      return this->dds_writer ()->register_instance (datum);
-    }
-
-    template <typename BASE_TYPE, typename WRITER_TYPE, typename VALUE_TYPE>
-    void
-    InstanceHandleManager_T<BASE_TYPE, WRITER_TYPE, VALUE_TYPE>::unregister_instance (
-      const VALUE_TYPE& datum,
-      DDS_INSTANCE_HANDLE_T_IN instance_handle)
-    {
-      this->dds_writer ()->unregister_instance (datum, instance_handle);
-    }
-
-    template <typename BASE_TYPE, typename WRITER_TYPE, typename VALUE_TYPE>
-    void
-    InstanceHandleManager_T<BASE_TYPE, WRITER_TYPE, VALUE_TYPE>::set_dds_writer (
-      ::DDS::DataWriter_ptr dds_writer)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::InstanceHandleManager_T::set_dds_writer");
-
-      this->dds_writer_ = WRITER_TYPE::_narrow (dds_writer);
-
-      if (!::CORBA::is_nil (dds_writer) && ::CORBA::is_nil (this->dds_writer_.in ()))
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        "InstanceHandleManager_T::set_dds_writer - "
-                        "narrow failed.\n"));
-          throw ::CORBA::INTERNAL ();
-        }
-    }
-
-    template <typename BASE_TYPE, typename WRITER_TYPE, typename VALUE_TYPE>
-    ::DDS::DataWriter_ptr
-     InstanceHandleManager_T<BASE_TYPE, WRITER_TYPE, VALUE_TYPE>::get_dds_writer (void)
-     {
-      return ::DDS::DataWriter::_duplicate (this->dds_writer_.in ());
-     }
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/impl/InstanceHandleManager_T.h b/CIAO/connectors/dds4ccm/impl/InstanceHandleManager_T.h
deleted file mode 100644
index 8c4470c0299..00000000000
--- a/CIAO/connectors/dds4ccm/impl/InstanceHandleManager_T.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef INSTANCEHANDLEMANGER_T_H_
-#define INSTANCEHANDLEMANGER_T_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "dds4ccm/impl/LocalObject.h"
-#include "dds4ccm/impl/LocalObject_T.h"
-#include "ace/Copy_Disabled.h"
-
-namespace CIAO
-{
-  namespace DDS4CCM
-  {
-    template <typename BASE_TYPE, typename WRITER_TYPE, typename VALUE_TYPE>
-    class InstanceHandleManager_T :
-      public virtual BASE_TYPE,
-      public virtual LocalObject,
-      private virtual ACE_Copy_Disabled
-    {
-    public:
-      /// Constructor
-      InstanceHandleManager_T (void);
-
-      /// Destructor
-      virtual ~InstanceHandleManager_T (void);
-
-      virtual ::DDS::InstanceHandle_t register_instance (
-        const VALUE_TYPE& datum);
-
-      virtual void unregister_instance (
-        const VALUE_TYPE& datum,
-        DDS_INSTANCE_HANDLE_T_IN instance_handle);
-
-      void set_dds_writer (::DDS::DataWriter_ptr dds_writer);
-
-      ::DDS::DataWriter_ptr get_dds_writer (void);
-
-    protected:
-      /// This method doesn't increment the refcount, only for internal
-      /// usage
-      typename WRITER_TYPE::_ptr_type dds_writer (void);
-
-    private:
-      typename WRITER_TYPE::_var_type dds_writer_;
-    };
-  }
-}
-
-#include "dds4ccm/impl/InstanceHandleManager_T.cpp"
-
-#endif /* INSTANCEHANDLEMANGER_T_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/LocalObject.cpp b/CIAO/connectors/dds4ccm/impl/LocalObject.cpp
deleted file mode 100644
index 5e670f775b2..00000000000
--- a/CIAO/connectors/dds4ccm/impl/LocalObject.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-#include "dds4ccm/impl/LocalObject.h"
-
-namespace CIAO
-{
-  namespace DDS4CCM
-  {
-    LocalObject::LocalObject (void)
-    {
-    }
-
-    LocalObject::~LocalObject (void)
-    {
-    }
-
-    ::CORBA::Object_ptr
-    LocalObject::_get_component (void)
-    {
-      return CORBA::Object::_duplicate (this->component_.in ());
-    }
-
-    void
-    LocalObject::_set_component (::CORBA::Object_ptr component)
-    {
-      this->component_ = ::CORBA::Object::_duplicate (component);
-    }
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/impl/LocalObject.h b/CIAO/connectors/dds4ccm/impl/LocalObject.h
deleted file mode 100644
index 0818037c712..00000000000
--- a/CIAO/connectors/dds4ccm/impl/LocalObject.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// -*- C++ -*-
-#ifndef DDS4CCM_LOCALOBJECT_H_
-#define DDS4CCM_LOCALOBJECT_H_
-
-#include "tao/LocalObject.h"
-#include "dds4ccm/impl/dds4ccm_dds_impl_export.h"
-
-namespace CIAO
-{
-  namespace DDS4CCM
-  {
-    /**
-     * Base class for all DDS4CCM local facets. It stores
-     * an object reference to the component this local
-     * facet belongs too.
-     */
-    class DDS4CCM_DDS_IMPL_Export LocalObject
-      : public virtual ::CORBA::LocalObject
-    {
-    public:
-      LocalObject (void);
-      virtual ~LocalObject (void);
-
-      void _set_component (::CORBA::Object_ptr component);
-      virtual ::CORBA::Object_ptr _get_component (void);
-
-    private:
-      ::CORBA::Object_var component_;
-    };
-  }
-}
-
-#endif /* DDS4CCM_LOCALOBJECT_T_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/LocalObject_T.cpp b/CIAO/connectors/dds4ccm/impl/LocalObject_T.cpp
deleted file mode 100644
index 02ff07683ce..00000000000
--- a/CIAO/connectors/dds4ccm/impl/LocalObject_T.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-namespace CIAO
-{
-  namespace DDS4CCM
-  {
-    template <typename LOCAL_OBJECT>
-    LocalObject_Auto_Ptr_T<LOCAL_OBJECT>::LocalObject_Auto_Ptr_T (void) : l (new LOCAL_OBJECT)
-    {
-    }
-
-    template <typename LOCAL_OBJECT>
-    LocalObject_Auto_Ptr_T<LOCAL_OBJECT>::~LocalObject_Auto_Ptr_T (void)
-    {
-      ::CORBA::release (l);
-    }
-
-    template <typename LOCAL_OBJECT>
-    LocalObject_Auto_Ptr_T<LOCAL_OBJECT>::LocalObject_Auto_Ptr_T (LOCAL_OBJECT* lobject)
-      : l (lobject)
-    {
-    }
-
-    template <typename LOCAL_OBJECT>
-    LOCAL_OBJECT*
-    LocalObject_Auto_Ptr_T<LOCAL_OBJECT>::operator-> (void) const
-    {
-      return this->l;
-    }
-
-    template <typename LOCAL_OBJECT>
-    LocalObject_Auto_Ptr_T<LOCAL_OBJECT>::operator LOCAL_OBJECT *& (void)
-    {
-      return this->l;
-    }
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/impl/LocalObject_T.h b/CIAO/connectors/dds4ccm/impl/LocalObject_T.h
deleted file mode 100644
index fb367ee4917..00000000000
--- a/CIAO/connectors/dds4ccm/impl/LocalObject_T.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// -*- C++ -*-
-#ifndef DDS4CCM_LOCALOBJECT_T_H_
-#define DDS4CCM_LOCALOBJECT_T_H_
-
-#include "ace/Copy_Disabled.h"
-
-namespace CIAO
-{
-  namespace DDS4CCM
-  {
-    /**
-     * Helper template that allocates a new LOCAL_OBJECT from the heap and that
-     * makes sure we call ::CORBA::release() at destruction
-     */
-    template <typename LOCAL_OBJECT>
-    class LocalObject_Auto_Ptr_T : private ACE_Copy_Disabled
-    {
-    public:
-      LocalObject_Auto_Ptr_T (void);
-
-      ~LocalObject_Auto_Ptr_T (void);
-
-      explicit LocalObject_Auto_Ptr_T (LOCAL_OBJECT* lobject);
-
-      LOCAL_OBJECT* operator-> (void) const;
-
-      operator LOCAL_OBJECT *& (void);
-    private:
-      LOCAL_OBJECT* l;
-    };
-  }
-}
-
-#include "dds4ccm/impl/LocalObject_T.cpp"
-
-#endif /* DDS4CCM_LOCALOBJECT_T_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/PortStatusListener.cpp b/CIAO/connectors/dds4ccm/impl/PortStatusListener.cpp
deleted file mode 100644
index 66c8808f062..00000000000
--- a/CIAO/connectors/dds4ccm/impl/PortStatusListener.cpp
+++ /dev/null
@@ -1,233 +0,0 @@
-#include "dds4ccm/impl/PortStatusListener.h"
-#include "dds4ccm/impl/Utils.h"
-#include "dds4ccm/impl/logger/Log_Macros.h"
-#include "dds4ccm/impl/DDSCallbackStatusHandler.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO
-{
-  namespace DDS4CCM
-  {
-    PortStatusListener::PortStatusListener (
-        ::CCM_DDS::PortStatusListener_ptr port_status_listener,
-         ACE_Reactor* reactor)
-    : port_status_listener_ (::CCM_DDS::PortStatusListener::_duplicate (port_status_listener)),
-      reactor_ (reactor)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::PortStatusListener::PortStatusListener");
-    }
-
-    PortStatusListener::~PortStatusListener (void)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::PortStatusListener::~PortStatusListener");
-    }
-
-    void
-    PortStatusListener::on_requested_deadline_missed (
-        ::DDS::DataReader_ptr the_reader,
-         const ::DDS::RequestedDeadlineMissedStatus & status)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::PortStatusListener::on_requested_deadline_missed");
-
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, DDS4CCM_INFO
-          ACE_TEXT ("PortStatusListener::on_requested_deadline_missed: ")
-          ACE_TEXT ("total count <%d> - total change <%d> - ")
-          ACE_TEXT ("last instance") DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER
-          ACE_TEXT ("\n"),
-          status.total_count, status.total_count_change,
-          DDS_INSTANCE_HANDLE_LOG (status.last_instance_handle)));
-
-      if (! ::CORBA::is_nil (this->port_status_listener_))
-        {
-          try
-            {
-              if (this->reactor_)
-                {
-                  ::CIAO::DDS4CCM::OnRequestedDeadlineMissedHandler* rh = 0;
-                  ACE_NEW (rh,
-                      ::CIAO::DDS4CCM::OnRequestedDeadlineMissedHandler (
-                            this->port_status_listener_.in (), the_reader, status));
-                  ACE_Event_Handler_var safe_handler (rh);
-                  if (this->reactor_->notify (rh) != 0)
-                    {
-                      DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                          ACE_TEXT ("PortStatusListener::on_requested_deadline_missed: ")
-                          ACE_TEXT ("failed to use reactor.\n")));
-                    }
-                }
-              else
-                {
-                  this->port_status_listener_->on_requested_deadline_missed (the_reader, status);
-                }
-            }
-          catch (const ::CORBA::BAD_INV_ORDER& ex)
-            {
-              DDS4CCM_PRINT_DEBUG_CORBA_EXCEPTION (
-                                      DDS4CCM_LOG_LEVEL_ACTION,
-                                      ex,
-                                      "PortStatusListener::on_requested_deadline_missed");
-            }
-          catch (const ::CORBA::Exception& ex)
-            {
-              DDS4CCM_PRINT_CORBA_EXCEPTION (
-                  DDS4CCM_LOG_LEVEL_ERROR,
-                  ex,
-                  "PortStatusListener::on_requested_deadline_missed");
-            }
-          catch (...)
-            {
-              DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                  "PortStatusListener::on_requested_deadline_missed - "
-                  "Unexpected exception caught\n"));
-            }
-        }
-      else
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-              ACE_TEXT ("PortStatusListener::on_requested_deadline_missed: ")
-          ACE_TEXT ("No portstatus listener installed\n")));
-        }
-    }
-
-    void
-    PortStatusListener::on_sample_lost (
-        ::DDS::DataReader_ptr the_reader,
-         const ::DDS::SampleLostStatus & status)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::PortStatusListener::on_sample_lost");
-
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, DDS4CCM_INFO
-          ACE_TEXT ("PortStatusListener::on_sample_lost: ")
-      ACE_TEXT ("total count <%d> - total change <%d>\n"),
-      status.total_count, status.total_count_change));
-
-      if (! ::CORBA::is_nil (this->port_status_listener_.in ()))
-        {
-          try
-            {
-              if (this->reactor_)
-                {
-                  ::CIAO::DDS4CCM::OnSampleLostHandler* rh = 0;
-                  ACE_NEW (rh,
-                      ::CIAO::DDS4CCM::OnSampleLostHandler (
-                          this->port_status_listener_.in (),
-                          the_reader,
-                          status));
-                  ACE_Event_Handler_var safe_handler (rh);
-                  if (this->reactor_->notify (rh) != 0)
-                    {
-                      DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                          ACE_TEXT ("PortStatusListener::on_sample_lost: ")
-                      ACE_TEXT ("failed to use reactor.\n")));
-                    }
-                }
-              else
-                {
-                  this->port_status_listener_->on_sample_lost (the_reader, status);
-                }
-            }
-          catch (const ::CORBA::BAD_INV_ORDER& ex)
-            {
-              DDS4CCM_PRINT_DEBUG_CORBA_EXCEPTION (
-                                      DDS4CCM_LOG_LEVEL_ACTION,
-                                      ex,
-                                      "PortStatusListener::on_sample_lost");
-            }
-          catch (const ::CORBA::Exception& ex)
-            {
-              DDS4CCM_PRINT_CORBA_EXCEPTION (
-                  DDS4CCM_LOG_LEVEL_ERROR,
-                  ex,
-                  "PortStatusListener::on_sample_lost");
-            }
-          catch (...)
-            {
-              DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                  "PortStatusListener::on_sample_lost - "
-                  "Unexpected exception caught\n"));
-            }
-        }
-      else
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG,
-              ACE_TEXT ("PortStatusListener::on_sample_lost: ")
-              ACE_TEXT ("No portstatus listener installed\n")));
-        }
-    }
-
-    void
-    PortStatusListener::on_requested_incompatible_qos (
-        ::DDS::DataReader_ptr ,
-         const ::DDS::RequestedIncompatibleQosStatus & )
-    {
-      DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-          "PortStatusListener::on_requested_incompatible_qos - "
-          "Unexpected callback occurred\n"));
-    }
-
-    void
-    PortStatusListener::on_sample_rejected (
-        ::DDS::DataReader_ptr ,
-         const ::DDS::SampleRejectedStatus & )
-    {
-      DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-          "PortStatusListener::on_sample_rejected - "
-          "Unexpected callback occurred\n"));
-    }
-
-    void
-    PortStatusListener::on_liveliness_changed (
-        ::DDS::DataReader_ptr ,
-         const ::DDS::LivelinessChangedStatus & )
-    {
-      DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-          "PortStatusListener::on_liveliness_changed - "
-          "Unexpected callback occurred\n"));
-    }
-
-    void
-    PortStatusListener::on_data_available (::DDS::DataReader_ptr )
-    {
-      DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-          "PortStatusListener::on_data_available - "
-          "Unexpected callback occurred\n"));
-    }
-
-    void
-    PortStatusListener::on_subscription_matched (
-        ::DDS::DataReader_ptr ,
-         const ::DDS::SubscriptionMatchedStatus & )
-    {
-      DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-          "PortStatusListener::on_subscription_matched - "
-          "Unexpected callback occurred\n"));
-    }
-
-    ::DDS::StatusMask
-    PortStatusListener::get_mask (
-         ::CCM_DDS::PortStatusListener_ptr psl)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::PortStatusListener::get_mask");
-
-      ::DDS::StatusMask mask = 0;
-      if (! ::CORBA::is_nil (psl) ||
-          DDS4CCM_debug_level >= DDS4CCM_LOG_LEVEL_DDS_STATUS)
-        {
-          mask = ::DDS::REQUESTED_DEADLINE_MISSED_STATUS |
-                 ::DDS::SAMPLE_LOST_STATUS;
-        }
-
-      if (DDS4CCM_debug_level >= DDS4CCM_LOG_LEVEL_DDS_STATUS)
-        {
-          ACE_CString msk;
-          translate_statusmask (msk, mask);
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, DDS4CCM_INFO
-              "PortStatusListener::get_mask - "
-              "Mask becomes %C\n",
-              msk.c_str ()));
-        }
-      return mask;
-    }
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/impl/PortStatusListener.h b/CIAO/connectors/dds4ccm/impl/PortStatusListener.h
deleted file mode 100644
index 3fe6e1c089b..00000000000
--- a/CIAO/connectors/dds4ccm/impl/PortStatusListener.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * @author William R. Otte <wotte@dre.vanderbilt.edu>
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef PORTSTATUSLISTENER_T_H_
-#define PORTSTATUSLISTENER_T_H_
-
-#include "dds4ccm/idl/dds4ccm_PortStatusListenerC.h"
-#include "dds4ccm/impl/dds4ccm_dds_impl_export.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-class ACE_Reactor;
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-namespace CIAO
-{
-  namespace DDS4CCM
-  {
-    class DDS4CCM_DDS_IMPL_Export PortStatusListener :
-      public ::DDS::DataReaderListener
-    {
-    public:
-      /// Constructor
-      PortStatusListener (
-        ::CCM_DDS::PortStatusListener_ptr port_status_listener,
-        ACE_Reactor* reactor);
-
-      /// Destructor
-      virtual ~PortStatusListener (void);
-
-      virtual void on_requested_deadline_missed (
-        ::DDS::DataReader_ptr the_reader,
-        const ::DDS::RequestedDeadlineMissedStatus & status);
-
-      virtual void on_sample_lost (
-        ::DDS::DataReader_ptr the_reader,
-        const ::DDS::SampleLostStatus & status);
-
-      virtual void
-      on_requested_incompatible_qos (
-        ::DDS::DataReader_ptr ,
-        const ::DDS::RequestedIncompatibleQosStatus & );
-
-      virtual void
-      on_sample_rejected (
-        ::DDS::DataReader_ptr ,
-        const ::DDS::SampleRejectedStatus & );
-
-      virtual void
-      on_liveliness_changed (
-        ::DDS::DataReader_ptr ,
-        const ::DDS::LivelinessChangedStatus & );
-
-      virtual void
-      on_data_available (
-        ::DDS::DataReader_ptr );
-
-      virtual void
-      on_subscription_matched (
-        ::DDS::DataReader_ptr ,
-        const ::DDS::SubscriptionMatchedStatus & );
-
-      static ::DDS::StatusMask get_mask (
-        ::CCM_DDS::PortStatusListener_ptr psl);
-
-    private:
-      ::CCM_DDS::PortStatusListener_var port_status_listener_;
-    protected:
-      ACE_Reactor* reactor_;
-    };
-  }
-}
-
-#endif /* PORTSTATUSLISTENER_T_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/PublisherListener.cpp b/CIAO/connectors/dds4ccm/impl/PublisherListener.cpp
deleted file mode 100644
index b95d1a141ac..00000000000
--- a/CIAO/connectors/dds4ccm/impl/PublisherListener.cpp
+++ /dev/null
@@ -1,350 +0,0 @@
-#include "dds4ccm/impl/PublisherListener.h"
-#include "dds4ccm/impl/Utils.h"
-#include "dds4ccm/impl/logger/Log_Macros.h"
-#include "dds4ccm/impl/DataReaderHandler_T.h"
-#include "dds4ccm/impl/DDSCallbackStatusHandler.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO
-{
-  namespace DDS4CCM
-  {
-    PublisherListener::PublisherListener (
-      ::CCM_DDS::ConnectorStatusListener_ptr error_listener,
-      ACE_Reactor* reactor)
-          : error_listener_ (::CCM_DDS::ConnectorStatusListener::_duplicate (error_listener)),
-            reactor_ (reactor)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::PublisherListener::PublisherListener");
-    }
-
-    PublisherListener::~PublisherListener (void)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::PublisherListener::~PublisherListener");
-    }
-
-    void
-    PublisherListener::on_unexpected_status (
-      ::DDS::Entity_ptr entity,
-      ::DDS::StatusKind status_kind)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::PublisherListener::on_unexpected_status");
-
-      if (! ::CORBA::is_nil (this->error_listener_))
-        {
-          try
-            {
-              if (this->reactor_)
-                {
-                  ::CIAO::DDS4CCM::OnUnexpectedStatusHandler* rh = 0;
-                  ACE_NEW (rh,
-                          ::CIAO::DDS4CCM::OnUnexpectedStatusHandler (
-                            this->error_listener_, entity, status_kind));
-                  ACE_Event_Handler_var safe_handler (rh);
-                  if (this->reactor_->notify (rh) != 0)
-                    {
-                      DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                            ACE_TEXT ("PublisherListener::on_unexpected_status: ")
-                            ACE_TEXT ("failed to use reactor.\n")));
-                    }
-                }
-              else
-                {
-                  this->error_listener_->on_unexpected_status (entity, status_kind);
-                }
-            }
-          catch (const ::CORBA::BAD_INV_ORDER& ex)
-            {
-              DDS4CCM_PRINT_DEBUG_CORBA_EXCEPTION (
-                                      DDS4CCM_LOG_LEVEL_ACTION,
-                                      ex,
-                                      "PublisherListener::on_unexpected_status");
-            }
-          catch (const ::CORBA::Exception& ex)
-            {
-              DDS4CCM_PRINT_CORBA_EXCEPTION (
-                                      DDS4CCM_LOG_LEVEL_ERROR,
-                                      ex,
-                                      "PublisherListener::on_unexpected_status");
-            }
-          catch (...)
-            {
-              DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                "PublisherListener::on_unexpected_status - "
-                "Unexpected exception caught for <%C>\n",
-                translate_statuskind (status_kind)));
-            }
-        }
-      else
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                        ACE_TEXT ("PublisherListener::on_unexpected_status: ")
-                        ACE_TEXT ("No error listener connected for <%C>\n"),
-                        translate_statuskind (status_kind)));
-        }
-    }
-
-    void
-    PublisherListener::on_offered_deadline_missed (
-      ::DDS::DataWriter_ptr the_Writer,
-      const ::DDS::OfferedDeadlineMissedStatus & status)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::PublisherListener::on_offered_deadline_missed");
-
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, DDS4CCM_INFO
-                    ACE_TEXT ("PublisherListener::on_offered_deadline_missed: ")
-                    ACE_TEXT ("total count <%d> - count change <%d> - ")
-                    ACE_TEXT ("last instance handle ")
-                    DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER ACE_TEXT ("\n"),
-                    status.total_count, status.total_count_change,
-                    DDS_INSTANCE_HANDLE_LOG (status.last_instance_handle)));
-
-      if (! ::CORBA::is_nil (this->error_listener_))
-        {
-          try
-            {
-              if (this->reactor_)
-                {
-                  ::CIAO::DDS4CCM::OnOfferedDeadlineMissedHandler* rh = 0;
-                  ACE_NEW (rh,
-                          ::CIAO::DDS4CCM::OnOfferedDeadlineMissedHandler (
-                            this->error_listener_, the_Writer, status));
-                  ACE_Event_Handler_var safe_handler (rh);
-                  if (this->reactor_->notify (rh) != 0)
-                    {
-                      DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                                    ACE_TEXT ("PublisherListener::on_offered_deadline_missed - ")
-                                    ACE_TEXT ("failed to use reactor.\n")));
-                    }
-                }
-              else
-                {
-                  this->error_listener_->on_offered_deadline_missed (the_Writer, status);
-                }
-            }
-          catch (const ::CORBA::BAD_INV_ORDER& ex)
-            {
-              DDS4CCM_PRINT_DEBUG_CORBA_EXCEPTION (
-                                      DDS4CCM_LOG_LEVEL_ACTION,
-                                      ex,
-                                      "PublisherListener::on_offered_deadline_missed");
-            }
-          catch (const ::CORBA::Exception& ex)
-            {
-              DDS4CCM_PRINT_CORBA_EXCEPTION (
-                                      DDS4CCM_LOG_LEVEL_ERROR,
-                                      ex,
-                                      "PublisherListener::on_offered_deadline_missed");
-            }
-          catch (...)
-            {
-              DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                "PublisherListener::on_offered_deadline_missed - "
-                "Unexpected exception caught\n"));
-            }
-        }
-      else
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                        ACE_TEXT ("PublisherListener::on_offered_deadline_missed: ")
-                        ACE_TEXT ("No error listener connected\n")));
-        }
-    }
-
-    void
-    PublisherListener::on_offered_incompatible_qos (
-      ::DDS::DataWriter_ptr the_Writer,
-      const ::DDS::OfferedIncompatibleQosStatus & status)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::PublisherListener::on_offered_incompatible_qos");
-
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, DDS4CCM_INFO
-                    ACE_TEXT ("PublisherListener::on_offered_incompatible_qos: ")
-                    ACE_TEXT ("total count <%d> - total change <%d> - ")
-                    ACE_TEXT ("last policy id <%C> - policies:\n"),
-                    status.total_count, status.total_count_change,
-                    translate_qospolicyid_t (status.last_policy_id)));
-      for (CORBA::ULong i = 0; i < status.policies.length (); ++i)
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, DDS4CCM_INFO
-                      ACE_TEXT ("\t\tid <%C> - count <%d>\n"),
-                      translate_qospolicyid_t (status.policies[i].policy_id),
-                      status.policies[i].count));
-        }
-
-      if (! ::CORBA::is_nil (this->error_listener_))
-        {
-          try
-            {
-              if (this->reactor_)
-                {
-                  ::CIAO::DDS4CCM::OnOfferedIncompatibleQoSHandler* rh = 0;
-                  ACE_NEW (rh,
-                          ::CIAO::DDS4CCM::OnOfferedIncompatibleQoSHandler (
-                            this->error_listener_, the_Writer, status));
-                  ACE_Event_Handler_var safe_handler (rh);
-                  if (this->reactor_->notify (rh) != 0)
-                    {
-                      DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                                    ACE_TEXT ("PublisherListener::on_offered_incompatible_qos - ")
-                                    ACE_TEXT ("failed to use reactor.\n")));
-                    }
-                }
-              else
-                {
-                  this->error_listener_->on_offered_incompatible_qos (the_Writer, status);
-                }
-            }
-          catch (const ::CORBA::BAD_INV_ORDER& ex)
-            {
-              DDS4CCM_PRINT_DEBUG_CORBA_EXCEPTION (
-                                      DDS4CCM_LOG_LEVEL_ACTION,
-                                      ex,
-                                      "PublisherListener::on_offered_incompatible_qos");
-            }
-          catch (const ::CORBA::Exception& ex)
-            {
-              DDS4CCM_PRINT_CORBA_EXCEPTION (
-                                      DDS4CCM_LOG_LEVEL_ERROR,
-                                      ex,
-                                      "PublisherListener::on_offered_incompatible_qos");
-            }
-          catch (...)
-            {
-              DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                "PublisherListener::on_offered_incompatible_qos - "
-                "Unexpected exception caught\n"));
-            }
-        }
-      else
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                        ACE_TEXT ("PublisherListener::on_offered_incompatible_qos - ")
-                        ACE_TEXT ("No error listener connected\n")));
-        }
-    }
-
-    void
-    PublisherListener::on_liveliness_lost (
-      ::DDS::DataWriter_ptr the_Writer,
-      const ::DDS::LivelinessLostStatus & status)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::PublisherListener::on_liveliness_lost");
-
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, DDS4CCM_INFO
-                    ACE_TEXT ("PublisherListener::on_liveliness_lost: ")
-                    ACE_TEXT ("total count <%d> - count change <%d>\n"),
-                    status.total_count, status.total_count_change));
-
-      this->on_unexpected_status (the_Writer, ::DDS::LIVELINESS_LOST_STATUS);
-    }
-
-    void
-    PublisherListener::on_publication_matched (
-      ::DDS::DataWriter_ptr the_Writer,
-      const ::DDS::PublicationMatchedStatus & status)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::PublisherListener::on_publication_matched");
-
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, DDS4CCM_INFO
-                    ACE_TEXT ("PublisherListener::on_publication_matched: ")
-                    ACE_TEXT ("total count <%d> - count change <%d> - ")
-                    ACE_TEXT ("current count <%d> - current count change <%d> ")
-                    ACE_TEXT ("last publication handle ")
-                    DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER ACE_TEXT ("\n"),
-                    status.total_count, status.total_count_change,
-                    status.current_count, status.current_count_change,
-                    DDS_INSTANCE_HANDLE_LOG (status.last_subscription_handle)));
-
-      this->on_unexpected_status (the_Writer, ::DDS::PUBLICATION_MATCHED_STATUS);
-    }
-
-    #if (CIAO_DDS4CCM_NDDS==1)
-    void
-    PublisherListener::on_reliable_writer_cache_changed (
-      ::DDS::DataWriter_ptr the_Writer,
-      const ::DDS::ReliableWriterCacheChangedStatus & status)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::PublisherListener::on_reliable_writer_cache_changed");
-
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, DDS4CCM_INFO
-                    ACE_TEXT ("PublisherListener::on_reliable_writer_cache_changed: ")
-                    ACE_TEXT ("empty_reliable_writer_cache.total_count <%d> - ")
-                    ACE_TEXT ("empty_reliable_writer_cache.total_count_change <%d> - ")
-                    ACE_TEXT ("full_reliable_writer_cache.total_count <%d> - ")
-                    ACE_TEXT ("full_reliable_writer_cache.total_count_change <%d> - ")
-                    ACE_TEXT ("low_watermark_reliable_writer_cache.total_count <%d> - ")
-                    ACE_TEXT ("low_watermark_reliable_writer_cache.total_count_change <%d> - ")
-                    ACE_TEXT ("high_watermark_reliable_writer_cache.total_count <%d> - ")
-                    ACE_TEXT ("high_watermark_reliable_writer_cache.total_count_change <%d> - ")
-                    ACE_TEXT ("unacknowledged_sample_count <%d> - ")
-                    ACE_TEXT ("unacknowledged_sample_count_peak <%d>\n"),
-                    status.empty_reliable_writer_cache.total_count,
-                    status.empty_reliable_writer_cache.total_count_change,
-                    status.full_reliable_writer_cache.total_count,
-                    status.full_reliable_writer_cache.total_count_change,
-                    status.low_watermark_reliable_writer_cache.total_count,
-                    status.low_watermark_reliable_writer_cache.total_count_change,
-                    status.high_watermark_reliable_writer_cache.total_count,
-                    status.high_watermark_reliable_writer_cache.total_count_change,
-                    status.unacknowledged_sample_count,
-                    status.unacknowledged_sample_count_peak));
-
-      this->on_unexpected_status (the_Writer, ::DDS::RELIABLE_WRITER_CACHE_CHANGED_STATUS);
-    }
-
-    void
-    PublisherListener::on_reliable_reader_activity_changed (
-      ::DDS::DataWriter_ptr the_Writer,
-      const ::DDS::ReliableReaderActivityChangedStatus & status)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::PublisherListener::on_reliable_reader_activity_changed");
-
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, DDS4CCM_INFO
-                    ACE_TEXT ("PublisherListener::on_reliable_reader_activity_changed: ")
-                    ACE_TEXT ("active count <%d> - active change <%d> - ")
-                    ACE_TEXT ("not active count <%d> - inactive count change <%d>")
-                    ACE_TEXT ("last instance handle ")
-                    DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER ACE_TEXT("\n"),
-                    status.active_count, status.active_count_change,
-                    status.inactive_count, status.inactive_count_change,
-                    DDS_INSTANCE_HANDLE_LOG(status.last_instance_handle)));
-
-      this->on_unexpected_status (the_Writer, ::DDS::RELIABLE_READER_ACTIVITY_CHANGED_STATUS);
-    }
-    #endif
-
-    ::DDS::StatusMask
-    PublisherListener::get_mask (
-      ::CCM_DDS::ConnectorStatusListener_ptr error_listener)
-    {
-      ::DDS::StatusMask mask = 0;
-
-      if (! ::CORBA::is_nil (error_listener) ||
-          DDS4CCM_debug_level >= DDS4CCM_LOG_LEVEL_DDS_STATUS)
-        {
-          mask = ::DDS::OFFERED_DEADLINE_MISSED_STATUS |
-                 ::DDS::OFFERED_INCOMPATIBLE_QOS_STATUS |
-    #if (CIAO_DDS4CCM_NDDS==1)
-                 ::DDS::RELIABLE_WRITER_CACHE_CHANGED_STATUS |
-                 ::DDS::RELIABLE_READER_ACTIVITY_CHANGED_STATUS |
-    #endif
-                 ::DDS::LIVELINESS_LOST_STATUS |
-                 ::DDS::PUBLICATION_MATCHED_STATUS;
-        }
-
-      if (DDS4CCM_debug_level >= DDS4CCM_LOG_LEVEL_DDS_STATUS)
-        {
-          ACE_CString msk;
-          translate_statusmask (msk, mask);
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, DDS4CCM_INFO
-                        "PublisherListener::get_mask - "
-                        "Mask becomes %C\n",
-                        msk.c_str ()));
-        }
-      return mask;
-    }
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/impl/PublisherListener.h b/CIAO/connectors/dds4ccm/impl/PublisherListener.h
deleted file mode 100644
index be265f12591..00000000000
--- a/CIAO/connectors/dds4ccm/impl/PublisherListener.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * @author William R. Otte <wotte@dre.vanderbilt.edu>
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef PUBLISHERLISTENER_T_H_
-#define PUBLISHERLISTENER_T_H_
-
-#include "dds4ccm/idl/dds4ccm_ConnectorStatusListenerC.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-#include "dds4ccm/impl/dds4ccm_dds_impl_export.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-class ACE_Reactor;
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-namespace CIAO
-{
-  namespace DDS4CCM
-  {
-    class DDS4CCM_DDS_IMPL_Export PublisherListener :
-      public ::DDS::PublisherListener
-    {
-    public:
-      /// Constructor
-      PublisherListener (
-        ::CCM_DDS::ConnectorStatusListener_ptr error_listener,
-        ACE_Reactor* reactor);
-
-      /// Destructor
-      virtual ~PublisherListener (void);
-
-      virtual void on_offered_deadline_missed (
-        ::DDS::DataWriter_ptr the_Writer,
-        const ::DDS::OfferedDeadlineMissedStatus & status);
-
-      virtual void on_liveliness_lost (
-        ::DDS::DataWriter_ptr the_Writer,
-        const ::DDS::LivelinessLostStatus & status);
-
-      virtual void on_offered_incompatible_qos (
-        ::DDS::DataWriter_ptr the_Writer,
-        const ::DDS::OfferedIncompatibleQosStatus & status);
-
-      virtual void on_publication_matched (
-        ::DDS::DataWriter_ptr the_Writer,
-        const ::DDS::PublicationMatchedStatus & status);
-
-#if (CIAO_DDS4CCM_NDDS==1)
-      virtual void on_reliable_writer_cache_changed (
-        ::DDS::DataWriter_ptr the_writer,
-        const ::DDS::ReliableWriterCacheChangedStatus & status);
-
-      virtual void on_reliable_reader_activity_changed (
-        ::DDS::DataWriter_ptr the_Writer,
-        const ::DDS::ReliableReaderActivityChangedStatus & status);
-#endif
-
-      static ::DDS::StatusMask get_mask (
-        ::CCM_DDS::ConnectorStatusListener_ptr error_listener);
-
-    private:
-      virtual void on_unexpected_status (
-        ::DDS::Entity_ptr entity,
-        ::DDS::StatusKind status_kind);
-
-      ::CCM_DDS::ConnectorStatusListener_var error_listener_;
-
-      ACE_Reactor* reactor_;
-    };
-  }
-}
-
-#endif /* PUBLISHERLISTENER_T_H_ */
-
diff --git a/CIAO/connectors/dds4ccm/impl/Reader_T.cpp b/CIAO/connectors/dds4ccm/impl/Reader_T.cpp
deleted file mode 100644
index 70ce29db2d4..00000000000
--- a/CIAO/connectors/dds4ccm/impl/Reader_T.cpp
+++ /dev/null
@@ -1,385 +0,0 @@
-// #include "dds4ccm/impl/Utils.h"
-
-#include "dds4ccm/impl/logger/Log_Macros.h"
-#include "dds4ccm/impl/SampleInfo.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-namespace CIAO
-{
-  namespace DDS4CCM
-  {
-    template <typename READER_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    Reader_T<READER_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::Reader_T (void)
-      : condition_manager_ (0)
-    {
-      DDS4CCM_TRACE ("Reader_T::Reader_T");
-    }
-
-    template <typename READER_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    Reader_T<READER_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::~Reader_T (void)
-    {
-      DDS4CCM_TRACE ("Reader_T::~Reader_T");
-    }
-
-    template <typename READER_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    ::DDS::InstanceHandle_t
-    Reader_T<READER_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::check_handle (
-      const VALUE_TYPE& an_instance,
-      DDS_INSTANCE_HANDLE_T_IN instance_handle)
-    {
-      DDS4CCM_TRACE ("Reader_T::check_handle");
-
-      ::DDS::InstanceHandle_t const lookup_hnd =
-          this->dds_reader ()->lookup_instance (an_instance);
-
-      return this->condition_manager_->check_handle (instance_handle,
-                                                     lookup_hnd);
-    }
-
-    template <typename READER_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    CORBA::ULong
-    Reader_T<READER_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::get_nr_valid_samples (
-      const ::DDS::SampleInfoSeq& sample_infos,
-      const bool determine_last)
-    {
-      DDS4CCM_TRACE ("Reader_T::get_nr_valid_samples");
-
-      CORBA::ULong nr_of_samples = 0;
-      if (determine_last)
-        {
-          for (::CORBA::ULong i = 0 ; i < sample_infos.length(); ++i)
-            {
-              if (sample_infos[i].valid_data &&
-                  sample_infos[i].sample_rank == 0)
-                {
-                  ++nr_of_samples;
-                }
-            }
-        }
-      else
-        {
-          for (::CORBA::ULong i = 0 ; i < sample_infos.length(); ++i)
-            {
-              if (sample_infos[i].valid_data)
-                {
-                  ++nr_of_samples;
-                }
-            }
-        }
-      return nr_of_samples;
-    }
-
-    template <typename READER_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    void
-    Reader_T<READER_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::convert_data (
-      const SEQ_VALUE_TYPE & all_data,
-      SEQ_VALUE_TYPE & data_to_return,
-      ::CCM_DDS::ReadInfoSeq& infos,
-      const ::DDS::SampleInfoSeq & sample_info)
-    {
-      DDS4CCM_TRACE ("Reader_T::convert_data");
-
-      CORBA::ULong samples_to_return = this->get_nr_valid_samples (sample_info,
-                                                                    false);
-      infos.length (samples_to_return);
-      data_to_return.length (samples_to_return);
-
-      CORBA::ULong ix = 0;
-      for (::CORBA::ULong i = 0 ; i < sample_info.length(); ++i)
-        {
-          if (sample_info[i].valid_data)
-            {
-              infos[ix] <<= sample_info[i];
-              data_to_return[ix] = all_data[i];
-              ++ix;
-            }
-        }
-    }
-
-    template <typename READER_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    void
-    Reader_T<READER_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::read_w_instance (
-      SEQ_VALUE_TYPE & data,
-      ::DDS::SampleInfoSeq & sample_info,
-      DDS_INSTANCE_HANDLE_T_IN lookup_hnd)
-    {
-      DDS4CCM_TRACE ("Reader_T::read_w_instance");
-
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_INFO, DDS4CCM_INFO
-                    ACE_TEXT ("Reader_T::read_w_instance - ")
-                    ACE_TEXT ("Start reading with instance ")
-                    DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER ACE_TEXT ("\n"),
-                    DDS_INSTANCE_HANDLE_LOG (lookup_hnd)));
-      ::DDS::ReturnCode_t const retval = this->dds_reader ()->read_instance (
-                                            data,
-                                            sample_info,
-                                            ::DDS::LENGTH_UNLIMITED,
-                                            lookup_hnd,
-                                            ::DDS::READ_SAMPLE_STATE | ::DDS::NOT_READ_SAMPLE_STATE,
-                                            ::DDS::NEW_VIEW_STATE | ::DDS::NOT_NEW_VIEW_STATE,
-                                            ::DDS::ALIVE_INSTANCE_STATE);
-      if (retval != ::DDS::RETCODE_OK && retval != ::DDS::RETCODE_NO_DATA)
-        {
-          // Return the loan but don't throw an exception since an error returning
-          // the loan is less important than an error during the retrieval  of
-          // data from DDS.
-          this->return_loan (data, sample_info, false);
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        ACE_TEXT ("Reader_T::read_w_instance - ")
-                        ACE_TEXT ("retval is %C\n"),
-                        ::CIAO::DDS4CCM::translate_retcode(retval)));
-          throw ::CCM_DDS::InternalError (retval, 0);
-        }
-    }
-
-    template <typename READER_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    void
-    Reader_T<READER_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::read_wo_instance (
-      SEQ_VALUE_TYPE & data,
-      ::DDS::SampleInfoSeq & sample_info,
-      ::DDS::QueryCondition_ptr qc)
-    {
-      DDS4CCM_TRACE ("Reader_T::read_wo_instance");
-
-      ::DDS::ReturnCode_t retval = ::DDS::RETCODE_ERROR;
-
-      if (! ::CORBA::is_nil (qc))
-        {
-          retval = this->dds_reader ()->read_w_condition (
-                                                    data,
-                                                    sample_info,
-                                                    ::DDS::LENGTH_UNLIMITED,
-                                                    qc);
-        }
-      else
-        {
-          retval = this->dds_reader ()->read (
-                      data,
-                      sample_info,
-                      ::DDS::LENGTH_UNLIMITED,
-                      ::DDS::READ_SAMPLE_STATE | ::DDS::NOT_READ_SAMPLE_STATE,
-                      ::DDS::NEW_VIEW_STATE | ::DDS::NOT_NEW_VIEW_STATE,
-                      ::DDS::ALIVE_INSTANCE_STATE);
-        }
-      if (retval != ::DDS::RETCODE_OK && retval != ::DDS::RETCODE_NO_DATA)
-        {
-          // Return the loan but don't throw an exception since an error returning
-          // the loan is less important than an error during the retrieval  of
-          // data from DDS.
-          this->return_loan (data, sample_info, false);
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        ACE_TEXT ("Reader_T::read_wo_instance - ")
-                        ACE_TEXT ("retval is %C\n"),
-                        ::CIAO::DDS4CCM::translate_retcode(retval)));
-          throw ::CCM_DDS::InternalError (retval, 0);
-        }
-    }
-
-    template <typename READER_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    void
-    Reader_T<READER_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::return_loan (
-      SEQ_VALUE_TYPE & data,
-      ::DDS::SampleInfoSeq sample_info,
-      bool throw_exception)
-    {
-      DDS4CCM_TRACE ("Reader_T::return_loan");
-
-      // Return the loan
-      ::DDS::ReturnCode_t const retval =
-        this->dds_reader ()->return_loan (data, sample_info);
-      if (retval != ::DDS::RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        "Reader_T::return_loan - "
-                        "Error returning loan to DDS - <%C>\n",
-                        translate_retcode (retval)));
-          if (throw_exception)
-            {
-              throw ::CCM_DDS::InternalError (retval, 0);
-            }
-        }
-    }
-
-    template <typename READER_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    void
-    Reader_T<READER_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::read_last (
-      SEQ_VALUE_TYPE& instances,
-      ::CCM_DDS::ReadInfoSeq& infos)
-    {
-      DDS4CCM_TRACE ("Reader_T::read_last");
-
-      // This function has to return the last sample of all instances
-      ::DDS::SampleInfoSeq sample_info;
-      SEQ_VALUE_TYPE data;
-
-      ::DDS::QueryCondition_var qc = this->condition_manager_->get_querycondition_reader ();
-      this->read_wo_instance (data,
-                              sample_info,
-                              qc.in ());
-
-      // Determine how many samples to return
-      CORBA::ULong samples_to_return = this->get_nr_valid_samples (sample_info,
-                                                                    true);
-      infos.length (samples_to_return);
-      instances.length (samples_to_return);
-      ::CORBA::ULong ix = 0;
-      for (::CORBA::ULong i = 0 ; i < sample_info.length(); ++i)
-        {
-          if (sample_info[i].valid_data && sample_info[i].sample_rank == 0)
-            {
-              infos[ix] <<= sample_info[i];
-              instances[ix] = data[i];
-              ++ix;
-            }
-        }
-      this->return_loan (data, sample_info);
-    }
-
-    template <typename READER_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    void
-    Reader_T<READER_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::read_all (
-              SEQ_VALUE_TYPE& instances,
-              ::CCM_DDS::ReadInfoSeq& infos)
-    {
-      DDS4CCM_TRACE ("Reader_T::read_all");
-
-      // This function has to return all samples of all instances
-      ::DDS::SampleInfoSeq sample_info;
-      SEQ_VALUE_TYPE data;
-
-      ::DDS::QueryCondition_var qc = this->condition_manager_->get_querycondition_reader ();
-      this->read_wo_instance (data,
-                              sample_info,
-                              qc.in ());
-
-      this->convert_data (data, instances, infos, sample_info);
-      this->return_loan (instances, sample_info);
-    }
-
-    template <typename READER_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    void
-    Reader_T<READER_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::read_one_last (
-      VALUE_TYPE& an_instance,
-      ::CCM_DDS::ReadInfo_out info,
-      DDS_INSTANCE_HANDLE_T_IN instance_handle)
-    {
-      DDS4CCM_TRACE ("Reader_T::read_one_last");
-
-      ::DDS::InstanceHandle_t const lookup_hnd =
-        this->check_handle (an_instance, instance_handle);
-
-      ::DDS::SampleInfoSeq sample_info;
-      SEQ_VALUE_TYPE data;
-
-      this->read_w_instance (data,
-                             sample_info,
-                             lookup_hnd);
-
-      ::CORBA::Long sample = data.length();
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_INFO, DDS4CCM_INFO
-                    ACE_TEXT ("Reader_T::read_one_last - ")
-                    ACE_TEXT ("total number of samples <%u>\n"),
-                    sample));
-      while (sample > 0 && !sample_info[sample-1].valid_data)
-        {
-          --sample;
-        }
-      if (sample > 0)
-        {
-          if (sample_info[sample-1].valid_data)
-            {
-              an_instance = data[sample-1];
-              info <<= sample_info[sample-1];
-            }
-        }
-      this->return_loan (data, sample_info);
-    }
-
-    template <typename READER_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    void
-    Reader_T<READER_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::read_one_all (
-      const VALUE_TYPE& an_instance,
-      SEQ_VALUE_TYPE& instances,
-      ::CCM_DDS::ReadInfoSeq& infos,
-      DDS_INSTANCE_HANDLE_T_IN instance_handle)
-    {
-      DDS4CCM_TRACE ("Reader_T::read_one_all");
-
-      ::DDS::InstanceHandle_t const lookup_hnd =
-        this->check_handle (an_instance, instance_handle);
-
-      ::DDS::SampleInfoSeq sample_info;
-      SEQ_VALUE_TYPE data;
-
-      this->read_w_instance (data,
-                              sample_info,
-                              lookup_hnd);
-      this->convert_data (data, instances, infos, sample_info);
-      this->return_loan (instances, sample_info);
-    }
-
-    template <typename READER_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    ::CCM_DDS::QueryFilter *
-    Reader_T<READER_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::query (void)
-    {
-      DDS4CCM_TRACE ("Reader_T::query");
-
-      return this->condition_manager_->query ();
-    }
-
-    template <typename READER_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    void
-    Reader_T<READER_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::query (
-      const ::CCM_DDS::QueryFilter & query)
-    {
-      DDS4CCM_TRACE ("Reader_T::query");
-
-      return this->condition_manager_->query (query);
-    }
-
-    template <typename READER_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    void
-    Reader_T<READER_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::set_dds_reader (
-      ::DDS::DataReader_ptr dr,
-      ConditionManager * condition_manager)
-    {
-      DDS4CCM_TRACE ("Reader_T::set_dds_reader");
-
-      this->dds_reader_ = TYPED_DDS_READER::_narrow (dr);
-      if (!::CORBA::is_nil (dr) && ::CORBA::is_nil (this->dds_reader_.in ()))
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        "Reader_T::set_dds_reader - "
-                        "narrow failed.\n"));
-          throw ::CORBA::INTERNAL ();
-        }
-      this->condition_manager_ = condition_manager;
-    }
-
-    template <typename READER_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    ::DDS::DataReader_ptr
-    Reader_T<READER_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::get_dds_reader (void)
-    {
-      DDS4CCM_TRACE ("Reader_T::get_dds_reader");
-
-      return ::DDS::DataReader::_duplicate (this->dds_reader_.in ());
-    }
-
-    template <typename READER_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    typename TYPED_DDS_READER::_ptr_type
-    Reader_T<READER_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::dds_reader (void)
-    {
-      if (! ::CORBA::is_nil (this->dds_reader_))
-        {
-          return this->dds_reader_;
-        }
-      else
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        "Reader_T::dds_reader - "
-                        "Throwing BAD_INV_ORDER.\n"));
-          throw ::CORBA::BAD_INV_ORDER ();
-        }
-    }
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/impl/Reader_T.h b/CIAO/connectors/dds4ccm/impl/Reader_T.h
deleted file mode 100644
index bde38f6ae7d..00000000000
--- a/CIAO/connectors/dds4ccm/impl/Reader_T.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
- * @author William R. Otte <wotte@dre.vanderbilt.edu>
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-#ifndef READER_T_H_
-#define READER_T_H_
-
-#include "dds4ccm/idl/ccm_ddsC.h"
-#include "ace/Copy_Disabled.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-#include "dds4ccm/impl/LocalObject.h"
-
-namespace CIAO
-{
-  namespace DDS4CCM
-  {
-    class ConditionManager;
-
-    template <typename READER_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    class Reader_T :
-        public virtual READER_TYPE,
-        public virtual LocalObject,
-        private virtual ACE_Copy_Disabled
-    {
-    public:
-      /// Constructor
-      Reader_T (void);
-
-      /// Destructor
-      virtual ~Reader_T (void);
-
-      virtual void read_last (
-        SEQ_VALUE_TYPE& instances,
-        ::CCM_DDS::ReadInfoSeq& infos);
-
-      virtual void read_all (
-        SEQ_VALUE_TYPE& instances,
-        ::CCM_DDS::ReadInfoSeq& infos);
-
-      virtual void read_one_last (
-        VALUE_TYPE& an_instance,
-        ::CCM_DDS::ReadInfo_out info,
-        DDS_INSTANCE_HANDLE_T_IN instance_handle);
-
-      virtual void read_one_all (
-        const VALUE_TYPE& an_instance,
-        SEQ_VALUE_TYPE& instances,
-        ::CCM_DDS::ReadInfoSeq& infos,
-        DDS_INSTANCE_HANDLE_T_IN instance_handle);
-
-      virtual ::CCM_DDS::QueryFilter *query (void);
-
-      virtual void query (const ::CCM_DDS::QueryFilter & filter);
-
-      void set_dds_reader (::DDS::DataReader_ptr dr,
-                           ::CIAO::DDS4CCM::ConditionManager * condition_manager);
-
-      ::DDS::DataReader_ptr get_dds_reader (void);
-
-    private:
-      typename TYPED_DDS_READER::_var_type dds_reader_;
-      ::CIAO::DDS4CCM::ConditionManager * condition_manager_;
-
-      typename TYPED_DDS_READER::_ptr_type dds_reader (void);
-
-      // Helper methods
-      ::CORBA::ULong get_nr_valid_samples (
-        const ::DDS::SampleInfoSeq& sample_infos,
-        const bool determine_last);
-
-      ::DDS::InstanceHandle_t check_handle (
-        const VALUE_TYPE& an_instance,
-        DDS_INSTANCE_HANDLE_T_IN instance_handle);
-
-      void convert_data (
-        const SEQ_VALUE_TYPE& all_data,
-        SEQ_VALUE_TYPE& data_to_return,
-        ::CCM_DDS::ReadInfoSeq& infos,
-        const ::DDS::SampleInfoSeq & sample_info);
-
-      void read_wo_instance (
-        SEQ_VALUE_TYPE& data,
-        ::DDS::SampleInfoSeq & sample_info,
-        ::DDS::QueryCondition_ptr qc);
-
-      void read_w_instance (
-        SEQ_VALUE_TYPE& data,
-        ::DDS::SampleInfoSeq & sample_info,
-        DDS_INSTANCE_HANDLE_T_IN lookup_hnd);
-
-      void return_loan (
-        SEQ_VALUE_TYPE& data,
-        ::DDS::SampleInfoSeq sample_info,
-        bool throw_exception=true);
-    };
-  }
-}
-
-#include "dds4ccm/impl/Reader_T.cpp"
-
-#endif /* READER_T_H_ */
-
diff --git a/CIAO/connectors/dds4ccm/impl/SampleInfo.h b/CIAO/connectors/dds4ccm/impl/SampleInfo.h
deleted file mode 100644
index 4b7d3434111..00000000000
--- a/CIAO/connectors/dds4ccm/impl/SampleInfo.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef SAMPLE_INFO_H
-#define SAMPLE_INFO_H
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-
-inline void
-operator<<= (::CCM_DDS::ReadInfo& ccm_dds_readinfo, const ::DDS::SampleInfo& sample_info)
-{
-  ccm_dds_readinfo.source_timestamp = sample_info.source_timestamp;
-  if (sample_info.sample_state == ::DDS::NOT_READ_SAMPLE_STATE)
-    {
-      ccm_dds_readinfo.access_status = ::CCM_DDS::FRESH_INFO;
-    }
-  else if (sample_info.sample_state == ::DDS::READ_SAMPLE_STATE)
-    {
-      ccm_dds_readinfo.access_status = ::CCM_DDS::ALREADY_SEEN;
-    }
-
-  ccm_dds_readinfo.instance_handle = sample_info.instance_handle;
-
-  if (sample_info.instance_state == ::DDS::ALIVE_INSTANCE_STATE &&
-      sample_info.view_state == ::DDS::NEW_VIEW_STATE)
-    {
-      // Instance_status new
-      ccm_dds_readinfo.instance_status = ::CCM_DDS::INSTANCE_CREATED;
-    }
-  else if (sample_info.instance_state == ::DDS::NOT_ALIVE_DISPOSED_INSTANCE_STATE)
-    {
-      // Instance_status deleted
-      ccm_dds_readinfo.instance_status = ::CCM_DDS::INSTANCE_DELETED;
-    }
-  else if ((sample_info.instance_state == ::DDS::ALIVE_INSTANCE_STATE &&
-            sample_info.view_state == ::DDS::NOT_NEW_VIEW_STATE) ||
-            sample_info.instance_state == ::DDS::NOT_ALIVE_NO_WRITERS_INSTANCE_STATE)
-    {
-      // Instance_status updated
-      ccm_dds_readinfo.instance_status = ::CCM_DDS::INSTANCE_UPDATED;
-    }
-}
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/impl/StateListenerControl_T.cpp b/CIAO/connectors/dds4ccm/impl/StateListenerControl_T.cpp
deleted file mode 100644
index 877fb84c9af..00000000000
--- a/CIAO/connectors/dds4ccm/impl/StateListenerControl_T.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-// -*- C++ -*-
-template <typename BASE_TYPE>
-CCM_DDS_StateListenerControl_T<BASE_TYPE>::CCM_DDS_StateListenerControl_T (void)
-    : is_filter_interpreted_ (false)
-{
-  DDS4CCM_TRACE ("CCM_DDS_StateListenerControl_T::CCM_DDS_StateListenerControl_T");
-}
-
-template <typename BASE_TYPE>
-CCM_DDS_StateListenerControl_T<BASE_TYPE>::~CCM_DDS_StateListenerControl_T (void)
-{
-  DDS4CCM_TRACE ("CCM_DDS_StateListenerControl_T::~CCM_DDS_StateListenerControl_T");
-}
-
-template <typename BASE_TYPE>
-::CORBA::Boolean
-CCM_DDS_StateListenerControl_T<BASE_TYPE>::is_filter_interpreted (void)
-{
-  DDS4CCM_TRACE ("CCM_DDS_StateListenerControl_T::is_filter_interpreted");
-
-  return this->is_filter_interpreted_.value ();
-}
-
-template <typename BASE_TYPE>
-void
-CCM_DDS_StateListenerControl_T<BASE_TYPE>::is_filter_interpreted (
-  ::CORBA::Boolean is_filter_interpreted)
-{
-  DDS4CCM_TRACE ("CCM_DDS_StateListenerControl_T::is_filter_interpreted");
-
-  this->is_filter_interpreted_ = is_filter_interpreted;
-}
diff --git a/CIAO/connectors/dds4ccm/impl/StateListenerControl_T.h b/CIAO/connectors/dds4ccm/impl/StateListenerControl_T.h
deleted file mode 100644
index 7eb0afa4038..00000000000
--- a/CIAO/connectors/dds4ccm/impl/StateListenerControl_T.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// -*- C++ -*-
-#ifndef STATELISTENERCONTROL_T_H_
-#define STATELISTENERCONTROL_T_H_
-
-#include "dds4ccm/impl/DataListenerControl_T.h"
-#include "dds4ccm/idl/dds4ccm_StateListenerControlEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-template <typename BASE_TYPE>
-class CCM_DDS_StateListenerControl_T
-  : public virtual CCM_DDS_DataListenerControl_T<BASE_TYPE>
-{
-public:
-  /// Constructor
-  CCM_DDS_StateListenerControl_T (void);
-
-  /// Destructor
-  virtual ~CCM_DDS_StateListenerControl_T (void);
-
-  /// Set the is_filter_interpreted
-  virtual ::CORBA::Boolean is_filter_interpreted (void);
-
-  /// Get the is_filter_interpreted
-  virtual void is_filter_interpreted (::CORBA::Boolean is_filter_interpreted);
-
-private:
-  ACE_Atomic_Op <TAO_SYNCH_MUTEX, ::CORBA::Boolean> is_filter_interpreted_;
-};
-
-#include "dds4ccm/impl/StateListenerControl_T.cpp"
-
-#endif /* STATELISTENERCONTROL_T_H_ */
-
diff --git a/CIAO/connectors/dds4ccm/impl/SubscriberListener.cpp b/CIAO/connectors/dds4ccm/impl/SubscriberListener.cpp
deleted file mode 100644
index 803f638b2d5..00000000000
--- a/CIAO/connectors/dds4ccm/impl/SubscriberListener.cpp
+++ /dev/null
@@ -1,334 +0,0 @@
-#include "dds4ccm/impl/SubscriberListener.h"
-#include "dds4ccm/impl/logger/Log_Macros.h"
-#include "dds4ccm/impl/DDSCallbackStatusHandler.h"
-#include "dds4ccm/impl/Utils.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO
-{
-  namespace DDS4CCM
-  {
-    SubscriberListener::SubscriberListener (
-        ::CCM_DDS::ConnectorStatusListener_ptr error_listener,
-         ACE_Reactor* reactor)
-    : error_listener_ (::CCM_DDS::ConnectorStatusListener::_duplicate (error_listener)),
-      reactor_ (reactor)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::SubscriberListener::SubscriberListener");
-    }
-
-    SubscriberListener::~SubscriberListener (void)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::SubscriberListener::~SubscriberListener");
-    }
-
-    void
-    SubscriberListener::on_requested_incompatible_qos (
-        ::DDS::DataReader_ptr reader,
-         const ::DDS::RequestedIncompatibleQosStatus & status)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::SubscriberListener::on_requested_incompatible_qos");
-
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, DDS4CCM_INFO
-          ACE_TEXT ("SubscriberListener::on_requested_incompatible_qos: ")
-          ACE_TEXT ("total count <%d> - total change <%d> - ")
-          ACE_TEXT ("last policy id <%C> - policies:\n"),
-      status.total_count, status.total_count_change,
-      translate_qospolicyid_t (status.last_policy_id)));
-      for (CORBA::ULong i = 0; i < status.policies.length (); ++i)
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, DDS4CCM_INFO
-              ACE_TEXT ("\t\tid <%C> - count <%d>\n"),
-              translate_qospolicyid_t (status.policies[i].policy_id),
-              status.policies[i].count));
-        }
-
-      if (! ::CORBA::is_nil (this->error_listener_))
-        {
-          try
-            {
-              if (this->reactor_)
-                {
-                  ::CIAO::DDS4CCM::OnRequestedOncompatibleQosHandler* rh = 0;
-                  ACE_NEW (rh,
-                      ::CIAO::DDS4CCM::OnRequestedOncompatibleQosHandler (
-                          this->error_listener_, reader, status));
-                  ACE_Event_Handler_var safe_handler (rh);
-                  if (this->reactor_->notify (rh) != 0)
-                    {
-                      DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                          ACE_TEXT ("SubscriberListener::")
-                      ACE_TEXT ("on_requested_incompatible_qos - ")
-                      ACE_TEXT ("failed to use reactor.\n")));
-                    }
-                }
-              else
-                {
-                  this->error_listener_->on_requested_incompatible_qos (reader, status);
-                }
-            }
-          catch (const ::CORBA::BAD_INV_ORDER& ex)
-            {
-              DDS4CCM_PRINT_DEBUG_CORBA_EXCEPTION (
-                                      DDS4CCM_LOG_LEVEL_ACTION,
-                                      ex,
-                                      "SubscriberListener::on_requested_incompatible_qos");
-            }
-          catch (const ::CORBA::Exception& ex)
-            {
-              DDS4CCM_PRINT_CORBA_EXCEPTION (
-                  DDS4CCM_LOG_LEVEL_ERROR,
-                  ex,
-                  "SubscriberListener::on_requested_incompatible_qos");
-            }
-          catch (...)
-            {
-              DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                  "SubscriberListener::on_requested_incompatible_qos - "
-                  "Unexpected exception caught\n"));
-            }
-        }
-      else
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-              ACE_TEXT ("SubscriberListener::on_requested_incompatible_qos - ")
-          ACE_TEXT ("No error listener connected\n")));
-        }
-    }
-
-    void
-    SubscriberListener::on_unexpected_status (
-        ::DDS::Entity_ptr entity,
-         ::DDS::StatusKind status_kind)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::SubscriberListener::on_unexpected_status");
-
-      if (! ::CORBA::is_nil (this->error_listener_))
-        {
-          try
-            {
-              if (this->reactor_)
-                {
-                  ::CIAO::DDS4CCM::OnUnexpectedStatusHandler* rh = 0;
-                  ACE_NEW (rh,
-                      ::CIAO::DDS4CCM::OnUnexpectedStatusHandler (
-                          this->error_listener_, entity, status_kind));
-                  ACE_Event_Handler_var safe_handler (rh);
-                  if (this->reactor_->notify (rh) != 0)
-                    {
-                      DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                          ACE_TEXT ("SubscriberListener::on_unexpected_status - ")
-                          ACE_TEXT ("failed to use reactor.\n")));
-                    }
-                }
-              else
-                {
-                  this->error_listener_->on_unexpected_status (entity, status_kind);
-                }
-            }
-          catch (const ::CORBA::BAD_INV_ORDER& ex)
-            {
-              DDS4CCM_PRINT_DEBUG_CORBA_EXCEPTION (
-                                      DDS4CCM_LOG_LEVEL_ACTION,
-                                      ex,
-                                      "SubscriberListener::on_unexpected_status");
-            }
-          catch (const ::CORBA::Exception& ex)
-            {
-              DDS4CCM_PRINT_CORBA_EXCEPTION (
-                  DDS4CCM_LOG_LEVEL_ERROR,
-                  ex,
-                  "SubscriberListener::on_unexpected_status");
-            }
-          catch (...)
-            {
-              DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                  "SubscriberListener::on_unexpected_status - "
-                  "Unexpected exception caught for <%C>\n",
-                  translate_statuskind (status_kind)));
-            }
-        }
-      else
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-              ACE_TEXT ("SubscriberListener::on_unexpected_status - ")
-          ACE_TEXT ("No error listener connected for <%C>\n"),
-          translate_statuskind (status_kind)));
-        }
-    }
-
-    void
-    SubscriberListener::on_liveliness_changed (
-        ::DDS::DataReader* reader,
-         const ::DDS::LivelinessChangedStatus& status)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::SubscriberListener::on_liveliness_changed");
-
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, DDS4CCM_INFO
-          ACE_TEXT ("SubscriberListener::on_liveliness_changed: ")
-          ACE_TEXT ("alive count <%d> - not alive count <%d> - ")
-          ACE_TEXT ("alive count change <%d> - not alive count change <%d> ")
-          ACE_TEXT ("last publication handle ") DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER
-          ACE_TEXT ("\n"),
-          status.alive_count, status.not_alive_count,
-          status.alive_count_change, status.not_alive_count_change,
-          DDS_INSTANCE_HANDLE_LOG (status.last_publication_handle)));
-
-      this->on_unexpected_status (reader, ::DDS::LIVELINESS_CHANGED_STATUS);
-    }
-
-    void
-    SubscriberListener::on_sample_rejected (
-        ::DDS::DataReader_ptr reader,
-         const ::DDS::SampleRejectedStatus& status)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::SubscriberListener::on_sample_rejected");
-
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, DDS4CCM_INFO
-          ACE_TEXT ("SubscriberListener::on_sample_rejected: ")
-          ACE_TEXT ("total count <%d> - count change <%d> - ")
-          ACE_TEXT ("last reason <%C> - last instance handle ")
-          DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER ACE_TEXT ("\n"),
-          status.total_count, status.total_count_change,
-          translate_rejectedstatuskind (status.last_reason),
-          DDS_INSTANCE_HANDLE_LOG (status.last_instance_handle)));
-
-      if (! ::CORBA::is_nil (this->error_listener_))
-        {
-          try
-            {
-              if (this->reactor_)
-                {
-                  ::CIAO::DDS4CCM::OnSampleRejectedHandler* rh = 0;
-                  ACE_NEW (rh,
-                      ::CIAO::DDS4CCM::OnSampleRejectedHandler (
-                          this->error_listener_, reader, status));
-                  ACE_Event_Handler_var safe_handler (rh);
-                  if (this->reactor_->notify (rh) != 0)
-                    {
-                      DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                          ACE_TEXT ("SubscriberListener::on_sample_rejected - ")
-                      ACE_TEXT ("failed to use reactor.\n")));
-                    }
-                }
-              else
-                {
-                  this->error_listener_->on_sample_rejected (reader, status);
-                }
-            }
-          catch (const ::CORBA::BAD_INV_ORDER& ex)
-            {
-              DDS4CCM_PRINT_DEBUG_CORBA_EXCEPTION (
-                                      DDS4CCM_LOG_LEVEL_ACTION,
-                                      ex,
-                                      "SubscriberListener::on_sample_rejected");
-            }
-          catch (const ::CORBA::Exception& ex)
-            {
-              DDS4CCM_PRINT_CORBA_EXCEPTION (
-                  DDS4CCM_LOG_LEVEL_ERROR,
-                  ex,
-                  "SubscriberListener::on_sample_rejected");
-            }
-          catch (...)
-            {
-              DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                  "SubscriberListener::on_sample_rejected - "
-                  "Unexpected exception caught\n"));
-            }
-        }
-      else
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-              ACE_TEXT ("SubscriberListener::on_sample_rejected - ")
-          ACE_TEXT ("No error listener connected\n")));
-        }
-    }
-
-    void
-    SubscriberListener::on_subscription_matched (
-        ::DDS::DataReader* reader,
-         const ::DDS::SubscriptionMatchedStatus& status)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::SubscriberListener::on_subscription_matched");
-
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, DDS4CCM_INFO
-          ACE_TEXT ("SubscriberListener::on_subscription_matched: ")
-          ACE_TEXT ("total count <%d> - count change <%d> - ")
-          ACE_TEXT ("current count <%d> - current count change <%d> ")
-          ACE_TEXT ("last publication handle ") DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER
-          ACE_TEXT ("\n"),
-          status.total_count, status.total_count_change,
-          status.current_count, status.current_count_change,
-          DDS_INSTANCE_HANDLE_LOG (status.last_publication_handle)));
-
-      this->on_unexpected_status (reader, ::DDS::SUBSCRIPTION_MATCHED_STATUS);
-    }
-
-    void
-    SubscriberListener::on_data_on_readers (
-        ::DDS::Subscriber *)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::SubscriberListener::on_data_on_readers");
-      //do nothing by design
-    }
-
-    void
-    SubscriberListener::on_requested_deadline_missed (
-        ::DDS::DataReader_ptr,
-         const ::DDS::RequestedDeadlineMissedStatus &)
-    {
-      DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-          "SubscriberListener::on_requested_deadline_missed - "
-          "Unexpected callback occurred\n"));
-    }
-
-    void
-    SubscriberListener::on_data_available (
-        ::DDS::DataReader_ptr)
-    {
-      DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-          "SubscriberListener::on_data_available - "
-          "Unexpected callback occurred\n"));
-    }
-
-    void
-    SubscriberListener::on_sample_lost (
-        ::DDS::DataReader_ptr,
-         const ::DDS::SampleLostStatus &)
-    {
-      DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-          "SubscriberListener::on_sample_lost - "
-          "Unexpected callback occurred\n"));
-    }
-
-    ::DDS::StatusMask
-    SubscriberListener::get_mask (
-         ::CCM_DDS::ConnectorStatusListener_ptr csl)
-    {
-      ::DDS::StatusMask mask = 0;
-
-      if (! ::CORBA::is_nil (csl) ||
-          DDS4CCM_debug_level >= DDS4CCM_LOG_LEVEL_DDS_STATUS)
-        {
-          mask = ::DDS::REQUESTED_INCOMPATIBLE_QOS_STATUS |
-                 ::DDS::SAMPLE_REJECTED_STATUS |
-                 ::DDS::LIVELINESS_CHANGED_STATUS |
-                 ::DDS::SUBSCRIPTION_MATCHED_STATUS;
-        }
-
-      if (DDS4CCM_debug_level >= DDS4CCM_LOG_LEVEL_DDS_STATUS)
-        {
-          ACE_CString msk;
-          translate_statusmask (msk, mask);
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, DDS4CCM_INFO
-              "SubscriberListener::get_mask - "
-              "Mask becomes %C\n",
-              msk.c_str ()));
-        }
-      return mask;
-    }
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/impl/SubscriberListener.h b/CIAO/connectors/dds4ccm/impl/SubscriberListener.h
deleted file mode 100644
index c0bb0b35b14..00000000000
--- a/CIAO/connectors/dds4ccm/impl/SubscriberListener.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * @author William R. Otte <wotte@dre.vanderbilt.edu>
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef SUBSCRIBERLISTENER_T_H_
-#define SUBSCRIBERLISTENER_T_H_
-
-#include "dds4ccm/idl/dds4ccm_ConnectorStatusListenerC.h"
-#include "dds4ccm/impl/dds4ccm_dds_impl_export.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-class ACE_Reactor;
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-namespace CIAO
-{
-  namespace DDS4CCM
-  {
-    class DDS4CCM_DDS_IMPL_Export SubscriberListener :
-      public ::DDS::SubscriberListener
-    {
-    public:
-      /// Constructor
-      SubscriberListener (
-        ::CCM_DDS::ConnectorStatusListener_ptr error_listener,
-        ACE_Reactor* reactor);
-
-      /// Destructor
-      virtual ~SubscriberListener (void);
-
-      virtual void on_requested_incompatible_qos (
-        ::DDS::DataReader_ptr reader,
-        const ::DDS::RequestedIncompatibleQosStatus & status);
-
-      virtual void on_liveliness_changed(
-        ::DDS::DataReader* reader,
-        const ::DDS::LivelinessChangedStatus& status);
-
-      virtual void on_sample_rejected(
-        ::DDS::DataReader* reader,
-        const ::DDS::SampleRejectedStatus& status);
-
-      virtual void on_subscription_matched(
-        ::DDS::DataReader* reader,
-        const ::DDS::SubscriptionMatchedStatus& status);
-
-      virtual void on_data_on_readers(
-        ::DDS::Subscriber* subscriber);
-
-      virtual void on_requested_deadline_missed (
-        ::DDS::DataReader_ptr ,
-        const ::DDS::RequestedDeadlineMissedStatus & );
-
-      virtual void on_data_available (
-        ::DDS::DataReader_ptr );
-
-      virtual void on_sample_lost (
-        ::DDS::DataReader_ptr ,
-        const ::DDS::SampleLostStatus & );
-
-      static ::DDS::StatusMask get_mask (
-        ::CCM_DDS::ConnectorStatusListener_ptr csl);
-
-    private:
-      virtual void on_unexpected_status(
-        ::DDS::Entity_ptr entity,
-        ::DDS::StatusKind status_kind);
-
-      ::CCM_DDS::ConnectorStatusListener_var error_listener_;
-
-      ACE_Reactor* reactor_;
-    };
-  }
-}
-
-#endif /* SUBSCRIBERLISTENER_T_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/TimeUtilities.h b/CIAO/connectors/dds4ccm/impl/TimeUtilities.h
deleted file mode 100644
index dbb7476a908..00000000000
--- a/CIAO/connectors/dds4ccm/impl/TimeUtilities.h
+++ /dev/null
@@ -1,38 +0,0 @@
-//=============================================================================
-/**
- *  @file    TimeUtilities.h
- *
- *  @author  Marcel Smit (msmit@remedy.nl)
- */
-//=============================================================================
-
-
-#ifndef DDS4CCM_TIME_UTILITIES_H
-#define DDS4CCM_TIME_UTILITIES_H
-
-#include "ace/Time_Value.h"
-#include "ace/Truncate.h"
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-
-inline void
-operator<<= (::DDS::Time_t & dds_time, const ::ACE_Time_Value & ace_time)
-{
-  dds_time.sec = ACE_Utils::truncate_cast<CORBA::Long> (ace_time.sec ());
-  dds_time.nanosec = ace_time.usec () * 1000;
-}
-
-inline void
-operator<<= (::ACE_Time_Value & ace_time, const ::DDS::Time_t &dds_time)
-{
-  ace_time.sec (dds_time.sec);
-  ace_time.usec (dds_time.nanosec/1000);
-}
-
-inline void
-operator<<= (::ACE_Time_Value & ace_time, const ::DDS::Duration_t &dds_time)
-{
-  ace_time.sec (dds_time.sec);
-  ace_time.usec (dds_time.nanosec/1000);
-}
-
-#endif /* DDS4CCM_TIME_UTILITIES_H */
diff --git a/CIAO/connectors/dds4ccm/impl/TopicListener.cpp b/CIAO/connectors/dds4ccm/impl/TopicListener.cpp
deleted file mode 100644
index c4819269863..00000000000
--- a/CIAO/connectors/dds4ccm/impl/TopicListener.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-#include "dds4ccm/impl/TopicListener.h"
-#include "dds4ccm/impl/Utils.h"
-#include "dds4ccm/impl/DDSCallbackStatusHandler.h"
-#include "dds4ccm/impl/logger/Log_Macros.h"
-#include "ace/Reactor.h"
-
-namespace CIAO
-{
-  namespace DDS4CCM
-  {
-    TopicListener::TopicListener (
-        ::CCM_DDS::ConnectorStatusListener_ptr error_listener,
-         ACE_Reactor* reactor) :
-         error_listener_ (::CCM_DDS::ConnectorStatusListener::_duplicate (error_listener)),
-         reactor_ (reactor)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::TopicListener::TopicListener");
-    }
-
-    TopicListener::~TopicListener (void)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::TopicListener::~TopicListener");
-    }
-
-    void
-    TopicListener::on_inconsistent_topic (
-        ::DDS::Topic_ptr the_topic,
-         const ::DDS::InconsistentTopicStatus & status)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::TopicListener::on_inconsistent_topic");
-
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, DDS4CCM_INFO
-          ACE_TEXT ("TopicListener::on_inconsistent_topic: ")
-      ACE_TEXT ("total count <%d> - total change <%d> - "),
-      status.total_count, status.total_count_change));
-
-      if (! ::CORBA::is_nil (this->error_listener_.in ()))
-        {
-          try
-          {
-              if (this->reactor_)
-                {
-                  ::CIAO::DDS4CCM::OnInconsistentTopicHandler* rh = 0;
-                  ACE_NEW (rh,
-                      ::CIAO::DDS4CCM::OnInconsistentTopicHandler (
-                          this->error_listener_,
-                          the_topic,
-                          status));
-                  ACE_Event_Handler_var safe_handler (rh);
-                  if (this->reactor_->notify (rh) != 0)
-                    {
-                      DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                          ACE_TEXT ("TopicListener::on_inconsistent_topic - ")
-                      ACE_TEXT ("failed to use reactor.\n")));
-                    }
-                }
-              else
-                {
-                  this->error_listener_->on_inconsistent_topic (the_topic, status);
-                }
-          }
-          catch (const ::CORBA::BAD_INV_ORDER& ex)
-            {
-              DDS4CCM_PRINT_DEBUG_CORBA_EXCEPTION (
-                                      DDS4CCM_LOG_LEVEL_ACTION,
-                                      ex,
-                                      "TopicListener::on_inconsistent_topic");
-            }
-          catch (const ::CORBA::Exception& ex)
-            {
-                DDS4CCM_PRINT_CORBA_EXCEPTION (
-                    DDS4CCM_LOG_LEVEL_ERROR,
-                    ex,
-                    "TopicListener::on_inconsistent_topic");
-            }
-          catch (...)
-            {
-                DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                    "TopicListener::on_inconsistent_topic - "
-                    "Unexpected exception caught\n"));
-            }
-        }
-      else
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-              ACE_TEXT ("TopicListener::on_inconsistent_topic - ")
-          ACE_TEXT ("No error listener connected\n")));
-        }
-    }
-
-    ::DDS::StatusMask
-    TopicListener::get_mask (
-         CCM_DDS::ConnectorStatusListener_ptr error_listener)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::TopicListener::get_mask");
-
-      ::DDS::StatusMask mask = 0;
-
-      if (! ::CORBA::is_nil (error_listener) ||
-          DDS4CCM_debug_level >= DDS4CCM_LOG_LEVEL_DDS_STATUS)
-        {
-          mask = ::DDS::INCONSISTENT_TOPIC_STATUS;
-        }
-
-      if (DDS4CCM_debug_level >= DDS4CCM_LOG_LEVEL_DDS_STATUS)
-        {
-          ACE_CString msk;
-          translate_statusmask (msk, mask);
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, DDS4CCM_INFO
-              "TopicListener::get_mask - "
-              "Mask becomes %C\n",
-              msk.c_str ()));
-        }
-      return mask;
-    }
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/impl/TopicListener.h b/CIAO/connectors/dds4ccm/impl/TopicListener.h
deleted file mode 100644
index be6ab188113..00000000000
--- a/CIAO/connectors/dds4ccm/impl/TopicListener.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-#ifndef TOPICLISTENER_T_H_
-#define TOPICLISTENER_T_H_
-
-#include "dds4ccm/idl/dds4ccm_ConnectorStatusListenerC.h"
-#include "dds4ccm/impl/dds4ccm_dds_impl_export.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-class ACE_Reactor;
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-namespace CIAO
-{
-  namespace DDS4CCM
-  {
-    class DDS4CCM_DDS_IMPL_Export TopicListener :
-      public ::DDS::TopicListener
-    {
-    public:
-      /// Constructor
-      TopicListener (::CCM_DDS::ConnectorStatusListener_ptr error_listener,
-                       ::ACE_Reactor* reactor);
-
-      /// Destructor
-      virtual ~TopicListener (void);
-
-      virtual void on_inconsistent_topic (
-        ::DDS::Topic_ptr the_topic,
-        const ::DDS::InconsistentTopicStatus & status);
-
-      static ::DDS::StatusMask get_mask (
-        CCM_DDS::ConnectorStatusListener_ptr error_listener);
-
-    private:
-      CCM_DDS::ConnectorStatusListener_var error_listener_;
-      ACE_Reactor* reactor_;
-    };
-  }
-}
-
-#endif /* TOPICLISTENER_T_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/Updater_T.cpp b/CIAO/connectors/dds4ccm/impl/Updater_T.cpp
deleted file mode 100644
index c1ee9b3f6a2..00000000000
--- a/CIAO/connectors/dds4ccm/impl/Updater_T.cpp
+++ /dev/null
@@ -1,319 +0,0 @@
-#include "dds4ccm/impl/Utils.h"
-#include "dds4ccm/impl/Coherent_Changes_Guard.h"
-#include "dds4ccm/impl/logger/Log_Macros.h"
-
-namespace CIAO
-{
-  namespace DDS4CCM
-  {
-    template <typename UPDATER_TYPE, typename TYPED_DDS_WRITER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    Updater_T<UPDATER_TYPE, TYPED_DDS_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::Updater_T (void)
-    : InstanceHandleManager_T<UPDATER_TYPE, TYPED_DDS_WRITER, VALUE_TYPE> (),
-      is_global_scope_ (false),
-      is_coherent_write_ (false)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::Updater_T");
-    }
-
-    template <typename UPDATER_TYPE, typename TYPED_DDS_WRITER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    Updater_T<UPDATER_TYPE, TYPED_DDS_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::~Updater_T (void)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::~Updater_T");
-    }
-
-    template <typename UPDATER_TYPE, typename TYPED_DDS_WRITER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    bool
-    Updater_T<UPDATER_TYPE, TYPED_DDS_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::is_global_scope (void)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::is_global_scope");
-      return this->is_global_scope_;
-    }
-
-    template <typename UPDATER_TYPE, typename TYPED_DDS_WRITER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    bool
-    Updater_T<UPDATER_TYPE, TYPED_DDS_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::is_coherent_write (void)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::is_coherent_write");
-      return this->is_coherent_write_;
-    }
-
-    template <typename UPDATER_TYPE, typename TYPED_DDS_WRITER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    void
-    Updater_T<UPDATER_TYPE, TYPED_DDS_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::is_coherent_write (bool value)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::is_coherent_write");
-      this->is_coherent_write_ = value;
-    }
-
-    template <typename UPDATER_TYPE, typename TYPED_DDS_WRITER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    void
-    Updater_T<UPDATER_TYPE, TYPED_DDS_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::create_i (
-      const VALUE_TYPE& an_instance,
-      ::CCM_DDS::DataNumber_t index)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::create_i");
-      ::DDS::InstanceHandle_t const hnd =
-          this->dds_writer ()->register_instance (an_instance);
-      if (hnd == ::DDS::HANDLE_NIL)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-              ACE_TEXT ("Updater_T::create_i: ")
-          ACE_TEXT ("Unable to unregister instance, nil handle.\n")));
-          throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, index);
-        }
-      ::DDS::ReturnCode_t const result  = this->dds_writer ()->write (an_instance, hnd);
-      if (result != ::DDS::RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-            ACE_TEXT ("Updater_T::create_i: ")
-            ACE_TEXT ("Unable to update data, error %C.\n"),
-          translate_retcode (result)));
-          throw ::CCM_DDS::InternalError (result, index);
-        }
-    }
-
-    template <typename UPDATER_TYPE, typename TYPED_DDS_WRITER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    void
-    Updater_T<UPDATER_TYPE, TYPED_DDS_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::create_one (
-      const VALUE_TYPE& an_instance)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::create_one");
-      ::DDS::InstanceHandle_t const hnd = this->dds_writer ()->lookup_instance (an_instance);
-      if (hnd != ::DDS::HANDLE_NIL)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-              ACE_TEXT ("Updater_T::create_one: ")
-              ACE_TEXT ("Instance already registered with handle")
-              DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER
-              ACE_TEXT (".\n"),
-              DDS_INSTANCE_HANDLE_LOG (hnd)));
-          throw CCM_DDS::AlreadyCreated (0);
-        }
-
-      this->create_i (an_instance, 0);
-    }
-
-    template <typename UPDATER_TYPE, typename TYPED_DDS_WRITER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    void
-    Updater_T<UPDATER_TYPE, TYPED_DDS_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::update_i (
-      const VALUE_TYPE& an_instance,
-      DDS_INSTANCE_HANDLE_T_IN instance_handle,
-      ::CCM_DDS::DataNumber_t index)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::update_i");
-      ::DDS::ReturnCode_t const result  =
-          this->dds_writer ()->write (an_instance, instance_handle);
-      if (result != ::DDS::RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-              ACE_TEXT ("Updater_T::update_i: ")
-          ACE_TEXT ("Unable to update data, error %C.\n"),
-          translate_retcode (result)));
-          throw ::CCM_DDS::InternalError (result, index);
-        }
-    }
-
-    template <typename UPDATER_TYPE, typename TYPED_DDS_WRITER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    void
-    Updater_T<UPDATER_TYPE, TYPED_DDS_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::update_one (
-      const VALUE_TYPE& an_instance,
-      DDS_INSTANCE_HANDLE_T_IN instance_handle)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::update_one");
-      ::DDS::InstanceHandle_t hnd = instance_handle;
-      if (hnd == ::DDS::HANDLE_NIL)
-        {
-          hnd = this->dds_writer ()->lookup_instance (an_instance);
-        }
-      else
-        {
-          // Check explicitly if the instance handle matches the instance, this
-          // is not checked by RTI DDS
-          ::DDS::InstanceHandle_t const instance_handle_l =
-              this->dds_writer ()->lookup_instance (an_instance);
-
-          if (hnd != instance_handle_l)
-            {
-              throw ::CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0);
-            }
-        }
-      if (hnd == ::DDS::HANDLE_NIL)
-        {
-          throw CCM_DDS::NonExistent (0);
-        }
-      this->update_i (an_instance, instance_handle, 0);
-    }
-
-    template <typename UPDATER_TYPE, typename TYPED_DDS_WRITER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    void
-    Updater_T<UPDATER_TYPE, TYPED_DDS_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::delete_i (
-      const VALUE_TYPE& an_instance,
-      DDS_INSTANCE_HANDLE_T_IN instance_handle,
-      ::CCM_DDS::DataNumber_t index)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::delete_i");
-
-      ::DDS::InstanceHandle_t hnd = instance_handle;
-      if (instance_handle == ::DDS::HANDLE_NIL)
-        {
-          hnd = this->dds_writer ()->lookup_instance (an_instance);
-        }
-
-      ::DDS::ReturnCode_t result =
-          this->dds_writer ()->dispose (an_instance, hnd);
-      if (result != ::DDS::RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-              ACE_TEXT ("Updater_T::delete_i: ")
-          ACE_TEXT ("Unable to dispose instance, error %C.\n"),
-          translate_retcode (result)));
-          throw ::CCM_DDS::InternalError (result, index);
-        }
-      result = this->dds_writer ()->unregister_instance (an_instance, hnd);
-      if (result != ::DDS::RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-              ACE_TEXT ("Updater_T::delete_i: ")
-          ACE_TEXT ("Unable to unregister instance, error %C.\n"),
-          translate_retcode (result)));
-          throw ::CCM_DDS::InternalError (result, index);
-        }
-    }
-
-    template <typename UPDATER_TYPE, typename TYPED_DDS_WRITER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    void
-    Updater_T<UPDATER_TYPE, TYPED_DDS_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::delete_one (
-      const VALUE_TYPE& an_instance,
-      DDS_INSTANCE_HANDLE_T_IN instance_handle)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::delete_one");
-      ::DDS::InstanceHandle_t hnd = instance_handle;
-      if (instance_handle == ::DDS::HANDLE_NIL)
-        {
-          hnd = this->dds_writer ()->lookup_instance (an_instance);
-        }
-      else
-        {
-          // Check explicitly if the instance handle matches the instance, this
-          // is not checked by RTI DDS
-          ::DDS::InstanceHandle_t const l_instance_handle =
-              this->dds_writer ()->lookup_instance (an_instance);
-
-          if (hnd != l_instance_handle)
-            {
-              throw ::CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0);
-            }
-        }
-      if (hnd == ::DDS::HANDLE_NIL)
-        {
-          throw CCM_DDS::NonExistent (0);
-        }
-      this->delete_i (an_instance, hnd, 0);
-    }
-
-    template <typename UPDATER_TYPE, typename TYPED_DDS_WRITER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    void
-    Updater_T<UPDATER_TYPE, TYPED_DDS_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::create_many (
-      const SEQ_VALUE_TYPE& data)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::create_many");
-
-      // Check for existence of instances
-      this->check_already_created (data);
-
-      ::DDS::Publisher_var pub = this->dds_writer ()->get_publisher();
-      Coherent_Changes_Guard guard (pub.in (), this->is_coherent_write_);
-
-      for (::CORBA::ULong index = 0; index < data.length (); index++)
-        {
-          this->create_i (data[index], index);
-        }
-    }
-
-    template <typename UPDATER_TYPE, typename TYPED_DDS_WRITER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    void
-    Updater_T<UPDATER_TYPE, TYPED_DDS_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::check_existent (
-        const SEQ_VALUE_TYPE& data)
-    {
-      ::CCM_DDS::NonExistent exception;
-      for (::CORBA::ULong index = 0; index < data.length (); index++)
-        {
-          ::DDS::InstanceHandle_t const hnd =
-              this->dds_writer ()->lookup_instance (data[index]);
-          if (hnd == ::DDS::HANDLE_NIL)
-            {
-              CORBA::ULong const length = exception.indexes.length ();
-              exception.indexes.length (length + 1);
-              exception.indexes[length] = index;
-            }
-        }
-
-      if (exception.indexes.length () > 0)
-        {
-          throw exception;
-        }
-    }
-
-    template <typename UPDATER_TYPE, typename TYPED_DDS_WRITER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    void
-    Updater_T<UPDATER_TYPE, TYPED_DDS_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::check_already_created (
-      const SEQ_VALUE_TYPE& data)
-    {
-      ::CCM_DDS::AlreadyCreated exception;
-      for (::CORBA::ULong index = 0; index < data.length (); index++)
-        {
-          ::DDS::InstanceHandle_t const hnd =
-              this->dds_writer ()->lookup_instance (data[index]);
-          if (hnd != ::DDS::HANDLE_NIL)
-            {
-              ::CORBA::ULong const length = exception.indexes.length ();
-              exception.indexes.length (length + 1);
-              exception.indexes[length] = index;
-            }
-        }
-
-      if (exception.indexes.length () > 0)
-        {
-          throw exception;
-        }
-    }
-
-    template <typename UPDATER_TYPE, typename TYPED_DDS_WRITER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    void
-    Updater_T<UPDATER_TYPE, TYPED_DDS_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::update_many (
-        const SEQ_VALUE_TYPE& data)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::update_many");
-
-      // Check for existence of instances
-      this->check_existent (data);
-
-      ::DDS::Publisher_var pub = this->dds_writer ()->get_publisher();
-      Coherent_Changes_Guard guard (pub.in (), this->is_coherent_write_);
-
-      for (::CORBA::ULong index = 0; index < data.length (); index++)
-        {
-          this->update_i (data[index], ::DDS::HANDLE_NIL, index);
-        }
-    }
-
-    template <typename UPDATER_TYPE, typename TYPED_DDS_WRITER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    void
-    Updater_T<UPDATER_TYPE, TYPED_DDS_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::delete_many (
-      const SEQ_VALUE_TYPE& data)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::delete_many");
-
-      // Check for existence of instances
-      this->check_existent (data);
-
-      ::DDS::Publisher_var pub = this->dds_writer ()->get_publisher();
-      Coherent_Changes_Guard guard (pub.in (), this->is_coherent_write_);
-
-      for (::CORBA::ULong index = 0; index < data.length (); index++)
-        {
-          this->delete_i (data[index], ::DDS::HANDLE_NIL, index);
-        }
-    }
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/impl/Updater_T.h b/CIAO/connectors/dds4ccm/impl/Updater_T.h
deleted file mode 100644
index 598ac1738cf..00000000000
--- a/CIAO/connectors/dds4ccm/impl/Updater_T.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef UPDATER_T_H_
-#define UPDATER_T_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ace/Copy_Disabled.h"
-#include "InstanceHandleManager_T.h"
-
-namespace CIAO
-{
-  namespace DDS4CCM
-  {
-    template <typename UPDATER_TYPE, typename TYPED_DDS_WRITER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    class Updater_T
-      : public InstanceHandleManager_T <UPDATER_TYPE, TYPED_DDS_WRITER, VALUE_TYPE>
-    {
-    public:
-      /// Constructor
-      Updater_T (void);
-
-      /// Destructor
-      virtual ~Updater_T (void);
-
-      virtual void create_one (
-        const VALUE_TYPE& an_instance);
-
-      virtual void update_one (
-        const VALUE_TYPE& an_instance,
-        DDS_INSTANCE_HANDLE_T_IN instance_handle);
-
-      virtual void delete_one (
-        const VALUE_TYPE& an_instance,
-        DDS_INSTANCE_HANDLE_T_IN instance_handle);
-
-      virtual void create_many (const SEQ_VALUE_TYPE& data);
-
-      virtual void update_many (const SEQ_VALUE_TYPE& data);
-
-      virtual void delete_many (const SEQ_VALUE_TYPE& data);
-
-      virtual bool is_global_scope ();
-
-      /**
-       * @name is_coherent_write
-       * Accessors for is_coherent_write
-       */
-      //@{
-      virtual bool is_coherent_write ();
-
-      virtual void is_coherent_write (bool value_);
-      //@}
-
-    private:
-      void create_i (
-        const VALUE_TYPE& an_instance,
-        ::CCM_DDS::DataNumber_t index);
-
-      void update_i (
-        const VALUE_TYPE& an_instance,
-        DDS_INSTANCE_HANDLE_T_IN instance_handle,
-        ::CCM_DDS::DataNumber_t index);
-
-      void delete_i (
-        const VALUE_TYPE& an_instance,
-        DDS_INSTANCE_HANDLE_T_IN instance_handle,
-        ::CCM_DDS::DataNumber_t index);
-
-      void check_existent (const SEQ_VALUE_TYPE& data);
-
-      void check_already_created (const SEQ_VALUE_TYPE& data);
-
-      bool is_global_scope_;
-      bool is_coherent_write_;
-    };
-  }
-}
-
-#include "dds4ccm/impl/Updater_T.cpp"
-
-#endif /* UPDATER_T_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/Utils.cpp b/CIAO/connectors/dds4ccm/impl/Utils.cpp
deleted file mode 100644
index b8011148d18..00000000000
--- a/CIAO/connectors/dds4ccm/impl/Utils.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-#include "Utils.h"
-
-namespace CIAO
-{
-  namespace DDS4CCM
-  {
-    QOS_XML_Noop::QOS_XML_Noop (void)
-    {
-    }
-
-    QOS_XML_Noop::~QOS_XML_Noop (void)
-    {
-    }
-
-    DDS::ReturnCode_t
-    QOS_XML_Noop::init (
-      const ACE_TCHAR * /*qos_profile*/)
-    {
-      return ::DDS::RETCODE_OK;
-    }
-
-    DDS::ReturnCode_t
-    QOS_XML_Noop::get_datawriter_qos (
-      DDS::DataWriterQos& /*dw_qos*/,
-      const char * /*qos_profile*/,
-      const char* /*topic_name*/)
-    {
-      return ::DDS::RETCODE_OK;
-    }
-
-    DDS::ReturnCode_t
-    QOS_XML_Noop::get_datareader_qos (
-      DDS::DataReaderQos& /*dr_qos*/,
-      const char * /*qos_profile*/,
-      const char* /*topic_name*/)
-    {
-      return ::DDS::RETCODE_OK;
-    }
-
-    DDS::ReturnCode_t
-    QOS_XML_Noop::get_publisher_qos (
-      DDS::PublisherQos& /*pub_qos*/,
-      const char * /*qos_profile*/)
-    {
-      return ::DDS::RETCODE_OK;
-    }
-
-    DDS::ReturnCode_t
-    QOS_XML_Noop::get_subscriber_qos (
-      DDS::SubscriberQos& /*sub_qos*/,
-      const char * /*qos_profile*/)
-    {
-      return ::DDS::RETCODE_OK;
-    }
-
-    DDS::ReturnCode_t
-    QOS_XML_Noop::get_topic_qos (
-      DDS::TopicQos& /*topic_qos*/,
-      const char * /*qos_profile*/,
-      const ACE_TCHAR * /*topic_name*/)
-    {
-      return ::DDS::RETCODE_OK;
-    }
-
-    DDS::ReturnCode_t
-    QOS_XML_Noop::get_participant_qos (
-      DDS::DomainParticipantQos& /*part_qos*/,
-      const char * /*qos_profile*/)
-    {
-      return ::DDS::RETCODE_OK;
-    }
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/impl/Utils.h b/CIAO/connectors/dds4ccm/impl/Utils.h
deleted file mode 100644
index ab6a0131b66..00000000000
--- a/CIAO/connectors/dds4ccm/impl/Utils.h
+++ /dev/null
@@ -1,217 +0,0 @@
-/**
- * @file Utils.h
- * @author William R. Otte <wotte@dre.vanderbilt.edu>
- *
- * Misc utility classes for DDS4CCM.
- */
-
-#ifndef DDS4CCM_UTILS_H
-#define DDS4CCM_UTILS_H
-
-#if (CIAO_DDS4CCM_NDDS==1)
-# include "dds4ccm/idl/ndds/ndds_dcpsC.h"
-#else
-# include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#endif
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-#include "dds4ccm/impl/dds4ccm_dds_impl_export.h"
-
-#include "ace/String_Base.h"
-
-namespace CIAO
-{
-  namespace DDS4CCM
-  {
-    /**
-     * Enum controlling the semantics of the
-     * DDS4CCM listeners.
-     */
-    enum DDS4CCM_LISTENER_READ_TAKE
-    {
-      /// Listener does a DDS read
-      DDS4CCM_READ,
-      /// Listener does a DDS take
-      DDS4CCM_TAKE
-    };
-
-    /// Helper method translating a DDS ReturnCode_t into
-    /// a readable string
-    inline const char * translate_retcode (::DDS::ReturnCode_t ret)
-    {
-#define DDS4CCM_RETCODE(X) case X: return #X
-      switch (ret)
-        {
-          DDS4CCM_RETCODE (DDS::RETCODE_OK);
-          DDS4CCM_RETCODE (DDS::RETCODE_ERROR);
-          DDS4CCM_RETCODE (DDS::RETCODE_UNSUPPORTED);
-          DDS4CCM_RETCODE (DDS::RETCODE_BAD_PARAMETER);
-          DDS4CCM_RETCODE (DDS::RETCODE_PRECONDITION_NOT_MET);
-          DDS4CCM_RETCODE (DDS::RETCODE_OUT_OF_RESOURCES);
-          DDS4CCM_RETCODE (DDS::RETCODE_NOT_ENABLED);
-          DDS4CCM_RETCODE (DDS::RETCODE_IMMUTABLE_POLICY);
-          DDS4CCM_RETCODE (DDS::RETCODE_INCONSISTENT_POLICY);
-          DDS4CCM_RETCODE (DDS::RETCODE_ALREADY_DELETED);
-          DDS4CCM_RETCODE (DDS::RETCODE_TIMEOUT);
-          DDS4CCM_RETCODE (DDS::RETCODE_NO_DATA);
-          DDS4CCM_RETCODE (DDS::RETCODE_ILLEGAL_OPERATION);
-        }
-      return "***Unknown enum value, update CIAO::DDS4CCM::translate_retcode()";
-#undef DDS4CCM_RETCODE
-    }
-
-    inline const char * translate_statuskind (DDS::StatusKind ret)
-    {
-#define DDS4CCM_RETCODE(X) case X: return #X
-      switch (ret)
-        {
-          DDS4CCM_RETCODE (DDS::INCONSISTENT_TOPIC_STATUS);
-          DDS4CCM_RETCODE (DDS::OFFERED_DEADLINE_MISSED_STATUS);
-          DDS4CCM_RETCODE (DDS::REQUESTED_DEADLINE_MISSED_STATUS);
-          DDS4CCM_RETCODE (DDS::OFFERED_INCOMPATIBLE_QOS_STATUS);
-          DDS4CCM_RETCODE (DDS::REQUESTED_INCOMPATIBLE_QOS_STATUS);
-          DDS4CCM_RETCODE (DDS::SAMPLE_LOST_STATUS);
-          DDS4CCM_RETCODE (DDS::SAMPLE_REJECTED_STATUS);
-          DDS4CCM_RETCODE (DDS::DATA_ON_READERS_STATUS);
-          DDS4CCM_RETCODE (DDS::DATA_AVAILABLE_STATUS);
-          DDS4CCM_RETCODE (DDS::LIVELINESS_LOST_STATUS);
-          DDS4CCM_RETCODE (DDS::LIVELINESS_CHANGED_STATUS);
-          DDS4CCM_RETCODE (DDS::PUBLICATION_MATCHED_STATUS);
-          DDS4CCM_RETCODE (DDS::SUBSCRIPTION_MATCHED_STATUS);
-#if (CIAO_DDS4CCM_NDDS==1)
-          DDS4CCM_RETCODE (DDS::RELIABLE_WRITER_CACHE_CHANGED_STATUS);
-          DDS4CCM_RETCODE (DDS::RELIABLE_READER_ACTIVITY_CHANGED_STATUS);
-#endif
-          //DDS4CCM_RETCODE (DDS::DATA_WRITER_CACHE_STATUS);
-          //DDS4CCM_RETCODE (DDS::DATA_WRITER_PROTOCOL_STATUS);
-          //DDS4CCM_RETCODE (DDS::DATA_READER_CACHE_STATUS);
-          //DDS4CCM_RETCODE (DDS::DATA_READER_PROTOCOL_STATUS);
-        }
-      return "***Unknown enum value, update CIAO::DDS4CCM::translate_statuskind()";
-#undef DDS4CCM_RETCODE
-    }
-
-    inline const char * translate_rejectedstatuskind (DDS::SampleRejectedStatusKind ret)
-    {
-#define DDS4CCM_RETCODE(X) case X: return #X
-      switch (ret)
-        {
-          DDS4CCM_RETCODE (DDS::NOT_REJECTED);
-          DDS4CCM_RETCODE (DDS::REJECTED_BY_INSTANCES_LIMIT);
-          DDS4CCM_RETCODE (DDS::REJECTED_BY_SAMPLES_LIMIT);
-          DDS4CCM_RETCODE (DDS::REJECTED_BY_SAMPLES_PER_INSTANCE_LIMIT);
-#if (CIAO_DDS4CCM_NDDS==1)
-          DDS4CCM_RETCODE (DDS::REJECTED_BY_REMOTE_WRITERS_LIMIT);
-          DDS4CCM_RETCODE (DDS::REJECTED_BY_REMOTE_WRITERS_PER_INSTANCE_LIMIT);
-          DDS4CCM_RETCODE (DDS::REJECTED_BY_SAMPLES_PER_REMOTE_WRITER_LIMIT);
-          DDS4CCM_RETCODE (DDS::REJECTED_BY_VIRTUAL_WRITERS_LIMIT); /* RTI DDS 5.0.0 Extension */
-          DDS4CCM_RETCODE (DDS::REJECTED_BY_REMOTE_WRITERS_PER_SAMPLE_LIMIT); /* RTI DDS 5.0.0 Extension */
-          DDS4CCM_RETCODE (DDS::REJECTED_BY_REMOTE_WRITER_SAMPLES_PER_VIRTUAL_QUEUE_LIMIT); /* RTI DDS 5.0.0 Extension */
-#endif
-        }
-      return "***Unknown enum value, update CIAO::DDS4CCM::translate_rejectedstatuskind()";
-#undef DDS4CCM_RETCODE
-    }
-
-    inline void translate_statusmask (ACE_CString &ret, ::DDS::StatusMask mask)
-    {
-#define DDS4CCM_CHECK_MASK(X, Y, Z) \
-        if (X & Y) { \
-          if (Z.length () != 0) \
-              Z += " | "; \
-          Z += translate_statuskind (Y); \
-        }
-      DDS4CCM_CHECK_MASK (mask, ::DDS::INCONSISTENT_TOPIC_STATUS, ret);
-      DDS4CCM_CHECK_MASK (mask, ::DDS::OFFERED_DEADLINE_MISSED_STATUS, ret);
-      DDS4CCM_CHECK_MASK (mask, ::DDS::REQUESTED_DEADLINE_MISSED_STATUS, ret);
-      DDS4CCM_CHECK_MASK (mask, ::DDS::OFFERED_INCOMPATIBLE_QOS_STATUS, ret);
-      DDS4CCM_CHECK_MASK (mask, ::DDS::REQUESTED_INCOMPATIBLE_QOS_STATUS, ret);
-      DDS4CCM_CHECK_MASK (mask, ::DDS::SAMPLE_LOST_STATUS, ret);
-      DDS4CCM_CHECK_MASK (mask, ::DDS::SAMPLE_REJECTED_STATUS, ret);
-      DDS4CCM_CHECK_MASK (mask, ::DDS::DATA_ON_READERS_STATUS, ret);
-      DDS4CCM_CHECK_MASK (mask, ::DDS::DATA_AVAILABLE_STATUS, ret);
-      DDS4CCM_CHECK_MASK (mask, ::DDS::LIVELINESS_LOST_STATUS, ret);
-      DDS4CCM_CHECK_MASK (mask, ::DDS::LIVELINESS_CHANGED_STATUS, ret);
-      DDS4CCM_CHECK_MASK (mask, ::DDS::PUBLICATION_MATCHED_STATUS, ret);
-      DDS4CCM_CHECK_MASK (mask, ::DDS::SUBSCRIPTION_MATCHED_STATUS, ret);
-#if (CIAO_DDS4CCM_NDDS==1)
-      DDS4CCM_CHECK_MASK (mask, ::DDS::RELIABLE_WRITER_CACHE_CHANGED_STATUS, ret);
-      DDS4CCM_CHECK_MASK (mask, ::DDS::RELIABLE_READER_ACTIVITY_CHANGED_STATUS, ret);
-#endif
-
-#undef DDS4CCM_CHECK_MASK
-    }
-
-    inline const char * translate_qospolicyid_t (DDS::QosPolicyId_t id)
-    {
-#define DDS4CCM_DDS_POLICYID_T(X) case X: return #X
-      switch (id)
-        {
-          DDS4CCM_DDS_POLICYID_T (DDS::INVALID_QOS_POLICY_ID);
-          DDS4CCM_DDS_POLICYID_T (DDS::USERDATA_QOS_POLICY_ID);
-          DDS4CCM_DDS_POLICYID_T (DDS::DURABILITY_QOS_POLICY_ID);
-          DDS4CCM_DDS_POLICYID_T (DDS::PRESENTATION_QOS_POLICY_ID);
-          DDS4CCM_DDS_POLICYID_T (DDS::DEADLINE_QOS_POLICY_ID);
-          DDS4CCM_DDS_POLICYID_T (DDS::LATENCYBUDGET_QOS_POLICY_ID);
-          DDS4CCM_DDS_POLICYID_T (DDS::OWNERSHIP_QOS_POLICY_ID);
-          DDS4CCM_DDS_POLICYID_T (DDS::OWNERSHIPSTRENGTH_QOS_POLICY_ID);
-          DDS4CCM_DDS_POLICYID_T (DDS::LIVELINESS_QOS_POLICY_ID);
-          DDS4CCM_DDS_POLICYID_T (DDS::TIMEBASEDFILTER_QOS_POLICY_ID);
-          DDS4CCM_DDS_POLICYID_T (DDS::PARTITION_QOS_POLICY_ID);
-          DDS4CCM_DDS_POLICYID_T (DDS::RELIABILITY_QOS_POLICY_ID);
-          DDS4CCM_DDS_POLICYID_T (DDS::DESTINATIONORDER_QOS_POLICY_ID);
-          DDS4CCM_DDS_POLICYID_T (DDS::HISTORY_QOS_POLICY_ID);
-          DDS4CCM_DDS_POLICYID_T (DDS::RESOURCELIMITS_QOS_POLICY_ID);
-          DDS4CCM_DDS_POLICYID_T (DDS::ENTITYFACTORY_QOS_POLICY_ID);
-          DDS4CCM_DDS_POLICYID_T (DDS::WRITERDATALIFECYCLE_QOS_POLICY_ID);
-          DDS4CCM_DDS_POLICYID_T (DDS::READERDATALIFECYCLE_QOS_POLICY_ID);
-          DDS4CCM_DDS_POLICYID_T (DDS::TOPICDATA_QOS_POLICY_ID);
-          DDS4CCM_DDS_POLICYID_T (DDS::GROUPDATA_QOS_POLICY_ID);
-          DDS4CCM_DDS_POLICYID_T (DDS::TRANSPORTPRIORITY_QOS_POLICY_ID);
-          DDS4CCM_DDS_POLICYID_T (DDS::LIFESPAN_QOS_POLICY_ID);
-          DDS4CCM_DDS_POLICYID_T (DDS::DURABILITYSERVICE_QOS_POLICY_ID);
-        }
-      return "***Unknown enum value, update CIAO::DDS4CCM::translate_qospolicyid_t()";
-  #undef DDS4CCM_DDS_POLICYID_T
-    }
-
-    class DDS4CCM_DDS_IMPL_Export QOS_XML_Noop
-    {
-    public:
-      QOS_XML_Noop (void);
-      ~QOS_XML_Noop (void);
-
-      DDS::ReturnCode_t
-      init (const ACE_TCHAR * qos_profile);
-
-      DDS::ReturnCode_t
-      get_datawriter_qos (DDS::DataWriterQos& dw_qos,
-                          const char *qos_profile,
-                          const char* topic_name);
-
-      DDS::ReturnCode_t
-      get_datareader_qos (DDS::DataReaderQos& dr_qos,
-                          const char *qos_profile,
-                          const char* topic_name);
-
-      DDS::ReturnCode_t
-      get_publisher_qos (DDS::PublisherQos& pub_qos,
-                          const char *qos_profile);
-
-      DDS::ReturnCode_t
-      get_subscriber_qos (DDS::SubscriberQos& sub_qos,
-                          const char *qos_profile);
-
-      DDS::ReturnCode_t
-      get_topic_qos (DDS::TopicQos& topic_qos,
-                    const char *qos_profile,
-                    const ACE_TCHAR *topic_name);
-
-      DDS::ReturnCode_t
-      get_participant_qos (DDS::DomainParticipantQos& part_qos,
-                          const char *qos_profile);
-    };
-  }
-}
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/impl/Writer_T.cpp b/CIAO/connectors/dds4ccm/impl/Writer_T.cpp
deleted file mode 100644
index c478c39982e..00000000000
--- a/CIAO/connectors/dds4ccm/impl/Writer_T.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-#include "dds4ccm/impl/Utils.h"
-#include "dds4ccm/impl/Coherent_Changes_Guard.h"
-#include "dds4ccm/impl/logger/Log_Macros.h"
-
-namespace CIAO
-{
-  namespace DDS4CCM
-  {
-    template <typename WRITER_TYPE, typename TYPED_DDS_WRITER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    Writer_T<WRITER_TYPE, TYPED_DDS_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::Writer_T (void)
-    : InstanceHandleManager_T<WRITER_TYPE, TYPED_DDS_WRITER, VALUE_TYPE> (),
-      is_coherent_write_ (false)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::Writer_T::Writer_T");
-    }
-
-    template <typename WRITER_TYPE, typename TYPED_DDS_WRITER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    Writer_T<WRITER_TYPE, TYPED_DDS_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::~Writer_T (void)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::Writer_T::~Writer_T");
-    }
-
-    template <typename WRITER_TYPE, typename TYPED_DDS_WRITER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    void
-    Writer_T<WRITER_TYPE, TYPED_DDS_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::write_i (
-      const VALUE_TYPE& datum,
-      DDS_INSTANCE_HANDLE_T_IN instance_handle,
-      ::CCM_DDS::DataNumber_t index)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::Writer_T::write_i");
-
-      ::DDS::ReturnCode_t const retval = this->dds_writer ()->write (datum, instance_handle);
-
-      if (retval != ::DDS::RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-              "Writer_T::write_i - "
-              "Write unsuccessful, received error code %C\n",
-              translate_retcode (retval)));
-          throw ::CCM_DDS::InternalError (retval, index);
-        }
-    }
-
-    template <typename WRITER_TYPE, typename TYPED_DDS_WRITER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    void
-    Writer_T<WRITER_TYPE, TYPED_DDS_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::write_one (
-      const VALUE_TYPE & an_instance,
-      DDS_INSTANCE_HANDLE_T_IN instance_handle)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::Writer_T::write_one");
-
-      this->write_i (an_instance, instance_handle, 0);
-
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_UNIMP_ACTION, (LM_TRACE, DDS4CCM_INFO
-          "Writer_T::write_one - "
-          "Write successful\n"));
-    }
-
-    template <typename WRITER_TYPE, typename TYPED_DDS_WRITER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    void
-    Writer_T<WRITER_TYPE, TYPED_DDS_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::write_many (
-      const SEQ_VALUE_TYPE& instances)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::Writer_T::write_many");
-
-      ::DDS::Publisher_var pub = this->dds_writer ()->get_publisher ();
-      if (::CORBA::is_nil (pub.in ()))
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        ACE_TEXT ("Writer_T::write_many - ")
-                        ACE_TEXT ("Publisher on DataWriter seems to be NIL\n")));
-          throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0);
-        }
-
-      Coherent_Changes_Guard guard (
-        pub.in (),
-        this->is_coherent_write_);
-
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_TRACE, DDS4CCM_INFO
-          "Writer_T::write_many - "
-          "Preparing to write to DDS\n"));
-
-      for (::CORBA::ULong index = 0; index < instances.length(); index++)
-        {
-          this->write_i (instances[index], ::DDS::HANDLE_NIL, index);
-        }
-
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_UNIMP_ACTION, (LM_TRACE, DDS4CCM_INFO
-          "Writer_T::write_many - "
-          "Write successful\n"));
-    }
-
-    template <typename WRITER_TYPE, typename TYPED_DDS_WRITER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    ::CORBA::Boolean
-    Writer_T<WRITER_TYPE, TYPED_DDS_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::is_coherent_write (void)
-    {
-      return this->is_coherent_write_;
-    }
-
-    template <typename WRITER_TYPE, typename TYPED_DDS_WRITER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    void
-    Writer_T<WRITER_TYPE, TYPED_DDS_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::is_coherent_write (
-        ::CORBA::Boolean value)
-    {
-      this->is_coherent_write_ = value;
-    }
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/impl/Writer_T.h b/CIAO/connectors/dds4ccm/impl/Writer_T.h
deleted file mode 100644
index abf2e019be9..00000000000
--- a/CIAO/connectors/dds4ccm/impl/Writer_T.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * @author William R. Otte <wotte@dre.vanderbilt.edu>
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef WRITER_T_H_
-#define WRITER_T_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "InstanceHandleManager_T.h"
-
-namespace CIAO
-{
-  namespace DDS4CCM
-  {
-    template <typename WRITER_TYPE, typename TYPED_DDS_WRITER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
-    class Writer_T
-      : public InstanceHandleManager_T <WRITER_TYPE, TYPED_DDS_WRITER, VALUE_TYPE>
-    {
-    public:
-      /// Constructor
-      Writer_T (void);
-
-      /// Destructor
-      virtual ~Writer_T (void);
-
-      virtual void write_one (
-        const VALUE_TYPE& an_instance,
-        DDS_INSTANCE_HANDLE_T_IN instance_handle);
-
-      virtual void write_many (const SEQ_VALUE_TYPE& instances);
-
-      /**
-       * @name is_coherent_write
-       * Accessors for is_coherent_write
-       */
-      //@{
-      virtual ::CORBA::Boolean is_coherent_write (void);
-
-      virtual void is_coherent_write ( ::CORBA::Boolean value);
-      //@}
-
-    private:
-      void write_i (const VALUE_TYPE& datum,
-                    DDS_INSTANCE_HANDLE_T_IN instance_handle,
-                    ::CCM_DDS::DataNumber_t index);
-
-      bool is_coherent_write_;
-    };
-  }
-}
-
-#include "dds4ccm/impl/Writer_T.cpp"
-
-#endif /* WRITER_T_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/dds4ccm_conf.h b/CIAO/connectors/dds4ccm/impl/dds4ccm_conf.h
deleted file mode 100644
index 5cfc599f2d1..00000000000
--- a/CIAO/connectors/dds4ccm/impl/dds4ccm_conf.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- *
- * Configuration file for DDS4CCM.
- */
-
-#ifndef DDS4CCM_CONF_H_
-#define DDS4CCM_CONF_H_
-
-/**
- * CIAO_DDS4CCM_CONTEXT_SWITCH defines whether DDS4CCM
- * does use the ORB core reactor thread when a DDS callback
- * has been received.
- *
- * If this is defined to 1 DDS4CCM will pass the DDS callback to the
- * ORB Core Reactor thread which means a thread context switch
- *
- * If this is defined to 0 no context switch takes place and the DDS
- * callback is delivered to the user code on the DDS thread
- *
- * If the user doesn't explicitly choose a value we will default to 1
- */
-#if !defined (CIAO_DDS4CCM_CONTEXT_SWITCH)
-#  define CIAO_DDS4CCM_CONTEXT_SWITCH 1
-#endif /* CIAO_DDS4CCM_CONTEXT_SWITCH */
-
-#if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1) && !defined (ACE_HAS_REACTOR_NOTIFICATION_QUEUE)
-#  error For using the DDS4CCM context switch ACE_HAS_REACTOR_NOTIFICATION_QUEUE must be defined
-#endif
-
-#if (CIAO_DDS4CCM_NDDS==1)
-# include "dds4ccm/impl/Utils.h"
-# define DDS_INSTANCE_HANDLE_T_IN const ::DDS::InstanceHandle_t &
-# define DDS_INSTANCE_HANDLE_T_RETN ::DDS::InstanceHandle_t
-# define DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER ACE_TEXT ("<%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x:%d:%d>")
-# define DDS_INSTANCE_HANDLE_LOG(X) X.value[0], X.value[1], X.value[2], X.value[3], X.value[4], X.value[5], X.value[6], X.value[7], X.value[8], X.value[9], X.value[10], X.value[11], X.value[12], X.value[13], X.value[14], X.value[15], X.length, X.isValid
-# define DDS_ENTITY_FORMAT_SPECIFIER ACE_TEXT ("<%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x:%d:%d>")
-# define DDS_ENTITY_LOG(X) X->get_instance_handle ().value[0], X->get_instance_handle ().value[1], X->get_instance_handle ().value[2], X->get_instance_handle ().value[3], X->get_instance_handle ().value[4], X->get_instance_handle ().value[5], X->get_instance_handle ().value[6], X->get_instance_handle ().value[7], X->get_instance_handle ().value[8], X->get_instance_handle ().value[9], X->get_instance_handle ().value[10], X->get_instance_handle ().value[11], X->get_instance_handle ().value[12], X->get_instance_handle ().value[13], X->get_instance_handle ().value[14], X->get_instance_handle ().value[15], X->get_instance_handle ().length, X->get_instance_handle ().isValid
-# define DDS_XML_QOS_PARSER_TYPE CIAO::DDS4CCM::QOS_XML_Noop
-#elif (CIAO_DDS4CCM_OPENDDS==1)
-# define DDS_INSTANCE_HANDLE_T_IN ::DDS::InstanceHandle_t
-# define DDS_INSTANCE_HANDLE_T_RETN ::DDS::InstanceHandle_t
-# define DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER ACE_TEXT ("<%d>")
-# define DDS_INSTANCE_HANDLE_LOG(X) X
-# define DDS_ENTITY_FORMAT_SPECIFIER ACE_TEXT ("<%d:%@>")
-# define DDS_ENTITY_LOG(X) X->get_instance_handle (), X
-# define DDS_XML_QOS_PARSER_TYPE OpenDDS::DCPS::QOS_XML_Loader
-#endif
-#endif /* DDS4CCM_CONF_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/dds4ccm_dds_impl_export.h b/CIAO/connectors/dds4ccm/impl/dds4ccm_dds_impl_export.h
deleted file mode 100644
index fd09437021c..00000000000
--- a/CIAO/connectors/dds4ccm/impl/dds4ccm_dds_impl_export.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// -*- C++ -*-
-// Definition for Win32 Export directives.
-// ------------------------------
-#ifndef DDS4CCM_DDS_IMPL_EXPORT_H
-#define DDS4CCM_DDS_IMPL_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (DDS4CCM_DDS_IMPL_HAS_DLL)
-#  define DDS4CCM_DDS_IMPL_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && DDS4CCM_DDS_IMPL_HAS_DLL */
-
-#if !defined (DDS4CCM_DDS_IMPL_HAS_DLL)
-#  define DDS4CCM_DDS_IMPL_HAS_DLL 1
-#endif /* ! DDS4CCM_DDS_IMPL_HAS_DLL */
-
-#if defined (DDS4CCM_DDS_IMPL_HAS_DLL) && (DDS4CCM_DDS_IMPL_HAS_DLL == 1)
-#  if defined (DDS4CCM_DDS_IMPL_BUILD_DLL)
-#    define DDS4CCM_DDS_IMPL_Export ACE_Proper_Export_Flag
-#    define DDS4CCM_DDS_IMPL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define DDS4CCM_DDS_IMPL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* DDS4CCM_DDS_IMPL_BUILD_DLL */
-#    define DDS4CCM_DDS_IMPL_Export ACE_Proper_Import_Flag
-#    define DDS4CCM_DDS_IMPL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define DDS4CCM_DDS_IMPL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* DDS4CCM_DDS_IMPL_BUILD_DLL */
-#else /* DDS4CCM_DDS_IMPL_HAS_DLL == 1 */
-#  define DDS4CCM_DDS_IMPL_Export
-#  define DDS4CCM_DDS_IMPL_SINGLETON_DECLARATION(T)
-#  define DDS4CCM_DDS_IMPL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* DDS4CCM_DDS_IMPL_HAS_DLL == 1 */
-
-// Set DDS4CCM_DDS_IMPL_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (DDS4CCM_DDS_IMPL_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define DDS4CCM_DDS_IMPL_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define DDS4CCM_DDS_IMPL_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !DDS4CCM_DDS_IMPL_NTRACE */
-
-#if (DDS4CCM_DDS_IMPL_NTRACE == 1)
-#  define DDS4CCM_DDS_IMPL_TRACE(X)
-#else /* (DDS4CCM_DDS_IMPL_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define DDS4CCM_DDS_IMPL_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (DDS4CCM_DDS_IMPL_NTRACE == 1) */
-
-#endif /* DDS4CCM_DDS_IMPL_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/connectors/dds4ccm/impl/dds4ccm_impl.mpc b/CIAO/connectors/dds4ccm/impl/dds4ccm_impl.mpc
deleted file mode 100644
index aae76fa4d17..00000000000
--- a/CIAO/connectors/dds4ccm/impl/dds4ccm_impl.mpc
+++ /dev/null
@@ -1,33 +0,0 @@
-project(CIAO_DDS4CCM_DDS_Impl) : install, dds4ccm_skel, dds4ccm_lem_stub, taolib, \
-                                 ciao_output, ccm_stub, dds4ccm_logger, dds4ccm_base {
-
-  dynamicflags += DDS4CCM_DDS_IMPL_BUILD_DLL
-  macros += BUILDING_DDS_LIB
-  Header_Files {
-    *.h
-  }
-
-  Template_Files {
-    *_T.cpp
-  }
-
-  Source_Files {
-    ConditionManager.cpp
-    Coherent_Changes_Guard.cpp
-    ContentFilterSetting.cpp
-    CCM_DataReader.cpp
-    CCM_DataWriter.cpp
-    DDSCallbackStatusHandler.cpp
-    LocalObject.cpp
-    PortStatusListener.cpp
-    PublisherListener.cpp
-    SubscriberListener.cpp
-    TopicListener.cpp
-    Utils.cpp
-    DomainParticipantManager.cpp
-  }
-
-  specific {
-    install_dir = connectors/dds4ccm/impl
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/impl/dds4ccm_utils.h b/CIAO/connectors/dds4ccm/impl/dds4ccm_utils.h
deleted file mode 100644
index 94687d7f9a6..00000000000
--- a/CIAO/connectors/dds4ccm/impl/dds4ccm_utils.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * @file dds4ccm_utils.h
- * @author Johnny Willemsen  (jwillemsen@remedy.nl)
- *
- * Misc utility classes for DDS4CCM.
- */
-
-#ifndef DDS4CCM_UTILS_UTILS_H
-#define DDS4CCM_UTILS_UTILS_H
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-#include "dds4ccm/idl/ccm_ddsC.h"
-
-namespace CIAO
-{
-  namespace DDS4CCM
-  {
-    inline const char * translate_ccm_dds_accessstatus (::CCM_DDS::AccessStatus ret)
-    {
-#define DDS4CCM_DDS_ACCESSSTATUS(X) case X: return #X
-      switch (ret)
-        {
-          DDS4CCM_DDS_ACCESSSTATUS (CCM_DDS::FRESH_INFO);
-          DDS4CCM_DDS_ACCESSSTATUS (CCM_DDS::ALREADY_SEEN);
-        }
-      return "***Unknown enum value, update CIAO::DDS4CCM::translate_ccm_dds_accessstatus()";
-#undef DDS4CCM_DDS_ACCESSSTATUS
-    }
-  }
-}
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/impl/logger/DDS4CCM_Logger_Export.h b/CIAO/connectors/dds4ccm/impl/logger/DDS4CCM_Logger_Export.h
deleted file mode 100644
index af004632352..00000000000
--- a/CIAO/connectors/dds4ccm/impl/logger/DDS4CCM_Logger_Export.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// -*- C++ -*-
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl DDS4CCM_Logger
-// ------------------------------
-#ifndef DDS4CCM_LOGGER_EXPORT_H
-#define DDS4CCM_LOGGER_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (DDS4CCM_LOGGER_HAS_DLL)
-#  define DDS4CCM_LOGGER_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && DDS4CCM_LOGGER_HAS_DLL */
-
-#if !defined (DDS4CCM_LOGGER_HAS_DLL)
-#  define DDS4CCM_LOGGER_HAS_DLL 1
-#endif /* ! DDS4CCM_LOGGER_HAS_DLL */
-
-#if defined (DDS4CCM_LOGGER_HAS_DLL) && (DDS4CCM_LOGGER_HAS_DLL == 1)
-#  if defined (DDS4CCM_LOGGER_BUILD_DLL)
-#    define DDS4CCM_Logger_Export ACE_Proper_Export_Flag
-#    define DDS4CCM_LOGGER_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define DDS4CCM_LOGGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* DDS4CCM_LOGGER_BUILD_DLL */
-#    define DDS4CCM_Logger_Export ACE_Proper_Import_Flag
-#    define DDS4CCM_LOGGER_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define DDS4CCM_LOGGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* DDS4CCM_LOGGER_BUILD_DLL */
-#else /* DDS4CCM_LOGGER_HAS_DLL == 1 */
-#  define DDS4CCM_Logger_Export
-#  define DDS4CCM_LOGGER_SINGLETON_DECLARATION(T)
-#  define DDS4CCM_LOGGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* DDS4CCM_LOGGER_HAS_DLL == 1 */
-
-// Set DDS4CCM_LOGGER_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (DDS4CCM_LOGGER_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define DDS4CCM_LOGGER_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define DDS4CCM_LOGGER_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !DDS4CCM_LOGGER_NTRACE */
-
-#if (DDS4CCM_LOGGER_NTRACE == 1)
-#  define DDS4CCM_LOGGER_TRACE(X)
-#else /* (DDS4CCM_LOGGER_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define DDS4CCM_LOGGER_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (DDS4CCM_LOGGER_NTRACE == 1) */
-
-#endif /* DDS4CCM_LOGGER_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/connectors/dds4ccm/impl/logger/Log_Macros.cpp b/CIAO/connectors/dds4ccm/impl/logger/Log_Macros.cpp
deleted file mode 100644
index 6721de9956c..00000000000
--- a/CIAO/connectors/dds4ccm/impl/logger/Log_Macros.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "Log_Macros.h"
-
-DDS4CCM_Logger_Export unsigned int DDS4CCM_debug_level = 0;
-
-DDS4CCM_Logger_Export ACE_Log_Category DDS4CCM_log_category ("DDS4CCM");
diff --git a/CIAO/connectors/dds4ccm/impl/logger/Log_Macros.h b/CIAO/connectors/dds4ccm/impl/logger/Log_Macros.h
deleted file mode 100644
index 65c54686c59..00000000000
--- a/CIAO/connectors/dds4ccm/impl/logger/Log_Macros.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/**
- * @file Log_Macros.h
- * @author William R. Otte <wotte@dre.vanderbilt.edu>
- *
- * Macros used for logging in DDS4CCM
- */
-
-#ifndef DDS4CCM_LOG_MACROS_H_
-#define DDS4CCM_LOG_MACROS_H_
-
-// default information printed with CIAO logging messages.
-#include "DDS4CCM_Logger_Export.h"
-#include "ace/Log_Msg.h"
-#include "ace/Log_Category.h"
-
-#if !defined (DDS4CCM_INFO)
-#  define DDS4CCM_INFO "(%P|%t) [%M] - %T - "
-#endif
-
-// Defines for log levels
-#define DDS4CCM_LOG_LEVEL_ERROR           1
-#define DDS4CCM_LOG_LEVEL_CAST_ERROR      2
-#define DDS4CCM_LOG_LEVEL_DDS_NIL_RETURN  3
-#define DDS4CCM_LOG_LEVEL_4               4 //unused
-#define DDS4CCM_LOG_LEVEL_5               5 //unused
-#define DDS4CCM_LOG_LEVEL_ACTION          6
-#define DDS4CCM_LOG_LEVEL_UNIMP_ACTION    7
-#define DDS4CCM_LOG_LEVEL_ACTION_STARTING 8
-#define DDS4CCM_LOG_LEVEL_CAST_SUCCESSFUL 9
-#define DDS4CCM_LOG_LEVEL_DDS_STATUS     10
-
-extern DDS4CCM_Logger_Export unsigned int DDS4CCM_debug_level;
-
-extern DDS4CCM_Logger_Export ACE_Log_Category DDS4CCM_log_category;
-
-// By default tracing is turned off.
-#if !defined (DDS4CCM_NTRACE)
-#  define DDS4CCM_NTRACE 1
-#endif /* DDS4CCM_NTRACE */
-
-#if (DDS4CCM_NTRACE == 1)
-#  if !defined (ACE_NTRACE)
-#    define DDS4CCM_TRACE(X) do {} while (0)
-#    define DDS4CCM_ENABLE_TRACE() do {} while (0)
-#    define DDS4CCM_DISABLE_TRACE() do {} while (0)
-#  else
-#    if (ACE_NTRACE == 0)
-#      error DDS4CCM_TRACE cannot be disabled if ACE_TRACE is enabled
-#    else
-#      define DDS4CCM_TRACE(X) do {} while (0)
-#      define DDS4CCM_ENABLE_TRACE() do {} while (0)
-#      define DDS4CCM_DISABLE_TRACE() do {} while (0)
-#    endif
-#  endif
-#else
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define DDS4CCM_TRACE(X) ACE_TRACE_IMPL(X)
-#  define DDS4CCM_ENABLE_TRACE() ACE_Trace::start_tracing ()
-#  define DDS4CCM_DISABLE_TRACE() ACE_Trace::stop_tracing ()
-#  undef DDS4CCM_INFO // Make log messages indent with tracing.
-#  define DDS4CCM_INFO "%I(%P|%t) [%M] - %T - "
-#  include "ace/Trace.h"
-#endif /* DDS4CCM_NTRACE */
-
-#if defined (DDS4CCM_NLOGGING)
-# define DDS4CCM_ERROR(L, X) do {} while (0)
-# define DDS4CCM_DEBUG(L, X) do {} while (0)
-# define DDS4CCM_PRINT_INTERNAL_EXCEPTION(L, E, X) do {} while (0)
-# define DDS4CCM_PRINT_CORBA_EXCEPTION(L, E, X) do {} while (0)
-# define DDS4CCM_PRINT_DEBUG_CORBA_EXCEPTION(L, E, X) do {} while (0)
-# define DDS4CCM_ERROR_RETURN(L, X, Y) return (Y)
-# define DDS4CCM_ERROR_BREAK(L, X) { break; }
-#else
-# if !defined (DDS4CCM_ERROR)
-#  define DDS4CCM_ERROR(L, X) \
-  do { \
-    if (DDS4CCM_debug_level >= L) \
-      { \
-        int const __ace_error = ACE_Log_Msg::last_error_adapter (); \
-        ACE_Log_Category_TSS *ace___ = DDS4CCM_log_category.per_thr_obj (); \
-        if (ace___ == 0) break; \
-        ace___->conditional_set (__FILE__, __LINE__, -1, __ace_error); \
-        ace___->log X; \
-      } \
-  } while (0)
-#  endif
-
-# if !defined (DDS4CCM_DEBUG)
-#  define DDS4CCM_DEBUG(L, X) \
-  do { \
-    if (DDS4CCM_debug_level >= L) \
-      { \
-        int const __ace_error = ACE_Log_Msg::last_error_adapter (); \
-        ACE_Log_Category_TSS *ace___ = DDS4CCM_log_category.per_thr_obj (); \
-        if (ace___ == 0) break; \
-        ace___->conditional_set (__FILE__, __LINE__, 0, __ace_error); \
-        ace___->log X; \
-      } \
-  } while (0)
-# endif
-
-# if !defined (DDS4CCM_PRINT_INTERNAL_EXCEPTION)
-#  define DDS4CCM_PRINT_INTERNAL_EXCEPTION(L, E, X) \
-  do { \
-    if (DDS4CCM_debug_level >= L) \
-      { \
-        ACE_CString msg (X);\
-        msg += " - Caught CCM_DDS internal exception: error <";\
-        msg += E; \
-        msg += ">\n";\
-        DDS4CCM_ERROR (L, (LM_ERROR, msg.c_str ()));\
-      } \
-  } while (0)
-# endif
-# if !defined (DDS4CCM_PRINT_CORBA_EXCEPTION)
-#  define DDS4CCM_PRINT_CORBA_EXCEPTION(L, E, X) \
-  do { \
-    if (DDS4CCM_debug_level >= L) \
-      { \
-        ACE_CString msg (X);\
-        msg += " - Caught CORBA exception.\n";\
-        DDS4CCM_ERROR (L, (LM_ERROR, msg.c_str ()));\
-        E._tao_print_exception (X);\
-      } \
-  } while (0)
-# endif
-# if !defined (DDS4CCM_PRINT_DEBUG_CORBA_EXCEPTION)
-#  define DDS4CCM_PRINT_DEBUG_CORBA_EXCEPTION(L, E, X) \
-  do { \
-    if (DDS4CCM_debug_level >= L) \
-      { \
-        ACE_CString msg (X);\
-        msg += " - Caught CORBA exception.\n";\
-        DDS4CCM_DEBUG (L, (LM_DEBUG, msg.c_str ()));\
-        E._tao_print_exception (X);\
-      } \
-  } while (0)
-# endif
-# if !defined (DDS4CCM_ERROR_RETURN)
-#  define DDS4CCM_ERROR_RETURN(L, X, Y) \
-  do { \
-    if (DDS4CCM_debug_level >= L) \
-      { \
-        int const __ace_error = ACE_Log_Msg::last_error_adapter (); \
-        ACE_Log_Category_TSS *ace___ = DDS4CCM_log_category.per_thr_obj (); \
-        if (ace___ == 0) break; \
-        ace___->conditional_set (__FILE__, __LINE__, Y, __ace_error); \
-        ace___->log X; \
-      } \
-    return Y; \
-  } while (0)
-# endif
-# if !defined (DDS4CCM_ERROR_BREAK)
-#  define DDS4CCM_ERROR_BREAK(L, X) { DDS4CCM_ERROR (L, X); break; }
-# endif
-#endif
-
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/impl/logger/Logger_Service.cpp b/CIAO/connectors/dds4ccm/impl/logger/Logger_Service.cpp
deleted file mode 100644
index 2d88ca354ea..00000000000
--- a/CIAO/connectors/dds4ccm/impl/logger/Logger_Service.cpp
+++ /dev/null
@@ -1,172 +0,0 @@
-#include "Logger_Service.h"
-#include "Log_Macros.h"
-#include "ace/Get_Opt.h"
-#include "ace/CORBA_macros.h"
-#include "ace/Env_Value_T.h"
-#include "tao/SystemException.h"
-#include "ace/Service_Config.h"
-#include "ace/Arg_Shifter.h"
-#include "ace/Log_Msg_Backend.h"
-#include "ace/Dynamic_Service.h"
-
-#if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
-// Needed to set ACE_LOG_MSG::msg_ostream()
-// FUZZ: disable check_for_streams_include
-#  include "ace/streams.h"
-#endif /* !ACE_LACKS_IOSTREAM_TOTALLY */
-
-CIAO::DDS4CCM::Logger_Service::Logger_Service (void)
-  : filename_ (ACE_TEXT("")),
-    trace_ (false)
-{
-}
-
-void
-CIAO::DDS4CCM::Logger_Service::init ()
-{
-  // Get prospective values from the environment first, those given on
-  // command line can override
-  ACE_Env_Value<int> log (ACE_TEXT("DDS4CCM_LOG_LEVEL"), DDS4CCM_debug_level);
-  DDS4CCM_debug_level = log;
-
-  ACE_Env_Value<int> trace (ACE_TEXT("DDS4CCM_TRACE_ENABLE"), 0);
-  this->trace_ = (trace != 0);
-
-  if (this->trace_)
-    {
-      DDS4CCM_ENABLE_TRACE ();
-    }
-  else
-    {
-      DDS4CCM_DISABLE_TRACE ();
-    }
-
-
-  ACE_Env_Value<const ACE_TCHAR *> filename (ACE_TEXT("DDS4CCM_LOG_FILE"), this->filename_.c_str ());
-  this->filename_ = filename;
-
-  ACE_Env_Value<const ACE_TCHAR *> backend (ACE_TEXT("DDS4CCM_LOG_BACKEND"), this->backend_.c_str ());
-  this->backend_ = backend;
-}
-
-int
-CIAO::DDS4CCM::Logger_Service::init (int argc, ACE_TCHAR * argv[])
-{
-  this->init ();
-  this->parse_args (argc, argv);
-
-  if (this->filename_.length () > 0)
-    {
-#if defined (ACE_LACKS_IOSTREAM_TOTALLY)
-
-      FILE* output_stream = ACE_OS::fopen (this->filename_.c_str (), ACE_TEXT ("a"));
-
-      ACE_LOG_MSG->msg_ostream (output_stream, 1);
-#else /* ! ACE_LACKS_IOSTREAM_TOTALLY */
-      ofstream* output_stream = 0;
-
-      ACE_NEW_THROW_EX (output_stream,
-                        ofstream (),
-                        CORBA::NO_MEMORY (
-                          CORBA::SystemException::_tao_minor_code (
-                            0,
-                            ENOMEM),
-                          CORBA::COMPLETED_NO));
-
-      output_stream->open (ACE_TEXT_ALWAYS_CHAR (this->filename_.c_str ()),
-                           ios::out | ios::app);
-
-      if (!output_stream->bad ())
-        {
-          ACE_LOG_MSG->msg_ostream (output_stream, 1);
-        }
-#endif /* ACE_LACKS_IOSTREAM_TOTALLY */
-
-      ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR | ACE_Log_Msg::LOGGER);
-      ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM);
-    }
-
-  if (this->backend_.length () > 0)
-    {
-
-      ACE_Log_Msg_Backend* logger_be =
-        ACE_Dynamic_Service<ACE_Log_Msg_Backend>::instance(this->backend_.c_str ());
-
-      //        backend->open ("");
-
-      if (logger_be == 0)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR,
-                         (LM_EMERGENCY, DDS4CCM_INFO
-                          "Logger_Service::init - "
-                          "Unable to load backend %s\n",
-                          this->backend_.c_str ()));
-          return -1;
-        }
-
-      ACE_Log_Msg::msg_backend (logger_be);
-
-      ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR | ACE_Log_Msg::LOGGER);
-      ACE_LOG_MSG->set_flags (ACE_Log_Msg::CUSTOM);
-    }
-
-  return 0;
-}
-
-void
-CIAO::DDS4CCM::Logger_Service::parse_args (int argc, ACE_TCHAR **argv)
-{
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::Logger_Service::parse_args");
-
-  ACE_Arg_Shifter arg_shifter (argc, argv);
-
-  while (arg_shifter.is_anything_left ())
-    {
-      const ACE_TCHAR *current_arg = 0;
-      if (0 != (current_arg =
-                     arg_shifter.get_the_parameter
-                     (ACE_TEXT ("-DDS4CCMLogLevel"))))
-        {
-          DDS4CCM_debug_level = ACE_OS::atoi (current_arg);
-
-          arg_shifter.consume_arg ();
-        }
-      else if (0 == arg_shifter.cur_arg_strncasecmp
-          (ACE_TEXT ("-DDS4CCMTraceEnable")))
-        {
-          this->trace_ = true;
-
-          arg_shifter.consume_arg ();
-        }
-      else if (0 != (current_arg =
-                     arg_shifter.get_the_parameter
-                     (ACE_TEXT ("-DDS4CCMLogFile"))))
-        {
-          this->filename_ = current_arg;
-
-          arg_shifter.consume_arg ();
-        }
-      else
-        {
-          // Can't interpret this argument.  Move on to the next
-          // argument.  Any arguments that don't match are ignored
-          // so that the caller can still use them.
-          arg_shifter.ignore_arg ();
-        }
-    }
-}
-
-int
-CIAO::DDS4CCM::Logger_Service::Initializer (void)
-{
-  return ACE_Service_Config::process_directive (ace_svc_desc_DDS4CCM_LOGGER_SERVICE);
-}
-
-ACE_STATIC_SVC_DEFINE (DDS4CCM_LOGGER_SERVICE,
-                       ACE_TEXT ("DDS4CCM_Logger"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (DDS4CCM_LOGGER_SERVICE),
-                       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-                       0)
-ACE_FACTORY_DEFINE (DDS4CCM_Logger, DDS4CCM_LOGGER_SERVICE)
-
diff --git a/CIAO/connectors/dds4ccm/impl/logger/Logger_Service.h b/CIAO/connectors/dds4ccm/impl/logger/Logger_Service.h
deleted file mode 100644
index 9c166a65587..00000000000
--- a/CIAO/connectors/dds4ccm/impl/logger/Logger_Service.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef DDS4CCM_LOGGER_SERVICE_H_
-#define DDS4CCM_LOGGER_SERVICE_H_
-
-#include "DDS4CCM_Logger_Export.h"
-#include "ace/Service_Object.h"
-
-namespace CIAO
-{
-  namespace DDS4CCM
-  {
-    class DDS4CCM_Logger_Export Logger_Service : public ACE_Service_Object
-      {
-      public:
-        Logger_Service (void);
-        virtual int init (int ARGC, ACE_TCHAR * ARGV[]);
-
-        void init ();
-
-        static int Initializer (void);
-      private:
-        void parse_args (int argc, ACE_TCHAR **argv);
-
-        ACE_TString filename_;
-        ACE_TString backend_;
-        bool trace_;
-      };
-  }
-}
-
-static int TAO_Requires_DDS4CCM_Logger_Service_Initializer =
-  ::CIAO::DDS4CCM::Logger_Service::Initializer ();
-
-typedef ::CIAO::DDS4CCM::Logger_Service DDS4CCM_LOGGER_SERVICE;
-
-ACE_STATIC_SVC_DECLARE (DDS4CCM_LOGGER_SERVICE)
-ACE_FACTORY_DECLARE (DDS4CCM_Logger, DDS4CCM_LOGGER_SERVICE)
-
-#endif /*LOGGER_SERVICE_H_*/
diff --git a/CIAO/connectors/dds4ccm/impl/logger/dds4ccm_logger.mpc b/CIAO/connectors/dds4ccm/impl/logger/dds4ccm_logger.mpc
deleted file mode 100644
index b40efede048..00000000000
--- a/CIAO/connectors/dds4ccm/impl/logger/dds4ccm_logger.mpc
+++ /dev/null
@@ -1,21 +0,0 @@
-// -*- MPC -*-
-project(DDS4CCM_Logger): install, ciao_lib, taolib, acelib {
-  sharedname   = DDS4CCM_Logger
-  dynamicflags += DDS4CCM_LOGGER_BUILD_DLL
-
-  Source_Files {
-    Logger_Service.cpp
-    Log_Macros.cpp
-  }
-
-  Header_Files {
-    DDS4CCM_Logger_Export.h
-    Logger_Service.h
-    Log_Macros.h
-  }
-
-  specific {
-    install_dir = connectors/dds4ccm/impl/logger
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Condition.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Condition.cpp
deleted file mode 100644
index 35441752b2c..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/Condition.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-#include "Condition.h"
-#include "dds4ccm/impl/logger/Log_Macros.h"
-#include "ndds/ndds_cpp.h"
-
-namespace CIAO
-{
-  namespace NDDS
-  {
-    DDS_Condition_i::DDS_Condition_i (DDSCondition * condition)
-      : rti_entity_ (condition)
-    {
-      DDS4CCM_TRACE ("DDS_Condition_i::DDS_Condition_i");
-    }
-
-    DDS_Condition_i::~DDS_Condition_i (void)
-    {
-      DDS4CCM_TRACE ("DDS_Condition_i::~DDS_Condition_i");
-    }
-
-    ::CORBA::Boolean
-    DDS_Condition_i::get_trigger_value (void)
-    {
-      DDS4CCM_TRACE ("DDS_Condition_i::get_trigger_value");
-
-      return this->rti_entity ()->get_trigger_value ();
-    }
-
-    DDSCondition *
-    DDS_Condition_i::get_rti_entity (void)
-    {
-      return this->rti_entity_;
-    }
-
-    void
-    DDS_Condition_i::set_rti_entity (DDSCondition * cond)
-    {
-      this->rti_entity_ = cond;
-    }
-
-    DDSCondition *
-    DDS_Condition_i::rti_entity (void)
-    {
-      if (!this->rti_entity_)
-        {
-          throw ::CORBA::BAD_INV_ORDER ();
-        }
-      return this->rti_entity_;
-    }
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Condition.h b/CIAO/connectors/dds4ccm/impl/ndds/Condition.h
deleted file mode 100644
index 904941b25ab..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/Condition.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef CONDITION_H_
-#define CONDITION_H_
-
-#include "ndds_dcpsC.h"
-#include "tao/LocalObject.h"
-
-#include "dds4ccm_ndds_export.h"
-
-class DDSCondition;
-
-namespace CIAO
-{
-  namespace NDDS
-  {
-    class DDS4CCM_NDDS_Export DDS_Condition_i :
-      public virtual ::DDS::Condition,
-      public virtual ::CORBA::LocalObject
-    {
-
-    public:
-      /// Constructor
-      DDS_Condition_i (DDSCondition * condition);
-
-      /// Destructor
-      virtual ~DDS_Condition_i (void);
-
-      virtual ::CORBA::Boolean
-      get_trigger_value (void);
-
-      DDSCondition * get_rti_entity (void);
-
-      void set_rti_entity (DDSCondition * cond);
-
-    private:
-      DDSCondition * rti_entity_;
-
-      DDSCondition * rti_entity ();
-    };
-  }
-}
-
-#endif /* CONDITION_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp b/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp
deleted file mode 100644
index a353736a936..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-#include "dds4ccm/impl/ndds/ContentFilteredTopic.h"
-#include "dds4ccm/impl/ndds/Topic.h"
-#include "dds4ccm/impl/logger/Log_Macros.h"
-#include "dds4ccm/impl/ndds/convertors/StringSeq.h"
-#include "ndds/ndds_cpp.h"
-
-namespace CIAO
-{
-  namespace NDDS
-  {
-    DDS_ContentFilteredTopic_i::DDS_ContentFilteredTopic_i (
-        ::DDSContentFilteredTopic * cft,
-        ::DDS::DomainParticipant_ptr dp)
-      : rti_entity_ (cft),
-        dp_ (::DDS::DomainParticipant::_duplicate (dp))
-    {
-    }
-
-    DDS_ContentFilteredTopic_i::~DDS_ContentFilteredTopic_i (void)
-    {
-    }
-
-    char *
-    DDS_ContentFilteredTopic_i::get_filter_expression (void)
-    {
-      DDS4CCM_TRACE ("DDS_ContentFilteredTopic_i::get_filter_expression");
-      return CORBA::string_dup (this->rti_entity ()->get_filter_expression ());
-    }
-
-    ::DDS::ReturnCode_t
-    DDS_ContentFilteredTopic_i::get_expression_parameters (
-      ::DDS::StringSeq & expression_parameters)
-    {
-      DDS4CCM_TRACE ("DDS_ContentFilteredTopic_i::get_expression_parameters");
-      DDS_StringSeq parameters;
-      ::DDS::ReturnCode_t retval =
-        this->rti_entity ()->get_expression_parameters (parameters);
-      expression_parameters <<= parameters;
-      return retval;
-    }
-
-    ::DDS::ReturnCode_t
-    DDS_ContentFilteredTopic_i::set_expression_parameters (
-      const ::DDS::StringSeq & expression_parameters)
-    {
-      DDS4CCM_TRACE ("DDS_ContentFilteredTopic_i::set_expression_parameters");
-
-      DDS_StringSeq parameters;
-      parameters <<= expression_parameters;
-      return this->rti_entity ()->set_expression_parameters (parameters);
-    }
-
-    ::DDS::Topic_ptr
-    DDS_ContentFilteredTopic_i::get_related_topic (void)
-    {
-      DDS4CCM_TRACE ("DDS_ContentFilteredTopic_i::get_related_topic");
-
-      ::DDS::Topic_var retval;
-      DDSTopic *topic = this->rti_entity ()->get_related_topic ();
-      ACE_NEW_THROW_EX (retval,
-                        DDS_Topic_i (topic, this->dp_.in ()),
-                        ::CORBA::NO_MEMORY ());
-      return retval._retn ();
-    }
-
-    char *
-    DDS_ContentFilteredTopic_i::get_type_name (void)
-    {
-      return CORBA::string_dup (this->rti_entity ()->get_type_name ());
-    }
-
-    char *
-    DDS_ContentFilteredTopic_i::get_name (void)
-    {
-      return CORBA::string_dup (this->rti_entity ()->get_name ());
-    }
-
-    ::DDS::DomainParticipant_ptr
-    DDS_ContentFilteredTopic_i::get_participant (void)
-    {
-      return ::DDS::DomainParticipant::_duplicate (this->dp_.in ());
-    }
-
-    DDSContentFilteredTopic *
-    DDS_ContentFilteredTopic_i::get_rti_entity (void)
-    {
-      return this->rti_entity_;
-    }
-
-    void
-    DDS_ContentFilteredTopic_i::set_rti_entity (DDSContentFilteredTopic * cft)
-    {
-      this->rti_entity_ = cft;
-    }
-
-    DDSContentFilteredTopic *
-    DDS_ContentFilteredTopic_i::rti_entity (void)
-    {
-      if (!this->rti_entity_)
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG,
-                        "DDS_ContentFilteredTopic_i::rti_entity - "
-                        "Throwing BAD_INV_ORDER.\n"));
-          throw ::CORBA::BAD_INV_ORDER ();
-        }
-      return this->rti_entity_;
-    }
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h b/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h
deleted file mode 100644
index 96f9c01520b..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef CONTENFILTEREDTOPIC_T_H_
-#define CONTENFILTEREDTOPIC_T_H_
-
-#include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h"
-#include "dds4ccm/idl/ndds/ndds_dcpsC.h"
-#include "tao/LocalObject.h"
-
-class DDSContentFilteredTopic;
-
-namespace CIAO
-{
-  namespace NDDS
-  {
-    class DDS4CCM_NDDS_Export DDS_ContentFilteredTopic_i :
-      public virtual ::DDS::ContentFilteredTopic,
-      public virtual ::CORBA::LocalObject
-    {
-    public:
-      /// Constructor
-      explicit DDS_ContentFilteredTopic_i (::DDSContentFilteredTopic * cft,
-                                         ::DDS::DomainParticipant_ptr dp);
-
-      /// Destructor
-      virtual ~DDS_ContentFilteredTopic_i (void);
-
-      virtual char * get_filter_expression (void);
-
-      virtual ::DDS::ReturnCode_t get_expression_parameters (
-          ::DDS::StringSeq & expression_parameters);
-
-      virtual ::DDS::ReturnCode_t set_expression_parameters (
-          const ::DDS::StringSeq & expression_parameters);
-
-      virtual ::DDS::Topic_ptr get_related_topic (void);
-
-      virtual char * get_type_name (void);
-
-      virtual char * get_name (void);
-
-      virtual ::DDS::DomainParticipant_ptr get_participant (void);
-
-      ::DDSContentFilteredTopic * get_rti_entity (void);
-
-      void set_rti_entity (::DDSContentFilteredTopic * cft);
-
-    private:
-      ::DDSContentFilteredTopic * rti_entity_;
-      ::DDS::DomainParticipant_var dp_;
-
-      DDSContentFilteredTopic * rti_entity (void);
-    };
-  }
-}
-
-#endif /* CONTENFILTEREDTOPIC_T_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReader.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataReader.cpp
deleted file mode 100644
index 8683b6ce1cc..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataReader.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "dds4ccm/impl/ndds/DataReader.h"
-
-namespace CIAO
-{
-  namespace NDDS
-  {
-    DDS_DataReader_Base::~DDS_DataReader_Base (void)
-    {
-    }
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReader.h b/CIAO/connectors/dds4ccm/impl/ndds/DataReader.h
deleted file mode 100644
index 988d06d2dc8..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataReader.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DATAREADER_H
-#define DATAREADER_H
-
-#include "dds4ccm/idl/ndds/ndds_dcpsC.h"
-#include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h"
-#include "tao/LocalObject.h"
-
-class DDSDataReader;
-
-namespace CIAO
-{
-  namespace NDDS
-  {
-    class DDS4CCM_NDDS_Export DDS_DataReader_Base
-      : public virtual ::DDS::DataReader,
-        public virtual ::CORBA::LocalObject
-    {
-    public:
-      virtual ~DDS_DataReader_Base (void);
-
-      virtual ::DDSDataReader * get_rti_entity (void) = 0;
-
-      virtual void set_rti_entity (::DDSDataReader* dr, ::DDS::DomainParticipant_ptr dp) = 0;
-    };
-  }
-}
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.cpp
deleted file mode 100644
index 88d30b88595..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-#include "dds4ccm/impl/ndds/DataReaderListener.h"
-#include "dds4ccm/impl/ndds/convertors/SampleLostStatus.h"
-#include "dds4ccm/impl/ndds/convertors/SubscriptionMatchedStatus.h"
-#include "dds4ccm/impl/ndds/convertors/RequestedDeadlineMissedStatus.h"
-#include "dds4ccm/impl/ndds/convertors/SampleRejectedStatus.h"
-#include "dds4ccm/impl/ndds/convertors/LivelinessChangedStatus.h"
-#include "dds4ccm/impl/ndds/convertors/RequestedIncompatibleQosStatus.h"
-#include "dds4ccm/impl/logger/Log_Macros.h"
-
-namespace CIAO
-{
-  namespace NDDS
-  {
-    DDS_DataReaderListener_i::DDS_DataReaderListener_i (
-      ::DDS::DataReaderListener_ptr p,
-      ::DDS::DataReader_ptr dr)
-      : impl_ (::DDS::DataReaderListener::_duplicate (p)),
-        dr_ (::DDS::DataReader::_duplicate (dr))
-    {
-    }
-
-    DDS_DataReaderListener_i::~DDS_DataReaderListener_i (void)
-    {
-    }
-
-    void
-    DDS_DataReaderListener_i::on_requested_deadline_missed (
-      ::DDSDataReader* ,
-      const ::DDS_RequestedDeadlineMissedStatus & status)
-    {
-      DDS4CCM_TRACE ("DDS_DataReaderListener_i::on_requested_deadline_missed");
-      ::DDS::RequestedDeadlineMissedStatus ddsstatus;
-      ddsstatus <<= status;
-      this->impl_->on_requested_deadline_missed (this->dr_, ddsstatus);
-    }
-
-    void
-    DDS_DataReaderListener_i::on_requested_incompatible_qos (
-      ::DDSDataReader* ,
-      const ::DDS_RequestedIncompatibleQosStatus & status)
-    {
-      DDS4CCM_TRACE ("DDS_DataReaderListener_i::on_requested_incompatible_qos");
-      ::DDS::RequestedIncompatibleQosStatus ddsstatus;
-      ddsstatus <<= status;
-      this->impl_->on_requested_incompatible_qos (this->dr_, ddsstatus);
-    }
-
-    void
-    DDS_DataReaderListener_i::on_sample_rejected (
-      ::DDSDataReader* ,
-      const ::DDS_SampleRejectedStatus & status)
-    {
-      DDS4CCM_TRACE ("DDS_DataReaderListener_i::on_sample_rejected");
-      ::DDS::SampleRejectedStatus ddsstatus;
-      ddsstatus <<= status;
-      this->impl_->on_sample_rejected (this->dr_, ddsstatus);
-    }
-
-    void
-    DDS_DataReaderListener_i::on_liveliness_changed (
-      ::DDSDataReader* ,
-      const ::DDS_LivelinessChangedStatus & status)
-    {
-      DDS4CCM_TRACE ("DDS_DataReaderListener_i::on_liveliness_changed");
-      ::DDS::LivelinessChangedStatus ddsstatus;
-      ddsstatus <<= status;
-      this->impl_->on_liveliness_changed (this->dr_, ddsstatus);
-    }
-
-    void
-    DDS_DataReaderListener_i::on_data_available(::DDSDataReader *)
-    {
-      DDS4CCM_TRACE ("DDS_DataReaderListener_i::on_data_available");
-      this->impl_->on_data_available (this->dr_);
-    }
-
-    void
-    DDS_DataReaderListener_i::on_subscription_matched (
-      ::DDSDataReader* ,
-      const ::DDS_SubscriptionMatchedStatus & status)
-    {
-      DDS4CCM_TRACE ("DDS_DataReaderListener_i::on_subscription_matched");
-      ::DDS::SubscriptionMatchedStatus ddsstatus;
-      ddsstatus <<= status;
-      this->impl_->on_subscription_matched (this->dr_, ddsstatus);
-    }
-
-    void
-    DDS_DataReaderListener_i::on_sample_lost (
-      ::DDSDataReader* ,
-      const ::DDS_SampleLostStatus & status)
-    {
-      DDS4CCM_TRACE ("DDS_DataReaderListener_i::on_sample_lost");
-      ::DDS::SampleLostStatus ddsstatus;
-      ddsstatus <<= status;
-      this->impl_->on_sample_lost (this->dr_, ddsstatus);
-    }
-
-    ::DDS::DataReaderListener_ptr
-    DDS_DataReaderListener_i::get_datareaderlistener (void)
-    {
-      return ::DDS::DataReaderListener::_duplicate (this->impl_.in ());
-    }
-
-    void
-    DDS_DataReaderListener_i::set_dds_entity (::DDS::DataReader_ptr dr)
-    {
-      this->dr_ = ::DDS::DataReader::_duplicate (dr);
-    }
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.h b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.h
deleted file mode 100644
index 80ced9465a3..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDSDATAREADERLISTENER_T_H_
-#define DDSDATAREADERLISTENER_T_H_
-
-#include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h"
-#include "dds4ccm/idl/ndds/ndds_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-
-namespace CIAO
-{
-  namespace NDDS
-  {
-    class DDS4CCM_NDDS_Export DDS_DataReaderListener_i :
-      public ::DDSDataReaderListener
-    {
-    public:
-      /// Constructor
-      DDS_DataReaderListener_i (::DDS::DataReaderListener_ptr p,
-                                ::DDS::DataReader_ptr typed_dr);
-
-      /// Destructor
-      virtual ~DDS_DataReaderListener_i (void);
-
-      virtual void on_requested_deadline_missed(::DDSDataReader* reader,
-        const ::DDS_RequestedDeadlineMissedStatus& status);
-
-      virtual void on_liveliness_changed(::DDSDataReader* reader,
-        const ::DDS_LivelinessChangedStatus& status);
-
-      virtual void on_requested_incompatible_qos(::DDSDataReader* reader,
-        const ::DDS_RequestedIncompatibleQosStatus& status);
-
-      virtual void on_sample_rejected(::DDSDataReader* reader,
-        const ::DDS_SampleRejectedStatus& status);
-
-      virtual void on_data_available(::DDSDataReader* reader);
-
-      virtual void on_sample_lost(::DDSDataReader* reader,
-          const ::DDS_SampleLostStatus& status);
-
-      virtual void on_subscription_matched(::DDSDataReader* reader,
-          const ::DDS_SubscriptionMatchedStatus& status);
-
-      ::DDS::DataReaderListener_ptr get_datareaderlistener (void);
-
-      void set_dds_entity (::DDS::DataReader_ptr typed_dr);
-    private:
-      ::DDS::DataReaderListener_var impl_;
-      ::DDS::DataReader_var dr_;
-    };
-  }
-}
-
-#endif /* DDSDATAREADERLISTENER_T_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReader_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataReader_T.cpp
deleted file mode 100644
index 7a56d7b2b58..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataReader_T.cpp
+++ /dev/null
@@ -1,1003 +0,0 @@
-#include "dds4ccm/impl/ndds/DataReaderListener.h"
-#include "dds4ccm/impl/ndds/StatusCondition.h"
-#include "dds4ccm/impl/ndds/ReadCondition.h"
-#include "dds4ccm/impl/ndds/QueryCondition.h"
-#include "dds4ccm/impl/ndds/Subscriber.h"
-#include "dds4ccm/impl/ndds/TopicDescription.h"
-#include "dds4ccm/impl/ndds/Topic.h"
-#include "dds4ccm/impl/ndds/ContentFilteredTopic.h"
-#include "dds4ccm/impl/Utils.h"
-
-#include "dds4ccm/impl/ndds/convertors/SampleInfoSeq.h"
-#include "dds4ccm/impl/ndds/convertors/SampleLostStatus.h"
-#include "dds4ccm/impl/ndds/convertors/SubscriptionMatchedStatus.h"
-#include "dds4ccm/impl/ndds/convertors/RequestedDeadlineMissedStatus.h"
-#include "dds4ccm/impl/ndds/convertors/SampleRejectedStatus.h"
-#include "dds4ccm/impl/ndds/convertors/LivelinessChangedStatus.h"
-#include "dds4ccm/impl/ndds/convertors/PublicationBuiltinTopicData.h"
-#include "dds4ccm/impl/ndds/convertors/RequestedIncompatibleQosStatus.h"
-#include "dds4ccm/impl/ndds/convertors/Duration_t.h"
-#include "dds4ccm/impl/ndds/convertors/InstanceHandle_t.h"
-#include "dds4ccm/impl/ndds/convertors/InstanceHandleSeq.h"
-#include "dds4ccm/impl/ndds/convertors/DataReaderQos.h"
-#include "dds4ccm/impl/ndds/convertors/StringSeq.h"
-
-#include "dds4ccm/impl/logger/Log_Macros.h"
-
-namespace CIAO
-{
-  namespace NDDS
-  {
-    template <typename TYPED_DDS_READER, typename TYPED_READER_TYPE, typename VALUE_TYPE, typename SEQ_TYPE, typename RTI_SEQ_TYPE>
-    DataReader_T <TYPED_DDS_READER, TYPED_READER_TYPE, VALUE_TYPE, SEQ_TYPE, RTI_SEQ_TYPE>::DataReader_T (
-      DDSDataReader * dr,
-      ::DDS::DomainParticipant_ptr dp,
-      ::DDS::Subscriber_ptr sub)
-      : rti_entity_ (0)
-        , dp_ (::DDS::DomainParticipant::_duplicate (dp))
-        , sub_ (::DDS::Subscriber::_duplicate (sub))
-    {
-      DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::DataReader_T");
-      if (dr)
-        {
-          this->rti_entity_ = TYPED_DDS_READER::narrow (dr);
-        }
-    }
-
-    template <typename TYPED_DDS_READER, typename TYPED_READER_TYPE, typename VALUE_TYPE, typename SEQ_TYPE, typename RTI_SEQ_TYPE>
-    DataReader_T <TYPED_DDS_READER, TYPED_READER_TYPE, VALUE_TYPE, SEQ_TYPE, RTI_SEQ_TYPE>::~DataReader_T (void)
-    {
-      DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::~DataReader_T");
-    }
-
-    template <typename TYPED_DDS_READER, typename TYPED_READER_TYPE, typename VALUE_TYPE, typename SEQ_TYPE, typename RTI_SEQ_TYPE>
-    ::DDS::ReturnCode_t
-    DataReader_T <TYPED_DDS_READER, TYPED_READER_TYPE, VALUE_TYPE, SEQ_TYPE, RTI_SEQ_TYPE>::complete_read (
-        RTI_SEQ_TYPE & dds_data_values,
-        SEQ_TYPE & data_values,
-        DDS_SampleInfoSeq & dds_sample_infos,
-        ::DDS::SampleInfoSeq & sample_infos,
-        const ::DDS::ReturnCode_t & retcode,
-        const char * method_name)
-    {
-      if (retcode == ::DDS::RETCODE_OK)
-        {
-          data_values.length (dds_data_values.length ());
-          sample_infos.length (dds_sample_infos.length ());
-
-          for (::DDS_Long i = 0 ; i < dds_sample_infos.length(); ++i)
-            {
-              sample_infos[i] <<= dds_sample_infos[i];
-              data_values[i] = dds_data_values[i];
-            }
-        }
-      else if (retcode != ::DDS::RETCODE_NO_DATA)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        ACE_TEXT ("DataReader_T::%C - ")
-                        ACE_TEXT ("Error while reading samples from DDS - <%C>\n"),
-                        method_name,
-                        ::CIAO::DDS4CCM::translate_retcode (retcode)));
-        }
-      ::DDS::ReturnCode_t const retcode_return_loan =
-        this->rti_entity ()->return_loan (dds_data_values, dds_sample_infos);
-      if (retcode_return_loan != ::DDS::RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        ACE_TEXT ("DataReader_T::%C - ")
-                        ACE_TEXT ("Error returning loan to DDS - <%C>\n"),
-                        method_name,
-                        ::CIAO::DDS4CCM::translate_retcode (retcode_return_loan)));
-          // In case a read action from DDS causes errors, the users wants to see
-          // this error (and not the return loan error).
-          if (retcode  == ::DDS::RETCODE_OK)
-            return retcode_return_loan;
-        }
-      return retcode;
-    }
-
-    template <typename TYPED_DDS_READER, typename TYPED_READER_TYPE, typename VALUE_TYPE, typename SEQ_TYPE, typename RTI_SEQ_TYPE>
-    ::DDS::ReturnCode_t
-    DataReader_T <TYPED_DDS_READER, TYPED_READER_TYPE, VALUE_TYPE, SEQ_TYPE, RTI_SEQ_TYPE>::read (
-        SEQ_TYPE & data_values,
-        ::DDS::SampleInfoSeq & sample_infos,
-        ::CORBA::Long max_samples,
-        ::DDS::SampleStateMask sample_states,
-        ::DDS::ViewStateMask view_states,
-        ::DDS::InstanceStateMask instance_states)
-    {
-      DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::read");
-
-      DDS_SampleInfoSeq dds_sample_infos;
-
-      RTI_SEQ_TYPE dds_data_values;
-
-      ::DDS::ReturnCode_t const retcode_read =
-        this->rti_entity ()->read (dds_data_values,
-                                   dds_sample_infos,
-                                   max_samples,
-                                   sample_states,
-                                   view_states,
-                                   instance_states);
-      return this->complete_read (dds_data_values, data_values,
-                                  dds_sample_infos, sample_infos,
-                                  retcode_read, "read");
-    }
-
-    template <typename TYPED_DDS_READER, typename TYPED_READER_TYPE, typename VALUE_TYPE, typename SEQ_TYPE, typename RTI_SEQ_TYPE>
-    ::DDS::ReturnCode_t
-    DataReader_T <TYPED_DDS_READER, TYPED_READER_TYPE, VALUE_TYPE, SEQ_TYPE, RTI_SEQ_TYPE>::take (
-      SEQ_TYPE & data_values,
-      ::DDS::SampleInfoSeq & sample_infos,
-      ::CORBA::Long max_samples,
-      ::DDS::SampleStateMask sample_states,
-      ::DDS::ViewStateMask view_states,
-      ::DDS::InstanceStateMask instance_states)
-    {
-      DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::take");
-
-      DDS_SampleInfoSeq dds_sample_infos;
-
-      RTI_SEQ_TYPE dds_data_values;
-
-      ::DDS::ReturnCode_t const retcode_take =
-        this->rti_entity ()->take (dds_data_values,
-                                   dds_sample_infos,
-                                   max_samples,
-                                   sample_states,
-                                   view_states,
-                                   instance_states);
-
-      return this->complete_read (dds_data_values, data_values,
-                                  dds_sample_infos, sample_infos,
-                                  retcode_take, "take");
-    }
-
-    template <typename TYPED_DDS_READER, typename TYPED_READER_TYPE, typename VALUE_TYPE, typename SEQ_TYPE, typename RTI_SEQ_TYPE>
-    ::DDS::ReturnCode_t
-    DataReader_T <TYPED_DDS_READER, TYPED_READER_TYPE, VALUE_TYPE, SEQ_TYPE, RTI_SEQ_TYPE>::read_w_condition (
-      SEQ_TYPE & data_values,
-      ::DDS::SampleInfoSeq & sample_infos,
-      ::CORBA::Long max_samples,
-      ::DDS::ReadCondition_ptr a_condition)
-    {
-      DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::read_w_condition");
-
-      DDS_SampleInfoSeq dds_sample_infos;
-
-      RTI_SEQ_TYPE dds_data_values;
-
-      ::DDS::ReturnCode_t retcode_read_w_condition = ::DDS::RETCODE_ERROR;
-
-      DDS_ReadCondition_i * dds_rc_proxy =
-        dynamic_cast <DDS_ReadCondition_i *>(a_condition);
-
-      if (dds_rc_proxy)
-        {
-          DDSReadCondition * dds_rc =
-            dds_rc_proxy->get_rti_entity ();
-          retcode_read_w_condition = this->rti_entity ()->read_w_condition (
-                                                                dds_data_values,
-                                                                dds_sample_infos,
-                                                                max_samples,
-                                                                dds_rc);
-        }
-      else
-        {
-          DDS_QueryCondition_i * dds_qc_proxy =
-            dynamic_cast <DDS_QueryCondition_i *>(a_condition);
-          if (dds_qc_proxy)
-            {
-              DDSQueryCondition * dds_qc =
-                dds_qc_proxy->get_rti_entity ();
-              retcode_read_w_condition = this->rti_entity ()->read_w_condition (
-                                                                dds_data_values,
-                                                                dds_sample_infos,
-                                                                max_samples,
-                                                                dds_qc);
-            }
-          else
-            {
-              retcode_read_w_condition = this->rti_entity ()->read_w_condition (
-                                                                dds_data_values,
-                                                                dds_sample_infos,
-                                                                max_samples,
-                                                                0);
-            }
-        }
-      return this->complete_read (dds_data_values, data_values,
-                                  dds_sample_infos, sample_infos,
-                                  retcode_read_w_condition, "read_w_condition");
-    }
-
-    template <typename TYPED_DDS_READER, typename TYPED_READER_TYPE, typename VALUE_TYPE, typename SEQ_TYPE, typename RTI_SEQ_TYPE>
-    ::DDS::ReturnCode_t
-    DataReader_T <TYPED_DDS_READER, TYPED_READER_TYPE, VALUE_TYPE, SEQ_TYPE, RTI_SEQ_TYPE>::take_w_condition (
-      SEQ_TYPE & data_values,
-      ::DDS::SampleInfoSeq & sample_infos,
-      ::CORBA::Long max_samples,
-      ::DDS::ReadCondition_ptr a_condition)
-    {
-      DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::take_w_condition");
-
-      DDS_SampleInfoSeq dds_sample_infos;
-
-      RTI_SEQ_TYPE dds_data_values;
-
-      ::DDS::ReturnCode_t retcode_take_w_condition = ::DDS::RETCODE_ERROR;
-
-      DDS_ReadCondition_i * dds_rc_proxy =
-        dynamic_cast <DDS_ReadCondition_i *>(a_condition);
-
-      if (dds_rc_proxy)
-        {
-          DDSReadCondition * dds_rc =
-            dds_rc_proxy->get_rti_entity ();
-          retcode_take_w_condition = this->rti_entity ()->take_w_condition (
-                                                                dds_data_values,
-                                                                dds_sample_infos,
-                                                                max_samples,
-                                                                dds_rc);
-        }
-      else
-        {
-          DDS_QueryCondition_i * dds_qc_proxy =
-            dynamic_cast <DDS_QueryCondition_i *>(a_condition);
-          if (dds_qc_proxy)
-            {
-              DDSQueryCondition * dds_qc =
-                dds_qc_proxy->get_rti_entity ();
-              retcode_take_w_condition = this->rti_entity ()->take_w_condition (
-                                                                dds_data_values,
-                                                                dds_sample_infos,
-                                                                max_samples,
-                                                                dds_qc);
-            }
-          else
-            {
-              retcode_take_w_condition = this->rti_entity ()->take_w_condition (
-                                                                dds_data_values,
-                                                                dds_sample_infos,
-                                                                max_samples,
-                                                                0);
-            }
-        }
-
-      return this->complete_read (dds_data_values, data_values,
-                                  dds_sample_infos, sample_infos,
-                                  retcode_take_w_condition, "read_w_condition");
-    }
-
-    template <typename TYPED_DDS_READER, typename TYPED_READER_TYPE, typename VALUE_TYPE, typename SEQ_TYPE, typename RTI_SEQ_TYPE>
-    ::DDS::ReturnCode_t
-    DataReader_T <TYPED_DDS_READER, TYPED_READER_TYPE, VALUE_TYPE, SEQ_TYPE, RTI_SEQ_TYPE>::read_next_sample (
-      VALUE_TYPE & data_values,
-      ::DDS::SampleInfo & sample_info)
-    {
-      DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::read_next_sample");
-
-      DDS_SampleInfo dds_sample_info;
-
-      ::DDS::ReturnCode_t const retcode_read_next_sample =
-        this->rti_entity ()->read_next_sample (data_values,
-                                               dds_sample_info);
-      sample_info <<= dds_sample_info;
-      return retcode_read_next_sample;
-    }
-
-    template <typename TYPED_DDS_READER, typename TYPED_READER_TYPE, typename VALUE_TYPE, typename SEQ_TYPE, typename RTI_SEQ_TYPE>
-    ::DDS::ReturnCode_t
-    DataReader_T <TYPED_DDS_READER, TYPED_READER_TYPE, VALUE_TYPE, SEQ_TYPE, RTI_SEQ_TYPE>::take_next_sample (
-      VALUE_TYPE & data_values,
-      ::DDS::SampleInfo & sample_info)
-    {
-      DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::take_next_sample");
-
-      DDS_SampleInfo dds_sample_info;
-
-      ::DDS::ReturnCode_t const retcode_take_next_sample =
-        this->rti_entity ()->take_next_sample (data_values,
-                                               dds_sample_info);
-      sample_info <<= dds_sample_info;
-      return retcode_take_next_sample ;
-    }
-
-    template <typename TYPED_DDS_READER, typename TYPED_READER_TYPE, typename VALUE_TYPE, typename SEQ_TYPE, typename RTI_SEQ_TYPE>
-    ::DDS::ReturnCode_t
-    DataReader_T <TYPED_DDS_READER, TYPED_READER_TYPE, VALUE_TYPE, SEQ_TYPE, RTI_SEQ_TYPE>::read_instance (
-      SEQ_TYPE & data_values,
-      ::DDS::SampleInfoSeq & sample_infos,
-      ::CORBA::Long max_samples,
-      const ::DDS::InstanceHandle_t & a_handle,
-      ::DDS::SampleStateMask sample_states,
-      ::DDS::ViewStateMask view_states,
-      ::DDS::InstanceStateMask instance_states)
-    {
-      DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::read_instance");
-
-      DDS_SampleInfoSeq dds_sample_infos;
-
-      ::DDS_InstanceHandle_t dds_handle = ::DDS_HANDLE_NIL;
-      dds_handle <<= a_handle;
-
-      RTI_SEQ_TYPE dds_data_values;
-
-      ::DDS::ReturnCode_t const retcode_read_instance =
-        this->rti_entity ()->read_instance (dds_data_values,
-                                            dds_sample_infos,
-                                            max_samples,
-                                            dds_handle,
-                                            sample_states,
-                                            view_states,
-                                            instance_states);
-      return this->complete_read (dds_data_values, data_values,
-                                  dds_sample_infos, sample_infos,
-                                  retcode_read_instance, "read_instance");
-    }
-
-    template <typename TYPED_DDS_READER, typename TYPED_READER_TYPE, typename VALUE_TYPE, typename SEQ_TYPE, typename RTI_SEQ_TYPE>
-    ::DDS::ReturnCode_t
-    DataReader_T <TYPED_DDS_READER, TYPED_READER_TYPE, VALUE_TYPE, SEQ_TYPE, RTI_SEQ_TYPE>::take_instance (
-      SEQ_TYPE & data_values,
-      ::DDS::SampleInfoSeq & sample_infos,
-      ::CORBA::Long max_samples,
-      const ::DDS::InstanceHandle_t & a_handle,
-      ::DDS::SampleStateMask sample_states,
-      ::DDS::ViewStateMask view_states,
-      ::DDS::InstanceStateMask instance_states)
-    {
-      DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::take_instance");
-
-      DDS_SampleInfoSeq dds_sample_infos;
-
-      ::DDS_InstanceHandle_t dds_handle = ::DDS_HANDLE_NIL;
-      dds_handle <<= a_handle;
-
-      RTI_SEQ_TYPE dds_data_values;
-
-      ::DDS::ReturnCode_t const retcode_take_instance =
-        this->rti_entity ()->take_instance (dds_data_values,
-                                            dds_sample_infos,
-                                            max_samples,
-                                            dds_handle,
-                                            sample_states,
-                                            view_states,
-                                            instance_states);
-      return this->complete_read (dds_data_values, data_values,
-                                  dds_sample_infos, sample_infos,
-                                  retcode_take_instance, "take_instance");
-    }
-
-    template <typename TYPED_DDS_READER, typename TYPED_READER_TYPE, typename VALUE_TYPE, typename SEQ_TYPE, typename RTI_SEQ_TYPE>
-    ::DDS::ReturnCode_t
-    DataReader_T <TYPED_DDS_READER, TYPED_READER_TYPE, VALUE_TYPE, SEQ_TYPE, RTI_SEQ_TYPE>::read_next_instance (
-      SEQ_TYPE & data_values,
-      ::DDS::SampleInfoSeq & sample_infos,
-      ::CORBA::Long max_samples,
-      const ::DDS::InstanceHandle_t & a_handle,
-      ::DDS::SampleStateMask sample_states,
-      ::DDS::ViewStateMask view_states,
-      ::DDS::InstanceStateMask instance_states)
-    {
-      DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::read_next_instance");
-
-      DDS_SampleInfoSeq dds_sample_infos;
-
-      ::DDS_InstanceHandle_t dds_handle = ::DDS_HANDLE_NIL;
-      dds_handle <<= a_handle;
-
-      RTI_SEQ_TYPE dds_data_values;
-
-      ::DDS::ReturnCode_t const retcode_read_next_instance =
-        this->rti_entity ()->read_next_instance (dds_data_values,
-                                                 dds_sample_infos,
-                                                 max_samples,
-                                                 dds_handle,
-                                                 sample_states,
-                                                 view_states,
-                                                 instance_states);
-      return this->complete_read (dds_data_values, data_values,
-                                  dds_sample_infos, sample_infos,
-                                  retcode_read_next_instance, "read_next_instance");
-    }
-
-    template <typename TYPED_DDS_READER, typename TYPED_READER_TYPE, typename VALUE_TYPE, typename SEQ_TYPE, typename RTI_SEQ_TYPE>
-    ::DDS::ReturnCode_t
-    DataReader_T <TYPED_DDS_READER, TYPED_READER_TYPE, VALUE_TYPE, SEQ_TYPE, RTI_SEQ_TYPE>::take_next_instance (
-      SEQ_TYPE & data_values,
-      ::DDS::SampleInfoSeq & sample_infos,
-      ::CORBA::Long max_samples,
-      const ::DDS::InstanceHandle_t & a_handle,
-      ::DDS::SampleStateMask sample_states,
-      ::DDS::ViewStateMask view_states,
-      ::DDS::InstanceStateMask instance_states)
-    {
-      DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::take_next_instance");
-
-      DDS_SampleInfoSeq dds_sample_infos;
-
-      ::DDS_InstanceHandle_t dds_handle = ::DDS_HANDLE_NIL;
-      dds_handle <<= a_handle;
-
-      RTI_SEQ_TYPE dds_data_values;
-
-      ::DDS::ReturnCode_t const retcode_take_next_instance =
-        this->rti_entity ()->take_next_instance (dds_data_values,
-                                                 dds_sample_infos,
-                                                 max_samples,
-                                                 dds_handle,
-                                                 sample_states,
-                                                 view_states,
-                                                 instance_states);
-      return this->complete_read (dds_data_values, data_values,
-                                  dds_sample_infos, sample_infos,
-                                  retcode_take_next_instance, "take_next_instance");
-    }
-
-    template <typename TYPED_DDS_READER, typename TYPED_READER_TYPE, typename VALUE_TYPE, typename SEQ_TYPE, typename RTI_SEQ_TYPE>
-    ::DDS::ReturnCode_t
-    DataReader_T <TYPED_DDS_READER, TYPED_READER_TYPE, VALUE_TYPE, SEQ_TYPE, RTI_SEQ_TYPE>::read_next_instance_w_condition (
-      SEQ_TYPE & data_values,
-      ::DDS::SampleInfoSeq & sample_infos,
-      ::CORBA::Long max_samples,
-      const ::DDS::InstanceHandle_t & previous_handle,
-      ::DDS::ReadCondition_ptr a_condition)
-    {
-      DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::read_next_instance_w_condition");
-
-      DDS_SampleInfoSeq dds_sample_infos;
-
-      ::DDS_InstanceHandle_t dds_handle = ::DDS_HANDLE_NIL;
-      dds_handle <<= previous_handle;
-
-      DDS_ReadCondition_i * dds_condition_proxy =
-        dynamic_cast <DDS_ReadCondition_i *>(a_condition);
-      DDSReadCondition * dds_condition = 0;
-      if (dds_condition_proxy)
-        {
-          dds_condition = dds_condition_proxy->get_rti_entity ();
-        }
-
-      RTI_SEQ_TYPE dds_data_values;
-
-      ::DDS::ReturnCode_t const retcode_read_next_instance_w_condition =
-        this->rti_entity ()->read_next_instance_w_condition (dds_data_values,
-                                                             dds_sample_infos,
-                                                             max_samples,
-                                                             dds_handle,
-                                                             dds_condition);
-      return this->complete_read (dds_data_values, data_values,
-                                  dds_sample_infos, sample_infos,
-                                  retcode_read_next_instance_w_condition,
-                                  "read_next_instance_w_condition");
-    }
-
-    template <typename TYPED_DDS_READER, typename TYPED_READER_TYPE, typename VALUE_TYPE, typename SEQ_TYPE, typename RTI_SEQ_TYPE>
-    ::DDS::ReturnCode_t
-    DataReader_T <TYPED_DDS_READER, TYPED_READER_TYPE, VALUE_TYPE, SEQ_TYPE, RTI_SEQ_TYPE>::take_next_instance_w_condition (
-      SEQ_TYPE & data_values,
-      ::DDS::SampleInfoSeq & sample_infos,
-      ::CORBA::Long max_samples,
-      const ::DDS::InstanceHandle_t & previous_handle,
-      ::DDS::ReadCondition_ptr a_condition)
-    {
-      DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::take_next_instance_w_condition");
-
-      DDS_SampleInfoSeq dds_sample_infos;
-
-      ::DDS_InstanceHandle_t dds_handle = ::DDS_HANDLE_NIL;
-      dds_handle <<= previous_handle;
-
-      DDS_ReadCondition_i * dds_condition_proxy =
-        dynamic_cast <DDS_ReadCondition_i *>(a_condition);
-      DDSReadCondition * dds_condition = 0;
-      if (dds_condition_proxy)
-        {
-          dds_condition = dds_condition_proxy->get_rti_entity ();
-        }
-
-      RTI_SEQ_TYPE dds_data_values;
-
-      ::DDS::ReturnCode_t const retcode_take_next_instance_w_condition =
-        this->rti_entity ()->take_next_instance_w_condition (dds_data_values,
-                                                             dds_sample_infos,
-                                                             max_samples,
-                                                             dds_handle,
-                                                             dds_condition);
-      return this->complete_read (dds_data_values, data_values,
-                                  dds_sample_infos, sample_infos,
-                                  retcode_take_next_instance_w_condition,
-                                  "take_next_instance_w_condition");
-    }
-
-    template <typename TYPED_DDS_READER, typename TYPED_READER_TYPE, typename VALUE_TYPE, typename SEQ_TYPE, typename RTI_SEQ_TYPE>
-    ::DDS::ReturnCode_t
-    DataReader_T <TYPED_DDS_READER, TYPED_READER_TYPE, VALUE_TYPE, SEQ_TYPE, RTI_SEQ_TYPE>::return_loan (
-      SEQ_TYPE & /*data_values*/,
-      ::DDS::SampleInfoSeq & /*sample_infos*/)
-    {
-      // No need to implement this since a return_loan is
-      // done every read/take operation in this proxy
-      return ::DDS::RETCODE_OK;
-    }
-
-    template <typename TYPED_DDS_READER, typename TYPED_READER_TYPE, typename VALUE_TYPE, typename SEQ_TYPE, typename RTI_SEQ_TYPE>
-    ::DDS::ReturnCode_t
-    DataReader_T <TYPED_DDS_READER, TYPED_READER_TYPE, VALUE_TYPE, SEQ_TYPE, RTI_SEQ_TYPE>::get_key_value (
-      VALUE_TYPE & key_holder,
-      const ::DDS::InstanceHandle_t & handle)
-    {
-      ::DDS_InstanceHandle_t dds_handle = ::DDS_HANDLE_NIL;
-      dds_handle <<= handle;
-
-      return this->rti_entity ()->get_key_value (key_holder,
-                                                 dds_handle);
-    }
-
-    template <typename TYPED_DDS_READER, typename TYPED_READER_TYPE, typename VALUE_TYPE, typename SEQ_TYPE, typename RTI_SEQ_TYPE>
-    ::DDS::InstanceHandle_t
-    DataReader_T <TYPED_DDS_READER, TYPED_READER_TYPE, VALUE_TYPE, SEQ_TYPE, RTI_SEQ_TYPE>::lookup_instance (
-      const VALUE_TYPE& an_instance)
-    {
-      ::DDS_InstanceHandle_t hnd =
-        this->rti_entity ()->lookup_instance (an_instance);
-      ::DDS::InstanceHandle_t ret = ::DDS::HANDLE_NIL;
-      ret <<= hnd;
-      return ret;
-    }
-
-    template <typename TYPED_DDS_READER, typename TYPED_READER_TYPE, typename VALUE_TYPE, typename SEQ_TYPE, typename RTI_SEQ_TYPE>
-    TYPED_DDS_READER *
-    DataReader_T <TYPED_DDS_READER, TYPED_READER_TYPE, VALUE_TYPE, SEQ_TYPE, RTI_SEQ_TYPE>::rti_entity (void)
-    {
-      if (this->rti_entity_)
-        {
-          return this->rti_entity_;
-        }
-      else
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG,
-                        "DataReader_T <TYPED_DDS_READER, TYPED_READER_TYPE, VALUE_TYPE, SEQ_TYPE, RTI_SEQ_TYPE>::rti_entity - "
-                        "Throwing BAD_INV_ORDER.\n"));
-          throw ::CORBA::BAD_INV_ORDER ();
-        }
-    }
-
-    template <typename TYPED_DDS_READER, typename TYPED_READER_TYPE, typename VALUE_TYPE, typename SEQ_TYPE, typename RTI_SEQ_TYPE>
-    ::DDS::ReturnCode_t
-    DataReader_T <TYPED_DDS_READER, TYPED_READER_TYPE, VALUE_TYPE, SEQ_TYPE, RTI_SEQ_TYPE>::enable (void)
-    {
-      return this->rti_entity ()->enable ();
-    }
-
-    template <typename TYPED_DDS_READER, typename TYPED_READER_TYPE, typename VALUE_TYPE, typename SEQ_TYPE, typename RTI_SEQ_TYPE>
-    ::DDS::StatusCondition_ptr
-    DataReader_T <TYPED_DDS_READER, TYPED_READER_TYPE, VALUE_TYPE, SEQ_TYPE, RTI_SEQ_TYPE>::get_statuscondition (void)
-    {
-      DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::get_statuscondition");
-
-      ::DDS::StatusCondition_var retval;
-      DDSStatusCondition* sc = this->rti_entity ()->get_statuscondition ();
-      if (sc)
-        {
-          ACE_NEW_THROW_EX (retval,
-                            DDS_StatusCondition_i (sc, this->dp_.in ()),
-                            ::CORBA::NO_MEMORY ());
-        }
-      return retval._retn ();
-    }
-
-    template <typename TYPED_DDS_READER, typename TYPED_READER_TYPE, typename VALUE_TYPE, typename SEQ_TYPE, typename RTI_SEQ_TYPE>
-    ::DDS::StatusMask
-    DataReader_T <TYPED_DDS_READER, TYPED_READER_TYPE, VALUE_TYPE, SEQ_TYPE, RTI_SEQ_TYPE>::get_status_changes (void)
-    {
-      DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::get_status_changes");
-
-      return this->rti_entity ()->get_status_changes ();
-    }
-
-    template <typename TYPED_DDS_READER, typename TYPED_READER_TYPE, typename VALUE_TYPE, typename SEQ_TYPE, typename RTI_SEQ_TYPE>
-    DDS_INSTANCE_HANDLE_T_RETN
-    DataReader_T <TYPED_DDS_READER, TYPED_READER_TYPE, VALUE_TYPE, SEQ_TYPE, RTI_SEQ_TYPE>::get_instance_handle (void)
-    {
-      DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::get_instance_handle");
-
-      ::DDS_InstanceHandle_t const rtihandle =
-        this->rti_entity ()->get_instance_handle ();
-      ::DDS::InstanceHandle_t handle;
-      handle <<= rtihandle;
-      return handle;
-    }
-
-    template <typename TYPED_DDS_READER, typename TYPED_READER_TYPE, typename VALUE_TYPE, typename SEQ_TYPE, typename RTI_SEQ_TYPE>
-    ::DDS::ReadCondition_ptr
-    DataReader_T <TYPED_DDS_READER, TYPED_READER_TYPE, VALUE_TYPE, SEQ_TYPE, RTI_SEQ_TYPE>::create_readcondition (
-      ::DDS::SampleStateMask sample_states,
-      ::DDS::ViewStateMask view_states,
-      ::DDS::InstanceStateMask instance_states)
-    {
-      DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::create_readcondition");
-
-      ::DDS::ReadCondition_var retval;
-      DDSReadCondition* rc =
-        this->rti_entity ()->create_readcondition (sample_states,
-                                            view_states,
-                                            instance_states);
-      if (rc)
-        {
-          ACE_NEW_THROW_EX (retval,
-                            DDS_ReadCondition_i (rc, this),
-                            ::CORBA::NO_MEMORY ());
-        }
-      return retval._retn ();
-    }
-
-    template <typename TYPED_DDS_READER, typename TYPED_READER_TYPE, typename VALUE_TYPE, typename SEQ_TYPE, typename RTI_SEQ_TYPE>
-    ::DDS::QueryCondition_ptr
-    DataReader_T <TYPED_DDS_READER, TYPED_READER_TYPE, VALUE_TYPE, SEQ_TYPE, RTI_SEQ_TYPE>::create_querycondition (
-      ::DDS::SampleStateMask sample_states,
-      ::DDS::ViewStateMask view_states,
-      ::DDS::InstanceStateMask instance_states,
-      const char * query_expression,
-      const ::DDS::StringSeq & query_parameters)
-    {
-      DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::create_querycondition");
-
-      ::DDS::QueryCondition_var retval;
-      DDS_StringSeq parameters;
-      parameters <<= query_parameters;
-      DDSQueryCondition* qc = this->rti_entity ()->create_querycondition (
-                                    sample_states,
-                                    view_states,
-                                    instance_states,
-                                    query_expression,
-                                    parameters);
-
-      if (qc)
-        {
-          ACE_NEW_THROW_EX (retval,
-                            DDS_QueryCondition_i (qc, this),
-                            ::CORBA::NO_MEMORY ());
-        }
-      return retval._retn ();
-    }
-
-    template <typename TYPED_DDS_READER, typename TYPED_READER_TYPE, typename VALUE_TYPE, typename SEQ_TYPE, typename RTI_SEQ_TYPE>
-    ::DDS::ReturnCode_t
-    DataReader_T <TYPED_DDS_READER, TYPED_READER_TYPE, VALUE_TYPE, SEQ_TYPE, RTI_SEQ_TYPE>::delete_readcondition (
-      ::DDS::ReadCondition_ptr a_condition)
-    {
-      DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::delete_readcondition");
-
-      ::DDSReadCondition * dds_rc = 0;
-      DDS_ReadCondition_i * rc = dynamic_cast< DDS_ReadCondition_i *> (a_condition);
-      DDS_QueryCondition_i * qc = dynamic_cast< DDS_QueryCondition_i *> (a_condition);
-
-      if (!rc)
-        {
-          if (!qc)
-            {
-              DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_CAST_ERROR, (LM_DEBUG, DDS4CCM_INFO
-                            ACE_TEXT ("DataReader_T::delete_readcondition - ")
-                            ACE_TEXT ("Unable to cast provided condition to a typed ")
-                            ACE_TEXT ("read condition nor a typed query condition\n")));
-              return ::DDS::RETCODE_BAD_PARAMETER;
-            }
-          dds_rc = dynamic_cast < ::DDSReadCondition *> (qc->get_rti_entity ());
-          if (!dds_rc)
-            {
-              DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_CAST_ERROR, (LM_DEBUG, DDS4CCM_INFO
-                            ACE_TEXT ("DataReader_T::delete_readcondition - ")
-                            ACE_TEXT ("Unable to cast DDSQueryCondition to a ")
-                            ACE_TEXT ("DDSReadCondition\n")));
-              return ::DDS::RETCODE_BAD_PARAMETER;
-            }
-        }
-      else
-        {
-          dds_rc = rc->get_rti_entity ();
-        }
-
-      if (rc)
-        {
-          rc->set_rti_entity (0);
-        }
-      if (qc)
-        {
-          qc->set_rti_entity (0);
-        }
-
-      return this->rti_entity ()->delete_readcondition (dds_rc);
-    }
-
-    template <typename TYPED_DDS_READER, typename TYPED_READER_TYPE, typename VALUE_TYPE, typename SEQ_TYPE, typename RTI_SEQ_TYPE>
-    ::DDS::ReturnCode_t
-    DataReader_T <TYPED_DDS_READER, TYPED_READER_TYPE, VALUE_TYPE, SEQ_TYPE, RTI_SEQ_TYPE>::delete_contained_entities (void)
-    {
-      DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::delete_contained_entities");
-
-      return this->rti_entity ()->delete_contained_entities ();
-    }
-
-    template <typename TYPED_DDS_READER, typename TYPED_READER_TYPE, typename VALUE_TYPE, typename SEQ_TYPE, typename RTI_SEQ_TYPE>
-    ::DDS::ReturnCode_t
-    DataReader_T <TYPED_DDS_READER, TYPED_READER_TYPE, VALUE_TYPE, SEQ_TYPE, RTI_SEQ_TYPE>::set_qos (
-      const ::DDS::DataReaderQos &qos)
-    {
-      DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::set_qos");
-
-      ::DDS_DataReaderQos ccm_dds_qos;
-      DDS_ReturnCode_t const retcode = this->rti_entity ()->get_qos (ccm_dds_qos);
-      if (retcode != DDS_RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        "DataReader_T<TYPED_DDS_READER, TYPED_READER_TYPE, VALUE_TYPE, SEQ_TYPE, RTI_SEQ_TYPE>::set_qos - "
-                        "Error: Unable to retrieve qos\n"));
-          return retcode;
-        }
-      ccm_dds_qos <<= qos;
-      return this->rti_entity ()->set_qos (ccm_dds_qos);
-    }
-
-    template <typename TYPED_DDS_READER, typename TYPED_READER_TYPE, typename VALUE_TYPE, typename SEQ_TYPE, typename RTI_SEQ_TYPE>
-    ::DDS::ReturnCode_t
-    DataReader_T <TYPED_DDS_READER, TYPED_READER_TYPE, VALUE_TYPE, SEQ_TYPE, RTI_SEQ_TYPE>::get_qos (
-      ::DDS::DataReaderQos &qos)
-    {
-      DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::get_qos");
-
-      ::DDS_DataReaderQos ccm_dds_qos;
-      ccm_dds_qos <<= qos;
-      ::DDS_ReturnCode_t const retval = this->rti_entity ()->get_qos (ccm_dds_qos);
-      qos <<= ccm_dds_qos;
-      return retval;
-    }
-
-    template <typename TYPED_DDS_READER, typename TYPED_READER_TYPE, typename VALUE_TYPE, typename SEQ_TYPE, typename RTI_SEQ_TYPE>
-    ::DDS::ReturnCode_t
-    DataReader_T <TYPED_DDS_READER, TYPED_READER_TYPE, VALUE_TYPE, SEQ_TYPE, RTI_SEQ_TYPE>::set_listener (
-      ::DDS::DataReaderListener_ptr a_listener,
-      ::DDS::StatusMask mask)
-    {
-      DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T <TYPED_DDS_READER, TYPED_READER_TYPE, VALUE_TYPE, SEQ_TYPE, RTI_SEQ_TYPE>::set_listener");
-
-      // Retrieve the previously set listener
-      DDSDataReaderListener *old_listener = this->rti_entity ()->get_listener ();
-
-      DDSDataReaderListener *listener = 0;
-      if (! ::CORBA::is_nil (a_listener))
-        {
-          ACE_NEW_THROW_EX (listener,
-                            DDS_DataReaderListener_i (
-                              a_listener,
-                              this),
-                            ::CORBA::NO_MEMORY ());
-        }
-
-      ::DDS::ReturnCode_t const retcode =
-        this->rti_entity ()->set_listener (listener, mask);
-
-      if (retcode != ::DDS::RETCODE_OK)
-        {
-          delete listener;
-        }
-      else
-        {
-          delete old_listener;
-        }
-
-      return retcode;
-    }
-
-    template <typename TYPED_DDS_READER, typename TYPED_READER_TYPE, typename VALUE_TYPE, typename SEQ_TYPE, typename RTI_SEQ_TYPE>
-    ::DDS::DataReaderListener_ptr
-    DataReader_T <TYPED_DDS_READER, TYPED_READER_TYPE, VALUE_TYPE, SEQ_TYPE, RTI_SEQ_TYPE>::get_listener (void)
-    {
-      DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T <TYPED_DDS_READER, TYPED_READER_TYPE, VALUE_TYPE, SEQ_TYPE, RTI_SEQ_TYPE>::get_listener");
-
-      DDSDataReaderListener *drl = this->rti_entity ()->get_listener ();
-      DDS_DataReaderListener_i *ccm_dds_drl =
-        dynamic_cast <DDS_DataReaderListener_i *> (drl);
-      if (!ccm_dds_drl)
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, "DataReader_T"
-                                    "::get_listener - "
-                                    "DDS returned a NIL listener.\n"));
-          return ::DDS::DataReaderListener::_nil ();
-        }
-      return ccm_dds_drl->get_datareaderlistener ();
-    }
-
-    template <typename TYPED_DDS_READER, typename TYPED_READER_TYPE, typename VALUE_TYPE, typename SEQ_TYPE, typename RTI_SEQ_TYPE>
-    ::DDS::TopicDescription_ptr
-    DataReader_T <TYPED_DDS_READER, TYPED_READER_TYPE, VALUE_TYPE, SEQ_TYPE, RTI_SEQ_TYPE>::get_topicdescription (void)
-    {
-      DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::get_topicdescription");
-
-      ::DDS::TopicDescription_var dds_td;
-      DDSTopicDescription* td = this->rti_entity ()->get_topicdescription ();
-      DDSTopic * tp = 0;
-      if (td)
-        {
-          tp = DDSTopic::narrow (td);
-
-          if (tp)
-            {
-              ACE_NEW_THROW_EX (dds_td,
-                                DDS_Topic_i (tp, this->dp_.in ()),
-                                ::CORBA::NO_MEMORY ());
-            }
-          else
-            {
-              ::DDSContentFilteredTopic * cft =
-                DDSContentFilteredTopic::narrow (td);
-              if (cft)
-                {
-                  ACE_NEW_THROW_EX (dds_td,
-                                    DDS_ContentFilteredTopic_i (cft, this->dp_.in ()),
-                                    ::CORBA::NO_MEMORY ());
-                }
-            }
-        }
-      return dds_td._retn ();
-    }
-
-    template <typename TYPED_DDS_READER, typename TYPED_READER_TYPE, typename VALUE_TYPE, typename SEQ_TYPE, typename RTI_SEQ_TYPE>
-    ::DDS::Subscriber_ptr
-    DataReader_T <TYPED_DDS_READER, TYPED_READER_TYPE, VALUE_TYPE, SEQ_TYPE, RTI_SEQ_TYPE>::get_subscriber (void)
-    {
-      DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::get_subscriber");
-
-      return ::DDS::Subscriber::_duplicate (this->sub_.in ());
-    }
-
-    template <typename TYPED_DDS_READER, typename TYPED_READER_TYPE, typename VALUE_TYPE, typename SEQ_TYPE, typename RTI_SEQ_TYPE>
-    ::DDS::ReturnCode_t
-    DataReader_T <TYPED_DDS_READER, TYPED_READER_TYPE, VALUE_TYPE, SEQ_TYPE, RTI_SEQ_TYPE>::get_sample_rejected_status (
-      ::DDS::SampleRejectedStatus & status)
-    {
-      DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::get_sample_rejected_status");
-
-      DDS_SampleRejectedStatus ddsstatus;
-      ::DDS::ReturnCode_t const retval = this->rti_entity ()->get_sample_rejected_status (ddsstatus);
-      status <<= ddsstatus;
-      return retval;
-    }
-
-    template <typename TYPED_DDS_READER, typename TYPED_READER_TYPE, typename VALUE_TYPE, typename SEQ_TYPE, typename RTI_SEQ_TYPE>
-    ::DDS::ReturnCode_t
-    DataReader_T <TYPED_DDS_READER, TYPED_READER_TYPE, VALUE_TYPE, SEQ_TYPE, RTI_SEQ_TYPE>::get_liveliness_changed_status (
-      ::DDS::LivelinessChangedStatus & status)
-    {
-      DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::get_liveliness_changed_status");
-
-      DDS_LivelinessChangedStatus ddsstatus;
-      ::DDS::ReturnCode_t const retval = this->rti_entity ()->get_liveliness_changed_status (ddsstatus);
-      status <<= ddsstatus;
-      return retval;
-    }
-
-    template <typename TYPED_DDS_READER, typename TYPED_READER_TYPE, typename VALUE_TYPE, typename SEQ_TYPE, typename RTI_SEQ_TYPE>
-    ::DDS::ReturnCode_t
-    DataReader_T <TYPED_DDS_READER, TYPED_READER_TYPE, VALUE_TYPE, SEQ_TYPE, RTI_SEQ_TYPE>::get_requested_deadline_missed_status (
-      ::DDS::RequestedDeadlineMissedStatus & status)
-    {
-      DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::get_requested_deadline_missed_status");
-
-      DDS_RequestedDeadlineMissedStatus ddsstatus;
-      ::DDS::ReturnCode_t const retval = this->rti_entity ()->get_requested_deadline_missed_status (ddsstatus);
-      status <<= ddsstatus;
-      return retval;
-    }
-
-    template <typename TYPED_DDS_READER, typename TYPED_READER_TYPE, typename VALUE_TYPE, typename SEQ_TYPE, typename RTI_SEQ_TYPE>
-    ::DDS::ReturnCode_t
-    DataReader_T <TYPED_DDS_READER, TYPED_READER_TYPE, VALUE_TYPE, SEQ_TYPE, RTI_SEQ_TYPE>::get_requested_incompatible_qos_status (
-      ::DDS::RequestedIncompatibleQosStatus & status)
-    {
-      DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::get_requested_incompatible_qos_status");
-
-      DDS_RequestedIncompatibleQosStatus ddsstatus;
-      ::DDS::ReturnCode_t const retval =
-        this->rti_entity ()->get_requested_incompatible_qos_status (ddsstatus);
-      status <<= ddsstatus;
-      return retval;
-    }
-
-    template <typename TYPED_DDS_READER, typename TYPED_READER_TYPE, typename VALUE_TYPE, typename SEQ_TYPE, typename RTI_SEQ_TYPE>
-    ::DDS::ReturnCode_t
-    DataReader_T <TYPED_DDS_READER, TYPED_READER_TYPE, VALUE_TYPE, SEQ_TYPE, RTI_SEQ_TYPE>::get_subscription_matched_status (
-      ::DDS::SubscriptionMatchedStatus & status)
-    {
-      DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::get_subscription_matched_status");
-
-      ::DDS_SubscriptionMatchedStatus ddsstatus;
-      ::DDS::ReturnCode_t const retval = this->rti_entity ()->get_subscription_matched_status (ddsstatus);
-      status <<= ddsstatus;
-      return retval;
-    }
-
-    template <typename TYPED_DDS_READER, typename TYPED_READER_TYPE, typename VALUE_TYPE, typename SEQ_TYPE, typename RTI_SEQ_TYPE>
-    ::DDS::ReturnCode_t
-    DataReader_T <TYPED_DDS_READER, TYPED_READER_TYPE, VALUE_TYPE, SEQ_TYPE, RTI_SEQ_TYPE>::get_sample_lost_status (
-      ::DDS::SampleLostStatus & status)
-    {
-      DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::get_sample_lost_status");
-
-      DDS_SampleLostStatus ddsstatus;
-      ::DDS::ReturnCode_t const retval = this->rti_entity ()->get_sample_lost_status (ddsstatus);
-      status <<= ddsstatus;
-      return retval;
-    }
-
-    template <typename TYPED_DDS_READER, typename TYPED_READER_TYPE, typename VALUE_TYPE, typename SEQ_TYPE, typename RTI_SEQ_TYPE>
-    ::DDS::ReturnCode_t
-    DataReader_T <TYPED_DDS_READER, TYPED_READER_TYPE, VALUE_TYPE, SEQ_TYPE, RTI_SEQ_TYPE>::wait_for_historical_data (
-      const ::DDS::Duration_t & max_wait)
-    {
-      DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::wait_for_historical_data");
-
-      ::DDS_Duration_t rtiduration;
-      rtiduration <<= max_wait;
-      return this->rti_entity ()->wait_for_historical_data (rtiduration);
-    }
-
-    template <typename TYPED_DDS_READER, typename TYPED_READER_TYPE, typename VALUE_TYPE, typename SEQ_TYPE, typename RTI_SEQ_TYPE>
-    ::DDS::ReturnCode_t
-    DataReader_T <TYPED_DDS_READER, TYPED_READER_TYPE, VALUE_TYPE, SEQ_TYPE, RTI_SEQ_TYPE>::get_matched_publications (
-      ::DDS::InstanceHandleSeq & publication_handles)
-    {
-      DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T <TYPED_DDS_READER, TYPED_READER_TYPE, VALUE_TYPE, SEQ_TYPE, RTI_SEQ_TYPE>::get_matched_publications");
-
-      ::DDS_InstanceHandleSeq rtiseq;
-      ::DDS::ReturnCode_t const retval = this->rti_entity ()->get_matched_publications (rtiseq);
-      publication_handles <<= rtiseq;
-      return retval;
-    }
-
-    template <typename TYPED_DDS_READER, typename TYPED_READER_TYPE, typename VALUE_TYPE, typename SEQ_TYPE, typename RTI_SEQ_TYPE>
-    ::DDS::ReturnCode_t
-    DataReader_T <TYPED_DDS_READER, TYPED_READER_TYPE, VALUE_TYPE, SEQ_TYPE, RTI_SEQ_TYPE>::get_matched_publication_data (
-      ::DDS::PublicationBuiltinTopicData & publication_data,
-      DDS_INSTANCE_HANDLE_T_IN publication_handle)
-    {
-      DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::get_matched_publication_data");
-
-      ::DDS_PublicationBuiltinTopicData ccm_dds_pub_data;
-      ::DDS_InstanceHandle_t ccm_dds_pub_handle;
-
-      ccm_dds_pub_data <<= publication_data;
-      ccm_dds_pub_handle <<= publication_handle;
-      ::DDS::ReturnCode_t const retcode = this->rti_entity ()->
-                    get_matched_publication_data (ccm_dds_pub_data,
-                                                  ccm_dds_pub_handle);
-      publication_data <<= ccm_dds_pub_data;
-      return retcode;
-    }
-
-    template <typename TYPED_DDS_READER, typename TYPED_READER_TYPE, typename VALUE_TYPE, typename SEQ_TYPE, typename RTI_SEQ_TYPE>
-    void
-    DataReader_T <TYPED_DDS_READER, TYPED_READER_TYPE, VALUE_TYPE, SEQ_TYPE, RTI_SEQ_TYPE>::set_rti_entity (
-      ::DDSDataReader* dr, ::DDS::DomainParticipant_ptr dp)
-    {
-      DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::set_rti_entity");
-
-      if (dr)
-        {
-          this->rti_entity_ = TYPED_DDS_READER::narrow (dr);
-        }
-      else
-        {
-          this->rti_entity_ = 0;
-        }
-      this->dp_ = ::DDS::DomainParticipant::_duplicate (dp);
-    }
-
-    template <typename TYPED_DDS_READER, typename TYPED_READER_TYPE, typename VALUE_TYPE, typename SEQ_TYPE, typename RTI_SEQ_TYPE>
-    ::DDSDataReader*
-    DataReader_T <TYPED_DDS_READER, TYPED_READER_TYPE, VALUE_TYPE, SEQ_TYPE, RTI_SEQ_TYPE>::get_rti_entity (void)
-    {
-      return this->rti_entity_;
-    }
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReader_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DataReader_T.h
deleted file mode 100644
index 5cdee526065..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataReader_T.h
+++ /dev/null
@@ -1,228 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- *
- * Common dataReader class for the Getter, Reader,
- * and, Listen port
- */
-#ifndef DATAREADER_T_H_
-#define DATAREADER_T_H_
-
-#include "dds4ccm/impl/ndds/DataReader.h"
-#include "dds4ccm/impl/ndds/convertors/InstanceHandle_t.h"
-
-namespace CIAO
-{
-  namespace NDDS
-  {
-    template <typename TYPED_DDS_READER, typename TYPED_READER_TYPE, typename VALUE_TYPE, typename SEQ_TYPE, typename RTI_SEQ_TYPE>
-    class DataReader_T
-      : public virtual DDS_DataReader_Base,
-        public virtual TYPED_READER_TYPE
-    {
-    public:
-      /// Constructor
-      explicit DataReader_T (::DDSDataReader * dr,
-                             ::DDS::DomainParticipant_ptr dp,
-                             ::DDS::Subscriber_ptr sub);
-
-      /// Destructor
-      virtual ~DataReader_T (void);
-
-      virtual ::DDS::ReturnCode_t read (
-        SEQ_TYPE & data_values,
-        ::DDS::SampleInfoSeq & sample_infos,
-        ::CORBA::Long max_samples,
-        ::DDS::SampleStateMask sample_states,
-        ::DDS::ViewStateMask view_states,
-        ::DDS::InstanceStateMask instance_states);
-
-      virtual ::DDS::ReturnCode_t take (
-        SEQ_TYPE & data_values,
-        ::DDS::SampleInfoSeq & sample_infos,
-        ::CORBA::Long max_samples,
-        ::DDS::SampleStateMask sample_states,
-        ::DDS::ViewStateMask view_states,
-        ::DDS::InstanceStateMask instance_states);
-
-      virtual ::DDS::ReturnCode_t read_w_condition (
-        SEQ_TYPE & data_values,
-        ::DDS::SampleInfoSeq & sample_infos,
-        ::CORBA::Long max_samples,
-        ::DDS::ReadCondition_ptr a_condition);
-
-      virtual ::DDS::ReturnCode_t take_w_condition (
-        SEQ_TYPE & data_values,
-        ::DDS::SampleInfoSeq & sample_infos,
-        ::CORBA::Long max_samples,
-        ::DDS::ReadCondition_ptr a_condition);
-
-      virtual ::DDS::ReturnCode_t read_next_sample (
-        VALUE_TYPE & data_values,
-        ::DDS::SampleInfo & sample_info);
-
-      virtual ::DDS::ReturnCode_t take_next_sample (
-        VALUE_TYPE & data_values,
-        ::DDS::SampleInfo & sample_info);
-
-      virtual ::DDS::ReturnCode_t read_instance (
-        SEQ_TYPE & data_values,
-        ::DDS::SampleInfoSeq & sample_infos,
-        ::CORBA::Long max_samples,
-        const ::DDS::InstanceHandle_t & a_handle,
-        ::DDS::SampleStateMask sample_states,
-        ::DDS::ViewStateMask view_states,
-        ::DDS::InstanceStateMask instance_states);
-
-      virtual ::DDS::ReturnCode_t take_instance (
-        SEQ_TYPE & data_values,
-        ::DDS::SampleInfoSeq & sample_infos,
-        ::CORBA::Long max_samples,
-        const ::DDS::InstanceHandle_t & a_handle,
-        ::DDS::SampleStateMask sample_states,
-        ::DDS::ViewStateMask view_states,
-        ::DDS::InstanceStateMask instance_states);
-
-      virtual ::DDS::ReturnCode_t read_next_instance (
-        SEQ_TYPE & data_values,
-        ::DDS::SampleInfoSeq & sample_infos,
-        ::CORBA::Long max_samples,
-        const ::DDS::InstanceHandle_t & previous_handle,
-        ::DDS::SampleStateMask sample_states,
-        ::DDS::ViewStateMask view_states,
-        ::DDS::InstanceStateMask instance_states);
-
-      virtual ::DDS::ReturnCode_t take_next_instance (
-        SEQ_TYPE & data_values,
-        ::DDS::SampleInfoSeq & sample_infos,
-        ::CORBA::Long max_samples,
-        const ::DDS::InstanceHandle_t & previous_handle,
-        ::DDS::SampleStateMask sample_states,
-        ::DDS::ViewStateMask view_states,
-        ::DDS::InstanceStateMask instance_states);
-
-      virtual ::DDS::ReturnCode_t read_next_instance_w_condition (
-        SEQ_TYPE & data_values,
-        ::DDS::SampleInfoSeq & sample_infos,
-        ::CORBA::Long max_samples,
-        const ::DDS::InstanceHandle_t & previous_handle,
-        ::DDS::ReadCondition_ptr a_condition);
-
-      virtual ::DDS::ReturnCode_t take_next_instance_w_condition (
-        SEQ_TYPE & data_values,
-        ::DDS::SampleInfoSeq & sample_infos,
-        ::CORBA::Long max_samples,
-        const ::DDS::InstanceHandle_t & previous_handle,
-        ::DDS::ReadCondition_ptr a_condition);
-
-      virtual ::DDS::ReturnCode_t return_loan (
-        SEQ_TYPE & data_values,
-        ::DDS::SampleInfoSeq & sample_infos);
-
-      virtual ::DDS::ReturnCode_t get_key_value (
-        VALUE_TYPE & key_holder,
-        const ::DDS::InstanceHandle_t & handle);
-
-      virtual ::DDS::InstanceHandle_t lookup_instance (
-        const VALUE_TYPE& an_instance);
-
-      virtual ::DDS::ReturnCode_t enable (void);
-
-      virtual ::DDS::StatusCondition_ptr get_statuscondition (void);
-
-      virtual ::DDS::StatusMask get_status_changes (void);
-
-      virtual DDS_INSTANCE_HANDLE_T_RETN get_instance_handle (void);
-
-      virtual ::DDS::ReadCondition_ptr
-      create_readcondition (
-        ::DDS::SampleStateMask sample_states,
-        ::DDS::ViewStateMask view_states,
-        ::DDS::InstanceStateMask instance_states);
-
-      virtual ::DDS::QueryCondition_ptr
-      create_querycondition (
-        ::DDS::SampleStateMask sample_states,
-        ::DDS::ViewStateMask view_states,
-        ::DDS::InstanceStateMask instance_states,
-        const char * query_expression,
-        const ::DDS::StringSeq & query_parameters);
-
-      virtual ::DDS::ReturnCode_t
-      delete_readcondition (
-        ::DDS::ReadCondition_ptr a_condition);
-
-      virtual ::DDS::ReturnCode_t delete_contained_entities (void);
-
-      virtual ::DDS::ReturnCode_t set_qos (const ::DDS::DataReaderQos & qos);
-
-      virtual ::DDS::ReturnCode_t get_qos (::DDS::DataReaderQos & qos);
-
-      virtual ::DDS::ReturnCode_t
-      set_listener (::DDS::DataReaderListener_ptr a_listener,
-                    ::DDS::StatusMask mask);
-
-      virtual ::DDS::DataReaderListener_ptr get_listener (void);
-
-      virtual ::DDS::TopicDescription_ptr get_topicdescription (void);
-
-      virtual ::DDS::Subscriber_ptr get_subscriber (void);
-
-      virtual ::DDS::ReturnCode_t
-      get_sample_rejected_status (::DDS::SampleRejectedStatus & status);
-
-      virtual ::DDS::ReturnCode_t
-      get_liveliness_changed_status (
-        ::DDS::LivelinessChangedStatus & status);
-
-      virtual ::DDS::ReturnCode_t
-      get_requested_deadline_missed_status (
-        ::DDS::RequestedDeadlineMissedStatus & status);
-
-      virtual ::DDS::ReturnCode_t
-      get_requested_incompatible_qos_status (
-        ::DDS::RequestedIncompatibleQosStatus & status);
-
-      virtual ::DDS::ReturnCode_t
-      get_subscription_matched_status (
-        ::DDS::SubscriptionMatchedStatus & status);
-
-      virtual ::DDS::ReturnCode_t
-      get_sample_lost_status (::DDS::SampleLostStatus & status);
-
-      virtual ::DDS::ReturnCode_t
-      wait_for_historical_data (const ::DDS::Duration_t & max_wait);
-
-      virtual ::DDS::ReturnCode_t
-      get_matched_publications (
-        ::DDS::InstanceHandleSeq & publication_handles);
-
-      virtual ::DDS::ReturnCode_t
-      get_matched_publication_data (
-        ::DDS::PublicationBuiltinTopicData & publication_data,
-        DDS_INSTANCE_HANDLE_T_IN publication_handle);
-
-      virtual void set_rti_entity (::DDSDataReader* dr, ::DDS::DomainParticipant_ptr dp);
-
-      ::DDSDataReader * get_rti_entity (void);
-
-    private:
-      TYPED_DDS_READER * rti_entity_;
-      ::DDS::DomainParticipant_var dp_;
-      ::DDS::Subscriber_var sub_;
-
-      TYPED_DDS_READER * rti_entity (void);
-
-      ::DDS::ReturnCode_t complete_read (
-        RTI_SEQ_TYPE & dds_data_values,
-        SEQ_TYPE & data_values,
-        DDS_SampleInfoSeq & dds_sample_infos,
-        ::DDS::SampleInfoSeq & sample_infos,
-        const ::DDS::ReturnCode_t & retcode,
-        const char * method_name);
-    };
-  }
-}
-
-#include "dds4ccm/impl/ndds/DataReader_T.cpp"
-
-#endif /* DATAREADER_T_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.cpp
deleted file mode 100644
index fda2bba2aba..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "dds4ccm/impl/ndds/DataWriter.h"
-#include "dds4ccm/impl/logger/Log_Macros.h"
-#include "ndds/ndds_cpp.h"
-
-namespace CIAO
-{
-  namespace NDDS
-  {
-    DDS_DataWriter_Base::DDS_DataWriter_Base (void)
-    {
-    }
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.h b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.h
deleted file mode 100644
index 269c92d3e02..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDS4CCM_DATAWRITER_H
-#define DDS4CCM_DATAWRITER_H
-
-#include "dds4ccm/idl/ndds/ndds_dcpsC.h"
-
-#include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h"
-
-#include "tao/LocalObject.h"
-
-class DDSDataWriter;
-
-namespace CIAO
-{
-  namespace NDDS
-  {
-    class DDS4CCM_NDDS_Export DDS_DataWriter_Base
-      : public virtual ::DDS::DataWriter,
-        public virtual ::CORBA::LocalObject
-    {
-    public:
-      /// Constructor
-      DDS_DataWriter_Base (void);
-
-      virtual ::DDSDataWriter * get_rti_entity (void) = 0;
-
-      virtual void set_rti_entity (::DDSDataWriter * dw) = 0;
-    };
-  }
-}
-
-#endif /* DDS4CCM_DATAWRITER_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.cpp
deleted file mode 100644
index f27f595e6e2..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-#include "dds4ccm/impl/ndds/DataWriterListener.h"
-#include "dds4ccm/impl/ndds/convertors/PublicationMatchedStatus.h"
-#include "dds4ccm/impl/ndds/convertors/LivelinessLostStatus.h"
-#include "dds4ccm/impl/ndds/convertors/OfferedIncompatibleQosStatus.h"
-#include "dds4ccm/impl/ndds/convertors/OfferedDeadlineMissedStatus.h"
-#include "dds4ccm/impl/logger/Log_Macros.h"
-
-namespace CIAO
-{
-  namespace NDDS
-  {
-
-    DDS_DataWriterListener_i::DDS_DataWriterListener_i (
-      ::DDS::DataWriterListener_ptr s,
-      ::DDS::DataWriter_ptr dw)
-      : impl_ (::DDS::DataWriterListener::_duplicate (s)),
-        dw_ (::DDS::DataWriter::_duplicate (dw))
-    {
-    }
-
-    DDS_DataWriterListener_i::~DDS_DataWriterListener_i (void)
-    {
-    }
-
-    void
-    DDS_DataWriterListener_i::on_offered_deadline_missed (
-      ::DDSDataWriter *,
-      const ::DDS_OfferedDeadlineMissedStatus & status)
-    {
-      DDS4CCM_TRACE ("DDS_DataWriterListener_i::on_offered_deadline_missed");
-      ::DDS::OfferedDeadlineMissedStatus ddsstatus;
-      ddsstatus <<= status;
-      this->impl_->on_offered_deadline_missed (this->dw_, ddsstatus);
-    }
-
-
-    void
-    DDS_DataWriterListener_i::on_offered_incompatible_qos (
-      ::DDSDataWriter *,
-      const ::DDS_OfferedIncompatibleQosStatus & status)
-    {
-      DDS4CCM_TRACE ("DDS_DataWriterListener_i::on_offered_incompatible_qos");
-      ::DDS::OfferedIncompatibleQosStatus ddsstatus;
-      ddsstatus <<= status;
-      this->impl_->on_offered_incompatible_qos (this->dw_, ddsstatus);
-    }
-
-    void
-    DDS_DataWriterListener_i::on_liveliness_lost (
-      ::DDSDataWriter *,
-      const ::DDS_LivelinessLostStatus & status)
-    {
-      DDS4CCM_TRACE ("DDS_DataWriterListener_i::on_liveliness_lost");
-      ::DDS::LivelinessLostStatus ddsstatus;
-      ddsstatus <<= status;
-      this->impl_->on_liveliness_lost (this->dw_, ddsstatus);
-    }
-
-    void
-    DDS_DataWriterListener_i::on_publication_matched (
-      ::DDSDataWriter *,
-      const ::DDS_PublicationMatchedStatus & status)
-    {
-      DDS4CCM_TRACE ("DDS_DataWriterListener_i::on_publication_matched");
-      ::DDS::PublicationMatchedStatus ddsstatus;
-      ddsstatus <<= status;
-      this->impl_->on_publication_matched (this->dw_, ddsstatus);
-    }
-
-    ::DDS::DataWriterListener_ptr
-    DDS_DataWriterListener_i::get_datawriterlistener (void)
-    {
-      return ::DDS::DataWriterListener::_duplicate (this->impl_.in ());
-    }
-
-    void
-    DDS_DataWriterListener_i::set_dds_entity (::DDS::DataWriter_ptr dw)
-    {
-      this->dw_ = ::DDS::DataWriter::_duplicate (dw);
-    }
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.h b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.h
deleted file mode 100644
index 4adf86b0a17..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * @author William R. Otte <wotte@dre.vanderbilt.edu>
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDSDATAWRITERLISTENER_T_H_
-#define DDSDATAWRITERLISTENER_T_H_
-
-#include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h"
-#include "dds4ccm/idl/ndds/ndds_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-
-namespace CIAO
-{
-  namespace NDDS
-  {
-    class DDS4CCM_NDDS_Export DDS_DataWriterListener_i :
-      public ::DDSDataWriterListener
-    {
-    public:
-      /// Constructor
-      DDS_DataWriterListener_i (::DDS::DataWriterListener_ptr p,
-                                ::DDS::DataWriter_ptr dw);
-
-      /// Destructor
-      virtual ~DDS_DataWriterListener_i (void);
-
-      virtual void on_offered_deadline_missed (
-        ::DDSDataWriter *the_writer,
-        const ::DDS_OfferedDeadlineMissedStatus & status);
-
-      virtual void on_offered_incompatible_qos (
-        ::DDSDataWriter *the_writer,
-        const ::DDS_OfferedIncompatibleQosStatus & status);
-
-      virtual void on_liveliness_lost (
-        ::DDSDataWriter *the_writer,
-        const ::DDS_LivelinessLostStatus & status);
-
-      virtual void on_publication_matched (
-        ::DDSDataWriter *the_writer,
-        const ::DDS_PublicationMatchedStatus & status);
-
-      ::DDS::DataWriterListener_ptr get_datawriterlistener (void);
-
-      void set_dds_entity (::DDS::DataWriter_ptr dw);
-
-    private:
-      ::DDS::DataWriterListener_var impl_;
-      ::DDS::DataWriter_var dw_;
-    };
-  }
-}
-
-#endif /* DDSDATAWRITERLISTENER_T_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter_T.cpp
deleted file mode 100644
index d1f20d80317..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter_T.cpp
+++ /dev/null
@@ -1,490 +0,0 @@
-#include "dds4ccm/impl/ndds/DataWriter.h"
-#include "dds4ccm/impl/ndds/StatusCondition.h"
-#include "dds4ccm/impl/ndds/Publisher.h"
-#include "dds4ccm/impl/ndds/DataWriterListener.h"
-#include "dds4ccm/impl/ndds/Topic.h"
-
-#include "dds4ccm/impl/ndds/convertors/Duration_t.h"
-#include "dds4ccm/impl/ndds/convertors/InstanceHandle_t.h"
-#include "dds4ccm/impl/ndds/convertors/PublicationMatchedStatus.h"
-#include "dds4ccm/impl/ndds/convertors/LivelinessLostStatus.h"
-#include "dds4ccm/impl/ndds/convertors/OfferedIncompatibleQosStatus.h"
-#include "dds4ccm/impl/ndds/convertors/OfferedDeadlineMissedStatus.h"
-#include "dds4ccm/impl/ndds/convertors/InstanceHandleSeq.h"
-#include "dds4ccm/impl/ndds/convertors/DataWriterQos.h"
-#include "dds4ccm/impl/ndds/convertors/SubscriptionBuiltinTopicData.h"
-
-#include "dds4ccm/impl/logger/Log_Macros.h"
-
-namespace CIAO
-{
-  namespace NDDS
-  {
-    template <typename TYPED_DDS_WRITER, typename TYPED_WRITER_TYPE, typename VALUE_TYPE>
-    DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::DataWriter_T (
-      ::DDSDataWriter * dw,
-      ::DDS::DomainParticipant_ptr dp,
-      ::DDS::Publisher_ptr pub)
-      : rti_entity_ (0)
-        , dp_ (::DDS::DomainParticipant::_duplicate (dp))
-        , pub_ (::DDS::Publisher::_duplicate (pub))
-    {
-      if (dw)
-        {
-          this->rti_entity_ = TYPED_DDS_WRITER::narrow (dw);
-        }
-    }
-
-    template <typename TYPED_DDS_WRITER, typename TYPED_WRITER_TYPE, typename VALUE_TYPE>
-    ::DDS::ReturnCode_t
-    DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::set_qos (const ::DDS::DataWriterQos & qos)
-    {
-      DDS4CCM_TRACE ("DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::set_qos");
-      ::DDS_DataWriterQos ccm_dds_qos;
-      DDS_ReturnCode_t const retcode = this->rti_entity ()->get_qos (ccm_dds_qos);
-      if (retcode != DDS_RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        "DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::set_qos - "
-                        "Error: Unable to retrieve qos\n"));
-          return retcode;
-        }
-      ccm_dds_qos <<= qos;
-      return this->rti_entity ()->set_qos (ccm_dds_qos);
-    }
-
-    template <typename TYPED_DDS_WRITER, typename TYPED_WRITER_TYPE, typename VALUE_TYPE>
-    ::DDS::ReturnCode_t
-    DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::get_qos (::DDS::DataWriterQos & qos)
-    {
-      DDS4CCM_TRACE ("DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::get_qos");
-      ::DDS_DataWriterQos ccm_dds_qos;
-      ccm_dds_qos <<= qos;
-      ::DDS::ReturnCode_t const retcode =
-        this->rti_entity ()->get_qos (ccm_dds_qos);
-      qos <<= ccm_dds_qos;
-      return retcode;
-    }
-
-    template <typename TYPED_DDS_WRITER, typename TYPED_WRITER_TYPE, typename VALUE_TYPE>
-    ::DDS::ReturnCode_t
-    DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::set_listener (
-      ::DDS::DataWriterListener_ptr a_listener,
-      ::DDS::StatusMask mask)
-    {
-      DDS4CCM_TRACE ("DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::set_listener");
-
-      // Retrieve the previously set listener
-      DDSDataWriterListener *old_listener = this->rti_entity ()->get_listener ();
-
-      DDSDataWriterListener *listener = 0;
-      if (! ::CORBA::is_nil (a_listener))
-        {
-          ACE_NEW_THROW_EX (listener,
-                            DDS_DataWriterListener_i (
-                              a_listener,
-                              this),
-                            ::CORBA::NO_MEMORY ());
-        }
-
-      ::DDS::ReturnCode_t const retcode =
-        this->rti_entity ()->set_listener (listener, mask);
-
-      if (retcode != ::DDS::RETCODE_OK)
-        {
-          delete listener;
-        }
-      else
-        {
-          delete old_listener;
-        }
-
-      return retcode;
-    }
-
-    template <typename TYPED_DDS_WRITER, typename TYPED_WRITER_TYPE, typename VALUE_TYPE>
-    ::DDS::DataWriterListener_ptr
-    DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::get_listener (void)
-    {
-      DDS4CCM_TRACE ("DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::get_listener");
-
-      DDSDataWriterListener *wr = this->rti_entity ()->get_listener ();
-      DDS_DataWriterListener_i * list_proxy =
-        dynamic_cast <DDS_DataWriterListener_i *> (wr);
-      if (!list_proxy)
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG,
-                        "DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::get_listener - "
-                        "DDS returned a NIL listener.\n"));
-          return ::DDS::DataWriterListener::_nil ();
-        }
-      return list_proxy->get_datawriterlistener ();
-    }
-
-    template <typename TYPED_DDS_WRITER, typename TYPED_WRITER_TYPE, typename VALUE_TYPE>
-    ::DDS::Topic_ptr
-    DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::get_topic (void)
-    {
-      DDS4CCM_TRACE ("DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::get_topic");
-
-      ::DDS::Topic_var retval;
-      DDSTopic* t = this->rti_entity ()->get_topic ();
-      ACE_NEW_THROW_EX (retval,
-                        DDS_Topic_i (t, this->dp_.in ()),
-                        ::CORBA::NO_MEMORY ());
-      return retval._retn ();
-    }
-
-    template <typename TYPED_DDS_WRITER, typename TYPED_WRITER_TYPE, typename VALUE_TYPE>
-    ::DDS::Publisher_ptr
-    DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::get_publisher (void)
-    {
-      DDS4CCM_TRACE ("DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::get_publisher");
-
-      return ::DDS::Publisher::_duplicate (this->pub_.in ());
-    }
-
-    template <typename TYPED_DDS_WRITER, typename TYPED_WRITER_TYPE, typename VALUE_TYPE>
-    ::DDS::ReturnCode_t
-    DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::wait_for_acknowledgments (const ::DDS::Duration_t & max_wait)
-    {
-      DDS4CCM_TRACE ("DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::wait_for_acknowledgments");
-
-      ::DDS_Duration_t rtiduration;
-     rtiduration <<= max_wait;
-     return this->rti_entity ()->wait_for_acknowledgments (rtiduration);
-    }
-
-    template <typename TYPED_DDS_WRITER, typename TYPED_WRITER_TYPE, typename VALUE_TYPE>
-    ::DDS::ReturnCode_t
-    DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::get_liveliness_lost_status (::DDS::LivelinessLostStatus & status)
-    {
-      DDS4CCM_TRACE ("DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::get_liveliness_lost_status");
-
-      ::DDS_LivelinessLostStatus ddsstatus;
-      ddsstatus <<= status;
-      ::DDS::ReturnCode_t const retval =
-        this->rti_entity ()->get_liveliness_lost_status (ddsstatus);
-      status <<= ddsstatus;
-      return retval;
-    }
-
-    template <typename TYPED_DDS_WRITER, typename TYPED_WRITER_TYPE, typename VALUE_TYPE>
-    ::DDS::ReturnCode_t
-    DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::get_offered_deadline_missed_status (
-      ::DDS::OfferedDeadlineMissedStatus & status)
-    {
-      DDS4CCM_TRACE ("DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::get_offered_deadline_missed_status");
-
-      ::DDS_OfferedDeadlineMissedStatus ddsstatus;
-      ddsstatus <<= status;
-      ::DDS::ReturnCode_t const retval =
-        this->rti_entity ()->get_offered_deadline_missed_status (ddsstatus);
-      status <<= ddsstatus;
-      return retval;
-    }
-
-    template <typename TYPED_DDS_WRITER, typename TYPED_WRITER_TYPE, typename VALUE_TYPE>
-    ::DDS::ReturnCode_t
-    DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::get_offered_incompatible_qos_status (
-      ::DDS::OfferedIncompatibleQosStatus & status)
-    {
-      DDS4CCM_TRACE ("DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::get_offered_incompatible_qos_status");
-
-      ::DDS_OfferedIncompatibleQosStatus ddsstatus;
-      ddsstatus <<= status;
-      ::DDS::ReturnCode_t const retval =
-        this->rti_entity ()->get_offered_incompatible_qos_status (ddsstatus);
-      status <<= ddsstatus;
-      return retval;
-    }
-
-    template <typename TYPED_DDS_WRITER, typename TYPED_WRITER_TYPE, typename VALUE_TYPE>
-    ::DDS::ReturnCode_t
-    DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::get_publication_matched_status (
-      ::DDS::PublicationMatchedStatus & status)
-    {
-      DDS4CCM_TRACE ("DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::get_publication_matched_status");
-
-      ::DDS_PublicationMatchedStatus ddsstatus;
-      ddsstatus <<= status;
-      ::DDS::ReturnCode_t const retval =
-        this->rti_entity ()->get_publication_matched_status (ddsstatus);
-      status <<= ddsstatus;
-      return retval;
-    }
-
-    template <typename TYPED_DDS_WRITER, typename TYPED_WRITER_TYPE, typename VALUE_TYPE>
-    ::DDS::ReturnCode_t
-    DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::assert_liveliness (void)
-    {
-      DDS4CCM_TRACE ("DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::assert_liveliness");
-
-      return this->rti_entity ()->assert_liveliness ();
-    }
-
-    template <typename TYPED_DDS_WRITER, typename TYPED_WRITER_TYPE, typename VALUE_TYPE>
-    ::DDS::ReturnCode_t
-    DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::get_matched_subscriptions (
-      ::DDS::InstanceHandleSeq & subscription_handles)
-    {
-      DDS4CCM_TRACE ("DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::get_matched_subscription");
-
-      ::DDS_InstanceHandleSeq rtiseq;
-      rtiseq <<= subscription_handles;
-      ::DDS::ReturnCode_t const retval =
-        this->rti_entity ()->get_matched_subscriptions (rtiseq);
-      subscription_handles <<= rtiseq;
-      return retval;
-    }
-
-    template <typename TYPED_DDS_WRITER, typename TYPED_WRITER_TYPE, typename VALUE_TYPE>
-    ::DDS::ReturnCode_t
-    DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::get_matched_subscription_data (
-      ::DDS::SubscriptionBuiltinTopicData & subscription_data,
-      DDS_INSTANCE_HANDLE_T_IN subscription_handle)
-    {
-      DDS4CCM_TRACE ("DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::get_matched_subscription_data");
-
-      ::DDS_SubscriptionBuiltinTopicData ccm_dds_sub_data;
-      ::DDS_InstanceHandle_t ccm_dds_sub_handle;
-      ccm_dds_sub_handle <<= subscription_handle;
-      ::DDS::ReturnCode_t const retval =
-        this->rti_entity ()->get_matched_subscription_data (ccm_dds_sub_data,
-                                                            ccm_dds_sub_handle);
-      subscription_data <<= ccm_dds_sub_data;
-      return retval;
-    }
-
-    template <typename TYPED_DDS_WRITER, typename TYPED_WRITER_TYPE, typename VALUE_TYPE>
-    ::DDS::ReturnCode_t
-    DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::enable (void)
-    {
-      DDS4CCM_TRACE ("DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::enable");
-
-      return this->rti_entity ()->enable ();
-    }
-
-    template <typename TYPED_DDS_WRITER, typename TYPED_WRITER_TYPE, typename VALUE_TYPE>
-    ::DDS::StatusCondition_ptr
-    DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::get_statuscondition (void)
-    {
-      DDS4CCM_TRACE ("DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::get_statuscondition");
-
-      ::DDS::StatusCondition_var retval;
-      DDSStatusCondition* sc = this->rti_entity ()->get_statuscondition ();
-      ACE_NEW_THROW_EX (retval,
-                        DDS_StatusCondition_i (sc, this->dp_.in ()),
-                        ::CORBA::NO_MEMORY ());
-      return retval._retn ();
-    }
-
-    template <typename TYPED_DDS_WRITER, typename TYPED_WRITER_TYPE, typename VALUE_TYPE>
-    ::DDS::StatusMask
-    DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::get_status_changes (void)
-    {
-      DDS4CCM_TRACE ("DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::get_status_changes");
-
-      return this->rti_entity ()->get_status_changes ();
-    }
-
-    template <typename TYPED_DDS_WRITER, typename TYPED_WRITER_TYPE, typename VALUE_TYPE>
-    DDS_INSTANCE_HANDLE_T_RETN
-    DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::get_instance_handle (void)
-    {
-      DDS4CCM_TRACE ("DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::get_instance_handle");
-
-      ::DDS_InstanceHandle_t const rtihandle =
-        this->rti_entity ()->get_instance_handle ();
-      ::DDS::InstanceHandle_t handle;
-      handle <<= rtihandle;
-      return handle;
-    }
-
-    template <typename TYPED_DDS_WRITER, typename TYPED_WRITER_TYPE, typename VALUE_TYPE>
-    ::DDS::InstanceHandle_t
-    DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::register_instance (
-        const VALUE_TYPE & instance_data)
-    {
-      DDS4CCM_TRACE ("DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::register_instance");
-
-      ::DDS::InstanceHandle_t dds_handle;
-      ::DDS_InstanceHandle_t const handle = this->rti_entity ()->register_instance (instance_data);
-      dds_handle <<= handle;
-      return dds_handle;
-    }
-
-    template <typename TYPED_DDS_WRITER, typename TYPED_WRITER_TYPE, typename VALUE_TYPE>
-    ::DDS::InstanceHandle_t
-    DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::register_instance_w_timestamp (
-        const VALUE_TYPE & instance_data,
-        const ::DDS::Time_t & source_timestamp)
-    {
-      DDS4CCM_TRACE ("DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::register_instance_w_timestamp");
-
-      ::DDS_Time_t time;
-      time <<= source_timestamp;
-      ::DDS_InstanceHandle_t const rtihandle =
-        this->rti_entity ()->register_instance_w_timestamp (instance_data, time);
-      ::DDS::InstanceHandle_t handle;
-      handle <<= rtihandle;
-      return handle;
-    }
-
-    template <typename TYPED_DDS_WRITER, typename TYPED_WRITER_TYPE, typename VALUE_TYPE>
-    ::DDS::ReturnCode_t
-    DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::unregister_instance (
-        const VALUE_TYPE & instance_data,
-        const ::DDS::InstanceHandle_t & handle)
-    {
-      DDS4CCM_TRACE ("DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::unregister_instance");
-
-      ::DDS_InstanceHandle_t instance_handle = ::DDS_HANDLE_NIL;
-      instance_handle <<= handle;
-      return this->rti_entity ()->unregister_instance (instance_data, instance_handle);
-    }
-
-    template <typename TYPED_DDS_WRITER, typename TYPED_WRITER_TYPE, typename VALUE_TYPE>
-    ::DDS::ReturnCode_t
-    DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::unregister_instance_w_timestamp (
-        const VALUE_TYPE & instance_data,
-        const ::DDS::InstanceHandle_t & handle,
-        const ::DDS::Time_t & source_timestamp)
-    {
-      DDS4CCM_TRACE ("DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::unregister_instance_w_timestamp");
-
-      ::DDS_InstanceHandle_t instance_handle = ::DDS_HANDLE_NIL;
-      instance_handle <<= handle;
-      ::DDS_Time_t time;
-      time <<= source_timestamp;
-      return this->rti_entity ()->unregister_instance_w_timestamp (instance_data,
-                                                                   instance_handle,
-                                                                   time);
-    }
-
-    template <typename TYPED_DDS_WRITER, typename TYPED_WRITER_TYPE, typename VALUE_TYPE>
-    ::DDS::ReturnCode_t
-    DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::write (
-        const VALUE_TYPE & instance_data,
-        const ::DDS::InstanceHandle_t & handle)
-    {
-      DDS4CCM_TRACE ("DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::write");
-
-      ::DDS_InstanceHandle_t instance_handle = ::DDS_HANDLE_NIL;
-      instance_handle <<= handle;
-      return this->rti_entity ()->write (instance_data, instance_handle);
-    }
-
-    template <typename TYPED_DDS_WRITER, typename TYPED_WRITER_TYPE, typename VALUE_TYPE>
-    ::DDS::ReturnCode_t
-    DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::write_w_timestamp (
-        const VALUE_TYPE & instance_data,
-        const ::DDS::InstanceHandle_t & handle,
-        const ::DDS::Time_t & source_timestamp)
-    {
-      DDS4CCM_TRACE ("DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::write_w_timestamp");
-
-      ::DDS_InstanceHandle_t instance_handle = ::DDS_HANDLE_NIL;
-      instance_handle <<= handle;
-      ::DDS_Time_t time;
-      time <<= source_timestamp;
-      return this->rti_entity ()->write_w_timestamp (instance_data,
-                                                     instance_handle,
-                                                     time);
-    }
-
-    template <typename TYPED_DDS_WRITER, typename TYPED_WRITER_TYPE, typename VALUE_TYPE>
-     ::DDS::ReturnCode_t
-     DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::dispose (
-        const VALUE_TYPE & instance_data,
-        const ::DDS::InstanceHandle_t & handle)
-    {
-      DDS4CCM_TRACE ("DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::dispose");
-
-      ::DDS_InstanceHandle_t instance_handle = ::DDS_HANDLE_NIL;
-      instance_handle <<= handle;
-      return this->rti_entity ()->dispose (instance_data, instance_handle);
-    }
-
-    template <typename TYPED_DDS_WRITER, typename TYPED_WRITER_TYPE, typename VALUE_TYPE>
-    ::DDS::ReturnCode_t
-    DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::dispose_w_timestamp (
-        const VALUE_TYPE & instance_data,
-        const ::DDS::InstanceHandle_t & handle,
-        const ::DDS::Time_t & source_timestamp)
-    {
-      DDS4CCM_TRACE ("DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::dispose_w_timestamp");
-
-      ::DDS_InstanceHandle_t instance_handle = ::DDS_HANDLE_NIL;
-      instance_handle <<= handle;
-      ::DDS_Time_t time;
-      time <<= source_timestamp;
-      return this->rti_entity ()->dispose_w_timestamp (instance_data,
-                                                       instance_handle,
-                                                       time);
-    }
-
-    template <typename TYPED_DDS_WRITER, typename TYPED_WRITER_TYPE, typename VALUE_TYPE>
-    ::DDS::ReturnCode_t
-    DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::get_key_value (
-        VALUE_TYPE & key_holder,
-        const ::DDS::InstanceHandle_t & handle)
-    {
-      DDS4CCM_TRACE ("DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::get_key_value");
-
-      ::DDS_InstanceHandle_t instance_handle = ::DDS_HANDLE_NIL;
-      instance_handle <<= handle;
-      return this->rti_entity ()->get_key_value (key_holder, instance_handle);
-    }
-
-    template <typename TYPED_DDS_WRITER, typename TYPED_WRITER_TYPE, typename VALUE_TYPE>
-    ::DDS::InstanceHandle_t
-    DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::lookup_instance (
-        const VALUE_TYPE & instance_data)
-    {
-      DDS4CCM_TRACE ("DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::lookup_instance");
-
-      ::DDS_InstanceHandle_t const rtihandle =
-        this->rti_entity ()->lookup_instance (instance_data);
-      ::DDS::InstanceHandle_t handle = DDS::HANDLE_NIL;
-      handle <<= rtihandle;
-      return handle;
-    }
-
-    template <typename TYPED_DDS_WRITER, typename TYPED_WRITER_TYPE, typename VALUE_TYPE>
-    void
-    DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::set_rti_entity (DDSDataWriter * dw)
-    {
-      if (dw)
-        {
-          this->rti_entity_ = TYPED_DDS_WRITER::narrow (dw);
-        }
-      else
-        {
-          this->rti_entity_ = 0;
-        }
-    }
-
-    template <typename TYPED_DDS_WRITER, typename TYPED_WRITER_TYPE, typename VALUE_TYPE>
-    DDSDataWriter *
-    DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::get_rti_entity (void)
-    {
-      return this->rti_entity_;
-    }
-
-    template <typename TYPED_DDS_WRITER, typename TYPED_WRITER_TYPE, typename VALUE_TYPE>
-    TYPED_DDS_WRITER*
-    DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::rti_entity (void)
-    {
-      if (!this->rti_entity_)
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG,
-                        "DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::rti_entity - "
-                        "Throwing BAD_INV_ORDER.\n"));
-          throw ::CORBA::BAD_INV_ORDER ();
-        }
-      return this->rti_entity_;
-    }
-
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter_T.h
deleted file mode 100644
index 7bf8288f89b..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter_T.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/**
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DATAWRITER_T_H_
-#define DATAWRITER_T_H_
-
-#include "dds4ccm/idl/ndds/ndds_dcpsC.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-#include "dds4ccm/impl/ndds/DataWriter.h"
-
-namespace CIAO
-{
-  namespace NDDS
-  {
-    template <typename TYPED_DDS_WRITER, typename TYPED_WRITER_TYPE, typename VALUE_TYPE>
-    class DataWriter_T
-      : public virtual DDS_DataWriter_Base,
-        public virtual TYPED_WRITER_TYPE
-    {
-    public:
-      explicit DataWriter_T (::DDSDataWriter * dw,
-                             ::DDS::DomainParticipant_ptr dp,
-                             ::DDS::Publisher_ptr pub);
-
-      virtual ::DDS::ReturnCode_t set_qos (const ::DDS::DataWriterQos & qos);
-
-      virtual ::DDS::ReturnCode_t get_qos (::DDS::DataWriterQos & qos);
-
-      virtual ::DDS::ReturnCode_t set_listener (
-        ::DDS::DataWriterListener_ptr a_listener,
-        ::DDS::StatusMask mask);
-
-      virtual ::DDS::DataWriterListener_ptr get_listener (void);
-
-      virtual ::DDS::Topic_ptr get_topic (void);
-
-      virtual ::DDS::Publisher_ptr get_publisher (void);
-
-      virtual ::DDS::ReturnCode_t wait_for_acknowledgments (
-        const ::DDS::Duration_t & max_wait);
-
-      virtual ::DDS::ReturnCode_t get_liveliness_lost_status (
-        ::DDS::LivelinessLostStatus & status);
-
-      virtual ::DDS::ReturnCode_t get_offered_deadline_missed_status (
-        ::DDS::OfferedDeadlineMissedStatus & status);
-
-      virtual ::DDS::ReturnCode_t get_offered_incompatible_qos_status (
-        ::DDS::OfferedIncompatibleQosStatus & status);
-
-      virtual ::DDS::ReturnCode_t get_publication_matched_status (
-        ::DDS::PublicationMatchedStatus & status);
-
-      virtual ::DDS::ReturnCode_t assert_liveliness (void);
-
-      virtual ::DDS::ReturnCode_t get_matched_subscriptions (
-        ::DDS::InstanceHandleSeq & subscription_handles);
-
-      virtual ::DDS::ReturnCode_t get_matched_subscription_data (
-        ::DDS::SubscriptionBuiltinTopicData & subscription_data,
-        DDS_INSTANCE_HANDLE_T_IN subscription_handle);
-
-      virtual ::DDS::ReturnCode_t enable (void);
-
-      virtual ::DDS::StatusCondition_ptr get_statuscondition (void);
-
-      virtual ::DDS::StatusMask get_status_changes (void);
-
-      virtual DDS_INSTANCE_HANDLE_T_RETN get_instance_handle (void);
-
-      virtual ::DDS::InstanceHandle_t register_instance (
-        const VALUE_TYPE & instance_data);
-
-      virtual ::DDS::InstanceHandle_t register_instance_w_timestamp (
-        const VALUE_TYPE & instance_data,
-        const ::DDS::Time_t & source_timestamp);
-
-      virtual ::DDS::ReturnCode_t unregister_instance (
-        const VALUE_TYPE & instance_data,
-        const ::DDS::InstanceHandle_t & handle);
-
-      virtual ::DDS::ReturnCode_t unregister_instance_w_timestamp (
-        const VALUE_TYPE & instance_data,
-        const ::DDS::InstanceHandle_t & handle,
-        const ::DDS::Time_t & source_timestamp);
-
-      virtual ::DDS::ReturnCode_t write (
-        const VALUE_TYPE & instance_data,
-        const ::DDS::InstanceHandle_t & handle);
-
-      virtual ::DDS::ReturnCode_t write_w_timestamp (
-        const VALUE_TYPE & instance_data,
-        const ::DDS::InstanceHandle_t & handle,
-        const ::DDS::Time_t & source_timestamp);
-
-      virtual ::DDS::ReturnCode_t dispose (
-        const VALUE_TYPE & instance_data,
-        const ::DDS::InstanceHandle_t & instance_handle);
-
-      virtual ::DDS::ReturnCode_t dispose_w_timestamp (
-        const VALUE_TYPE & instance_data,
-        const ::DDS::InstanceHandle_t & instance_handle,
-        const ::DDS::Time_t & source_timestamp);
-
-      virtual ::DDS::ReturnCode_t get_key_value (
-        VALUE_TYPE & key_holder,
-        const ::DDS::InstanceHandle_t & handle);
-
-      virtual ::DDS::InstanceHandle_t lookup_instance (
-        const VALUE_TYPE & instance_data);
-
-      virtual ::DDSDataWriter * get_rti_entity (void);
-
-      virtual void set_rti_entity (::DDSDataWriter * dw);
-
-    private:
-      TYPED_DDS_WRITER * rti_entity_;
-      ::DDS::DomainParticipant_var dp_;
-      ::DDS::Publisher_var pub_;
-
-      TYPED_DDS_WRITER * rti_entity (void);
-    };
-  }
-}
-
-#include "dds4ccm/impl/ndds/DataWriter_T.cpp"
-
-#endif /* DATAWRITER_T_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.cpp
deleted file mode 100644
index 76da9e0ff8c..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.cpp
+++ /dev/null
@@ -1,1189 +0,0 @@
-#include "dds4ccm/impl/ndds/DomainParticipant.h"
-#include "dds4ccm/impl/ndds/Subscriber.h"
-#include "dds4ccm/impl/ndds/Publisher.h"
-#include "dds4ccm/impl/ndds/ContentFilteredTopic.h"
-#include "dds4ccm/impl/ndds/TopicDescription.h"
-#include "dds4ccm/impl/ndds/Topic.h"
-#include "dds4ccm/impl/ndds/DomainParticipantListener.h"
-#include "dds4ccm/impl/ndds/PublisherListener.h"
-#include "dds4ccm/impl/ndds/SubscriberListener.h"
-#include "dds4ccm/impl/ndds/StatusCondition.h"
-
-#include "dds4ccm/impl/ndds/TopicListener.h"
-#include "dds4ccm/impl/ndds/Utils.h"
-
-#include "dds4ccm/impl/ndds/convertors/PublisherQos.h"
-#include "dds4ccm/impl/ndds/convertors/SubscriberQos.h"
-#include "dds4ccm/impl/ndds/convertors/TopicQos.h"
-#include "dds4ccm/impl/ndds/convertors/DomainParticipantQos.h"
-#include "dds4ccm/impl/ndds/convertors/InstanceHandle_t.h"
-#include "dds4ccm/impl/ndds/convertors/Duration_t.h"
-#include "dds4ccm/impl/ndds/convertors/Time_t.h"
-#include "dds4ccm/impl/ndds/convertors/InstanceHandleSeq.h"
-#include "dds4ccm/impl/ndds/convertors/TopicBuiltinTopicData.h"
-#include "dds4ccm/impl/ndds/convertors/ParticipantBuiltinTopicData.h"
-
-#include "dds4ccm/impl/logger/Log_Macros.h"
-
-#include "ace/CORBA_macros.h"
-
-#include "ndds/ndds_cpp.h"
-
-namespace CIAO
-{
-  namespace NDDS
-  {
-    DDS_DomainParticipant_i::DDS_DomainParticipant_i (
-      ::DDSDomainParticipant * dp) : rti_entity_ (dp)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::DDS_DomainParticipant_i");
-    }
-
-    DDS_DomainParticipant_i::~DDS_DomainParticipant_i (void)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::~DDS_DomainParticipant_i");
-    }
-
-    ::DDS::Publisher_ptr
-    DDS_DomainParticipant_i::create_publisher_with_profile (
-      const char * qos_profile,
-      ::DDS::PublisherListener_ptr a_listener,
-      ::DDS::StatusMask mask)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_publisher_with_profile");
-
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_TRACE, DDS4CCM_INFO
-                    "DDS_DomainParticipant_i::create_publisher_with_profile <%C> - "
-                    "Start creating Publisher\n",
-                    qos_profile));
-      DDS_PublisherListener_i *ccm_dds_pl = 0;
-      if (! ::CORBA::is_nil (a_listener))
-        {
-          ACE_NEW_THROW_EX (ccm_dds_pl,
-                            DDS_PublisherListener_i (a_listener, this),
-                            ::CORBA::NO_MEMORY ());
-        }
-      char * lib_name = get_library_name(qos_profile);
-      char * prof_name = get_profile_name(qos_profile);
-
-      DDSPublisher * ccm_dds_pub = 0;
-
-      if (lib_name != 0 && prof_name != 0)
-        {
-          ccm_dds_pub = this->rti_entity ()->create_publisher_with_profile (
-                                                        lib_name,
-                                                        prof_name,
-                                                        ccm_dds_pl,
-                                                        mask);
-        }
-
-      ACE_OS::free (lib_name);
-      ACE_OS::free (prof_name);
-
-      if (!ccm_dds_pub)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        "DDS_DomainParticipant_i::create_publisher_with_profile <%C> - "
-                        "Error: Unable to create Publisher\n",
-                        qos_profile));
-          delete ccm_dds_pl;
-          return ::DDS::Publisher::_nil ();
-        }
-
-      ::DDS::Publisher_var retval;
-      ACE_NEW_THROW_EX (retval,
-                        DDS_Publisher_i (ccm_dds_pub, this),
-                        ::CORBA::NO_MEMORY ());
-
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_INFO, DDS4CCM_INFO
-                    "DDS_DomainParticipant_i::create_publisher_with_profile <%C> - "
-                    "Successfully created a DDSPublisher\n",
-                    qos_profile));
-
-      DDS_ReturnCode_t retcode = ccm_dds_pub->enable ();
-      if (retcode != DDS_RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                       "DDS_DomainParticipant_i"
-                       "::create_publisher_with_profile <%C> - "
-                       "Error: Unable to create Publisher: <%C>\n",
-                       qos_profile,
-                       ::CIAO::DDS4CCM::translate_retcode (retcode)));
-          delete ccm_dds_pl;
-          throw ::CORBA::INTERNAL ();
-        }
-      return retval._retn ();
-    }
-
-
-    ::DDS::Publisher_ptr
-    DDS_DomainParticipant_i::create_publisher (
-      const ::DDS::PublisherQos & qos,
-      ::DDS::PublisherListener_ptr a_listener,
-      ::DDS::StatusMask mask)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_publisher");
-
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_TRACE, DDS4CCM_INFO
-                    "DDS_DomainParticipant_i::create_publisher - "
-                    "Start creating Publisher\n"));
-
-      DDS_PublisherQos ccm_dds_qos;
-      DDS_ReturnCode_t retcode = this->rti_entity ()->get_default_publisher_qos (ccm_dds_qos);
-      if (retcode != DDS_RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                       "DDS_DomainParticipant_i"
-                       "::create_publisher - "
-                       "Error: Unable to retrieve default publisher qos\n"));
-          return ::DDS::Publisher::_nil ();
-        }
-      ccm_dds_qos <<= qos;
-
-      DDS_PublisherListener_i *ccm_dds_pl = 0;
-      if (! ::CORBA::is_nil (a_listener))
-        {
-          ACE_NEW_THROW_EX (ccm_dds_pl,
-                            DDS_PublisherListener_i (a_listener, this),
-                            ::CORBA::NO_MEMORY ());
-        }
-
-      DDSPublisher * ccm_dds_pub =
-        this->rti_entity ()->create_publisher (ccm_dds_qos,
-                                               ccm_dds_pl,
-                                               mask);
-
-      if (!ccm_dds_pub)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                       "DDS_DomainParticipant_i"
-                       "::create_publisher - "
-                       "Error: Unable to create Publisher\n"));
-          delete ccm_dds_pl;
-          return ::DDS::Publisher::_nil ();
-        }
-
-      ::DDS::Publisher_var retval;
-      ACE_NEW_THROW_EX (retval,
-                        DDS_Publisher_i (ccm_dds_pub, this),
-                        ::CORBA::NO_MEMORY ());
-
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_INFO, DDS4CCM_INFO
-                    "DDS_DomainParticipant_i::create_publisher - "
-                    "Successfully created a DDSPublisher\n"));
-
-      retcode = ccm_dds_pub->enable ();
-      if (retcode != DDS_RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                       "DDS_DomainParticipant_i"
-                       "::create_publisher - "
-                       "Error: Unable to enable the Publisher: <%C>\n",
-                       ::CIAO::DDS4CCM::translate_retcode (retcode)));
-          delete ccm_dds_pl;
-          throw ::CORBA::INTERNAL ();
-        }
-      return retval._retn ();
-    }
-
-
-    ::DDS::ReturnCode_t
-    DDS_DomainParticipant_i::delete_publisher (
-      ::DDS::Publisher_ptr p)
-    {
-      DDS_Publisher_i *ccm_dds_pub =
-        dynamic_cast < DDS_Publisher_i * > (p);
-
-      if (!ccm_dds_pub)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_CAST_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        "DDS_DomainParticipant_i"
-                        "::delete_publisher - "
-                        "Unable to cast provided object reference to servant pointer.\n"));
-          return ::DDS::RETCODE_ERROR;
-        }
-
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_CAST_SUCCESSFUL, (LM_TRACE, DDS4CCM_INFO
-                   "DDS_DomainParticipant_i"
-                   "::delete_publisher - "
-                   "Successfully casted provided object reference to "
-                   "DDS_Publisher_i\n"));
-
-      DDSPublisher* pub = ccm_dds_pub->get_rti_entity ();
-      ccm_dds_pub->set_rti_entity (0);
-      DDS_ReturnCode_t const retval = this->rti_entity ()->delete_publisher (pub);
-
-      if (retval != DDS_RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        "DDS_DomainParticipant_i"
-                        "::delete_publisher - "
-                        "Error: RTI delete_publisher returned non-ok error code %C\n",
-                        ::CIAO::DDS4CCM::translate_retcode (retval)));
-        }
-      else
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_INFO, DDS4CCM_INFO
-                        "DDS_DomainParticipant_i::delete_publisher - "
-                        "Provided publisher successfully deleted\n"));
-        }
-
-      return retval;
-    }
-
-
-    ::DDS::Subscriber_ptr
-    DDS_DomainParticipant_i::create_subscriber_with_profile (
-      const char * qos_profile,
-      ::DDS::SubscriberListener_ptr a_listener,
-      ::DDS::StatusMask mask)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_subscriber_with_profile");
-
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_TRACE, DDS4CCM_INFO
-                   "DDS_DomainParticipant_i"
-                   "::create_subscriber_with_profile <%C> - "
-                   "Creating Subscriber\n",
-                   qos_profile));
-
-      DDS_SubscriberListener_i *ccm_dds_sl = 0;
-      if (! ::CORBA::is_nil (a_listener))
-        {
-          ACE_NEW_THROW_EX (ccm_dds_sl,
-                            DDS_SubscriberListener_i (a_listener, this),
-                            ::CORBA::NO_MEMORY ());
-        }
-      char * lib_name = get_library_name(qos_profile);
-      char * prof_name = get_profile_name(qos_profile);
-
-      DDSSubscriber * ccm_dds_sub = 0;
-
-      if (lib_name != 0 && prof_name != 0)
-        {
-          ccm_dds_sub = this->rti_entity ()->create_subscriber_with_profile (
-                                                        lib_name,
-                                                        prof_name,
-                                                        ccm_dds_sl,
-                                                        mask);
-        }
-
-      ACE_OS::free (lib_name);
-      ACE_OS::free (prof_name);
-
-      if (!ccm_dds_sub)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_DDS_NIL_RETURN, (LM_ERROR, DDS4CCM_INFO
-                        "DDS_DomainParticipant_i::"
-                        "create_subscriber_with_profile <%C> - "
-                        "Error: RTI DDS returned a nil subscriber.\n",
-                        qos_profile));
-          delete ccm_dds_sl;
-          return ::DDS::Subscriber::_nil ();
-        }
-
-      ::DDS::Subscriber_var retval;
-      ACE_NEW_THROW_EX (retval,
-                        DDS_Subscriber_i (ccm_dds_sub, this),
-                        ::CORBA::NO_MEMORY ());
-
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_INFO, DDS4CCM_INFO
-                    "DDS_DomainParticipant_i::create_subscriber_with_profile <%C> - "
-                    "Successfully created a DDSSubscriber\n",
-                    qos_profile));
-
-      DDS_ReturnCode_t retcode = ccm_dds_sub->enable ();
-      if (retcode != DDS_RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        "DDS_DomainParticipant_i::create_subscriber_with_profile <%C> - "
-                        "Error: Unable to enable the DDSSubscriber: <%C>\n",
-                        qos_profile,
-                        ::CIAO::DDS4CCM::translate_retcode (retcode)));
-          delete ccm_dds_sl;
-          throw ::CORBA::INTERNAL ();
-        }
-      return retval._retn ();
-    }
-
-
-    ::DDS::Subscriber_ptr
-    DDS_DomainParticipant_i::create_subscriber (
-                                       const ::DDS::SubscriberQos & qos,
-                                       ::DDS::SubscriberListener_ptr a_listener,
-                                       ::DDS::StatusMask mask)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_subscriber");
-
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_TRACE, DDS4CCM_INFO
-                    "DDS_DomainParticipant_i::create_subscriber - "
-                    "Creating Subscriber\n"));
-
-      DDS_SubscriberListener_i *ccm_dds_sl = 0;
-      if (! ::CORBA::is_nil (a_listener))
-        {
-          ACE_NEW_THROW_EX (ccm_dds_sl,
-                            DDS_SubscriberListener_i (a_listener, this),
-                            ::CORBA::NO_MEMORY ());
-        }
-
-      DDS_SubscriberQos ccm_dds_qos;
-      DDS_ReturnCode_t retcode = this->rti_entity ()->get_default_subscriber_qos (ccm_dds_qos);
-      if (retcode != DDS_RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                       "DDS_DomainParticipant_i"
-                       "::create_subscriber - "
-                       "Error: Unable to retrieve default subscriber qos\n"));
-          return ::DDS::Subscriber::_nil ();
-        }
-      ccm_dds_qos <<= qos;
-
-      DDSSubscriber * ccm_dds_sub =
-        this->rti_entity ()->create_subscriber (ccm_dds_qos,
-                                                ccm_dds_sl,
-                                                mask);
-
-      if (!ccm_dds_sub)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_DDS_NIL_RETURN, (LM_ERROR, DDS4CCM_INFO
-                        "DDS_DomainParticipant_i::"
-                        "create_subscriber - "
-                        "Error: RTI DDS returned a nil subscriber.\n"));
-          delete ccm_dds_sl;
-          return ::DDS::Subscriber::_nil ();
-        }
-
-      ::DDS::Subscriber_var retval;
-      ACE_NEW_THROW_EX (retval,
-                        DDS_Subscriber_i (ccm_dds_sub, this),
-                        ::CORBA::NO_MEMORY ());
-
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_INFO, DDS4CCM_INFO
-                    "DDS_DomainParticipant_i::create_subscriber - "
-                    "Successfully created a DDSSubscriber\n"));
-
-      retcode = ccm_dds_sub->enable ();
-      if (retcode != DDS_RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        "DDS_DomainParticipant_i::create_subscriber - "
-                        "Error: Unable to enable the DDSSubscriber: <%C>\n",
-                        ::CIAO::DDS4CCM::translate_retcode (retcode)));
-          delete ccm_dds_sl;
-          throw ::CORBA::INTERNAL ();
-        }
-      return retval._retn ();
-    }
-
-
-    ::DDS::ReturnCode_t
-    DDS_DomainParticipant_i::delete_subscriber (
-      ::DDS::Subscriber_ptr s)
-    {
-      DDS_Subscriber_i *ccm_dds_sub = dynamic_cast < DDS_Subscriber_i * > (s);
-
-      if (!ccm_dds_sub)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_CAST_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        "DDS_DomainParticipant_i::delete_subscriber - Unable to cast "
-                        "provided object reference to servant pointer.\n"));
-          return ::DDS::RETCODE_ERROR;
-        }
-
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_CAST_SUCCESSFUL, (LM_TRACE, DDS4CCM_INFO
-                    "DDS_DomainParticipant_i::delete_subscriber - Successfully casted "
-                    "provided object reference to Subscriber_type\n"));
-
-      DDSSubscriber* sub = ccm_dds_sub->get_rti_entity ();
-      ccm_dds_sub->set_rti_entity (0);
-      DDS_ReturnCode_t const retval =
-        this->rti_entity ()->delete_subscriber (sub);
-
-      if (retval != DDS_RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        "DDS_DomainParticipant_i::delete_subscriber - Error: RTI "
-                        "delete_subscriber returned non-ok error code %C\n",
-                        ::CIAO::DDS4CCM::translate_retcode (retval)));
-        }
-      else
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_INFO, DDS4CCM_INFO
-                        "DDS_DomainParticipant_i::delete_subscriber - "
-                        "Provided subscriber successfully deleted\n"));
-        }
-
-      return retval;
-    }
-
-    ::DDS::Subscriber_ptr
-    DDS_DomainParticipant_i::get_builtin_subscriber (void)
-    {
-      ::DDS::Subscriber_var retval;
-      DDSSubscriber* sub = this->rti_entity ()->get_builtin_subscriber ();
-      if (sub)
-        {
-          ACE_NEW_THROW_EX (retval,
-                            DDS_Subscriber_i (sub, this),
-                            ::CORBA::NO_MEMORY ());
-        }
-      return retval._retn ();
-    }
-
-    ::DDS::Topic_ptr
-    DDS_DomainParticipant_i::create_topic (
-                                            const char * impl_name,
-                                            const char * type_name,
-                                            const ::DDS::TopicQos & qos,
-                                            ::DDS::TopicListener_ptr a_listener,
-                                            ::DDS::StatusMask mask)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_topic");
-
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_DEBUG, DDS4CCM_INFO
-                    "DDS_DomainParticipant_i::create_topic - "
-                    "Attempting to create topic with name <%C> and type <%C>\n",
-                    impl_name, type_name));
-
-      DDS_TopicListener_i *ccm_dds_tl = 0;
-      if (! ::CORBA::is_nil (a_listener))
-        {
-          // Topic will be set later (using set_dds_topic)
-          ACE_NEW_THROW_EX (ccm_dds_tl,
-                            DDS_TopicListener_i (::DDS::Topic::_nil (), a_listener),
-                            ::CORBA::NO_MEMORY ());
-        }
-
-      DDS_TopicQos ccm_dds_qos;
-      DDS_ReturnCode_t const retcode = this->rti_entity ()->get_default_topic_qos (ccm_dds_qos);
-      if (retcode != DDS_RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                      "DDS_DomainParticipant_i"
-                      "::create_topic - "
-                      "Error: Unable to retrieve default topic qos\n"));
-          return ::DDS::Topic::_nil ();
-        }
-      ccm_dds_qos <<= qos;
-
-      DDSTopic * dds_tp = this->rti_entity ()->create_topic (impl_name,
-                                                             type_name,
-                                                             ccm_dds_qos,
-                                                             ccm_dds_tl,
-                                                             mask);
-
-      if (!dds_tp)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_DDS_NIL_RETURN, (LM_ERROR, DDS4CCM_INFO
-                        "DDS_DomainParticipant_i::create_topic - "
-                        "Error: RTI DDS returned a nil topic "
-                        "with name <%C> and type <%C>\n",
-                        impl_name, type_name));
-          delete ccm_dds_tl;
-          return ::DDS::Topic::_nil ();
-        }
-
-      ::DDS::Topic_var retval;
-      ACE_NEW_THROW_EX (retval,
-                        DDS_Topic_i (dds_tp, this),
-                        ::CORBA::NO_MEMORY ());
-
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_INFO, DDS4CCM_INFO
-                    "DDS_DomainParticipant_i::create_topic - "
-                    "Successfully created topic with name <%C> and type <%C>\n",
-                    impl_name, type_name));
-
-      if (ccm_dds_tl)
-        {
-          ccm_dds_tl->set_dds_topic (retval.in ());
-        }
-
-      return retval._retn ();
-    }
-
-
-    ::DDS::Topic_ptr
-    DDS_DomainParticipant_i::create_topic_with_profile (
-        const char *impl_name,
-        const char *type_name,
-        const char *qos_profile,
-        ::DDS::TopicListener_ptr a_listener,
-        ::DDS::StatusMask mask)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_topic_with_profile");
-
-      if (impl_name == 0)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        "DDS_DomainParticipant_i::create_topic_with_profile <%C> - "
-                        "Error: provided nil topic name\n",
-                        qos_profile));
-          return ::DDS::Topic::_nil ();
-        }
-
-      if (type_name == 0)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        "DDS_DomainParticipant_i::create_topic_with_profile <%C> - "
-                        "Error: provided nil type name\n",
-                        qos_profile));
-          return ::DDS::Topic::_nil ();
-        }
-
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_DEBUG, DDS4CCM_INFO
-                    "DDS_DomainParticipant_i::create_topic_with_profile <%C> - "
-                    "Attempting to create topic with name %C and type %C\n",
-                    qos_profile,
-                    impl_name, type_name));
-
-      DDS_TopicListener_i *ccm_dds_tl = 0;
-      if (! ::CORBA::is_nil (a_listener))
-        {
-          // Topic will be set later (using set_dds_topic)
-          ACE_NEW_THROW_EX (ccm_dds_tl,
-                            DDS_TopicListener_i (::DDS::Topic::_nil (), a_listener),
-                            ::CORBA::NO_MEMORY ());
-        }
-
-      DDSTopic * dds_tp = 0;
-
-      char * lib_name = get_library_name(qos_profile);
-      char * prof_name = get_profile_name(qos_profile);
-
-      if (lib_name != 0 && prof_name != 0)
-        {
-          dds_tp = this->rti_entity ()->create_topic_with_profile (
-                                                        impl_name,
-                                                        type_name,
-                                                        lib_name,
-                                                        prof_name,
-                                                        ccm_dds_tl,
-                                                        mask);
-        }
-      ACE_OS::free (lib_name);
-      ACE_OS::free (prof_name);
-
-      if (!dds_tp)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_DDS_NIL_RETURN, (LM_ERROR, DDS4CCM_INFO
-                        "DDS_DomainParticipant_i::create_topic_with_profile <%C> - "
-                        "Error: RTI DDS returned a nil topic\n",
-                        qos_profile));
-          delete ccm_dds_tl;
-          return ::DDS::Topic::_nil ();
-        }
-
-      ::DDS::Topic_var retval;
-      ACE_NEW_THROW_EX (retval,
-                        DDS_Topic_i (dds_tp, this),
-                        ::CORBA::NO_MEMORY ());
-
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_INFO, DDS4CCM_INFO
-                    "DDS_DomainParticipant_i::create_topic_with_profile <%C> - "
-                    "Successfully created topic with name %C and type %C\n",
-                    qos_profile,
-                    impl_name, type_name));
-
-      if (ccm_dds_tl)
-        {
-          ccm_dds_tl->set_dds_topic (retval.in ());
-        }
-      return retval._retn ();
-    }
-
-
-    ::DDS::ReturnCode_t
-    DDS_DomainParticipant_i::delete_topic (::DDS::Topic_ptr a_topic)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::delete_topic");
-      CORBA::String_var topic_name = a_topic->get_name ();
-      DDSTopicDescription * dds_td =
-        this->rti_entity ()->lookup_topicdescription (topic_name.in ());
-      DDSTopic * tp = 0;
-      if (dds_td)
-        {
-          tp = DDSTopic::narrow (dds_td);
-        }
-
-      if (!tp)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_CAST_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        "DDS_DomainParticipant_i::delete_topic <%C> - Unable to cast "
-                        "provided object reference to servant.\n",
-                        topic_name.in ()));
-          return ::DDS::RETCODE_BAD_PARAMETER;
-        }
-
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_CAST_SUCCESSFUL, (LM_TRACE, DDS4CCM_INFO
-                    "DDS_DomainParticipant_i::delete_topic <%C> - "
-                    "Successfully casted provided object reference to servant.\n",
-                    topic_name.in ()));
-
-      DDS_ReturnCode_t const retcode = this->rti_entity ()->delete_topic (tp);
-
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_INFO, DDS4CCM_INFO
-                    "DDS_DomainParticipant_i::delete_topic <%C> - "
-                    "delete_topic returned error code <%C>\n",
-                    topic_name.in (),
-                    ::CIAO::DDS4CCM::translate_retcode (retcode)));
-
-      return retcode;
-    }
-
-
-    ::DDS::Topic_ptr
-    DDS_DomainParticipant_i::find_topic (const char * impl_name,
-                                         const ::DDS::Duration_t & timeout)
-    {
-      ::DDS::Topic_var retval;
-      ::DDS_Duration_t ddstimeout;
-      ddstimeout <<= timeout;
-      ::DDSTopic* topic = this->rti_entity ()->find_topic (impl_name, ddstimeout);
-      if (topic)
-        {
-          ACE_NEW_RETURN (retval,
-                          DDS_Topic_i (topic, this),
-                          ::DDS::Topic::_nil ());
-        }
-      return retval._retn ();
-    }
-
-
-    ::DDS::TopicDescription_ptr
-    DDS_DomainParticipant_i::lookup_topicdescription (const char * name)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::lookup_topicdescription");
-
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_UNIMP_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                    "DDS_DomainParticipant_i::lookup_topicdescription - "
-                    "Looking up topic: name <%C>\n",
-                    name));
-
-      ::DDS::TopicDescription_var retval;
-      ::DDSTopicDescription* topic = this->rti_entity ()->lookup_topicdescription (name);
-      if (topic)
-        {
-          // Check the entity: is it a Topic or a ContentFilteredTopic
-          ::DDSTopic * tp = dynamic_cast < ::DDSTopic *> (topic);
-          if (tp)
-            {
-              ACE_NEW_THROW_EX (retval,
-                                DDS_Topic_i (tp, this),
-                                ::CORBA::NO_MEMORY ());
-            }
-          else
-            {
-              ::DDSContentFilteredTopic * cftp =
-                dynamic_cast < ::DDSContentFilteredTopic *>(topic);
-              if (cftp)
-                {
-                  ACE_NEW_THROW_EX (retval,
-                                    DDS_ContentFilteredTopic_i (cftp, this),
-                                    ::CORBA::NO_MEMORY ());
-                }
-            }
-        }
-      return retval._retn ();
-    }
-
-
-    ::DDS::ContentFilteredTopic_ptr
-    DDS_DomainParticipant_i::create_contentfilteredtopic (const char * name,
-                                                          ::DDS::Topic_ptr related_topic,
-                                                          const char * filter_expression,
-                                                          const ::DDS::StringSeq & expression_parameters)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_contentfilteredtopic");
-
-      DDS_Topic_i *top = dynamic_cast< DDS_Topic_i *> (related_topic);
-      if (!top)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_CAST_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        "DDS_DomainParticipant_i::create_contentfilteredtopic - "
-                        "Unable to cast provided topic.\n"));
-          return ::DDS::ContentFilteredTopic::_nil ();
-        }
-
-      const char** parameterlist = 0;
-      ACE_NEW_THROW_EX (parameterlist,
-                        const char*[expression_parameters.length ()],
-                        ::CORBA::NO_MEMORY ());
-
-      for (CORBA::ULong i = 0; i < expression_parameters.length (); ++i)
-        {
-          parameterlist[i] = expression_parameters[i].in ();
-        }
-      DDS_StringSeq parameters (expression_parameters.length ());
-      parameters.from_array (parameterlist, expression_parameters.length ());
-
-      DDSContentFilteredTopic * ccm_dds_cft = this->rti_entity ()->create_contentfilteredtopic (
-                                                                  name,
-                                                                  top->get_rti_entity (),
-                                                                  filter_expression,
-                                                                  parameters);
-      delete [] parameterlist;
-      if (!ccm_dds_cft)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_DDS_NIL_RETURN, (LM_ERROR, DDS4CCM_INFO
-                        "DDS_DomainParticipant_i::create_contentfilteredtopic - "
-                        "RTI DDS returned a nil ContentFilteredTopic for "
-                        "name <%C> and filter expression <%C>.\n",
-                       name, filter_expression));
-          return ::DDS::ContentFilteredTopic::_nil ();
-        }
-
-      ::DDS::ContentFilteredTopic_var retval;
-      ACE_NEW_THROW_EX (retval,
-                        DDS_ContentFilteredTopic_i (ccm_dds_cft, this),
-                        ::CORBA::NO_MEMORY ());
-
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_INFO, DDS4CCM_INFO
-                    "DDS_DomainParticipant_i::create_contentfilteredtopic - "
-                    "Successfully created contentfilteredtopic with name <%C> and "
-                    "filter expression <%C>\n",
-                    name, filter_expression));
-
-      return retval._retn ();
-    }
-
-
-    ::DDS::ReturnCode_t
-    DDS_DomainParticipant_i::delete_contentfilteredtopic (
-      ::DDS::ContentFilteredTopic_ptr a_contentfilteredtopic)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::delete_contentfilteredtopic");
-      DDS_ContentFilteredTopic_i *ccm_dds_cft =
-          dynamic_cast < DDS_ContentFilteredTopic_i *> (a_contentfilteredtopic);
-      if (!ccm_dds_cft)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_CAST_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        "DDS_DomainParticipant_i::delete_contentfilteredtopic - "
-                        "Unable to cast provided ContentFilteredTopic.\n"));
-          return ::DDS::RETCODE_BAD_PARAMETER;
-        }
-      DDSContentFilteredTopic* tp = ccm_dds_cft->get_rti_entity ();
-      ccm_dds_cft->set_rti_entity (0);
-      return this->rti_entity ()->delete_contentfilteredtopic (tp);
-    }
-
-
-    ::DDS::MultiTopic_ptr
-    DDS_DomainParticipant_i::create_multitopic (
-      const char * name,
-      const char * type_name,
-      const char * subscription_expression,
-      const ::DDS::StringSeq & expression_parameters)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_multitopic");
-      ACE_UNUSED_ARG (name);
-      ACE_UNUSED_ARG (type_name);
-      ACE_UNUSED_ARG (subscription_expression);
-      ACE_UNUSED_ARG (expression_parameters);
-      //Not implemented in version ndds.4.5b.rev01 of RTI DDS.
-      throw ::CORBA::NO_IMPLEMENT ();
-    }
-
-
-    ::DDS::ReturnCode_t
-    DDS_DomainParticipant_i::delete_multitopic (
-      ::DDS::MultiTopic_ptr a_multitopic)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::delete_multitopic");
-      ACE_UNUSED_ARG (a_multitopic);
-      //Not implemented in version ndds.4.5b.rev01 of RTI DDS.
-      throw ::CORBA::NO_IMPLEMENT ();
-    }
-
-
-    ::DDS::ReturnCode_t
-    DDS_DomainParticipant_i::delete_contained_entities (void)
-    {
-      return this->rti_entity ()->delete_contained_entities ();
-
-    }
-
-
-    ::DDS::ReturnCode_t
-    DDS_DomainParticipant_i::set_qos (
-      const ::DDS::DomainParticipantQos & qos)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::set_qos");
-      ::DDS_DomainParticipantQos ccm_dds_qos;
-      DDS_ReturnCode_t const retcode = this->rti_entity ()->get_qos (ccm_dds_qos);
-      if (retcode != DDS_RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                       "DDS_DomainParticipant_i"
-                       "::set_qos - "
-                       "Error: Unable to retrieve participant qos\n"));
-          return retcode;
-        }
-      ccm_dds_qos <<= qos;
-      return this->rti_entity ()->set_qos (ccm_dds_qos);
-    }
-
-
-    ::DDS::ReturnCode_t
-    DDS_DomainParticipant_i::get_qos (
-      ::DDS::DomainParticipantQos & qos)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_qos");
-      ::DDS_DomainParticipantQos ccm_dds_qos;
-      ccm_dds_qos <<= qos;
-      ::DDS::ReturnCode_t const retcode =
-        this->rti_entity ()-> get_qos (ccm_dds_qos);
-      qos <<= ccm_dds_qos;
-      return retcode;
-    }
-
-
-    ::DDS::ReturnCode_t
-    DDS_DomainParticipant_i::set_listener (
-                ::DDS::DomainParticipantListener_ptr a_listener,
-                ::DDS::StatusMask mask)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::set_listener");
-
-      // Retrieve the previously set listener
-      DDSDomainParticipantListener *old_listener = this->rti_entity ()->get_listener ();
-
-      DDSDomainParticipantListener *listener = 0;
-      if (! ::CORBA::is_nil (a_listener))
-        {
-          ACE_NEW_THROW_EX (listener,
-                            DDS_DomainParticipantListener_i (a_listener),
-                            ::CORBA::NO_MEMORY ());
-        }
-
-      ::DDS::ReturnCode_t const retcode =
-        this->rti_entity ()->set_listener (listener, mask);
-
-      if (retcode != ::DDS::RETCODE_OK)
-        {
-          delete listener;
-        }
-      else
-        {
-          delete old_listener;
-        }
-
-      return retcode;
-    }
-
-    ::DDS::DomainParticipantListener_ptr
-    DDS_DomainParticipant_i::get_listener (void)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_listener");
-
-      DDSDomainParticipantListener *ccm_dds_dp_list = this->rti_entity ()->get_listener ();
-      DDS_DomainParticipantListener_i * list_proxy =
-        dynamic_cast <DDS_DomainParticipantListener_i *> (ccm_dds_dp_list);
-      if (!list_proxy)
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                        "DDS_DomainParticipant_i::get_listener - "
-                        "DDS returned a NIL listener.\n"));
-          return ::DDS::DomainParticipantListener::_nil ();
-        }
-      return list_proxy->get_domainparticipantlistener ();
-    }
-
-    ::DDS::ReturnCode_t
-    DDS_DomainParticipant_i::ignore_participant (
-      DDS_INSTANCE_HANDLE_T_IN handle)
-    {
-      ::DDS_InstanceHandle_t ccm_dds_handle;
-      ccm_dds_handle <<= handle;
-      return this->rti_entity ()->ignore_participant (ccm_dds_handle);
-    }
-
-
-    ::DDS::ReturnCode_t
-    DDS_DomainParticipant_i::ignore_topic (
-      DDS_INSTANCE_HANDLE_T_IN handle)
-    {
-      ::DDS_InstanceHandle_t ccm_dds_handle;
-      ccm_dds_handle <<= handle;
-      return this->rti_entity ()->ignore_topic (ccm_dds_handle);
-    }
-
-
-    ::DDS::ReturnCode_t
-    DDS_DomainParticipant_i::ignore_publication (
-      DDS_INSTANCE_HANDLE_T_IN handle)
-    {
-      ::DDS_InstanceHandle_t ccm_dds_handle;
-      ccm_dds_handle <<= handle;
-      return this->rti_entity ()->ignore_publication (ccm_dds_handle);
-    }
-
-
-    ::DDS::ReturnCode_t
-    DDS_DomainParticipant_i::ignore_subscription (
-      DDS_INSTANCE_HANDLE_T_IN handle)
-    {
-      ::DDS_InstanceHandle_t ccm_dds_handle;
-      ccm_dds_handle <<= handle;
-      return this->rti_entity ()->ignore_subscription (ccm_dds_handle);
-    }
-
-
-    ::DDS::DomainId_t
-    DDS_DomainParticipant_i::get_domain_id (void)
-    {
-      return this->rti_entity ()->get_domain_id ();
-    }
-
-
-    ::DDS::ReturnCode_t
-    DDS_DomainParticipant_i::assert_liveliness (void)
-    {
-      return this->rti_entity ()->assert_liveliness ();
-    }
-
-
-    ::DDS::ReturnCode_t
-    DDS_DomainParticipant_i::set_default_publisher_qos (
-      const ::DDS::PublisherQos & qos)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::set_default_publisher_qos");
-      ::DDS_PublisherQos ccm_dds_qos;
-      DDS_ReturnCode_t const retcode = this->rti_entity ()->get_default_publisher_qos (ccm_dds_qos);
-      if (retcode != DDS_RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                       "DDS_DomainParticipant_i"
-                       "::set_default_publisher_qos - "
-                       "Error: Unable to retrieve default publisher qos\n"));
-          return retcode;
-        }
-      ccm_dds_qos <<= qos;
-      return this->rti_entity ()->set_default_publisher_qos (ccm_dds_qos);
-    }
-
-
-    ::DDS::ReturnCode_t
-    DDS_DomainParticipant_i::get_default_publisher_qos (
-      ::DDS::PublisherQos & qos)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_default_publisher_qos");
-      ::DDS_PublisherQos ccm_dds_qos;
-      ::DDS::ReturnCode_t const retcode =
-        this->rti_entity ()-> get_default_publisher_qos (ccm_dds_qos);
-      qos <<= ccm_dds_qos;
-      return retcode;
-    }
-
-
-    ::DDS::ReturnCode_t
-    DDS_DomainParticipant_i::set_default_subscriber_qos (
-      const ::DDS::SubscriberQos & qos)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::set_default_subscriber_qos");
-      ::DDS_SubscriberQos ccm_dds_qos;
-      DDS_ReturnCode_t const retcode = this->rti_entity ()->get_default_subscriber_qos (ccm_dds_qos);
-      if (retcode != DDS_RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                       "DDS_DomainParticipant_i"
-                       "::set_default_subscriber_qos - "
-                       "Error: Unable to retrieve default subscriber qos\n"));
-          return retcode;
-        }
-      ccm_dds_qos <<= qos;
-      return this->rti_entity ()->set_default_subscriber_qos (ccm_dds_qos);
-    }
-
-
-    ::DDS::ReturnCode_t
-    DDS_DomainParticipant_i::get_default_subscriber_qos (
-      ::DDS::SubscriberQos & qos)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_default_subscriber_qos");
-      ::DDS_SubscriberQos ccm_dds_qos;
-      ::DDS::ReturnCode_t const retcode =
-            this->rti_entity ()-> get_default_subscriber_qos (ccm_dds_qos);
-      qos <<= ccm_dds_qos;
-      return retcode;
-    }
-
-
-    ::DDS::ReturnCode_t
-    DDS_DomainParticipant_i::set_default_topic_qos (
-      const ::DDS::TopicQos & qos)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::set_default_topic_qos");
-      ::DDS_TopicQos ccm_dds_qos;
-      DDS_ReturnCode_t const retcode = this->rti_entity ()->get_default_topic_qos (ccm_dds_qos);
-      if (retcode != DDS_RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                       "DDS_DomainParticipant_i"
-                       "::set_default_topic_qos - "
-                       "Error: Unable to retrieve default topic qos\n"));
-          return retcode;
-        }
-      ccm_dds_qos <<= qos;
-      return this->rti_entity ()->set_default_topic_qos (ccm_dds_qos);
-    }
-
-
-    ::DDS::ReturnCode_t
-    DDS_DomainParticipant_i::get_default_topic_qos (
-      ::DDS::TopicQos & qos)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_default_topic_qos");
-      ::DDS_TopicQos ccm_dds_qos;
-      ::DDS::ReturnCode_t const retcode =
-            this->rti_entity ()-> get_default_topic_qos (ccm_dds_qos);
-      qos <<= ccm_dds_qos;
-      return retcode;
-    }
-
-    ::DDS::ReturnCode_t
-    DDS_DomainParticipant_i::get_discovered_participants (
-      ::DDS::InstanceHandleSeq & impl_handles)
-    {
-      ::DDS_InstanceHandleSeq rtiseq;
-      ::DDS::ReturnCode_t const retval = this->rti_entity ()->get_discovered_participants (rtiseq);
-      impl_handles <<= rtiseq;
-      return retval;
-    }
-
-
-    ::DDS::ReturnCode_t
-    DDS_DomainParticipant_i::get_discovered_participant_data (
-      ::DDS::ParticipantBuiltinTopicData & impl_data,
-      DDS_INSTANCE_HANDLE_T_IN impl_handle)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_discovered_participant_data");
-      DDS_ParticipantBuiltinTopicData dds_part_data;
-      dds_part_data <<= impl_data;
-      ::DDS_InstanceHandle_t dds_hnd;
-      dds_hnd <<= impl_handle;
-      ::DDS_ReturnCode_t retcode =
-        this->rti_entity ()->get_discovered_participant_data (dds_part_data,
-                                                        dds_hnd);
-      impl_data <<= dds_part_data;
-      return retcode;
-    }
-
-
-    ::DDS::ReturnCode_t
-    DDS_DomainParticipant_i::get_discovered_topics (
-      ::DDS::InstanceHandleSeq & impl_handles)
-    {
-      ::DDS_InstanceHandleSeq rtiseq;
-      ::DDS::ReturnCode_t const retval = this->rti_entity ()->get_discovered_topics (rtiseq);
-      impl_handles <<= rtiseq;
-      return retval;
-    }
-
-
-    ::DDS::ReturnCode_t
-    DDS_DomainParticipant_i::get_discovered_topic_data (
-      ::DDS::TopicBuiltinTopicData & impl_data,
-      DDS_INSTANCE_HANDLE_T_IN impl_handle)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_discovered_topic_data");
-      DDS_TopicBuiltinTopicData dds_tp_data;
-      dds_tp_data <<= impl_data;
-      ::DDS_InstanceHandle_t dds_hnd;
-      dds_hnd <<= impl_handle;
-      ::DDS_ReturnCode_t retcode =
-        this->rti_entity ()->get_discovered_topic_data (dds_tp_data,
-                                                  dds_hnd);
-      impl_data <<= dds_tp_data;
-      return retcode;
-    }
-
-
-    ::CORBA::Boolean
-    DDS_DomainParticipant_i::contains_entity (
-      DDS_INSTANCE_HANDLE_T_IN a_handle)
-    {
-      ::DDS_InstanceHandle_t ccm_dds_handle;
-      ccm_dds_handle <<= a_handle;
-      return this->rti_entity ()->contains_entity (ccm_dds_handle);
-    }
-
-
-    ::DDS::ReturnCode_t
-    DDS_DomainParticipant_i::get_current_time (
-      ::DDS::Time_t & current_time)
-    {
-      DDS_Time_t ccm_dds_time;
-      ::DDS::ReturnCode_t const retval = this->rti_entity ()->get_current_time (ccm_dds_time);
-      current_time <<= ccm_dds_time;
-      return retval;
-    }
-
-
-    ::DDS::ReturnCode_t
-    DDS_DomainParticipant_i::enable (void)
-    {
-      return this->rti_entity ()->enable ();
-    }
-
-
-    ::DDS::StatusCondition_ptr
-    DDS_DomainParticipant_i::get_statuscondition (void)
-    {
-      ::DDS::StatusCondition_var retval;
-      DDSStatusCondition* sc = this->rti_entity ()->get_statuscondition ();
-      if (sc)
-        {
-          ACE_NEW_THROW_EX (retval,
-                            DDS_StatusCondition_i (sc, this),
-                            ::CORBA::NO_MEMORY ());
-        }
-      return retval._retn ();
-    }
-
-
-    ::DDS::StatusMask
-    DDS_DomainParticipant_i::get_status_changes (void)
-    {
-      return this->rti_entity ()->get_status_changes ();
-    }
-
-
-    DDS_INSTANCE_HANDLE_T_RETN
-    DDS_DomainParticipant_i::get_instance_handle (void)
-    {
-      ::DDS_InstanceHandle_t const rtihandle = this->rti_entity ()->get_instance_handle ();
-      ::DDS::InstanceHandle_t handle;
-      handle <<= rtihandle;
-      return handle;
-    }
-
-
-    DDSDomainParticipant *
-    DDS_DomainParticipant_i::get_rti_entity (void)
-    {
-      return this->rti_entity_;
-    }
-
-
-    void
-    DDS_DomainParticipant_i::set_rti_entity (
-      DDSDomainParticipant * dp)
-    {
-      this->rti_entity_ = dp;
-    }
-
-
-    DDSDomainParticipant *
-    DDS_DomainParticipant_i::rti_entity (void)
-    {
-      if (!this->rti_entity_)
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG,
-                        "DDS_DomainParticipant_i::rti_entity - "
-                        "Throwing BAD_INV_ORDER.\n"));
-          throw ::CORBA::BAD_INV_ORDER ();
-        }
-      return this->rti_entity_;
-    }
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.h b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.h
deleted file mode 100644
index 678a9c069d8..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.h
+++ /dev/null
@@ -1,187 +0,0 @@
-/**
- * @author William R. Otte <wotte@dre.vanderbilt.edu>
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DOMAINPARTICIPANT_T_H_
-#define DOMAINPARTICIPANT_T_H_
-
-#include "dds4ccm/idl/ndds/ndds_dcpsC.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-#include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h"
-#include "tao/LocalObject.h"
-
-class DDSDomainParticipant;
-
-namespace CIAO
-{
-  namespace NDDS
-  {
-    class DDS4CCM_NDDS_Export DDS_DomainParticipant_i :
-      public virtual ::DDS::DomainParticipant,
-      public virtual ::CORBA::LocalObject
-    {
-    public:
-      /// Constructor
-      DDS_DomainParticipant_i (DDSDomainParticipant * dp);
-
-      /// Destructor
-      virtual ~DDS_DomainParticipant_i (void);
-
-      virtual ::DDS::Publisher_ptr create_publisher (
-        const ::DDS::PublisherQos & qos,
-        ::DDS::PublisherListener_ptr a_listener,
-        ::DDS::StatusMask mask);
-
-      virtual ::DDS::Publisher_ptr create_publisher_with_profile (
-        const char* qos_profile,
-        ::DDS::PublisherListener_ptr a_listener,
-        ::DDS::StatusMask mask);
-
-      virtual ::DDS::ReturnCode_t delete_publisher (::DDS::Publisher_ptr p);
-
-      virtual ::DDS::Subscriber_ptr create_subscriber (
-        const ::DDS::SubscriberQos & qos,
-        ::DDS::SubscriberListener_ptr a_listener,
-        ::DDS::StatusMask mask);
-
-      virtual ::DDS::Subscriber_ptr create_subscriber_with_profile(
-        const char* qos_profile,
-        ::DDS::SubscriberListener_ptr a_listener,
-        ::DDS::StatusMask mask);
-
-      virtual ::DDS::ReturnCode_t delete_subscriber (::DDS::Subscriber_ptr s);
-
-      virtual ::DDS::Subscriber_ptr get_builtin_subscriber (void);
-
-      virtual ::DDS::Topic_ptr create_topic (
-        const char * impl_name,
-        const char * type_name,
-        const ::DDS::TopicQos & qos,
-        ::DDS::TopicListener_ptr a_listener,
-        ::DDS::StatusMask mask);
-
-      virtual ::DDS::Topic_ptr create_topic_with_profile (
-        const char * impl_name,
-        const char * type_name,
-        const char* qos_profile,
-        ::DDS::TopicListener_ptr a_listener,
-        ::DDS::StatusMask mask);
-
-      virtual ::DDS::ReturnCode_t delete_topic (::DDS::Topic_ptr a_topic);
-
-      virtual ::DDS::Topic_ptr find_topic (
-        const char * impl_name,
-        const ::DDS::Duration_t & timeout);
-
-      virtual ::DDS::TopicDescription_ptr lookup_topicdescription (
-        const char * name);
-
-      virtual ::DDS::ContentFilteredTopic_ptr create_contentfilteredtopic (
-        const char * name,
-        ::DDS::Topic_ptr related_topic,
-        const char * filter_expression,
-        const ::DDS::StringSeq & expression_parameters);
-
-      virtual ::DDS::ReturnCode_t delete_contentfilteredtopic (
-        ::DDS::ContentFilteredTopic_ptr a_contentfilteredtopic);
-
-      virtual ::DDS::MultiTopic_ptr create_multitopic (
-        const char * name,
-        const char * type_name,
-        const char * subscription_expression,
-        const ::DDS::StringSeq & expression_parameters);
-
-      virtual ::DDS::ReturnCode_t delete_multitopic (
-        ::DDS::MultiTopic_ptr a_multitopic);
-
-      virtual ::DDS::ReturnCode_t delete_contained_entities (void);
-
-      virtual ::DDS::ReturnCode_t set_qos (
-        const ::DDS::DomainParticipantQos & qos);
-
-      virtual ::DDS::ReturnCode_t get_qos (
-        ::DDS::DomainParticipantQos & qos);
-
-      virtual ::DDS::ReturnCode_t set_listener (
-        ::DDS::DomainParticipantListener_ptr a_listener,
-        ::DDS::StatusMask mask);
-
-      virtual ::DDS::DomainParticipantListener_ptr get_listener (void);
-
-      virtual ::DDS::ReturnCode_t ignore_participant (
-        DDS_INSTANCE_HANDLE_T_IN handle);
-
-      virtual ::DDS::ReturnCode_t ignore_topic (
-        DDS_INSTANCE_HANDLE_T_IN handle);
-
-      virtual ::DDS::ReturnCode_t ignore_publication (
-        DDS_INSTANCE_HANDLE_T_IN handle);
-
-      virtual ::DDS::ReturnCode_t ignore_subscription (
-        DDS_INSTANCE_HANDLE_T_IN handle);
-
-      virtual ::DDS::DomainId_t get_domain_id (void);
-
-      virtual ::DDS::ReturnCode_t assert_liveliness (void);
-
-      virtual ::DDS::ReturnCode_t set_default_publisher_qos (
-        const ::DDS::PublisherQos & qos);
-
-      virtual ::DDS::ReturnCode_t get_default_publisher_qos (
-        ::DDS::PublisherQos & qos);
-
-      virtual ::DDS::ReturnCode_t set_default_subscriber_qos (
-        const ::DDS::SubscriberQos & qos);
-
-      virtual ::DDS::ReturnCode_t get_default_subscriber_qos (
-        ::DDS::SubscriberQos & qos);
-
-      virtual ::DDS::ReturnCode_t set_default_topic_qos (
-        const ::DDS::TopicQos & qos);
-
-      virtual ::DDS::ReturnCode_t get_default_topic_qos (
-        ::DDS::TopicQos & qos);
-
-      virtual ::DDS::ReturnCode_t get_discovered_participants (
-        ::DDS::InstanceHandleSeq & impl_handles);
-
-      virtual ::DDS::ReturnCode_t get_discovered_participant_data (
-        ::DDS::ParticipantBuiltinTopicData & impl_data,
-        DDS_INSTANCE_HANDLE_T_IN impl_handle);
-
-      virtual ::DDS::ReturnCode_t get_discovered_topics (
-        ::DDS::InstanceHandleSeq & impl_handles);
-
-      virtual ::DDS::ReturnCode_t get_discovered_topic_data (
-        ::DDS::TopicBuiltinTopicData & impl_data,
-        DDS_INSTANCE_HANDLE_T_IN impl_handle);
-
-      virtual ::CORBA::Boolean contains_entity (
-        DDS_INSTANCE_HANDLE_T_IN a_handle);
-
-      virtual ::DDS::ReturnCode_t get_current_time (
-        ::DDS::Time_t & current_time);
-
-      virtual ::DDS::ReturnCode_t enable (void);
-
-      virtual ::DDS::StatusCondition_ptr get_statuscondition (void);
-
-      virtual ::DDS::StatusMask get_status_changes (void);
-
-      virtual DDS_INSTANCE_HANDLE_T_RETN get_instance_handle (void);
-
-      ::DDSDomainParticipant * get_rti_entity (void);
-
-      void set_rti_entity (::DDSDomainParticipant * dp);
-
-    protected:
-      ::DDSDomainParticipant *rti_entity_;
-      ::DDSDomainParticipant * rti_entity (void);
-    };
-  }
-}
-
-#endif /* DOMAINPARTICIPANT_T_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp
deleted file mode 100644
index 9ebe40e3fd6..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp
+++ /dev/null
@@ -1,340 +0,0 @@
-#include "dds4ccm/impl/ndds/DomainParticipantFactory.h"
-#include "dds4ccm/impl/ndds/DomainParticipant.h"
-#include "dds4ccm/impl/ndds/DomainParticipantListener.h"
-#include "dds4ccm/impl/ndds/convertors/DomainParticipantFactoryQos.h"
-#include "dds4ccm/impl/ndds/convertors/DomainParticipantQos.h"
-#include "dds4ccm/impl/ndds/Utils.h"
-#include "dds4ccm/impl/Utils.h"
-#include "dds4ccm/impl/logger/Log_Macros.h"
-
-namespace CIAO
-{
-  namespace NDDS
-  {
-    DDS_DomainParticipantFactory_i::DDS_DomainParticipantFactory_i (void)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipantFactory_i::DDS_DomainParticipantFactory_i");
-    }
-
-    DDS_DomainParticipantFactory_i::~DDS_DomainParticipantFactory_i (void)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipantFactory_i::~DDS_DomainParticipantFactory_i");
-    }
-
-    ::DDS::DomainParticipant_ptr
-    DDS_DomainParticipantFactory_i::create_participant (::DDS::DomainId_t domain_id,
-                                                        const ::DDS::DomainParticipantQos & qos,
-                                                        ::DDS::DomainParticipantListener_ptr a_listener,
-                                                        ::DDS::StatusMask mask)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipantFactory_i::create_participant");
-
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_TRACE, DDS4CCM_INFO
-                    "DDS_DomainParticipantFactory_i::create_participant - "
-                    "Start creating domain participant for domain <%d>\n",
-                    domain_id));
-
-      DDS_DomainParticipantListener_i *ccm_dds_dpl = 0;
-      if (! ::CORBA::is_nil (a_listener))
-        {
-          ACE_NEW_THROW_EX (ccm_dds_dpl,
-                            DDS_DomainParticipantListener_i (a_listener),
-                            ::CORBA::NO_MEMORY ());
-        }
-
-      ACE_CString qos_profile = "default";
-
-      DDS_DomainParticipantQos ccm_dds_qos;
-      DDS_ReturnCode_t retcode = DDSDomainParticipantFactory::get_instance()->get_default_participant_qos (ccm_dds_qos);
-      if (retcode != DDS_RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                      "DDS_DomainParticipantFactory_i"
-                      "::create_participant - "
-                      "Error: Unable to retrieve default participant qos\n"));
-          return ::DDS::DomainParticipant::_nil ();
-        }
-      ccm_dds_qos <<= qos;
-      DDSDomainParticipant * dds_dp = DDSDomainParticipantFactory::get_instance ()->
-                  create_participant (domain_id,
-                                      ccm_dds_qos,
-                                      ccm_dds_dpl,
-                                      mask);
-
-      if (!dds_dp)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                      "DDS_DomainParticipantFactory_i"
-                      "::create_participant - "
-                      "Error: Unable to create DomainParticipant for domain <%d>\n",
-                      domain_id));
-          delete ccm_dds_dpl;
-          return ::DDS::DomainParticipant::_nil ();
-        }
-
-      ::DDS::DomainParticipant_var retval;
-      ACE_NEW_THROW_EX (retval,
-                        DDS_DomainParticipant_i (dds_dp),
-                        ::CORBA::NO_MEMORY ());
-      retcode = dds_dp->enable ();
-      if (retcode != DDS_RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                      "DDS_DomainParticipantFactory_i"
-                      "::create_participant - "
-                      "Error: Unable to enable the domainparticipant "
-                      "for domain <%d>: <%C>\n",
-                      domain_id,
-                      ::CIAO::DDS4CCM::translate_retcode (retcode)));
-          delete ccm_dds_dpl;
-          throw ::CORBA::INTERNAL ();
-        }
-
-      if (ccm_dds_dpl)
-        {
-          ccm_dds_dpl->set_dds_dp (retval.in ());
-        }
-
-      return retval._retn ();
-    }
-
-
-    ::DDS::DomainParticipant_ptr
-    DDS_DomainParticipantFactory_i::create_participant_with_profile (
-      ::DDS::DomainId_t domain_id,
-      const char * qos_profile,
-      ::DDS::DomainParticipantListener_ptr a_listener,
-      ::DDS::StatusMask mask)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipantFactory_i::"
-                     "create_participant_with_profile");
-
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_TRACE, DDS4CCM_INFO
-                    "DDS_DomainParticipantFactory_i::create_participant_with_profile - "
-                    "Start creating domain participant: "
-                    "profile <%C> - domain <%d>\n",
-                    qos_profile, domain_id));
-      DDS_DomainParticipantListener_i *ccm_dds_dpl = 0;
-      if (! ::CORBA::is_nil (a_listener))
-        {
-          ACE_NEW_THROW_EX (ccm_dds_dpl,
-                            DDS_DomainParticipantListener_i (a_listener),
-                            ::CORBA::NO_MEMORY ());
-        }
-
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                    "DDS_DomainParticipantFactory_i::create_participant_with_profile - "
-                    "Creating participant: profile <%C> - domain <%d>\n",
-                    qos_profile,
-                    domain_id));
-
-      char * lib_name = get_library_name(qos_profile);
-      char * prof_name = get_profile_name(qos_profile);
-
-      DDSDomainParticipant * dds_dp = 0;
-      if (lib_name != 0 && prof_name != 0)
-        {
-          dds_dp = DDSDomainParticipantFactory::get_instance ()->
-                            create_participant_with_profile (domain_id,
-                                                            lib_name,
-                                                            prof_name,
-                                                            ccm_dds_dpl,
-                                                            mask);
-        }
-
-      ACE_OS::free (lib_name);
-      ACE_OS::free (prof_name);
-
-      if (!dds_dp)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        "DDS_DomainParticipantFactory_i::create_participant_with_profile <%C> - "
-                        "Error: Unable to create DomainParticipant for domain <%d>\n",
-                        qos_profile,
-                        domain_id));
-          delete ccm_dds_dpl;
-          return ::DDS::DomainParticipant::_nil ();
-        }
-      ::DDS::DomainParticipant_var retval;
-      ACE_NEW_THROW_EX (retval,
-                        DDS_DomainParticipant_i (dds_dp),
-                        ::CORBA::NO_MEMORY ());
-      DDS_ReturnCode_t retcode = dds_dp->enable ();
-      if (retcode != DDS_RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        "DDS_DomainParticipantFactory_i::create_participant_with_profile <%C> - "
-                        "Error: Unable to enable DomainParticipant for domain <%d>: <%C>\n",
-                        qos_profile,
-                        domain_id,
-                        ::CIAO::DDS4CCM::translate_retcode (retcode)));
-          delete ccm_dds_dpl;
-          throw ::CORBA::INTERNAL ();
-        }
-
-      if (ccm_dds_dpl)
-        {
-          ccm_dds_dpl->set_dds_dp (retval.in ());
-        }
-      DDS_DomainParticipant_i * typed_dp =
-        dynamic_cast < DDS_DomainParticipant_i *>
-        (retval.in ());
-
-      if (typed_dp)
-        {
-          typed_dp->set_rti_entity (dds_dp);
-        }
-
-      return retval._retn ();
-    }
-
-    ::DDS::ReturnCode_t
-    DDS_DomainParticipantFactory_i::delete_participant (
-      ::DDS::DomainParticipant_ptr a_participant)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipantFactory_i::delete_participant");
-
-      DDS_DomainParticipant_i *part =
-        dynamic_cast< DDS_DomainParticipant_i * > (a_participant);
-
-      if (!part)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_CAST_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        "DDS_DomainParticipantFactory_i"
-                        "::delete_participant - "
-                        "Unable to cast provided object reference to servant "
-                        "type, bailing.\n"));
-          return DDS::RETCODE_ERROR;
-        }
-
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_CAST_SUCCESSFUL, (LM_TRACE, DDS4CCM_INFO
-                    "DDS_DomainParticipantFactory_i"
-                    "::delete_participant - "
-                    "Successfully casted provided object reference to servant type.\n"));
-
-      const DDS_ReturnCode_t retcode = DDSDomainParticipantFactory::get_instance ()->
-                  delete_participant (part->get_rti_entity ());
-      if (retcode != DDS_RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                    "DDS_DomainParticipantFactory_i"
-                    "::delete_participant - "
-                    "delete_participant returned non-ok error code %C\n",
-                    ::CIAO::DDS4CCM::translate_retcode (retcode)));
-        }
-      else
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_INFO, DDS4CCM_INFO
-                    "DDS_DomainParticipantFactory_i"
-                    "::delete_participant - "
-                    "Successfully deleted provided participant.\n"));
-        }
-      return retcode;
-    }
-
-
-    ::DDS::DomainParticipant_ptr
-    DDS_DomainParticipantFactory_i::lookup_participant (
-      ::DDS::DomainId_t domain_id)
-    {
-      ::DDS::DomainParticipant_var retval;
-      ::DDSDomainParticipant* dp = DDSDomainParticipantFactory::get_instance ()
-        ->lookup_participant (domain_id);
-       ACE_NEW_THROW_EX (retval,
-                         DDS_DomainParticipant_i (dp),
-                         ::CORBA::NO_MEMORY ());
-      return retval._retn ();
-    }
-
-
-    ::DDS::ReturnCode_t
-    DDS_DomainParticipantFactory_i::set_default_participant_qos (
-      const ::DDS::DomainParticipantQos & qos)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipantFactory_i::"
-        "set_default_participant_qos");
-      DDS_DomainParticipantQos ccm_dds_qos;
-      DDS_ReturnCode_t const retcode = DDSDomainParticipantFactory::get_instance()->get_default_participant_qos (ccm_dds_qos);
-      if (retcode != DDS_RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                      "DDS_DomainParticipantFactory_i"
-                      "::set_default_participant_qos - "
-                      "Error: Unable to retrieve default participant qos\n"));
-          return retcode;
-        }
-      ccm_dds_qos <<= qos;
-      return DDSDomainParticipantFactory::get_instance ()->
-        set_default_participant_qos (ccm_dds_qos);
-    }
-
-
-    ::DDS::ReturnCode_t
-    DDS_DomainParticipantFactory_i::get_default_participant_qos (
-      ::DDS::DomainParticipantQos & qos)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipantFactory_i::"
-        "get_default_participant_qos");
-      DDS_DomainParticipantQos ccm_dds_qos;
-      ::DDS::ReturnCode_t const retcode =
-        DDSDomainParticipantFactory::get_instance ()->
-          get_default_participant_qos (ccm_dds_qos);
-      qos <<= ccm_dds_qos;
-      return retcode;
-    }
-
-    ::DDS::ReturnCode_t
-    DDS_DomainParticipantFactory_i::set_qos (
-      const ::DDS::DomainParticipantFactoryQos & qos)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipantFactory_i::set_qos");
-      DDS_DomainParticipantFactoryQos ccm_dds_qos;
-      DDS_ReturnCode_t const retcode = DDSDomainParticipantFactory::get_instance ()->get_qos (ccm_dds_qos);
-      if (retcode != DDS_RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                      "DDS_DomainParticipantFactory_i"
-                      "::set_qos - "
-                      "Error: Unable to retrieve participant factory qos\n"));
-          return retcode;
-        }
-      ccm_dds_qos <<= qos;
-      return DDSDomainParticipantFactory::get_instance ()->set_qos (ccm_dds_qos);
-    }
-
-
-    ::DDS::ReturnCode_t
-    DDS_DomainParticipantFactory_i::get_qos (
-      ::DDS::DomainParticipantFactoryQos & qos)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipantFactory_i::get_qos");
-      DDS_DomainParticipantFactoryQos ccm_dds_qos;
-      ccm_dds_qos <<= qos;
-      ::DDS::ReturnCode_t const retcode =
-        DDSDomainParticipantFactory::get_instance ()->get_qos (ccm_dds_qos);
-      ccm_dds_qos <<= qos;
-      return retcode;
-    }
-
-
-    ::DDS::ReturnCode_t
-    DDS_DomainParticipantFactory_i::set_default_participant_qos_with_profile (
-      const char * qos_profile)
-    {
-      char * lib_name = get_library_name(qos_profile);
-      char * prof_name = get_profile_name(qos_profile);
-
-      ::DDS::ReturnCode_t retcode = ::DDS::RETCODE_ERROR;
-      if (lib_name != 0 && prof_name != 0)
-        {
-          retcode = DDSDomainParticipantFactory::get_instance ()->
-            set_default_participant_qos_with_profile (lib_name, prof_name);
-        }
-
-      ACE_OS::free (lib_name);
-      ACE_OS::free (prof_name);
-
-      return retcode;
-    }
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h
deleted file mode 100644
index 2d52267b1e0..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * @author William R. Otte <wotte@dre.vanderbilt.edu>
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DOMAINPARTICIPANTFACTORY_T_H_
-#define DOMAINPARTICIPANTFACTORY_T_H_
-
-#include "dds4ccm/idl/ndds/ndds_dcpsC.h"
-#include "tao/LocalObject.h"
-#include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h"
-
-namespace CIAO
-{
-  namespace NDDS
-  {
-    class DDS4CCM_NDDS_Export DDS_DomainParticipantFactory_i :
-      public virtual ::DDS::DomainParticipantFactory,
-      public virtual ::CORBA::LocalObject
-    {
-
-    public:
-      friend class ACE_Singleton<DDS_DomainParticipantFactory_i, TAO_SYNCH_MUTEX>;
-
-      /// Constructor
-      DDS_DomainParticipantFactory_i (void);
-
-      /// Destructor
-      virtual ~DDS_DomainParticipantFactory_i (void);
-
-      virtual ::DDS::DomainParticipant_ptr create_participant (
-          ::DDS::DomainId_t domain_id,
-          const ::DDS::DomainParticipantQos & qos,
-          ::DDS::DomainParticipantListener_ptr a_listener,
-          ::DDS::StatusMask mask);
-
-      virtual ::DDS::DomainParticipant_ptr create_participant_with_profile (
-          ::DDS::DomainId_t domain_id,
-          const char * qos_profile,
-          ::DDS::DomainParticipantListener_ptr a_listener,
-          ::DDS::StatusMask mask);
-
-      virtual ::DDS::ReturnCode_t delete_participant (
-        ::DDS::DomainParticipant_ptr a_participant);
-
-      virtual ::DDS::DomainParticipant_ptr lookup_participant (
-        ::DDS::DomainId_t domain_id);
-
-      virtual
-        ::DDS::ReturnCode_t set_default_participant_qos (const ::DDS::DomainParticipantQos & qos);
-
-      virtual
-        ::DDS::ReturnCode_t get_default_participant_qos (::DDS::DomainParticipantQos & qos);
-
-      virtual
-        ::DDS::ReturnCode_t set_qos (const ::DDS::DomainParticipantFactoryQos & qos);
-
-      virtual
-        ::DDS::ReturnCode_t get_qos (::DDS::DomainParticipantFactoryQos & qos);
-
-      virtual ::DDS::ReturnCode_t set_default_participant_qos_with_profile(
-                                                        const char * qos_profile);
-    };
-  }
-}
-
-#endif /* DOMAINPARTICIPANTFACTORY_T_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.cpp
deleted file mode 100644
index 15afb558dd5..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.cpp
+++ /dev/null
@@ -1,264 +0,0 @@
-#include "dds4ccm/impl/ndds/DomainParticipantListener.h"
-#include "dds4ccm/impl/logger/Log_Macros.h"
-#include "dds4ccm/impl/ndds/TypeSupport.h"
-
-#include "dds4ccm/impl/ndds/convertors/InconsistentTopicStatus.h"
-#include "dds4ccm/impl/ndds/convertors/RequestedDeadlineMissedStatus.h"
-#include "dds4ccm/impl/ndds/convertors/RequestedIncompatibleQosStatus.h"
-#include "dds4ccm/impl/ndds/convertors/SampleRejectedStatus.h"
-#include "dds4ccm/impl/ndds/convertors/LivelinessChangedStatus.h"
-#include "dds4ccm/impl/ndds/convertors/SubscriptionMatchedStatus.h"
-#include "dds4ccm/impl/ndds/convertors/SampleLostStatus.h"
-#include "dds4ccm/impl/ndds/convertors/OfferedIncompatibleQosStatus.h"
-#include "dds4ccm/impl/ndds/convertors/OfferedDeadlineMissedStatus.h"
-#include "dds4ccm/impl/ndds/convertors/LivelinessLostStatus.h"
-#include "dds4ccm/impl/ndds/convertors/PublicationMatchedStatus.h"
-
-#include "dds4ccm/impl/ndds/Topic.h"
-#include "dds4ccm/impl/ndds/Subscriber.h"
-#include "dds4ccm/impl/ndds/Publisher.h"
-
-namespace CIAO
-{
-  namespace NDDS
-  {
-    DDS_DomainParticipantListener_i::DDS_DomainParticipantListener_i (
-      ::DDS::DomainParticipantListener_ptr p)
-        : impl_ (::DDS::DomainParticipantListener::_duplicate (p))
-    {
-    }
-
-    DDS_DomainParticipantListener_i::~DDS_DomainParticipantListener_i (void)
-    {
-    }
-
-    ::DDS::DataReader_ptr
-    DDS_DomainParticipantListener_i::create_datareader (DDSDataReader * reader)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipantListener_i::create_datareader");
-
-      ::DDS::Subscriber_var sub;
-      ACE_NEW_THROW_EX (sub,
-                        DDS_Subscriber_i (reader->get_subscriber (),
-                                          this->dp_.in ()),
-                        ::CORBA::NO_MEMORY ());
-
-      ::DDS::DataReader_var dr = DDS_TypeSupport_i::create_datareader (
-                                                                reader,
-                                                                this->dp_.in (),
-                                                                sub.in ());
-      return dr.in ();
-    }
-
-    ::DDS::DataWriter_ptr
-    DDS_DomainParticipantListener_i::create_datawriter (DDSDataWriter * writer)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipantListener_i::create_datawriter");
-
-      ::DDS::Publisher_var pub;
-      ACE_NEW_THROW_EX (pub,
-                        DDS_Publisher_i (writer->get_publisher (),
-                                         this->dp_.in ()),
-                        ::CORBA::NO_MEMORY ());
-
-      ::DDS::DataWriter_var dw = DDS_TypeSupport_i::create_datawriter (
-                                                                writer,
-                                                                this->dp_.in (),
-                                                                pub.in ());
-      return dw.in ();
-    }
-
-    void
-    DDS_DomainParticipantListener_i::on_inconsistent_topic (
-        ::DDSTopic * tp,
-        const ::DDS_InconsistentTopicStatus & status)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipantListener_i::on_inconsistent_topic");
-
-      ::DDS::InconsistentTopicStatus ddsstatus;
-      ddsstatus <<= status;
-
-      ::DDS::Topic_var topic;
-      ACE_NEW_THROW_EX (topic,
-                        DDS_Topic_i (tp,
-                                     this->dp_.in ()),
-                        ::CORBA::NO_MEMORY ());
-      this->impl_->on_inconsistent_topic (topic.in (), ddsstatus);
-    }
-
-    void
-    DDS_DomainParticipantListener_i::on_requested_deadline_missed (
-        ::DDSDataReader * reader,
-        const ::DDS_RequestedDeadlineMissedStatus & status)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipantListener_i::on_requested_deadline_missed");
-
-      ::DDS::RequestedDeadlineMissedStatus ddsstatus;
-      ddsstatus <<= status;
-
-      ::DDS::DataReader_var dr = this->create_datareader (reader);
-      this->impl_->on_requested_deadline_missed (dr.in (), ddsstatus);
-    }
-
-    void
-    DDS_DomainParticipantListener_i::on_requested_incompatible_qos (
-        ::DDSDataReader * reader,
-        const ::DDS_RequestedIncompatibleQosStatus & status)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipantListener_i::on_requested_incompatible_qos");
-
-      ::DDS::RequestedIncompatibleQosStatus ddsstatus;
-      ddsstatus <<= status;
-
-      ::DDS::DataReader_var dr = this->create_datareader (reader);
-      this->impl_->on_requested_incompatible_qos (dr.in (), ddsstatus);
-    }
-
-    void
-    DDS_DomainParticipantListener_i::on_sample_rejected (
-        ::DDSDataReader * reader,
-        const ::DDS_SampleRejectedStatus & status)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipantListener_i::on_sample_rejected");
-
-      ::DDS::SampleRejectedStatus ddsstatus;
-      ddsstatus <<= status;
-
-      ::DDS::DataReader_var dr = this->create_datareader (reader);
-      this->impl_->on_sample_rejected (dr.in (), ddsstatus);
-    }
-
-    void
-    DDS_DomainParticipantListener_i::on_liveliness_changed (
-        ::DDSDataReader * reader,
-        const ::DDS_LivelinessChangedStatus & status)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipantListener_i::on_liveliness_changed");
-
-      ::DDS::LivelinessChangedStatus ddsstatus;
-      ddsstatus <<= status;
-
-      ::DDS::DataReader_var dr = this->create_datareader (reader);
-      this->impl_->on_liveliness_changed (dr.in (), ddsstatus);
-    }
-
-    void
-    DDS_DomainParticipantListener_i::on_data_available (
-        ::DDSDataReader* reader)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipantListener_i::on_data_available");
-
-      ::DDS::DataReader_var dr = this->create_datareader (reader);
-      this->impl_->on_data_available (dr.in ());
-    }
-
-    void
-    DDS_DomainParticipantListener_i::on_subscription_matched (
-        ::DDSDataReader * reader,
-        const ::DDS_SubscriptionMatchedStatus & status)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipantListener_i::on_subscription_matched");
-
-      ::DDS::SubscriptionMatchedStatus ddsstatus;
-      ddsstatus <<= status;
-
-      ::DDS::DataReader_var dr = this->create_datareader (reader);
-      this->impl_->on_subscription_matched (dr.in (), ddsstatus);
-    }
-
-    void
-    DDS_DomainParticipantListener_i::on_sample_lost (
-        ::DDSDataReader * reader,
-        const ::DDS_SampleLostStatus & status)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipantListener_i::on_sample_lost");
-
-      ::DDS::SampleLostStatus ddsstatus;
-      ddsstatus <<= status;
-
-      ::DDS::DataReader_var dr = this->create_datareader (reader);
-      this->impl_->on_sample_lost (dr.in (), ddsstatus);
-    }
-
-    void
-    DDS_DomainParticipantListener_i::on_offered_deadline_missed (
-        ::DDSDataWriter * writer,
-        const ::DDS_OfferedDeadlineMissedStatus & status)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipantListener_i::on_offered_deadline_missed");
-
-      ::DDS::OfferedDeadlineMissedStatus ddsstatus;
-      ddsstatus <<= status;
-
-      ::DDS::DataWriter_var dw = this->create_datawriter (writer);
-      this->impl_->on_offered_deadline_missed (dw.in (), ddsstatus);
-    }
-
-    void
-    DDS_DomainParticipantListener_i::on_offered_incompatible_qos (
-        ::DDSDataWriter * writer,
-        const ::DDS_OfferedIncompatibleQosStatus & status)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipantListener_i::on_offered_incompatible_qos");
-
-      ::DDS::OfferedIncompatibleQosStatus ddsstatus;
-      ddsstatus <<= status;
-
-      ::DDS::DataWriter_var dw = this->create_datawriter (writer);
-      this->impl_->on_offered_incompatible_qos (dw.in (), ddsstatus);
-    }
-
-    void
-    DDS_DomainParticipantListener_i::on_liveliness_lost (
-        ::DDSDataWriter * writer,
-        const ::DDS_LivelinessLostStatus & status)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipantListener_i::on_liveliness_lost");
-
-      ::DDS::LivelinessLostStatus ddsstatus;
-      ddsstatus <<= status;
-
-      ::DDS::DataWriter_var dw = this->create_datawriter (writer);
-      this->impl_->on_liveliness_lost (dw.in (), ddsstatus);
-    }
-
-    void
-    DDS_DomainParticipantListener_i::on_publication_matched (
-        ::DDSDataWriter * writer,
-        const ::DDS_PublicationMatchedStatus & status)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipantListener_i::on_publication_matched");
-
-      ::DDS::PublicationMatchedStatus ddsstatus;
-      ddsstatus <<= status;
-
-      ::DDS::DataWriter_var dw = this->create_datawriter (writer);
-      this->impl_->on_publication_matched (dw.in (), ddsstatus);
-    }
-
-    void
-    DDS_DomainParticipantListener_i::on_data_on_readers (
-        ::DDSSubscriber* subscriber)
-    {
-      ::DDS::Subscriber_var sub;
-      ACE_NEW_THROW_EX (sub,
-                        DDS_Subscriber_i (subscriber,
-                                          this->dp_.in ()),
-                        ::CORBA::NO_MEMORY ());
-      this->impl_->on_data_on_readers (sub.in ());
-    }
-
-    ::DDS::DomainParticipantListener_ptr
-    DDS_DomainParticipantListener_i::get_domainparticipantlistener (void)
-    {
-      return ::DDS::DomainParticipantListener::_duplicate (this->impl_.in ());
-    }
-
-    void
-    DDS_DomainParticipantListener_i::set_dds_dp (::DDS::DomainParticipant_ptr dp)
-    {
-      this->dp_ = ::DDS::DomainParticipant::_duplicate (dp);
-    }
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.h b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.h
deleted file mode 100644
index a481dc54a18..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/**
- * @author William R. Otte <wotte@dre.vanderbilt.edu>
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DOMAINPARTICIPANTLISTENER_H_
-#define DOMAINPARTICIPANTLISTENER_H_
-
-#include "dds4ccm/idl/ndds/ndds_dcpsC.h"
-#include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h"
-#include "ndds/ndds_cpp.h"
-
-namespace CIAO
-{
-  namespace NDDS
-  {
-    class DDS4CCM_NDDS_Export DDS_DomainParticipantListener_i :
-      public ::DDSDomainParticipantListener
-    {
-    public:
-      /// Constructor
-      DDS_DomainParticipantListener_i (::DDS::DomainParticipantListener_ptr p);
-
-      /// Destructor
-      virtual ~DDS_DomainParticipantListener_i (void);
-
-      ::DDS::DomainParticipantListener_ptr get_domainparticipantlistener (void);
-
-      virtual void
-      on_inconsistent_topic (
-        ::DDSTopic*,
-        const ::DDS_InconsistentTopicStatus & );
-
-      virtual void
-      on_requested_deadline_missed (
-        ::DDSDataReader* ,
-        const ::DDS_RequestedDeadlineMissedStatus & );
-
-      virtual void
-      on_requested_incompatible_qos (
-        ::DDSDataReader* ,
-        const ::DDS_RequestedIncompatibleQosStatus & );
-
-      virtual void
-      on_sample_rejected (
-        ::DDSDataReader*,
-        const ::DDS_SampleRejectedStatus & );
-
-      virtual void
-      on_liveliness_changed (
-        ::DDSDataReader* ,
-        const ::DDS_LivelinessChangedStatus & );
-
-      virtual void
-      on_data_available (
-        ::DDSDataReader* );
-
-      virtual void
-      on_subscription_matched (
-        ::DDSDataReader* ,
-        const ::DDS_SubscriptionMatchedStatus & );
-
-      virtual void
-      on_sample_lost (
-        ::DDSDataReader* ,
-        const ::DDS_SampleLostStatus & );
-
-      virtual void
-      on_offered_deadline_missed (
-        ::DDSDataWriter* ,
-        const ::DDS_OfferedDeadlineMissedStatus & );
-
-      virtual void
-      on_offered_incompatible_qos (
-        ::DDSDataWriter* ,
-        const ::DDS_OfferedIncompatibleQosStatus & );
-
-      virtual void
-      on_liveliness_lost (
-        ::DDSDataWriter* ,
-        const ::DDS_LivelinessLostStatus & );
-
-      virtual void
-      on_publication_matched (
-        ::DDSDataWriter* ,
-        const ::DDS_PublicationMatchedStatus & );
-
-      virtual void
-      on_data_on_readers (
-        ::DDSSubscriber* );
-
-
-      void set_dds_dp (::DDS::DomainParticipant_ptr dp);
-    private:
-      ::DDS::DomainParticipantListener_var impl_;
-      ::DDS::DomainParticipant_var dp_;
-
-      ::DDS::DataReader_ptr
-      create_datareader (DDSDataReader * reader);
-
-      ::DDS::DataWriter_ptr
-      create_datawriter (DDSDataWriter * writer);
-
-    };
-  }
-}
-
-#endif /* DOMAINPARTICIPANTLISTENER_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Publisher.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Publisher.cpp
deleted file mode 100644
index a0a3951145b..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/Publisher.cpp
+++ /dev/null
@@ -1,471 +0,0 @@
-#include "dds4ccm/impl/ndds/Publisher.h"
-#include "dds4ccm/impl/ndds/PublisherListener.h"
-#include "dds4ccm/impl/ndds/DomainParticipant.h"
-#include "dds4ccm/impl/ndds/Topic.h"
-#include "dds4ccm/impl/ndds/DataWriter_T.h"
-#include "dds4ccm/impl/ndds/StatusCondition.h"
-#include "dds4ccm/impl/ndds/DataWriterListener.h"
-#include "dds4ccm/impl/ndds/TypeSupport.h"
-#include "dds4ccm/impl/ndds/Utils.h"
-
-#include "dds4ccm/impl/ndds/convertors/InstanceHandle_t.h"
-#include "dds4ccm/impl/ndds/convertors/Duration_t.h"
-#include "dds4ccm/impl/ndds/convertors/DataWriterQos.h"
-#include "dds4ccm/impl/ndds/convertors/PublisherQos.h"
-#include "dds4ccm/impl/ndds/convertors/TopicQos.h"
-
-#include "dds4ccm/impl/logger/Log_Macros.h"
-#include "ndds/ndds_cpp.h"
-
-namespace CIAO
-{
-  namespace NDDS
-  {
-    DDS_Publisher_i::DDS_Publisher_i (::DDSPublisher * p,
-                                      ::DDS::DomainParticipant_ptr dp)
-      : rti_entity_ (p),
-        dp_ (::DDS::DomainParticipant::_duplicate (dp))
-    {
-      DDS4CCM_TRACE ("DDS_Publisher_i::DDS_Publisher_i");
-    }
-
-    DDS_Publisher_i::~DDS_Publisher_i (void)
-    {
-      DDS4CCM_TRACE ("DDS_Publisher_i::~DDS_Publisher_i");
-    }
-
-    ::DDS::DataWriter_ptr
-    DDS_Publisher_i::create_datawriter (
-      ::DDS::Topic_ptr a_topic,
-      const ::DDS::DataWriterQos &qos,
-      ::DDS::DataWriterListener_ptr a_listener,
-      ::DDS::StatusMask mask)
-    {
-      DDS4CCM_TRACE ("DDS_Publisher_i::create_datawriter");
-
-      DDS_Topic_i * topic = dynamic_cast < DDS_Topic_i * > (a_topic);
-
-      if (!topic)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_CAST_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        "DDS_Publisher_i::create_datawriter - "
-                        "Error: Unable to cast provided topic to its servant.\n"));
-          return ::DDS::DataWriter::_nil ();
-        }
-
-      DDS_DataWriterListener_i *ccm_dds_dwl = 0;
-      if (! ::CORBA::is_nil (a_listener))
-        {
-          ACE_NEW_THROW_EX (ccm_dds_dwl,
-                            DDS_DataWriterListener_i (a_listener, 0),
-                            ::CORBA::NO_MEMORY ());
-        }
-      DDS_DataWriterQos ccm_dds_qos;
-      DDS_ReturnCode_t const retcode = this->rti_entity ()->get_default_datawriter_qos (ccm_dds_qos);
-      if (retcode != DDS_RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                       "DDS_Publisher_i"
-                       "::create_datawriter - "
-                       "Error: Unable to retrieve default datawriter qos\n"));
-          return ::DDS::DataWriter::_nil ();
-        }
-      ccm_dds_qos <<= qos;
-      DDSDataWriter *ccm_dds_dw = this->rti_entity ()->create_datawriter (
-                                                            topic->get_rti_entity (),
-                                                            ccm_dds_qos,
-                                                            ccm_dds_dwl,
-                                                            mask);
-
-      if (!ccm_dds_dw)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_DDS_NIL_RETURN, (LM_ERROR, DDS4CCM_INFO
-                        "DDS_Publisher_i::create_datawriter - "
-                        "Error: RTI Topic returned a nil datawriter.\n"));
-          delete ccm_dds_dwl;
-          return ::DDS::DataWriter::_nil ();
-        }
-
-      ::DDS::DataWriter_var retval = DDS_TypeSupport_i::create_datawriter (ccm_dds_dw,
-                                                                          this->dp_.in (),
-                                                                          this);
-      if (ccm_dds_dwl)
-        {
-          ccm_dds_dwl->set_dds_entity (retval.in ());
-        }
-      return retval._retn ();
-    }
-
-
-    ::DDS::DataWriter_ptr
-    DDS_Publisher_i::create_datawriter_with_profile (::DDS::Topic_ptr a_topic,
-                                        const char* qos_profile,
-                                        ::DDS::DataWriterListener_ptr a_listener,
-                                        ::DDS::StatusMask mask)
-    {
-      DDS4CCM_TRACE ("DDS_Publisher_i::create_datawriter_with_profile");
-
-      DDS_Topic_i * topic = dynamic_cast < DDS_Topic_i * > (a_topic);
-
-      if (!topic)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_CAST_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        "DDS_Publisher_i::create_datawriter_with_profile <%C>- "
-                        "Error: Unable to cast provided topic to its servant.\n",
-                        qos_profile));
-          return ::DDS::DataWriter::_nil ();
-        }
-
-      DDS_DataWriterListener_i *ccm_dds_dwl = 0;
-      if (! ::CORBA::is_nil (a_listener))
-        {
-          ACE_NEW_THROW_EX (ccm_dds_dwl,
-                            DDS_DataWriterListener_i (a_listener, 0),
-                            ::CORBA::NO_MEMORY ());
-        }
-
-      char * lib_name = get_library_name(qos_profile);
-      char * prof_name = get_profile_name(qos_profile);
-
-      DDSDataWriter *ccm_dds_dw = 0;
-
-      if (lib_name != 0 && prof_name != 0)
-        {
-          ccm_dds_dw = this->rti_entity ()->create_datawriter_with_profile (
-                                                                  topic->get_rti_entity (),
-                                                                  lib_name,
-                                                                  prof_name,
-                                                                  ccm_dds_dwl,
-                                                                  mask);
-        }
-
-      ACE_OS::free (lib_name);
-      ACE_OS::free (prof_name);
-
-      if (!ccm_dds_dw)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_DDS_NIL_RETURN, (LM_ERROR, DDS4CCM_INFO
-                        "DDS_Publisher_i::create_datawriter_with_profile <%C> - "
-                        "Error: RTI Topic returned a nil datawriter.\n",
-                        qos_profile));
-          delete ccm_dds_dwl;
-          return ::DDS::DataWriter::_nil ();
-        }
-      else
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                        "DDS_Publisher_i::create_datawriter_with_profile - "
-                        "Successfully created datawriter with profile <%C>.\n",
-                        qos_profile));
-        }
-
-      ::DDS::DataWriter_var retval =
-        DDS_TypeSupport_i::create_datawriter (ccm_dds_dw,
-                                              this->dp_.in (),
-                                              this);
-      if (ccm_dds_dwl)
-        {
-          ccm_dds_dwl->set_dds_entity (retval.in ());
-        }
-      return retval._retn ();
-    }
-
-
-    ::DDS::ReturnCode_t
-    DDS_Publisher_i::delete_datawriter (::DDS::DataWriter_ptr a_datawriter)
-    {
-      DDS4CCM_TRACE ("DDS_Publisher_i::delete_datawriter");
-
-      DDS_DataWriter_Base *dw = dynamic_cast< DDS_DataWriter_Base * > (a_datawriter);
-
-      if (!dw)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_CAST_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        "DDS_Publisher_i::delete_datawriter - "
-                        "Unable to cast provided object reference to servant.\n"));
-          return ::DDS::RETCODE_BAD_PARAMETER;
-        }
-
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_CAST_SUCCESSFUL, (LM_TRACE, DDS4CCM_INFO
-                    "DDS_Publisher_i::delete_datawriter - "
-                    "Successfully casted provided object reference to servant.\n"));
-
-      DDSDataWriter* rti_dw = dw->get_rti_entity ();
-      dw->set_rti_entity (0);
-      DDS_ReturnCode_t const retval =
-        this->rti_entity ()->delete_datawriter (rti_dw);
-
-      if (retval != DDS_RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        "DDS_Publisher_i::delete_datawriter - "
-                        "Error: RTI delete_datawriter returned non-ok error code %C\n",
-                        ::CIAO::DDS4CCM::translate_retcode (retval)));
-        }
-      else
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_INFO, DDS4CCM_INFO
-                        "DDS_Publisher_i::delete_datawriter - "
-                        "Provided datawriter successfully deleted\n"));
-        }
-
-      return retval;
-    }
-
-
-    ::DDS::DataWriter_ptr
-    DDS_Publisher_i::lookup_datawriter (const char * impl_name)
-    {
-      DDSDataWriter* dw = this->rti_entity ()->lookup_datawriter (impl_name);
-      ::DDS::DataWriter_var retval =
-        DDS_TypeSupport_i::create_datawriter (dw,
-                                              this->dp_.in (),
-                                              this);
-      return retval._retn ();
-    }
-
-    ::DDS::ReturnCode_t
-    DDS_Publisher_i::delete_contained_entities (void)
-    {
-      return this->rti_entity ()->delete_contained_entities ();
-    }
-
-    ::DDS::ReturnCode_t
-    DDS_Publisher_i::set_qos (const ::DDS::PublisherQos & qos)
-    {
-      DDS4CCM_TRACE ("DDS_Publisher_i::set_qos");
-      ::DDS_PublisherQos ccm_dds_qos;
-      DDS_ReturnCode_t const retcode = this->rti_entity ()->get_qos (ccm_dds_qos);
-      if (retcode != DDS_RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                       "DDS_Publisher_i"
-                       "::set_qos - "
-                       "Error: Unable to retrieve publisher qos\n"));
-          return retcode;
-        }
-      ccm_dds_qos <<= qos;
-      return this->rti_entity ()->set_qos (ccm_dds_qos);
-    }
-
-
-    ::DDS::ReturnCode_t
-    DDS_Publisher_i::get_qos (::DDS::PublisherQos & qos)
-    {
-      DDS4CCM_TRACE ("DDS_Publisher_i::get_qos");
-      ::DDS_PublisherQos ccm_dds_qos;
-      ccm_dds_qos <<= qos;
-      ::DDS::ReturnCode_t const retcode =
-        this->rti_entity ()->get_qos (ccm_dds_qos);
-      qos <<= ccm_dds_qos;
-      return retcode;
-    }
-
-
-    ::DDS::ReturnCode_t
-    DDS_Publisher_i::set_listener (
-      ::DDS::PublisherListener_ptr a_listener,
-      ::DDS::StatusMask mask)
-    {
-      DDS4CCM_TRACE ("DDS_Publisher_i::set_listener");
-
-      // Retrieve the previously set listener
-      DDSPublisherListener *old_listener = this->rti_entity ()->get_listener ();
-
-      DDSPublisherListener *listener = 0;
-      if (! ::CORBA::is_nil (a_listener))
-        {
-          ACE_NEW_THROW_EX (listener,
-                            DDS_PublisherListener_i (
-                              a_listener,
-                              this->dp_.in ()),
-                            ::CORBA::NO_MEMORY ());
-        }
-
-      ::DDS::ReturnCode_t const retcode =
-        this->rti_entity ()->set_listener (listener, mask);
-
-      if (retcode != ::DDS::RETCODE_OK)
-        {
-          delete listener;
-        }
-      else
-        {
-          delete old_listener;
-        }
-
-      return retcode;
-    }
-
-
-    ::DDS::PublisherListener_ptr
-    DDS_Publisher_i::get_listener (void)
-    {
-      DDS4CCM_TRACE ("DDS_Publisher_i::get_listener");
-
-      DDSPublisherListener *ccm_dds_pub_list = this->rti_entity ()->get_listener ();
-      DDS_PublisherListener_i * list_proxy =
-        dynamic_cast <DDS_PublisherListener_i *> (ccm_dds_pub_list);
-      if (!list_proxy)
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                        "DDS_Publisher_i::get_listener - "
-                        "DDS returned a NIL listener.\n"));
-          return ::DDS::PublisherListener::_nil ();
-        }
-      return list_proxy->get_publisher_listener ();
-    }
-
-
-    ::DDS::ReturnCode_t
-    DDS_Publisher_i::suspend_publications (void)
-    {
-      return this->rti_entity ()->suspend_publications ();
-    }
-
-
-    ::DDS::ReturnCode_t
-    DDS_Publisher_i::resume_publications (void)
-    {
-      return this->rti_entity ()->resume_publications ();
-    }
-
-
-    ::DDS::ReturnCode_t
-    DDS_Publisher_i::begin_coherent_changes (void)
-    {
-      return this->rti_entity ()->begin_coherent_changes ();
-    }
-
-
-    ::DDS::ReturnCode_t
-    DDS_Publisher_i::end_coherent_changes (void)
-    {
-      return this->rti_entity ()->end_coherent_changes ();
-    }
-
-
-    ::DDS::ReturnCode_t
-    DDS_Publisher_i::wait_for_acknowledgments (
-      const ::DDS::Duration_t & max_wait)
-    {
-      DDS_Duration_t ccm_dds_dds_duration;
-      ccm_dds_dds_duration <<= max_wait;
-      return this->rti_entity ()->wait_for_acknowledgments (ccm_dds_dds_duration);
-    }
-
-
-    ::DDS::DomainParticipant_ptr
-    DDS_Publisher_i::get_participant (void)
-    {
-      DDS4CCM_TRACE ("DDS_Publisher_i::get_participant");
-      return ::DDS::DomainParticipant::_duplicate (this->dp_.in ());
-    }
-
-
-    ::DDS::ReturnCode_t
-    DDS_Publisher_i::set_default_datawriter_qos (const ::DDS::DataWriterQos & qos)
-    {
-      DDS4CCM_TRACE ("DDS_Publisher_i::set_default_datawriter_qos");
-      ::DDS_DataWriterQos ccm_dds_qos;
-      DDS_ReturnCode_t const retcode = this->rti_entity ()->get_default_datawriter_qos (ccm_dds_qos);
-      if (retcode != DDS_RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                       "DDS_Publisher_i"
-                       "::set_default_datawriter - "
-                       "Error: Unable to retrieve default datawriter qos\n"));
-          return retcode;
-        }
-      ccm_dds_qos <<= qos;
-      return this->rti_entity ()->set_default_datawriter_qos (ccm_dds_qos);
-    }
-
-
-    ::DDS::ReturnCode_t
-    DDS_Publisher_i::get_default_datawriter_qos (::DDS::DataWriterQos & qos)
-    {
-      DDS4CCM_TRACE ("DDS_Publisher_i::get_default_datawriter_qos");
-      ::DDS_DataWriterQos ccm_dds_qos;
-      ::DDS::ReturnCode_t const retcode =
-            this->rti_entity ()->get_default_datawriter_qos (ccm_dds_qos);
-      qos <<= ccm_dds_qos;
-      return retcode;
-    }
-
-
-    ::DDS::ReturnCode_t
-    DDS_Publisher_i::copy_from_topic_qos (::DDS::DataWriterQos & a_dataimpl_qos,
-                                          const ::DDS::TopicQos & a_impl_qos)
-    {
-      DDS4CCM_TRACE ("DDS_Publisher_i::copy_from_topic_qos");
-      ::DDS_DataWriterQos ccm_dds_qos;
-      ::DDS_TopicQos ccm_dds_topic_qos;
-
-      ccm_dds_qos <<= a_dataimpl_qos;
-      ccm_dds_topic_qos <<= a_impl_qos;
-      ::DDS::ReturnCode_t const retcode =
-          this->rti_entity ()->copy_from_topic_qos (ccm_dds_qos, ccm_dds_topic_qos);
-      a_dataimpl_qos <<= ccm_dds_qos;
-      return retcode;
-    }
-
-    ::DDS::ReturnCode_t
-    DDS_Publisher_i::enable (void)
-    {
-      return this->rti_entity ()->enable ();
-    }
-
-    ::DDS::StatusCondition_ptr
-    DDS_Publisher_i::get_statuscondition (void)
-    {
-      ::DDS::StatusCondition_var retval;
-      DDSStatusCondition* sc = this->rti_entity ()->get_statuscondition ();
-      if (sc)
-        {
-          ACE_NEW_THROW_EX (retval,
-                            DDS_StatusCondition_i (sc, this->dp_.in ()),
-                            ::CORBA::NO_MEMORY ());
-        }
-      return retval._retn ();
-    }
-
-    ::DDS::StatusMask
-    DDS_Publisher_i::get_status_changes (void)
-    {
-      return this->rti_entity ()->get_status_changes ();
-    }
-
-    ::DDS::InstanceHandle_t
-    DDS_Publisher_i::get_instance_handle (void)
-    {
-      ::DDS_InstanceHandle_t const rtihandle = this->rti_entity ()->get_instance_handle ();
-      ::DDS::InstanceHandle_t handle;
-      handle <<= rtihandle;
-      return handle;
-    }
-
-    DDSPublisher *
-    DDS_Publisher_i::get_rti_entity (void)
-    {
-      return this->rti_entity_;
-    }
-
-    void
-    DDS_Publisher_i::set_rti_entity (DDSPublisher * pub)
-    {
-      this->rti_entity_ = pub;
-    }
-
-    DDSPublisher *
-    DDS_Publisher_i::rti_entity (void)
-    {
-      if (!this->rti_entity_)
-        {
-          throw ::CORBA::BAD_INV_ORDER ();
-        }
-      return this->rti_entity_;
-    }
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Publisher.h b/CIAO/connectors/dds4ccm/impl/ndds/Publisher.h
deleted file mode 100644
index 17684167e26..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/Publisher.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/**
- * @author William R. Otte <wotte@dre.vanderbilt.edu>
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef PUBLISHER_T_H_
-#define PUBLISHER_T_H_
-
-#include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h"
-#include "dds4ccm/idl/ndds/ndds_dcpsC.h"
-#include "tao/LocalObject.h"
-
-class DDSPublisher;
-
-namespace CIAO
-{
-  namespace NDDS
-  {
-    class DDS4CCM_NDDS_Export DDS_Publisher_i :
-      public virtual ::DDS::Publisher,
-      public virtual ::CORBA::LocalObject
-    {
-    public:
-      /// Constructor
-      DDS_Publisher_i (DDSPublisher * p,
-                     ::DDS::DomainParticipant_ptr dp);
-
-      /// Destructor
-      virtual ~DDS_Publisher_i (void);
-
-      virtual
-        ::DDS::DataWriter_ptr create_datawriter (::DDS::Topic_ptr a_topic,
-                                                 const ::DDS::DataWriterQos & qos,
-                                                 ::DDS::DataWriterListener_ptr a_listener,
-                                                 ::DDS::StatusMask mask);
-
-      virtual ::DDS::DataWriter_ptr create_datawriter_with_profile (
-          ::DDS::Topic_ptr a_topic,
-          const char* qos_profile,
-          ::DDS::DataWriterListener_ptr a_listener,
-          ::DDS::StatusMask mask);
-
-      virtual
-        ::DDS::ReturnCode_t delete_datawriter (::DDS::DataWriter_ptr a_datawriter);
-
-      virtual
-        ::DDS::DataWriter_ptr lookup_datawriter (const char * impl_name);
-
-      virtual
-        ::DDS::ReturnCode_t delete_contained_entities (void);
-
-      virtual
-        ::DDS::ReturnCode_t set_qos (const ::DDS::PublisherQos & qos);
-
-      virtual
-        ::DDS::ReturnCode_t get_qos (::DDS::PublisherQos & qos);
-
-      virtual
-        ::DDS::ReturnCode_t set_listener (::DDS::PublisherListener_ptr a_listener,
-                                          ::DDS::StatusMask mask);
-
-      virtual
-        ::DDS::PublisherListener_ptr get_listener (void);
-
-      virtual
-        ::DDS::ReturnCode_t suspend_publications (void);
-
-      virtual
-        ::DDS::ReturnCode_t resume_publications (void);
-
-      virtual
-        ::DDS::ReturnCode_t begin_coherent_changes (void);
-
-      virtual
-        ::DDS::ReturnCode_t end_coherent_changes (void);
-
-      virtual
-        ::DDS::ReturnCode_t wait_for_acknowledgments (const ::DDS::Duration_t & max_wait);
-
-      virtual
-        ::DDS::DomainParticipant_ptr get_participant (void);
-
-      virtual
-        ::DDS::ReturnCode_t set_default_datawriter_qos (const ::DDS::DataWriterQos & qos);
-
-      virtual
-        ::DDS::ReturnCode_t get_default_datawriter_qos (::DDS::DataWriterQos & qos);
-
-      virtual
-        ::DDS::ReturnCode_t copy_from_topic_qos (::DDS::DataWriterQos & a_dataimpl_qos,
-                                                 const ::DDS::TopicQos & a_impl_qos);
-
-      virtual
-        ::DDS::ReturnCode_t enable (void);
-
-      virtual
-        ::DDS::StatusCondition_ptr get_statuscondition (void);
-
-      virtual
-        ::DDS::StatusMask get_status_changes (void);
-
-      virtual
-        ::DDS::InstanceHandle_t get_instance_handle (void);
-
-      DDSPublisher * get_rti_entity (void);
-
-      void set_rti_entity (::DDSPublisher * sub);
-
-    private:
-      DDSPublisher *rti_entity_;
-      ::DDS::DomainParticipant_var dp_;
-
-      DDSPublisher *rti_entity (void);
-    };
-  }
-}
-
-#endif /* PUBLISHER_T_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.cpp b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.cpp
deleted file mode 100644
index 94b867fbb07..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-#include "dds4ccm/impl/ndds/PublisherListener.h"
-#include "dds4ccm/impl/ndds/Publisher.h"
-#include "dds4ccm/impl/ndds/DataWriter_T.h"
-#include "dds4ccm/impl/ndds/DomainParticipant.h"
-#include "dds4ccm/impl/ndds/TypeSupport.h"
-
-#include "dds4ccm/impl/ndds/convertors/PublicationMatchedStatus.h"
-#include "dds4ccm/impl/ndds/convertors/LivelinessLostStatus.h"
-#include "dds4ccm/impl/ndds/convertors/OfferedIncompatibleQosStatus.h"
-#include "dds4ccm/impl/ndds/convertors/OfferedDeadlineMissedStatus.h"
-#include "dds4ccm/impl/ndds/convertors/ReliableReaderActivityChangedStatus.h"
-#include "dds4ccm/impl/ndds/convertors/ReliableWriterCacheChangedStatus.h"
-
-#include "dds4ccm/impl/logger/Log_Macros.h"
-
-namespace CIAO
-{
-  namespace NDDS
-  {
-    DDS_PublisherListener_i::DDS_PublisherListener_i (
-      ::DDS::PublisherListener_ptr p,
-      ::DDS::DomainParticipant_ptr dp)
-      : impl_ (::DDS::PublisherListener::_duplicate (p)),
-        dp_ (::DDS::DomainParticipant::_duplicate (dp))
-    {
-      DDS4CCM_TRACE ("DDS_PublisherListener_i::DDS_PublisherListener_i");
-    }
-
-    DDS_PublisherListener_i::~DDS_PublisherListener_i (void)
-    {
-      DDS4CCM_TRACE ("DDS_PublisherListener_i::~DDS_PublisherListener_i");
-    }
-
-    void
-    DDS_PublisherListener_i::on_offered_deadline_missed (
-      ::DDSDataWriter* the_writer,
-      const ::DDS_OfferedDeadlineMissedStatus & status)
-    {
-      DDS4CCM_TRACE ("DDS_PublisherListener_i::on_offered_deadline_missed");
-
-      ::DDS::OfferedDeadlineMissedStatus ddsstatus;
-      ::DDS::DataWriter_var proxy =
-        DDS_TypeSupport_i::create_datawriter (the_writer,
-                                              this->dp_.in (),
-                                              ::DDS::Publisher::_nil ());
-      ddsstatus <<= status;
-      this->impl_->on_offered_deadline_missed (proxy.in (), ddsstatus);
-    }
-
-    void
-    DDS_PublisherListener_i::on_offered_incompatible_qos (
-      ::DDSDataWriter* the_writer,
-      const ::DDS_OfferedIncompatibleQosStatus & status)
-    {
-      DDS4CCM_TRACE ("DDS_PublisherListener_i::on_offered_incompatible_qos");
-
-      ::DDS::OfferedIncompatibleQosStatus ddsstatus;
-      ::DDS::DataWriter_var proxy = DDS_TypeSupport_i::create_datawriter (
-                                                      the_writer,
-                                                      this->dp_.in (),
-                                                      ::DDS::Publisher::_nil ());
-      ddsstatus <<= status;
-      this->impl_->on_offered_incompatible_qos (proxy.in (), ddsstatus);
-    }
-
-    void
-    DDS_PublisherListener_i::on_liveliness_lost (
-      ::DDSDataWriter* the_writer,
-      const ::DDS_LivelinessLostStatus & status)
-    {
-      DDS4CCM_TRACE ("DDS_PublisherListener_i::on_liveliness_lost");
-
-      ::DDS::LivelinessLostStatus ddsstatus;
-      ::DDS::DataWriter_var proxy = DDS_TypeSupport_i::create_datawriter (
-                                                      the_writer,
-                                                      this->dp_.in (),
-                                                      ::DDS::Publisher::_nil ());
-      ddsstatus <<= status;
-      this->impl_->on_liveliness_lost (proxy.in (), ddsstatus);
-    }
-
-    void
-    DDS_PublisherListener_i::on_publication_matched (
-      ::DDSDataWriter* the_writer,
-      const ::DDS_PublicationMatchedStatus & status)
-    {
-      DDS4CCM_TRACE ("DDS_PublisherListener_i::on_publication_matched");
-
-      ::DDS::PublicationMatchedStatus ddsstatus;
-      ::DDS::DataWriter_var proxy = DDS_TypeSupport_i::create_datawriter (
-                                                      the_writer,
-                                                      this->dp_.in (),
-                                                      ::DDS::Publisher::_nil ());
-      ddsstatus <<= status;
-      this->impl_->on_publication_matched (proxy.in (), ddsstatus);
-    }
-
-    void
-    DDS_PublisherListener_i::on_reliable_reader_activity_changed (
-      ::DDSDataWriter *the_writer,
-      const ::DDS_ReliableReaderActivityChangedStatus & status)
-    {
-      DDS4CCM_TRACE ("DDS_PublisherListener_i::on_reliable_reader_activity_changed");
-
-      ::DDS::ReliableReaderActivityChangedStatus ddsstatus;
-      ::DDS::DataWriter_var proxy = DDS_TypeSupport_i::create_datawriter (
-                                                      the_writer,
-                                                      this->dp_.in (),
-                                                      ::DDS::Publisher::_nil ());
-      ddsstatus <<= status;
-      this->impl_->on_reliable_reader_activity_changed (proxy.in (), ddsstatus);
-    }
-
-    void
-    DDS_PublisherListener_i::on_reliable_writer_cache_changed (
-      ::DDSDataWriter* the_writer,
-      const ::DDS_ReliableWriterCacheChangedStatus & status)
-    {
-      DDS4CCM_TRACE ("DDS_PublisherListener_i::on_reliable_writer_cache_changed");
-
-      ::DDS::ReliableWriterCacheChangedStatus ddsstatus;
-      ::DDS::DataWriter_var proxy = DDS_TypeSupport_i::create_datawriter (
-                                                      the_writer,
-                                                      this->dp_.in (),
-                                                      ::DDS::Publisher::_nil ());
-      ddsstatus <<= status;
-      this->impl_->on_reliable_writer_cache_changed (proxy.in (), ddsstatus);
-    }
-
-    ::DDS::PublisherListener_ptr
-    DDS_PublisherListener_i::get_publisher_listener (void)
-    {
-      return ::DDS::PublisherListener::_duplicate (this->impl_.in ());
-    }
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.h b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.h
deleted file mode 100644
index c0ea9458030..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * @author William R. Otte <wotte@dre.vanderbilt.edu>
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDSPUBLISHERLISTENER_T_H_
-#define DDSPUBLISHERLISTENER_T_H_
-
-#include "dds4ccm/idl/ndds/ndds_dcpsC.h"
-#include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h"
-#include "ndds/ndds_cpp.h"
-
-namespace CIAO
-{
-  namespace NDDS
-  {
-    class DDS4CCM_NDDS_Export DDS_PublisherListener_i :
-      public ::DDSPublisherListener
-    {
-    public:
-      /// Constructor
-      DDS_PublisherListener_i (
-        ::DDS::PublisherListener_ptr p,
-        ::DDS::DomainParticipant_ptr dp);
-
-      /// Destructor
-      virtual ~DDS_PublisherListener_i (void);
-
-      virtual void
-      on_offered_deadline_missed (
-        ::DDSDataWriter *the_writer,
-        const ::DDS_OfferedDeadlineMissedStatus & status);
-
-      virtual void
-      on_offered_incompatible_qos (
-        ::DDSDataWriter *the_writer,
-        const ::DDS_OfferedIncompatibleQosStatus & status);
-
-      virtual void
-      on_liveliness_lost (
-        ::DDSDataWriter *the_writer,
-        const ::DDS_LivelinessLostStatus & status);
-
-      virtual void
-      on_publication_matched (
-        ::DDSDataWriter *the_writer,
-        const ::DDS_PublicationMatchedStatus & status);
-
-      virtual void
-      on_reliable_reader_activity_changed (
-        ::DDSDataWriter *the_writer,
-        const ::DDS_ReliableReaderActivityChangedStatus & status);
-
-      virtual void
-      on_reliable_writer_cache_changed (
-        ::DDSDataWriter *the_writer,
-        const ::DDS_ReliableWriterCacheChangedStatus & status);
-
-      ::DDS::PublisherListener_ptr get_publisher_listener (void);
-    private:
-      ::DDS::PublisherListener_var impl_;
-      ::DDS::DomainParticipant_var dp_;
-    };
-  }
-}
-
-#endif /* DDSPUBLISHERLISTENER_T_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.cpp b/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.cpp
deleted file mode 100644
index 8fcb74d4d95..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-#include "dds4ccm/impl/ndds/QueryCondition.h"
-#include "dds4ccm/impl/ndds/convertors/StringSeq.h"
-#include "dds4ccm/impl/logger/Log_Macros.h"
-#include "ndds/ndds_cpp.h"
-
-namespace CIAO
-{
-  namespace NDDS
-  {
-    DDS_QueryCondition_i::DDS_QueryCondition_i (
-      ::DDSQueryCondition * qc,
-      ::DDS::DataReader_ptr dr)
-      : rti_entity_ (qc),
-        dr_ (::DDS::DataReader::_duplicate (dr))
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::DDS_QueryCondition_i::DDS_QueryCondition_i");
-    }
-
-    DDS_QueryCondition_i::~DDS_QueryCondition_i (void)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::DDS_QueryCondition_i::~DDS_QueryCondition_i");
-    }
-
-    ::CORBA::Boolean
-    DDS_QueryCondition_i::get_trigger_value (void)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::DDS_QueryCondition_i::get_trigger_value");
-
-      return this->rti_entity ()->get_trigger_value ();
-    }
-
-    ::DDS::SampleStateMask
-    DDS_QueryCondition_i::get_sample_state_mask (void)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::DDS_QueryCondition_i::get_sample_state_mask");
-
-      return this->rti_entity ()->get_sample_state_mask ();
-    }
-
-    ::DDS::ViewStateMask
-    DDS_QueryCondition_i::get_view_state_mask (void)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::DDS_QueryCondition_i::get_view_state_mask");
-
-      return this->rti_entity ()->get_view_state_mask ();
-    }
-
-    ::DDS::InstanceStateMask
-    DDS_QueryCondition_i::get_instance_state_mask (void)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::DDS_QueryCondition_i::get_instance_state_mask");
-
-      return this->rti_entity ()->get_instance_state_mask ();
-    }
-
-    ::DDS::DataReader_ptr
-    DDS_QueryCondition_i::get_datareader (void)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::DDS_QueryCondition_i::get_datareader");
-
-      return ::DDS::DataReader::_duplicate (this->dr_.in ());
-    }
-
-    char *
-    DDS_QueryCondition_i::get_query_expression (void)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::DDS_QueryCondition_i::get_query_expression");
-
-      return ::CORBA::string_dup (this->rti_entity ()->get_query_expression ());
-    }
-
-    ::DDS::ReturnCode_t
-    DDS_QueryCondition_i::get_query_parameters (
-      ::DDS::StringSeq & query_parameters)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::DDS_QueryCondition_i::get_query_parameters");
-
-      DDS_StringSeq parameters;
-      ::DDS::ReturnCode_t const retval =
-        this->rti_entity ()->get_query_parameters (parameters);
-      query_parameters <<= parameters;
-      return retval;
-    }
-
-    ::DDS::ReturnCode_t
-    DDS_QueryCondition_i::set_query_parameters (
-      const ::DDS::StringSeq & query_parameters)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::DDS_QueryCondition_i::set_query_parameters");
-
-      DDS_StringSeq parameters;
-      parameters <<= query_parameters;
-
-      return this->rti_entity ()->set_query_parameters (parameters);
-    }
-
-    DDSQueryCondition *
-    DDS_QueryCondition_i::get_rti_entity (void)
-    {
-      return this->rti_entity_;
-    }
-
-    void
-    DDS_QueryCondition_i::set_rti_entity (DDSQueryCondition *entity)
-    {
-      this->rti_entity_ = entity;
-    }
-
-    DDSQueryCondition *
-    DDS_QueryCondition_i::rti_entity (void)
-    {
-      if (!this->rti_entity_)
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG,
-                        "DDS_QueryCondition_i::rti_entity - "
-                        "Throwing BAD_INV_ORDER.\n"));
-          throw ::CORBA::BAD_INV_ORDER ();
-        }
-      return this->rti_entity_;
-    }
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.h b/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.h
deleted file mode 100644
index 046069c13b4..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- * @author William R. Otte <wotte@dre.vanderbilt.edu>
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef QUERYCONDITION_T_H_
-#define QUERYCONDITION_T_H_
-
-#include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h"
-#include "dds4ccm/idl/ndds/ndds_dcpsC.h"
-#include "tao/LocalObject.h"
-
-class DDSQueryCondition;
-
-namespace CIAO
-{
-  namespace NDDS
-  {
-    class DDS4CCM_NDDS_Export DDS_QueryCondition_i :
-      public virtual ::DDS::QueryCondition,
-      public virtual ::CORBA::LocalObject
-    {
-    public:
-      /// Constructor
-      DDS_QueryCondition_i (::DDSQueryCondition * qc,
-                          ::DDS::DataReader_ptr dr);
-
-      /// Destructor
-      virtual ~DDS_QueryCondition_i (void);
-
-      virtual ::CORBA::Boolean get_trigger_value (void);
-
-      virtual ::DDS::SampleStateMask get_sample_state_mask (void);
-
-      virtual ::DDS::ViewStateMask get_view_state_mask (void);
-
-      virtual ::DDS::InstanceStateMask get_instance_state_mask (void);
-
-      virtual ::DDS::DataReader_ptr get_datareader (void);
-
-      virtual char *get_query_expression (void);
-
-      virtual ::DDS::ReturnCode_t
-      get_query_parameters (::DDS::StringSeq & query_parameters);
-
-      virtual ::DDS::ReturnCode_t
-      set_query_parameters (const ::DDS::StringSeq & query_parameters);
-
-      ::DDSQueryCondition * get_rti_entity (void);
-
-      void set_rti_entity (::DDSQueryCondition *entity);
-
-    private:
-      ::DDSQueryCondition * rti_entity_;
-      ::DDS::DataReader_var dr_;
-
-      ::DDSQueryCondition * rti_entity ();
-    };
-  }
-}
-
-#endif /* QUERYCONDITION_T_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.cpp b/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.cpp
deleted file mode 100644
index 8f949b17d6e..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-#include "dds4ccm/impl/ndds/ReadCondition.h"
-#include "dds4ccm/impl/logger/Log_Macros.h"
-#include "ndds/ndds_cpp.h"
-
-namespace CIAO
-{
-  namespace NDDS
-  {
-    DDS_ReadCondition_i::DDS_ReadCondition_i (
-      ::DDSReadCondition * rc,
-      ::DDS::DataReader_ptr dr)
-      : rti_entity_ (rc),
-        dr_ (::DDS::DataReader::_duplicate (dr))
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::DDS_ReadCondition_i::DDS_ReadCondition_i");
-    }
-
-    DDS_ReadCondition_i::~DDS_ReadCondition_i (void)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::DDS_ReadCondition_i::~DDS_ReadCondition_i");
-    }
-
-    ::CORBA::Boolean
-    DDS_ReadCondition_i::get_trigger_value (void)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::DDS_ReadCondition_i::get_trigger_value");
-
-      return this->rti_entity ()->get_trigger_value ();
-    }
-
-    ::DDS::SampleStateMask
-    DDS_ReadCondition_i::get_sample_state_mask (void)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::DDS_ReadCondition_i::get_sample_state_mask");
-
-      return this->rti_entity ()->get_sample_state_mask ();
-    }
-
-    ::DDS::ViewStateMask
-    DDS_ReadCondition_i::get_view_state_mask (void)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::DDS_ReadCondition_i::get_view_state_mask");
-
-      return this->rti_entity ()->get_view_state_mask ();
-    }
-
-    ::DDS::InstanceStateMask
-    DDS_ReadCondition_i::get_instance_state_mask (void)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::DDS_ReadCondition_i::get_instance_state_mask");
-
-      return this->rti_entity ()->get_instance_state_mask ();
-    }
-
-    ::DDS::DataReader_ptr
-    DDS_ReadCondition_i::get_datareader (void)
-    {
-      DDS4CCM_TRACE ("CIAO::DDS4CCM::DDS_ReadCondition_i::get_datareader");
-
-      return ::DDS::DataReader::_duplicate (this->dr_.in ());
-    }
-
-    DDSReadCondition *
-    DDS_ReadCondition_i::get_rti_entity (void)
-    {
-      return this->rti_entity_;
-    }
-
-    void
-    DDS_ReadCondition_i::set_rti_entity (DDSReadCondition *entity)
-    {
-      this->rti_entity_ = entity;
-    }
-
-    DDSReadCondition *
-    DDS_ReadCondition_i::rti_entity (void)
-    {
-      if (!this->rti_entity_)
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG,
-                        "DDS_ReadCondition_i::rti_entity - "
-                        "Throwing BAD_INV_ORDER.\n"));
-          throw ::CORBA::BAD_INV_ORDER ();
-        }
-      return this->rti_entity_;
-    }
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.h b/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.h
deleted file mode 100644
index 3446e6c9c67..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * @author William R. Otte <wotte@dre.vanderbilt.edu>
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef READCONDITION_T_H_
-#define READCONDITION_T_H_
-
-#include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h"
-#include "dds4ccm/idl/ndds/ndds_dcpsC.h"
-#include "tao/LocalObject.h"
-
-class DDSReadCondition;
-#include "tao/LocalObject.h"
-
-namespace CIAO
-{
-  namespace NDDS
-  {
-    class DDS4CCM_NDDS_Export DDS_ReadCondition_i :
-      public virtual ::DDS::ReadCondition,
-      public virtual ::CORBA::LocalObject
-    {
-    public:
-      /// Constructor
-      DDS_ReadCondition_i (::DDSReadCondition * rc,
-                         ::DDS::DataReader_ptr dr);
-
-      /// Destructor
-      virtual ~DDS_ReadCondition_i (void);
-
-      virtual ::CORBA::Boolean get_trigger_value (void);
-
-      virtual ::DDS::SampleStateMask get_sample_state_mask (void);
-
-      virtual ::DDS::ViewStateMask get_view_state_mask (void);
-
-      virtual ::DDS::InstanceStateMask get_instance_state_mask (void);
-
-      virtual ::DDS::DataReader_ptr get_datareader (void);
-
-      ::DDSReadCondition * get_rti_entity (void);
-
-      void set_rti_entity (::DDSReadCondition* entity);
-
-    private:
-      ::DDSReadCondition *rti_entity_;
-      ::DDS::DataReader_var dr_;
-
-      ::DDSReadCondition * rti_entity (void);
-    };
-  }
-}
-
-#endif /* READCONDITION_T_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.cpp b/CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.cpp
deleted file mode 100644
index 80c0865e472..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-#include "dds4ccm/impl/ndds/StatusCondition.h"
-#include "dds4ccm/impl/logger/Log_Macros.h"
-#include "ndds/ndds_cpp.h"
-
-namespace CIAO
-{
-  namespace NDDS
-  {
-    DDS_StatusCondition_i::DDS_StatusCondition_i (
-      ::DDSStatusCondition * sc,
-      ::DDS::Entity_ptr entity) :
-      rti_entity_ (sc),
-      entity_ (::DDS::Entity::_duplicate (entity))
-    {
-    }
-
-    DDS_StatusCondition_i::~DDS_StatusCondition_i (void)
-    {
-    }
-
-    ::CORBA::Boolean
-    DDS_StatusCondition_i::get_trigger_value (void)
-    {
-      return this->rti_entity ()->get_trigger_value ();
-    }
-
-    ::DDS::StatusMask
-    DDS_StatusCondition_i::get_enabled_statuses (void)
-    {
-      return this->rti_entity ()->get_enabled_statuses ();
-    }
-
-    ::DDS::ReturnCode_t
-    DDS_StatusCondition_i::set_enabled_statuses (
-      ::DDS::StatusMask mask)
-    {
-      return this->rti_entity ()->set_enabled_statuses (mask);
-    }
-
-    ::DDS::Entity_ptr
-    DDS_StatusCondition_i::get_entity (void)
-    {
-      return ::DDS::Entity::_duplicate (this->entity_.in ());
-    }
-
-    ::DDSStatusCondition *
-    DDS_StatusCondition_i::get_rti_entity (void)
-    {
-      return this->rti_entity_;
-    }
-
-    void
-    DDS_StatusCondition_i::set_rti_entity (::DDSStatusCondition * status_condition)
-    {
-      this->rti_entity_ = status_condition;
-    }
-
-    ::DDSStatusCondition *
-    DDS_StatusCondition_i::rti_entity (void)
-    {
-      if (!this->rti_entity_)
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG,
-                        "DDS_StatusCondition_i::rti_entity - "
-                        "Throwing BAD_INV_ORDER.\n"));
-          throw ::CORBA::BAD_INV_ORDER ();
-        }
-      return this->rti_entity_;
-    }
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.h b/CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.h
deleted file mode 100644
index 360a0984670..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * @author William R. Otte <wotte@dre.vanderbilt.edu>
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDS4CCM_STATUSCONDITION_H
-#define DDS4CCM_STATUSCONDITION_H
-
-#include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h"
-#include "dds4ccm/idl/ndds/ndds_dcpsC.h"
-#include "tao/LocalObject.h"
-
-class DDSStatusCondition;
-
-namespace CIAO
-{
-  namespace NDDS
-  {
-    class DDS4CCM_NDDS_Export DDS_StatusCondition_i :
-      public virtual ::DDS::StatusCondition,
-      public virtual ::CORBA::LocalObject
-    {
-    public:
-      /// Constructor
-      DDS_StatusCondition_i (::DDSStatusCondition *sc,
-                           ::DDS::Entity_ptr entity);
-
-      /// Destructor
-      virtual ~DDS_StatusCondition_i (void);
-
-      virtual ::CORBA::Boolean get_trigger_value (void);
-
-      virtual ::DDS::StatusMask get_enabled_statuses (void);
-
-      virtual ::DDS::ReturnCode_t set_enabled_statuses (::DDS::StatusMask mask);
-
-      virtual ::DDS::Entity_ptr get_entity (void);
-
-      ::DDSStatusCondition * get_rti_entity (void);
-
-      void set_rti_entity (::DDSStatusCondition * status_condition);
-
-    private:
-      ::DDSStatusCondition * rti_entity_;
-      ::DDS::Entity_var entity_;
-      ::DDSStatusCondition * rti_entity (void);
-    };
-  }
-}
-
-#endif /* DDS4CCM_STATUSCONDITION_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp
deleted file mode 100644
index 8f9f859f162..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp
+++ /dev/null
@@ -1,617 +0,0 @@
-#include "dds4ccm/impl/ndds/Subscriber.h"
-#include "dds4ccm/impl/ndds/Topic.h"
-#include "dds4ccm/impl/ndds/ContentFilteredTopic.h"
-#include "dds4ccm/impl/ndds/DataReader_T.h"
-#include "dds4ccm/impl/ndds/DataReaderListener.h"
-#include "dds4ccm/impl/ndds/StatusCondition.h"
-#include "dds4ccm/impl/ndds/DomainParticipant.h"
-#include "dds4ccm/impl/ndds/TypeSupport.h"
-#include "dds4ccm/impl/ndds/Utils.h"
-
-#include "dds4ccm/impl/ndds/SubscriberListener.h"
-
-#include "dds4ccm/impl/ndds/convertors/InstanceHandle_t.h"
-#include "dds4ccm/impl/ndds/convertors/DataReaderQos.h"
-#include "dds4ccm/impl/ndds/convertors/SubscriberQos.h"
-#include "dds4ccm/impl/ndds/convertors/TopicQos.h"
-
-#include "dds4ccm/impl/logger/Log_Macros.h"
-
-namespace CIAO
-{
-  namespace NDDS
-  {
-    DDS_Subscriber_i::DDS_Subscriber_i (::DDSSubscriber * sub,
-                                    ::DDS::DomainParticipant_ptr dp)
-      : rti_entity_ (sub),
-        dp_ (::DDS::DomainParticipant::_duplicate (dp))
-    {
-      DDS4CCM_TRACE ("DDS_Subscriber_i::DDS_Subscriber_i");
-    }
-
-    DDS_Subscriber_i::~DDS_Subscriber_i (void)
-    {
-      DDS4CCM_TRACE ("DDS_Subscriber_i::~DDS_Subscriber_i");
-    }
-
-    ::DDS::ReturnCode_t
-    DDS_Subscriber_i::enable (void)
-    {
-      return this->rti_entity ()->enable ();
-    }
-
-    ::DDS::StatusCondition_ptr
-    DDS_Subscriber_i::get_statuscondition (void)
-    {
-      ::DDS::StatusCondition_var retval;
-      ::DDSStatusCondition* sc = this->rti_entity ()->get_statuscondition ();
-      if (sc)
-        {
-          ACE_NEW_THROW_EX (retval,
-                            DDS_StatusCondition_i (sc, this->dp_.in ()),
-                            ::CORBA::NO_MEMORY ());
-        }
-      return retval._retn ();
-    }
-
-    ::DDS::StatusMask
-    DDS_Subscriber_i::get_status_changes (void)
-    {
-      return this->rti_entity ()->get_status_changes ();
-    }
-
-    ::DDS::InstanceHandle_t
-    DDS_Subscriber_i::get_instance_handle (void)
-    {
-      ::DDS_InstanceHandle_t const rtihandle =
-        this->rti_entity ()->get_instance_handle ();
-      ::DDS::InstanceHandle_t handle;
-      handle <<= rtihandle;
-      return handle;
-    }
-
-    DDSDataReader *
-    DDS_Subscriber_i::create_datareader (
-                  DDSContentFilteredTopic * topic,
-                  DDSDataReaderListener * ccm_dds_drl,
-                  ::DDS::StatusMask mask,
-                   const ::DDS::DataReaderQos & qos)
-    {
-      DDS_DataReaderQos ccm_dds_qos;
-      DDS_ReturnCode_t const retcode = this->rti_entity ()->get_default_datareader_qos (ccm_dds_qos);
-      if (retcode != DDS_RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                       "DDS_Subscriber_i"
-                       "::create_datareader - "
-                       "Error: Unable to retrieve default datareader qos\n"));
-          return 0;
-        }
-
-      ccm_dds_qos <<= qos;
-      return this->rti_entity ()->create_datareader (topic,
-                                                     ccm_dds_qos,
-                                                     ccm_dds_drl,
-                                                     mask);
-    }
-
-    DDSDataReader *
-    DDS_Subscriber_i::create_datareader (
-                  DDSTopic * topic,
-                  DDSDataReaderListener * ccm_dds_drl,
-                  ::DDS::StatusMask mask,
-                   const ::DDS::DataReaderQos & qos)
-    {
-      DDS_DataReaderQos ccm_dds_qos;
-      DDS_ReturnCode_t const retcode = this->rti_entity ()->get_default_datareader_qos (ccm_dds_qos);
-      if (retcode != DDS_RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                       "DDS_Subscriber_i"
-                       "::create_datareader - "
-                       "Error: Unable to retrieve default datareader qos\n"));
-          return 0;
-        }
-      ccm_dds_qos <<= qos;
-      return this->rti_entity ()->create_datareader (topic,
-                                               ccm_dds_qos,
-                                               ccm_dds_drl,
-                                               mask);
-    }
-
-    DDSDataReader *
-    DDS_Subscriber_i::create_datareader_with_profile (
-                  DDSContentFilteredTopic * topic,
-                  const char * qos_profile,
-                  DDSDataReaderListener * ccm_dds_drl,
-                  ::DDS::StatusMask mask)
-    {
-      char * lib_name = get_library_name(qos_profile);
-      char * prof_name = get_profile_name(qos_profile);
-
-      DDSDataReader * dr = 0;
-
-      if (lib_name != 0 && prof_name != 0)
-        {
-          dr = this->rti_entity ()->create_datareader_with_profile (
-                                                            topic,
-                                                            lib_name,
-                                                            prof_name,
-                                                            ccm_dds_drl,
-                                                            mask);
-        }
-
-      ACE_OS::free (lib_name);
-      ACE_OS::free (prof_name);
-
-      return dr;
-    }
-
-    DDSDataReader *
-    DDS_Subscriber_i::create_datareader_with_profile (
-                  DDSTopic * topic,
-                  const char * qos_profile,
-                  DDSDataReaderListener * ccm_dds_drl,
-                  ::DDS::StatusMask mask)
-    {
-      char * lib_name = get_library_name (qos_profile);
-      char * prof_name = get_profile_name (qos_profile);
-
-      DDSDataReader * dr = 0;
-
-      if (lib_name != 0 && prof_name != 0)
-        {
-          dr = this->rti_entity ()->create_datareader_with_profile (topic,
-                                                            lib_name,
-                                                            prof_name,
-                                                            ccm_dds_drl,
-                                                            mask);
-        }
-
-      ACE_OS::free (lib_name);
-      ACE_OS::free (prof_name);
-      return dr;
-    }
-
-    ::DDS::DataReader_ptr
-    DDS_Subscriber_i::create_datareader (
-      ::DDS::TopicDescription_ptr a_topic,
-      const ::DDS::DataReaderQos & qos,
-      ::DDS::DataReaderListener_ptr a_listener,
-      ::DDS::StatusMask mask)
-    {
-      DDS4CCM_TRACE ("DDS_Subscriber_i::create_datareader");
-      DDS_DataReaderListener_i *ccm_dds_drl = 0;
-      if (! ::CORBA::is_nil (a_listener))
-        {
-          ACE_NEW_THROW_EX (ccm_dds_drl,
-                            DDS_DataReaderListener_i (a_listener,
-                                                      ::DDS::DataReader::_nil ()),
-                            ::CORBA::NO_MEMORY ());
-        }
-
-      DDSDataReader * ccm_dds_dr = 0;
-      DDS_Topic_i* topic = dynamic_cast < DDS_Topic_i * > (a_topic);
-
-      if (!topic)
-        {
-          DDS_ContentFilteredTopic_i * cf_topic =
-            dynamic_cast < DDS_ContentFilteredTopic_i * > (a_topic);
-          if (!cf_topic)
-            {
-              DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_CAST_ERROR, (LM_ERROR, DDS4CCM_INFO
-                          "DDS_Subscriber_i::create_datareader - Error: Unable to "
-                          "cast provided topic to one of its servant.\n"));
-              delete ccm_dds_drl;
-              return ::DDS::DataReader::_nil ();
-            }
-          else
-            ccm_dds_dr = this->create_datareader (cf_topic->get_rti_entity (),
-                                                  ccm_dds_drl,
-                                                  mask,
-                                                  qos);
-        }
-      else
-        ccm_dds_dr = this->create_datareader (topic->get_rti_entity (),
-                                              ccm_dds_drl,
-                                              mask,
-                                              qos);
-
-      if (!ccm_dds_dr)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_DDS_NIL_RETURN, (LM_ERROR, DDS4CCM_INFO "DDS_Subscriber_i"
-                       "::create_datareader - "
-                       "Error: RTI Topic returned a nil datareader.\n"));
-          delete ccm_dds_drl;
-          return ::DDS::DataReader::_nil ();
-        }
-      else
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                        "DDS_Subscriber_i::create_datareader - "
-                        "Successfully created datareader.\n"));
-        }
-
-      ::DDS::DataReader_var reader = DDS_TypeSupport_i::create_datareader (
-                                                                ccm_dds_dr,
-                                                                this->dp_.in (),
-                                                                this);
-      if (ccm_dds_drl)
-        {
-          ccm_dds_drl->set_dds_entity (reader.in ());
-        }
-      return reader._retn ();
-    }
-
-
-    ::DDS::DataReader_ptr
-    DDS_Subscriber_i::create_datareader_with_profile (
-      ::DDS::TopicDescription_ptr a_topic,
-      const char * qos_profile,
-      ::DDS::DataReaderListener_ptr a_listener,
-      ::DDS::StatusMask mask)
-    {
-      DDS4CCM_TRACE ("DDS_Subscriber_i::create_datareader_with_profile");
-      DDS_DataReaderListener_i *ccm_dds_drl = 0;
-      if (! ::CORBA::is_nil (a_listener))
-        {
-          ACE_NEW_THROW_EX (ccm_dds_drl,
-                            DDS_DataReaderListener_i (a_listener, ::DDS::DataReader::_nil ()),
-                            ::CORBA::NO_MEMORY ());
-        }
-
-      DDSDataReader * ccm_dds_dr = 0;
-      DDS_Topic_i * topic = dynamic_cast < DDS_Topic_i * > (a_topic);
-
-      if (!topic)
-        {
-          DDS_ContentFilteredTopic_i * cf_topic =
-            dynamic_cast < DDS_ContentFilteredTopic_i * > (a_topic);
-          if (!cf_topic)
-            {
-              DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_CAST_ERROR, (LM_ERROR, DDS4CCM_INFO
-                            "DDS_Subscriber_i::create_datareader_with_profile <%C> - "
-                            "Error: Unable to cast provided topic to one "
-                            "of its servant.\n",
-                            qos_profile));
-              delete ccm_dds_drl;
-              return ::DDS::DataReader::_nil ();
-            }
-          else
-            {
-              ccm_dds_dr = this->create_datareader_with_profile (cf_topic->get_rti_entity (),
-                                                           qos_profile,
-                                                           ccm_dds_drl,
-                                                           mask);
-            }
-        }
-      else
-        {
-          ccm_dds_dr = this->create_datareader_with_profile (topic->get_rti_entity (),
-                                                             qos_profile,
-                                                             ccm_dds_drl,
-                                                             mask);
-        }
-
-      if (!ccm_dds_dr)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_DDS_NIL_RETURN, (LM_ERROR, DDS4CCM_INFO
-                        "DDS_Subscriber_i::create_datareader_with_profile <%C>- "
-                        "Error: RTI Topic returned a nil datareader.\n",
-                        qos_profile));
-          delete ccm_dds_drl;
-          return ::DDS::DataReader::_nil ();
-        }
-      else
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                        "DDS_Subscriber_i::create_datareader_with_profile - "
-                        "Successfully created datareader with profile <%C>.\n",
-                        qos_profile));
-        }
-
-      ::DDS::DataReader_var reader = DDS_TypeSupport_i::create_datareader (ccm_dds_dr,
-                                                                           this->dp_.in (),
-                                                                           this);
-      if (ccm_dds_drl)
-        {
-          ccm_dds_drl->set_dds_entity (reader.in ());
-        }
-      return reader._retn ();
-    }
-
-    ::DDS::ReturnCode_t
-    DDS_Subscriber_i::delete_datareader (
-      ::DDS::DataReader_ptr a_datareader)
-    {
-      DDS_DataReader_Base *dr = dynamic_cast< DDS_DataReader_Base *> (a_datareader);
-      if (!dr)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_CAST_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        "DDS_Subscriber_i::delete_datareader - Unable to cast "
-                        "provided object reference to servant.\n"));
-          return ::DDS::RETCODE_BAD_PARAMETER;
-        }
-
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_CAST_SUCCESSFUL, (LM_TRACE, DDS4CCM_INFO
-                    "DDS_Subscriber_i::delete_datareader - "
-                    "Successfully casted provided object reference "
-                    "to servant.\n"));
-
-      DDSDataReader* rti_dr = dr->get_rti_entity ();
-      dr->set_rti_entity (0, ::DDS::DomainParticipant::_nil ());
-      DDS_ReturnCode_t const retval =
-        this->rti_entity ()->delete_datareader (rti_dr);
-
-      if (retval != DDS_RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        "DDS_Subscriber_i::delete_datareader - "
-                        "Error: Returned non-ok error code %C\n",
-                        ::CIAO::DDS4CCM::translate_retcode (retval)));
-        }
-      else
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_INFO, DDS4CCM_INFO
-                        "DDS_Subscriber_i::delete_datareader - "
-                        "Datareader successfully deleted\n"));
-        }
-
-      return retval;
-    }
-
-    ::DDS::ReturnCode_t
-    DDS_Subscriber_i::delete_contained_entities (void)
-    {
-      return this->rti_entity ()->delete_contained_entities ();
-    }
-
-    ::DDS::DataReader_ptr
-    DDS_Subscriber_i::lookup_datareader (
-      const char * impl_name)
-    {
-      ::DDS::DataReader_var retval;
-      DDSDataReader* dr = this->rti_entity ()->lookup_datareader (impl_name);
-      if (dr)
-        {
-          retval = DDS_TypeSupport_i::create_datareader (dr,
-                                                         this->dp_.in (),
-                                                         this);
-        }
-      return retval._retn();
-    }
-
-
-    ::DDS::ReturnCode_t
-    DDS_Subscriber_i::get_datareaders (
-      ::DDS::DataReaderSeq & readers,
-      ::DDS::SampleStateMask sample_states,
-      ::DDS::ViewStateMask view_states,
-      ::DDS::InstanceStateMask instance_states)
-    {
-      DDS4CCM_TRACE ("DDS_Subscriber_i::get_datareaders");
-      ::DDSDataReaderSeq dds_readers;
-
-      ::DDS_ReturnCode_t retcode =
-        this->rti_entity ()->get_datareaders (dds_readers,
-                                              sample_states,
-                                              view_states,
-                                              instance_states);
-      if (retcode == DDS_RETCODE_OK)
-        {
-          readers.length (dds_readers.length ());
-          for (::DDS_Long i = 0; i < dds_readers.length (); ++i)
-            {
-              ::DDS::DataReader_var rdr = DDS_TypeSupport_i::create_datareader (
-                                                                dds_readers[i],
-                                                                this->dp_.in (),
-                                                                this);
-              readers [i] = rdr._retn ();
-            }
-        }
-      return retcode;
-    }
-
-
-    ::DDS::ReturnCode_t
-    DDS_Subscriber_i::notify_datareaders (void)
-    {
-      return this->rti_entity ()->notify_datareaders ();
-    }
-
-
-    ::DDS::ReturnCode_t
-    DDS_Subscriber_i::set_qos (
-      const ::DDS::SubscriberQos & qos)
-    {
-      DDS4CCM_TRACE ("DDS_Subscriber_i::set_qos");
-      ::DDS_SubscriberQos ccm_dds_qos;
-      DDS_ReturnCode_t const retcode = this->rti_entity ()->get_qos (ccm_dds_qos);
-      if (retcode != DDS_RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                       "DDS_Subscriber_i"
-                       "::set_qos - "
-                       "Error: Unable to retrieve subscriber qos\n"));
-          return retcode;
-        }
-      ccm_dds_qos <<= qos;
-      return this->rti_entity ()->get_qos (ccm_dds_qos);
-    }
-
-
-    ::DDS::ReturnCode_t
-    DDS_Subscriber_i::get_qos (
-      ::DDS::SubscriberQos & qos)
-    {
-      DDS4CCM_TRACE ("DDS_Subscriber_i::get_qos");
-      ::DDS_SubscriberQos ccm_dds_qos;
-      ccm_dds_qos <<= qos;
-      DDS_ReturnCode_t const retcode = this->rti_entity ()->get_qos (ccm_dds_qos);
-      qos <<= ccm_dds_qos;
-      return retcode;
-    }
-
-
-    ::DDS::ReturnCode_t
-    DDS_Subscriber_i::set_listener (
-      ::DDS::SubscriberListener_ptr a_listener,
-      ::DDS::StatusMask mask)
-    {
-      DDS4CCM_TRACE ("DDS_Subscriber_i::set_listener");
-
-      // Retrieve the previously set listener
-      DDSSubscriberListener *old_listener = this->rti_entity ()->get_listener ();
-
-      DDSSubscriberListener *listener = 0;
-      if (! ::CORBA::is_nil (a_listener))
-        {
-          ACE_NEW_THROW_EX (listener,
-                            DDS_SubscriberListener_i (
-                              a_listener,
-                              this->dp_.in ()),
-                            ::CORBA::NO_MEMORY ());
-        }
-
-      ::DDS::ReturnCode_t const retcode =
-        this->rti_entity ()->set_listener (listener, mask);
-
-      if (retcode != ::DDS::RETCODE_OK)
-        {
-          delete listener;
-        }
-      else
-        {
-          delete old_listener;
-        }
-
-      return retcode;
-    }
-
-
-    ::DDS::SubscriberListener_ptr
-    DDS_Subscriber_i::get_listener (void)
-    {
-      DDS4CCM_TRACE ("DDS_Subscriber_i::get_listener");
-
-      DDSSubscriberListener *ccm_dds_impl_list = this->rti_entity ()->get_listener ();
-      DDS_SubscriberListener_i *list_proxy =
-        dynamic_cast <DDS_SubscriberListener_i *> (ccm_dds_impl_list);
-      if (!list_proxy)
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                        "DDS_Subscriber_i::get_listener - "
-                        "DDS returned a NIL listener.\n"));
-          return ::DDS::SubscriberListener::_nil ();
-        }
-      return list_proxy->get_subscriber_listener ();
-    }
-
-
-    ::DDS::ReturnCode_t
-    DDS_Subscriber_i::begin_access (void)
-    {
-      return this->rti_entity ()->begin_access ();
-    }
-
-
-    ::DDS::ReturnCode_t
-    DDS_Subscriber_i::end_access (void)
-    {
-      return this->rti_entity ()->end_access ();
-    }
-
-
-    ::DDS::DomainParticipant_ptr
-    DDS_Subscriber_i::get_participant (void)
-    {
-      return DDS::DomainParticipant::_duplicate (this->dp_.in ());
-    }
-
-
-    ::DDS::ReturnCode_t
-    DDS_Subscriber_i::set_default_datareader_qos (
-      const ::DDS::DataReaderQos & qos)
-    {
-      DDS4CCM_TRACE ("DDS_Subscriber_i::set_default_datareader_qos");
-      ::DDS_DataReaderQos ccm_dds_qos;
-      DDS_ReturnCode_t const retcode = this->rti_entity ()->get_default_datareader_qos (ccm_dds_qos);
-      if (retcode != DDS_RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                       "DDS_Subscriber_i"
-                       "::set_default_datareader_qos - "
-                       "Error: Unable to retrieve default datareader qos\n"));
-          return retcode;
-        }
-      ccm_dds_qos <<= qos;
-      return this->rti_entity ()->set_default_datareader_qos (ccm_dds_qos);
-    }
-
-    ::DDS::ReturnCode_t
-    DDS_Subscriber_i::get_default_datareader_qos (
-      ::DDS::DataReaderQos & qos)
-    {
-      DDS4CCM_TRACE ("DDS_Subscriber_i::get_default_datareader_qos");
-      ::DDS_DataReaderQos ccm_dds_qos;
-      ::DDS::ReturnCode_t const retcode =
-        this->rti_entity ()->get_default_datareader_qos (ccm_dds_qos);
-      qos <<= ccm_dds_qos;
-      return retcode;
-    }
-
-
-    ::DDS::ReturnCode_t
-    DDS_Subscriber_i::copy_from_topic_qos (
-      ::DDS::DataReaderQos & a_datareader_qos,
-      const ::DDS::TopicQos & a_impl_qos)
-    {
-      DDS4CCM_TRACE ("DDS_Subscriber_i::copy_from_topic_qos");
-      ::DDS_DataReaderQos ccm_dds_qos;
-      ::DDS_TopicQos ccm_dds_topic_qos;
-      DDS_ReturnCode_t retcode = this->rti_entity ()->get_default_datareader_qos (ccm_dds_qos);
-      if (retcode != DDS_RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                       "DDS_Subscriber_i"
-                       "::copy_from_topic_qos - "
-                       "Error: Unable to retrieve default datareader qos\n"));
-          return retcode;
-        }
-
-      ccm_dds_qos <<= a_datareader_qos;
-      ccm_dds_topic_qos <<= a_impl_qos;
-      retcode =
-          this->rti_entity ()->copy_from_topic_qos (ccm_dds_qos,
-                                                    ccm_dds_topic_qos);
-      a_datareader_qos <<= ccm_dds_qos;
-      return retcode;
-    }
-
-    DDSSubscriber *
-    DDS_Subscriber_i::get_rti_entity (void)
-    {
-      return this->rti_entity_;
-    }
-
-    void
-    DDS_Subscriber_i::set_rti_entity (DDSSubscriber * sub)
-    {
-      this->rti_entity_ = sub;
-    }
-
-    DDSSubscriber *
-    DDS_Subscriber_i::rti_entity (void)
-    {
-      if (!this->rti_entity_)
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG,
-                        "DDS_Subscriber_i::rti_entity - "
-                        "Throwing BAD_INV_ORDER.\n"));
-          throw ::CORBA::BAD_INV_ORDER ();
-        }
-      return this->rti_entity_;
-    }
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.h b/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.h
deleted file mode 100644
index 2bbe6fda2b2..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/**
- * @author William R. Otte <wotte@dre.vanderbilt.edu>
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef SUBSCRIBER_T_H_
-#define SUBSCRIBER_T_H_
-
-#include "dds4ccm/idl/ndds/ndds_dcpsC.h"
-#include "dds4ccm/impl/ndds/DataReader_T.h"
-#include "tao/LocalObject.h"
-
-class DDSSubscriber;
-
-namespace CIAO
-{
-  namespace NDDS
-  {
-    class DDS4CCM_NDDS_Export DDS_Subscriber_i :
-      public virtual ::DDS::Subscriber,
-      public virtual ::CORBA::LocalObject
-    {
-    public:
-      /// Constructor
-      DDS_Subscriber_i (::DDSSubscriber * sub,
-                      ::DDS::DomainParticipant_ptr dp);
-
-      /// Destructor
-      virtual ~DDS_Subscriber_i (void);
-
-      virtual ::DDS::ReturnCode_t enable (void);
-
-      virtual ::DDS::StatusCondition_ptr get_statuscondition (void);
-
-      virtual ::DDS::StatusMask get_status_changes (void);
-
-      virtual ::DDS::InstanceHandle_t get_instance_handle (void);
-
-      virtual ::DDS::DataReader_ptr create_datareader (
-        ::DDS::TopicDescription_ptr a_topic,
-        const ::DDS::DataReaderQos & qos,
-        ::DDS::DataReaderListener_ptr a_listener,
-        ::DDS::StatusMask mask);
-
-      virtual ::DDS::DataReader_ptr
-      create_datareader_with_profile (
-        ::DDS::TopicDescription_ptr a_topic,
-        const char * qos_profile,
-        ::DDS::DataReaderListener_ptr a_listener,
-        ::DDS::StatusMask mask);
-
-      virtual ::DDS::ReturnCode_t
-      delete_datareader (::DDS::DataReader_ptr a_datareader);
-
-      virtual ::DDS::ReturnCode_t delete_contained_entities (void);
-
-      virtual ::DDS::DataReader_ptr lookup_datareader (const char * impl_name);
-
-      virtual ::DDS::ReturnCode_t
-      get_datareaders (
-        ::DDS::DataReaderSeq & readers,
-        ::DDS::SampleStateMask sample_states,
-        ::DDS::ViewStateMask view_states,
-        ::DDS::InstanceStateMask instance_states);
-
-      virtual ::DDS::ReturnCode_t notify_datareaders (void);
-
-      virtual ::DDS::ReturnCode_t set_qos (const ::DDS::SubscriberQos & qos);
-
-      virtual ::DDS::ReturnCode_t get_qos (::DDS::SubscriberQos & qos);
-
-      virtual ::DDS::ReturnCode_t
-      set_listener (
-        ::DDS::SubscriberListener_ptr a_listener,
-        ::DDS::StatusMask mask);
-
-      virtual ::DDS::SubscriberListener_ptr get_listener (void);
-
-      virtual ::DDS::ReturnCode_t begin_access (void);
-
-      virtual ::DDS::ReturnCode_t end_access (void);
-
-      virtual ::DDS::DomainParticipant_ptr get_participant (void);
-
-      virtual ::DDS::ReturnCode_t
-      set_default_datareader_qos (
-        const ::DDS::DataReaderQos & qos);
-
-      virtual ::DDS::ReturnCode_t
-      get_default_datareader_qos (
-        ::DDS::DataReaderQos & qos);
-
-      virtual ::DDS::ReturnCode_t
-      copy_from_topic_qos (
-        ::DDS::DataReaderQos & a_datareader_qos,
-        const ::DDS::TopicQos & a_impl_qos);
-
-      ::DDSSubscriber * get_rti_entity (void);
-
-      void set_rti_entity (::DDSSubscriber * sub);
-
-    private:
-      DDSSubscriber *rti_entity_;
-      ::DDS::DomainParticipant_var dp_;
-
-      DDSSubscriber *rti_entity (void);
-
-      DDSDataReader *
-      create_datareader (
-        DDSTopic * topic,
-        DDSDataReaderListener * ccm_dds_drl,
-        ::DDS::StatusMask mask,
-         const ::DDS::DataReaderQos & qos);
-
-      DDSDataReader *
-      create_datareader (
-        DDSContentFilteredTopic * topic,
-        DDSDataReaderListener * ccm_dds_drl,
-        ::DDS::StatusMask mask,
-         const ::DDS::DataReaderQos & qos);
-
-      DDSDataReader *
-      create_datareader_with_profile (
-        DDSContentFilteredTopic * topic,
-        const char * qos_profile,
-        DDSDataReaderListener * ccm_dds_drl,
-        ::DDS::StatusMask mask);
-
-      DDSDataReader *
-      create_datareader_with_profile (
-        DDSTopic * topic,
-        const char * qos_profile,
-        DDSDataReaderListener * ccm_dds_drl,
-        ::DDS::StatusMask mask);
-    };
-  }
-}
-
-#endif /* SUBSCRIBER_T_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.cpp b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.cpp
deleted file mode 100644
index e34424b37ec..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.cpp
+++ /dev/null
@@ -1,163 +0,0 @@
-#include "dds4ccm/impl/ndds/SubscriberListener.h"
-#include "dds4ccm/impl/ndds/Subscriber.h"
-#include "dds4ccm/impl/ndds/DomainParticipant.h"
-#include "dds4ccm/impl/ndds/TypeSupport.h"
-
-#include "dds4ccm/impl/ndds/convertors/SampleLostStatus.h"
-#include "dds4ccm/impl/ndds/convertors/SubscriptionMatchedStatus.h"
-#include "dds4ccm/impl/ndds/convertors/RequestedDeadlineMissedStatus.h"
-#include "dds4ccm/impl/ndds/convertors/SampleRejectedStatus.h"
-#include "dds4ccm/impl/ndds/convertors/LivelinessChangedStatus.h"
-#include "dds4ccm/impl/ndds/convertors/RequestedIncompatibleQosStatus.h"
-
-#include "dds4ccm/impl/logger/Log_Macros.h"
-
-namespace CIAO
-{
-  namespace NDDS
-  {
-    DDS_SubscriberListener_i::DDS_SubscriberListener_i (
-      ::DDS::SubscriberListener_ptr p,
-      ::DDS::DomainParticipant_ptr dp)
-      : impl_ ( ::DDS::SubscriberListener::_duplicate (p))
-        , dp_ (::DDS::DomainParticipant::_duplicate (dp))
-    {
-      DDS4CCM_TRACE ("DDS_SubscriberListener_i::DDS_SubscriberListener_i");
-    }
-
-    DDS_SubscriberListener_i::~DDS_SubscriberListener_i (void)
-    {
-      DDS4CCM_TRACE ("DDS_SubscriberListener_i::~DDS_SubscriberListener_i");
-    }
-
-    void
-    DDS_SubscriberListener_i::on_data_on_readers (
-        ::DDSSubscriber* the_subscriber)
-    {
-      DDS4CCM_TRACE ("DDS_SubscriberListener_i::on_data_on_readers");
-
-      ::DDS::Subscriber_var sub;
-      ACE_NEW (sub,
-               DDS_Subscriber_i (the_subscriber, dp_.in ()));
-      this->impl_->on_data_on_readers (sub.in ());
-      the_subscriber->notify_datareaders ();
-    }
-
-    void
-    DDS_SubscriberListener_i::on_requested_deadline_missed (
-      ::DDSDataReader* the_reader,
-      const ::DDS_RequestedDeadlineMissedStatus & status)
-    {
-      DDS4CCM_TRACE ("DDS_SubscriberListener_i::on_requested_deadline_missed");
-
-      ::DDS::RequestedDeadlineMissedStatus ddsstatus;
-      ::DDS::DataReader_var proxy = DDS_TypeSupport_i::create_datareader (
-                                                    the_reader,
-                                                    this->dp_.in (),
-                                                    ::DDS::Subscriber::_nil ());
-      ddsstatus <<= status;
-      this->impl_->on_requested_deadline_missed (proxy.in (), ddsstatus);
-    }
-
-    void
-    DDS_SubscriberListener_i::on_requested_incompatible_qos (
-      ::DDSDataReader* the_reader,
-      const ::DDS_RequestedIncompatibleQosStatus & status)
-    {
-      DDS4CCM_TRACE ("DDS_SubscriberListener_i::on_requested_incompatible_qos");
-
-      ::DDS::RequestedIncompatibleQosStatus ddsstatus;
-      ::DDS::DataReader_var proxy = DDS_TypeSupport_i::create_datareader (
-                                                    the_reader,
-                                                    this->dp_.in (),
-                                                    ::DDS::Subscriber::_nil ());
-      ddsstatus <<= status;
-      this->impl_->on_requested_incompatible_qos (proxy.in (), ddsstatus);
-    }
-
-    void
-    DDS_SubscriberListener_i::on_sample_rejected (
-      ::DDSDataReader* the_reader,
-      const ::DDS_SampleRejectedStatus & status)
-    {
-      DDS4CCM_TRACE ("DDS_SubscriberListener_i::on_sample_rejected");
-
-      ::DDS::SampleRejectedStatus ddsstatus;
-      ::DDS::DataReader_var proxy = DDS_TypeSupport_i::create_datareader (
-                                                    the_reader,
-                                                    this->dp_.in (),
-                                                    ::DDS::Subscriber::_nil ());
-      ddsstatus <<= status;
-      this->impl_->on_sample_rejected (proxy.in (), ddsstatus);
-    }
-
-    void
-    DDS_SubscriberListener_i::on_liveliness_changed (
-      ::DDSDataReader* the_reader,
-      const ::DDS_LivelinessChangedStatus & status)
-    {
-      DDS4CCM_TRACE ("DDS_SubscriberListener_i::on_liveliness_changed");
-
-      ::DDS::LivelinessChangedStatus ddsstatus;
-      ::DDS::DataReader_var proxy = DDS_TypeSupport_i::create_datareader (
-                                                    the_reader,
-                                                    this->dp_.in (),
-                                                    ::DDS::Subscriber::_nil ());
-      ddsstatus <<= status;
-      this->impl_->on_liveliness_changed (proxy.in (), ddsstatus);
-    }
-
-    void
-    DDS_SubscriberListener_i::on_data_available (
-      ::DDSDataReader* the_reader)
-    {
-      DDS4CCM_TRACE ("DDS_SubscriberListener_i::on_data_available");
-
-      ::DDS::DataReader_var proxy = DDS_TypeSupport_i::create_datareader (
-                                                    the_reader,
-                                                    this->dp_.in (),
-                                                    ::DDS::Subscriber::_nil ());
-      this->impl_->on_data_available (proxy.in ());
-    }
-
-    void
-    DDS_SubscriberListener_i::on_subscription_matched (
-      ::DDSDataReader* the_reader,
-      const ::DDS_SubscriptionMatchedStatus & status)
-    {
-      DDS4CCM_TRACE ("DDS_SubscriberListener_i::on_subscription_matched");
-
-      ::DDS::SubscriptionMatchedStatus ddsstatus;
-      ::DDS::DataReader_var proxy = DDS_TypeSupport_i::create_datareader (
-                                                    the_reader,
-                                                    this->dp_.in (),
-                                                    ::DDS::Subscriber::_nil ());
-      ddsstatus <<= status;
-      this->impl_->on_subscription_matched (proxy.in (), ddsstatus);
-    }
-
-    void
-    DDS_SubscriberListener_i::on_sample_lost (
-      ::DDSDataReader* the_reader,
-      const ::DDS_SampleLostStatus & status)
-    {
-      DDS4CCM_TRACE ("DDS_SubscriberListener_i::on_sample_lost");
-
-      ::DDS::SampleLostStatus ddsstatus;
-      ::DDS::DataReader_var proxy = DDS_TypeSupport_i::create_datareader (
-                                                    the_reader,
-                                                    this->dp_.in (),
-                                                    ::DDS::Subscriber::_nil ());
-      ddsstatus <<= status;
-      this->impl_->on_sample_lost (proxy.in (), ddsstatus);
-    }
-
-    ::DDS::SubscriberListener_ptr
-    DDS_SubscriberListener_i::get_subscriber_listener (void)
-    {
-      return ::DDS::SubscriberListener::_duplicate (this->impl_.in ());
-    }
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.h b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.h
deleted file mode 100644
index c4fd656e008..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/**
- * @author William R. Otte <wotte@dre.vanderbilt.edu>
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDSSUBSCRIBERLISTENER_T_H_
-#define DDSSUBSCRIBERLISTENER_T_H_
-
-#include "dds4ccm/idl/ndds/ndds_dcpsC.h"
-#include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h"
-#include "ndds/ndds_cpp.h"
-
-namespace CIAO
-{
-  namespace NDDS
-  {
-    class DDS4CCM_NDDS_Export DDS_SubscriberListener_i :
-      public ::DDSSubscriberListener
-    {
-    public:
-      /// Constructor
-      DDS_SubscriberListener_i (
-        ::DDS::SubscriberListener_ptr s,
-        ::DDS::DomainParticipant_ptr dp);
-
-      /// Destructor
-      virtual ~DDS_SubscriberListener_i (void);
-
-      virtual void
-      on_requested_deadline_missed (
-        ::DDSDataReader* the_reader,
-        const ::DDS_RequestedDeadlineMissedStatus & status);
-
-      virtual void
-      on_requested_incompatible_qos (
-        ::DDSDataReader* the_reader,
-        const ::DDS_RequestedIncompatibleQosStatus & status);
-
-      virtual void
-      on_sample_rejected (
-        ::DDSDataReader* the_reader,
-        const ::DDS_SampleRejectedStatus & status);
-
-      virtual void
-      on_liveliness_changed (
-        ::DDSDataReader* the_reader,
-        const ::DDS_LivelinessChangedStatus & status);
-
-      virtual void
-      on_data_available (
-        ::DDSDataReader* the_reader);
-
-      virtual void
-      on_subscription_matched (
-        ::DDSDataReader* the_reader,
-        const ::DDS_SubscriptionMatchedStatus & status);
-
-      virtual void
-      on_sample_lost (
-        ::DDSDataReader* the_reader,
-        const ::DDS_SampleLostStatus & status);
-
-      virtual void
-      on_data_on_readers (
-        ::DDSSubscriber* the_subscriber);
-
-      ::DDS::SubscriberListener_ptr get_subscriber_listener (void);
-    private:
-      ::DDS::SubscriberListener_var impl_;
-      ::DDS::DomainParticipant_var dp_;
-    };
-  }
-}
-
-#endif /* DDSSUBSCRIBERLISTENER_T_H_ */
-
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Topic.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Topic.cpp
deleted file mode 100644
index c1a625ceb25..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/Topic.cpp
+++ /dev/null
@@ -1,204 +0,0 @@
-#include "dds4ccm/impl/ndds/Topic.h"
-#include "dds4ccm/impl/ndds/StatusCondition.h"
-#include "dds4ccm/impl/ndds/TopicListener.h"
-
-#include "dds4ccm/impl/ndds/convertors/InstanceHandle_t.h"
-#include "dds4ccm/impl/ndds/convertors/InconsistentTopicStatus.h"
-#include "dds4ccm/impl/ndds/convertors/TopicQos.h"
-
-#include "dds4ccm/impl/logger/Log_Macros.h"
-
-namespace CIAO
-{
-  namespace NDDS
-  {
-    DDS_Topic_i::DDS_Topic_i (::DDSTopic* topic,
-                          ::DDS::DomainParticipant_ptr dp)
-      : rti_entity_ (topic),
-        dp_ (::DDS::DomainParticipant::_duplicate (dp))
-    {
-      DDS4CCM_TRACE ("DDS_Topic_i::DDS_Topic_i");
-    }
-
-    DDS_Topic_i::~DDS_Topic_i (void)
-    {
-      DDS4CCM_TRACE ("DDS_Topic_i::~DDS_Topic_i");
-    }
-
-    ::DDS::ReturnCode_t
-    DDS_Topic_i::set_qos (const ::DDS::TopicQos &qos)
-    {
-      DDS4CCM_TRACE ("DDS_Topic_i::set_qos");
-      ::DDS_TopicQos ccm_dds_qos;
-      DDS_ReturnCode_t const retcode = this->rti_entity ()->get_qos (ccm_dds_qos);
-      if (retcode != DDS_RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                       "DDS_Topic_i"
-                       "::set_qos - "
-                       "Error: Unable to retrieve topic qos\n"));
-          return retcode;
-        }
-      ccm_dds_qos <<= qos;
-      return this->rti_entity ()->get_qos (ccm_dds_qos);
-    }
-
-    ::DDS::ReturnCode_t
-    DDS_Topic_i::get_qos (::DDS::TopicQos &qos)
-    {
-      DDS4CCM_TRACE ("DDS_Topic_i::get_qos");
-      ::DDS_TopicQos ccm_dds_qos;
-      ccm_dds_qos <<= qos;
-      ::DDS_ReturnCode_t const retval = this->rti_entity ()->get_qos (ccm_dds_qos);
-      qos <<= ccm_dds_qos;
-      return retval;
-    }
-
-    ::DDS::ReturnCode_t
-    DDS_Topic_i::set_listener (
-      ::DDS::TopicListener_ptr a_listener,
-      ::DDS::StatusMask mask)
-    {
-      DDS4CCM_TRACE ("DDS_Topic_i::set_listener");
-
-      // Retrieve the previously set listener
-      DDSTopicListener *old_listener = this->rti_entity ()->get_listener ();
-
-      DDSTopicListener *listener = 0;
-      if (! ::CORBA::is_nil (a_listener))
-        {
-          ACE_NEW_THROW_EX (listener,
-                            DDS_TopicListener_i (
-                              this,
-                              a_listener),
-                            ::CORBA::NO_MEMORY ());
-        }
-
-      ::DDS::ReturnCode_t const retcode =
-        this->rti_entity ()->set_listener (listener, mask);
-
-      if (retcode != ::DDS::RETCODE_OK)
-        {
-          delete listener;
-        }
-      else
-        {
-          this->topic_listener_ = ::DDS::TopicListener::_duplicate (a_listener);
-          delete old_listener;
-        }
-
-      return retcode;
-    }
-
-    ::DDS::TopicListener_ptr
-    DDS_Topic_i::get_listener (void)
-    {
-      DDS4CCM_TRACE ("DDS_Topic_i::get_listener");
-
-      return ::DDS::TopicListener::_duplicate (this->topic_listener_.in ());
-    }
-
-    ::DDS::ReturnCode_t
-    DDS_Topic_i::get_inconsistent_topic_status (
-      ::DDS::InconsistentTopicStatus & a_status)
-    {
-      DDS4CCM_TRACE ("DDS_Topic_i::get_inconsistent_topic_status");
-
-      DDS_InconsistentTopicStatus ddsstatus;
-      ::DDS::ReturnCode_t const retval =
-        this->rti_entity ()->get_inconsistent_topic_status (ddsstatus);
-      a_status <<= ddsstatus;
-      return retval;
-    }
-
-    ::DDS::ReturnCode_t
-    DDS_Topic_i::enable (void)
-    {
-      DDS4CCM_TRACE ("DDS_Topic_i::enable");
-
-      return this->rti_entity ()->enable ();
-    }
-
-    ::DDS::StatusCondition_ptr
-    DDS_Topic_i::get_statuscondition (void)
-    {
-      DDS4CCM_TRACE ("DDS_Topic_i::get_statuscondition");
-
-      ::DDS::StatusCondition_var retval;
-      DDSStatusCondition* sc = this->rti_entity ()->get_statuscondition ();
-      ACE_NEW_THROW_EX (retval,
-                        DDS_StatusCondition_i (sc, this->dp_.in ()),
-                        ::CORBA::NO_MEMORY ());
-      return retval._retn ();
-    }
-
-    ::DDS::StatusMask
-    DDS_Topic_i::get_status_changes (void)
-    {
-      DDS4CCM_TRACE ("DDS_Topic_i::get_status_changes");
-
-      return this->rti_entity ()->get_status_changes ();
-    }
-
-    ::DDS::InstanceHandle_t
-    DDS_Topic_i::get_instance_handle (void)
-    {
-      DDS4CCM_TRACE ("DDS_Topic_i::get_instance_handle");
-
-      ::DDS_InstanceHandle_t const rtihandle =
-        this->rti_entity ()->get_instance_handle ();
-      ::DDS::InstanceHandle_t handle;
-      handle <<= rtihandle;
-      return handle;
-    }
-
-    char *
-    DDS_Topic_i::get_type_name (void)
-    {
-      DDS4CCM_TRACE ("DDS_Topic_i::get_type_name");
-
-      return CORBA::string_dup (this->rti_entity ()->get_type_name ());
-    }
-
-    char *
-    DDS_Topic_i::get_name (void)
-    {
-      DDS4CCM_TRACE ("DDS_Topic_i::get_name");
-
-      return CORBA::string_dup (this->rti_entity ()->get_name ());
-    }
-
-    ::DDS::DomainParticipant_ptr
-    DDS_Topic_i::get_participant (void)
-    {
-      DDS4CCM_TRACE ("DDS_Topic_i::get_participant");
-
-      return ::DDS::DomainParticipant::_duplicate (this->dp_.in ());
-    }
-
-    DDSTopic *
-    DDS_Topic_i::get_rti_entity (void)
-    {
-      return this->rti_entity_;
-    }
-
-    void
-    DDS_Topic_i::set_rti_entity (::DDSTopic* topic)
-    {
-      this->rti_entity_ = topic;
-    }
-
-    DDSTopic *
-    DDS_Topic_i::rti_entity (void)
-    {
-      if (!this->rti_entity_)
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG,
-                        "DDS_Topic_i::rti_entity - "
-                        "Throwing BAD_INV_ORDER.\n"));
-          throw ::CORBA::BAD_INV_ORDER ();
-        }
-      return this->rti_entity_;
-      }
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Topic.h b/CIAO/connectors/dds4ccm/impl/ndds/Topic.h
deleted file mode 100644
index 1755858aa62..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/Topic.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef NDDS_TOPIC_H
-#define NDDS_TOPIC_H
-
-#include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h"
-#include "dds4ccm/idl/ndds/ndds_dcpsC.h"
-#include "tao/LocalObject.h"
-
-class DDSTopic;
-
-namespace CIAO
-{
-  namespace NDDS
-  {
-    class DDS4CCM_NDDS_Export DDS_Topic_i :
-      public virtual ::DDS::Topic,
-      public virtual ::CORBA::LocalObject
-    {
-    public:
-      /// Constructor
-      DDS_Topic_i (::DDSTopic* topic,
-                 ::DDS::DomainParticipant_ptr dp);
-
-      /// Destructor
-      virtual ~DDS_Topic_i (void);
-
-      virtual ::DDS::ReturnCode_t set_qos (const ::DDS::TopicQos & qos);
-
-      virtual ::DDS::ReturnCode_t get_qos (::DDS::TopicQos & qos);
-
-      virtual ::DDS::ReturnCode_t set_listener (
-        ::DDS::TopicListener_ptr a_listener,
-        ::DDS::StatusMask mask);
-
-      virtual ::DDS::TopicListener_ptr get_listener (void);
-
-      virtual ::DDS::ReturnCode_t get_inconsistent_topic_status (
-        ::DDS::InconsistentTopicStatus & a_status);
-
-      virtual ::DDS::ReturnCode_t enable (void);
-
-      virtual ::DDS::StatusCondition_ptr get_statuscondition (void);
-
-      virtual ::DDS::StatusMask get_status_changes (void);
-
-      virtual ::DDS::InstanceHandle_t get_instance_handle (void);
-
-      virtual char * get_type_name (void);
-
-      virtual char * get_name (void);
-
-      virtual ::DDS::DomainParticipant_ptr get_participant (void);
-
-      ::DDSTopic * get_rti_entity (void);
-
-      void set_rti_entity (::DDSTopic* topic);
-
-    private:
-      ::DDSTopic * rti_entity_;
-      ::DDS::DomainParticipant_var dp_;
-      ::DDS::TopicListener_var topic_listener_;
-
-      DDSTopic * rti_entity (void);
-    };
-  }
-}
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.cpp b/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.cpp
deleted file mode 100644
index c76c5cb99c5..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-#include "dds4ccm/impl/ndds/TopicDescription.h"
-#include "dds4ccm/impl/logger/Log_Macros.h"
-#include "ndds/ndds_cpp.h"
-
-namespace CIAO
-{
-  namespace NDDS
-  {
-    DDS_TopicDescription_i::DDS_TopicDescription_i (
-      ::DDSTopicDescription * rc,
-      ::DDS::DomainParticipant_ptr dp) :
-      rti_entity_ (rc),
-      dp_ (::DDS::DomainParticipant::_duplicate (dp))
-    {
-    }
-
-    DDS_TopicDescription_i::~DDS_TopicDescription_i (void)
-    {
-    }
-
-    char *
-    DDS_TopicDescription_i::get_type_name (void)
-    {
-      return CORBA::string_dup (this->rti_entity ()->get_type_name ());
-    }
-
-    char *
-    DDS_TopicDescription_i::get_name (void)
-    {
-      return CORBA::string_dup (this->rti_entity ()->get_name ());
-    }
-
-    ::DDS::DomainParticipant_ptr
-    DDS_TopicDescription_i::get_participant (void)
-    {
-      return ::DDS::DomainParticipant::_duplicate (this->dp_.in ());
-    }
-
-    ::DDSTopicDescription *
-    DDS_TopicDescription_i::get_rti_entity (void)
-    {
-      return this->rti_entity_;
-    }
-
-    ::DDSTopicDescription *
-    DDS_TopicDescription_i::rti_entity (void)
-    {
-      if (!this->rti_entity_)
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG,
-                        "DDS_TopicDescription_i::rti_entity - "
-                        "Throwing BAD_INV_ORDER.\n"));
-          throw ::CORBA::BAD_INV_ORDER ();
-        }
-      return this->rti_entity_;
-    }
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.h b/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.h
deleted file mode 100644
index 4fb709dcc0f..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * @author William R. Otte <wotte@dre.vanderbilt.edu>
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef TOPICDESCRIPTION_T_H_
-#define TOPICDESCRIPTION_T_H_
-
-#include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h"
-#include "dds4ccm/idl/ndds/ndds_dcpsC.h"
-#include "tao/LocalObject.h"
-
-class DDSTopicDescription;
-
-namespace CIAO
-{
-  namespace NDDS
-  {
-    class DDS4CCM_NDDS_Export DDS_TopicDescription_i :
-      public virtual ::DDS::TopicDescription,
-      public virtual ::CORBA::LocalObject
-    {
-    public:
-      /// Constructor
-      DDS_TopicDescription_i (::DDSTopicDescription * rc,
-                            ::DDS::DomainParticipant_ptr dp);
-
-      /// Destructor
-      virtual ~DDS_TopicDescription_i (void);
-
-      virtual char * get_type_name (void);
-
-      virtual char * get_name (void);
-
-      virtual ::DDS::DomainParticipant_ptr get_participant (void);
-
-      ::DDSTopicDescription * get_rti_entity (void);
-
-    private:
-      ::DDSTopicDescription * rti_entity_;
-      ::DDS::DomainParticipant_var dp_;
-
-      ::DDSTopicDescription * rti_entity (void);
-    };
-  }
-}
-
-#endif /* TOPICDESCRIPTION_T_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TopicListener.cpp b/CIAO/connectors/dds4ccm/impl/ndds/TopicListener.cpp
deleted file mode 100644
index ca8fe2b5078..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/TopicListener.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-#include "dds4ccm/impl/ndds/TopicListener.h"
-#include "dds4ccm/impl/ndds/Topic.h"
-#include "dds4ccm/impl/ndds/convertors/InconsistentTopicStatus.h"
-#include "dds4ccm/impl/logger/Log_Macros.h"
-
-namespace CIAO
-{
-  namespace NDDS
-  {
-    DDS_TopicListener_i::DDS_TopicListener_i (
-      ::DDS::Topic_ptr topic,
-      ::DDS::TopicListener_ptr topic_listener)
-      : topic_ (::DDS::Topic::_duplicate (topic)),
-        topic_listener_ (::DDS::TopicListener::_duplicate (topic_listener))
-    {
-    }
-
-    DDS_TopicListener_i::~DDS_TopicListener_i (void)
-    {
-    }
-
-    void
-    DDS_TopicListener_i::on_inconsistent_topic (
-      ::DDSTopic*,
-      const ::DDS_InconsistentTopicStatus & status)
-    {
-      DDS4CCM_TRACE ("DDS_TopicListener_i::on_inconsistent_topic");
-
-      ::DDS::InconsistentTopicStatus ddsstatus;
-      ddsstatus <<= status;
-      this->topic_listener_->on_inconsistent_topic (this->topic_.in (), ddsstatus);
-    }
-
-    void
-    DDS_TopicListener_i::set_dds_topic (::DDS::Topic_ptr topic)
-    {
-      this->topic_ = ::DDS::Topic::_duplicate (topic);
-    }
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TopicListener.h b/CIAO/connectors/dds4ccm/impl/ndds/TopicListener.h
deleted file mode 100644
index 131459e2257..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/TopicListener.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDSTOPICLISTENER_T_H_
-#define DDSTOPICLISTENER_T_H_
-
-#include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h"
-#include "dds4ccm/idl/ndds/ndds_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-
-namespace CIAO
-{
-  namespace NDDS
-  {
-    class DDS4CCM_NDDS_Export DDS_TopicListener_i :
-      public ::DDSTopicListener
-    {
-    public:
-      /// Constructor
-      DDS_TopicListener_i (::DDS::Topic_ptr topic,
-                           ::DDS::TopicListener_ptr topic_listener);
-
-      /// Destructor
-      virtual ~DDS_TopicListener_i (void);
-
-      virtual void on_inconsistent_topic(
-        ::DDSTopic* topic,
-        const ::DDS_InconsistentTopicStatus& status);
-
-      void set_dds_topic (::DDS::Topic_ptr topic);
-
-    private:
-      ::DDS::Topic_var topic_;
-      ::DDS::TopicListener_var topic_listener_;
-    };
-  }
-}
-
-#endif /* TOPICLISTENER_T_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TypeSupport.cpp b/CIAO/connectors/dds4ccm/impl/ndds/TypeSupport.cpp
deleted file mode 100644
index f743968462a..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/TypeSupport.cpp
+++ /dev/null
@@ -1,329 +0,0 @@
-#include "dds4ccm/impl/ndds/TypeSupport.h"
-
-namespace CIAO
-{
-  namespace NDDS
-  {
-    DDS_TypeFactory_i_var::DDS_TypeFactory_i_var (
-      DDS_TypeFactory_i* tf)
-      : ref_count_ (1),
-        tf_ (tf)
-    {
-      DDS4CCM_TRACE ("DDS_TypeFactory_i_var::DDS_TypeFactory_i_var");
-    }
-
-    DDS_TypeFactory_i_var::~DDS_TypeFactory_i_var (void)
-    {
-      DDS4CCM_TRACE ("DDS_TypeFactory_i_var::~DDS_TypeFactory_i_var");
-    }
-
-    DDS_TypeFactory_i*
-    DDS_TypeFactory_i_var::get_factory ()
-    {
-      DDS4CCM_TRACE ("DDS_TypeFactory_i_var::get_typefactory");
-
-      return tf_;
-    }
-
-    long
-    DDS_TypeFactory_i_var::_inc_ref ()
-    {
-      DDS4CCM_TRACE ("DDS_TypeFactory_i_var::_inc_ref");
-
-      return ++this->ref_count_;
-    }
-
-    long
-    DDS_TypeFactory_i_var::_dec_ref ()
-    {
-      DDS4CCM_TRACE ("DDS_TypeFactory_i_var::_dec_ref");
-
-      return --this->ref_count_;
-    }
-
-    std::map < ::DDS::DomainParticipant_ptr, ::CIAO::NDDS::DDS_TypeSupport_i::typefactories >
-      CIAO::NDDS::DDS_TypeSupport_i::participant_factories;
-
-    DDS_TypeFactory_i::~DDS_TypeFactory_i (void)
-    {
-    }
-
-    DDS_TypeFactory_i*
-    DDS_TypeSupport_i::get_factory_i (::DDS::DomainParticipant_ptr dp,
-                                      const char* type)
-    {
-      DDS4CCM_TRACE ("DDS_TypeSupport_i::get_factory_i");
-
-      DDS_TypeFactory_i* tfi = 0;
-      participantfactories::iterator entry = participant_factories.find(dp);
-      if (entry != participant_factories.end())
-        {
-          // We have found the domain participant, now search for a type factory
-          // within the domain participant
-          typefactories tf = entry->second;
-          typefactories::iterator it = tf.find(type);
-          if (it != tf.end())
-            {
-              tfi = it->second->get_factory ();
-            }
-        }
-
-      if (tfi)
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                        "DDS_TypeSupport_i::get_factory_i - "
-                        "A factory for domain participant <%@> of type <%C> "
-                        "has been found\n",
-                        dp,
-                        type));
-        }
-      else
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        "DDS_TypeSupport_i::get_factory_i - "
-                        "A factory for domain participant <%@> of type <%C> "
-                        "has not been found\n",
-                        dp,
-                        type));
-        }
-
-      return tfi;
-    }
-
-    bool
-    DDS_TypeSupport_i::register_type (::DDS::DomainParticipant_ptr dp,
-                                      const char* type, DDS_TypeFactory_i* f)
-    {
-      DDS4CCM_TRACE ("DDS_TypeSupport_i::register_type");
-
-      participantfactories::iterator dp_entry = participant_factories.find(dp);
-
-      if (dp_entry == participant_factories.end())
-        {
-          // The domain participant has not been found, insert the domain
-          // participant first
-          typefactories tf;
-          std::pair <participantfactories::iterator, bool> dp_ret = participant_factories.insert(
-            std::pair< ::DDS::DomainParticipant_ptr, typefactories > (dp, tf));
-          if (!dp_ret.second)
-            {
-              DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                            "DDS_TypeSupport_i::register_type - "
-                            "Unable to create new DomainParticipant entry: "
-                            "type <%C> - DomainParticipant <%@>\n",
-                            type,
-                            dp));
-              return false;
-            }
-        }
-
-      // DomainParticipant is in the list or has been added
-      dp_entry = participant_factories.find(dp);
-      typefactories tf = dp_entry->second;
-      // tf contains the list of type-factory combinations.
-      // search for the given type
-      typefactories::iterator tf_entry = tf.find(type);
-      bool retval = false;
-      if (tf_entry == tf.end())
-        {
-          // Factory not registered for specified type.
-          // Register it
-          DDS_TypeFactory_i_var *tf_var = 0;
-          ACE_NEW_RETURN (tf_var,
-                    DDS_TypeFactory_i_var (f),
-                    false);
-
-          std::pair <typefactories::iterator, bool> tf_ret =
-            tf.insert(typefactories::value_type (type, tf_var));
-          if (tf_ret.second)
-            {
-              DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                            "DDS_TypeSupport_i::register_type - "
-                            "Created new factory entry for type <%C> for participant <%@>\n",
-                            type, dp));
-              // assign the type-factory combination to the DomainParticipant entry.
-              dp_entry->second = tf;
-              retval = true;
-            }
-          else
-            {
-              DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                            "DDS_TypeSupport_i::register_type - "
-                            "Unable to create new factory entry type <%C> for participant <%@>\n",
-                            type, dp));
-              delete tf_var;
-            }
-        }
-      else
-        {
-          long const refcount = tf_entry->second->_inc_ref ();
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                        "DDS_TypeSupport_i::register_type - "
-                        "Incremented refcount to <%d> for type-factory for participant <%@> since "
-                        "it already exists for type <%C>\n",
-                        refcount, dp,
-                        type));
-        }
-      return retval;
-    }
-
-    bool
-    DDS_TypeSupport_i::unregister_type (::DDS::DomainParticipant_ptr dp,
-                                        const char* type)
-    {
-      DDS4CCM_TRACE ("DDS_TypeSupport_i::unregister_type");
-
-      bool retval = false;
-      participantfactories::iterator dp_entry = participant_factories.find(dp);
-
-      if (dp_entry != participant_factories.end())
-        {
-          // Found the domain participant
-          typefactories tf = dp_entry->second;
-          typefactories::iterator it = tf.find(type);
-          if (it != tf.end())
-            {
-              // Let us drop the refcount on the type factory, when it drops
-              // to zero we delete it
-              long const refcount = it->second->_dec_ref ();
-              retval = true;
-              if (refcount == 0)
-                {
-                  DDS_TypeFactory_i_var* f_var = it->second;
-                  tf.erase(it);
-                  dp_entry->second = tf;
-                  DDS_TypeFactory_i* f = f_var->get_factory();
-                  delete f;
-                  delete f_var;
-                  DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                                "DDS_TypeSupport_i::unregister_type - "
-                                "Deleted type factory for participant <%@> and type <%C> "
-                                "refcount dropped to zero\n",
-                                dp,
-                                type));
-                  if (tf.size () == 0UL)
-                    { // no more entries -> remove the participant from
-                      // the list
-                      participant_factories.erase(dp_entry);
-
-                      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                                    "DDS_TypeSupport_i::unregister_type - "
-                                    "Erased participant entry for participant <%@>, "
-                                    "no type factories left anymore\n",
-                                    dp));
-                    }
-                }
-              else
-                {
-                  DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
-                                "DDS_TypeSupport_i::unregister_type - "
-                                "Decremented refcount to <%d> for factory for participant <%@> and type <%C>\n",
-                                refcount,
-                                dp,
-                                type));
-                }
-            }
-          else
-            {
-              DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                            "DDS_TypeSupport_i::unregister_type - "
-                            "Could not find the correct factory belonging to participant <%@> "
-                            "and type <%C>. Unable to remove.\n",
-                            dp,
-                            type));
-            }
-        }
-      else
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        "DDS_TypeSupport_i::unregister_type - "
-                        "Could not find the entry for participant <%@>. "
-                        "Unable to remove.\n",
-                        dp));
-        }
-      return retval;
-    }
-
-    ::DDS::DataWriter_ptr
-     DDS_TypeSupport_i::create_datawriter (DDSDataWriter* dw,
-                                           ::DDS::DomainParticipant_ptr dp,
-                                           ::DDS::Publisher_ptr pub)
-    {
-      DDS4CCM_TRACE ("DDS_TypeSupport_i::create_datawriter");
-
-      const char* type = dw->get_topic ()->get_type_name();
-
-      DDS_TypeFactory_i *f = get_factory_i(dp, type);
-      if (f)
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_INFO, DDS4CCM_INFO
-                        "DDS_TypeSupport_i::create_datawriter - "
-                        "Created DDSDataWriter for type <%C> for "
-                        "participant <%@>\n", type, dp));
-
-          return f->create_datawriter (dw, dp, pub);
-        }
-      else
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        "DDS_TypeSupport_i::create_datawriter - "
-                        "Error creating DDSDataWriter for type <%C> "
-                        "for participant <%@>\n", type, dp));
-        }
-
-      return ::DDS::DataWriter::_nil ();
-    }
-
-    ::DDS::DataReader_ptr
-     DDS_TypeSupport_i::create_datareader (DDSDataReader* dr,
-                                           ::DDS::DomainParticipant_ptr dp,
-                                           ::DDS::Subscriber_ptr sub)
-    {
-      DDS4CCM_TRACE ("DDS_TypeSupport_i::create_datareader");
-
-      const char* type = dr->get_topicdescription ()->get_type_name();
-      DDS_TypeFactory_i *f = get_factory_i(dp, type);
-      if (f)
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_INFO, DDS4CCM_INFO
-                        "DDS_TypeSupport_i::create_datareader - "
-                        "Created DDSDataReader for type <%C> "
-                        "for participant <%@>\n", type, dp));
-
-          return f->create_datareader (dr, dp, sub);
-        }
-      else
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        "DDS_TypeSupport_i::create_datareader - "
-                        "Error creating DDSDataReader for type <%C> "
-                        "for participant <%@>\n", type, dp));
-        }
-
-      return ::DDS::DataReader::_nil ();
-    }
-
-    void
-    DDS_TypeSupport_i::close (void)
-    {
-      DDS4CCM_TRACE ("DDS_TypeSupport_i::close");
-
-      for(participantfactories::iterator i = participant_factories.begin();
-          i != participant_factories.end();
-          ++i)
-        {
-          typefactories tf = i->second;
-
-          for(typefactories::iterator j = tf.begin();
-              j != tf.end();
-              ++j)
-            {
-              delete j->second;
-            }
-          tf.clear();
-        }
-      participant_factories.clear ();
-    }
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TypeSupport.h b/CIAO/connectors/dds4ccm/impl/ndds/TypeSupport.h
deleted file mode 100644
index 7c685ff208e..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/TypeSupport.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/**
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * NDDS TypeSupport
- */
-
-#ifndef NDDS_TYPESUPPORT_H_
-#define NDDS_TYPESUPPORT_H_
-
-#include "dds4ccm/idl/ndds/ndds_dcpsC.h"
-#include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h"
-#include "dds4ccm/impl/ndds/DataWriter_T.h"
-#include "dds4ccm/impl/ndds/DataReader_T.h"
-
-#include <map>
-
-namespace CIAO
-{
-  namespace NDDS
-  {
-    class DDS4CCM_NDDS_Export DDS_TypeFactory_i
-    {
-    public:
-      virtual ~DDS_TypeFactory_i (void);
-      virtual DDS::DataWriter_ptr create_datawriter (DDSDataWriter* dw,
-                                                     ::DDS::DomainParticipant_ptr dp,
-                                                     ::DDS::Publisher_ptr pub) = 0;
-      virtual DDS::DataReader_ptr create_datareader (DDSDataReader* dr,
-                                                     ::DDS::DomainParticipant_ptr dp,
-                                                     ::DDS::Subscriber_ptr sub) = 0;
-    };
-
-    template <typename DDS_TYPE, typename SEQ_TYPE>
-    class DDS_TypeFactory_T : public DDS_TypeFactory_i
-    {
-    public:
-      DDS::DataWriter_ptr create_datawriter (DDSDataWriter* dw,
-                                             ::DDS::DomainParticipant_ptr dp,
-                                             ::DDS::Publisher_ptr pub)
-      {
-        typedef CIAO::NDDS::DataWriter_T<
-            typename DDS_TYPE::datawriter_type,
-            typename DDS_TYPE::typed_writer_type,
-            typename DDS_TYPE::value_type>
-          DataWriter_type;
-        return new DataWriter_type (dw, dp, pub);
-      }
-      DDS::DataReader_ptr create_datareader (DDSDataReader* dr,
-                                             ::DDS::DomainParticipant_ptr dp,
-                                             ::DDS::Subscriber_ptr sub)
-      {
-        typedef CIAO::NDDS::DataReader_T<
-            typename DDS_TYPE::datareader_type,
-            typename DDS_TYPE::typed_reader_type,
-            typename DDS_TYPE::value_type,
-            SEQ_TYPE,
-            typename DDS_TYPE::dds_seq_type>
-          DataReader_type;
-        return new DataReader_type (dr, dp, sub);
-      }
-    };
-
-    /**
-     * Helper class to administrate the type factory and how many times
-     * it has been registered
-     */
-    class DDS_TypeFactory_i_var
-    {
-      public:
-        DDS_TypeFactory_i_var (DDS_TypeFactory_i* tf);
-        ~DDS_TypeFactory_i_var (void);
-
-        DDS_TypeFactory_i* get_factory ();
-
-        /**
-         * Increments the reference count
-         */
-        long _inc_ref ();
-        /**
-         * Decrements the reference count
-         */
-        long _dec_ref ();
-
-      private:
-        long ref_count_;
-        DDS_TypeFactory_i* tf_;
-    };
-
-    class DDS4CCM_NDDS_Export DDS_TypeSupport_i
-    {
-    public:
-      /**
-        * Clears all internal maps, freeing the memory.
-        */
-      static void close (void);
-
-      /**
-        * Registering a type-factory combination per DomainParticipant.
-        * @retval false Insertions to one of the maps fails or if there's
-        * already a factory for the given type registered.
-        * @retval true Insertions succeeded
-        */
-      static bool register_type (::DDS::DomainParticipant_ptr dp,
-                                 const char* type, DDS_TypeFactory_i* factory);
-
-      /**
-        * Unregistering a type-factory combination for a specific
-        * DomainParticipant. At the moment the type factory isn't used anymore
-        * it is automatically destructed.
-        * @retval false Unregistering the type factory failed
-        * @retval true Unregistering the type factory succeeded
-        */
-      static bool unregister_type (::DDS::DomainParticipant_ptr dp,
-                                   const char* type);
-
-      /**
-        * Create a type specific datawriter
-        */
-      static ::DDS::DataWriter_ptr create_datawriter (DDSDataWriter* dw,
-                                                      ::DDS::DomainParticipant_ptr dp,
-                                                      ::DDS::Publisher_ptr pub);
-      /**
-        * Create a type specific datareader
-        */
-      static ::DDS::DataReader_ptr create_datareader (DDSDataReader* dr,
-                                                      ::DDS::DomainParticipant_ptr dp,
-                                                      ::DDS::Subscriber_ptr sub);
-    private:
-      DDS_TypeSupport_i (void);
-      ~DDS_TypeSupport_i (void);
-
-      /// Store for a specific DDS type a type factory var with its own refcount
-      typedef std::map < ACE_CString, DDS_TypeFactory_i_var* > typefactories;
-
-      /// For each domain participant we store a map with type factories for the
-      /// types that participant has
-      typedef std::map< ::DDS::DomainParticipant_ptr, typefactories > participantfactories;
-      static participantfactories participant_factories;
-
-      /**
-        * Searches for a TypeFactory, based on a type and DomainParticipant
-        */
-      static DDS_TypeFactory_i* get_factory_i (::DDS::DomainParticipant_ptr dp,
-                                               const char* type);
-    };
-  }
-}
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Utils.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Utils.cpp
deleted file mode 100644
index bcd67e3ab7e..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/Utils.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-#include "dds4ccm/impl/ndds/Utils.h"
-#include "dds4ccm/impl/logger/Log_Macros.h"
-#include "ace/Tokenizer_T.h"
-
-namespace CIAO
-{
-  namespace NDDS
-  {
-    char * get_library_name (const char * qos_profile)
-    {
-      char* buf = ACE_OS::strdup (qos_profile);
-      ACE_Tokenizer_T<char> tok (buf);
-      tok.delimiter_replace ('#', 0);
-      const char * lib_name = tok.next ();
-
-      if (lib_name == 0)
-        {
-          ACE_OS::free (buf);
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        "get_library_name <%C> - "
-                        "Error: malformed qos_profile. Expected format: "
-                        "<library_name>#<profile_name>\n",
-                        qos_profile));
-          return 0;
-        }
-
-      char * ret = ACE_OS::strdup (lib_name);
-      ACE_OS::free (buf);
-      return ret;
-    }
-
-    char * get_profile_name (const char * qos_profile)
-    {
-      char* buf = ACE_OS::strdup (qos_profile);
-      ACE_Tokenizer_T<char> tok (buf);
-      tok.delimiter_replace ('#', 0);
-      const char * lib_name = tok.next ();
-      const char * prof_name = tok.next ();
-
-      if (lib_name == 0 || prof_name == 0 || tok.next () != 0)
-        {
-          ACE_OS::free (buf);
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        "get_profile_name <%C> - "
-                        "Error: malformed qos_profile. Expected format: "
-                        "<library_name>#<profile_name>\n",
-                        qos_profile));
-          return 0;
-        }
-
-      char * ret = ACE_OS::strdup (prof_name);
-      ACE_OS::free (buf);
-      return ret;
-    }
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Utils.h b/CIAO/connectors/dds4ccm/impl/ndds/Utils.h
deleted file mode 100644
index aeb9b9a562f..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/Utils.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file Utils.h
- * @author Marcel Smit (msmit@remedy.nl)
- *
- * Misc utility classes for NDDS.
- */
-
-#ifndef NDDS_UTILS_H_
-#define NDDS_UTILS_H_
-
-#include "ace/String_Base.h"
-
-namespace CIAO
-{
-  namespace NDDS
-  {
-    char * get_library_name (const char * qos_profile);
-    char * get_profile_name (const char * qos_profile);
-  }
-}
-
-#endif /* NDDS_UTILS_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/WaitSet.cpp b/CIAO/connectors/dds4ccm/impl/ndds/WaitSet.cpp
deleted file mode 100644
index 7d3ad599c0c..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/WaitSet.cpp
+++ /dev/null
@@ -1,233 +0,0 @@
-#include "WaitSet.h"
-#include "dds4ccm/impl/ndds/Condition.h"
-#include "dds4ccm/impl/ndds/QueryCondition.h"
-#include "dds4ccm/impl/ndds/ReadCondition.h"
-#include "dds4ccm/impl/ndds/convertors/Duration_t.h"
-#include "dds4ccm/impl/ndds/convertors/InstanceHandle_t.h"
-#include "dds4ccm/impl/Utils.h"
-#include "dds4ccm/impl/logger/Log_Macros.h"
-#include "ndds/ndds_cpp.h"
-
-
-namespace CIAO
-{
-  namespace NDDS
-  {
-    DDS_WaitSet_i::DDS_WaitSet_i ()
-      : rti_entity_ (0)
-    {
-      DDS4CCM_TRACE ("DDS_WaitSet_i::DDS_WaitSet_i");
-    }
-
-    DDS_WaitSet_i::~DDS_WaitSet_i (void)
-    {
-      DDS4CCM_TRACE ("DDS_WaitSet_i::~DDS_WaitSet_i");
-
-      delete this->rti_entity_;
-    }
-
-    ::DDS::ReturnCode_t
-    DDS_WaitSet_i::wait (::DDS::ConditionSeq & active_conditions,
-                         const ::DDS::Duration_t & timeout)
-    {
-      DDS4CCM_TRACE ("DDS_WaitSet_i::wait");
-
-      DDS_Duration_t dds_timeout;
-      dds_timeout <<= timeout;
-
-      DDSConditionSeq dds_conditions;
-      DDS_ReturnCode_t const retcode =
-         this->rti_entity ()->wait (dds_conditions, dds_timeout);
-
-      this->convert_conditions (dds_conditions, active_conditions);
-
-      return retcode;
-    }
-
-    ::DDS::ReturnCode_t
-    DDS_WaitSet_i::attach_condition (::DDS::Condition_ptr cond)
-    {
-      DDS4CCM_TRACE ("DDS_WaitSet_i::attach_condition");
-
-      ::DDS::ReadCondition_var rc_cond = ::DDS::ReadCondition::_narrow (cond);
-      ::DDS::QueryCondition_var qc_cond = ::DDS::QueryCondition::_narrow (cond);
-
-      if (! ::CORBA::is_nil (qc_cond.in ()))
-        {
-          DDS_QueryCondition_i * qc_proxy =
-            dynamic_cast <DDS_QueryCondition_i *> (qc_cond.in ());
-          if (qc_proxy)
-            {
-              return this->rti_entity ()->attach_condition (qc_proxy->get_rti_entity ());
-            }
-        }
-      else if (! ::CORBA::is_nil (rc_cond.in ()))
-        {
-          DDS_ReadCondition_i * rc_proxy =
-            dynamic_cast <DDS_ReadCondition_i *> (rc_cond.in ());
-          if (rc_proxy)
-            {
-              return this->rti_entity ()->attach_condition (rc_proxy->get_rti_entity ());
-            }
-        }
-      return ::DDS::RETCODE_BAD_PARAMETER;
-    }
-
-    ::DDS::ReturnCode_t
-    DDS_WaitSet_i::detach_condition (::DDS::Condition_ptr cond)
-    {
-      DDS4CCM_TRACE ("DDS_WaitSet_i::detach_condition");
-
-      ::DDS::ReadCondition_var rc_cond = ::DDS::ReadCondition::_narrow (cond);
-      ::DDS::QueryCondition_var qc_cond = ::DDS::QueryCondition::_narrow (cond);
-
-       if (! ::CORBA::is_nil (qc_cond.in ()))
-        {
-          DDS_QueryCondition_i * qc_proxy =
-            dynamic_cast <DDS_QueryCondition_i *> (qc_cond.in ());
-          if (qc_proxy)
-            {
-              return this->rti_entity ()->detach_condition (qc_proxy->get_rti_entity ());
-            }
-        }
-      else if (! ::CORBA::is_nil (rc_cond.in ()))
-        {
-          DDS_ReadCondition_i * rc_proxy =
-            dynamic_cast <DDS_ReadCondition_i *> (rc_cond.in ());
-          if (rc_proxy)
-            {
-              return this->rti_entity ()->detach_condition (rc_proxy->get_rti_entity ());
-            }
-        }
-      DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                    "DDS_WaitSet_i::detach_condition - "
-                    "Unable to narrow the given condition to a ReadCondition "
-                    "nor a QueryCondition\n"));
-
-      return ::DDS::RETCODE_BAD_PARAMETER;
-    }
-
-    ::DDS::ReturnCode_t
-    DDS_WaitSet_i::get_conditions (::DDS::ConditionSeq & attached_conditions)
-    {
-      DDS4CCM_TRACE ("DDS_WaitSet_i::get_conditions");
-
-      DDSConditionSeq dds_seq;
-      ::DDS::ReturnCode_t const retcode =
-        this->rti_entity ()->get_conditions (dds_seq);
-
-      if (retcode != ::DDS::RETCODE_OK)
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                        "DDS_WaitSet_i::get_conditions - "
-                        "Error while calling get_conditions: <%C>\n",
-                        CIAO::DDS4CCM::translate_retcode (retcode)));
-          return retcode;
-        }
-      this->convert_conditions (dds_seq, attached_conditions);
-      return retcode;
-    }
-
-    ::DDS::InstanceHandle_t
-    DDS_WaitSet_i::check_handle (
-      const ::DDS::InstanceHandle_t & instance_handle,
-      const ::DDS::InstanceHandle_t & lookup_handle,
-      bool & error,
-      bool & non_existent)
-    {
-      ::DDS_InstanceHandle_t hnd = ::DDS_HANDLE_NIL;
-      hnd <<= instance_handle;
-
-      ::DDS_InstanceHandle_t lookup_hnd = ::DDS_HANDLE_NIL;
-      lookup_hnd <<= lookup_handle;
-
-      ::DDS::InstanceHandle_t ret = ::DDS::HANDLE_NIL;
-
-      if (!DDS_InstanceHandle_equals (&hnd, &::DDS_HANDLE_NIL) &&
-          !DDS_InstanceHandle_equals (&hnd, &lookup_hnd))
-        {
-          error = true;
-        }
-      else if (DDS_InstanceHandle_equals (&lookup_hnd, &::DDS_HANDLE_NIL))
-        {
-          non_existent = true;
-        }
-      else
-        {
-          ret <<= lookup_hnd;
-        }
-      return ret;
-    }
-
-    DDSWaitSet *
-    DDS_WaitSet_i::get_rti_entity (void)
-    {
-      return this->rti_entity_;
-    }
-
-    void
-    DDS_WaitSet_i::init (void)
-    {
-      DDS4CCM_TRACE ("DDS_WaitSet_i::init");
-      if (!this->rti_entity_)
-        {
-          ACE_NEW_THROW_EX (this->rti_entity_,
-                            DDSWaitSet (),
-                            ::CORBA::NO_MEMORY ());
-        }
-    }
-
-    void
-    DDS_WaitSet_i::convert_conditions (const DDSConditionSeq & dds_conditions,
-                                       ::DDS::ConditionSeq & conditions)
-    {
-      DDS4CCM_TRACE ("DDS_WaitSet_i::convert_conditions");
-
-      conditions.length (dds_conditions.length ());
-
-      for (DDS_Long i = 0;
-           i < dds_conditions.length();
-           ++i)
-        {
-          DDSQueryCondition * dds_qc =
-            dynamic_cast <DDSQueryCondition *> (dds_conditions[i]);
-          if (dds_qc)
-            {
-              ::DDS::QueryCondition_var cond;
-              ACE_NEW_THROW_EX (cond,
-                                DDS_QueryCondition_i (dds_qc,
-                                                      ::DDS::DataReader::_nil ()),
-                                ::CORBA::NO_MEMORY ());
-              conditions[i] = ::DDS::QueryCondition::_duplicate (cond.in ());
-            }
-          else
-            {
-              DDSReadCondition * dds_rc =
-                dynamic_cast <DDSReadCondition *> (dds_conditions[i]);
-              if (dds_rc)
-                {
-                  ::DDS::ReadCondition_var cond;
-                  ACE_NEW_THROW_EX (cond,
-                                    DDS_ReadCondition_i (dds_rc,
-                                                         ::DDS::DataReader::_nil ()),
-                                    ::CORBA::NO_MEMORY ());
-                  conditions[i] = ::DDS::ReadCondition::_duplicate (cond.in ());
-                }
-            }
-        }
-    }
-
-    DDSWaitSet *
-    DDS_WaitSet_i::rti_entity (void)
-    {
-      if (!this->rti_entity_)
-        {
-          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG,
-                        "DDS_WaitSet_i::rti_entity - "
-                        "Throwing BAD_INV_ORDER.\n"));
-          throw ::CORBA::BAD_INV_ORDER ();
-        }
-      return this->rti_entity_;
-    }
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/WaitSet.h b/CIAO/connectors/dds4ccm/impl/ndds/WaitSet.h
deleted file mode 100644
index ce9fe23d8eb..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/WaitSet.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef WAITSET_H_
-#define WAITSET_H_
-
-#include "dds4ccm/idl/ndds/ndds_dcpsC.h"
-#include "tao/LocalObject.h"
-
-#include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h"
-
-class DDSWaitSet;
-struct DDSConditionSeq;
-
-namespace CIAO
-{
-  namespace NDDS
-  {
-    /**
-      * @class DDS_WaitSet_i
-      *
-      * @brief Representative (proxy) class for the RTI waitset.
-      *
-      * Implementation of the RTI waitset functionality.
-      */
-    class DDS4CCM_NDDS_Export DDS_WaitSet_i :
-      public virtual ::DDS::WaitSet,
-      public virtual ::CORBA::LocalObject
-    {
-
-    public:
-      /// Constructor
-      DDS_WaitSet_i ();
-
-      /// Destructor
-      virtual ~DDS_WaitSet_i (void);
-
-      /**
-        * Waits for DDS until the attached read/query conditions are met
-        * or when a timeout occurs.
-        *
-        * active_conditions will contain conditions DDS has found.
-        */
-      virtual ::DDS::ReturnCode_t
-      wait (::DDS::ConditionSeq & active_conditions,
-            const ::DDS::Duration_t & timeout);
-
-      /**
-        * Attaches a condition to the waitset. 'wait' will be waiting for
-        * this condition.
-        */
-      virtual ::DDS::ReturnCode_t
-      attach_condition (::DDS::Condition_ptr cond);
-
-      /**
-        * Detaches a condition from the waitset. 'wait' won't be waiting
-        * for this condition anymore.
-        */
-      virtual ::DDS::ReturnCode_t
-      detach_condition (::DDS::Condition_ptr cond);
-
-      /**
-        * Retrieves a list of attached conditions.
-        */
-      virtual ::DDS::ReturnCode_t
-      get_conditions (::DDS::ConditionSeq & attached_conditions);
-
-      /**
-        * Returns the RTI waitset
-        */
-      DDSWaitSet * get_rti_entity (void);
-
-      /**
-        * Used in the Reader in order to check whether whether the
-        * user has supplied the correct handle with the type specific
-        * instance. See Reader_T::read_one_last and the DDS4CCM spec
-        * for more info.
-        *
-        * Checks whether two DDS-handles are equal. If no error
-        * occurs and the lookup_handle exists, this method will return
-        * the lookup_handle.
-        *
-        * @todo We actually want this method to be in the DDS4CCM
-        * connector but since we're not allowed to use RTI specific code
-        * there it's located here.
-        *
-        * 'error' will be true if instance_handle != DDS_HANDLE_NIL and
-        * when instance_handle != lookup_handle.
-        *
-        * non_existent will be true is lookup_hnd is DDS_HANDLE_NIL
-        */
-      ::DDS::InstanceHandle_t
-      check_handle (const ::DDS::InstanceHandle_t & instance_handle,
-                    const ::DDS::InstanceHandle_t & lookup_handle,
-                    bool & error,
-                    bool & non_existent);
-
-      /**
-        * Creates the RTI waitset.
-        */
-      void init (void);
-
-    private:
-      DDSWaitSet * rti_entity_;
-
-      DDSWaitSet * rti_entity ();
-
-      /**
-        * Converts the RTI condition(s) to the DDS4CCM condition(s)
-        */
-      void
-      convert_conditions (const DDSConditionSeq& dds_conditions,
-                          ::DDS::ConditionSeq & conditions);
-    };
-  }
-}
-
-#endif /* WAITSET_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/BuiltinTopicKey_t.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/BuiltinTopicKey_t.h
deleted file mode 100644
index c50f0db9717..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/BuiltinTopicKey_t.h
+++ /dev/null
@@ -1,22 +0,0 @@
-                                      /**
- * @author Marcel Smit <msmit@dre.vanderbilt.edu>
- */
-
-#ifndef BUILTINTOPICKEY_T_H_
-#define BUILTINTOPICKEY_T_H_
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-inline void
-operator<<= (::DDS::BuiltinTopicKey_t &ddsbuiltintopickey, const ::DDS_BuiltinTopicKey_t & builtintopickey)
-{
-  ACE_OS::memcpy (ddsbuiltintopickey.value, builtintopickey.value, sizeof (builtintopickey.value));
-}
-
-inline void
-operator<<= (::DDS_BuiltinTopicKey_t &ddsbuiltintopickey, const ::DDS::BuiltinTopicKey_t & builtintopickey)
-{
-  ACE_OS::memcpy (ddsbuiltintopickey.value, builtintopickey.value, sizeof (builtintopickey.value));
-}
-
-#endif /* BUILTINTOPICKEY_T_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/DataReaderQos.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/DataReaderQos.h
deleted file mode 100644
index 632bd08d8cd..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/DataReaderQos.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDS4CCM_DATAREADERQOS_H
-#define DDS4CCM_DATAREADERQOS_H
-
-#include "DurabilityQosPolicy.h"
-#include "DeadlineQosPolicy.h"
-#include "LatencyBudgetQosPolicy.h"
-#include "LivelinessQosPolicy.h"
-#include "ReliabilityQosPolicy.h"
-#include "DestinationOrderQosPolicy.h"
-#include "HistoryQosPolicy.h"
-#include "ResourceLimitsQosPolicy.h"
-#include "UserDataQosPolicy.h"
-#include "OwnershipQosPolicy.h"
-#include "TimeBasedFilterQosPolicy.h"
-#include "ReaderDataLifecycleQosPolicy.h"
-#include "DataReaderResourceLimitsQosPolicy.h"
-#include "TypeConsistencyEnforcementQosPolicy.h"
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-inline void
-operator<<= (::DDS::DataReaderQos &ddsqos, const ::DDS_DataReaderQos & qos)
-{
-  ddsqos.durability <<= qos.durability;
-  ddsqos.deadline <<= qos.deadline;
-  ddsqos.latency_budget <<= qos.latency_budget;
-  ddsqos.liveliness <<= qos.liveliness;
-  ddsqos.reliability <<= qos.reliability;
-  ddsqos.destination_order <<= qos.destination_order;
-  ddsqos.history <<= qos.history;
-  ddsqos.resource_limits <<= qos.resource_limits;
-  ddsqos.user_data <<= qos.user_data;
-  ddsqos.ownership <<= qos.ownership;
-  ddsqos.time_based_filter <<= qos.time_based_filter;
-  ddsqos.reader_data_lifecycle <<= qos.reader_data_lifecycle;
-  ddsqos.reader_resource_limits <<= qos.reader_resource_limits;
-#if defined (RTI_DDS_VERSION_MAJOR) && (RTI_DDS_VERSION_MAJOR >= 5)
-  ddsqos.type_consistency <<= qos.type_consistency;
-#endif
-}
-
-inline void
-operator<<= (::DDS_DataReaderQos &ddsqos, const ::DDS::DataReaderQos & qos)
-{
-  ddsqos.durability <<= qos.durability;
-  ddsqos.deadline <<= qos.deadline;
-  ddsqos.latency_budget <<= qos.latency_budget;
-  ddsqos.liveliness <<= qos.liveliness;
-  ddsqos.reliability <<= qos.reliability;
-  ddsqos.destination_order <<= qos.destination_order;
-  ddsqos.history <<= qos.history;
-  ddsqos.resource_limits <<= qos.resource_limits;
-  ddsqos.user_data <<= qos.user_data;
-  ddsqos.ownership <<= qos.ownership;
-  ddsqos.time_based_filter <<= qos.time_based_filter;
-  ddsqos.reader_data_lifecycle <<= qos.reader_data_lifecycle;
-  ddsqos.reader_resource_limits <<= qos.reader_resource_limits;
-#if defined (RTI_DDS_VERSION_MAJOR) && (RTI_DDS_VERSION_MAJOR >= 5)
-  ddsqos.type_consistency <<= qos.type_consistency;
-#endif
-}
-
-#endif /* DDS4CCM_DATAREADERQOS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/DataReaderResourceLimitsQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/DataReaderResourceLimitsQosPolicy.h
deleted file mode 100644
index cb1ec1f71c5..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/DataReaderResourceLimitsQosPolicy.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDS4CCM_DDS_DATAREADERRESOURCELIMITSQOSPOLICY_H
-#define DDS4CCM_DDS_DATAREADERRESOURCELIMITSQOSPOLICY_H
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-inline void
-operator<<= (::DDS::DataReaderResourceLimitsQosPolicy &ddsqos, const ::DDS_DataReaderResourceLimitsQosPolicy & qos)
-{
-  ddsqos.max_remote_writers = qos.max_remote_writers;
-  ddsqos.max_remote_writers_per_instance = qos.max_remote_writers_per_instance;
-  ddsqos.max_samples_per_remote_writer = qos.max_samples_per_remote_writer;
-  ddsqos.max_infos = qos.max_infos;
-  ddsqos.initial_remote_writers = qos.initial_remote_writers;
-  ddsqos.initial_remote_writers_per_instance = qos.initial_remote_writers_per_instance;
-  ddsqos.initial_infos = qos.initial_infos;
-  ddsqos.initial_outstanding_reads = qos.initial_outstanding_reads;
-  ddsqos.max_outstanding_reads = qos.max_outstanding_reads;
-  ddsqos.max_samples_per_read = qos.max_samples_per_read;
-  ddsqos.disable_fragmentation_support = qos.disable_fragmentation_support;
-  ddsqos.max_fragmented_samples = qos.max_fragmented_samples;
-  ddsqos.initial_fragmented_samples = qos.initial_fragmented_samples;
-  ddsqos.max_fragmented_samples_per_remote_writer = qos.max_fragmented_samples_per_remote_writer;
-  ddsqos.max_fragments_per_sample = qos.max_fragments_per_sample;
-  ddsqos.dynamically_allocate_fragmented_samples = qos.dynamically_allocate_fragmented_samples;
-  ddsqos.max_total_instances = qos.max_total_instances;
-  ddsqos.max_remote_virtual_writers_per_instance = qos.max_remote_virtual_writers_per_instance;
-  ddsqos.initial_remote_virtual_writers_per_instance = qos.initial_remote_virtual_writers_per_instance;
-  ddsqos.max_query_condition_filters = qos.max_query_condition_filters;
-}
-
-inline void
-operator<<= (::DDS_DataReaderResourceLimitsQosPolicy &ddsqos, const ::DDS::DataReaderResourceLimitsQosPolicy & qos)
-{
-  ddsqos.max_remote_writers = qos.max_remote_writers;
-  ddsqos.max_remote_writers_per_instance = qos.max_remote_writers_per_instance;
-  ddsqos.max_samples_per_remote_writer = qos.max_samples_per_remote_writer;
-  ddsqos.max_infos = qos.max_infos;
-  ddsqos.initial_remote_writers = qos.initial_remote_writers;
-  ddsqos.initial_remote_writers_per_instance = qos.initial_remote_writers_per_instance;
-  ddsqos.initial_infos = qos.initial_infos;
-  ddsqos.initial_outstanding_reads = qos.initial_outstanding_reads;
-  ddsqos.max_outstanding_reads = qos.max_outstanding_reads;
-  ddsqos.max_samples_per_read = qos.max_samples_per_read;
-  ddsqos.disable_fragmentation_support = qos.disable_fragmentation_support;
-  ddsqos.max_fragmented_samples = qos.max_fragmented_samples;
-  ddsqos.initial_fragmented_samples = qos.initial_fragmented_samples;
-  ddsqos.max_fragmented_samples_per_remote_writer = qos.max_fragmented_samples_per_remote_writer;
-  ddsqos.max_fragments_per_sample = qos.max_fragments_per_sample;
-  ddsqos.dynamically_allocate_fragmented_samples = qos.dynamically_allocate_fragmented_samples;
-  ddsqos.max_total_instances = qos.max_total_instances;
-  ddsqos.max_remote_virtual_writers_per_instance = qos.max_remote_virtual_writers_per_instance;
-  ddsqos.initial_remote_virtual_writers_per_instance = qos.initial_remote_virtual_writers_per_instance;
-  ddsqos.max_query_condition_filters = qos.max_query_condition_filters;
-}
-
-#endif /* DDS4CCM_DDS_DATAREADERRESOURCELIMITSQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/DataWriterQos.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/DataWriterQos.h
deleted file mode 100644
index a622058a597..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/DataWriterQos.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDS4CCM_DATAWRITERQOS_H
-#define DDS4CCM_DATAWRITERQOS_H
-
-#include "DurabilityQosPolicy.h"
-#include "DurabilityServiceQosPolicy.h"
-#include "DeadlineQosPolicy.h"
-#include "LatencyBudgetQosPolicy.h"
-#include "LivelinessQosPolicy.h"
-#include "ReliabilityQosPolicy.h"
-#include "DestinationOrderQosPolicy.h"
-#include "HistoryQosPolicy.h"
-#include "ResourceLimitsQosPolicy.h"
-#include "TransportPriorityQosPolicy.h"
-#include "LifespanQosPolicy.h"
-#include "UserDataQosPolicy.h"
-#include "OwnershipQosPolicy.h"
-#include "OwnershipStrengthQosPolicy.h"
-#include "WriterDataLifecycleQosPolicy.h"
-#include "DataWriterResourceLimitsQosPolicy.h"
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-inline void
-operator<<= (::DDS::DataWriterQos &ddsqos, const ::DDS_DataWriterQos & qos)
-{
-  ddsqos.durability <<= qos.durability;
-  ddsqos.durability_service <<= qos.durability_service;
-  ddsqos.deadline <<= qos.deadline;
-  ddsqos.latency_budget <<= qos.latency_budget;
-  ddsqos.liveliness <<= qos.liveliness;
-  ddsqos.reliability <<= qos.reliability;
-  ddsqos.destination_order <<= qos.destination_order;
-  ddsqos.history <<= qos.history;
-  ddsqos.resource_limits <<= qos.resource_limits;
-  ddsqos.transport_priority <<= qos.transport_priority;
-  ddsqos.lifespan <<= qos.lifespan;
-  ddsqos.user_data <<= qos.user_data;
-  ddsqos.ownership <<= qos.ownership;
-  ddsqos.ownership_strength <<= qos.ownership_strength;
-  ddsqos.writer_data_lifecycle <<= qos.writer_data_lifecycle;
-  ddsqos.writer_resource_limits <<= qos.writer_resource_limits;
-}
-
-inline void
-operator<<= (::DDS_DataWriterQos &ddsqos, const ::DDS::DataWriterQos & qos)
-{
-  ddsqos.durability <<= qos.durability;
-  ddsqos.durability_service <<= qos.durability_service;
-  ddsqos.deadline <<= qos.deadline;
-  ddsqos.latency_budget <<= qos.latency_budget;
-  ddsqos.liveliness <<= qos.liveliness;
-  ddsqos.reliability <<= qos.reliability;
-  ddsqos.destination_order <<= qos.destination_order;
-  ddsqos.history <<= qos.history;
-  ddsqos.resource_limits <<= qos.resource_limits;
-  ddsqos.transport_priority <<= qos.transport_priority;
-  ddsqos.lifespan <<= qos.lifespan;
-  ddsqos.user_data <<= qos.user_data;
-  ddsqos.ownership <<= qos.ownership;
-  ddsqos.ownership_strength <<= qos.ownership_strength;
-  ddsqos.writer_data_lifecycle <<= qos.writer_data_lifecycle;
-  ddsqos.writer_resource_limits <<= qos.writer_resource_limits;
-}
-
-#endif /* DDS4CCM_DATAWRITERQOS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/DataWriterResourceLimitsQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/DataWriterResourceLimitsQosPolicy.h
deleted file mode 100644
index 75fb46b4b5b..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/DataWriterResourceLimitsQosPolicy.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDS4CCM_DDS_DATAWRITERRESOURCELIMITSQOSPOLICY_H
-#define DDS4CCM_DDS_DATAWRITERRESOURCELIMITSQOSPOLICY_H
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-inline void
-operator<<= (::DDS::DataWriterResourceLimitsQosPolicy &ddsqos, const ::DDS_DataWriterResourceLimitsQosPolicy & qos)
-{
-  ddsqos.initial_concurrent_blocking_threads = qos.initial_concurrent_blocking_threads;
-  ddsqos.max_concurrent_blocking_threads = qos.max_concurrent_blocking_threads;
-  ddsqos.max_remote_reader_filters = qos.max_remote_reader_filters;
-  ddsqos.initial_batches = qos.initial_batches;
-  ddsqos.max_batches = qos.max_batches;
-  ddsqos.cookie_max_length = qos.cookie_max_length;
-  ddsqos.instance_replacement = static_cast < ::DDS::DataWriterResourceLimitsInstanceReplacementKind> (qos.instance_replacement);
-  ddsqos.replace_empty_instances = qos.replace_empty_instances;
-  ddsqos.autoregister_instances = qos.autoregister_instances;
-}
-
-inline void
-operator<<= (::DDS_DataWriterResourceLimitsQosPolicy &ddsqos, const ::DDS::DataWriterResourceLimitsQosPolicy & qos)
-{
-  ddsqos.initial_concurrent_blocking_threads = qos.initial_concurrent_blocking_threads;
-  ddsqos.max_concurrent_blocking_threads = qos.max_concurrent_blocking_threads;
-  ddsqos.max_remote_reader_filters = qos.max_remote_reader_filters;
-  ddsqos.initial_batches = qos.initial_batches;
-  ddsqos.max_batches = qos.max_batches;
-  ddsqos.cookie_max_length = qos.cookie_max_length;
-  ddsqos.instance_replacement = static_cast < ::DDS_DataWriterResourceLimitsInstanceReplacementKind> (qos.instance_replacement);
-  ddsqos.replace_empty_instances = qos.replace_empty_instances;
-  ddsqos.autoregister_instances = qos.autoregister_instances;
-}
-
-#endif /* DDS4CCM_DDS_DATAWRITERRESOURCELIMITSQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/DeadlineQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/DeadlineQosPolicy.h
deleted file mode 100644
index 4a2b18ab597..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/DeadlineQosPolicy.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDS4CCM_DEADLINEQOSPOLICY_H
-#define DDS4CCM_DEADLINEQOSPOLICY_H
-
-#include "Duration_t.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-inline void
-operator<<= (::DDS::DeadlineQosPolicy &ddsqos, const ::DDS_DeadlineQosPolicy & qos)
-{
-  ddsqos.period <<= qos.period;
-}
-
-inline void
-operator<<= (::DDS_DeadlineQosPolicy &ddsqos, const ::DDS::DeadlineQosPolicy & qos)
-{
-  ddsqos.period <<= qos.period;
-}
-
-#endif /* DDS4CCM_DEADLINEQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/DestinationOrderQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/DestinationOrderQosPolicy.h
deleted file mode 100644
index e20ec4770ca..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/DestinationOrderQosPolicy.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDS4CCM_DESTINATIONORDERQOSPOLICY_H
-#define DDS4CCM_DESTINATIONORDERQOSPOLICY_H
-
-#include "Duration_t.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-inline void
-operator<<= (::DDS::DestinationOrderQosPolicy &ddsqos, const ::DDS_DestinationOrderQosPolicy & qos)
-{
-  ddsqos.kind = static_cast < ::DDS::DestinationOrderQosPolicyKind> (qos.kind);
-  ddsqos.scope = static_cast < ::DDS::DestinationOrderQosPolicyScopeKind> (qos.scope);
-  ddsqos.source_timestamp_tolerance <<= qos.source_timestamp_tolerance;
-}
-
-inline void
-operator<<= (::DDS_DestinationOrderQosPolicy &ddsqos, const ::DDS::DestinationOrderQosPolicy & qos)
-{
-  ddsqos.kind = static_cast < ::DDS_DestinationOrderQosPolicyKind> (qos.kind);
-  ddsqos.scope = static_cast < ::DDS_DestinationOrderQosPolicyScopeKind> (qos.scope);
-  ddsqos.source_timestamp_tolerance <<= qos.source_timestamp_tolerance;
-}
-
-#endif /* DDS4CCM_DESTINATIONORDERQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/DomainParticipantFactoryQos.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/DomainParticipantFactoryQos.h
deleted file mode 100644
index ac7af8d7e5f..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/DomainParticipantFactoryQos.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDS4CCM_DOMAINPARTICIPANTFACTORYQOSPOLICY_H
-#define DDS4CCM_DOMAINPARTICIPANTFACTORYQOSPOLICY_H
-
-#include "EntityFactoryQosPolicy.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-inline void
-operator<<= (::DDS::DomainParticipantFactoryQos &ddsqos, const ::DDS_DomainParticipantFactoryQos & qos)
-{
-  ddsqos.entity_factory <<= qos.entity_factory;
-}
-
-inline void
-operator<<= (::DDS_DomainParticipantFactoryQos &ddsqos, const ::DDS::DomainParticipantFactoryQos & qos)
-{
-  ddsqos.entity_factory <<= qos.entity_factory;
-}
-
-#endif /* DDS4CCM_DOMAINPARTICIPANTFACTORYQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/DomainParticipantQos.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/DomainParticipantQos.h
deleted file mode 100644
index 299daad6af9..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/DomainParticipantQos.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDS4CCM_DOMAINPARTICIPANTQOSPOLICY_H
-#define DDS4CCM_DOMAINPARTICIPANTQOSPOLICY_H
-
-#include "UserDataQosPolicy.h"
-#include "EntityFactoryQosPolicy.h"
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-inline void
-operator<<= (::DDS::DomainParticipantQos &ddsqos, const ::DDS_DomainParticipantQos & qos)
-{
-  ddsqos.user_data <<= qos.user_data;
-  ddsqos.entity_factory <<= qos.entity_factory;
-}
-
-inline void
-operator<<= (::DDS_DomainParticipantQos &ddsqos, const ::DDS::DomainParticipantQos & qos)
-{
-  ddsqos.user_data <<= qos.user_data;
-  ddsqos.entity_factory <<= qos.entity_factory;
-}
-
-#endif /* DDS4CCM_DOMAINPARTICIPANTQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/DurabilityQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/DurabilityQosPolicy.h
deleted file mode 100644
index a8c114e867b..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/DurabilityQosPolicy.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDS4CCM_DURABILITYQOSPOLICY_H
-#define DDS4CCM_DURABILITYQOSPOLICY_H
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-inline void
-operator<<= (::DDS::DurabilityQosPolicy &ddsqos, const ::DDS_DurabilityQosPolicy & qos)
-{
-  ddsqos.kind = static_cast < ::DDS::DurabilityQosPolicyKind> (qos.kind);
-}
-
-inline void
-operator<<= (::DDS_DurabilityQosPolicy &ddsqos, const ::DDS::DurabilityQosPolicy & qos)
-{
-  ddsqos.kind = static_cast < ::DDS_DurabilityQosPolicyKind> (qos.kind);
-}
-
-#endif /* DDS4CCM_DURABILITYQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/DurabilityServiceQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/DurabilityServiceQosPolicy.h
deleted file mode 100644
index 4f5d6b61635..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/DurabilityServiceQosPolicy.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDS4CCM_DURABILITYSERVICEQOSPOLICY_H
-#define DDS4CCM_DURABILITYSERVICEQOSPOLICY_H
-
-#include "Duration_t.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-inline void
-operator<<= (::DDS::DurabilityServiceQosPolicy &ddsqos, const ::DDS_DurabilityServiceQosPolicy & qos)
-{
-  ddsqos.service_cleanup_delay <<= qos.service_cleanup_delay;
-  ddsqos.history_kind = static_cast < ::DDS::HistoryQosPolicyKind> (qos.history_kind);
-  ddsqos.history_depth = qos.history_depth;
-  ddsqos.max_samples = qos.max_samples;
-  ddsqos.max_instances = qos.max_instances;
-  ddsqos.max_samples_per_instance = qos.max_samples_per_instance;
-}
-
-inline void
-operator<<= (::DDS_DurabilityServiceQosPolicy &ddsqos, const ::DDS::DurabilityServiceQosPolicy & qos)
-{
-  ddsqos.service_cleanup_delay <<= qos.service_cleanup_delay;
-  ddsqos.history_kind = static_cast < ::DDS_HistoryQosPolicyKind> (qos.history_kind);
-  ddsqos.history_depth = qos.history_depth;
-  ddsqos.max_samples = qos.max_samples;
-  ddsqos.max_instances = qos.max_instances;
-  ddsqos.max_samples_per_instance = qos.max_samples_per_instance;
-}
-
-#endif /* DDS4CCM_DURABILITYSERVICEQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/Duration_t.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/Duration_t.h
deleted file mode 100644
index 72fa927d5f6..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/Duration_t.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * @author William R. Otte <wotte@dre.vanderbilt.edu>
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDS4CCM_DURATION_T_H_
-#define DDS4CCM_DURATION_T_H_
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-inline void
-operator<<= (::DDS::Duration_t &ddsduration, const ::DDS_Duration_t & duration)
-{
-  ddsduration.sec = duration.sec;
-  ddsduration.nanosec = duration.nanosec;
-}
-
-inline void
-operator<<= (::DDS_Duration_t &ddsduration, const ::DDS::Duration_t & duration)
-{
-  ddsduration.sec = duration.sec;
-  ddsduration.nanosec = duration.nanosec;
-}
-
-#endif /* DDS4CCM_DURATION_T_H_ */
-
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/EntityFactoryQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/EntityFactoryQosPolicy.h
deleted file mode 100644
index bc94bb4a1a2..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/EntityFactoryQosPolicy.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDS4CCM_ENTITYFACTORYQOSPOLICY_H
-#define DDS4CCM_ENTITYFACTORYQOSPOLICY_H
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-inline void
-operator<<= (::DDS::EntityFactoryQosPolicy &ddsqos, const ::DDS_EntityFactoryQosPolicy & qos)
-{
-  ddsqos.autoenable_created_entities = qos.autoenable_created_entities;
-}
-
-inline void
-operator<<= (::DDS_EntityFactoryQosPolicy &ddsqos, const ::DDS::EntityFactoryQosPolicy & qos)
-{
-  ddsqos.autoenable_created_entities = qos.autoenable_created_entities;
-}
-
-#endif /* DDS4CCM_ENTITYFACTORYQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/GroupDataQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/GroupDataQosPolicy.h
deleted file mode 100644
index 49f8bef51d0..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/GroupDataQosPolicy.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDS4CCM_GROUPDATAQOSPOLICY_H
-#define DDS4CCM_GROUPDATAQOSPOLICY_H
-
-#include "OctetSeq.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-inline void
-operator<<= (::DDS::GroupDataQosPolicy &ddsqos, const ::DDS_GroupDataQosPolicy & qos)
-{
-  ddsqos.value <<= qos.value;
-}
-
-inline void
-operator<<= (::DDS_GroupDataQosPolicy &ddsqos, const ::DDS::GroupDataQosPolicy & qos)
-{
-  ddsqos.value <<= qos.value;
-}
-
-#endif /* DDS4CCM_GROUPDATAQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/HistoryQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/HistoryQosPolicy.h
deleted file mode 100644
index 91f06cb5a49..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/HistoryQosPolicy.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDS4CCM_HISTORYQOSPOLICY_H
-#define DDS4CCM_HISTORYQOSPOLICY_H
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-inline void
-operator<<= (::DDS::HistoryQosPolicy &ddsqos, const ::DDS_HistoryQosPolicy & qos)
-{
-  ddsqos.kind = static_cast < ::DDS::HistoryQosPolicyKind> (qos.kind);
-  ddsqos.depth = qos.depth;
-  ddsqos.refilter = static_cast < ::DDS::RefilterQosPolicyKind> (qos.refilter);
-}
-
-inline void
-operator<<= (::DDS_HistoryQosPolicy &ddsqos, const ::DDS::HistoryQosPolicy & qos)
-{
-  ddsqos.kind = static_cast < ::DDS_HistoryQosPolicyKind> (qos.kind);
-  ddsqos.depth = qos.depth;
-  ddsqos.refilter = static_cast < ::DDS_RefilterQosPolicyKind> (qos.refilter);
-}
-
-#endif /* DDS4CCM_HISTORYQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/InconsistentTopicStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/InconsistentTopicStatus.h
deleted file mode 100644
index 5a8d6ca0f37..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/InconsistentTopicStatus.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * @author William R. Otte <wotte@dre.vanderbilt.edu>
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDS4CCM_INCONSISTENTTOPICSTATUS_H
-#define DDS4CCM_INCONSISTENTTOPICSTATUS_H
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-inline void
-operator<<= (::DDS::InconsistentTopicStatus &ddsstatus, const ::DDS_InconsistentTopicStatus & status)
-{
-  ddsstatus.total_count = status.total_count;
-  ddsstatus.total_count_change = status.total_count_change;
-}
-
-inline void
-operator<<= (::DDS_InconsistentTopicStatus &ddsstatus, const ::DDS::InconsistentTopicStatus & status)
-{
-  ddsstatus.total_count = status.total_count;
-  ddsstatus.total_count_change = status.total_count_change;
-}
-
-#endif /* DDS4CCM_INCONSISTENTTOPICSTATUS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/InstanceHandleSeq.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/InstanceHandleSeq.h
deleted file mode 100644
index 5624cbfdad4..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/InstanceHandleSeq.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * @author William R. Otte <wotte@dre.vanderbilt.edu>
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDS4CCM_INSTANCEHANDLESEQ_H
-#define DDS4CCM_INSTANCEHANDLESEQ_H
-
-#include "InstanceHandle_t.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-template <typename corbaseq, typename ddsseq>
-void convert_dds_to_corba_sequence(corbaseq & target, const ddsseq& source) {
-  target.length (source.length ());
-  for (::DDS_Long index = 0; index < source.length (); index++)
-    {
-      target[index] <<= source[index];
-    }
-}
-
-inline void
-operator<<= (::DDS::InstanceHandleSeq &ddsinstancehandleseqseq, const ::DDS_InstanceHandleSeq & instancehandleseq)
-{
-  convert_dds_to_corba_sequence (ddsinstancehandleseqseq, instancehandleseq);
-}
-
-inline void
-operator<<= (::DDS_InstanceHandleSeq &ddsinstancehandleseqseq, const ::DDS::InstanceHandleSeq & instancehandleseq)
-{
-  ddsinstancehandleseqseq.length (instancehandleseq.length ());
-  for (::DDS::InstanceHandleSeq::size_type index = 0; index < instancehandleseq.length (); index++)
-    {
-      ddsinstancehandleseqseq[index] <<= instancehandleseq[index];
-    }
-}
-
-#endif /* DDS4CCM_INSTANCEHANDLESEQ_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/InstanceHandle_t.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/InstanceHandle_t.h
deleted file mode 100644
index 3ece45658ff..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/InstanceHandle_t.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * @author William R. Otte <wotte@dre.vanderbilt.edu>
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDS4CCM_INSTANCEHANDLE_T_H_
-#define DDS4CCM_INSTANCEHANDLE_T_H_
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-#include "dds4ccm/idl/ndds/ndds_dcps_instance_handleC.h"
-
-#endif /* DDS4CCM_INSTANCEHANDLE_T_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/LatencyBudgetQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/LatencyBudgetQosPolicy.h
deleted file mode 100644
index 7d28c13774b..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/LatencyBudgetQosPolicy.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDS4CCM_LATENCYBUDGETQOSPOLICY_H
-#define DDS4CCM_LATENCYBUDGETQOSPOLICY_H
-
-#include "Duration_t.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-inline void
-operator<<= (::DDS::LatencyBudgetQosPolicy &ddsqos, const ::DDS_LatencyBudgetQosPolicy & qos)
-{
-  ddsqos.duration <<= qos.duration;
-}
-
-inline void
-operator<<= (::DDS_LatencyBudgetQosPolicy &ddsqos, const ::DDS::LatencyBudgetQosPolicy & qos)
-{
-  ddsqos.duration <<= qos.duration;
-}
-
-#endif /* DDS4CCM_LATENCYBUDGETQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/LifespanQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/LifespanQosPolicy.h
deleted file mode 100644
index a9c50b56848..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/LifespanQosPolicy.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDS4CCM_LIFESPANQOSPOLICY_H
-#define DDS4CCM_LIFESPANQOSPOLICY_H
-
-#include "Duration_t.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-inline void
-operator<<= (::DDS::LifespanQosPolicy &ddsqos, const ::DDS_LifespanQosPolicy & qos)
-{
-  ddsqos.duration <<= qos.duration;
-}
-
-inline void
-operator<<= (::DDS_LifespanQosPolicy &ddsqos, const ::DDS::LifespanQosPolicy & qos)
-{
-  ddsqos.duration <<= qos.duration;
-}
-
-#endif /* DDS4CCM_LIFESPANQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/LivelinessChangedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/LivelinessChangedStatus.h
deleted file mode 100644
index f0689c9020b..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/LivelinessChangedStatus.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * @author William R. Otte <wotte@dre.vanderbilt.edu>
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDS4CCM_LIVELINESSCHANGEDSTATUS_H
-#define DDS4CCM_LIVELINESSCHANGEDSTATUS_H
-
-#include "InstanceHandle_t.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-inline void
-operator<<= (::DDS::LivelinessChangedStatus &ddsstatus, const ::DDS_LivelinessChangedStatus & status)
-{
-  ddsstatus.alive_count = status.alive_count;
-  ddsstatus.not_alive_count = status.not_alive_count;
-  ddsstatus.alive_count_change = status.alive_count_change;
-  ddsstatus.not_alive_count_change = status.not_alive_count_change;
-  ddsstatus.last_publication_handle <<= status.last_publication_handle;
-}
-
-inline void
-operator<<= (::DDS_LivelinessChangedStatus &ddsstatus, const ::DDS::LivelinessChangedStatus & status)
-{
-  ddsstatus.alive_count = status.alive_count;
-  ddsstatus.not_alive_count = status.not_alive_count;
-  ddsstatus.alive_count_change = status.alive_count_change;
-  ddsstatus.not_alive_count_change = status.not_alive_count_change;
-  ddsstatus.last_publication_handle <<= status.last_publication_handle;
-}
-
-#endif /* DDS4CCM_LIVELINESSCHANGEDSTATUS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/LivelinessLostStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/LivelinessLostStatus.h
deleted file mode 100644
index c489af08b40..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/LivelinessLostStatus.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * @author William R. Otte <wotte@dre.vanderbilt.edu>
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDS4CCM_LIVELINESSLOSTSTATUS_H
-#define DDS4CCM_LIVELINESSLOSTSTATUS_H
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-inline void
-operator<<= (::DDS::LivelinessLostStatus &ddsstatus, const ::DDS_LivelinessLostStatus & status)
-{
-  ddsstatus.total_count = status.total_count;
-  ddsstatus.total_count_change = status.total_count_change;
-}
-
-inline void
-operator<<= (::DDS_LivelinessLostStatus &ddsstatus, const ::DDS::LivelinessLostStatus & status)
-{
-  ddsstatus.total_count = status.total_count;
-  ddsstatus.total_count_change = status.total_count_change;
-}
-
-#endif /* DDS4CCM_LIVELINESSLOSTSTATUS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/LivelinessQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/LivelinessQosPolicy.h
deleted file mode 100644
index c232c71973c..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/LivelinessQosPolicy.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDS4CCM_LIVELINESSQOSPOLICY_H
-#define DDS4CCM_LIVELINESSQOSPOLICY_H
-
-#include "Duration_t.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-inline void
-operator<<= (::DDS::LivelinessQosPolicy &ddsqos, const ::DDS_LivelinessQosPolicy & qos)
-{
-  ddsqos.kind = static_cast < ::DDS::LivelinessQosPolicyKind> (qos.kind);
-  ddsqos.lease_duration <<= qos.lease_duration;
-}
-
-inline void
-operator<<= (::DDS_LivelinessQosPolicy &ddsqos, const ::DDS::LivelinessQosPolicy & qos)
-{
-  ddsqos.kind = static_cast < ::DDS_LivelinessQosPolicyKind> (qos.kind);
-  ddsqos.lease_duration <<= qos.lease_duration;
-}
-
-#endif /* DDS4CCM_LIVELINESSQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/OctetSeq.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/OctetSeq.h
deleted file mode 100644
index 1e97618cbac..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/OctetSeq.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDS4CCM_OCTETSEQ_H
-#define DDS4CCM_OCTETSEQ_H
-
-inline void
-operator<<= (::DDS::OctetSeq &ddsseq, const ::DDS_OctetSeq & seq)
-{
-  ddsseq.length (seq.length ());
-  for (::DDS_Long i  = 0; i < seq.length (); ++i)
-    {
-      ddsseq[i] = seq[i];
-    }
-}
-
-inline void
-operator<<= (::DDS_OctetSeq &ddsseq, const ::DDS::OctetSeq & seq)
-{
-  ddsseq.length (seq.length ());
-  for (::CORBA::ULong i  = 0; i < seq.length (); ++i)
-    {
-      ddsseq[i] = seq[i];
-    }
-}
-
-#endif /* DDS4CCM_OCTETSEQ_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/OfferedDeadlineMissedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/OfferedDeadlineMissedStatus.h
deleted file mode 100644
index d5b53a4ca18..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/OfferedDeadlineMissedStatus.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * @author William R. Otte <wotte@dre.vanderbilt.edu>
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDS4CCM_OFFEREDDEADLINEMISSEDSTATUS_H
-#define DDS4CCM_OFFEREDDEADLINEMISSEDSTATUS_H
-
-#include "InstanceHandle_t.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-inline void
-operator<<= (::DDS::OfferedDeadlineMissedStatus &ddsstatus, const ::DDS_OfferedDeadlineMissedStatus & status)
-{
-  ddsstatus.total_count = status.total_count;
-  ddsstatus.total_count_change = status.total_count_change;
-  ddsstatus.last_instance_handle <<= status.last_instance_handle;
-}
-
-inline void
-operator<<= (::DDS_OfferedDeadlineMissedStatus &ddsstatus, const ::DDS::OfferedDeadlineMissedStatus & status)
-{
-  ddsstatus.total_count = status.total_count;
-  ddsstatus.total_count_change = status.total_count_change;
-  ddsstatus.last_instance_handle <<= status.last_instance_handle;
-}
-
-#endif /* DDS4CCM_OFFEREDDEADLINEMISSEDSTATUS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/OfferedIncompatibleQosStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/OfferedIncompatibleQosStatus.h
deleted file mode 100644
index 1fd24c3a002..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/OfferedIncompatibleQosStatus.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * @author William R. Otte <wotte@dre.vanderbilt.edu>
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDS4CCM_OFFEREDINCOMPATIBLEQOSSTATUS_H
-#define DDS4CCM_OFFEREDINCOMPATIBLEQOSSTATUS_H
-
-#include "QosPolicyCountSeq.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-inline void
-operator<<= (::DDS::OfferedIncompatibleQosStatus &ddsstatus, const ::DDS_OfferedIncompatibleQosStatus & status)
-{
-  ddsstatus.total_count = status.total_count;
-  ddsstatus.total_count_change = status.total_count_change;
-  ddsstatus.last_policy_id = status.last_policy_id;
-  ddsstatus.policies <<= status.policies;
-}
-
-inline void
-operator<<= (::DDS_OfferedIncompatibleQosStatus &ddsstatus, const ::DDS::OfferedIncompatibleQosStatus & status)
-{
-  ddsstatus.total_count = status.total_count;
-  ddsstatus.total_count_change = status.total_count_change;
-  ddsstatus.last_policy_id = static_cast <DDS_QosPolicyId_t>(status.last_policy_id);
-  ddsstatus.policies <<= status.policies;
-}
-
-#endif /* DDS4CCM_OFFEREDINCOMPATIBLEQOSSTATUS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/OwnershipQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/OwnershipQosPolicy.h
deleted file mode 100644
index a21e88f381e..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/OwnershipQosPolicy.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDS4CCM_OWNERSHIPQOSPOLICY_H
-#define DDS4CCM_OWNERSHIPQOSPOLICY_H
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-inline void
-operator<<= (::DDS::OwnershipQosPolicy &ddsqos, const ::DDS_OwnershipQosPolicy & qos)
-{
-  ddsqos.kind = static_cast < ::DDS::OwnershipQosPolicyKind> (qos.kind);
-}
-
-inline void
-operator<<= (::DDS_OwnershipQosPolicy &ddsqos, const ::DDS::OwnershipQosPolicy & qos)
-{
-  ddsqos.kind = static_cast < ::DDS_OwnershipQosPolicyKind> (qos.kind);
-}
-
-#endif /* DDS4CCM_OWNERSHIPQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/OwnershipStrengthQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/OwnershipStrengthQosPolicy.h
deleted file mode 100644
index f5fc5457ca0..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/OwnershipStrengthQosPolicy.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDS4CCM_OWNERSHIPSTRENGTHQOSPOLICY_H
-#define DDS4CCM_OWNERSHIPSTRENGTHQOSPOLICY_H
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-inline void
-operator<<= (::DDS::OwnershipStrengthQosPolicy &ddsqos, const ::DDS_OwnershipStrengthQosPolicy & qos)
-{
-  ddsqos.value = qos.value;
-}
-
-inline void
-operator<<= (::DDS_OwnershipStrengthQosPolicy &ddsqos, const ::DDS::OwnershipStrengthQosPolicy & qos)
-{
-  ddsqos.value = qos.value;
-}
-
-#endif /* DDS4CCM_OWNERSHIPSTRENGTHQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/ParticipantBuiltinTopicData.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/ParticipantBuiltinTopicData.h
deleted file mode 100644
index dde39e49a9b..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/ParticipantBuiltinTopicData.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef PARTICIPANTBUILTINTOPICDATA_H_
-#define PARTICIPANTBUILTINTOPICDATA_H_
-
-#include "BuiltinTopicKey_t.h"
-#include "UserDataQosPolicy.h"
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-inline void
-operator<<= (::DDS::ParticipantBuiltinTopicData &ddstopicdata, const ::DDS_ParticipantBuiltinTopicData & topicdata)
-{
-  ddstopicdata.key <<= topicdata.key;
-  ddstopicdata.user_data <<= topicdata.user_data;
-}
-
-inline void
-operator<<= (::DDS_ParticipantBuiltinTopicData & ddstopicdata, const ::DDS::ParticipantBuiltinTopicData & topicdata)
-{
-  ddstopicdata.key <<= topicdata.key;
-  ddstopicdata.user_data <<= topicdata.user_data;
-}
-
-#endif /* PARTICIPANTBUILTINTOPICDATA_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/PartitionQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/PartitionQosPolicy.h
deleted file mode 100644
index 82287c4b600..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/PartitionQosPolicy.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDS4CCM_PARTITIONQOSPOLICY_H
-#define DDS4CCM_PARTITIONQOSPOLICY_H
-
-#include "StringSeq.h"
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-inline void
-operator<<= (::DDS::PartitionQosPolicy &ddsqos, const ::DDS_PartitionQosPolicy & qos)
-{
-  ddsqos.name <<= qos.name;
-}
-
-inline void
-operator<<= (::DDS_PartitionQosPolicy &ddsqos, const ::DDS::PartitionQosPolicy & qos)
-{
-  ddsqos.name <<= qos.name;
-}
-
-#endif /* DDS4CCM_PARTITIONQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/PresentationQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/PresentationQosPolicy.h
deleted file mode 100644
index 2442e3e4fbf..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/PresentationQosPolicy.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDS4CCM_PRESENTATIONQOSPOLICY_H
-#define DDS4CCM_PRESENTATIONQOSPOLICY_H
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-inline void
-operator<<= (::DDS::PresentationQosPolicy &ddsqos, const ::DDS_PresentationQosPolicy & qos)
-{
-  ddsqos.access_scope = static_cast < ::DDS::PresentationQosPolicyAccessScopeKind> (qos.access_scope);
-  ddsqos.coherent_access = qos.coherent_access;
-  ddsqos.ordered_access = qos.ordered_access;
-}
-
-inline void
-operator<<= (::DDS_PresentationQosPolicy &ddsqos, const ::DDS::PresentationQosPolicy & qos)
-{
-  ddsqos.access_scope = static_cast < DDS_PresentationQosPolicyAccessScopeKind> (qos.access_scope);
-  ddsqos.coherent_access = qos.coherent_access;
-  ddsqos.ordered_access = qos.ordered_access;
-}
-
-#endif /* DDS4CCM_PRESENTATIONQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/PublicationBuiltinTopicData.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/PublicationBuiltinTopicData.h
deleted file mode 100644
index 69d471c64bf..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/PublicationBuiltinTopicData.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef PUBLICATIONBUILTINTOPICDATA_H_
-#define PUBLICATIONBUILTINTOPICDATA_H_
-
-#include "BuiltinTopicKey_t.h"
-#include "DurabilityQosPolicy.h"
-#include "DurabilityServiceQosPolicy.h"
-#include "DeadlineQosPolicy.h"
-#include "LatencyBudgetQosPolicy.h"
-#include "LivelinessQosPolicy.h"
-#include "ReliabilityQosPolicy.h"
-#include "LifespanQosPolicy.h"
-#include "UserDataQosPolicy.h"
-#include "OwnershipQosPolicy.h"
-#include "OwnershipStrengthQosPolicy.h"
-#include "DestinationOrderQosPolicy.h"
-#include "PresentationQosPolicy.h"
-#include "PartitionQosPolicy.h"
-#include "TopicDataQosPolicy.h"
-#include "GroupDataQosPolicy.h"
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-inline void
-operator<<= (::DDS::PublicationBuiltinTopicData &ddstopicdata, const ::DDS_PublicationBuiltinTopicData & topicdata)
-{
-  ddstopicdata.key <<= topicdata.key;
-  ddstopicdata.participant_key <<= topicdata.participant_key;
-  ddstopicdata.topic_name = topicdata.topic_name;
-  ddstopicdata.type_name = topicdata.type_name;
-  ddstopicdata.durability <<= topicdata.durability;
-  ddstopicdata.durability_service <<= topicdata.durability_service;
-  ddstopicdata.deadline <<= topicdata.deadline;
-  ddstopicdata.latency_budget <<= topicdata.latency_budget;
-  ddstopicdata.liveliness <<= topicdata.liveliness;
-  ddstopicdata.reliability <<= topicdata.reliability;
-  ddstopicdata.lifespan <<= topicdata.lifespan;
-  ddstopicdata.user_data <<= topicdata.user_data;
-  ddstopicdata.ownership <<= topicdata.ownership;
-  ddstopicdata.ownership_strength <<= topicdata.ownership_strength;
-  ddstopicdata.destination_order <<= topicdata.destination_order;
-  ddstopicdata.presentation <<= topicdata.presentation;
-  ddstopicdata.partition <<= topicdata.partition;
-  ddstopicdata.topic_data <<= topicdata.topic_data;
-  ddstopicdata.group_data <<= topicdata.group_data;
-}
-
-inline void
-operator<<= (::DDS_PublicationBuiltinTopicData & ddstopicdata, const ::DDS::PublicationBuiltinTopicData & topicdata)
-{
-  ddstopicdata.key <<= topicdata.key;
-  ddstopicdata.participant_key <<= topicdata.participant_key;
-  ddstopicdata.topic_name = CORBA::string_dup (topicdata.topic_name);
-  ddstopicdata.type_name = CORBA::string_dup (topicdata.type_name);
-  ddstopicdata.durability <<= topicdata.durability;
-  ddstopicdata.durability_service <<= topicdata.durability_service;
-  ddstopicdata.deadline <<= topicdata.deadline;
-  ddstopicdata.latency_budget <<= topicdata.latency_budget;
-  ddstopicdata.liveliness <<= topicdata.liveliness;
-  ddstopicdata.reliability <<= topicdata.reliability;
-  ddstopicdata.lifespan <<= topicdata.lifespan;
-  ddstopicdata.user_data <<= topicdata.user_data;
-  ddstopicdata.ownership <<= topicdata.ownership;
-  ddstopicdata.ownership_strength <<= topicdata.ownership_strength;
-  ddstopicdata.destination_order <<= topicdata.destination_order;
-  ddstopicdata.presentation <<= topicdata.presentation;
-  ddstopicdata.partition <<= topicdata.partition;
-  ddstopicdata.topic_data <<= topicdata.topic_data;
-  ddstopicdata.group_data <<= topicdata.group_data;
-}
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/PublicationMatchedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/PublicationMatchedStatus.h
deleted file mode 100644
index 1b6b49dbc41..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/PublicationMatchedStatus.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * @author William R. Otte <wotte@dre.vanderbilt.edu>
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDS4CCM_PUBLICATIONMATCHEDSTATUS_H
-#define DDS4CCM_PUBLICATIONMATCHEDSTATUS_H
-
-#include "InstanceHandle_t.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-inline void
-operator<<= (::DDS::PublicationMatchedStatus &ddsstatus, const ::DDS_PublicationMatchedStatus & status)
-{
-  ddsstatus.total_count = status.total_count;
-  ddsstatus.total_count_change = status.total_count_change;
-  ddsstatus.current_count = status.current_count;
-  ddsstatus.current_count_change = status.current_count_change;
-  ddsstatus.last_subscription_handle <<= status.last_subscription_handle;
-}
-
-inline void
-operator<<= (::DDS_PublicationMatchedStatus &ddsstatus, const ::DDS::PublicationMatchedStatus & status)
-{
-  ddsstatus.total_count = status.total_count;
-  ddsstatus.total_count_change = status.total_count_change;
-  ddsstatus.current_count = status.current_count;
-  ddsstatus.current_count_change = status.current_count_change;
-  ddsstatus.last_subscription_handle <<= status.last_subscription_handle;
-}
-
-#endif /* DDS4CCM_PUBLICATIONMATCHEDSTATUS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/PublisherQos.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/PublisherQos.h
deleted file mode 100644
index 471f42b3d7d..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/PublisherQos.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDS4CCM_PUBLISHERQOS_H
-#define DDS4CCM_PUBLISHERQOS_H
-
-#include "PresentationQosPolicy.h"
-#include "PartitionQosPolicy.h"
-#include "GroupDataQosPolicy.h"
-#include "EntityFactoryQosPolicy.h"
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-inline void
-operator<<= (::DDS::PublisherQos &ddsqos, const ::DDS_PublisherQos & qos)
-{
-  ddsqos.presentation <<= qos.presentation;
-  ddsqos.partition <<= qos.partition;
-  ddsqos.group_data <<= qos.group_data;
-  ddsqos.entity_factory <<= qos.entity_factory;
-}
-
-inline void
-operator<<= (::DDS_PublisherQos &ddsqos, const ::DDS::PublisherQos & qos)
-{
-  ddsqos.presentation <<= qos.presentation;
-  ddsqos.partition <<= qos.partition;
-  ddsqos.group_data <<= qos.group_data;
-  ddsqos.entity_factory <<= qos.entity_factory;
-}
-
-#endif /* DDS4CCM_PUBLISHERQOS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/QosPolicyCountSeq.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/QosPolicyCountSeq.h
deleted file mode 100644
index f53a2e7b705..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/QosPolicyCountSeq.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * @author William R. Otte <wotte@dre.vanderbilt.edu>
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDS4CCM_QOSPOLICYCOUNTSEQ_H
-#define DDS4CCM_QOSPOLICYCOUNTSEQ_H
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-inline void
-operator<<= (::DDS::QosPolicyCountSeq & ddspolicycount, const ::DDS_QosPolicyCountSeq & policycount)
-{
-  ddspolicycount.length (policycount.length ());
-  for (::DDS_Long i = 0 ; i < policycount.length (); ++i)
-    {
-      ddspolicycount[i].policy_id = policycount[i].policy_id;
-      ddspolicycount[i].count = policycount[i].count;
-    }
-}
-
-inline void
-operator<<= (::DDS_QosPolicyCountSeq & ddspolicycount, const ::DDS::QosPolicyCountSeq & policycount)
-{
-  ddspolicycount.length (policycount.length ());
-  for (::CORBA::ULong i = 0 ; i < policycount.length (); ++i)
-    {
-      ddspolicycount[i].policy_id = static_cast <DDS_QosPolicyId_t> (policycount[i].policy_id);
-      ddspolicycount[i].count = policycount[i].count;
-    }
-}
-
-#endif /* DDS4CCM_QOSPOLICYCOUNTSEQ_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/ReaderDataLifecycleQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/ReaderDataLifecycleQosPolicy.h
deleted file mode 100644
index d8c6745116d..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/ReaderDataLifecycleQosPolicy.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDS4CCM_READERDATALIFECYCLEQOSPOLICY_H
-#define DDS4CCM_READERDATALIFECYCLEQOSPOLICY_H
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-#include "Duration_t.h"
-
-inline void
-operator<<= (::DDS::ReaderDataLifecycleQosPolicy &ddsqos, const ::DDS_ReaderDataLifecycleQosPolicy & qos)
-{
-  ddsqos.autopurge_nowriter_samples_delay <<= qos.autopurge_nowriter_samples_delay;
-  ddsqos.autopurge_disposed_samples_delay <<= qos.autopurge_disposed_samples_delay;
-}
-
-inline void
-operator<<= (::DDS_ReaderDataLifecycleQosPolicy &ddsqos, const ::DDS::ReaderDataLifecycleQosPolicy & qos)
-{
-  ddsqos.autopurge_nowriter_samples_delay <<= qos.autopurge_nowriter_samples_delay;
-  ddsqos.autopurge_disposed_samples_delay <<= qos.autopurge_disposed_samples_delay;
-}
-
-#endif /* DDS4CCM_READERDATALIFECYCLEQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/ReliabilityQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/ReliabilityQosPolicy.h
deleted file mode 100644
index 536b64e2181..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/ReliabilityQosPolicy.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDS4CCM_RELIABILITYSQOSPOLICY_H
-#define DDS4CCM_RELIABILITYSQOSPOLICY_H
-
-#include "Duration_t.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-inline void
-operator<<= (::DDS::ReliabilityQosPolicy &ddsqos, const ::DDS_ReliabilityQosPolicy & qos)
-{
-  ddsqos.kind = static_cast < ::DDS::ReliabilityQosPolicyKind> (qos.kind);
-  ddsqos.max_blocking_time <<= qos.max_blocking_time;
-}
-
-inline void
-operator<<= (::DDS_ReliabilityQosPolicy &ddsqos, const ::DDS::ReliabilityQosPolicy & qos)
-{
-  ddsqos.kind = static_cast < ::DDS_ReliabilityQosPolicyKind> (qos.kind);
-  ddsqos.max_blocking_time <<= qos.max_blocking_time;
-}
-
-#endif /* DDS4CCM_RELIABILITYSQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/ReliableReaderActivityChangedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/ReliableReaderActivityChangedStatus.h
deleted file mode 100644
index 61e94abd558..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/ReliableReaderActivityChangedStatus.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDS4CCM_RELIABLEREADERACTIVITYCHANGEDSTATUS_H
-#define DDS4CCM_RELIABLEREADERACTIVITYCHANGEDSTATUS_H
-
-#include "dds4ccm/impl/ndds/convertors/InstanceHandle_t.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-inline void
-operator<<= (::DDS::ReliableReaderActivityChangedStatus &ddsstatus, const ::DDS_ReliableReaderActivityChangedStatus & status)
-{
-  ddsstatus.active_count = status.active_count;
-  ddsstatus.active_count_change = status.active_count_change;
-  ddsstatus.inactive_count = status.inactive_count;
-  ddsstatus.inactive_count_change = status.inactive_count_change;
-  ddsstatus.last_instance_handle <<= status.last_instance_handle;
-}
-
-inline void
-operator<<= (::DDS_ReliableReaderActivityChangedStatus &ddsstatus, const ::DDS::ReliableReaderActivityChangedStatus & status)
-{
-  ddsstatus.active_count = status.active_count;
-  ddsstatus.active_count_change = status.active_count_change;
-  ddsstatus.inactive_count = status.inactive_count;
-  ddsstatus.inactive_count_change = status.inactive_count_change;
-  ddsstatus.last_instance_handle <<= status.last_instance_handle;
-}
-
-#endif /* DDS4CCM_RELIABLEREADERACTIVITYCHANGEDSTATUS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/ReliableWriterCacheChangedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/ReliableWriterCacheChangedStatus.h
deleted file mode 100644
index 422bcde03aa..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/ReliableWriterCacheChangedStatus.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDS4CCM_RELIABLEWRITERCACHECHANGEDSTATUS_H
-#define DDS4CCM_RELIABLEWRITERCACHECHANGEDSTATUS_H
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-inline void
-operator<<= (::DDS::ReliableWriterCacheChangedStatus &ddsstatus, const ::DDS_ReliableWriterCacheChangedStatus & status)
-{
-  ddsstatus.empty_reliable_writer_cache.total_count = status.empty_reliable_writer_cache.total_count;
-  ddsstatus.empty_reliable_writer_cache.total_count_change = status.empty_reliable_writer_cache.total_count_change;
-  ddsstatus.full_reliable_writer_cache.total_count = status.full_reliable_writer_cache.total_count;
-  ddsstatus.full_reliable_writer_cache.total_count_change = status.full_reliable_writer_cache.total_count_change;
-  ddsstatus.low_watermark_reliable_writer_cache.total_count = status.low_watermark_reliable_writer_cache.total_count;
-  ddsstatus.low_watermark_reliable_writer_cache.total_count_change = status.low_watermark_reliable_writer_cache.total_count_change;
-  ddsstatus.high_watermark_reliable_writer_cache.total_count = status.high_watermark_reliable_writer_cache.total_count;
-  ddsstatus.high_watermark_reliable_writer_cache.total_count_change = status.high_watermark_reliable_writer_cache.total_count_change;
-  ddsstatus.unacknowledged_sample_count = status.unacknowledged_sample_count;
-  ddsstatus.unacknowledged_sample_count_peak = status.unacknowledged_sample_count_peak;
-}
-
-inline void
-operator<<= (::DDS_ReliableWriterCacheChangedStatus &ddsstatus, const ::DDS::ReliableWriterCacheChangedStatus & status)
-{
-  ddsstatus.empty_reliable_writer_cache.total_count = status.empty_reliable_writer_cache.total_count;
-  ddsstatus.empty_reliable_writer_cache.total_count_change = status.empty_reliable_writer_cache.total_count_change;
-  ddsstatus.full_reliable_writer_cache.total_count = status.full_reliable_writer_cache.total_count;
-  ddsstatus.full_reliable_writer_cache.total_count_change = status.full_reliable_writer_cache.total_count_change;
-  ddsstatus.low_watermark_reliable_writer_cache.total_count = status.low_watermark_reliable_writer_cache.total_count;
-  ddsstatus.low_watermark_reliable_writer_cache.total_count_change = status.low_watermark_reliable_writer_cache.total_count_change;
-  ddsstatus.high_watermark_reliable_writer_cache.total_count = status.high_watermark_reliable_writer_cache.total_count;
-  ddsstatus.high_watermark_reliable_writer_cache.total_count_change = status.high_watermark_reliable_writer_cache.total_count_change;
-  ddsstatus.unacknowledged_sample_count = status.unacknowledged_sample_count;
-  ddsstatus.unacknowledged_sample_count_peak = status.unacknowledged_sample_count_peak;
-}
-
-#endif /* DDS4CCM_RELIABLEWRITERCACHECHANGEDSTATUS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/RequestedDeadlineMissedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/RequestedDeadlineMissedStatus.h
deleted file mode 100644
index 991af987adb..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/RequestedDeadlineMissedStatus.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * @author William R. Otte <wotte@dre.vanderbilt.edu>
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDS4CCM_REQUESTEDDEADLINEMISSEDSTATUS_H
-#define DDS4CCM_REQUESTEDDEADLINEMISSEDSTATUS_H
-
-#include "InstanceHandle_t.h"
-
-inline void
-operator<<= (::DDS::RequestedDeadlineMissedStatus &ddsstatus, const ::DDS_RequestedDeadlineMissedStatus & status)
-{
-  ddsstatus.total_count = status.total_count;
-  ddsstatus.total_count_change = status.total_count_change;
-  ddsstatus.last_instance_handle <<= status.last_instance_handle;
-}
-
-inline void
-operator<<= (::DDS_RequestedDeadlineMissedStatus &ddsstatus, const ::DDS::RequestedDeadlineMissedStatus & status)
-{
-  ddsstatus.total_count = status.total_count;
-  ddsstatus.total_count_change = status.total_count_change;
-  ddsstatus.last_instance_handle <<= status.last_instance_handle;
-}
-
-#endif /* DDS4CCM_REQUESTEDDEADLINEMISSEDSTATUS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/RequestedIncompatibleQosStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/RequestedIncompatibleQosStatus.h
deleted file mode 100644
index 0d725e519aa..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/RequestedIncompatibleQosStatus.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * @author William R. Otte <wotte@dre.vanderbilt.edu>
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDS4CCM_REQUESTEDINCOMPATIBLEQOSSTATUS_H
-#define DDS4CCM_REQUESTEDINCOMPATIBLEQOSSTATUS_H
-
-#include "QosPolicyCountSeq.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-inline void
-operator<<= (::DDS::RequestedIncompatibleQosStatus &ddsstatus, const ::DDS_RequestedIncompatibleQosStatus & status)
-{
-  ddsstatus.total_count = status.total_count;
-  ddsstatus.total_count_change = status.total_count_change;
-  ddsstatus.last_policy_id = status.last_policy_id;
-  ddsstatus.policies <<= status.policies;
-}
-
-inline void
-operator<<= (::DDS_RequestedIncompatibleQosStatus &ddsstatus, const ::DDS::RequestedIncompatibleQosStatus & status)
-{
-  ddsstatus.total_count = status.total_count;
-  ddsstatus.total_count_change = status.total_count_change;
-  ddsstatus.last_policy_id = static_cast <DDS_QosPolicyId_t>(status.last_policy_id);
-  ddsstatus.policies <<= status.policies;
-}
-
-#endif /* DDS4CCM_REQUESTEDINCOMPATIBLEQOSSTATUS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/ResourceLimitsQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/ResourceLimitsQosPolicy.h
deleted file mode 100644
index 721dd99685a..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/ResourceLimitsQosPolicy.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDS4CCM_RESOURCELIMITSQOSPOLICY_H
-#define DDS4CCM_RESOURCELIMITSQOSPOLICY_H
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-inline void
-operator<<= (::DDS::ResourceLimitsQosPolicy &ddsqos, const ::DDS_ResourceLimitsQosPolicy & qos)
-{
-  ddsqos.max_samples = qos.max_samples;
-  ddsqos.max_instances = qos.max_instances;
-  ddsqos.max_samples_per_instance = qos.max_samples_per_instance;
-  ddsqos.initial_samples = qos.initial_samples;
-  ddsqos.initial_instances = qos.initial_instances;
-  ddsqos.instance_hash_buckets = qos.instance_hash_buckets;
-}
-
-inline void
-operator<<= (::DDS_ResourceLimitsQosPolicy &ddsqos, const ::DDS::ResourceLimitsQosPolicy & qos)
-{
-  ddsqos.max_samples = qos.max_samples;
-  ddsqos.max_instances = qos.max_instances;
-  ddsqos.max_samples_per_instance = qos.max_samples_per_instance;
-  ddsqos.initial_samples = qos.initial_samples;
-  ddsqos.initial_instances = qos.initial_instances;
-  ddsqos.instance_hash_buckets = qos.instance_hash_buckets;
-}
-
-#endif /* DDS4CCM_RESOURCELIMITSQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/SampleInfoSeq.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/SampleInfoSeq.h
deleted file mode 100644
index 3c7b697c193..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/SampleInfoSeq.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * @author William R. Otte <wotte@dre.vanderbilt.edu>
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef SAMPLEINFOSEQ_H
-#define SAMPLEINFOSEQ_H
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-#include "Time_t.h"
-#include "InstanceHandle_t.h"
-
-inline void
-operator<<= (::DDS::SampleInfo& sample_info, const ::DDS_SampleInfo& dds_sample_info)
-{
-  sample_info.sample_state = dds_sample_info.sample_state;
-  sample_info.view_state = dds_sample_info.view_state;
-  sample_info.instance_state = dds_sample_info.instance_state;
-  sample_info.source_timestamp <<= dds_sample_info.source_timestamp;
-  sample_info.instance_handle <<= dds_sample_info.instance_handle;
-  sample_info.publication_handle <<= dds_sample_info.publication_handle;
-  sample_info.disposed_generation_count = dds_sample_info.disposed_generation_count;
-  sample_info.no_writers_generation_count = dds_sample_info.no_writers_generation_count;
-  sample_info.sample_rank = dds_sample_info.sample_rank;
-  sample_info.generation_rank = dds_sample_info.generation_rank;
-  sample_info.absolute_generation_rank = dds_sample_info.absolute_generation_rank;
-  sample_info.valid_data = dds_sample_info.valid_data;
-}
-
-inline void
-operator<<= (::DDS::SampleInfoSeq &ddsinfo_seq, const ::DDS_SampleInfoSeq & info_seq)
-{
-  ddsinfo_seq.length (info_seq.length ());
-  for (::DDS_Long i = 0; i < info_seq.length (); ++i)
-    {
-      ddsinfo_seq[i] <<= info_seq[i];
-    }
-}
-
-#endif /* DDS4CCM_SAMPLELOSTSTATUS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/SampleLostStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/SampleLostStatus.h
deleted file mode 100644
index b2680e01242..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/SampleLostStatus.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * @author William R. Otte <wotte@dre.vanderbilt.edu>
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDS4CCM_SAMPLELOSTSTATUS_H
-#define DDS4CCM_SAMPLELOSTSTATUS_H
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-inline void
-operator<<= (::DDS::SampleLostStatus &ddsstatus, const ::DDS_SampleLostStatus & status)
-{
-  ddsstatus.total_count = status.total_count;
-  ddsstatus.total_count_change = status.total_count_change;
-}
-
-inline void
-operator>>= (const ::DDS_SampleLostStatus &status, ::DDS::SampleLostStatus & ddsstatus)
-{
-  ddsstatus.total_count = status.total_count;
-  ddsstatus.total_count_change = status.total_count_change;
-}
-
-#endif /* DDS4CCM_SAMPLELOSTSTATUS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/SampleRejectedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/SampleRejectedStatus.h
deleted file mode 100644
index f20f7d6d98d..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/SampleRejectedStatus.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * @author William R. Otte <wotte@dre.vanderbilt.edu>
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDS4CCM_SAMPLEREJECTEDSTATUS_H
-#define DDS4CCM_SAMPLEREJECTEDSTATUS_H
-
-#include "InstanceHandle_t.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-inline void
-operator<<= (::DDS::SampleRejectedStatus &ddsstatus, const ::DDS_SampleRejectedStatus & status)
-{
-  ddsstatus.total_count = status.total_count;
-  ddsstatus.total_count_change = status.total_count_change;
-  ddsstatus.last_reason = static_cast < ::DDS::SampleRejectedStatusKind> (status.last_reason);
-  ddsstatus.last_instance_handle <<= status.last_instance_handle;
-}
-
-inline void
-operator<<= (::DDS_SampleRejectedStatus &ddsstatus, const ::DDS::SampleRejectedStatus & status)
-{
-  ddsstatus.total_count = status.total_count;
-  ddsstatus.total_count_change = status.total_count_change;
-  ddsstatus.last_reason = static_cast < ::DDS_SampleRejectedStatusKind> (status.last_reason);
-  ddsstatus.last_instance_handle <<= status.last_instance_handle;
-}
-
-#endif /* DDS4CCM_SAMPLEREJECTEDSTATUS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/StringSeq.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/StringSeq.h
deleted file mode 100644
index 654eadca5b6..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/StringSeq.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- */
-
-#ifndef DDS4CCM_STRINGSEQ_T_H_
-#define DDS4CCM_STRINGSEQ_T_H_
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-inline void
-operator<<= (::DDS::StringSeq & string_seq, const ::DDS_StringSeq & dds_string_seq)
-{
-  string_seq.length (dds_string_seq.length ());
-  for (::DDS_Long i = 0 ; i < dds_string_seq.length(); ++i)
-    {
-      string_seq[i] = CORBA::string_dup (dds_string_seq[i]);
-    }
-}
-
-inline void
-operator<<= (::DDS_StringSeq & dds_string_seq, const ::DDS::StringSeq & string_seq)
-{
-    const char** parameterlist = new const char*[string_seq.length ()];
-
-    for (CORBA::ULong i = 0; i < string_seq.length (); ++i)
-      {
-        parameterlist[i] = string_seq[i].in ();
-      }
-    dds_string_seq.maximum(string_seq.length ());
-    dds_string_seq.length (string_seq.length ());
-    dds_string_seq.from_array (parameterlist, string_seq.length ());
-    delete [] parameterlist;
-}
-
-#endif /* DDS4CCM_STRINGSEQ_T_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/SubscriberQos.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/SubscriberQos.h
deleted file mode 100644
index 040a1ea52d8..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/SubscriberQos.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDS4CCM_SUBSCRIBERQOS_H
-#define DDS4CCM_SUBSCRIBERQOS_H
-
-#include "EntityFactoryQosPolicy.h"
-#include "GroupDataQosPolicy.h"
-#include "PartitionQosPolicy.h"
-#include "PresentationQosPolicy.h"
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-inline void
-operator<<= (::DDS::SubscriberQos &ddsqos, const ::DDS_SubscriberQos & qos)
-{
-  ddsqos.presentation <<= qos.presentation;
-  ddsqos.partition <<= qos.partition;
-  ddsqos.group_data <<= qos.group_data;
-  ddsqos.entity_factory <<= qos.entity_factory;
-}
-
-inline void
-operator<<= (::DDS_SubscriberQos &ddsqos, const ::DDS::SubscriberQos & qos)
-{
-  ddsqos.presentation <<= qos.presentation;
-  ddsqos.partition <<= qos.partition;
-  ddsqos.group_data <<= qos.group_data;
-  ddsqos.entity_factory <<= qos.entity_factory;
-}
-
-#endif /* DDS4CCM_SUBSCRIBERQOS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/SubscriptionBuiltinTopicData.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/SubscriptionBuiltinTopicData.h
deleted file mode 100644
index 4c2971970ef..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/SubscriptionBuiltinTopicData.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef SUBSCRIPTIONBUILTINTOPICDATA_H_
-#define SUBSCRIPTIONBUILTINTOPICDATA_H_
-
-#include "BuiltinTopicKey_t.h"
-#include "DurabilityQosPolicy.h"
-#include "DeadlineQosPolicy.h"
-#include "LatencyBudgetQosPolicy.h"
-#include "LivelinessQosPolicy.h"
-#include "ReliabilityQosPolicy.h"
-#include "OwnershipQosPolicy.h"
-#include "OwnershipStrengthQosPolicy.h"
-#include "DestinationOrderQosPolicy.h"
-#include "UserDataQosPolicy.h"
-#include "TimeBasedFilterQosPolicy.h"
-#include "PresentationQosPolicy.h"
-#include "PartitionQosPolicy.h"
-#include "TopicDataQosPolicy.h"
-#include "GroupDataQosPolicy.h"
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-inline void
-operator<<= (::DDS::SubscriptionBuiltinTopicData &ddstopicdata, const ::DDS_SubscriptionBuiltinTopicData & topicdata)
-{
-  ddstopicdata.key <<= topicdata.key;
-  ddstopicdata.participant_key <<= topicdata.participant_key;
-  ddstopicdata.topic_name = topicdata.topic_name;
-  ddstopicdata.type_name = topicdata.type_name;
-
-  ddstopicdata.durability <<= topicdata.durability;
-  ddstopicdata.deadline <<= topicdata.deadline;
-  ddstopicdata.latency_budget <<= topicdata.latency_budget;
-  ddstopicdata.liveliness <<= topicdata.liveliness;
-  ddstopicdata.reliability <<= topicdata.reliability;
-  ddstopicdata.ownership <<= topicdata.ownership;
-  ddstopicdata.destination_order <<= topicdata.destination_order;
-  ddstopicdata.user_data <<= topicdata.user_data;
-  ddstopicdata.time_based_filter <<= topicdata.time_based_filter;
-
-  ddstopicdata.presentation <<= topicdata.presentation;
-  ddstopicdata.partition <<= topicdata.partition;
-  ddstopicdata.topic_data <<= topicdata.topic_data;
-  ddstopicdata.group_data <<= topicdata.group_data;
-}
-
-inline void
-operator<<= (::DDS_SubscriptionBuiltinTopicData & ddstopicdata, const ::DDS::SubscriptionBuiltinTopicData & topicdata)
-{
-  ddstopicdata.key <<= topicdata.key;
-  ddstopicdata.participant_key <<= topicdata.participant_key;
-  ddstopicdata.topic_name = CORBA::string_dup (topicdata.topic_name);
-  ddstopicdata.type_name = CORBA::string_dup (topicdata.type_name);
-
-  ddstopicdata.durability <<= topicdata.durability;
-  ddstopicdata.deadline <<= topicdata.deadline;
-  ddstopicdata.latency_budget <<= topicdata.latency_budget;
-  ddstopicdata.liveliness <<= topicdata.liveliness;
-  ddstopicdata.reliability <<= topicdata.reliability;
-  ddstopicdata.ownership <<= topicdata.ownership;
-  ddstopicdata.destination_order <<= topicdata.destination_order;
-  ddstopicdata.user_data <<= topicdata.user_data;
-  ddstopicdata.time_based_filter <<= topicdata.time_based_filter;
-
-  ddstopicdata.presentation <<= topicdata.presentation;
-  ddstopicdata.partition <<= topicdata.partition;
-  ddstopicdata.topic_data <<= topicdata.topic_data;
-  ddstopicdata.group_data <<= topicdata.group_data;
-}
-
-#endif /* SUBSCRIPTIONBUILTINTOPICDATA_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/SubscriptionMatchedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/SubscriptionMatchedStatus.h
deleted file mode 100644
index 0e76d65fd04..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/SubscriptionMatchedStatus.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * @author William R. Otte <wotte@dre.vanderbilt.edu>
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDS4CCM_SUBSCRIPTIONMATCHEDSTATUS_H
-#define DDS4CCM_SUBSCRIPTIONMATCHEDSTATUS_H
-
-#include "InstanceHandle_t.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-inline void
-operator<<= (::DDS::SubscriptionMatchedStatus &ddsstatus, const ::DDS_SubscriptionMatchedStatus & status)
-{
-  ddsstatus.total_count = status.total_count;
-  ddsstatus.total_count_change = status.total_count_change;
-  ddsstatus.current_count = status.current_count;
-  ddsstatus.current_count_change = status.current_count_change;
-  ddsstatus.last_publication_handle <<= status.last_publication_handle;
-}
-
-inline void
-operator<<= (::DDS_SubscriptionMatchedStatus &ddsstatus, const ::DDS::SubscriptionMatchedStatus & status)
-{
-  ddsstatus.total_count = status.total_count;
-  ddsstatus.total_count_change = status.total_count_change;
-  ddsstatus.current_count = status.current_count;
-  ddsstatus.current_count_change = status.current_count_change;
-  ddsstatus.last_publication_handle <<= status.last_publication_handle;
-}
-
-#endif /* DDS4CCM_SUBSCRIPTIONMATCHEDSTATUS_H */
-
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/TimeBasedFilterQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/TimeBasedFilterQosPolicy.h
deleted file mode 100644
index b17d84af9a8..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/TimeBasedFilterQosPolicy.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDS4CCM_TIMEBASEDFILTERQOSPOLICY_H
-#define DDS4CCM_TIMEBASEDFILTERQOSPOLICY_H
-
-#include "Duration_t.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-inline void
-operator<<= (::DDS::TimeBasedFilterQosPolicy &ddsqos, const ::DDS_TimeBasedFilterQosPolicy & qos)
-{
-  ddsqos.minimum_separation <<= qos.minimum_separation;
-}
-
-inline void
-operator<<= (::DDS_TimeBasedFilterQosPolicy &ddsqos, const ::DDS::TimeBasedFilterQosPolicy & qos)
-{
-  ddsqos.minimum_separation <<= qos.minimum_separation;
-}
-
-#endif /* DDS4CCM_TIMEBASEDFILTERQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/Time_t.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/Time_t.h
deleted file mode 100644
index c768756e3fa..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/Time_t.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * @author William R. Otte <wotte@dre.vanderbilt.edu>
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDS4CCM_TIME_T_H_
-#define DDS4CCM_TIME_T_H_
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-inline void
-operator<<= (::DDS::Time_t &ddstime, const ::DDS_Time_t & time)
-{
-  ddstime.sec = time.sec;
-  ddstime.nanosec = time.nanosec;
-}
-
-inline void
-operator<<= (::DDS_Time_t &ddstime, const ::DDS::Time_t & time)
-{
-  ddstime.sec = time.sec;
-  ddstime.nanosec = time.nanosec;
-}
-
-#endif /* DDS4CCM_TIME_T_H_ */
-
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/TopicBuiltinTopicData.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/TopicBuiltinTopicData.h
deleted file mode 100644
index eeea382b1ab..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/TopicBuiltinTopicData.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef TOPICBUILTINTOPICDATA_H_
-#define TOPICBUILTINTOPICDATA_H_
-
-#include "BuiltinTopicKey_t.h"
-#include "DurabilityQosPolicy.h"
-#include "DurabilityServiceQosPolicy.h"
-#include "DeadlineQosPolicy.h"
-#include "LatencyBudgetQosPolicy.h"
-#include "LivelinessQosPolicy.h"
-#include "ReliabilityQosPolicy.h"
-#include "TransportPriorityQosPolicy.h"
-#include "LifespanQosPolicy.h"
-#include "DestinationOrderQosPolicy.h"
-#include "HistoryQosPolicy.h"
-#include "ResourceLimitsQosPolicy.h"
-#include "TopicDataQosPolicy.h"
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-inline void
-operator<<= (::DDS::TopicBuiltinTopicData &ddstopicdata, const ::DDS_TopicBuiltinTopicData & topicdata)
-{
-  ddstopicdata.key <<= topicdata.key;
-  ddstopicdata.name = topicdata.name;
-  ddstopicdata.type_name = topicdata.type_name;
-  ddstopicdata.durability <<= topicdata.durability;
-  ddstopicdata.durability_service <<= topicdata.durability_service;
-  ddstopicdata.deadline <<= topicdata.deadline;
-  ddstopicdata.latency_budget <<= topicdata.latency_budget;
-  ddstopicdata.liveliness <<= topicdata.liveliness;
-  ddstopicdata.reliability <<= topicdata.reliability;
-  ddstopicdata.transport_priority <<= topicdata.transport_priority;
-  ddstopicdata.lifespan <<= topicdata.lifespan;
-  ddstopicdata.destination_order <<= topicdata.destination_order;
-  ddstopicdata.history <<= topicdata.history;
-  ddstopicdata.resource_limits <<= topicdata.resource_limits;
-  ddstopicdata.ownership <<= topicdata.ownership;
-  ddstopicdata.topic_data <<= topicdata.topic_data;
-}
-
-inline void
-operator<<= (::DDS_TopicBuiltinTopicData & ddstopicdata, const ::DDS::TopicBuiltinTopicData & topicdata)
-{
-  ddstopicdata.key <<= topicdata.key;
-  ddstopicdata.name = CORBA::string_dup (topicdata.name);
-  ddstopicdata.type_name = CORBA::string_dup (topicdata.type_name);
-  ddstopicdata.durability <<= topicdata.durability;
-  ddstopicdata.durability_service <<= topicdata.durability_service;
-  ddstopicdata.deadline <<= topicdata.deadline;
-  ddstopicdata.latency_budget <<= topicdata.latency_budget;
-  ddstopicdata.liveliness <<= topicdata.liveliness;
-  ddstopicdata.reliability <<= topicdata.reliability;
-  ddstopicdata.transport_priority <<= topicdata.transport_priority;
-  ddstopicdata.lifespan <<= topicdata.lifespan;
-  ddstopicdata.destination_order <<= topicdata.destination_order;
-  ddstopicdata.history <<= topicdata.history;
-  ddstopicdata.resource_limits <<= topicdata.resource_limits;
-  ddstopicdata.ownership <<= topicdata.ownership;
-  ddstopicdata.topic_data <<= topicdata.topic_data;
-}
-
-#endif /* TOPICBUILTINTOPICDATA_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/TopicDataQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/TopicDataQosPolicy.h
deleted file mode 100644
index 382d6e4b11b..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/TopicDataQosPolicy.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDS4CCM_TOPICDATAQOSPOLICY_H
-#define DDS4CCM_TOPICDATAQOSPOLICY_H
-
-#include "OctetSeq.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-inline void
-operator<<= (::DDS::TopicDataQosPolicy &ddsqos, const ::DDS_TopicDataQosPolicy & qos)
-{
-  ddsqos.value <<= qos.value;
-}
-
-inline void
-operator<<= (::DDS_TopicDataQosPolicy &ddsqos, const ::DDS::TopicDataQosPolicy & qos)
-{
-  ddsqos.value <<= qos.value;
-}
-
-#endif /* DDS4CCM_TOPICDATAQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/TopicQos.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/TopicQos.h
deleted file mode 100644
index 67a1c5d878e..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/TopicQos.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDS4CCM_TOPICQOS_H
-#define DDS4CCM_TOPICQOS_H
-
-#include "TopicDataQosPolicy.h"
-#include "DurabilityQosPolicy.h"
-#include "DurabilityServiceQosPolicy.h"
-#include "DeadlineQosPolicy.h"
-#include "LatencyBudgetQosPolicy.h"
-#include "LivelinessQosPolicy.h"
-#include "ReliabilityQosPolicy.h"
-#include "DestinationOrderQosPolicy.h"
-#include "HistoryQosPolicy.h"
-#include "ResourceLimitsQosPolicy.h"
-#include "TransportPriorityQosPolicy.h"
-#include "LifespanQosPolicy.h"
-#include "OwnershipQosPolicy.h"
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-inline void
-operator<<= (::DDS::TopicQos &ddsqos, const ::DDS_TopicQos & qos)
-{
-  ddsqos.topic_data <<= qos.topic_data;
-  ddsqos.durability <<= qos.durability;
-  ddsqos.durability_service <<= qos.durability_service;
-  ddsqos.deadline <<= qos.deadline;
-  ddsqos.latency_budget <<= qos.latency_budget;
-  ddsqos.liveliness <<= qos.liveliness;
-  ddsqos.reliability <<= qos.reliability;
-  ddsqos.destination_order <<= qos.destination_order;
-  ddsqos.history <<= qos.history;
-  ddsqos.resource_limits <<= qos.resource_limits;
-  ddsqos.transport_priority <<= qos.transport_priority;
-  ddsqos.lifespan <<= qos.lifespan;
-  ddsqos.ownership <<= qos.ownership;
-}
-
-inline void
-operator<<= (::DDS_TopicQos &ddsqos, const ::DDS::TopicQos & qos)
-{
-  ddsqos.topic_data <<= qos.topic_data;
-  ddsqos.durability <<= qos.durability;
-  ddsqos.durability_service <<= qos.durability_service;
-  ddsqos.deadline <<= qos.deadline;
-  ddsqos.latency_budget <<= qos.latency_budget;
-  ddsqos.liveliness <<= qos.liveliness;
-  ddsqos.reliability <<= qos.reliability;
-  ddsqos.destination_order <<= qos.destination_order;
-  ddsqos.history <<= qos.history;
-  ddsqos.resource_limits <<= qos.resource_limits;
-  ddsqos.transport_priority <<= qos.transport_priority;
-  ddsqos.lifespan <<= qos.lifespan;
-  ddsqos.ownership <<= qos.ownership;
-}
-
-#endif /* DDS4CCM_TOPICQOS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/TransportPriorityQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/TransportPriorityQosPolicy.h
deleted file mode 100644
index 90a0535afe6..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/TransportPriorityQosPolicy.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDS4CCM_TRANSPORTPRIOTITYQOSPOLICY_H
-#define DDS4CCM_TRANSPORTPRIOTITYQOSPOLICY_H
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-inline void
-operator<<= (::DDS::TransportPriorityQosPolicy &ddsqos, const ::DDS_TransportPriorityQosPolicy & qos)
-{
-  ddsqos.value = qos.value;
-}
-
-inline void
-operator<<= (::DDS_TransportPriorityQosPolicy &ddsqos, const ::DDS::TransportPriorityQosPolicy & qos)
-{
-  ddsqos.value = qos.value;
-}
-
-#endif /* DDS4CCM_TRANSPORTPRIOTITYQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/TypeConsistencyEnforcementQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/TypeConsistencyEnforcementQosPolicy.h
deleted file mode 100644
index f34528ddea3..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/TypeConsistencyEnforcementQosPolicy.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDS4CCM_TYPECONSISTENCYENFORCEMENTQOSPOLICY_H
-#define DDS4CCM_TYPECONSISTENCYENFORCEMENTQOSPOLICY_H
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-#if defined (RTI_DDS_VERSION_MAJOR) && (RTI_DDS_VERSION_MAJOR >= 5)
-
-inline void
-operator<<= (::DDS::TypeConsistencyEnforcementQosPolicy &ddsqos, const ::DDS_TypeConsistencyEnforcementQosPolicy & qos)
-{
-  ddsqos.kind = static_cast < ::DDS::TypeConsistencyKind> (qos.kind);
-}
-
-inline void
-operator<<= (::DDS_TypeConsistencyEnforcementQosPolicy &ddsqos, const ::DDS::TypeConsistencyEnforcementQosPolicy & qos)
-{
-  ddsqos.kind = static_cast < ::DDS_TypeConsistencyKind> (qos.kind);
-}
-
-#endif
-
-#endif /* DDS4CCM_TYPECONSISTENCYENFORCEMENTQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/UserDataQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/UserDataQosPolicy.h
deleted file mode 100644
index 6b5a141f76f..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/UserDataQosPolicy.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDS4CCM_USERDATAQOSPOLICY_H
-#define DDS4CCM_USERDATAQOSPOLICY_H
-
-#include "OctetSeq.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-inline void
-operator<<= (::DDS::UserDataQosPolicy &ddsqos, const ::DDS_UserDataQosPolicy & qos)
-{
-  ddsqos.value <<= qos.value;
-}
-
-inline void
-operator<<= (::DDS_UserDataQosPolicy &ddsqos, const ::DDS::UserDataQosPolicy & qos)
-{
-  ddsqos.value <<= qos.value;
-}
-
-#endif /* DDS4CCM_USERDATAQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/WriterDataLifecycleQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/WriterDataLifecycleQosPolicy.h
deleted file mode 100644
index 6c4133555c1..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/WriterDataLifecycleQosPolicy.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @author Johnny Willemsen (jwillemsen@remedy.nl)
- *
- * Wrapper facade for NDDS.
- */
-
-#ifndef DDS4CCM_WRITERDATALIFECYCLEQOSPOLICY_H
-#define DDS4CCM_WRITERDATALIFECYCLEQOSPOLICY_H
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-inline void
-operator<<= (::DDS::WriterDataLifecycleQosPolicy &ddsqos, const ::DDS_WriterDataLifecycleQosPolicy & qos)
-{
-  ddsqos.autodispose_unregistered_instances = qos.autodispose_unregistered_instances;
-}
-
-inline void
-operator<<= (::DDS_WriterDataLifecycleQosPolicy &ddsqos, const ::DDS::WriterDataLifecycleQosPolicy & qos)
-{
-  ddsqos.autodispose_unregistered_instances = qos.autodispose_unregistered_instances;
-}
-
-#endif /* DDS4CCM_WRITERDATALIFECYCLEQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/dds4ccm_ndds_export.h b/CIAO/connectors/dds4ccm/impl/ndds/dds4ccm_ndds_export.h
deleted file mode 100644
index 19c64d6198c..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/dds4ccm_ndds_export.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// -*- C++ -*-
-// Definition for Win32 Export directives.
-// ------------------------------
-#ifndef DDS4CCM_DDS_NDDS_EXPORT_H
-#define DDS4CCM_DDS_NDDS_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (DDS4CCM_NDDS_HAS_DLL)
-#  define DDS4CCM_NDDS_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && DDS4CCM_NDDS_HAS_DLL */
-
-#if !defined (DDS4CCM_NDDS_HAS_DLL)
-#  define DDS4CCM_NDDS_HAS_DLL 1
-#endif /* ! DDS4CCM_NDDS_HAS_DLL */
-
-#if defined (DDS4CCM_NDDS_HAS_DLL) && (DDS4CCM_NDDS_HAS_DLL == 1)
-#  if defined (DDS4CCM_DDS_NDDS_BUILD_DLL)
-#    define DDS4CCM_NDDS_Export ACE_Proper_Export_Flag
-#    define DDS4CCM_NDDS_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define DDS4CCM_DDS_NDDS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* DDS4CCM_DDS_NDDS_BUILD_DLL */
-#    define DDS4CCM_NDDS_Export ACE_Proper_Import_Flag
-#    define DDS4CCM_NDDS_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define DDS4CCM_DDS_NDDS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* DDS4CCM_DDS_NDDS_BUILD_DLL */
-#else /* DDS4CCM_NDDS_HAS_DLL == 1 */
-#  define DDS4CCM_NDDS_Export
-#  define DDS4CCM_NDDS_SINGLETON_DECLARATION(T)
-#  define DDS4CCM_DDS_NDDS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* DDS4CCM_NDDS_HAS_DLL == 1 */
-
-#endif /* DDS4CCM_DDS_NDDS_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ndds_idltocpp.mpc b/CIAO/connectors/dds4ccm/impl/ndds/ndds_idltocpp.mpc
deleted file mode 100644
index 0bf92524d97..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/ndds_idltocpp.mpc
+++ /dev/null
@@ -1,40 +0,0 @@
-// -*- MPC -*-
-project(CIAO_DDS4CCM_DDS_NDDS) : install, ndds_idltocpp_stub, taolib, \
-                                 ciao_output, dds4ccm_logger, nddslib {
-
-  dynamicflags += DDS4CCM_DDS_NDDS_BUILD_DLL
-  macros += BUILDING_DDS_NDDS_LIB
-  Header_Files {
-    *.h
-    convertors/*.h
-  }
-
-  Source_Files {
-    Condition.cpp
-    ContentFilteredTopic.cpp
-    DataReader.cpp
-    DataReaderListener.cpp
-    DataWriter.cpp
-    DataWriterListener.cpp
-    DomainParticipant.cpp
-    DomainParticipantFactory.cpp
-    DomainParticipantListener.cpp
-    Publisher.cpp
-    PublisherListener.cpp
-    QueryCondition.cpp
-    ReadCondition.cpp
-    StatusCondition.cpp
-    Subscriber.cpp
-    SubscriberListener.cpp
-    Topic.cpp
-    TopicDescription.cpp
-    TopicListener.cpp
-    TypeSupport.cpp
-    WaitSet.cpp
-    Utils.cpp
-  }
-
-  specific {
-    install_dir = connectors/dds4ccm/impl/ndds
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/models/README b/CIAO/connectors/dds4ccm/models/README
deleted file mode 100644
index 422e7a46dea..00000000000
--- a/CIAO/connectors/dds4ccm/models/README
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-In order to use dds4ccm correctly, you must first create a PICML
-model of the dds4ccm IDL files that can be used as a GME library
-(called a PICML library from this point forward) for an project
-that uses dds4ccm. The PICML library for dds4ccm needs to be created
-only once and each time the IDL changes. To create the dds4ccm
-PICML library, please execute steps:
-
-%> cd $CIAO_ROOT
-%> idl_to_picml -x dds4ccm -r connectors/dds4ccm/idl
-%> mv dds4ccm.xme connectors/dds4ccm/models
diff --git a/CIAO/connectors/dds4ccm/models/dds4ccm.xme b/CIAO/connectors/dds4ccm/models/dds4ccm.xme
deleted file mode 100644
index cacf7404132..00000000000
--- a/CIAO/connectors/dds4ccm/models/dds4ccm.xme
+++ /dev/null
@@ -1,17214 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<!DOCTYPE project SYSTEM "mga.dtd">
-<project cdate="Sun Jun 20 00:46:17 2010" guid="{EF0AF5A8-FB8B-4D32-850A-2D7905C4B237}" mdate="Fri Aug 13 2:01:33 2010" metaguid="{48EC511C-4041-4EDC-8D6A-E4867FB8EC68}" metaname="PICML" metaversion="" version="">
-
-  <name>dds4ccm</name>
-
-  <comment/>
-
-  <author/>
-
-  <folder childrelidcntr="0x4" guid="{dcf2ae2f-94b5-41a4-8798-28318fff8fb8}" id="id-006a-00000001" kind="RootFolder" relid="0x1">
-    <name>dds4ccm</name>
-    <folder childrelidcntr="0x12" guid="{6d852a9e-1977-4a6a-8943-64c549a2db8b}" id="id-006a-00000002" kind="InterfaceDefinitions" relid="0x0">
-      <name>InterfaceDefinitions</name>
-      <model childrelidcntr="0x1" guid="{c15ffee3-4e42-4415-b8d3-2c6eb6f273bb}" id="id-0065-00000001" kind="File" relid="0x0">
-        <name>ccm_dds</name>
-        <attribute kind="Path">
-          <value>connectors/dds4ccm/idl</value>
-        </attribute>
-        <attribute kind="PostPreprocessorDirectives" status="meta">
-          <value/>
-        </attribute>
-        <attribute kind="PrePreprocessorDirectives" status="meta">
-          <value/>
-        </attribute>
-        <attribute kind="PrefixTag" status="meta">
-          <value/>
-        </attribute>
-        <model childrelidcntr="0x1" guid="{34a2a80d-dd8a-4ebf-9e5d-3eedeef2764d}" id="id-0065-00000002" kind="Package" relid="0x0" role="Package">
-          <name>CCM_DDS</name>
-          <attribute kind="PostPreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrePreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrefixTag" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="SpecifyIdTag" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="VersionTag" status="meta">
-            <value/>
-          </attribute>
-          <model childrelidcntr="0x10" guid="{973858e2-a3a5-47b4-84b6-7dccd553eafe}" id="id-0065-00000003" kind="Package" relid="0x0" role="Package">
-            <name>Typed</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrefixTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <model childrelidcntr="0x2" guid="{31f0e62f-0265-4cf5-b71d-5990577117be}" id="id-0065-00000004" kind="Object" relid="0x1" role="Object">
-              <name>InstanceHandleManager</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{92ba42fc-d09f-4927-b1cf-1e3ffa873740}" id="id-0065-00000005" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>register_instance</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{a4ab3f39-b211-43b3-83d9-4fcfedf38985}" id="id-0067-00000002" kind="InParameter" referred="id-0066-00000001" relid="0x0" role="InParameter">
-                  <name>datum</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{74c76ece-44ea-43ef-ba15-87a7d8f07e97}" id="id-0067-00000169" kind="ReturnType" referred="id-0067-00000167" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{fd5c661f-a1b2-4762-9415-bbdf2d17fce7}" id="id-0067-0000016a" kind="ExceptionRef" referred="id-0065-0000003c" relid="0x0" role="ExceptionRef">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{45fd16b9-8789-4bf2-b463-9fdb00d2c384}" id="id-0065-00000006" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                <name>unregister_instance</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{ac8c14ed-8e35-425b-8cf2-a6f5ba489e97}" id="id-0067-00000003" kind="InParameter" referred="id-0066-00000001" relid="0x0" role="InParameter">
-                  <name>datum</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{684865be-9ec3-4cf2-800c-def69ba0ecc5}" id="id-0067-0000016b" kind="InParameter" referred="id-0067-00000167" relid="0x0" role="InParameter">
-                  <name>instance_handle</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{9075612e-91a1-421c-9bee-841dd0fffe72}" id="id-0067-0000016c" kind="ExceptionRef" referred="id-0065-0000003c" relid="0x0" role="ExceptionRef">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-            </model>
-            <model childrelidcntr="0x4" guid="{6354d461-c223-4732-a44a-6994bbc2400c}" id="id-0065-00000007" kind="Object" relid="0x2" role="Object">
-              <name>Writer</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{762b9f68-9fca-4e2d-bf86-c03de77cdad1}" id="id-0065-00000008" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>write_one</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{39d3f530-7b40-40a5-a378-2c0859e5308e}" id="id-0067-00000004" kind="InParameter" referred="id-0066-00000001" relid="0x0" role="InParameter">
-                  <name>datum</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{1c7934af-9cce-4084-9f1a-e2fa632bde07}" id="id-0067-0000016d" kind="InParameter" referred="id-0067-00000167" relid="0x0" role="InParameter">
-                  <name>instance_handle</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{3848e2f2-a990-45be-a164-14edae3f0ec0}" id="id-0067-0000016e" kind="ExceptionRef" referred="id-0065-0000003c" relid="0x0" role="ExceptionRef">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{fc0a0deb-7c8b-45d9-ac99-98465ecc30e7}" id="id-0065-00000009" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                <name>write_many</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{b96601ec-2773-418a-8d88-4ccb0a1e455e}" id="id-0067-00000005" kind="InParameter" referred="id-0067-00000001" relid="0x0" role="InParameter">
-                  <name>data</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{47f91bb8-abf7-4b0d-a96c-00d0379e9636}" id="id-0067-0000016f" kind="ExceptionRef" referred="id-0065-0000003c" relid="0x0" role="ExceptionRef">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{325bb065-4fba-4e0b-b9cd-e71d659f8c91}" id="id-0065-0000000a" kind="Attribute" relid="0x2" role="Attribute">
-                <name>is_coherent_write</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{dcaf8484-6535-4f33-882f-fae5f083fbc8}" id="id-0067-00000170" kind="AttributeMember" referred="id-0066-00000023" relid="0x0" role="AttributeMember">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <reference guid="{7f8ce04c-e7fa-4476-8cda-4f3917f455dc}" id="id-0067-00000006" kind="Inherits" referred="id-0065-00000004" relid="0x3" role="Inherits">
-                <name>Inherits</name>
-              </reference>
-            </model>
-            <model childrelidcntr="0x9" guid="{66f2b8ec-262f-4de9-8f85-47d751509c36}" id="id-0065-0000000b" kind="Object" relid="0x3" role="Object">
-              <name>Updater</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{6cb43fd0-0169-4d67-b9c6-824a1f499f8e}" id="id-0065-0000000c" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>create_one</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{38e44026-f094-4559-9f59-4866d65c2e57}" id="id-0067-00000007" kind="InParameter" referred="id-0066-00000001" relid="0x0" role="InParameter">
-                  <name>datum</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{1cd4fb1d-7e9b-48c2-b941-cd533753fc27}" id="id-0067-00000171" kind="ExceptionRef" referred="id-0065-0000003a" relid="0x0" role="ExceptionRef">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{7864288f-9093-48f9-bb10-60ebe95e73ca}" id="id-0067-00000172" kind="ExceptionRef" referred="id-0065-0000003c" relid="0x0" role="ExceptionRef">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{f66c8596-6cc6-4cbf-ae36-721f1bf0480e}" id="id-0065-0000000d" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                <name>update_one</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{5d7dad55-48e4-4a8a-bf93-a2f306a04cdb}" id="id-0067-00000008" kind="InParameter" referred="id-0066-00000001" relid="0x0" role="InParameter">
-                  <name>datum</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{7df5fc97-60cf-4d88-8700-f566ecbcc8bb}" id="id-0067-00000173" kind="InParameter" referred="id-0067-00000167" relid="0x0" role="InParameter">
-                  <name>instance_handle</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{ef9152da-cdfc-4865-a315-ed95202698fe}" id="id-0067-00000174" kind="ExceptionRef" referred="id-0065-0000003b" relid="0x0" role="ExceptionRef">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{1943cc4b-c1e0-44c4-abda-6e7414de060f}" id="id-0067-00000175" kind="ExceptionRef" referred="id-0065-0000003c" relid="0x0" role="ExceptionRef">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>360,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{f537077f-f387-4192-8a26-5596277a3f2a}" id="id-0065-0000000e" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-                <name>delete_one</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{4a256ca6-114e-400d-8770-c41736da19d8}" id="id-0067-00000009" kind="InParameter" referred="id-0066-00000001" relid="0x0" role="InParameter">
-                  <name>datum</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{5b50bc69-f23a-4111-9846-c32dd6f9815a}" id="id-0067-00000176" kind="InParameter" referred="id-0067-00000167" relid="0x0" role="InParameter">
-                  <name>instance_handle</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{c27b475f-efca-4407-9a21-7f4285994efb}" id="id-0067-00000177" kind="ExceptionRef" referred="id-0065-0000003b" relid="0x0" role="ExceptionRef">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{f530443c-3e1b-4ad5-95ed-cd0eb0573d2a}" id="id-0067-00000178" kind="ExceptionRef" referred="id-0065-0000003c" relid="0x0" role="ExceptionRef">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>360,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{cb8e328d-38a4-4f2a-b717-8d8374d68daf}" id="id-0065-0000000f" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-                <name>create_many</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{7256c665-bf07-4a9c-ab2a-256e4f3c50f2}" id="id-0067-0000000a" kind="InParameter" referred="id-0067-00000001" relid="0x0" role="InParameter">
-                  <name>data</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{02de4bb7-fa93-4aa6-ab0e-d1e6286f4dec}" id="id-0067-00000179" kind="ExceptionRef" referred="id-0065-0000003a" relid="0x0" role="ExceptionRef">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{b7b7c6d5-bc8e-4fd3-bd58-45cbf201756e}" id="id-0067-0000017a" kind="ExceptionRef" referred="id-0065-0000003c" relid="0x0" role="ExceptionRef">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{95bde85e-e757-49b2-a908-a83f2c188fbd}" id="id-0065-00000010" kind="TwowayOperation" relid="0x4" role="TwowayOperation">
-                <name>update_many</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{8caec0b7-d5fe-4556-9b87-15dc20896ff8}" id="id-0067-0000000b" kind="InParameter" referred="id-0067-00000001" relid="0x0" role="InParameter">
-                  <name>data</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{379470f8-0040-4e10-b8a6-8fa2b34fddf9}" id="id-0067-0000017b" kind="ExceptionRef" referred="id-0065-0000003b" relid="0x0" role="ExceptionRef">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{d06d9371-0088-4dd8-9752-a18b3063c69b}" id="id-0067-0000017c" kind="ExceptionRef" referred="id-0065-0000003c" relid="0x0" role="ExceptionRef">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{813df944-1459-43e8-bbc8-88acc57a1fa5}" id="id-0065-00000011" kind="TwowayOperation" relid="0x5" role="TwowayOperation">
-                <name>delete_many</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{e8ca1bc7-caab-440e-b1fa-3201e467791e}" id="id-0067-0000000c" kind="InParameter" referred="id-0067-00000001" relid="0x0" role="InParameter">
-                  <name>data</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{5e770cfe-e15a-4a80-99fa-3e0406d7acf9}" id="id-0067-0000017d" kind="ExceptionRef" referred="id-0065-0000003b" relid="0x0" role="ExceptionRef">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{b524aac1-b976-40f9-a64f-2d4ddfa61438}" id="id-0067-0000017e" kind="ExceptionRef" referred="id-0065-0000003c" relid="0x0" role="ExceptionRef">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{10fafe01-6de0-4ece-b0d3-fe89ef7f4835}" id="id-0065-00000012" kind="ReadonlyAttribute" relid="0x6" role="ReadonlyAttribute">
-                <name>is_global_scope</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,660</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{87a9c6ed-1501-4c88-a20d-2feae9cde5b1}" id="id-0067-0000017f" kind="AttributeMember" referred="id-0066-00000023" relid="0x0" role="AttributeMember">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{94b21c7e-dfd6-4f18-97d2-6441336af003}" id="id-0065-00000013" kind="Attribute" relid="0x7" role="Attribute">
-                <name>is_coherent_write</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,760</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{9e483357-6b07-4e20-b357-efb37fcd53e3}" id="id-0067-00000180" kind="AttributeMember" referred="id-0066-00000023" relid="0x0" role="AttributeMember">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <reference guid="{43974de2-add7-4185-afb2-14c0c6ce5460}" id="id-0067-0000000d" kind="Inherits" referred="id-0065-00000004" relid="0x8" role="Inherits">
-                <name>Inherits</name>
-              </reference>
-            </model>
-            <model childrelidcntr="0x5" guid="{fbaae8e6-f7e9-44c0-a2d8-23c772e7e80f}" id="id-0065-00000014" kind="Object" relid="0x4" role="Object">
-              <name>Reader</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{9c80ff59-7621-4f27-8b70-09686b72e054}" id="id-0065-00000015" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>read_last</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{9c922906-3e03-4154-bc7c-130c56a1f5fb}" id="id-0067-0000000e" kind="InoutParameter" referred="id-0067-00000001" relid="0x0" role="InoutParameter">
-                  <name>data</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{93632f7b-130a-420b-8dbb-b2ae03eda7dd}" id="id-0067-00000181" kind="InoutParameter" referred="id-0067-0000002e" relid="0x0" role="InoutParameter">
-                  <name>infos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{10375f16-b46e-4ff3-895d-8b43cf7e4c22}" id="id-0067-00000182" kind="ExceptionRef" referred="id-0065-0000003c" relid="0x0" role="ExceptionRef">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{d5f05976-af23-4514-8d05-cb38cf76944c}" id="id-0065-00000016" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                <name>read_all</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{ea094b3f-dd2f-4827-ae5e-5e6e0144ee8c}" id="id-0067-0000000f" kind="InoutParameter" referred="id-0067-00000001" relid="0x0" role="InoutParameter">
-                  <name>data</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{b92ab869-0388-49dc-9a84-f093613a8098}" id="id-0067-00000183" kind="InoutParameter" referred="id-0067-0000002e" relid="0x0" role="InoutParameter">
-                  <name>infos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{5debda2b-712e-4ac1-9802-7c7fddd419a3}" id="id-0067-00000184" kind="ExceptionRef" referred="id-0065-0000003c" relid="0x0" role="ExceptionRef">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{962a6c2b-4d26-4297-955b-f5fe7ce399ec}" id="id-0065-00000017" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-                <name>read_one_last</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{bf72e9ae-e767-4a3f-9b71-25d90d3347e5}" id="id-0067-00000010" kind="InoutParameter" referred="id-0066-00000001" relid="0x0" role="InoutParameter">
-                  <name>datum</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{0cbc06f2-3bd6-4dac-9375-c6fc7fb0bacc}" id="id-0067-00000185" kind="OutParameter" referred="id-0065-00000037" relid="0x0" role="OutParameter">
-                  <name>info</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{485e3452-096b-45cd-aed9-17b92c1d2418}" id="id-0067-00000186" kind="InParameter" referred="id-0067-00000167" relid="0x0" role="InParameter">
-                  <name>instance_handle</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{10b9d7e0-3a2c-4373-a218-8d82a3d20af2}" id="id-0067-00000187" kind="ExceptionRef" referred="id-0065-0000003b" relid="0x0" role="ExceptionRef">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>360,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{5b88a936-0604-4801-84a1-9af6bac59f5a}" id="id-0067-00000188" kind="ExceptionRef" referred="id-0065-0000003c" relid="0x0" role="ExceptionRef">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>460,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{9d4c9094-2e65-4998-837d-853704667ed7}" id="id-0065-00000018" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-                <name>read_one_all</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{bef80ff6-3ee7-440a-ab11-b28cb887ba9c}" id="id-0067-00000011" kind="InParameter" referred="id-0066-00000001" relid="0x0" role="InParameter">
-                  <name>datum</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{51e5a25b-df5e-4ac0-87e3-ec768a239f35}" id="id-0067-00000012" kind="InoutParameter" referred="id-0067-00000001" relid="0x0" role="InoutParameter">
-                  <name>data</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{7c0fb1d1-b030-4a03-bd3c-cdf2cd1cd5a5}" id="id-0067-00000189" kind="InoutParameter" referred="id-0067-0000002e" relid="0x0" role="InoutParameter">
-                  <name>infos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{7e0af45b-784f-4c63-9f38-bc5b076d395e}" id="id-0067-0000018a" kind="InParameter" referred="id-0067-00000167" relid="0x0" role="InParameter">
-                  <name>instance_handle</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>360,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{05dcdca9-f31c-4606-b538-c93caf965ba2}" id="id-0067-0000018b" kind="ExceptionRef" referred="id-0065-0000003b" relid="0x0" role="ExceptionRef">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>460,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{0267af8d-e264-4a6b-b8ef-93af18391f02}" id="id-0067-0000018c" kind="ExceptionRef" referred="id-0065-0000003c" relid="0x0" role="ExceptionRef">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>560,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{4e4d040f-210e-4478-a09c-0e616a3cbb37}" id="id-0065-00000019" kind="Attribute" relid="0x4" role="Attribute">
-                <name>query</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{e52d1685-755d-4ad3-9983-6c33af87848e}" id="id-0067-0000018d" kind="AttributeMember" referred="id-0065-00000038" relid="0x0" role="AttributeMember">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{e7510491-305f-4e28-83de-378dd549b65e}" id="id-0067-0000018e" kind="SetException" referred="id-0065-0000003c" relid="0x0" role="SetException">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-            </model>
-            <model childrelidcntr="0x4" guid="{4e697921-f915-4dcc-91fc-489f76ea9a82}" id="id-0065-0000001a" kind="Object" relid="0x5" role="Object">
-              <name>Getter</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{bf64b05a-ab7e-4060-bc7c-af69eee2c826}" id="id-0065-0000001b" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>get_one</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{c5253db0-34fd-4107-966a-2a36bad3fc2b}" id="id-0067-00000013" kind="OutParameter" referred="id-0066-00000001" relid="0x0" role="OutParameter">
-                  <name>datum</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{339639f5-9e87-4fb1-931d-bb0d1b40c3e7}" id="id-0067-0000018f" kind="ReturnType" referred="id-0066-00000023" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{08ee158f-0d69-4c00-bcfd-eecdf17e21c4}" id="id-0067-00000190" kind="OutParameter" referred="id-0065-00000037" relid="0x0" role="OutParameter">
-                  <name>info</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{caef1103-880d-4e62-8dc3-dbb59d376a2c}" id="id-0067-00000191" kind="ExceptionRef" referred="id-0065-0000003c" relid="0x0" role="ExceptionRef">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>360,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{24b3532a-b438-49bc-a36b-40b6d0bb3e7a}" id="id-0065-0000001c" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                <name>get_many</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{b3b72284-6df7-4267-9ed5-2733b7035e46}" id="id-0067-00000014" kind="InoutParameter" referred="id-0067-00000001" relid="0x0" role="InoutParameter">
-                  <name>data</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{bee572a0-8c5f-47a5-8b5a-541311ce3bdf}" id="id-0067-00000192" kind="ReturnType" referred="id-0066-00000023" relid="0x0" role="ReturnType">
-                  <name>ReturnType</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{7a774978-975a-4ad0-9a75-f6b75fb58374}" id="id-0067-00000193" kind="InoutParameter" referred="id-0067-0000002e" relid="0x0" role="InoutParameter">
-                  <name>infos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>260,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{e4c3692f-190e-4f31-8e9f-00d740adb36a}" id="id-0067-00000194" kind="ExceptionRef" referred="id-0065-0000003c" relid="0x0" role="ExceptionRef">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>360,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{1e6a1ff3-f4d2-4e19-966b-d94e9d7d91db}" id="id-0065-0000001d" kind="Attribute" relid="0x2" role="Attribute">
-                <name>time_out</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{8bb061eb-7eb2-422e-8970-0328d48c7286}" id="id-0067-00000195" kind="AttributeMember" referred="id-0065-00000080" relid="0x0" role="AttributeMember">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{06f018e7-9d1a-49ed-acb5-f28f1b79f1c7}" id="id-0065-0000001e" kind="Attribute" relid="0x3" role="Attribute">
-                <name>max_delivered_data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{b689cc61-d959-414b-9307-709982762a1d}" id="id-0067-0000037c" kind="AttributeMember" referred="id-0067-000001b4" relid="0x0" role="AttributeMember">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-            </model>
-            <model childrelidcntr="0x2" guid="{6250051f-0f23-46a4-84b2-6b44fc5782db}" id="id-0065-0000001f" kind="Object" relid="0x6" role="Object">
-              <name>Listener</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{ccd1e971-4e02-49f3-ae51-fd2cc9c351ed}" id="id-0065-00000020" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>on_one_data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{7a78080c-3b7c-46e2-8cbc-f5bd78abdb0e}" id="id-0067-00000015" kind="InParameter" referred="id-0066-00000001" relid="0x0" role="InParameter">
-                  <name>datum</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{41dcc038-4baa-45af-b5ff-e2ca817eb149}" id="id-0067-00000196" kind="InParameter" referred="id-0065-00000037" relid="0x0" role="InParameter">
-                  <name>info</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{21fbe98c-805b-41dc-a052-c2e5b6bce679}" id="id-0065-00000021" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                <name>on_many_data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{dbfd6cdc-9219-4b29-bb1a-e91da13dc31a}" id="id-0067-00000016" kind="InParameter" referred="id-0067-00000001" relid="0x0" role="InParameter">
-                  <name>data</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{84537cd4-be78-4b29-9e66-98e28837a6ea}" id="id-0067-00000197" kind="InParameter" referred="id-0067-0000002e" relid="0x0" role="InParameter">
-                  <name>infos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-            </model>
-            <model childrelidcntr="0x4" guid="{25604677-e315-48da-a2b8-1b382b98f532}" id="id-0065-00000022" kind="Object" relid="0x7" role="Object">
-              <name>StateListener</name>
-              <attribute kind="InterfaceSemantics">
-                <value>local</value>
-              </attribute>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrefixTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{028d00f7-5b8e-461b-8284-98e662135fe4}" id="id-0065-00000023" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-                <name>on_creation</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{e4c1f87d-4c5c-4a5d-8ebc-a93908c6e7a5}" id="id-0067-00000017" kind="InParameter" referred="id-0066-00000001" relid="0x0" role="InParameter">
-                  <name>datum</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{ca1a067d-37e4-4f0b-8a49-529b420f6ee9}" id="id-0067-00000198" kind="InParameter" referred="id-0065-00000037" relid="0x0" role="InParameter">
-                  <name>info</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{de2eea24-bfb6-4b50-a248-71049b862d6f}" id="id-0065-00000024" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-                <name>on_one_update</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{cb2395ef-477c-44c6-92b1-91c2b4b223f7}" id="id-0067-00000018" kind="InParameter" referred="id-0066-00000001" relid="0x0" role="InParameter">
-                  <name>datum</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{57b4b0a1-44c5-41d2-aca7-a2f50070eead}" id="id-0067-00000199" kind="InParameter" referred="id-0065-00000037" relid="0x0" role="InParameter">
-                  <name>info</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{cf530e97-b8da-4cd7-aa64-1361f9f7054e}" id="id-0065-00000025" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-                <name>on_many_updates</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{c7fcbef5-e941-4acb-8abd-3d5a8395e6fb}" id="id-0067-00000019" kind="InParameter" referred="id-0067-00000001" relid="0x0" role="InParameter">
-                  <name>data</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{76d2a292-1e27-47f0-b329-db0d1c3d7d63}" id="id-0067-0000019a" kind="InParameter" referred="id-0067-0000002e" relid="0x0" role="InParameter">
-                  <name>infos</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <model childrelidcntr="0x1" guid="{d013b562-3c78-426d-bce0-b6b180150028}" id="id-0065-00000026" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-                <name>on_deletion</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{65ac5876-8892-407c-accf-fd563e016a58}" id="id-0067-0000001a" kind="InParameter" referred="id-0066-00000001" relid="0x0" role="InParameter">
-                  <name>datum</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{3602e7ae-be1e-4ba2-b7a0-2cdad7239406}" id="id-0067-0000019b" kind="InParameter" referred="id-0065-00000037" relid="0x0" role="InParameter">
-                  <name>info</name>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-            </model>
-            <model childrelidcntr="0x1" guid="{bf7f6820-3670-48c1-a350-fe275461d999}" id="id-0065-00000027" kind="PortType" relid="0x8" role="PortType">
-              <name>DDS_Write</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{cbd3c158-008a-494f-ae24-f5f3666759b9}" id="id-0067-0000001b" kind="RequiredRequestPort" referred="id-0065-00000007" relid="0x0" role="RequiredRequestPort">
-                <name>data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="exclusiveProvider" status="meta">
-                  <value>false</value>
-                </attribute>
-                <attribute kind="exclusiveUser" status="meta">
-                  <value>false</value>
-                </attribute>
-                <attribute kind="multiple_connections">
-                  <value>False</value>
-                </attribute>
-                <attribute kind="optional" status="meta">
-                  <value>false</value>
-                </attribute>
-              </reference>
-              <reference guid="{b8a368fc-cdb8-4419-9284-e9f121fd368c}" id="id-0067-0000019c" kind="RequiredRequestPort" referred="id-0065-000000ab" relid="0x0" role="RequiredRequestPort">
-                <name>dds_entity</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="exclusiveProvider" status="meta">
-                  <value>false</value>
-                </attribute>
-                <attribute kind="exclusiveUser" status="meta">
-                  <value>false</value>
-                </attribute>
-                <attribute kind="multiple_connections">
-                  <value>False</value>
-                </attribute>
-                <attribute kind="optional" status="meta">
-                  <value>false</value>
-                </attribute>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{619861da-4c85-4e91-b5fb-93ecabbb6911}" id="id-0065-00000028" kind="PortType" relid="0x9" role="PortType">
-              <name>DDS_Update</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{6334db56-7834-4a77-9551-8e78c0fb870c}" id="id-0067-0000001c" kind="RequiredRequestPort" referred="id-0065-0000000b" relid="0x0" role="RequiredRequestPort">
-                <name>data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="exclusiveProvider" status="meta">
-                  <value>false</value>
-                </attribute>
-                <attribute kind="exclusiveUser" status="meta">
-                  <value>false</value>
-                </attribute>
-                <attribute kind="multiple_connections">
-                  <value>False</value>
-                </attribute>
-                <attribute kind="optional" status="meta">
-                  <value>false</value>
-                </attribute>
-              </reference>
-              <reference guid="{3b2998ec-5de6-45bb-8c02-39d49bceee9d}" id="id-0067-0000019d" kind="RequiredRequestPort" referred="id-0065-000000ab" relid="0x0" role="RequiredRequestPort">
-                <name>dds_entity</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="exclusiveProvider" status="meta">
-                  <value>false</value>
-                </attribute>
-                <attribute kind="exclusiveUser" status="meta">
-                  <value>false</value>
-                </attribute>
-                <attribute kind="multiple_connections">
-                  <value>False</value>
-                </attribute>
-                <attribute kind="optional" status="meta">
-                  <value>false</value>
-                </attribute>
-              </reference>
-            </model>
-            <model childrelidcntr="0x2" guid="{3dddee43-c914-43c0-810a-ebcc47971a9d}" id="id-0065-00000029" kind="PortType" relid="0xa" role="PortType">
-              <name>DDS_Read</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{5bf211cb-da7e-481a-a999-bc5c6c65993c}" id="id-0065-0000002a" kind="Attribute" relid="0x0" role="Attribute">
-                <name>filter</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{aaf5cbf1-3594-4a38-b409-95bb4ad994ad}" id="id-0067-000001a0" kind="AttributeMember" referred="id-0065-00000038" relid="0x0" role="AttributeMember">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{e4350f70-6dce-4fd6-a3ef-6b5df46e16fe}" id="id-0067-000001a1" kind="SetException" referred="id-0065-0000003d" relid="0x0" role="SetException">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <reference guid="{4812a509-ba1f-4611-aa3b-1d20d3315187}" id="id-0067-0000001d" kind="RequiredRequestPort" referred="id-0065-00000014" relid="0x0" role="RequiredRequestPort">
-                <name>data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="exclusiveProvider" status="meta">
-                  <value>false</value>
-                </attribute>
-                <attribute kind="exclusiveUser" status="meta">
-                  <value>false</value>
-                </attribute>
-                <attribute kind="multiple_connections">
-                  <value>False</value>
-                </attribute>
-                <attribute kind="optional" status="meta">
-                  <value>false</value>
-                </attribute>
-              </reference>
-              <reference guid="{1525c918-c01b-482f-a278-b466237da990}" id="id-0067-0000019e" kind="RequiredRequestPort" referred="id-0065-000000ba" relid="0x0" role="RequiredRequestPort">
-                <name>dds_entity</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="exclusiveProvider" status="meta">
-                  <value>false</value>
-                </attribute>
-                <attribute kind="exclusiveUser" status="meta">
-                  <value>false</value>
-                </attribute>
-                <attribute kind="multiple_connections">
-                  <value>False</value>
-                </attribute>
-                <attribute kind="optional" status="meta">
-                  <value>false</value>
-                </attribute>
-              </reference>
-              <reference guid="{96e30ab7-5c98-41ab-ae48-48d3c443c5e1}" id="id-0067-0000019f" kind="ProvidedRequestPort" referred="id-0065-00000070" relid="0x0" role="ProvidedRequestPort">
-                <name>status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="exclusiveProvider" status="meta">
-                  <value>false</value>
-                </attribute>
-                <attribute kind="exclusiveUser" status="meta">
-                  <value>false</value>
-                </attribute>
-                <attribute kind="optional" status="meta">
-                  <value>false</value>
-                </attribute>
-              </reference>
-              <reference guid="{bb4a7c18-32e6-4393-b5ad-cbbdc1af1d08}" id="id-0067-000001a2" kind="RequiredRequestPort" referred="id-0065-0000003e" relid="0x1" role="RequiredRequestPort">
-                <name>filter_config</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="exclusiveProvider" status="meta">
-                  <value>false</value>
-                </attribute>
-                <attribute kind="exclusiveUser" status="meta">
-                  <value>false</value>
-                </attribute>
-                <attribute kind="multiple_connections">
-                  <value>False</value>
-                </attribute>
-                <attribute kind="optional" status="meta">
-                  <value>false</value>
-                </attribute>
-              </reference>
-            </model>
-            <model childrelidcntr="0x2" guid="{eec68a9a-758a-45d3-833f-c088cb078876}" id="id-0065-0000002b" kind="PortType" relid="0xb" role="PortType">
-              <name>DDS_Get</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{0f78654e-eb44-499d-9350-0839b4e63858}" id="id-0065-0000002c" kind="Attribute" relid="0x0" role="Attribute">
-                <name>filter</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{b0f3941f-2b7b-4b50-89bc-c464e1075e64}" id="id-0067-000001a5" kind="AttributeMember" referred="id-0065-00000038" relid="0x0" role="AttributeMember">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{af5c09aa-0e28-4795-b9ea-3279f4ed9630}" id="id-0067-000001a6" kind="SetException" referred="id-0065-0000003d" relid="0x0" role="SetException">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <reference guid="{5e75a6e7-bfbe-4d84-ac64-bbbdb4597a3a}" id="id-0067-0000001e" kind="RequiredRequestPort" referred="id-0065-00000014" relid="0x0" role="RequiredRequestPort">
-                <name>data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="exclusiveProvider" status="meta">
-                  <value>false</value>
-                </attribute>
-                <attribute kind="exclusiveUser" status="meta">
-                  <value>false</value>
-                </attribute>
-                <attribute kind="multiple_connections">
-                  <value>False</value>
-                </attribute>
-                <attribute kind="optional" status="meta">
-                  <value>false</value>
-                </attribute>
-              </reference>
-              <reference guid="{7f9aae18-cc60-49ac-9c64-e8677dc82db1}" id="id-0067-0000001f" kind="RequiredRequestPort" referred="id-0065-0000001a" relid="0x0" role="RequiredRequestPort">
-                <name>fresh_data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="exclusiveProvider" status="meta">
-                  <value>false</value>
-                </attribute>
-                <attribute kind="exclusiveUser" status="meta">
-                  <value>false</value>
-                </attribute>
-                <attribute kind="multiple_connections">
-                  <value>False</value>
-                </attribute>
-                <attribute kind="optional" status="meta">
-                  <value>false</value>
-                </attribute>
-              </reference>
-              <reference guid="{e04cbec6-6cd6-4218-990f-a887e7c3d456}" id="id-0067-000001a3" kind="RequiredRequestPort" referred="id-0065-000000ba" relid="0x0" role="RequiredRequestPort">
-                <name>dds_entity</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="exclusiveProvider" status="meta">
-                  <value>false</value>
-                </attribute>
-                <attribute kind="exclusiveUser" status="meta">
-                  <value>false</value>
-                </attribute>
-                <attribute kind="multiple_connections">
-                  <value>False</value>
-                </attribute>
-                <attribute kind="optional" status="meta">
-                  <value>false</value>
-                </attribute>
-              </reference>
-              <reference guid="{76519d1d-5f12-44f2-bb37-44aef358bf08}" id="id-0067-000001a4" kind="ProvidedRequestPort" referred="id-0065-00000070" relid="0x0" role="ProvidedRequestPort">
-                <name>status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="exclusiveProvider" status="meta">
-                  <value>false</value>
-                </attribute>
-                <attribute kind="exclusiveUser" status="meta">
-                  <value>false</value>
-                </attribute>
-                <attribute kind="optional" status="meta">
-                  <value>false</value>
-                </attribute>
-              </reference>
-              <reference guid="{ac904120-1317-4dbb-b291-8fe317fa5f13}" id="id-0067-000001a7" kind="RequiredRequestPort" referred="id-0065-0000003e" relid="0x1" role="RequiredRequestPort">
-                <name>filter_config</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="exclusiveProvider" status="meta">
-                  <value>false</value>
-                </attribute>
-                <attribute kind="exclusiveUser" status="meta">
-                  <value>false</value>
-                </attribute>
-                <attribute kind="multiple_connections">
-                  <value>False</value>
-                </attribute>
-                <attribute kind="optional" status="meta">
-                  <value>false</value>
-                </attribute>
-              </reference>
-            </model>
-            <model childrelidcntr="0x2" guid="{aea302e1-40ee-45b5-91e4-5b78deb209e5}" id="id-0065-0000002d" kind="PortType" relid="0xc" role="PortType">
-              <name>DDS_Listen</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{3266e8d4-569a-479c-b9a8-9cc5b04e4f0c}" id="id-0065-0000002e" kind="Attribute" relid="0x0" role="Attribute">
-                <name>filter</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{c71df672-bb1c-4913-8ed6-e0ddafb2d3bd}" id="id-0067-000001ab" kind="AttributeMember" referred="id-0065-00000038" relid="0x0" role="AttributeMember">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{106b5a2c-d7e6-4cea-9a93-df7bd5ce260d}" id="id-0067-000001ac" kind="SetException" referred="id-0065-0000003d" relid="0x0" role="SetException">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <reference guid="{61e2a992-3538-4606-a1d1-24a25f88ca5d}" id="id-0067-00000020" kind="RequiredRequestPort" referred="id-0065-00000014" relid="0x0" role="RequiredRequestPort">
-                <name>data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="exclusiveProvider" status="meta">
-                  <value>false</value>
-                </attribute>
-                <attribute kind="exclusiveUser" status="meta">
-                  <value>false</value>
-                </attribute>
-                <attribute kind="multiple_connections">
-                  <value>False</value>
-                </attribute>
-                <attribute kind="optional" status="meta">
-                  <value>false</value>
-                </attribute>
-              </reference>
-              <reference guid="{394c2257-6520-4469-92e3-8d0f4f74fc01}" id="id-0067-00000021" kind="ProvidedRequestPort" referred="id-0065-0000001f" relid="0x0" role="ProvidedRequestPort">
-                <name>data_listener</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="exclusiveProvider" status="meta">
-                  <value>false</value>
-                </attribute>
-                <attribute kind="exclusiveUser" status="meta">
-                  <value>false</value>
-                </attribute>
-                <attribute kind="optional" status="meta">
-                  <value>false</value>
-                </attribute>
-              </reference>
-              <reference guid="{a1c754a8-c82b-44ad-b713-92e20eec5675}" id="id-0067-000001a8" kind="RequiredRequestPort" referred="id-0065-00000068" relid="0x0" role="RequiredRequestPort">
-                <name>data_control</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="exclusiveProvider" status="meta">
-                  <value>false</value>
-                </attribute>
-                <attribute kind="exclusiveUser" status="meta">
-                  <value>false</value>
-                </attribute>
-                <attribute kind="multiple_connections">
-                  <value>False</value>
-                </attribute>
-                <attribute kind="optional" status="meta">
-                  <value>false</value>
-                </attribute>
-              </reference>
-              <reference guid="{a79437df-5339-40f8-854b-b46af2edaa40}" id="id-0067-000001a9" kind="RequiredRequestPort" referred="id-0065-000000ba" relid="0x0" role="RequiredRequestPort">
-                <name>dds_entity</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="exclusiveProvider" status="meta">
-                  <value>false</value>
-                </attribute>
-                <attribute kind="exclusiveUser" status="meta">
-                  <value>false</value>
-                </attribute>
-                <attribute kind="multiple_connections">
-                  <value>False</value>
-                </attribute>
-                <attribute kind="optional" status="meta">
-                  <value>false</value>
-                </attribute>
-              </reference>
-              <reference guid="{6c42a3a9-66e9-4e7c-9b8d-e9134cbc6f56}" id="id-0067-000001aa" kind="ProvidedRequestPort" referred="id-0065-00000070" relid="0x0" role="ProvidedRequestPort">
-                <name>status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="exclusiveProvider" status="meta">
-                  <value>false</value>
-                </attribute>
-                <attribute kind="exclusiveUser" status="meta">
-                  <value>false</value>
-                </attribute>
-                <attribute kind="optional" status="meta">
-                  <value>false</value>
-                </attribute>
-              </reference>
-              <reference guid="{3833a4bb-b7ac-4a39-aa65-c4c0e8bd36a3}" id="id-0067-000001ad" kind="RequiredRequestPort" referred="id-0065-0000003e" relid="0x1" role="RequiredRequestPort">
-                <name>filter_config</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,660</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="exclusiveProvider" status="meta">
-                  <value>false</value>
-                </attribute>
-                <attribute kind="exclusiveUser" status="meta">
-                  <value>false</value>
-                </attribute>
-                <attribute kind="multiple_connections">
-                  <value>False</value>
-                </attribute>
-                <attribute kind="optional" status="meta">
-                  <value>false</value>
-                </attribute>
-              </reference>
-            </model>
-            <model childrelidcntr="0x2" guid="{824566cf-5c31-4bc4-b7f0-08f3e194df43}" id="id-0065-0000002f" kind="PortType" relid="0xd" role="PortType">
-              <name>DDS_StateListen</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <model childrelidcntr="0x1" guid="{8037acb0-12ad-40b1-94bb-69c1bee6b6b9}" id="id-0065-00000030" kind="Attribute" relid="0x0" role="Attribute">
-                <name>filter</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,560</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <reference guid="{6b8ae559-da9a-4a03-95b7-fcc3996051dc}" id="id-0067-000001b1" kind="AttributeMember" referred="id-0065-00000038" relid="0x0" role="AttributeMember">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>60,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-                <reference guid="{eed9c788-7b5a-4c1f-9795-21704f2d8d96}" id="id-0067-000001b2" kind="SetException" referred="id-0065-0000003d" relid="0x0" role="SetException">
-                  <name/>
-                  <regnode isopaque="yes" name="PartRegs">
-                    <value/>
-                    <regnode isopaque="yes" name="InterfaceDefinition">
-                      <value/>
-                      <regnode isopaque="yes" name="Position">
-                        <value>160,60</value>
-                      </regnode>
-                    </regnode>
-                  </regnode>
-                </reference>
-              </model>
-              <reference guid="{c6ee3ff0-c5b4-4ef5-990a-4c47dcc5b655}" id="id-0067-00000022" kind="RequiredRequestPort" referred="id-0065-00000014" relid="0x0" role="RequiredRequestPort">
-                <name>data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="exclusiveProvider" status="meta">
-                  <value>false</value>
-                </attribute>
-                <attribute kind="exclusiveUser" status="meta">
-                  <value>false</value>
-                </attribute>
-                <attribute kind="multiple_connections">
-                  <value>False</value>
-                </attribute>
-                <attribute kind="optional" status="meta">
-                  <value>false</value>
-                </attribute>
-              </reference>
-              <reference guid="{b7888fd0-b0c0-4ca4-8013-70d865278be2}" id="id-0067-00000023" kind="ProvidedRequestPort" referred="id-0065-00000022" relid="0x0" role="ProvidedRequestPort">
-                <name>data_listener</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,260</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="exclusiveProvider" status="meta">
-                  <value>false</value>
-                </attribute>
-                <attribute kind="exclusiveUser" status="meta">
-                  <value>false</value>
-                </attribute>
-                <attribute kind="optional" status="meta">
-                  <value>false</value>
-                </attribute>
-              </reference>
-              <reference guid="{11b899d0-7064-4e27-b20e-b8a5e24f3548}" id="id-0067-000001ae" kind="RequiredRequestPort" referred="id-0065-00000078" relid="0x0" role="RequiredRequestPort">
-                <name>data_control</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,160</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="exclusiveProvider" status="meta">
-                  <value>false</value>
-                </attribute>
-                <attribute kind="exclusiveUser" status="meta">
-                  <value>false</value>
-                </attribute>
-                <attribute kind="multiple_connections">
-                  <value>False</value>
-                </attribute>
-                <attribute kind="optional" status="meta">
-                  <value>false</value>
-                </attribute>
-              </reference>
-              <reference guid="{e3f7233f-8283-4539-9f9d-df4eac67aafe}" id="id-0067-000001af" kind="RequiredRequestPort" referred="id-0065-000000ba" relid="0x0" role="RequiredRequestPort">
-                <name>dds_entity</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,360</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="exclusiveProvider" status="meta">
-                  <value>false</value>
-                </attribute>
-                <attribute kind="exclusiveUser" status="meta">
-                  <value>false</value>
-                </attribute>
-                <attribute kind="multiple_connections">
-                  <value>False</value>
-                </attribute>
-                <attribute kind="optional" status="meta">
-                  <value>false</value>
-                </attribute>
-              </reference>
-              <reference guid="{6b1da435-fdcc-4081-a454-a6e227c098b3}" id="id-0067-000001b0" kind="ProvidedRequestPort" referred="id-0065-00000070" relid="0x0" role="ProvidedRequestPort">
-                <name>status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,460</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="exclusiveProvider" status="meta">
-                  <value>false</value>
-                </attribute>
-                <attribute kind="exclusiveUser" status="meta">
-                  <value>false</value>
-                </attribute>
-                <attribute kind="optional" status="meta">
-                  <value>false</value>
-                </attribute>
-              </reference>
-              <reference guid="{b462f37c-4f66-4b08-84a6-59c2abe46a4a}" id="id-0067-000001b3" kind="RequiredRequestPort" referred="id-0065-0000003e" relid="0x1" role="RequiredRequestPort">
-                <name>filter_config</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,660</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-                <attribute kind="SpecifyIdTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="VersionTag" status="meta">
-                  <value/>
-                </attribute>
-                <attribute kind="exclusiveProvider" status="meta">
-                  <value>false</value>
-                </attribute>
-                <attribute kind="exclusiveUser" status="meta">
-                  <value>false</value>
-                </attribute>
-                <attribute kind="multiple_connections">
-                  <value>False</value>
-                </attribute>
-                <attribute kind="optional" status="meta">
-                  <value>false</value>
-                </attribute>
-              </reference>
-            </model>
-            <model childrelidcntr="0x2" guid="{9ba0875d-02f6-46a4-b15c-0ec933b459e0}" id="id-0065-00000031" kind="ConnectorObject" relid="0xe" role="ConnectorObject">
-              <name>DDS_State</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="UUID">
-                <value>C61798A6-7C26-11DF-8000-000C2958D27B</value>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{f37bfb4b-b88a-4815-94f7-8cd699d13e8c}" id="id-0067-00000024" kind="MirrorPort" referred="id-0065-00000028" relid="0x0" role="MirrorPort">
-                <name>observable</name>
-              </reference>
-              <reference guid="{e09832c6-f7fb-436c-91fb-b89d677a9261}" id="id-0067-00000025" kind="MirrorPort" referred="id-0065-00000029" relid="0x0" role="MirrorPort">
-                <name>passive_observer</name>
-              </reference>
-              <reference guid="{f8de4b83-cc7c-45f7-aa09-c444b91f1945}" id="id-0067-00000026" kind="MirrorPort" referred="id-0065-0000002b" relid="0x0" role="MirrorPort">
-                <name>pull_observer</name>
-              </reference>
-              <reference guid="{fec38694-fe28-4669-be83-d7142ece8d92}" id="id-0067-00000027" kind="MirrorPort" referred="id-0065-0000002d" relid="0x0" role="MirrorPort">
-                <name>push_observer</name>
-              </reference>
-              <reference guid="{85a0a8e1-d5b2-4c4f-8363-ae8abcd39b00}" id="id-0067-00000028" kind="MirrorPort" referred="id-0065-0000002f" relid="0x0" role="MirrorPort">
-                <name>push_state_observer</name>
-              </reference>
-              <reference id="id-0067-00000391" kind="ConnectorInherits" referred="id-0065-00000048" relid="0x1" role="ConnectorInherits">
-                <name>ConnectorInherits</name>
-              </reference>
-            </model>
-            <model childrelidcntr="0x2" guid="{a748a69a-9c98-4a2e-ae64-c98b9f684f0d}" id="id-0065-00000032" kind="ConnectorObject" relid="0xf" role="ConnectorObject">
-              <name>DDS_Event</name>
-              <attribute kind="PostPreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="PrePreprocessorDirectives" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="UUID">
-                <value>C61798A6-7C26-11DF-8001-000C2958D27B</value>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{97bf7da7-c669-4858-84bd-a5e0d55f03c9}" id="id-0067-00000029" kind="MirrorPort" referred="id-0065-00000027" relid="0x0" role="MirrorPort">
-                <name>supplier</name>
-              </reference>
-              <reference guid="{a9eda479-9be6-4d13-bfe1-d48d8793a55b}" id="id-0067-0000002a" kind="MirrorPort" referred="id-0065-0000002b" relid="0x0" role="MirrorPort">
-                <name>pull_consumer</name>
-              </reference>
-              <reference guid="{ac9efffe-2746-401f-8e5f-d87a31348854}" id="id-0067-0000002b" kind="MirrorPort" referred="id-0065-0000002d" relid="0x0" role="MirrorPort">
-                <name>push_consumer</name>
-              </reference>
-              <reference id="id-0067-00000392" kind="ConnectorInherits" referred="id-0065-00000048" relid="0x1" role="ConnectorInherits">
-                <name>ConnectorInherits</name>
-              </reference>
-            </model>
-            <atom guid="{f7eae334-9a8a-46fa-859b-a1306b0f717c}" id="id-0066-00000001" kind="NameParameter" relid="0x0" role="NameParameter">
-              <name>T</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="TemplateParameters">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </atom>
-            <reference guid="{4a4d7fb8-c4c9-4bce-934f-302e9df8fa56}" id="id-0067-00000001" kind="CollectionParameter" referred="id-0066-00000001" relid="0x1" role="CollectionParameter">
-              <name>TSeq</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="TemplateParameters">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>160,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-        </model>
-      </model>
-      <model childrelidcntr="0x1" guid="{efa14826-304a-4575-8733-94aaa271dfd6}" id="id-0065-00000033" kind="File" relid="0x1">
-        <name>dds4ccm_Base</name>
-        <attribute kind="Path">
-          <value>connectors/dds4ccm/idl</value>
-        </attribute>
-        <attribute kind="PostPreprocessorDirectives" status="meta">
-          <value/>
-        </attribute>
-        <attribute kind="PrePreprocessorDirectives" status="meta">
-          <value/>
-        </attribute>
-        <attribute kind="PrefixTag" status="meta">
-          <value/>
-        </attribute>
-        <model childrelidcntr="0xa" guid="{4591f46e-5f2b-484f-a218-955942cb37ea}" id="id-0065-00000034" kind="Package" relid="0x0" role="Package">
-          <name>CCM_DDS</name>
-          <attribute kind="PostPreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrePreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrefixTag" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="SpecifyIdTag" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="VersionTag" status="meta">
-            <value/>
-          </attribute>
-          <model childrelidcntr="0x2" guid="{8e40374e-5636-44e4-b1c5-8b9582a20307}" id="id-0065-00000035" kind="Enum" relid="0x0" role="Enum">
-            <name>AccessStatus</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <atom guid="{56069827-6a1a-40dc-be8d-25077dd54f1d}" id="id-0066-00000002" kind="EnumValue" relid="0x0" role="EnumValue">
-              <name>FRESH_INFO</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </atom>
-            <atom guid="{b3796768-7a7a-4e15-83f0-f7771da88f6b}" id="id-0066-00000003" kind="EnumValue" relid="0x1" role="EnumValue">
-              <name>ALREADY_SEEN</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </atom>
-          </model>
-          <model childrelidcntr="0x5" guid="{dea334c6-b3b5-4676-97a4-897ea6fe6f79}" id="id-0065-00000036" kind="Enum" relid="0x1" role="Enum">
-            <name>InstanceStatus</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <atom guid="{8b04876e-8fed-4a1e-ac7a-416ccd590f7a}" id="id-0066-00000004" kind="EnumValue" relid="0x0" role="EnumValue">
-              <name>INSTANCE_CREATED</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </atom>
-            <atom guid="{3fe5e3c0-9b4c-4120-95b8-1a04abedbb8f}" id="id-0066-00000005" kind="EnumValue" relid="0x1" role="EnumValue">
-              <name>INSTANCE_FILTERED_IN</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </atom>
-            <atom guid="{ae72f4b8-1e2a-4dbe-af7a-63d6ea4db75d}" id="id-0066-00000006" kind="EnumValue" relid="0x2" role="EnumValue">
-              <name>INSTANCE_UPDATED</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </atom>
-            <atom guid="{a683b070-f079-4d71-a397-02f96217692d}" id="id-0066-00000007" kind="EnumValue" relid="0x3" role="EnumValue">
-              <name>INSTANCE_FILTERED_OUT</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,360</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </atom>
-            <atom guid="{096fd7f6-203b-4001-ac47-8e5beafc141c}" id="id-0066-00000008" kind="EnumValue" relid="0x4" role="EnumValue">
-              <name>INSTANCE_DELETED</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,460</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </atom>
-          </model>
-          <model childrelidcntr="0x1" guid="{f0154a87-3f3a-40e5-86ca-9b2391830453}" id="id-0065-00000037" kind="Aggregate" relid="0x2" role="Aggregate">
-            <name>ReadInfo</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{d9028ef2-afdc-4373-8888-a8b497a5c11a}" id="id-0067-0000002c" kind="Member" referred="id-0065-00000035" relid="0x0" role="Member">
-              <name>access_status</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{a5d48ef3-faf3-45b2-ba9e-53dc324eab36}" id="id-0067-0000002d" kind="Member" referred="id-0065-00000036" relid="0x0" role="Member">
-              <name>instance_status</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,360</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{6c2866c9-c87c-4407-ab26-4766db5a4901}" id="id-0067-000001b7" kind="Member" referred="id-0067-00000167" relid="0x0" role="Member">
-              <name>instance_handle</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{df90510b-d2e5-4813-95a8-8bb0d03fb27f}" id="id-0067-000001b8" kind="Member" referred="id-0065-00000081" relid="0x0" role="Member">
-              <name>source_timestamp</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <model childrelidcntr="0x1" guid="{0361de1d-4c0e-4a9d-a52b-a1ce50fb2994}" id="id-0065-00000038" kind="Aggregate" relid="0x3" role="Aggregate">
-            <name>QueryFilter</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{ec7a4b7b-1534-4911-927a-856d030d3486}" id="id-0067-000001b9" kind="Member" referred="id-0066-00000033" relid="0x0" role="Member">
-              <name>expression</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{fae65ed4-c5fc-42b8-a3bc-09fb7b14c4f1}" id="id-0067-0000037d" kind="Member" referred="id-0067-000001d8" relid="0x0" role="Member">
-              <name>parameters</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <model childrelidcntr="0x3" guid="{65805011-4422-4420-a30d-c077f21e0757}" id="id-0065-00000039" kind="Enum" relid="0x4" role="Enum">
-            <name>ListenerMode</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <atom guid="{9f0cb3a2-eaf5-4e36-a2c2-3cddd6efba01}" id="id-0066-00000009" kind="EnumValue" relid="0x0" role="EnumValue">
-              <name>NOT_ENABLED</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </atom>
-            <atom guid="{e0d9ffaf-1236-40bd-96d6-6378d3c1c763}" id="id-0066-0000000a" kind="EnumValue" relid="0x1" role="EnumValue">
-              <name>ONE_BY_ONE</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </atom>
-            <atom guid="{86aa0e66-ffc2-4fc1-a48d-19bb13bdb106}" id="id-0066-0000000b" kind="EnumValue" relid="0x2" role="EnumValue">
-              <name>MANY_BY_MANY</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </atom>
-          </model>
-          <model childrelidcntr="0x1" guid="{3efaef2a-246b-4597-8332-e21a55903433}" id="id-0065-0000003a" kind="Exception" relid="0x5" role="Exception">
-            <name>AlreadyCreated</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{451b5926-5f07-4742-ab1e-75050787ab46}" id="id-0067-000001ba" kind="Member" referred="id-0067-000001b5" relid="0x0" role="Member">
-              <name>indexes</name>
-            </reference>
-          </model>
-          <model childrelidcntr="0x1" guid="{8b15e311-1ddc-4f0f-9542-3532990fe642}" id="id-0065-0000003b" kind="Exception" relid="0x6" role="Exception">
-            <name>NonExistent</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{73592d82-e3ff-4933-983a-d97298f6de1c}" id="id-0067-000001bb" kind="Member" referred="id-0067-000001b5" relid="0x0" role="Member">
-              <name>indexes</name>
-            </reference>
-          </model>
-          <model childrelidcntr="0x1" guid="{2acfcd50-3fae-47a3-8fef-cb659f920f4a}" id="id-0065-0000003c" kind="Exception" relid="0x7" role="Exception">
-            <name>InternalError</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{f78229fc-61d5-4fd3-a9a2-5a9cba818528}" id="id-0067-000001bc" kind="Member" referred="id-0067-000001b4" relid="0x0" role="Member">
-              <name>index</name>
-            </reference>
-            <reference guid="{4730d586-61aa-4f85-b670-e8271bfd2931}" id="id-0067-0000037e" kind="Member" referred="id-0067-000001d6" relid="0x0" role="Member">
-              <name>error_code</name>
-            </reference>
-          </model>
-          <model childrelidcntr="0x0" guid="{dab7a9cd-b69c-4cf3-ac7e-599d6ecb5ff1}" id="id-0065-0000003d" kind="Exception" relid="0x8" role="Exception">
-            <name>NonChangeable</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-          </model>
-          <model childrelidcntr="0x1" guid="{db1f229a-c7d8-4b0a-8ba5-18dd8c151409}" id="id-0065-0000003e" kind="Object" relid="0x9" role="Object">
-            <name>ContentFilterSetting</name>
-            <attribute kind="InterfaceSemantics">
-              <value>local</value>
-            </attribute>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrefixTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <model childrelidcntr="0x1" guid="{0f5be5ce-59fc-4b43-9379-00bfa3b1c732}" id="id-0065-0000003f" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-              <name>set_filter_parameters</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{fa19a987-a133-40e6-b6f0-47ec09d31075}" id="id-0067-0000002f" kind="ExceptionRef" referred="id-0065-0000003c" relid="0x0" role="ExceptionRef">
-                <name/>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{b7f67965-829b-430e-8998-f274bff8993b}" id="id-0067-0000037f" kind="InParameter" referred="id-0067-000001d8" relid="0x0" role="InParameter">
-                <name>parameters</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-          </model>
-          <reference guid="{18679629-7b2e-42c7-ba12-ee4d4f0c3111}" id="id-0067-0000002e" kind="Collection" referred="id-0065-00000037" relid="0x3" role="Collection">
-            <name>ReadInfoSeq</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="bound" status="meta">
-              <value/>
-            </attribute>
-          </reference>
-          <reference guid="{ebc3aec5-b0aa-4ea9-9a6f-63fb408599e7}" id="id-0067-000001b4" kind="Alias" referred="id-0066-0000002b" relid="0x0" role="Alias">
-            <name>DataNumber_t</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-          </reference>
-          <reference guid="{8becee46-56cf-4276-9592-0da89f0c64b0}" id="id-0067-000001b5" kind="Collection" referred="id-0067-000001b4" relid="0x0" role="Collection">
-            <name>DataNumberSeq</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="bound" status="meta">
-              <value/>
-            </attribute>
-          </reference>
-          <reference guid="{91bde20c-4789-4717-9d53-80b7beb0491a}" id="id-0067-000001b6" kind="Constant" referred="id-0066-0000002b" relid="0x0" role="Constant">
-            <name>UNLIMITED</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>0</value>
-            </attribute>
-          </reference>
-        </model>
-      </model>
-      <model childrelidcntr="0x1" guid="{829aaff6-dcd8-4f11-827b-7d212e9a904b}" id="id-0065-00000043" kind="File" relid="0x3">
-        <name>dds4ccm_Connector</name>
-        <attribute kind="Path">
-          <value>connectors/dds4ccm/idl</value>
-        </attribute>
-        <attribute kind="PostPreprocessorDirectives" status="meta">
-          <value/>
-        </attribute>
-        <attribute kind="PrePreprocessorDirectives" status="meta">
-          <value/>
-        </attribute>
-        <attribute kind="PrefixTag" status="meta">
-          <value/>
-        </attribute>
-        <model childrelidcntr="0x2" guid="{cd22e550-5212-470e-a781-7bb0ff31444f}" id="id-0065-00000044" kind="Package" relid="0x0" role="Package">
-          <name>CCM_DDS</name>
-          <attribute kind="PostPreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrePreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrefixTag" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="SpecifyIdTag" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="VersionTag" status="meta">
-            <value/>
-          </attribute>
-          <model childrelidcntr="0x2" guid="{b29cc787-8b26-4d1b-9b29-d80ec94e1613}" id="id-0065-00000045" kind="ConnectorObject" relid="0x0" role="ConnectorObject">
-            <name>DDS_Base</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="UUID">
-              <value>C61798A6-7C26-11DF-8002-000C2958D27B</value>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <model childrelidcntr="0x1" guid="{93fde27e-0d57-4d0e-8200-f5236f0e8dd4}" id="id-0065-00000046" kind="Attribute" relid="0x0" role="Attribute">
-              <name>domain_id</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{b3efb2e0-0e56-4b69-a959-99b4768435a8}" id="id-0067-00000031" kind="SetException" referred="id-0065-0000003d" relid="0x0" role="SetException">
-                <name/>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{0118c12e-990e-4960-a783-f07bf3baa3b3}" id="id-0067-00000380" kind="AttributeMember" referred="id-0067-000001d4" relid="0x0" role="AttributeMember">
-                <name/>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{41269dd5-2c55-459c-9016-7fed7a1052fb}" id="id-0065-00000047" kind="Attribute" relid="0x1" role="Attribute">
-              <name>qos_profile</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{e2f5b0fc-ccb0-4ad8-9844-98230252382c}" id="id-0067-00000032" kind="SetException" referred="id-0065-0000003d" relid="0x0" role="SetException">
-                <name/>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{70efda93-3154-472d-8f61-921da307c5b9}" id="id-0067-000001be" kind="AttributeMember" referred="id-0066-00000033" relid="0x0" role="AttributeMember">
-                <name/>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <reference guid="{9eaa85f3-f263-4b31-9982-c0f9092ea95c}" id="id-0067-000001bd" kind="RequiredRequestPort" referred="id-0065-0000005c" relid="0x0" role="RequiredRequestPort">
-              <name>error_listener</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="exclusiveProvider" status="meta">
-                <value>false</value>
-              </attribute>
-              <attribute kind="exclusiveUser" status="meta">
-                <value>false</value>
-              </attribute>
-              <attribute kind="multiple_connections">
-                <value>False</value>
-              </attribute>
-              <attribute kind="optional" status="meta">
-                <value>false</value>
-              </attribute>
-            </reference>
-          </model>
-          <model childrelidcntr="0x3" guid="{929df5a6-7abe-4e80-854e-d7eb0e88a1a1}" id="id-0065-00000048" kind="ConnectorObject" relid="0x1" role="ConnectorObject">
-            <name>DDS_TopicBase</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="UUID">
-              <value>C61798A6-7C26-11DF-8003-000C2958D27B</value>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <model childrelidcntr="0x1" guid="{ad843b0c-e8eb-4ed6-b132-436f53ff200b}" id="id-0065-00000049" kind="Attribute" relid="0x0" role="Attribute">
-              <name>topic_name</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{a5efd038-e5a5-49b1-8ea2-8db89abe9df8}" id="id-0067-00000033" kind="SetException" referred="id-0065-0000003d" relid="0x0" role="SetException">
-                <name/>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{d6f8da99-e195-4c2f-bebf-8a3ddeb926ac}" id="id-0067-000001bf" kind="AttributeMember" referred="id-0066-00000033" relid="0x0" role="AttributeMember">
-                <name/>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{c8f93226-f80b-4012-af94-2bf47910895c}" id="id-0065-0000004a" kind="Attribute" relid="0x1" role="Attribute">
-              <name>key_fields</name>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{79cecbcd-2c05-49ff-a801-658b232ceecd}" id="id-0067-00000034" kind="SetException" referred="id-0065-0000003d" relid="0x0" role="SetException">
-                <name/>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{bbb0cd1e-b990-4ae0-b1a0-625c26dfb166}" id="id-0067-00000381" kind="AttributeMember" referred="id-0067-000001d8" relid="0x0" role="AttributeMember">
-                <name/>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <reference id="id-0067-00000390" kind="ConnectorInherits" referred="id-0065-00000045" relid="0x2" role="ConnectorInherits">
-              <name>ConnectorInherits</name>
-            </reference>
-          </model>
-        </model>
-      </model>
-      <model childrelidcntr="0x1" guid="{f6ec2990-716f-4726-bd1a-49dce16c903e}" id="id-0065-0000005a" kind="File" relid="0x5">
-        <name>dds4ccm_ConnectorStatusListener</name>
-        <attribute kind="Path">
-          <value>connectors/dds4ccm/idl</value>
-        </attribute>
-        <attribute kind="PostPreprocessorDirectives" status="meta">
-          <value/>
-        </attribute>
-        <attribute kind="PrePreprocessorDirectives" status="meta">
-          <value/>
-        </attribute>
-        <attribute kind="PrefixTag" status="meta">
-          <value/>
-        </attribute>
-        <model childrelidcntr="0x1" guid="{633dfb10-2b6b-45bb-8d08-638ab70494bd}" id="id-0065-0000005b" kind="Package" relid="0x0" role="Package">
-          <name>CCM_DDS</name>
-          <attribute kind="PostPreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrePreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrefixTag" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="SpecifyIdTag" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="VersionTag" status="meta">
-            <value/>
-          </attribute>
-          <model childrelidcntr="0x6" guid="{da8dd74e-a925-4f3e-a1fa-cac45ace8b9d}" id="id-0065-0000005c" kind="Object" relid="0x0" role="Object">
-            <name>ConnectorStatusListener</name>
-            <attribute kind="InterfaceSemantics">
-              <value>local</value>
-            </attribute>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrefixTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <model childrelidcntr="0x1" guid="{7882cc5e-046d-4ae3-b649-6a2cfbf01fee}" id="id-0065-0000005d" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-              <name>on_inconsistent_topic</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{29b91f00-b74a-4af2-aa2d-42926cff9580}" id="id-0067-000001c3" kind="InParameter" referred="id-0065-0000009c" relid="0x0" role="InParameter">
-                <name>the_topic</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{1d815fc2-2786-4e43-9ff3-a28d51deb9c1}" id="id-0067-000001c4" kind="InParameter" referred="id-0065-00000082" relid="0x0" role="InParameter">
-                <name>status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{82972328-0c93-4fb1-ad63-4e57650477da}" id="id-0065-0000005e" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-              <name>on_requested_incompatible_qos</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{1c10e95c-e083-470e-be27-e77b278f0824}" id="id-0067-000001c5" kind="InParameter" referred="id-0065-000000ba" relid="0x0" role="InParameter">
-                <name>the_reader</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{f5f6cd3b-d3c6-47ea-b77c-9ed5e65d28fe}" id="id-0067-000001c6" kind="InParameter" referred="id-0065-0000008c" relid="0x0" role="InParameter">
-                <name>status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{258f94e3-04b2-4921-87b3-413d9ab90951}" id="id-0065-0000005f" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-              <name>on_sample_rejected</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{79345a69-2280-4a78-9056-afe5ad2416a5}" id="id-0067-000001c7" kind="InParameter" referred="id-0065-000000ba" relid="0x0" role="InParameter">
-                <name>the_reader</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{5a4bd54e-b7b6-4f90-9e81-c2586c53e138}" id="id-0067-000001c8" kind="InParameter" referred="id-0065-00000085" relid="0x0" role="InParameter">
-                <name>status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{7d1c8df9-94c6-4eef-aa87-94732c3629e8}" id="id-0065-00000060" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-              <name>on_offered_deadline_missed</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,360</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{42a71a0c-224d-434a-b72a-3bda842434c9}" id="id-0067-000001c9" kind="InParameter" referred="id-0065-000000ab" relid="0x0" role="InParameter">
-                <name>the_writer</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{75bd9949-8a22-49a5-8455-4d68126de471}" id="id-0067-000001ca" kind="InParameter" referred="id-0065-00000088" relid="0x0" role="InParameter">
-                <name>status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{e693cdd9-32f6-426f-86b8-b28388d10d68}" id="id-0065-00000061" kind="TwowayOperation" relid="0x4" role="TwowayOperation">
-              <name>on_offered_incompatible_qos</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,460</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{3d43c29a-58bd-42c4-ba24-f57332333d20}" id="id-0067-000001cb" kind="InParameter" referred="id-0065-000000ab" relid="0x0" role="InParameter">
-                <name>the_writer</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{538bd74f-1d95-4dc5-8e5c-17151a92b55e}" id="id-0067-000001cc" kind="InParameter" referred="id-0065-0000008b" relid="0x0" role="InParameter">
-                <name>status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{ae770844-b851-4227-94ad-e215a124851e}" id="id-0065-00000062" kind="TwowayOperation" relid="0x5" role="TwowayOperation">
-              <name>on_unexpected_status</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,560</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{3348c215-8940-4e9e-980f-5cc34bede3b1}" id="id-0067-000001cd" kind="InParameter" referred="id-0065-00000093" relid="0x0" role="InParameter">
-                <name>the_entity</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{957ae072-6620-4b92-91aa-18ad29d341a3}" id="id-0067-00000384" kind="InParameter" referred="id-0067-000001f1" relid="0x0" role="InParameter">
-                <name>status_kind</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-          </model>
-        </model>
-      </model>
-      <model childrelidcntr="0x1" guid="{4f3adb2a-cc9a-4398-8540-a53bd472e5df}" id="id-0065-00000066" kind="File" relid="0x7">
-        <name>dds4ccm_DataListenerControl</name>
-        <attribute kind="Path">
-          <value>connectors/dds4ccm/idl</value>
-        </attribute>
-        <attribute kind="PostPreprocessorDirectives" status="meta">
-          <value/>
-        </attribute>
-        <attribute kind="PrePreprocessorDirectives" status="meta">
-          <value/>
-        </attribute>
-        <attribute kind="PrefixTag" status="meta">
-          <value/>
-        </attribute>
-        <model childrelidcntr="0x1" guid="{dff4a2e0-25d9-412d-b2b7-82ceebb363e4}" id="id-0065-00000067" kind="Package" relid="0x0" role="Package">
-          <name>CCM_DDS</name>
-          <attribute kind="PostPreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrePreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrefixTag" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="SpecifyIdTag" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="VersionTag" status="meta">
-            <value/>
-          </attribute>
-          <model childrelidcntr="0x2" guid="{090ff77c-89cb-41d6-a927-b6aa4bc482b6}" id="id-0065-00000068" kind="Object" relid="0x0" role="Object">
-            <name>DataListenerControl</name>
-            <attribute kind="InterfaceSemantics">
-              <value>local</value>
-            </attribute>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrefixTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <model childrelidcntr="0x1" guid="{7b1a3436-61c1-48d3-a3f1-536487457d81}" id="id-0065-00000069" kind="Attribute" relid="0x0" role="Attribute">
-              <name>mode</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{9f8f84d9-8d4e-4739-959a-8a4c61ab4387}" id="id-0067-00000041" kind="AttributeMember" referred="id-0065-00000039" relid="0x0" role="AttributeMember">
-                <name/>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{c6536dfa-cc90-4e97-98ac-174c6892deab}" id="id-0065-0000006a" kind="Attribute" relid="0x1" role="Attribute">
-              <name>max_delivered_data</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{f9fc391e-7816-4e7d-b8e3-2b463077dbc3}" id="id-0067-000001ce" kind="AttributeMember" referred="id-0067-000001b4" relid="0x0" role="AttributeMember">
-                <name/>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-          </model>
-        </model>
-      </model>
-      <model childrelidcntr="0x1" guid="{2a99f802-8c2c-4a0c-be0f-f323a7f359f2}" id="id-0065-0000006e" kind="File" relid="0x9">
-        <name>dds4ccm_PortStatusListener</name>
-        <attribute kind="Path">
-          <value>connectors/dds4ccm/idl</value>
-        </attribute>
-        <attribute kind="PostPreprocessorDirectives" status="meta">
-          <value/>
-        </attribute>
-        <attribute kind="PrePreprocessorDirectives" status="meta">
-          <value/>
-        </attribute>
-        <attribute kind="PrefixTag" status="meta">
-          <value/>
-        </attribute>
-        <model childrelidcntr="0x1" guid="{9c2ac504-a781-4b30-a43b-9820a96d033d}" id="id-0065-0000006f" kind="Package" relid="0x0" role="Package">
-          <name>CCM_DDS</name>
-          <attribute kind="PostPreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrePreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrefixTag" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="SpecifyIdTag" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="VersionTag" status="meta">
-            <value/>
-          </attribute>
-          <model childrelidcntr="0x2" guid="{846970af-1676-4855-a75f-38bea43c18b4}" id="id-0065-00000070" kind="Object" relid="0x0" role="Object">
-            <name>PortStatusListener</name>
-            <attribute kind="InterfaceSemantics">
-              <value>local</value>
-            </attribute>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrefixTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <model childrelidcntr="0x1" guid="{e2aba88a-e59a-4a1d-a740-caf533037a94}" id="id-0065-00000071" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-              <name>on_requested_deadline_missed</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{495fcba1-fa62-49a3-9d80-9f186311b9b3}" id="id-0067-000001cf" kind="InParameter" referred="id-0065-000000ba" relid="0x0" role="InParameter">
-                <name>the_reader</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{8b892cb7-97f5-4e8e-bd50-f9f3abf4aa33}" id="id-0067-000001d0" kind="InParameter" referred="id-0065-00000089" relid="0x0" role="InParameter">
-                <name>status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{64478210-d18a-471b-be3f-3ace98685c27}" id="id-0065-00000072" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-              <name>on_sample_lost</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{04b72909-7452-4933-b6cd-b90efe528b3e}" id="id-0067-000001d1" kind="InParameter" referred="id-0065-000000ba" relid="0x0" role="InParameter">
-                <name>the_reader</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{2a95c9d6-ab99-4f97-a742-55189ecfbb55}" id="id-0067-000001d2" kind="InParameter" referred="id-0065-00000083" relid="0x0" role="InParameter">
-                <name>status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-          </model>
-        </model>
-      </model>
-      <model childrelidcntr="0x1" guid="{768e2924-97d0-49e4-b182-d580695d585b}" id="id-0065-00000076" kind="File" relid="0xb">
-        <name>dds4ccm_StateListenerControl</name>
-        <attribute kind="Path">
-          <value>connectors/dds4ccm/idl</value>
-        </attribute>
-        <attribute kind="PostPreprocessorDirectives" status="meta">
-          <value/>
-        </attribute>
-        <attribute kind="PrePreprocessorDirectives" status="meta">
-          <value/>
-        </attribute>
-        <attribute kind="PrefixTag" status="meta">
-          <value/>
-        </attribute>
-        <model childrelidcntr="0x1" guid="{af3c382b-cfef-4c8e-872b-6784d3580514}" id="id-0065-00000077" kind="Package" relid="0x0" role="Package">
-          <name>CCM_DDS</name>
-          <attribute kind="PostPreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrePreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrefixTag" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="SpecifyIdTag" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="VersionTag" status="meta">
-            <value/>
-          </attribute>
-          <model childrelidcntr="0x2" guid="{c5c6d8fb-caaa-4e16-a1d2-46560b3ba292}" id="id-0065-00000078" kind="Object" relid="0x0" role="Object">
-            <name>StateListenerControl</name>
-            <attribute kind="InterfaceSemantics">
-              <value>local</value>
-            </attribute>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrefixTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <model childrelidcntr="0x1" guid="{cb32524d-b746-4462-9a83-47bc84c72aba}" id="id-0065-00000079" kind="Attribute" relid="0x0" role="Attribute">
-              <name>is_filter_interpreted</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{cd30567b-74f9-4aae-97a1-9f58e29f2b23}" id="id-0067-000001d3" kind="AttributeMember" referred="id-0066-00000023" relid="0x0" role="AttributeMember">
-                <name/>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <reference guid="{a73c26e3-7c5f-4e12-97e7-c1aa98be57f2}" id="id-0067-00000044" kind="Inherits" referred="id-0065-00000068" relid="0x1" role="Inherits">
-              <name>Inherits</name>
-            </reference>
-          </model>
-        </model>
-      </model>
-      <model childrelidcntr="0x1" guid="{b752d754-9e41-4e14-a36e-919b1ee7cd89}" id="id-0065-0000007d" kind="File" relid="0xd">
-        <name>dds_rtf2_dcps</name>
-        <attribute kind="Path">
-          <value>connectors/dds4ccm/idl</value>
-        </attribute>
-        <attribute kind="PostPreprocessorDirectives" status="meta">
-          <value/>
-        </attribute>
-        <attribute kind="PrePreprocessorDirectives" status="meta">
-          <value/>
-        </attribute>
-        <attribute kind="PrefixTag" status="meta">
-          <value/>
-        </attribute>
-        <model childrelidcntr="0x57" guid="{6159b4d6-7d7b-4f62-acbd-b40c9258f224}" id="id-0065-0000007e" kind="Package" relid="0x0" role="Package">
-          <name>DDS</name>
-          <attribute kind="PostPreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrePreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrefixTag" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="SpecifyIdTag" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="VersionTag" status="meta">
-            <value/>
-          </attribute>
-          <model childrelidcntr="0x2" guid="{a5b03cad-ef21-4083-922b-2ab35bb09683}" id="id-0065-0000007f" kind="Aggregate" relid="0x0" role="Aggregate">
-            <name>BuiltinTopicKey_t</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference id="id-0067-0000038f" kind="Member" referred="id-0067-0000038e" relid="0x1" role="Member">
-              <name>value</name>
-              <regnode name="PartRegs">
-                <value/>
-                <regnode name="InterfaceDefinition">
-                  <value/>
-                  <regnode name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <model childrelidcntr="0x1" guid="{c25f412d-47d0-4004-82a1-97aca23f80c2}" id="id-0065-00000080" kind="Aggregate" relid="0x1" role="Aggregate">
-            <name>Duration_t</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{4249a059-015c-4349-9139-c647a1fa2d40}" id="id-0067-000001d9" kind="Member" referred="id-0066-00000028" relid="0x0" role="Member">
-              <name>sec</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{1f465721-a2e5-4476-85c8-187f26c707b0}" id="id-0067-000001da" kind="Member" referred="id-0066-0000002b" relid="0x0" role="Member">
-              <name>nanosec</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <model childrelidcntr="0x1" guid="{d7b87f17-977a-4be0-9091-944d13e2abef}" id="id-0065-00000081" kind="Aggregate" relid="0x2" role="Aggregate">
-            <name>Time_t</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{a0263a6d-9891-4948-be8c-8b143eb61ebc}" id="id-0067-000001db" kind="Member" referred="id-0066-00000028" relid="0x0" role="Member">
-              <name>sec</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{dbaf34cb-cfac-42d4-aaed-03350e4224e3}" id="id-0067-000001dc" kind="Member" referred="id-0066-0000002b" relid="0x0" role="Member">
-              <name>nanosec</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <model childrelidcntr="0x1" guid="{8d4c6c71-0536-4c64-9850-775867425145}" id="id-0065-00000082" kind="Aggregate" relid="0x3" role="Aggregate">
-            <name>InconsistentTopicStatus</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{e184c237-4a17-48c5-8959-4114ffcbd4ad}" id="id-0067-00000202" kind="Member" referred="id-0066-00000028" relid="0x0" role="Member">
-              <name>total_count</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{81bac9f7-c709-43bd-8a49-66513505d5a7}" id="id-0067-00000203" kind="Member" referred="id-0066-00000028" relid="0x0" role="Member">
-              <name>total_count_change</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <model childrelidcntr="0x1" guid="{477c1c4d-6625-4047-ad1b-049f98ea2c66}" id="id-0065-00000083" kind="Aggregate" relid="0x4" role="Aggregate">
-            <name>SampleLostStatus</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{a26d5d65-edb9-4f2d-8c1a-fc92878f82c3}" id="id-0067-00000204" kind="Member" referred="id-0066-00000028" relid="0x0" role="Member">
-              <name>total_count</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{47b47e09-61d7-49ac-a95c-3e31690da56c}" id="id-0067-00000205" kind="Member" referred="id-0066-00000028" relid="0x0" role="Member">
-              <name>total_count_change</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <model childrelidcntr="0x4" guid="{41e84200-639f-4863-9cc4-525be2ee68fe}" id="id-0065-00000084" kind="Enum" relid="0x5" role="Enum">
-            <name>SampleRejectedStatusKind</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <atom guid="{1ca8c1cc-a038-44a2-8fe6-8012da8f2d3b}" id="id-0066-0000000c" kind="EnumValue" relid="0x0" role="EnumValue">
-              <name>NOT_REJECTED</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </atom>
-            <atom guid="{5c62b917-c1a5-44c4-bf43-a62d8fc5ed69}" id="id-0066-0000000d" kind="EnumValue" relid="0x1" role="EnumValue">
-              <name>REJECTED_BY_INSTANCES_LIMIT</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </atom>
-            <atom guid="{2fd82d72-0967-419a-851b-512f4fb4386f}" id="id-0066-0000000e" kind="EnumValue" relid="0x2" role="EnumValue">
-              <name>REJECTED_BY_SAMPLES_LIMIT</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </atom>
-            <atom guid="{fac2dfa4-72a9-4188-8bab-56473e6dec96}" id="id-0066-0000000f" kind="EnumValue" relid="0x3" role="EnumValue">
-              <name>REJECTED_BY_SAMPLES_PER_INSTANCE_LIMIT</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,360</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </atom>
-          </model>
-          <model childrelidcntr="0x1" guid="{f2a168c3-4719-4d0a-b560-b46dac88b5be}" id="id-0065-00000085" kind="Aggregate" relid="0x6" role="Aggregate">
-            <name>SampleRejectedStatus</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{2747eab6-65b3-48f8-bdc2-07a15a0da61b}" id="id-0067-00000046" kind="Member" referred="id-0065-00000084" relid="0x0" role="Member">
-              <name>last_reason</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{d0e39512-4e45-435e-8284-7a7233e5a757}" id="id-0067-00000206" kind="Member" referred="id-0066-00000028" relid="0x0" role="Member">
-              <name>total_count</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{5654f0f9-6fbf-4f0e-a540-63987c47380e}" id="id-0067-00000207" kind="Member" referred="id-0066-00000028" relid="0x0" role="Member">
-              <name>total_count_change</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{14c0ee38-4c2f-43bf-9124-563e0abc2b0b}" id="id-0067-00000208" kind="Member" referred="id-0067-00000167" relid="0x0" role="Member">
-              <name>last_instance_handle</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,360</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <model childrelidcntr="0x1" guid="{d0dc1307-a10d-4a65-b01f-aa1a0d6ed20a}" id="id-0065-00000086" kind="Aggregate" relid="0x7" role="Aggregate">
-            <name>LivelinessLostStatus</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{9453bb3b-d71a-425c-9c15-cc87630f5c4e}" id="id-0067-00000209" kind="Member" referred="id-0066-00000028" relid="0x0" role="Member">
-              <name>total_count</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{3d412127-8425-48d4-8dc5-a5e739d3c7cc}" id="id-0067-0000020a" kind="Member" referred="id-0066-00000028" relid="0x0" role="Member">
-              <name>total_count_change</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <model childrelidcntr="0x1" guid="{9254f504-2700-4569-93f3-c03d9b61ed81}" id="id-0065-00000087" kind="Aggregate" relid="0x8" role="Aggregate">
-            <name>LivelinessChangedStatus</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{4b14f82d-bb06-42fd-8162-787055f30596}" id="id-0067-0000020b" kind="Member" referred="id-0066-00000028" relid="0x0" role="Member">
-              <name>alive_count</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{49bd96aa-52e4-4912-91ef-dda97895c3a3}" id="id-0067-0000020c" kind="Member" referred="id-0066-00000028" relid="0x0" role="Member">
-              <name>not_alive_count</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{c30d7c42-fb36-4109-bad2-91bd904173bf}" id="id-0067-0000020d" kind="Member" referred="id-0066-00000028" relid="0x0" role="Member">
-              <name>alive_count_change</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{11957c4f-c294-456e-be08-9677f4370e81}" id="id-0067-0000020e" kind="Member" referred="id-0066-00000028" relid="0x0" role="Member">
-              <name>not_alive_count_change</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,360</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{4d321c30-dccc-4f1f-9f5b-666417af0d1b}" id="id-0067-0000020f" kind="Member" referred="id-0067-00000167" relid="0x0" role="Member">
-              <name>last_publication_handle</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,460</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <model childrelidcntr="0x1" guid="{ff404a73-66eb-4bb8-a94e-b11c999b79ee}" id="id-0065-00000088" kind="Aggregate" relid="0x9" role="Aggregate">
-            <name>OfferedDeadlineMissedStatus</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{40978a0e-e00b-42e5-bc09-e565784b221c}" id="id-0067-00000210" kind="Member" referred="id-0066-00000028" relid="0x0" role="Member">
-              <name>total_count</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{b5e7ff62-6ad1-4ea3-a1ad-4be218ba0a75}" id="id-0067-00000211" kind="Member" referred="id-0066-00000028" relid="0x0" role="Member">
-              <name>total_count_change</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{9e7ec43a-270d-4403-aece-470e6f84c159}" id="id-0067-00000212" kind="Member" referred="id-0067-00000167" relid="0x0" role="Member">
-              <name>last_instance_handle</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <model childrelidcntr="0x1" guid="{43d167dc-af08-4dcb-ad53-82442cb9eed9}" id="id-0065-00000089" kind="Aggregate" relid="0xa" role="Aggregate">
-            <name>RequestedDeadlineMissedStatus</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{659375ea-d3d6-4a59-8176-671dac36def7}" id="id-0067-00000213" kind="Member" referred="id-0066-00000028" relid="0x0" role="Member">
-              <name>total_count</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{cc844a3b-91d3-45bc-8534-71a9b174f452}" id="id-0067-00000214" kind="Member" referred="id-0066-00000028" relid="0x0" role="Member">
-              <name>total_count_change</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{2c893c41-ac52-4ddc-993f-fbee4caa1603}" id="id-0067-00000215" kind="Member" referred="id-0067-00000167" relid="0x0" role="Member">
-              <name>last_instance_handle</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <model childrelidcntr="0x1" guid="{e89fea34-133b-4b0c-bce3-7d283cd5af96}" id="id-0065-0000008a" kind="Aggregate" relid="0xb" role="Aggregate">
-            <name>QosPolicyCount</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{a78c98e1-d747-463c-a1d7-af5d695e1e0e}" id="id-0067-00000216" kind="Member" referred="id-0067-000001d7" relid="0x0" role="Member">
-              <name>policy_id</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{680f80fb-bf72-4d79-8897-d35a225f9368}" id="id-0067-00000217" kind="Member" referred="id-0066-00000028" relid="0x0" role="Member">
-              <name>count</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <model childrelidcntr="0x1" guid="{c88e3a59-17ff-4108-875b-7535cb293858}" id="id-0065-0000008b" kind="Aggregate" relid="0xc" role="Aggregate">
-            <name>OfferedIncompatibleQosStatus</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{53f69b13-a147-47af-8558-f9b6c3129f9d}" id="id-0067-00000048" kind="Member" referred="id-0067-00000047" relid="0x0" role="Member">
-              <name>policies</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,360</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{01aafd7d-429f-495a-ae47-fd37ed99122a}" id="id-0067-00000218" kind="Member" referred="id-0066-00000028" relid="0x0" role="Member">
-              <name>total_count</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{e52be414-0737-4bb8-9ee1-fe8f17cae070}" id="id-0067-00000219" kind="Member" referred="id-0066-00000028" relid="0x0" role="Member">
-              <name>total_count_change</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{f8707b10-8d0c-4add-90ea-a4fd6422cf04}" id="id-0067-0000021a" kind="Member" referred="id-0067-000001d7" relid="0x0" role="Member">
-              <name>last_policy_id</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <model childrelidcntr="0x1" guid="{56377413-92e4-472a-90a9-71c28539f15b}" id="id-0065-0000008c" kind="Aggregate" relid="0xd" role="Aggregate">
-            <name>RequestedIncompatibleQosStatus</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{ddf0bbc1-8477-4303-b7ca-0d358c381535}" id="id-0067-00000049" kind="Member" referred="id-0067-00000047" relid="0x0" role="Member">
-              <name>policies</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,360</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{ec6e0a1c-f3b4-4152-8c0f-cf1688878463}" id="id-0067-0000021b" kind="Member" referred="id-0066-00000028" relid="0x0" role="Member">
-              <name>total_count</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{2d002650-9d63-48d5-a296-bf41ee91abf2}" id="id-0067-0000021c" kind="Member" referred="id-0066-00000028" relid="0x0" role="Member">
-              <name>total_count_change</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{5ed8833c-ac09-4483-9ed2-01c8b0d0a39d}" id="id-0067-0000021d" kind="Member" referred="id-0067-000001d7" relid="0x0" role="Member">
-              <name>last_policy_id</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <model childrelidcntr="0x1" guid="{2c2c71b4-dddf-4f35-bfd1-50b65509ebdd}" id="id-0065-0000008d" kind="Aggregate" relid="0xe" role="Aggregate">
-            <name>PublicationMatchedStatus</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{eb99edd9-bcd8-483a-b588-ae830734ed0e}" id="id-0067-0000021e" kind="Member" referred="id-0066-00000028" relid="0x0" role="Member">
-              <name>total_count</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{f12a6ed0-8be3-4aaa-93b0-b1ed1cf009c2}" id="id-0067-0000021f" kind="Member" referred="id-0066-00000028" relid="0x0" role="Member">
-              <name>total_count_change</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{62c7e48b-ae99-43fa-8218-d054c79f6dcd}" id="id-0067-00000220" kind="Member" referred="id-0066-00000028" relid="0x0" role="Member">
-              <name>current_count</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{501da5cb-155e-4954-94e2-4cefec1109d6}" id="id-0067-00000221" kind="Member" referred="id-0066-00000028" relid="0x0" role="Member">
-              <name>current_count_change</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,360</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{74cd297f-c4c3-48b1-9ef0-784b0e30c5d6}" id="id-0067-00000222" kind="Member" referred="id-0067-00000167" relid="0x0" role="Member">
-              <name>last_subscription_handle</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,460</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <model childrelidcntr="0x1" guid="{a3904686-138a-4a85-83ec-0d91c721912a}" id="id-0065-0000008e" kind="Aggregate" relid="0xf" role="Aggregate">
-            <name>SubscriptionMatchedStatus</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{37a0d63c-fcc2-4ec0-bd04-0445d48c120e}" id="id-0067-00000223" kind="Member" referred="id-0066-00000028" relid="0x0" role="Member">
-              <name>total_count</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{7b6a054b-ecf3-4dfa-ba59-14dfbe089576}" id="id-0067-00000224" kind="Member" referred="id-0066-00000028" relid="0x0" role="Member">
-              <name>total_count_change</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{cb21e320-eb39-49dd-aea1-a456bea93be6}" id="id-0067-00000225" kind="Member" referred="id-0066-00000028" relid="0x0" role="Member">
-              <name>current_count</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{dbf559ef-9da3-4929-89c9-7d3a4d9f46eb}" id="id-0067-00000226" kind="Member" referred="id-0066-00000028" relid="0x0" role="Member">
-              <name>current_count_change</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,360</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{601d70a5-e20d-4ec6-b055-4f91a6c89285}" id="id-0067-00000227" kind="Member" referred="id-0067-00000167" relid="0x0" role="Member">
-              <name>last_publication_handle</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,460</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <model childrelidcntr="0x1" guid="{763fd3a6-9b56-4284-93d5-1544fb78a6c2}" id="id-0065-0000008f" kind="Aggregate" relid="0x10" role="Aggregate">
-            <name>ReliableReaderActivityChangedStatus</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{6d73f6f0-4b2a-4d36-85e3-37f3c0ded980}" id="id-0067-00000228" kind="Member" referred="id-0066-00000028" relid="0x0" role="Member">
-              <name>active_count</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{13945772-0a96-4cba-ae2e-e5b168075ee3}" id="id-0067-00000229" kind="Member" referred="id-0066-00000028" relid="0x0" role="Member">
-              <name>inactive_count</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{4f05037b-b956-4b09-9c52-30f891dd4849}" id="id-0067-0000022a" kind="Member" referred="id-0066-00000028" relid="0x0" role="Member">
-              <name>active_count_change</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{c39f1a60-aacc-4450-b3f2-7786959cf62b}" id="id-0067-0000022b" kind="Member" referred="id-0066-00000028" relid="0x0" role="Member">
-              <name>inactive_count_change</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,360</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{3e56fe6b-bf13-4dcc-9296-42a5b6e0f6b4}" id="id-0067-0000022c" kind="Member" referred="id-0067-00000167" relid="0x0" role="Member">
-              <name>last_instance_handle</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,460</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <model childrelidcntr="0x1" guid="{189a004d-1843-4899-8fa7-10a12c89fcab}" id="id-0065-00000090" kind="Aggregate" relid="0x11" role="Aggregate">
-            <name>ReliableWriterCacheEventCount</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{5eb39167-0ac1-4736-bd26-c155bcd56a85}" id="id-0067-0000022d" kind="Member" referred="id-0066-00000028" relid="0x0" role="Member">
-              <name>total_count</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{222fb828-d06c-47d4-9db6-adaad3a0ba3a}" id="id-0067-0000022e" kind="Member" referred="id-0066-00000028" relid="0x0" role="Member">
-              <name>total_count_change</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <model childrelidcntr="0x1" guid="{438dc305-e48b-42eb-b104-295744b3b57b}" id="id-0065-00000091" kind="Aggregate" relid="0x12" role="Aggregate">
-            <name>ReliableWriterCacheChangedStatus</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{254a14d0-36de-4b30-bfe5-3e6b1e383613}" id="id-0067-0000004a" kind="Member" referred="id-0065-00000090" relid="0x0" role="Member">
-              <name>empty_reliable_writer_cache</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{12c63f1a-c9aa-4b27-9e7d-b78a381183e5}" id="id-0067-0000004b" kind="Member" referred="id-0065-00000090" relid="0x0" role="Member">
-              <name>full_reliable_writer_cache</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{928fd414-705b-4bd9-82fa-62db0e7c2a62}" id="id-0067-0000004c" kind="Member" referred="id-0065-00000090" relid="0x0" role="Member">
-              <name>low_watermark_reliable_writer_cache</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{f7f2e72d-9d9d-453b-be78-79fb5f5c4744}" id="id-0067-0000004d" kind="Member" referred="id-0065-00000090" relid="0x0" role="Member">
-              <name>high_watermark_reliable_writer_cache</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,360</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{c93d2194-f2e8-4024-8318-cae098b46aca}" id="id-0067-0000022f" kind="Member" referred="id-0066-00000028" relid="0x0" role="Member">
-              <name>unacknowledged_sample_count</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,460</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{9ac5831c-f9bd-4d4b-9963-f7e01fc0b141}" id="id-0067-00000230" kind="Member" referred="id-0066-00000028" relid="0x0" role="Member">
-              <name>unacknowledged_sample_count_peak</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,560</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <model childrelidcntr="0x0" guid="{f8027bdb-3f5e-42e8-8ab5-09488c655dda}" id="id-0065-00000092" kind="Object" relid="0x13" role="Object">
-            <name>Listener</name>
-            <attribute kind="InterfaceSemantics">
-              <value>local</value>
-            </attribute>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrefixTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-          </model>
-          <model childrelidcntr="0x4" guid="{3fc48051-8ef3-4e8f-a50f-aca9fa66774d}" id="id-0065-00000093" kind="Object" relid="0x14" role="Object">
-            <name>Entity</name>
-            <attribute kind="InterfaceSemantics">
-              <value>local</value>
-            </attribute>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrefixTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <model childrelidcntr="0x1" guid="{37f77090-3e8c-4924-a64a-378829cdbf7b}" id="id-0065-00000094" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-              <name>enable</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{c38bcd20-1e89-4657-94cc-5efa85b9c2f8}" id="id-0067-00000231" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{4fdecb27-0c35-4eb8-8286-947bb4e0fe5b}" id="id-0065-00000095" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-              <name>get_statuscondition</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{14c67b3e-0e96-453f-9a16-a69ed9615ffe}" id="id-0067-00000232" kind="ReturnType" referred="id-0065-00000111" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{79239a78-be48-45db-8ae8-0592dca31355}" id="id-0065-00000096" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-              <name>get_status_changes</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{6acfc95d-65f9-4cda-a0ed-62dd3f2374c5}" id="id-0067-00000233" kind="ReturnType" referred="id-0067-000001f2" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{77725c52-dc35-4efe-a66c-633af883860a}" id="id-0065-00000097" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-              <name>get_instance_handle</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,360</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{b8866053-8666-4021-815c-e623148034dd}" id="id-0067-00000234" kind="ReturnType" referred="id-0067-00000167" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-          </model>
-          <model childrelidcntr="0x3" guid="{7acee41b-3015-491c-a696-bfedaa9963e1}" id="id-0065-00000098" kind="Object" relid="0x15" role="Object">
-            <name>TopicDescription</name>
-            <attribute kind="InterfaceSemantics">
-              <value>local</value>
-            </attribute>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrefixTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <model childrelidcntr="0x1" guid="{47f9ef74-bb3c-44c2-a901-5b67615f168c}" id="id-0065-00000099" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-              <name>get_type_name</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{f4b8d2dc-c32d-4112-b4a3-c7c3a3f0e69d}" id="id-0067-00000235" kind="ReturnType" referred="id-0066-00000033" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{ce550fbe-44e3-4d1f-8a83-36113be0bf40}" id="id-0065-0000009a" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-              <name>get_name</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{8f7e62ff-51c5-4125-9aeb-e9f40044a1f3}" id="id-0067-00000236" kind="ReturnType" referred="id-0066-00000033" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{aebbe005-9458-4808-a804-68743be3b8da}" id="id-0065-0000009b" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-              <name>get_participant</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{0afcd804-47fe-4c8c-bfbd-16b81cf907b3}" id="id-0067-00000237" kind="ReturnType" referred="id-0065-00000146" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-          </model>
-          <model childrelidcntr="0x6" guid="{1513a26f-41cf-4f33-bc0d-453acf586e69}" id="id-0065-0000009c" kind="Object" relid="0x16" role="Object">
-            <name>Topic</name>
-            <attribute kind="InterfaceSemantics">
-              <value>local</value>
-            </attribute>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrefixTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <model childrelidcntr="0x1" guid="{7c385dbf-8514-4e9f-9b8d-e4036f71b57a}" id="id-0065-0000009d" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-              <name>set_qos</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{7e8c5d5a-8861-430d-b509-5cafd8118cc3}" id="id-0067-00000238" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{d4e3d371-a644-4ed5-a1ba-8801ce340a9d}" id="id-0067-00000239" kind="InParameter" referred="id-0065-0000013d" relid="0x0" role="InParameter">
-                <name>qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{2c8512d5-aef0-4292-8ec3-5578e9bd97c0}" id="id-0065-0000009e" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-              <name>get_qos</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{52a9e0ae-f407-4e21-b24c-0f27102fce7d}" id="id-0067-0000023a" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{7e95ac3b-ad35-4e30-b741-4d2029bc1153}" id="id-0067-0000023b" kind="InoutParameter" referred="id-0065-0000013d" relid="0x0" role="InoutParameter">
-                <name>qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{9cdc4a9b-cdce-42d3-b440-b803850fa319}" id="id-0065-0000009f" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-              <name>set_listener</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{07bcd3c9-f216-418f-99c3-86b56c601eae}" id="id-0067-0000023c" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{f4c3cae0-5b5c-4238-9f7b-6ecdcf5b8b89}" id="id-0067-0000023d" kind="InParameter" referred="id-0065-000000f3" relid="0x0" role="InParameter">
-                <name>a_listener</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{64a2df6d-e0a0-4d65-9c33-ec2da6f921a1}" id="id-0067-0000023e" kind="InParameter" referred="id-0067-000001f2" relid="0x0" role="InParameter">
-                <name>mask</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>260,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{9537ee1d-3a24-4448-95a7-362da20940ce}" id="id-0065-000000a0" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-              <name>get_listener</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,360</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{e482526c-2533-49e4-8a38-9a899057428f}" id="id-0067-0000023f" kind="ReturnType" referred="id-0065-000000f3" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{b2ffb576-5688-4807-b934-4f44f570d63c}" id="id-0065-000000a1" kind="TwowayOperation" relid="0x4" role="TwowayOperation">
-              <name>get_inconsistent_topic_status</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,460</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{f4c39c16-4506-45c0-9c24-c51267f78f51}" id="id-0067-0000004e" kind="InoutParameter" referred="id-0065-00000082" relid="0x0" role="InoutParameter">
-                <name>a_status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{c36ce585-f418-43ac-8890-d430daa2c078}" id="id-0067-00000240" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <reference guid="{05ff6b9f-53a9-4836-a396-33ca2d536404}" id="id-0067-0000004f" kind="Inherits" referred="id-0065-00000093" relid="0x5" role="Inherits">
-              <name>Inherits</name>
-            </reference>
-            <reference guid="{0b7b4c65-7f41-4aee-9f49-d1cb418ed5bd}" id="id-0067-00000050" kind="Inherits" referred="id-0065-00000098" relid="0x5" role="Inherits">
-              <name>Inherits</name>
-            </reference>
-          </model>
-          <model childrelidcntr="0x5" guid="{4519d714-cb1e-4ecb-bfad-1efad7a5148e}" id="id-0065-000000a2" kind="Object" relid="0x17" role="Object">
-            <name>ContentFilteredTopic</name>
-            <attribute kind="InterfaceSemantics">
-              <value>local</value>
-            </attribute>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrefixTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <model childrelidcntr="0x1" guid="{f74964a8-b61b-437c-a1d8-3092e88c392b}" id="id-0065-000000a3" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-              <name>get_filter_expression</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{5b987a95-3d0b-418c-8ca8-f2e65ee355d8}" id="id-0067-00000241" kind="ReturnType" referred="id-0066-00000033" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{ced05860-39f6-4a16-a2ae-04fc3bb5015a}" id="id-0065-000000a4" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-              <name>get_expression_parameters</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{f9164bd9-18e0-4f3c-bb91-f57d1727a055}" id="id-0067-00000242" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{be1a771a-f6ad-49ca-8d37-b5ba85078272}" id="id-0067-00000243" kind="InoutParameter" referred="id-0067-000001d8" relid="0x0" role="InoutParameter">
-                <name>expression_parameters</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{62800662-7ae4-48a1-837e-07a83ab4d863}" id="id-0065-000000a5" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-              <name>set_expression_parameters</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{29f41b68-9d52-47ad-a07c-3c227fe54954}" id="id-0067-00000244" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{6ba3e11c-de03-49cb-98c8-0b732bbda9ef}" id="id-0067-00000245" kind="InParameter" referred="id-0067-000001d8" relid="0x0" role="InParameter">
-                <name>expression_parameters</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{f89c4835-6002-4e00-b33d-02ecddfe8b71}" id="id-0065-000000a6" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-              <name>get_related_topic</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,360</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{cc3d38e3-2e8a-4b95-9159-a408db3f4cf8}" id="id-0067-00000051" kind="ReturnType" referred="id-0065-0000009c" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <reference guid="{6227c533-9113-45c3-bac0-550d056c3c9e}" id="id-0067-00000052" kind="Inherits" referred="id-0065-00000098" relid="0x4" role="Inherits">
-              <name>Inherits</name>
-            </reference>
-          </model>
-          <model childrelidcntr="0x4" guid="{0f4b4aa3-418d-424e-8be1-2311617dcbf2}" id="id-0065-000000a7" kind="Object" relid="0x18" role="Object">
-            <name>MultiTopic</name>
-            <attribute kind="InterfaceSemantics">
-              <value>local</value>
-            </attribute>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrefixTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <model childrelidcntr="0x1" guid="{98bec281-8398-46f9-af91-4f4220b9fd80}" id="id-0065-000000a8" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-              <name>get_subscription_expression</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{35c1f5b1-72f9-4651-8a22-2f79041ddc4e}" id="id-0067-00000246" kind="ReturnType" referred="id-0066-00000033" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{614b535e-aaa3-4539-b615-6e4818bad6f0}" id="id-0065-000000a9" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-              <name>get_expression_parameters</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{c174c042-2ead-46b5-812e-f933a9e431f8}" id="id-0067-00000247" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{8743fd10-4d33-4f47-8e99-29a35214f615}" id="id-0067-00000248" kind="InoutParameter" referred="id-0067-000001d8" relid="0x0" role="InoutParameter">
-                <name>expression_parameters</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{d90029a3-0ce6-4b5a-a5f0-6b35cf55adcf}" id="id-0065-000000aa" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-              <name>set_expression_parameters</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{87dd0a91-9db6-4325-b320-5aec593dd698}" id="id-0067-00000249" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{34737b11-e434-4d96-a3d8-c09985a95ff7}" id="id-0067-0000024a" kind="InParameter" referred="id-0067-000001d8" relid="0x0" role="InParameter">
-                <name>expression_parameters</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <reference guid="{cf64023a-355c-4206-970d-78254da32458}" id="id-0067-00000053" kind="Inherits" referred="id-0065-00000098" relid="0x3" role="Inherits">
-              <name>Inherits</name>
-            </reference>
-          </model>
-          <model childrelidcntr="0xf" guid="{b06f71dd-0286-4ae8-af83-414fd2f115e1}" id="id-0065-000000ab" kind="Object" relid="0x19" role="Object">
-            <name>DataWriter</name>
-            <attribute kind="InterfaceSemantics">
-              <value>local</value>
-            </attribute>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrefixTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <model childrelidcntr="0x1" guid="{03e60fae-d7ec-4096-a3e0-308a9ac0684e}" id="id-0065-000000ac" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-              <name>set_qos</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{66921089-3b93-420d-9d09-e983d0c3fccb}" id="id-0067-0000024b" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{40be1f9d-d188-4b06-b3d8-d019165a2031}" id="id-0067-0000024c" kind="InParameter" referred="id-0065-0000013e" relid="0x0" role="InParameter">
-                <name>qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{1be41d0f-9bea-4f28-afe8-fd0f97234fed}" id="id-0065-000000ad" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-              <name>get_qos</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{a172233d-bf1e-4669-821d-f80937375164}" id="id-0067-0000024d" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{a260f328-f446-4d9c-9704-d68f156d3d50}" id="id-0067-0000024e" kind="InoutParameter" referred="id-0065-0000013e" relid="0x0" role="InoutParameter">
-                <name>qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{d541075f-8cad-4036-869d-47204ccd947d}" id="id-0065-000000ae" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-              <name>set_listener</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{8aca85ab-f235-4a2d-88ca-fa93c53483d0}" id="id-0067-0000024f" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{0a53e61f-3a3f-4a58-a868-df00a3ef2a13}" id="id-0067-00000250" kind="InParameter" referred="id-0065-000000f5" relid="0x0" role="InParameter">
-                <name>a_listener</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{86f347c1-0283-4d58-bd0b-eb50215dfaf8}" id="id-0067-00000251" kind="InParameter" referred="id-0067-000001f2" relid="0x0" role="InParameter">
-                <name>mask</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>260,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{e960875e-f4de-4dbe-807f-96ff38898542}" id="id-0065-000000af" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-              <name>get_listener</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,360</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{3f1e29b1-c420-4588-b32b-8b176bb7625c}" id="id-0067-00000252" kind="ReturnType" referred="id-0065-000000f5" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{21be9e68-5bbb-4898-8d96-cff5e882597c}" id="id-0065-000000b0" kind="TwowayOperation" relid="0x4" role="TwowayOperation">
-              <name>get_topic</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,460</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{88cf4104-533a-42e2-9532-14ade65ada92}" id="id-0067-00000054" kind="ReturnType" referred="id-0065-0000009c" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{11d1d9c9-263c-4cfd-a6f7-33b47dcb8736}" id="id-0065-000000b1" kind="TwowayOperation" relid="0x5" role="TwowayOperation">
-              <name>get_publisher</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,560</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{6a12959c-234a-46b8-89ea-923efc30c87d}" id="id-0067-00000253" kind="ReturnType" referred="id-0065-000000e0" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{c98e7e74-8fcf-415f-bd37-c97cd4f7182f}" id="id-0065-000000b2" kind="TwowayOperation" relid="0x6" role="TwowayOperation">
-              <name>wait_for_acknowledgments</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,660</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{27a2f532-fede-463a-a5dc-f8cbb9fde023}" id="id-0067-00000055" kind="InParameter" referred="id-0065-00000080" relid="0x0" role="InParameter">
-                <name>max_wait</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{e3f34ddd-cefd-409c-8a37-080012a60cd2}" id="id-0067-00000254" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{54cadb57-5f14-41e7-9f7c-b0af1097dc14}" id="id-0065-000000b3" kind="TwowayOperation" relid="0x7" role="TwowayOperation">
-              <name>get_liveliness_lost_status</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,760</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{07cf7dba-714b-48cf-a8c5-599ae57c3941}" id="id-0067-00000056" kind="InoutParameter" referred="id-0065-00000086" relid="0x0" role="InoutParameter">
-                <name>status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{588ee479-1971-4d22-99b4-fda31545c49a}" id="id-0067-00000255" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{9546b16e-5df7-40fc-b2f9-5710df09a4da}" id="id-0065-000000b4" kind="TwowayOperation" relid="0x8" role="TwowayOperation">
-              <name>get_offered_deadline_missed_status</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,860</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{3285d48a-a6ba-4c99-880b-c0563ed2da97}" id="id-0067-00000057" kind="InoutParameter" referred="id-0065-00000088" relid="0x0" role="InoutParameter">
-                <name>status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{1212d1c6-f9c6-4d27-8461-e5b06ba811bd}" id="id-0067-00000256" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{0c5e9011-e170-44b4-ac2e-450219040898}" id="id-0065-000000b5" kind="TwowayOperation" relid="0x9" role="TwowayOperation">
-              <name>get_offered_incompatible_qos_status</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,960</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{8bbe6930-9292-46d7-a01e-60f8c6ac69fe}" id="id-0067-00000058" kind="InoutParameter" referred="id-0065-0000008b" relid="0x0" role="InoutParameter">
-                <name>status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{58d3582f-037b-4be8-aa65-f39993307301}" id="id-0067-00000257" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{b7413953-2322-422b-b920-ac083e2e442f}" id="id-0065-000000b6" kind="TwowayOperation" relid="0xa" role="TwowayOperation">
-              <name>get_publication_matched_status</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1060</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{3cd41ec7-c494-43d7-b9e2-f13e0e008c9d}" id="id-0067-00000059" kind="InoutParameter" referred="id-0065-0000008d" relid="0x0" role="InoutParameter">
-                <name>status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{5478d02f-8641-4493-801c-72f72e3d7513}" id="id-0067-00000258" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{d508c7f9-ce6f-480f-981c-9ae6984b38b0}" id="id-0065-000000b7" kind="TwowayOperation" relid="0xb" role="TwowayOperation">
-              <name>assert_liveliness</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{402cfdd7-adf7-44f5-aeeb-69c088ce010f}" id="id-0067-00000259" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{51711f31-8793-4171-ad92-715c15b342a7}" id="id-0065-000000b8" kind="TwowayOperation" relid="0xc" role="TwowayOperation">
-              <name>get_matched_subscriptions</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{d1a4d556-9a9c-42a3-a693-a04cd53e0a6f}" id="id-0067-0000025a" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{376a6c69-0e21-40b6-96d9-5126c4983691}" id="id-0067-0000025b" kind="InoutParameter" referred="id-0067-00000168" relid="0x0" role="InoutParameter">
-                <name>subscription_handles</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{3180ae88-c33d-4ad9-8eb5-e12f78ff97f4}" id="id-0065-000000b9" kind="TwowayOperation" relid="0xd" role="TwowayOperation">
-              <name>get_matched_subscription_data</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1360</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{80b2092b-af96-4601-9823-3990c3aa0577}" id="id-0067-0000025c" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{07f081be-d49c-453a-a416-c9104a68f015}" id="id-0067-0000025d" kind="InoutParameter" referred="id-0065-00000145" relid="0x0" role="InoutParameter">
-                <name>subscription_data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{3e4fe32d-6220-4369-9f62-bfffbf45b2f1}" id="id-0067-0000025e" kind="InParameter" referred="id-0067-00000167" relid="0x0" role="InParameter">
-                <name>subscription_handle</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>260,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <reference guid="{235fc104-2ce5-4b65-af6c-7b6925c8eef2}" id="id-0067-0000005a" kind="Inherits" referred="id-0065-00000093" relid="0xe" role="Inherits">
-              <name>Inherits</name>
-            </reference>
-          </model>
-          <model childrelidcntr="0x14" guid="{fdc8bf1e-e6c9-414a-aae8-714cae79f77d}" id="id-0065-000000ba" kind="Object" relid="0x1a" role="Object">
-            <name>DataReader</name>
-            <attribute kind="InterfaceSemantics">
-              <value>local</value>
-            </attribute>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrefixTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <model childrelidcntr="0x1" guid="{8364c0c8-5ebe-4e07-a39b-f421840d182b}" id="id-0065-000000bb" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-              <name>create_readcondition</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{4f24a7ec-5131-4418-addf-5e0196357674}" id="id-0067-0000025f" kind="ReturnType" referred="id-0065-00000115" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{2510d978-6f92-4dff-abb6-17f3f5cff5f7}" id="id-0067-00000385" kind="InParameter" referred="id-0067-000002c6" relid="0x0" role="InParameter">
-                <name>sample_states</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{da663271-0415-4a50-a029-882464ba26f1}" id="id-0067-00000386" kind="InParameter" referred="id-0067-000002cb" relid="0x0" role="InParameter">
-                <name>view_states</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>260,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{f6fa2b6d-c993-42db-9dec-0fc8c2b72b6d}" id="id-0067-00000387" kind="InParameter" referred="id-0067-000002d1" relid="0x0" role="InParameter">
-                <name>instance_states</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>360,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{366fb55c-2487-452e-9b75-cb3b4f59e662}" id="id-0065-000000bc" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-              <name>create_querycondition</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{52e4d1ae-1206-4481-a20f-102fa6dfea60}" id="id-0067-00000260" kind="ReturnType" referred="id-0065-0000011a" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{a145acb8-6446-4d02-8797-cf7254ce6ab7}" id="id-0067-00000261" kind="InParameter" referred="id-0066-00000033" relid="0x0" role="InParameter">
-                <name>query_expression</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>460,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{b06736dc-9e54-41fc-afac-4e99bb3223b2}" id="id-0067-00000262" kind="InParameter" referred="id-0067-000001d8" relid="0x0" role="InParameter">
-                <name>query_parameters</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>560,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{c1095bab-1aca-4140-b46a-e3709a6e4da3}" id="id-0067-00000388" kind="InParameter" referred="id-0067-000002c6" relid="0x0" role="InParameter">
-                <name>sample_states</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{a606eec2-53b4-450d-8e33-fcba20eaef10}" id="id-0067-00000389" kind="InParameter" referred="id-0067-000002cb" relid="0x0" role="InParameter">
-                <name>view_states</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>260,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{df2c621c-a512-41e6-a5a6-d595bd8a0622}" id="id-0067-0000038a" kind="InParameter" referred="id-0067-000002d1" relid="0x0" role="InParameter">
-                <name>instance_states</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>360,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{ca9b0360-b989-4013-9ce5-1cf10de5e498}" id="id-0065-000000bd" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-              <name>delete_readcondition</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{282d5486-b054-42f4-8780-375153252f41}" id="id-0067-00000263" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{ef05c440-391f-405a-a776-ce9f2a730c8b}" id="id-0067-00000264" kind="InParameter" referred="id-0065-00000115" relid="0x0" role="InParameter">
-                <name>a_condition</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{bbe5c7d5-792e-4c19-839f-26a79eb0ea3a}" id="id-0065-000000be" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-              <name>delete_contained_entities</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,360</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{98589b6b-47c5-424a-8325-88b6c6b8ddf9}" id="id-0067-00000265" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{78a49b0e-0668-48ae-bb70-f1c739f5d501}" id="id-0065-000000bf" kind="TwowayOperation" relid="0x4" role="TwowayOperation">
-              <name>set_qos</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,460</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{85583779-1ee1-42a2-b29c-d17d41a90ba5}" id="id-0067-00000266" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{b4c2cd01-c6c5-4803-9652-27e44b271449}" id="id-0067-00000267" kind="InParameter" referred="id-0065-00000140" relid="0x0" role="InParameter">
-                <name>qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{1226b0b4-f9a7-48e6-a60f-90d18d32fb6b}" id="id-0065-000000c0" kind="TwowayOperation" relid="0x5" role="TwowayOperation">
-              <name>get_qos</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,560</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{88a30702-5c90-4a78-b8f9-fbb64efe5c6d}" id="id-0067-00000268" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{0c1e6def-dd0d-4ff9-9c39-bb4ca7affbb6}" id="id-0067-00000269" kind="InoutParameter" referred="id-0065-00000140" relid="0x0" role="InoutParameter">
-                <name>qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{850308ef-c9a2-479c-9f4c-8351d2622eee}" id="id-0065-000000c1" kind="TwowayOperation" relid="0x6" role="TwowayOperation">
-              <name>set_listener</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,660</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{0c8d5a79-55fe-423d-a93d-407f1521af88}" id="id-0067-0000026a" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{865b5c00-d3fa-49e0-911b-8693599905c5}" id="id-0067-0000026b" kind="InParameter" referred="id-0065-000000fd" relid="0x0" role="InParameter">
-                <name>a_listener</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{a821d230-c7d8-4f84-b429-de12810f0dcc}" id="id-0067-0000026c" kind="InParameter" referred="id-0067-000001f2" relid="0x0" role="InParameter">
-                <name>mask</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>260,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{7baa6334-727a-45eb-8bc8-acdb0ad2b540}" id="id-0065-000000c2" kind="TwowayOperation" relid="0x7" role="TwowayOperation">
-              <name>get_listener</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,760</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{f502b17e-d2b7-464e-bd39-9412dd43606b}" id="id-0067-0000026d" kind="ReturnType" referred="id-0065-000000fd" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{d2af0371-d9d1-428f-8bfb-802afdf9359e}" id="id-0065-000000c3" kind="TwowayOperation" relid="0x8" role="TwowayOperation">
-              <name>get_topicdescription</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,860</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{a268a2b0-c39d-4647-a1ce-efabc5dcf561}" id="id-0067-0000005b" kind="ReturnType" referred="id-0065-00000098" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{8a7e2afe-5ab1-4cfe-b674-aacd0fd4c738}" id="id-0065-000000c4" kind="TwowayOperation" relid="0x9" role="TwowayOperation">
-              <name>get_subscriber</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,960</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{9ce8b5ad-c5a6-4ca0-aea6-360d84a46e7b}" id="id-0067-0000026e" kind="ReturnType" referred="id-0065-000000ce" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{908884b0-ec2f-4f93-9d92-35676ec68618}" id="id-0065-000000c5" kind="TwowayOperation" relid="0xa" role="TwowayOperation">
-              <name>get_sample_rejected_status</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1060</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{83bc4080-3dd2-4fc0-ab27-1b165be5d9d7}" id="id-0067-0000005c" kind="InoutParameter" referred="id-0065-00000085" relid="0x0" role="InoutParameter">
-                <name>status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{f9a9e169-86e9-4445-8806-62d620053a24}" id="id-0067-0000026f" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{20d01bb3-85db-4f54-91c8-e86d17646904}" id="id-0065-000000c6" kind="TwowayOperation" relid="0xb" role="TwowayOperation">
-              <name>get_liveliness_changed_status</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{d7f892f0-21d5-4859-9740-eeb548de58ee}" id="id-0067-0000005d" kind="InoutParameter" referred="id-0065-00000087" relid="0x0" role="InoutParameter">
-                <name>status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{b3ca04b8-3317-4a38-b73f-7bc61ef0b153}" id="id-0067-00000270" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{e07c8a90-1bb4-415d-a61f-e84d832cde82}" id="id-0065-000000c7" kind="TwowayOperation" relid="0xc" role="TwowayOperation">
-              <name>get_requested_deadline_missed_status</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{b8b86714-2293-424e-b89c-638dc177aba7}" id="id-0067-0000005e" kind="InoutParameter" referred="id-0065-00000089" relid="0x0" role="InoutParameter">
-                <name>status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{3325465b-0890-48b6-9e0f-30e321a8a143}" id="id-0067-00000271" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{8fbc76bf-a8dc-41d1-bbbd-d950354e7fad}" id="id-0065-000000c8" kind="TwowayOperation" relid="0xd" role="TwowayOperation">
-              <name>get_requested_incompatible_qos_status</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1360</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{8ea78cd1-84d0-414a-9a39-280656bae196}" id="id-0067-0000005f" kind="InoutParameter" referred="id-0065-0000008c" relid="0x0" role="InoutParameter">
-                <name>status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{17a44ee7-0ea9-401d-898d-2bdc0e33f7b2}" id="id-0067-00000272" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{2ca658fc-8e90-4e7d-ab2d-2690f5298858}" id="id-0065-000000c9" kind="TwowayOperation" relid="0xe" role="TwowayOperation">
-              <name>get_subscription_matched_status</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1460</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{29026bb4-fe9d-444d-887e-ae6562a04e82}" id="id-0067-00000060" kind="InoutParameter" referred="id-0065-0000008e" relid="0x0" role="InoutParameter">
-                <name>status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{b3915b89-c92a-4982-9188-3484fe4784eb}" id="id-0067-00000273" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{88c6b525-6df9-413a-b781-9bc5393b5977}" id="id-0065-000000ca" kind="TwowayOperation" relid="0xf" role="TwowayOperation">
-              <name>get_sample_lost_status</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1560</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{5cbe2df3-9bc6-4df7-a410-43ab45db51e9}" id="id-0067-00000061" kind="InoutParameter" referred="id-0065-00000083" relid="0x0" role="InoutParameter">
-                <name>status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{7a9a3452-d0c6-4893-8c1f-1e796ba00329}" id="id-0067-00000274" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{be4f3287-cd07-4eb7-b6c7-b6896851149d}" id="id-0065-000000cb" kind="TwowayOperation" relid="0x10" role="TwowayOperation">
-              <name>wait_for_historical_data</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1660</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{e3586331-a04c-48d6-96b6-fea0ce63a58b}" id="id-0067-00000062" kind="InParameter" referred="id-0065-00000080" relid="0x0" role="InParameter">
-                <name>max_wait</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{f1748b53-c1f1-4fdd-9202-bf3388f88eee}" id="id-0067-00000275" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{f7385d65-dd28-4743-8666-44afdc0129b1}" id="id-0065-000000cc" kind="TwowayOperation" relid="0x11" role="TwowayOperation">
-              <name>get_matched_publications</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1760</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{7d346b0a-c905-4a28-849e-fc2b86d70de4}" id="id-0067-00000276" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{20acc5d7-554a-4dec-b47f-3bedea1bd78b}" id="id-0067-00000277" kind="InoutParameter" referred="id-0067-00000168" relid="0x0" role="InoutParameter">
-                <name>publication_handles</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{0f133d49-abcd-45ba-9745-f48be5734e60}" id="id-0065-000000cd" kind="TwowayOperation" relid="0x12" role="TwowayOperation">
-              <name>get_matched_publication_data</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1860</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{1ac6aab5-ab51-4304-af34-64a5ba64ba97}" id="id-0067-00000278" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{70174954-be47-435a-9205-a9490ea902c8}" id="id-0067-00000279" kind="InoutParameter" referred="id-0065-00000144" relid="0x0" role="InoutParameter">
-                <name>publication_data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{b5649232-92e1-4d70-a805-8bff7b23cd18}" id="id-0067-0000027a" kind="InParameter" referred="id-0067-00000167" relid="0x0" role="InParameter">
-                <name>publication_handle</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>260,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <reference guid="{862fa6bf-24a5-468a-aab3-85bb4ea3344c}" id="id-0067-00000063" kind="Inherits" referred="id-0065-00000093" relid="0x13" role="Inherits">
-              <name>Inherits</name>
-            </reference>
-          </model>
-          <model childrelidcntr="0x12" guid="{a113f8ff-f511-492e-8f3e-73fbfa24baef}" id="id-0065-000000ce" kind="Object" relid="0x1b" role="Object">
-            <name>Subscriber</name>
-            <attribute kind="InterfaceSemantics">
-              <value>local</value>
-            </attribute>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrefixTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <model childrelidcntr="0x1" guid="{bbf7de78-8d06-4ea2-9c05-f229f25c2db0}" id="id-0065-000000cf" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-              <name>create_datareader</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{a24c2fc7-3ec8-42e7-98ec-0437cbc8ddcd}" id="id-0067-00000064" kind="ReturnType" referred="id-0065-000000ba" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{eb1c9be3-ab4b-40e3-913d-cce3d47abccb}" id="id-0067-00000065" kind="InParameter" referred="id-0065-00000098" relid="0x0" role="InParameter">
-                <name>a_topic</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{f2e089d5-e473-457d-80fc-66d8bea290b3}" id="id-0067-0000027b" kind="InParameter" referred="id-0065-00000140" relid="0x0" role="InParameter">
-                <name>qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>260,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{a88d13a8-95b4-43a2-b336-6e9389267b0c}" id="id-0067-0000027c" kind="InParameter" referred="id-0065-000000fd" relid="0x0" role="InParameter">
-                <name>a_listener</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>360,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{31fcbf32-00a5-4877-bdfa-0381fb4a38a9}" id="id-0067-0000027d" kind="InParameter" referred="id-0067-000001f2" relid="0x0" role="InParameter">
-                <name>mask</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>460,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{a832090b-f734-4b0b-b203-71aad2fadae9}" id="id-0065-000000d0" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-              <name>create_datareader_with_profile</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{38be5418-98f9-434a-9d16-d83296d16c3c}" id="id-0067-00000066" kind="ReturnType" referred="id-0065-000000ba" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{1dcde549-a8e2-4dda-8ee8-09b6cc9f0640}" id="id-0067-00000067" kind="InParameter" referred="id-0065-00000098" relid="0x0" role="InParameter">
-                <name>a_topic</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{fa32da6b-e51b-42d7-a141-f2ee67c52780}" id="id-0067-0000027e" kind="InParameter" referred="id-0066-00000033" relid="0x0" role="InParameter">
-                <name>library_name</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>260,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{962da721-9691-4709-afaa-c515be44a833}" id="id-0067-0000027f" kind="InParameter" referred="id-0066-00000033" relid="0x0" role="InParameter">
-                <name>profile_name</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>360,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{903a65c7-0c8d-49ed-a4e6-af4481a3f7e1}" id="id-0067-00000280" kind="InParameter" referred="id-0065-000000fd" relid="0x0" role="InParameter">
-                <name>a_listener</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>460,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{b5733249-8332-4dc6-85ba-97c59fd37ac4}" id="id-0067-00000281" kind="InParameter" referred="id-0067-000001f2" relid="0x0" role="InParameter">
-                <name>mask</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>560,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{56a03b42-9fad-4041-8a90-0c653e30677d}" id="id-0065-000000d1" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-              <name>delete_datareader</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{d823a347-0491-469b-a106-c455478bb667}" id="id-0067-00000068" kind="InParameter" referred="id-0065-000000ba" relid="0x0" role="InParameter">
-                <name>a_datareader</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{39555b40-9e6a-428c-91df-8ba60a80b0fa}" id="id-0067-00000282" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{218763d2-572d-4185-a2f8-b96b6ba1edc1}" id="id-0065-000000d2" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-              <name>delete_contained_entities</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,360</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{cb5cdb85-f31f-449a-874b-12745dedeca7}" id="id-0067-00000283" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{36b1e64f-1d4b-4503-b025-65f4d3c0f093}" id="id-0065-000000d3" kind="TwowayOperation" relid="0x4" role="TwowayOperation">
-              <name>lookup_datareader</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,460</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{37c3f4e8-20bd-4f6a-ae4e-aeec521ab3b2}" id="id-0067-00000069" kind="ReturnType" referred="id-0065-000000ba" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{640f5837-4ffe-4a5d-b2c7-6a8b5c68060e}" id="id-0067-00000284" kind="InParameter" referred="id-0066-00000033" relid="0x0" role="InParameter">
-                <name>topic_name</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{5ae59d40-bd26-405e-9e83-97614689543e}" id="id-0065-000000d4" kind="TwowayOperation" relid="0x5" role="TwowayOperation">
-              <name>get_datareaders</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,560</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{b5899b66-4d78-4072-85e9-164f8db37ed8}" id="id-0067-00000285" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{3d3b90a6-59ba-4b88-b424-e2bc6f1517e3}" id="id-0067-00000286" kind="InoutParameter" referred="id-0067-00000073" relid="0x0" role="InoutParameter">
-                <name>readers</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{028f06b5-ed5e-444e-acf1-dfdf163f5850}" id="id-0067-0000038b" kind="InParameter" referred="id-0067-000002c6" relid="0x0" role="InParameter">
-                <name>sample_states</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>260,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{5b0c5ed6-21a3-40cb-b017-6c4ce9ece9c5}" id="id-0067-0000038c" kind="InParameter" referred="id-0067-000002cb" relid="0x0" role="InParameter">
-                <name>view_states</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>360,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{2a80dc59-0e77-42cb-8a13-024122aafdb0}" id="id-0067-0000038d" kind="InParameter" referred="id-0067-000002d1" relid="0x0" role="InParameter">
-                <name>instance_states</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>460,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{48db7971-bd50-43f9-84e0-26d3e3798b40}" id="id-0065-000000d5" kind="TwowayOperation" relid="0x6" role="TwowayOperation">
-              <name>notify_datareaders</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,660</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{a979f694-aa7d-426e-b4ac-083295d17694}" id="id-0067-00000287" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{2b8f29ad-5481-4930-b64c-458a7cb68b79}" id="id-0065-000000d6" kind="TwowayOperation" relid="0x7" role="TwowayOperation">
-              <name>set_qos</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,760</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{badc2a99-847c-4197-8328-11cfc16bb01e}" id="id-0067-00000288" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{08fe8b5f-56af-4a23-a7e8-43186b10525c}" id="id-0067-00000289" kind="InParameter" referred="id-0065-00000141" relid="0x0" role="InParameter">
-                <name>qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{214ee0c6-04bd-4bcf-8cda-9b9e748a5964}" id="id-0065-000000d7" kind="TwowayOperation" relid="0x8" role="TwowayOperation">
-              <name>get_qos</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,860</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{617ac9bb-8e8f-4723-9042-66937b916c6f}" id="id-0067-0000028a" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{1d17d063-a724-4aef-b623-d5210eac0d53}" id="id-0067-0000028b" kind="InoutParameter" referred="id-0065-00000141" relid="0x0" role="InoutParameter">
-                <name>qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{f80fee9e-c13c-4c8a-bf9d-e3f6516ccf93}" id="id-0065-000000d8" kind="TwowayOperation" relid="0x9" role="TwowayOperation">
-              <name>set_listener</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,960</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{4b24d435-ed88-4ef3-a254-7f9fbd7ba88c}" id="id-0067-0000028c" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{f4c07ebd-16e2-4e17-b5d9-0c65b175de31}" id="id-0067-0000028d" kind="InParameter" referred="id-0065-00000105" relid="0x0" role="InParameter">
-                <name>a_listener</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{26414354-b5c6-422d-882b-2c217fdb3e65}" id="id-0067-0000028e" kind="InParameter" referred="id-0067-000001f2" relid="0x0" role="InParameter">
-                <name>mask</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>260,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{68723394-e823-4e51-abdf-6be53b7cdf9a}" id="id-0065-000000d9" kind="TwowayOperation" relid="0xa" role="TwowayOperation">
-              <name>get_listener</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1060</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{453c2c55-363e-44fe-afc8-dd4c27456b65}" id="id-0067-0000028f" kind="ReturnType" referred="id-0065-00000105" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{10f5ae9e-1189-4942-b4fe-b4d8bfc8834c}" id="id-0065-000000da" kind="TwowayOperation" relid="0xb" role="TwowayOperation">
-              <name>begin_access</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{737ddcc9-63ef-4dd6-89e2-9692ae6d55e8}" id="id-0067-00000290" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{ca070b7c-2035-4501-a173-913adb2de7af}" id="id-0065-000000db" kind="TwowayOperation" relid="0xc" role="TwowayOperation">
-              <name>end_access</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{a13f205e-d755-4713-a9a9-ab01cc26f656}" id="id-0067-00000291" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{8335259a-d72c-4c44-811f-3f9df0e84b6e}" id="id-0065-000000dc" kind="TwowayOperation" relid="0xd" role="TwowayOperation">
-              <name>get_participant</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1360</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{65f9d75e-ccc8-4abc-b161-d4d609fbe1c6}" id="id-0067-00000292" kind="ReturnType" referred="id-0065-00000146" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{f3371ab8-af13-44e8-b0a5-dd29f3e977c6}" id="id-0065-000000dd" kind="TwowayOperation" relid="0xe" role="TwowayOperation">
-              <name>set_default_datareader_qos</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1460</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{171e9191-5944-4e5f-b7b8-84234331f3d9}" id="id-0067-00000293" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{401654fe-a2f6-459b-b6c0-0113e70be839}" id="id-0067-00000294" kind="InParameter" referred="id-0065-00000140" relid="0x0" role="InParameter">
-                <name>qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{10a13d5c-af2a-4a99-960b-6ce6b033b957}" id="id-0065-000000de" kind="TwowayOperation" relid="0xf" role="TwowayOperation">
-              <name>get_default_datareader_qos</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1560</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{716daca9-9c40-4155-a00d-be826b5cfc4e}" id="id-0067-00000295" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{c134bb48-d9e8-44fc-8e1e-f3f78406833c}" id="id-0067-00000296" kind="InoutParameter" referred="id-0065-00000140" relid="0x0" role="InoutParameter">
-                <name>qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{6f1547e5-e8de-4537-80e4-a53bed927dbf}" id="id-0065-000000df" kind="TwowayOperation" relid="0x10" role="TwowayOperation">
-              <name>copy_from_topic_qos</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1660</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{7bc581f7-89fd-4916-8939-3b9e01f3dbd1}" id="id-0067-00000297" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{5b5f3cad-0276-4fd1-a5a8-3e025a696bd2}" id="id-0067-00000298" kind="InoutParameter" referred="id-0065-00000140" relid="0x0" role="InoutParameter">
-                <name>a_datareader_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{0664ad23-1a72-45d3-9c08-0ad871bf29a3}" id="id-0067-00000299" kind="InParameter" referred="id-0065-0000013d" relid="0x0" role="InParameter">
-                <name>a_topic_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>260,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <reference guid="{4a00ae57-4ab2-4cff-b63f-0116e1ca0432}" id="id-0067-0000006a" kind="Inherits" referred="id-0065-00000093" relid="0x11" role="Inherits">
-              <name>Inherits</name>
-            </reference>
-          </model>
-          <model childrelidcntr="0x13" guid="{4f5eebbb-cf9a-4547-88c3-68b4139798b5}" id="id-0065-000000e0" kind="Object" relid="0x1c" role="Object">
-            <name>Publisher</name>
-            <attribute kind="InterfaceSemantics">
-              <value>local</value>
-            </attribute>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrefixTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <model childrelidcntr="0x1" guid="{d4a98d8d-7f33-41b7-98b5-4cc3572f0731}" id="id-0065-000000e1" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-              <name>create_datawriter</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{cdd7167e-c07c-4afe-b134-209d53aabd6e}" id="id-0067-0000006b" kind="ReturnType" referred="id-0065-000000ab" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{34f51ff6-670d-4eff-8ed6-e811c6b38717}" id="id-0067-0000006c" kind="InParameter" referred="id-0065-0000009c" relid="0x0" role="InParameter">
-                <name>a_topic</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{bf0a5c44-eb8a-41f4-869b-f7bf96c77dec}" id="id-0067-0000029a" kind="InParameter" referred="id-0065-0000013e" relid="0x0" role="InParameter">
-                <name>qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>260,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{ea51d174-903a-43f3-9023-e38848c4d448}" id="id-0067-0000029b" kind="InParameter" referred="id-0065-000000f5" relid="0x0" role="InParameter">
-                <name>a_listener</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>360,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{188b0667-16f2-4bcd-bc77-964e2366d0fe}" id="id-0067-0000029c" kind="InParameter" referred="id-0067-000001f2" relid="0x0" role="InParameter">
-                <name>mask</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>460,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{afa7274d-6817-4601-9deb-d710d43e40d0}" id="id-0065-000000e2" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-              <name>create_datawriter_with_profile</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{0e08f6b6-76ad-4b40-82d3-b3024f8e751e}" id="id-0067-0000006d" kind="ReturnType" referred="id-0065-000000ab" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{a918d624-2e7b-4cc8-83a2-7368cc29ef3c}" id="id-0067-0000006e" kind="InParameter" referred="id-0065-0000009c" relid="0x0" role="InParameter">
-                <name>a_topic</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{6981d70d-ddbb-4140-8259-ed8ba6c74c34}" id="id-0067-0000029d" kind="InParameter" referred="id-0066-00000033" relid="0x0" role="InParameter">
-                <name>library_name</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>260,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{2421b119-5e27-4379-86f6-308f67a223c2}" id="id-0067-0000029e" kind="InParameter" referred="id-0066-00000033" relid="0x0" role="InParameter">
-                <name>probile_name</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>360,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{79540497-9b9e-48a9-89e3-58c7e8d86aa4}" id="id-0067-0000029f" kind="InParameter" referred="id-0065-000000f5" relid="0x0" role="InParameter">
-                <name>a_listener</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>460,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{e46386b3-7971-4061-b9d9-e6aa0ae129af}" id="id-0067-000002a0" kind="InParameter" referred="id-0067-000001f2" relid="0x0" role="InParameter">
-                <name>mask</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>560,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{b90ffda6-2051-4a0a-95ab-37a59a19edf9}" id="id-0065-000000e3" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-              <name>delete_datawriter</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{02aa4e05-ae68-4033-9419-74c767cdafad}" id="id-0067-0000006f" kind="InParameter" referred="id-0065-000000ab" relid="0x0" role="InParameter">
-                <name>a_datawriter</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{8e4d973b-95e8-4308-8793-2e3a6cdb5fb3}" id="id-0067-000002a1" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{d7ddfcd8-0fb8-4bba-bed4-87b098e094a9}" id="id-0065-000000e4" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-              <name>lookup_datawriter</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,360</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{00e37ecc-0ea0-4d8b-9235-fa67204c2a02}" id="id-0067-00000070" kind="ReturnType" referred="id-0065-000000ab" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{44de8d28-5be1-4cf7-aefb-43ad2397a6fe}" id="id-0067-000002a2" kind="InParameter" referred="id-0066-00000033" relid="0x0" role="InParameter">
-                <name>topic_name</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{8d2971dc-bd0f-450c-a657-8e7d55ad7bd4}" id="id-0065-000000e5" kind="TwowayOperation" relid="0x4" role="TwowayOperation">
-              <name>delete_contained_entities</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,460</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{3be19ff5-37af-4fe5-8a39-baabcc2fd8cf}" id="id-0067-000002a3" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{179d9a18-c488-4307-88d2-9f57797fb88d}" id="id-0065-000000e6" kind="TwowayOperation" relid="0x5" role="TwowayOperation">
-              <name>set_qos</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,560</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{dfd9f22b-b22f-4f6b-bb06-103200df3b51}" id="id-0067-000002a4" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{12663ac4-c11d-46e2-b1b7-fb490b1011db}" id="id-0067-000002a5" kind="InParameter" referred="id-0065-0000013f" relid="0x0" role="InParameter">
-                <name>qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{fb86cfc0-06ba-4804-8150-bf09edab5a9b}" id="id-0065-000000e7" kind="TwowayOperation" relid="0x6" role="TwowayOperation">
-              <name>get_qos</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,660</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{945ebf05-6a30-41f7-834d-e10b1d75060f}" id="id-0067-000002a6" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{733a97ee-941d-4148-9821-c0f89a193f3b}" id="id-0067-000002a7" kind="InoutParameter" referred="id-0065-0000013f" relid="0x0" role="InoutParameter">
-                <name>qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{cda3d7c2-d517-4ebc-bbba-88e79be7d0d0}" id="id-0065-000000e8" kind="TwowayOperation" relid="0x7" role="TwowayOperation">
-              <name>set_listener</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,760</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{4cae743d-7e86-4885-8090-0e47849879cb}" id="id-0067-000002a8" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{5736a6b7-874a-4338-bc81-75ee9a951225}" id="id-0067-000002a9" kind="InParameter" referred="id-0065-000000fc" relid="0x0" role="InParameter">
-                <name>a_listener</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{64528804-81a9-4bce-9624-c344e1b7516a}" id="id-0067-000002aa" kind="InParameter" referred="id-0067-000001f2" relid="0x0" role="InParameter">
-                <name>mask</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>260,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{f4d17e9a-58fd-4fa5-9749-2161c13877e9}" id="id-0065-000000e9" kind="TwowayOperation" relid="0x8" role="TwowayOperation">
-              <name>get_listener</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,860</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{4418ea4f-36c0-44b2-96cc-928bfac92f54}" id="id-0067-000002ab" kind="ReturnType" referred="id-0065-000000fc" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{e7385d87-75fc-461e-b864-015eec341af5}" id="id-0065-000000ea" kind="TwowayOperation" relid="0x9" role="TwowayOperation">
-              <name>suspend_publications</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,960</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{60dc06b1-7275-4cd8-98be-9c7632266e9e}" id="id-0067-000002ac" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{0f6efba4-a689-4d3f-b7e9-cef7fa4bbd8c}" id="id-0065-000000eb" kind="TwowayOperation" relid="0xa" role="TwowayOperation">
-              <name>resume_publications</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1060</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{040979b6-4257-4fd0-b06c-2a9f887c4ec6}" id="id-0067-000002ad" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{09792629-4fdb-4c0e-b596-718cfbb74571}" id="id-0065-000000ec" kind="TwowayOperation" relid="0xb" role="TwowayOperation">
-              <name>begin_coherent_changes</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{dcc3bae7-db81-4fd1-8540-b8892c32513e}" id="id-0067-000002ae" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{66214d0a-29a9-4bf1-a24e-eddd7d3b4398}" id="id-0065-000000ed" kind="TwowayOperation" relid="0xc" role="TwowayOperation">
-              <name>end_coherent_changes</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{325fcbf1-6cb7-4152-a8fe-ad543c4d6f11}" id="id-0067-000002af" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{d5293866-6ed6-4f2d-b42b-22fbca744fd4}" id="id-0065-000000ee" kind="TwowayOperation" relid="0xd" role="TwowayOperation">
-              <name>wait_for_acknowledgments</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1360</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{c9e98644-418c-4f72-bbf0-55362ec76bcd}" id="id-0067-00000071" kind="InParameter" referred="id-0065-00000080" relid="0x0" role="InParameter">
-                <name>max_wait</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{641d952c-266b-4a75-95ab-77dd3f516a57}" id="id-0067-000002b0" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{c9f8ec8f-69a9-4c5b-885c-974b20297674}" id="id-0065-000000ef" kind="TwowayOperation" relid="0xe" role="TwowayOperation">
-              <name>get_participant</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1460</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{9d3b8308-1b73-45f2-8b20-b0c0d7105af5}" id="id-0067-000002b1" kind="ReturnType" referred="id-0065-00000146" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{c122be64-e057-4bce-b70e-c911a0ef18d3}" id="id-0065-000000f0" kind="TwowayOperation" relid="0xf" role="TwowayOperation">
-              <name>set_default_datawriter_qos</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1560</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{ebcedb62-f5f4-4dd3-b652-5f8f6ae28093}" id="id-0067-000002b2" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{e201161b-3245-4c3e-87ff-54935e71b731}" id="id-0067-000002b3" kind="InParameter" referred="id-0065-0000013e" relid="0x0" role="InParameter">
-                <name>qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{f75d0811-ff01-4500-8125-4fc76004c532}" id="id-0065-000000f1" kind="TwowayOperation" relid="0x10" role="TwowayOperation">
-              <name>get_default_datawriter_qos</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1660</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{74d27c57-f92d-4af0-a090-c3acdb17ff21}" id="id-0067-000002b4" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{d4685544-1f06-459b-81a5-c618cce73903}" id="id-0067-000002b5" kind="InoutParameter" referred="id-0065-0000013e" relid="0x0" role="InoutParameter">
-                <name>qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{bac79da3-694b-4630-b0e8-b0e1c6588d5a}" id="id-0065-000000f2" kind="TwowayOperation" relid="0x11" role="TwowayOperation">
-              <name>copy_from_topic_qos</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1760</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{1577cab5-647c-4da4-84cf-4126946ffae7}" id="id-0067-000002b6" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{c7f99d7f-4ff0-43d6-9549-5e4f0fe584e7}" id="id-0067-000002b7" kind="InoutParameter" referred="id-0065-0000013e" relid="0x0" role="InoutParameter">
-                <name>a_datawriter_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{5d3895b6-c2d6-4015-af00-5465948508ef}" id="id-0067-000002b8" kind="InParameter" referred="id-0065-0000013d" relid="0x0" role="InParameter">
-                <name>a_topic_qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>260,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <reference guid="{e4183a64-c3c8-4f7f-8d5c-cb8d262353a7}" id="id-0067-00000072" kind="Inherits" referred="id-0065-00000093" relid="0x12" role="Inherits">
-              <name>Inherits</name>
-            </reference>
-          </model>
-          <model childrelidcntr="0x2" guid="{b96f7fda-6a45-47d2-b103-11ad5bd524d4}" id="id-0065-000000f3" kind="Object" relid="0x1d" role="Object">
-            <name>TopicListener</name>
-            <attribute kind="InterfaceSemantics">
-              <value>local</value>
-            </attribute>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrefixTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <model childrelidcntr="0x1" guid="{251c4042-ea65-4042-b536-b8a43990aa0c}" id="id-0065-000000f4" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-              <name>on_inconsistent_topic</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{8e0de7d7-b5b0-49bf-a8c1-32ee4dca0cd2}" id="id-0067-00000074" kind="InParameter" referred="id-0065-0000009c" relid="0x0" role="InParameter">
-                <name>the_topic</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{667f44e5-472d-4fa2-b9ef-b4cbfab49c8d}" id="id-0067-00000075" kind="InParameter" referred="id-0065-00000082" relid="0x0" role="InParameter">
-                <name>status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <reference guid="{e1aef13f-a614-4c9b-82f6-d23fcbf62ffb}" id="id-0067-00000076" kind="Inherits" referred="id-0065-00000092" relid="0x1" role="Inherits">
-              <name>Inherits</name>
-            </reference>
-          </model>
-          <model childrelidcntr="0x7" guid="{6ec642f5-e2c2-4b1b-ad6b-c7589f6124ab}" id="id-0065-000000f5" kind="Object" relid="0x1e" role="Object">
-            <name>DataWriterListener</name>
-            <attribute kind="InterfaceSemantics">
-              <value>local</value>
-            </attribute>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrefixTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <model childrelidcntr="0x1" guid="{4853b54d-7248-433c-ad29-dfaa7a701549}" id="id-0065-000000f6" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-              <name>on_offered_deadline_missed</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{74c70e9f-b9ff-4924-95a1-d325adec0f18}" id="id-0067-00000077" kind="InParameter" referred="id-0065-000000ab" relid="0x0" role="InParameter">
-                <name>writer</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{1d4cc92e-9eff-41d3-a609-80026f5123df}" id="id-0067-00000078" kind="InParameter" referred="id-0065-00000088" relid="0x0" role="InParameter">
-                <name>status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{8ddaf5b7-f2a4-4bce-b2aa-62afaaf4a8fd}" id="id-0065-000000f7" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-              <name>on_offered_incompatible_qos</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{826506ef-7504-4bf7-86c4-1a909979cced}" id="id-0067-00000079" kind="InParameter" referred="id-0065-000000ab" relid="0x0" role="InParameter">
-                <name>writer</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{30780cf3-8476-44da-bc3a-8dd199c42853}" id="id-0067-0000007a" kind="InParameter" referred="id-0065-0000008b" relid="0x0" role="InParameter">
-                <name>status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{65ac6074-64e3-4b24-92a0-d7f90c511e4e}" id="id-0065-000000f8" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-              <name>on_liveliness_lost</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{1132162b-706b-4e7e-bb43-3bdf83c4c761}" id="id-0067-0000007b" kind="InParameter" referred="id-0065-000000ab" relid="0x0" role="InParameter">
-                <name>writer</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{4b722d31-7fa2-415d-83c7-39a18d7ae812}" id="id-0067-0000007c" kind="InParameter" referred="id-0065-00000086" relid="0x0" role="InParameter">
-                <name>status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{296dafd2-3702-44d9-ab7a-f929d72fbf65}" id="id-0065-000000f9" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-              <name>on_publication_matched</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,360</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{c2e910b4-b861-4d01-a709-989a53a053f3}" id="id-0067-0000007d" kind="InParameter" referred="id-0065-000000ab" relid="0x0" role="InParameter">
-                <name>writer</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{ce1e5a71-12f7-406e-94b7-4b3ac2a2ef42}" id="id-0067-0000007e" kind="InParameter" referred="id-0065-0000008d" relid="0x0" role="InParameter">
-                <name>status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{b11529b5-a0d8-4003-9974-51497c3abaab}" id="id-0065-000000fa" kind="TwowayOperation" relid="0x4" role="TwowayOperation">
-              <name>on_reliable_writer_cache_changed</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,460</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{73023405-7e9b-4a0b-ad70-78c4aa8d80d2}" id="id-0067-0000007f" kind="InParameter" referred="id-0065-000000ab" relid="0x0" role="InParameter">
-                <name>writer</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{bb850eb5-7830-4ce9-88cb-a8344d424b5d}" id="id-0067-00000080" kind="InParameter" referred="id-0065-00000091" relid="0x0" role="InParameter">
-                <name>status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{32206b40-6314-4acb-a78f-f0aeb4218877}" id="id-0065-000000fb" kind="TwowayOperation" relid="0x5" role="TwowayOperation">
-              <name>on_reliable_reader_activity_changed</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,560</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{2974bfbf-5852-4460-8473-e59140fd694f}" id="id-0067-00000081" kind="InParameter" referred="id-0065-000000ab" relid="0x0" role="InParameter">
-                <name>writer</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{2c9ad149-a03c-452e-ab6e-9b7e9336968b}" id="id-0067-00000082" kind="InParameter" referred="id-0065-0000008f" relid="0x0" role="InParameter">
-                <name>status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <reference guid="{d6f48dce-0393-45a5-af20-3d76bab7e49a}" id="id-0067-00000083" kind="Inherits" referred="id-0065-00000092" relid="0x6" role="Inherits">
-              <name>Inherits</name>
-            </reference>
-          </model>
-          <model childrelidcntr="0x1" guid="{e4699243-959f-4fce-8308-d6fb2a3ba60c}" id="id-0065-000000fc" kind="Object" relid="0x1f" role="Object">
-            <name>PublisherListener</name>
-            <attribute kind="InterfaceSemantics">
-              <value>local</value>
-            </attribute>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrefixTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{b19e72bd-4670-4fe6-b0f4-b571561e68f0}" id="id-0067-00000084" kind="Inherits" referred="id-0065-000000f5" relid="0x0" role="Inherits">
-              <name>Inherits</name>
-            </reference>
-          </model>
-          <model childrelidcntr="0x8" guid="{21482efd-7490-4df3-bd59-af5c783e3468}" id="id-0065-000000fd" kind="Object" relid="0x20" role="Object">
-            <name>DataReaderListener</name>
-            <attribute kind="InterfaceSemantics">
-              <value>local</value>
-            </attribute>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrefixTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <model childrelidcntr="0x1" guid="{f152534c-add7-4f9d-91a6-ad53cb298618}" id="id-0065-000000fe" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-              <name>on_requested_deadline_missed</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{3a3ec0f6-3bed-4f2a-b03f-ab31f579d132}" id="id-0067-00000085" kind="InParameter" referred="id-0065-000000ba" relid="0x0" role="InParameter">
-                <name>the_reader</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{7693b0f3-2e6a-4190-b460-1537d2b25b04}" id="id-0067-00000086" kind="InParameter" referred="id-0065-00000089" relid="0x0" role="InParameter">
-                <name>status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{92c9b989-c372-49c2-a59f-5324d7779a4a}" id="id-0065-000000ff" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-              <name>on_requested_incompatible_qos</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{bd247fbc-54fa-4eb9-92da-2bff562cd95f}" id="id-0067-00000087" kind="InParameter" referred="id-0065-000000ba" relid="0x0" role="InParameter">
-                <name>the_reader</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{f496b174-7bc3-43c7-8bd6-b8d7c02a40e8}" id="id-0067-00000088" kind="InParameter" referred="id-0065-0000008c" relid="0x0" role="InParameter">
-                <name>status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{ab1169ab-0f50-4b35-bbb1-da177461bec7}" id="id-0065-00000100" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-              <name>on_sample_rejected</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{2e19fa4e-30af-4a38-8a07-83c6e50e848f}" id="id-0067-00000089" kind="InParameter" referred="id-0065-000000ba" relid="0x0" role="InParameter">
-                <name>the_reader</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{1fa64424-331f-4dc3-8801-cae23da11c7c}" id="id-0067-0000008a" kind="InParameter" referred="id-0065-00000085" relid="0x0" role="InParameter">
-                <name>status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{0163a50f-8169-4ccf-b200-89dbb6e3da85}" id="id-0065-00000101" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-              <name>on_liveliness_changed</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,360</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{72986913-c2cd-4987-b638-a01efe9cfb7a}" id="id-0067-0000008b" kind="InParameter" referred="id-0065-000000ba" relid="0x0" role="InParameter">
-                <name>the_reader</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{94ddd20b-f16b-4ee6-895b-ad9c5bb5070b}" id="id-0067-0000008c" kind="InParameter" referred="id-0065-00000087" relid="0x0" role="InParameter">
-                <name>status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{707b7440-d471-4b40-9cea-01a2d07993e9}" id="id-0065-00000102" kind="TwowayOperation" relid="0x4" role="TwowayOperation">
-              <name>on_data_available</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,460</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{5fcc73b8-51c8-4f68-a130-67d9ee8ff7e3}" id="id-0067-0000008d" kind="InParameter" referred="id-0065-000000ba" relid="0x0" role="InParameter">
-                <name>the_reader</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{5d373a8d-d337-44cc-a28e-c3822dc7719a}" id="id-0065-00000103" kind="TwowayOperation" relid="0x5" role="TwowayOperation">
-              <name>on_subscription_matched</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,560</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{5339ea05-93ed-42f3-bf5a-e650aa6386cf}" id="id-0067-0000008e" kind="InParameter" referred="id-0065-000000ba" relid="0x0" role="InParameter">
-                <name>the_reader</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{22bbcafe-f6a8-43b0-b9ec-da82617a9034}" id="id-0067-0000008f" kind="InParameter" referred="id-0065-0000008e" relid="0x0" role="InParameter">
-                <name>status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{ef0ed577-2fe7-41e2-9d84-01b3a7ac5ac2}" id="id-0065-00000104" kind="TwowayOperation" relid="0x6" role="TwowayOperation">
-              <name>on_sample_lost</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,660</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{99dfc069-394a-4586-8af3-f6b8d1ae62e9}" id="id-0067-00000090" kind="InParameter" referred="id-0065-000000ba" relid="0x0" role="InParameter">
-                <name>the_reader</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{3a2275ba-2b65-4f7c-9b49-5d93a4b4916e}" id="id-0067-00000091" kind="InParameter" referred="id-0065-00000083" relid="0x0" role="InParameter">
-                <name>status</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <reference guid="{f6a27cc0-3122-4857-8022-6391beb021c3}" id="id-0067-00000092" kind="Inherits" referred="id-0065-00000092" relid="0x7" role="Inherits">
-              <name>Inherits</name>
-            </reference>
-          </model>
-          <model childrelidcntr="0x2" guid="{4c9f54ce-366e-4d5b-8e0c-d733f62e3b94}" id="id-0065-00000105" kind="Object" relid="0x21" role="Object">
-            <name>SubscriberListener</name>
-            <attribute kind="InterfaceSemantics">
-              <value>local</value>
-            </attribute>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrefixTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <model childrelidcntr="0x1" guid="{77606d1b-4d11-4ffa-a143-6eaffb7108e4}" id="id-0065-00000106" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-              <name>on_data_on_readers</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{a84e3704-da57-47b7-81ad-9ca5d3083444}" id="id-0067-00000093" kind="InParameter" referred="id-0065-000000ce" relid="0x0" role="InParameter">
-                <name>the_subscriber</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <reference guid="{3df2b316-f31a-4c9f-ba84-3a93a8eb0f8d}" id="id-0067-00000094" kind="Inherits" referred="id-0065-000000fd" relid="0x1" role="Inherits">
-              <name>Inherits</name>
-            </reference>
-          </model>
-          <model childrelidcntr="0x1" guid="{f9d59fe3-9616-4806-833d-2a15868c3cae}" id="id-0065-00000107" kind="Object" relid="0x22" role="Object">
-            <name>DomainParticipantListener</name>
-            <attribute kind="InterfaceSemantics">
-              <value>local</value>
-            </attribute>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrefixTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{f2584eaf-ef06-4ad5-87ba-810c016187da}" id="id-0067-00000095" kind="Inherits" referred="id-0065-000000f3" relid="0x0" role="Inherits">
-              <name>Inherits</name>
-            </reference>
-            <reference guid="{02f1a8ab-9785-494b-8445-ec77f5cdbcf7}" id="id-0067-00000096" kind="Inherits" referred="id-0065-00000092" relid="0x0" role="Inherits">
-              <name>Inherits</name>
-            </reference>
-            <reference guid="{a56eb686-b35a-4881-a923-f6aff8c00ba7}" id="id-0067-00000097" kind="Inherits" referred="id-0065-000000fc" relid="0x0" role="Inherits">
-              <name>Inherits</name>
-            </reference>
-          </model>
-          <model childrelidcntr="0x1" guid="{20c8b739-65af-41ec-8d86-d821626a2a0e}" id="id-0065-00000108" kind="Object" relid="0x23" role="Object">
-            <name>Condition</name>
-            <attribute kind="InterfaceSemantics">
-              <value>local</value>
-            </attribute>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrefixTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <model childrelidcntr="0x1" guid="{90f43f6f-85b5-4226-ad3e-affd7916af2b}" id="id-0065-00000109" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-              <name>get_trigger_value</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{7090f7d6-516d-4f5a-b12e-3c2a0aaf1b4f}" id="id-0067-000002b9" kind="ReturnType" referred="id-0066-00000023" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-          </model>
-          <model childrelidcntr="0x4" guid="{963ea670-e2d4-4b71-b455-a310e1a8c32e}" id="id-0065-0000010a" kind="Object" relid="0x24" role="Object">
-            <name>WaitSet</name>
-            <attribute kind="InterfaceSemantics">
-              <value>local</value>
-            </attribute>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrefixTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <model childrelidcntr="0x1" guid="{2bec1971-a06d-49a1-b11f-dd4583830a2e}" id="id-0065-0000010b" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-              <name>wait</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{79266214-f81a-421a-bdb5-7e8e3203a7f0}" id="id-0067-00000099" kind="InoutParameter" referred="id-0067-00000098" relid="0x0" role="InoutParameter">
-                <name>active_conditions</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{d9d9632b-67bf-4cc4-81f6-3e56f1537b3d}" id="id-0067-0000009a" kind="InParameter" referred="id-0065-00000080" relid="0x0" role="InParameter">
-                <name>timeout</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>260,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{87bff5ae-af9c-4ae1-8671-cdb4258dc924}" id="id-0067-000002ba" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{180796f6-b238-4fb1-b53d-95a62d74c7c7}" id="id-0065-0000010c" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-              <name>attach_condition</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{cc5892e9-6b25-4a8f-be23-b23185a8fed5}" id="id-0067-0000009b" kind="InParameter" referred="id-0065-00000108" relid="0x0" role="InParameter">
-                <name>cond</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{be03b66e-ce78-4793-9760-502027a66357}" id="id-0067-000002bb" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{f111c931-37a1-4b4b-a8ab-1b1d21ebe53f}" id="id-0065-0000010d" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-              <name>detach_condition</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{f718c48d-f98d-4e3b-9b3b-17abd3d1998c}" id="id-0067-0000009c" kind="InParameter" referred="id-0065-00000108" relid="0x0" role="InParameter">
-                <name>cond</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{a1cec342-59b0-48ca-9fcd-e36a8ac60acf}" id="id-0067-000002bc" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{1444279c-ee95-4c33-9e1d-b4adde514038}" id="id-0065-0000010e" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-              <name>get_conditions</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,360</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{e27cb3cf-160d-440b-97c9-0e779c719ae6}" id="id-0067-0000009d" kind="InoutParameter" referred="id-0067-00000098" relid="0x0" role="InoutParameter">
-                <name>attached_conditions</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{3bb459d2-17c8-48c9-980b-29187643ed0d}" id="id-0067-000002bd" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-          </model>
-          <model childrelidcntr="0x2" guid="{80afdb19-9426-44ec-a1e6-d7d81b6ec892}" id="id-0065-0000010f" kind="Object" relid="0x25" role="Object">
-            <name>GuardCondition</name>
-            <attribute kind="InterfaceSemantics">
-              <value>local</value>
-            </attribute>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrefixTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <model childrelidcntr="0x1" guid="{ca4365c0-7848-43e7-815b-cda458caf3e2}" id="id-0065-00000110" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-              <name>set_trigger_value</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{adfa5c45-4218-405c-a892-35ea698c8f7d}" id="id-0067-000002be" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{316e1617-c876-4c5d-85a1-4c42b205e7d5}" id="id-0067-000002bf" kind="InParameter" referred="id-0066-00000023" relid="0x0" role="InParameter">
-                <name>value</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <reference guid="{38506d9c-3d34-4866-a783-f75d14a7a74f}" id="id-0067-0000009e" kind="Inherits" referred="id-0065-00000108" relid="0x1" role="Inherits">
-              <name>Inherits</name>
-            </reference>
-          </model>
-          <model childrelidcntr="0x4" guid="{ad67a803-70ff-4d6e-967b-990b5e6c9e7f}" id="id-0065-00000111" kind="Object" relid="0x26" role="Object">
-            <name>StatusCondition</name>
-            <attribute kind="InterfaceSemantics">
-              <value>local</value>
-            </attribute>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrefixTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <model childrelidcntr="0x1" guid="{b7a09a16-8c83-4c45-b89b-2e323d17198b}" id="id-0065-00000112" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-              <name>get_enabled_statuses</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{4a0b2011-450f-48de-977e-a6bf358aff39}" id="id-0067-000002c0" kind="ReturnType" referred="id-0067-000001f2" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{4706f066-fb65-49ce-9f68-f7c41a719ac1}" id="id-0065-00000113" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-              <name>set_enabled_statuses</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{6de57292-4752-4277-b663-859fb467b851}" id="id-0067-000002c1" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{3b21d514-9639-48b5-9416-b388ca4ca93e}" id="id-0067-000002c2" kind="InParameter" referred="id-0067-000001f2" relid="0x0" role="InParameter">
-                <name>mask</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{70d00df7-c473-441d-a716-cb05b29a4cf2}" id="id-0065-00000114" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-              <name>get_entity</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{99718575-6fb6-4a21-8e8e-cbfd521c869e}" id="id-0067-0000009f" kind="ReturnType" referred="id-0065-00000093" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <reference guid="{8f2a90d9-5b79-4c30-b0a4-9a152fda0bff}" id="id-0067-000000a0" kind="Inherits" referred="id-0065-00000108" relid="0x3" role="Inherits">
-              <name>Inherits</name>
-            </reference>
-          </model>
-          <model childrelidcntr="0x5" guid="{64561bb2-bbd1-4a4c-90c7-d4e94b5b0c86}" id="id-0065-00000115" kind="Object" relid="0x27" role="Object">
-            <name>ReadCondition</name>
-            <attribute kind="InterfaceSemantics">
-              <value>local</value>
-            </attribute>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrefixTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <model childrelidcntr="0x1" guid="{08ef321e-fe40-447f-9bc6-8cd61417375b}" id="id-0065-00000116" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-              <name>get_sample_state_mask</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{61ec1fe6-5488-4dcd-9de0-7d9650927c6a}" id="id-0067-000002d4" kind="ReturnType" referred="id-0067-000002c6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{35102179-2176-4e02-a59a-012ea18cd27b}" id="id-0065-00000117" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-              <name>get_view_state_mask</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{331a9701-847d-4307-900a-71d242fdbe19}" id="id-0067-000002d5" kind="ReturnType" referred="id-0067-000002cb" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{597df2bf-444d-4ef5-9016-790a7c639e41}" id="id-0065-00000118" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-              <name>get_instance_state_mask</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{83dc1818-b6aa-413e-9966-4a62cf8d9aba}" id="id-0067-000002d6" kind="ReturnType" referred="id-0067-000002d1" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{7dfd7c28-b9d7-47b3-9156-e7402dfc6424}" id="id-0065-00000119" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-              <name>get_datareader</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,360</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{9d0a0fce-db19-4a2a-bc5d-aa07a31d7d45}" id="id-0067-000000a1" kind="ReturnType" referred="id-0065-000000ba" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <reference guid="{4ac38eff-3932-4e71-a37c-20baa0295035}" id="id-0067-000000a2" kind="Inherits" referred="id-0065-00000108" relid="0x4" role="Inherits">
-              <name>Inherits</name>
-            </reference>
-          </model>
-          <model childrelidcntr="0x4" guid="{fb4c57c7-0d18-4743-873b-9f444650dd32}" id="id-0065-0000011a" kind="Object" relid="0x28" role="Object">
-            <name>QueryCondition</name>
-            <attribute kind="InterfaceSemantics">
-              <value>local</value>
-            </attribute>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrefixTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <model childrelidcntr="0x1" guid="{834abc4d-407d-40e2-93a6-6411f0a7e826}" id="id-0065-0000011b" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-              <name>get_query_expression</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{5983d075-b2ce-4cf5-b567-1cf4936a7486}" id="id-0067-000002d7" kind="ReturnType" referred="id-0066-00000033" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{0fb3b601-7e6c-4f02-9178-624d03577090}" id="id-0065-0000011c" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-              <name>get_query_parameters</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{522fcbb6-90c7-40e2-af2e-f550658b2792}" id="id-0067-000002d8" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{aa2e4b34-ec63-4eeb-a430-e191519b6275}" id="id-0067-000002d9" kind="InoutParameter" referred="id-0067-000001d8" relid="0x0" role="InoutParameter">
-                <name>query_parameters</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{0a953f9e-5d4c-4249-b695-e32385783cbf}" id="id-0065-0000011d" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-              <name>set_query_parameters</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{af4a8656-a5fa-4d09-b08d-7e51d3320c6c}" id="id-0067-000002da" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{ae451663-d878-4598-a1df-6d0c6546cfd0}" id="id-0067-000002db" kind="InParameter" referred="id-0067-000001d8" relid="0x0" role="InParameter">
-                <name>query_parameters</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <reference guid="{c9fce9c4-515f-47f1-a2ed-3238a98e6e7e}" id="id-0067-000000a3" kind="Inherits" referred="id-0065-00000115" relid="0x3" role="Inherits">
-              <name>Inherits</name>
-            </reference>
-          </model>
-          <model childrelidcntr="0x1" guid="{5d0b0d21-0174-4a3f-a4b1-4810b9b03867}" id="id-0065-0000011e" kind="Aggregate" relid="0x29" role="Aggregate">
-            <name>UserDataQosPolicy</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{cd833cb5-c474-4de6-82bd-f5813899e78a}" id="id-0067-00000309" kind="Member" referred="id-0067-00000308" relid="0x0" role="Member">
-              <name>value</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <model childrelidcntr="0x1" guid="{31e7ed51-9481-4d36-8b4c-1143ae45140b}" id="id-0065-0000011f" kind="Aggregate" relid="0x2a" role="Aggregate">
-            <name>TopicDataQosPolicy</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{0d4a3355-a817-412a-8ea7-9cd4192fe166}" id="id-0067-0000030a" kind="Member" referred="id-0067-00000308" relid="0x0" role="Member">
-              <name>value</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <model childrelidcntr="0x1" guid="{a1453d77-ab8f-49f1-854f-53aca2b29f30}" id="id-0065-00000120" kind="Aggregate" relid="0x2b" role="Aggregate">
-            <name>GroupDataQosPolicy</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{cc6206d6-92db-42f9-ae85-1f10fc8fcc5a}" id="id-0067-0000030b" kind="Member" referred="id-0067-00000308" relid="0x0" role="Member">
-              <name>value</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <model childrelidcntr="0x1" guid="{8f8dfe08-4063-42d2-a314-927a6aba1826}" id="id-0065-00000121" kind="Aggregate" relid="0x2c" role="Aggregate">
-            <name>TransportPriorityQosPolicy</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{09ac6238-520c-4c56-9ec6-8a4afc0f4357}" id="id-0067-0000030c" kind="Member" referred="id-0066-00000028" relid="0x0" role="Member">
-              <name>value</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <model childrelidcntr="0x1" guid="{d0473b4d-657b-4a9a-9b78-6119c51060ea}" id="id-0065-00000122" kind="Aggregate" relid="0x2d" role="Aggregate">
-            <name>LifespanQosPolicy</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{92a37816-156e-4678-b977-791074f4683c}" id="id-0067-000000a4" kind="Member" referred="id-0065-00000080" relid="0x0" role="Member">
-              <name>duration</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <model childrelidcntr="0x4" guid="{640d2a39-4edc-4d30-84c1-3015943c36c1}" id="id-0065-00000123" kind="Enum" relid="0x2e" role="Enum">
-            <name>DurabilityQosPolicyKind</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <atom guid="{e250443e-7189-42c1-af22-aa7e3e62bf4b}" id="id-0066-00000010" kind="EnumValue" relid="0x0" role="EnumValue">
-              <name>VOLATILE_DURABILITY_QOS</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </atom>
-            <atom guid="{6ec098c3-f16b-43c0-b632-3e6f83d4fd72}" id="id-0066-00000011" kind="EnumValue" relid="0x1" role="EnumValue">
-              <name>TRANSIENT_LOCAL_DURABILITY_QOS</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </atom>
-            <atom guid="{72b79f7c-e86f-4718-9a41-00be9c925290}" id="id-0066-00000012" kind="EnumValue" relid="0x2" role="EnumValue">
-              <name>TRANSIENT_DURABILITY_QOS</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </atom>
-            <atom guid="{cc39bfcd-d61c-466e-8320-328d1c9f05c3}" id="id-0066-00000013" kind="EnumValue" relid="0x3" role="EnumValue">
-              <name>PERSISTENT_DURABILITY_QOS</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,360</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </atom>
-          </model>
-          <model childrelidcntr="0x1" guid="{5af9d5af-d54e-482b-8e8c-c8bbcbf3b030}" id="id-0065-00000124" kind="Aggregate" relid="0x2f" role="Aggregate">
-            <name>DurabilityQosPolicy</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{6cb4e11e-f909-43c8-af97-acddef43abf8}" id="id-0067-000000a5" kind="Member" referred="id-0065-00000123" relid="0x0" role="Member">
-              <name>kind</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <model childrelidcntr="0x3" guid="{6bfe912d-b9e1-4a25-93a0-b44eb90e129d}" id="id-0065-00000125" kind="Enum" relid="0x30" role="Enum">
-            <name>PresentationQosPolicyAccessScopeKind</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <atom guid="{9673971f-2e34-46de-8ec8-73798197d0bd}" id="id-0066-00000014" kind="EnumValue" relid="0x0" role="EnumValue">
-              <name>INSTANCE_PRESENTATION_QOS</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </atom>
-            <atom guid="{ce53e6e7-5e3b-46f5-b79f-795c4b48e0ad}" id="id-0066-00000015" kind="EnumValue" relid="0x1" role="EnumValue">
-              <name>TOPIC_PRESENTATION_QOS</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </atom>
-            <atom guid="{90f403f0-3368-4050-aef9-2ae0da24c2c9}" id="id-0066-00000016" kind="EnumValue" relid="0x2" role="EnumValue">
-              <name>GROUP_PRESENTATION_QOS</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </atom>
-          </model>
-          <model childrelidcntr="0x1" guid="{ca630852-9aea-4553-8cb2-041012ae8aec}" id="id-0065-00000126" kind="Aggregate" relid="0x31" role="Aggregate">
-            <name>PresentationQosPolicy</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{d481933b-86f0-492a-b029-8288e8a6b97c}" id="id-0067-000000a6" kind="Member" referred="id-0065-00000125" relid="0x0" role="Member">
-              <name>access_scope</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{1a77a076-e8af-4a83-bdc7-e3dbe8e6079e}" id="id-0067-0000030d" kind="Member" referred="id-0066-00000023" relid="0x0" role="Member">
-              <name>coherent_access</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{95f21377-62b7-4462-a043-98094379ebb7}" id="id-0067-0000030e" kind="Member" referred="id-0066-00000023" relid="0x0" role="Member">
-              <name>ordered_access</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <model childrelidcntr="0x1" guid="{7d1121ef-12bb-4158-8d1c-c83e92792f6a}" id="id-0065-00000127" kind="Aggregate" relid="0x32" role="Aggregate">
-            <name>DeadlineQosPolicy</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{973f4fac-415a-4c29-99ee-0c8cff77b894}" id="id-0067-000000a7" kind="Member" referred="id-0065-00000080" relid="0x0" role="Member">
-              <name>period</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <model childrelidcntr="0x1" guid="{cf2d355a-ac71-42e8-974e-2991e17d4819}" id="id-0065-00000128" kind="Aggregate" relid="0x33" role="Aggregate">
-            <name>LatencyBudgetQosPolicy</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{9497318d-e203-47fc-8222-76fee855c609}" id="id-0067-000000a8" kind="Member" referred="id-0065-00000080" relid="0x0" role="Member">
-              <name>duration</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <model childrelidcntr="0x2" guid="{13267686-3ead-49f5-9b7d-db38a7ba7d6c}" id="id-0065-00000129" kind="Enum" relid="0x34" role="Enum">
-            <name>OwnershipQosPolicyKind</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <atom guid="{35bbee33-3cfb-4100-9f13-2089c07e8708}" id="id-0066-00000017" kind="EnumValue" relid="0x0" role="EnumValue">
-              <name>SHARED_OWNERSHIP_QOS</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </atom>
-            <atom guid="{f66082d0-4e9f-4361-a26d-6d6050d83b9c}" id="id-0066-00000018" kind="EnumValue" relid="0x1" role="EnumValue">
-              <name>EXCLUSIVE_OWNERSHIP_QOS</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </atom>
-          </model>
-          <model childrelidcntr="0x1" guid="{40c1b881-6f39-4bf5-9073-bea84cfcae9a}" id="id-0065-0000012a" kind="Aggregate" relid="0x35" role="Aggregate">
-            <name>OwnershipQosPolicy</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{7c40efef-88c4-4943-a5c1-f2bf1669fbf8}" id="id-0067-000000a9" kind="Member" referred="id-0065-00000129" relid="0x0" role="Member">
-              <name>kind</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <model childrelidcntr="0x1" guid="{44e1dafc-c12e-486c-9196-a18a5e346bbf}" id="id-0065-0000012b" kind="Aggregate" relid="0x36" role="Aggregate">
-            <name>OwnershipStrengthQosPolicy</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{99a7f461-8cbe-4576-b104-37bc31847fa6}" id="id-0067-0000030f" kind="Member" referred="id-0066-00000028" relid="0x0" role="Member">
-              <name>value</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <model childrelidcntr="0x3" guid="{7038e581-f25e-4142-bd4c-60e4dde8a414}" id="id-0065-0000012c" kind="Enum" relid="0x37" role="Enum">
-            <name>LivelinessQosPolicyKind</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <atom guid="{eeb954a4-8770-4151-a626-e4adc5aa10a6}" id="id-0066-00000019" kind="EnumValue" relid="0x0" role="EnumValue">
-              <name>AUTOMATIC_LIVELINESS_QOS</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </atom>
-            <atom guid="{327f4ac0-ec1a-4eb9-a118-3af2a9076ed5}" id="id-0066-0000001a" kind="EnumValue" relid="0x1" role="EnumValue">
-              <name>MANUAL_BY_PARTICIPANT_LIVELINESS_QOS</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </atom>
-            <atom guid="{09db2b95-ea2f-4c62-aee6-38106f64e4c5}" id="id-0066-0000001b" kind="EnumValue" relid="0x2" role="EnumValue">
-              <name>MANUAL_BY_TOPIC_LIVELINESS_QOS</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </atom>
-          </model>
-          <model childrelidcntr="0x1" guid="{9edb5275-ff34-4335-8293-ffbff6839c8a}" id="id-0065-0000012d" kind="Aggregate" relid="0x38" role="Aggregate">
-            <name>LivelinessQosPolicy</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{47b83650-1752-455a-819e-af36e2a02141}" id="id-0067-000000aa" kind="Member" referred="id-0065-0000012c" relid="0x0" role="Member">
-              <name>kind</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{290d189e-21d9-4a89-bc2d-c146e577531a}" id="id-0067-000000ab" kind="Member" referred="id-0065-00000080" relid="0x0" role="Member">
-              <name>lease_duration</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <model childrelidcntr="0x1" guid="{b6a1a384-bb33-4f77-8481-c99115ff8f75}" id="id-0065-0000012e" kind="Aggregate" relid="0x39" role="Aggregate">
-            <name>TimeBasedFilterQosPolicy</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{bdba4cf2-1773-454f-9848-e77539c6047d}" id="id-0067-000000ac" kind="Member" referred="id-0065-00000080" relid="0x0" role="Member">
-              <name>minimum_separation</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <model childrelidcntr="0x1" guid="{9d41c454-c99c-437c-adba-ad1734d0de96}" id="id-0065-0000012f" kind="Aggregate" relid="0x3a" role="Aggregate">
-            <name>PartitionQosPolicy</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{6bdaee44-0810-4fac-b0d7-83d06edf56b1}" id="id-0067-00000310" kind="Member" referred="id-0067-000001d8" relid="0x0" role="Member">
-              <name>name</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <model childrelidcntr="0x2" guid="{58736bb3-17e7-4d63-94c9-6fbdcf891236}" id="id-0065-00000130" kind="Enum" relid="0x3b" role="Enum">
-            <name>ReliabilityQosPolicyKind</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <atom guid="{67c74094-0213-40ca-95a5-944d3ec6bbe1}" id="id-0066-0000001c" kind="EnumValue" relid="0x0" role="EnumValue">
-              <name>BEST_EFFORT_RELIABILITY_QOS</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </atom>
-            <atom guid="{415114cd-5195-489f-bd3d-62da3c346ce5}" id="id-0066-0000001d" kind="EnumValue" relid="0x1" role="EnumValue">
-              <name>RELIABLE_RELIABILITY_QOS</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </atom>
-          </model>
-          <model childrelidcntr="0x1" guid="{23dcaea5-1b19-4696-9f88-59597b375aea}" id="id-0065-00000131" kind="Aggregate" relid="0x3c" role="Aggregate">
-            <name>ReliabilityQosPolicy</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{2d463ec8-1f8b-413d-b901-2877be67a0d9}" id="id-0067-000000ad" kind="Member" referred="id-0065-00000130" relid="0x0" role="Member">
-              <name>kind</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{48e76418-260b-4186-b8f5-b58fe85f0efd}" id="id-0067-000000ae" kind="Member" referred="id-0065-00000080" relid="0x0" role="Member">
-              <name>max_blocking_time</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <model childrelidcntr="0x2" guid="{8591eaca-32e4-44e4-bebb-b3e52d458ce1}" id="id-0065-00000132" kind="Enum" relid="0x3d" role="Enum">
-            <name>DestinationOrderQosPolicyKind</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <atom guid="{80c44981-7092-43c8-9e6f-34e5e0dd7506}" id="id-0066-0000001e" kind="EnumValue" relid="0x0" role="EnumValue">
-              <name>BY_RECEPTION_TIMESTAMP_DESTINATIONORDER_QOS</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </atom>
-            <atom guid="{0c071810-7892-4c4c-bdb8-a77fafb75faf}" id="id-0066-0000001f" kind="EnumValue" relid="0x1" role="EnumValue">
-              <name>BY_SOURCE_TIMESTAMP_DESTINATIONORDER_QOS</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </atom>
-          </model>
-          <model childrelidcntr="0x1" guid="{196945c2-043f-4a8f-bfb1-7d05a359ed03}" id="id-0065-00000133" kind="Aggregate" relid="0x3e" role="Aggregate">
-            <name>DestinationOrderQosPolicy</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{9bde85a2-fd0a-4bf3-978c-4673d1e5e12c}" id="id-0067-000000af" kind="Member" referred="id-0065-00000132" relid="0x0" role="Member">
-              <name>kind</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <model childrelidcntr="0x2" guid="{08af6c5f-caa3-4ca1-a4d1-b9d54310c697}" id="id-0065-00000134" kind="Enum" relid="0x3f" role="Enum">
-            <name>HistoryQosPolicyKind</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <atom guid="{7fc1b160-a621-440a-a680-dcb03426eda0}" id="id-0066-00000020" kind="EnumValue" relid="0x0" role="EnumValue">
-              <name>KEEP_LAST_HISTORY_QOS</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </atom>
-            <atom guid="{ed898fc4-b4d7-4d8b-9ec7-4e18b78f8d47}" id="id-0066-00000021" kind="EnumValue" relid="0x1" role="EnumValue">
-              <name>KEEP_ALL_HISTORY_QOS</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </atom>
-          </model>
-          <model childrelidcntr="0x1" guid="{0ac088b7-d4d1-45e3-b138-3de5e5f8ca51}" id="id-0065-00000135" kind="Aggregate" relid="0x40" role="Aggregate">
-            <name>HistoryQosPolicy</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{7217533c-d1f2-4c3b-b3d9-61d2045ea106}" id="id-0067-000000b0" kind="Member" referred="id-0065-00000134" relid="0x0" role="Member">
-              <name>kind</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{433081f8-8617-42fd-9abe-b688bbcf98ce}" id="id-0067-00000311" kind="Member" referred="id-0066-00000028" relid="0x0" role="Member">
-              <name>depth</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <model childrelidcntr="0x1" guid="{f8a00190-2a75-41c2-b5a0-682d61568931}" id="id-0065-00000136" kind="Aggregate" relid="0x41" role="Aggregate">
-            <name>ResourceLimitsQosPolicy</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{cc496538-8bd6-43a0-9c79-36cb89801e41}" id="id-0067-00000312" kind="Member" referred="id-0066-00000028" relid="0x0" role="Member">
-              <name>max_samples</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{ca3c745f-ba26-4d08-b621-951177cb1687}" id="id-0067-00000313" kind="Member" referred="id-0066-00000028" relid="0x0" role="Member">
-              <name>max_instances</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{f744660b-bf6d-4b72-a07f-857e5f8fce68}" id="id-0067-00000314" kind="Member" referred="id-0066-00000028" relid="0x0" role="Member">
-              <name>max_samples_per_instance</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <model childrelidcntr="0x1" guid="{fb47bdf9-902a-4e57-8f13-c418ec0265c6}" id="id-0065-00000137" kind="Aggregate" relid="0x42" role="Aggregate">
-            <name>EntityFactoryQosPolicy</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{3b58eef4-8165-466a-afbb-5560964f1031}" id="id-0067-00000315" kind="Member" referred="id-0066-00000023" relid="0x0" role="Member">
-              <name>autoenable_created_entities</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <model childrelidcntr="0x1" guid="{a6461d6d-7852-4fc0-9ae7-e5d889df27f7}" id="id-0065-00000138" kind="Aggregate" relid="0x43" role="Aggregate">
-            <name>WriterDataLifecycleQosPolicy</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{10690b87-d46c-433c-9f98-8840fe0ba8d9}" id="id-0067-00000316" kind="Member" referred="id-0066-00000023" relid="0x0" role="Member">
-              <name>autodispose_unregistered_instances</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <model childrelidcntr="0x1" guid="{dd3409b2-3697-4a11-bdf1-8678ac54106b}" id="id-0065-00000139" kind="Aggregate" relid="0x44" role="Aggregate">
-            <name>ReaderDataLifecycleQosPolicy</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{1ddfb830-8f41-4f6f-b977-7338cd722230}" id="id-0067-000000b1" kind="Member" referred="id-0065-00000080" relid="0x0" role="Member">
-              <name>autopurge_nowriter_samples_delay</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{cfde8b31-af5b-4977-8087-860ff997669b}" id="id-0067-000000b2" kind="Member" referred="id-0065-00000080" relid="0x0" role="Member">
-              <name>autopurge_disposed_samples_delay</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <model childrelidcntr="0x1" guid="{66cb25d0-4e81-4929-a939-d2e4008a3c0d}" id="id-0065-0000013a" kind="Aggregate" relid="0x45" role="Aggregate">
-            <name>DurabilityServiceQosPolicy</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{975eed39-aa06-4b1c-b3a3-5981dac1db8a}" id="id-0067-000000b3" kind="Member" referred="id-0065-00000080" relid="0x0" role="Member">
-              <name>service_cleanup_delay</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{2822bd5d-8275-416a-916e-fb16379386a8}" id="id-0067-000000b4" kind="Member" referred="id-0065-00000134" relid="0x0" role="Member">
-              <name>history_kind</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{9a11855b-e433-47b7-bc08-05028dd0d5ab}" id="id-0067-00000317" kind="Member" referred="id-0066-00000028" relid="0x0" role="Member">
-              <name>history_depth</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{028068fb-4140-47a0-82a3-7481a1fd5f55}" id="id-0067-00000318" kind="Member" referred="id-0066-00000028" relid="0x0" role="Member">
-              <name>max_samples</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,360</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{443d629e-763c-4995-9222-0aa69f824604}" id="id-0067-00000319" kind="Member" referred="id-0066-00000028" relid="0x0" role="Member">
-              <name>max_instances</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,460</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{7cf79540-2e2c-4b32-a441-9c6f0448d7e2}" id="id-0067-0000031a" kind="Member" referred="id-0066-00000028" relid="0x0" role="Member">
-              <name>max_samples_per_instance</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,560</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <model childrelidcntr="0x1" guid="{e01cafd0-be06-4610-bff3-cf897ea84212}" id="id-0065-0000013b" kind="Aggregate" relid="0x46" role="Aggregate">
-            <name>DomainParticipantFactoryQos</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{7adb24c4-6ca5-4543-85ac-a114f06ef16a}" id="id-0067-000000b5" kind="Member" referred="id-0065-00000137" relid="0x0" role="Member">
-              <name>entity_factory</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <model childrelidcntr="0x1" guid="{80880e1a-6bf3-4fad-8983-6703f02306de}" id="id-0065-0000013c" kind="Aggregate" relid="0x47" role="Aggregate">
-            <name>DomainParticipantQos</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{38a14857-e704-4a13-ad7b-d54be2b3ae21}" id="id-0067-000000b6" kind="Member" referred="id-0065-0000011e" relid="0x0" role="Member">
-              <name>user_data</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{ae9c7b4c-817a-4eeb-9ac6-442d42d6ac8c}" id="id-0067-000000b7" kind="Member" referred="id-0065-00000137" relid="0x0" role="Member">
-              <name>entity_factory</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <model childrelidcntr="0x1" guid="{d3a0c983-29d0-43c8-8bd8-29d44ba1f655}" id="id-0065-0000013d" kind="Aggregate" relid="0x48" role="Aggregate">
-            <name>TopicQos</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{d104f47a-95f8-4d58-aad8-19e32111c9f1}" id="id-0067-000000b8" kind="Member" referred="id-0065-0000011f" relid="0x0" role="Member">
-              <name>topic_data</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{8cd8f79d-6a29-471e-b0bb-cc5d6b7ffe34}" id="id-0067-000000b9" kind="Member" referred="id-0065-00000124" relid="0x0" role="Member">
-              <name>durability</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{ef026d4c-df93-4537-862c-1f6d6e96f209}" id="id-0067-000000ba" kind="Member" referred="id-0065-0000013a" relid="0x0" role="Member">
-              <name>durability_service</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{ceea4172-e125-48b6-af32-c92321bcb497}" id="id-0067-000000bb" kind="Member" referred="id-0065-00000127" relid="0x0" role="Member">
-              <name>deadline</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,360</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{fce43b52-4868-4e1f-a9b0-d113954a6e1e}" id="id-0067-000000bc" kind="Member" referred="id-0065-00000128" relid="0x0" role="Member">
-              <name>latency_budget</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,460</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{2c72abea-95b5-48ba-8778-92dcf8ea5212}" id="id-0067-000000bd" kind="Member" referred="id-0065-0000012d" relid="0x0" role="Member">
-              <name>liveliness</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,560</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{9070def0-791b-4252-ba41-0fe9742ff8fd}" id="id-0067-000000be" kind="Member" referred="id-0065-00000131" relid="0x0" role="Member">
-              <name>reliability</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,660</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{65e2a28d-1333-461f-8fce-fc49b1255cc3}" id="id-0067-000000bf" kind="Member" referred="id-0065-00000133" relid="0x0" role="Member">
-              <name>destination_order</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,760</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{7061f8ed-86da-493c-a821-871b8b50983d}" id="id-0067-000000c0" kind="Member" referred="id-0065-00000135" relid="0x0" role="Member">
-              <name>history</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,860</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{fc6db77a-da19-4c24-9b38-f4adaf495ea0}" id="id-0067-000000c1" kind="Member" referred="id-0065-00000136" relid="0x0" role="Member">
-              <name>resource_limits</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,960</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{1621cc44-b1e0-4e97-a19c-4d8cffdb85a8}" id="id-0067-000000c2" kind="Member" referred="id-0065-00000121" relid="0x0" role="Member">
-              <name>transport_priority</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1060</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{a1a4d783-fc7d-4b24-b6c5-7dd4ceb8f78d}" id="id-0067-000000c3" kind="Member" referred="id-0065-00000122" relid="0x0" role="Member">
-              <name>lifespan</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{94a5ca2d-6006-413c-9599-7b78c7ae6318}" id="id-0067-000000c4" kind="Member" referred="id-0065-0000012a" relid="0x0" role="Member">
-              <name>ownership</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <model childrelidcntr="0x1" guid="{142090e7-4afa-40f9-a7b7-acca45b58f89}" id="id-0065-0000013e" kind="Aggregate" relid="0x49" role="Aggregate">
-            <name>DataWriterQos</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{dbc6fe81-1bc3-4cac-acd0-8d819637963a}" id="id-0067-000000c5" kind="Member" referred="id-0065-00000124" relid="0x0" role="Member">
-              <name>durability</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{40bb7cad-1c21-4c1c-97d5-74e80222eb35}" id="id-0067-000000c6" kind="Member" referred="id-0065-0000013a" relid="0x0" role="Member">
-              <name>durability_service</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{161dce72-3f95-4cc7-9a75-da9564ca3aea}" id="id-0067-000000c7" kind="Member" referred="id-0065-00000127" relid="0x0" role="Member">
-              <name>deadline</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{9d9aa4a9-e988-4b14-b328-862ee8be23e3}" id="id-0067-000000c8" kind="Member" referred="id-0065-00000128" relid="0x0" role="Member">
-              <name>latency_budget</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,360</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{dd5d7b74-74d4-4f7f-8110-a098f5052b14}" id="id-0067-000000c9" kind="Member" referred="id-0065-0000012d" relid="0x0" role="Member">
-              <name>liveliness</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,460</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{872e8c21-6318-4ab5-a1d4-890ee96fc4ce}" id="id-0067-000000ca" kind="Member" referred="id-0065-00000131" relid="0x0" role="Member">
-              <name>reliability</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,560</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{318a73ee-29f7-4651-b9b7-654d6b956ac9}" id="id-0067-000000cb" kind="Member" referred="id-0065-00000133" relid="0x0" role="Member">
-              <name>destination_order</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,660</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{cae97f14-b966-4b09-852d-3f3112b8a57e}" id="id-0067-000000cc" kind="Member" referred="id-0065-00000135" relid="0x0" role="Member">
-              <name>history</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,760</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{2f93bc29-54a3-41cc-adb4-f54c99330b5a}" id="id-0067-000000cd" kind="Member" referred="id-0065-00000136" relid="0x0" role="Member">
-              <name>resource_limits</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,860</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{74fdb0e3-5d0e-481f-9985-f8d33b72b238}" id="id-0067-000000ce" kind="Member" referred="id-0065-00000121" relid="0x0" role="Member">
-              <name>transport_priority</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,960</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{43b72f95-f755-4253-9693-34052ad1b3dc}" id="id-0067-000000cf" kind="Member" referred="id-0065-00000122" relid="0x0" role="Member">
-              <name>lifespan</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1060</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{5323a935-6a62-44c5-9149-ccabb2ee80ba}" id="id-0067-000000d0" kind="Member" referred="id-0065-0000011e" relid="0x0" role="Member">
-              <name>user_data</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{82ac8d4d-96de-401e-9a0d-09f02332e7ca}" id="id-0067-000000d1" kind="Member" referred="id-0065-0000012a" relid="0x0" role="Member">
-              <name>ownership</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{6eb4257c-6a47-42dd-9585-971b6f1e591b}" id="id-0067-000000d2" kind="Member" referred="id-0065-0000012b" relid="0x0" role="Member">
-              <name>ownership_strength</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1360</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{2a7f428e-f781-4d5a-8614-6fbab50ec1f9}" id="id-0067-000000d3" kind="Member" referred="id-0065-00000138" relid="0x0" role="Member">
-              <name>writer_data_lifecycle</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1460</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <model childrelidcntr="0x1" guid="{05f323d2-bea1-4cd9-97d2-9d2d15244fbc}" id="id-0065-0000013f" kind="Aggregate" relid="0x4a" role="Aggregate">
-            <name>PublisherQos</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{507c41be-ceb6-4a51-960b-f79f086b46e9}" id="id-0067-000000d4" kind="Member" referred="id-0065-00000126" relid="0x0" role="Member">
-              <name>presentation</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{6fa8ae61-0ba5-4fcd-b0dc-0f3f94fb0903}" id="id-0067-000000d5" kind="Member" referred="id-0065-0000012f" relid="0x0" role="Member">
-              <name>partition</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{96603f31-1a32-43d3-955c-7de1350608af}" id="id-0067-000000d6" kind="Member" referred="id-0065-00000120" relid="0x0" role="Member">
-              <name>group_data</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{95c00a23-9a51-4bbd-b7b2-8b10a62bb323}" id="id-0067-000000d7" kind="Member" referred="id-0065-00000137" relid="0x0" role="Member">
-              <name>entity_factory</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,360</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <model childrelidcntr="0x1" guid="{5d8504b8-9924-4d9f-8454-057da8c34ac6}" id="id-0065-00000140" kind="Aggregate" relid="0x4b" role="Aggregate">
-            <name>DataReaderQos</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{a8a7970b-a25c-45af-9e9e-65d1d36f8b25}" id="id-0067-000000d8" kind="Member" referred="id-0065-00000124" relid="0x0" role="Member">
-              <name>durability</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{2e3cb73e-6c5b-4166-8d8d-80586358ce71}" id="id-0067-000000d9" kind="Member" referred="id-0065-00000127" relid="0x0" role="Member">
-              <name>deadline</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{16d3543d-99da-4ab2-982e-b307a74938c7}" id="id-0067-000000da" kind="Member" referred="id-0065-00000128" relid="0x0" role="Member">
-              <name>latency_budget</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{2748857a-a261-47a7-8697-43989a3016c9}" id="id-0067-000000db" kind="Member" referred="id-0065-0000012d" relid="0x0" role="Member">
-              <name>liveliness</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,360</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{c598c25e-4b38-40ac-9481-73d226446408}" id="id-0067-000000dc" kind="Member" referred="id-0065-00000131" relid="0x0" role="Member">
-              <name>reliability</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,460</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{d06b2587-7836-47a3-8db4-0fd9b1a35cc4}" id="id-0067-000000dd" kind="Member" referred="id-0065-00000133" relid="0x0" role="Member">
-              <name>destination_order</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,560</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{1af79dc4-80df-44b4-b755-b78c130504c9}" id="id-0067-000000de" kind="Member" referred="id-0065-00000135" relid="0x0" role="Member">
-              <name>history</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,660</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{9ea85702-c298-499e-b8d5-a3a5119c6ad8}" id="id-0067-000000df" kind="Member" referred="id-0065-00000136" relid="0x0" role="Member">
-              <name>resource_limits</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,760</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{75038eb6-12d7-4b05-a3ca-0b56c09289de}" id="id-0067-000000e0" kind="Member" referred="id-0065-0000011e" relid="0x0" role="Member">
-              <name>user_data</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,860</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{8d486a1b-fc87-44bd-a0dd-43269adae313}" id="id-0067-000000e1" kind="Member" referred="id-0065-0000012a" relid="0x0" role="Member">
-              <name>ownership</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,960</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{ae2ac85f-4ca8-4719-9b75-d1eb2f8d6d64}" id="id-0067-000000e2" kind="Member" referred="id-0065-0000012e" relid="0x0" role="Member">
-              <name>time_based_filter</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1060</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{066817f2-148d-4524-a7dc-03864e563b7c}" id="id-0067-000000e3" kind="Member" referred="id-0065-00000139" relid="0x0" role="Member">
-              <name>reader_data_lifecycle</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <model childrelidcntr="0x1" guid="{ad48c95c-f86c-4bd5-b12c-c7eba6432e44}" id="id-0065-00000141" kind="Aggregate" relid="0x4c" role="Aggregate">
-            <name>SubscriberQos</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{aa9100b8-993a-44c6-8a8b-60e102804fdf}" id="id-0067-000000e4" kind="Member" referred="id-0065-00000126" relid="0x0" role="Member">
-              <name>presentation</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{a8cd770b-55e5-4041-a5cd-fdacf4c2ed66}" id="id-0067-000000e5" kind="Member" referred="id-0065-0000012f" relid="0x0" role="Member">
-              <name>partition</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{1eceadee-ea1a-4f28-b95e-da8b38db62eb}" id="id-0067-000000e6" kind="Member" referred="id-0065-00000120" relid="0x0" role="Member">
-              <name>group_data</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{beecdcab-928f-4f06-baeb-b36efa54fb4f}" id="id-0067-000000e7" kind="Member" referred="id-0065-00000137" relid="0x0" role="Member">
-              <name>entity_factory</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,360</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <model childrelidcntr="0x1" guid="{6d7fa318-c5c6-452d-9ece-ca1ab5aef753}" id="id-0065-00000142" kind="Aggregate" relid="0x4d" role="Aggregate">
-            <name>ParticipantBuiltinTopicData</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{fbeff137-5e5f-40ec-a672-6a2bbcce8923}" id="id-0067-000000e8" kind="Member" referred="id-0065-0000007f" relid="0x0" role="Member">
-              <name>key</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{0647706a-1b80-4ef7-b901-cb14181598ee}" id="id-0067-000000e9" kind="Member" referred="id-0065-0000011e" relid="0x0" role="Member">
-              <name>user_data</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <model childrelidcntr="0x1" guid="{2bd37d3a-9a67-4ef1-a1f8-fbbc2b51723f}" id="id-0065-00000143" kind="Aggregate" relid="0x4e" role="Aggregate">
-            <name>TopicBuiltinTopicData</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{6b3ce870-f78f-4fd2-a63e-797f9e6a650e}" id="id-0067-000000ea" kind="Member" referred="id-0065-0000007f" relid="0x0" role="Member">
-              <name>key</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{86c5afa3-a1be-41eb-b069-e380608e8e48}" id="id-0067-000000eb" kind="Member" referred="id-0065-00000124" relid="0x0" role="Member">
-              <name>durability</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,360</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{d7753d28-9a6d-4df6-bb22-2f8b2de38c2c}" id="id-0067-000000ec" kind="Member" referred="id-0065-0000013a" relid="0x0" role="Member">
-              <name>durability_service</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,460</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{640eeb42-3323-4378-8704-f8cfebb5d9e4}" id="id-0067-000000ed" kind="Member" referred="id-0065-00000127" relid="0x0" role="Member">
-              <name>deadline</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,560</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{b3976ba1-0d26-4df7-a64e-0a564b1ed436}" id="id-0067-000000ee" kind="Member" referred="id-0065-00000128" relid="0x0" role="Member">
-              <name>latency_budget</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,660</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{237cc5ca-046d-45c1-929f-1ae92e859ecc}" id="id-0067-000000ef" kind="Member" referred="id-0065-0000012d" relid="0x0" role="Member">
-              <name>liveliness</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,760</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{fa16155c-7949-4ba1-b8aa-0fc8d9f4e491}" id="id-0067-000000f0" kind="Member" referred="id-0065-00000131" relid="0x0" role="Member">
-              <name>reliability</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,860</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{76c22efb-eda4-4f76-8c13-a79d5ca4cb9b}" id="id-0067-000000f1" kind="Member" referred="id-0065-00000121" relid="0x0" role="Member">
-              <name>transport_priority</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,960</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{6ec7265a-72e8-4982-bd02-c55a2d5d9c00}" id="id-0067-000000f2" kind="Member" referred="id-0065-00000122" relid="0x0" role="Member">
-              <name>lifespan</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1060</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{89f2277c-d997-4259-a91e-a752f9d9aaf4}" id="id-0067-000000f3" kind="Member" referred="id-0065-00000133" relid="0x0" role="Member">
-              <name>destination_order</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{10465536-fc3b-4701-9d0a-3159e43be578}" id="id-0067-000000f4" kind="Member" referred="id-0065-00000135" relid="0x0" role="Member">
-              <name>history</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{8ac6eb4f-2f26-4ed0-a667-133233092ea1}" id="id-0067-000000f5" kind="Member" referred="id-0065-00000136" relid="0x0" role="Member">
-              <name>resource_limits</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1360</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{737fb5c5-07d8-4862-8519-c1299ddcb421}" id="id-0067-000000f6" kind="Member" referred="id-0065-0000012a" relid="0x0" role="Member">
-              <name>ownership</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1460</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{f19a9151-2614-4a85-bd89-66e0ff11416d}" id="id-0067-000000f7" kind="Member" referred="id-0065-0000011f" relid="0x0" role="Member">
-              <name>topic_data</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1560</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{be5ded00-6080-42ca-a729-ef08939b5bef}" id="id-0067-0000031b" kind="Member" referred="id-0066-00000033" relid="0x0" role="Member">
-              <name>name</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{6e203ff9-56a2-4e0d-b13b-46eb029b618d}" id="id-0067-0000031c" kind="Member" referred="id-0066-00000033" relid="0x0" role="Member">
-              <name>type_name</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <model childrelidcntr="0x1" guid="{d6a2cf29-0b4f-4e8c-aea7-874f14043462}" id="id-0065-00000144" kind="Aggregate" relid="0x4f" role="Aggregate">
-            <name>PublicationBuiltinTopicData</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{322986af-0d46-44fa-93fc-edc57452abe6}" id="id-0067-000000f8" kind="Member" referred="id-0065-0000007f" relid="0x0" role="Member">
-              <name>key</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{b0007b0a-29e8-48c6-a7dd-83b56c723775}" id="id-0067-000000f9" kind="Member" referred="id-0065-0000007f" relid="0x0" role="Member">
-              <name>participant_key</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{19aee622-60df-40f6-8434-979ee6000124}" id="id-0067-000000fa" kind="Member" referred="id-0065-00000124" relid="0x0" role="Member">
-              <name>durability</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,460</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{435a2530-9905-4a2a-9dc0-8293d3f1f658}" id="id-0067-000000fb" kind="Member" referred="id-0065-0000013a" relid="0x0" role="Member">
-              <name>durability_service</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,560</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{f66233b3-97f0-4183-97a5-1f5fc9a7744f}" id="id-0067-000000fc" kind="Member" referred="id-0065-00000127" relid="0x0" role="Member">
-              <name>deadline</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,660</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{18d212a7-81d6-493e-a187-2f2269007044}" id="id-0067-000000fd" kind="Member" referred="id-0065-00000128" relid="0x0" role="Member">
-              <name>latency_budget</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,760</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{098876d8-a496-4f36-910d-bd4ae426180a}" id="id-0067-000000fe" kind="Member" referred="id-0065-0000012d" relid="0x0" role="Member">
-              <name>liveliness</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,860</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{e1164fd0-8a8d-4a14-a558-a43e92a7535c}" id="id-0067-000000ff" kind="Member" referred="id-0065-00000131" relid="0x0" role="Member">
-              <name>reliability</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,960</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{5acc1014-0f9c-4aaa-b162-3d464fd6ab4a}" id="id-0067-00000100" kind="Member" referred="id-0065-00000122" relid="0x0" role="Member">
-              <name>lifespan</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1060</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{6f0f0e3e-ca32-4c18-9147-e2fb6ba365d6}" id="id-0067-00000101" kind="Member" referred="id-0065-0000011e" relid="0x0" role="Member">
-              <name>user_data</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{3e571104-51ea-42fb-9d97-5cac48a97bd7}" id="id-0067-00000102" kind="Member" referred="id-0065-0000012a" relid="0x0" role="Member">
-              <name>ownership</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{e654a5f6-b0bf-4d6b-9488-04ea35ba6172}" id="id-0067-00000103" kind="Member" referred="id-0065-0000012b" relid="0x0" role="Member">
-              <name>ownership_strength</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1360</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{caf54c3f-127a-42a0-9284-51e89cb34f2a}" id="id-0067-00000104" kind="Member" referred="id-0065-00000133" relid="0x0" role="Member">
-              <name>destination_order</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1460</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{df1cc389-715b-49b5-a3da-fa14045eb638}" id="id-0067-00000105" kind="Member" referred="id-0065-00000126" relid="0x0" role="Member">
-              <name>presentation</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1560</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{04d93761-36bc-46f7-9181-c18877c2fc8c}" id="id-0067-00000106" kind="Member" referred="id-0065-0000012f" relid="0x0" role="Member">
-              <name>partition</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1660</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{55315601-9b0b-4c16-99f9-bf75b54b075e}" id="id-0067-00000107" kind="Member" referred="id-0065-0000011f" relid="0x0" role="Member">
-              <name>topic_data</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1760</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{fb4beee6-479d-4b40-9156-a995c06774f1}" id="id-0067-00000108" kind="Member" referred="id-0065-00000120" relid="0x0" role="Member">
-              <name>group_data</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1860</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{94428c6c-cef2-4092-b960-b153c7e4dea8}" id="id-0067-0000031d" kind="Member" referred="id-0066-00000033" relid="0x0" role="Member">
-              <name>topic_name</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{0a141642-e12e-4ac5-a872-a970a8ffbe4c}" id="id-0067-0000031e" kind="Member" referred="id-0066-00000033" relid="0x0" role="Member">
-              <name>type_name</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,360</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <model childrelidcntr="0x1" guid="{c26aeb2a-96c1-4b36-940d-42eec8123db6}" id="id-0065-00000145" kind="Aggregate" relid="0x50" role="Aggregate">
-            <name>SubscriptionBuiltinTopicData</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{4e51c86b-f1e9-4739-8438-076ef6b1e16e}" id="id-0067-00000109" kind="Member" referred="id-0065-0000007f" relid="0x0" role="Member">
-              <name>key</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{ec72bb7a-e715-4ccd-a5e5-52582cdd4beb}" id="id-0067-0000010a" kind="Member" referred="id-0065-0000007f" relid="0x0" role="Member">
-              <name>participant_key</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{6402f6f6-6348-4450-b54f-0c546cfa5b8f}" id="id-0067-0000010b" kind="Member" referred="id-0065-00000124" relid="0x0" role="Member">
-              <name>durability</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,460</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{309c21a6-5f73-40e0-a332-97718d42617f}" id="id-0067-0000010c" kind="Member" referred="id-0065-00000127" relid="0x0" role="Member">
-              <name>deadline</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,560</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{1647c2c4-22bb-42a7-bec7-d3e24031bc32}" id="id-0067-0000010d" kind="Member" referred="id-0065-00000128" relid="0x0" role="Member">
-              <name>latency_budget</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,660</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{99ec8a4b-f7f8-460e-b8e0-9a5708343f4e}" id="id-0067-0000010e" kind="Member" referred="id-0065-0000012d" relid="0x0" role="Member">
-              <name>liveliness</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,760</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{49bad0fb-0561-4ce2-9689-8ecfdcc4866f}" id="id-0067-0000010f" kind="Member" referred="id-0065-00000131" relid="0x0" role="Member">
-              <name>reliability</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,860</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{1cc8aa76-8048-4119-97f8-b591845ad95a}" id="id-0067-00000110" kind="Member" referred="id-0065-0000012a" relid="0x0" role="Member">
-              <name>ownership</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,960</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{8d2c75aa-031c-4a8e-8bc9-5771fa5198ee}" id="id-0067-00000111" kind="Member" referred="id-0065-00000133" relid="0x0" role="Member">
-              <name>destination_order</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1060</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{7ae8363a-13a0-4c1e-be9a-3e5923dbe1c3}" id="id-0067-00000112" kind="Member" referred="id-0065-0000011e" relid="0x0" role="Member">
-              <name>user_data</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{268b0ea6-c4c9-439f-bc05-663169532974}" id="id-0067-00000113" kind="Member" referred="id-0065-0000012e" relid="0x0" role="Member">
-              <name>time_based_filter</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{29d7e235-fe4b-40ce-8377-d2dc327847be}" id="id-0067-00000114" kind="Member" referred="id-0065-00000126" relid="0x0" role="Member">
-              <name>presentation</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1360</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{812b0b1d-cf37-4f78-80fb-1a5082067c90}" id="id-0067-00000115" kind="Member" referred="id-0065-0000012f" relid="0x0" role="Member">
-              <name>partition</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1460</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{f5d49385-2094-4b5f-b689-6f486d9434f5}" id="id-0067-00000116" kind="Member" referred="id-0065-0000011f" relid="0x0" role="Member">
-              <name>topic_data</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1560</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{3a2f2a70-a965-4044-8ac7-4198d7b7b45e}" id="id-0067-00000117" kind="Member" referred="id-0065-00000120" relid="0x0" role="Member">
-              <name>group_data</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1660</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{62f7f8e6-0422-4dc9-a981-62585849a9c3}" id="id-0067-0000031f" kind="Member" referred="id-0066-00000033" relid="0x0" role="Member">
-              <name>topic_name</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{9342c04a-4f17-4418-a928-08406abad35a}" id="id-0067-00000320" kind="Member" referred="id-0066-00000033" relid="0x0" role="Member">
-              <name>type_name</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,360</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <model childrelidcntr="0x28" guid="{adbad2ab-fe31-4027-b268-34d81e9b40bb}" id="id-0065-00000146" kind="Object" relid="0x51" role="Object">
-            <name>DomainParticipant</name>
-            <attribute kind="InterfaceSemantics">
-              <value>local</value>
-            </attribute>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrefixTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <model childrelidcntr="0x1" guid="{c8fde55c-1bc5-43ee-a1ad-d0128c992d70}" id="id-0065-00000147" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-              <name>create_publisher</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{3a6369f1-9ffa-42af-abf1-17d0cecb3264}" id="id-0067-00000118" kind="ReturnType" referred="id-0065-000000e0" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{4f7cb5a1-4b55-4990-8cb7-30805bdcbaf8}" id="id-0067-00000119" kind="InParameter" referred="id-0065-0000013f" relid="0x0" role="InParameter">
-                <name>qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{87e3fc46-8293-489c-afac-d5b63f899fe4}" id="id-0067-0000011a" kind="InParameter" referred="id-0065-000000fc" relid="0x0" role="InParameter">
-                <name>a_listener</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>260,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{27367b8e-01b0-46a8-9601-bd17713a19e1}" id="id-0067-00000321" kind="InParameter" referred="id-0067-000001f2" relid="0x0" role="InParameter">
-                <name>mask</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>360,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{97adace4-5ab0-4f2c-be4a-54f3e413816d}" id="id-0065-00000148" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-              <name>create_publisher_with_profile</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{fa3c8080-819f-40b6-a9b9-07982de8837a}" id="id-0067-0000011b" kind="ReturnType" referred="id-0065-000000e0" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{d2b69164-88fd-487f-bbf6-801ace2a21cb}" id="id-0067-0000011c" kind="InParameter" referred="id-0065-000000fc" relid="0x0" role="InParameter">
-                <name>a_listener</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>360,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{a84cdc29-91b8-4e23-925d-31eee31bd934}" id="id-0067-00000322" kind="InParameter" referred="id-0066-00000033" relid="0x0" role="InParameter">
-                <name>library_name</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{afdac122-bee2-484c-9a50-099abadbbbfa}" id="id-0067-00000323" kind="InParameter" referred="id-0066-00000033" relid="0x0" role="InParameter">
-                <name>profile_name</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>260,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{534a2637-1b2a-42ec-ba93-ef97cddaee5f}" id="id-0067-00000324" kind="InParameter" referred="id-0067-000001f2" relid="0x0" role="InParameter">
-                <name>mask</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>460,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{514c959c-2e91-47d1-93aa-727d7655aea5}" id="id-0065-00000149" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-              <name>delete_publisher</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{1dbd09f1-2033-4370-b145-384ed4240df7}" id="id-0067-0000011d" kind="InParameter" referred="id-0065-000000e0" relid="0x0" role="InParameter">
-                <name>p</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{28a89f80-e0be-4ff1-bb5b-6bb6f42fd1b3}" id="id-0067-00000325" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{92f68ffe-d20d-4e41-b4f3-fa409878e14a}" id="id-0065-0000014a" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-              <name>create_subscriber</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,360</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{c3f95a33-4686-4aef-8310-034e358030ca}" id="id-0067-0000011e" kind="ReturnType" referred="id-0065-000000ce" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{6f2085f7-30ab-48ef-be30-25d267d1486c}" id="id-0067-0000011f" kind="InParameter" referred="id-0065-00000141" relid="0x0" role="InParameter">
-                <name>qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{f34ba127-eb23-4977-9469-007cc1d5d551}" id="id-0067-00000120" kind="InParameter" referred="id-0065-00000105" relid="0x0" role="InParameter">
-                <name>a_listener</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>260,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{92ada6e9-5fda-40d4-b92d-af48cd36dc53}" id="id-0067-00000326" kind="InParameter" referred="id-0067-000001f2" relid="0x0" role="InParameter">
-                <name>mask</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>360,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{4a0f5f77-add2-4a39-b8f2-5914531b73a8}" id="id-0065-0000014b" kind="TwowayOperation" relid="0x4" role="TwowayOperation">
-              <name>create_subscriber_with_profile</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,460</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{9f1b2807-bc7b-42ea-8fcc-c6f8d54c496e}" id="id-0067-00000121" kind="ReturnType" referred="id-0065-000000ce" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{ff25f43b-1477-40b9-819b-3601b505e3a8}" id="id-0067-00000122" kind="InParameter" referred="id-0065-00000105" relid="0x0" role="InParameter">
-                <name>a_listener</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>360,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{f6e61b84-c21d-4753-a82d-62a5c43c832a}" id="id-0067-00000327" kind="InParameter" referred="id-0066-00000033" relid="0x0" role="InParameter">
-                <name>library_name</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{c902f4b3-5c28-496c-8445-ee3c8dd28a2d}" id="id-0067-00000328" kind="InParameter" referred="id-0066-00000033" relid="0x0" role="InParameter">
-                <name>profile_name</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>260,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{4b5e21cb-a0a4-4d52-b411-9178b9559637}" id="id-0067-00000329" kind="InParameter" referred="id-0067-000001f2" relid="0x0" role="InParameter">
-                <name>mask</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>460,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{b3f885a3-5f06-4f80-ac51-76e2354a5f71}" id="id-0065-0000014c" kind="TwowayOperation" relid="0x5" role="TwowayOperation">
-              <name>delete_subscriber</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,560</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{ffed51e2-201b-4634-b99a-274d9fafe3b8}" id="id-0067-00000123" kind="InParameter" referred="id-0065-000000ce" relid="0x0" role="InParameter">
-                <name>s</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{491fe4b7-1197-4b25-aa39-d73d9289d017}" id="id-0067-0000032a" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{088936e8-802f-48cc-8fb8-704514d1ff74}" id="id-0065-0000014d" kind="TwowayOperation" relid="0x6" role="TwowayOperation">
-              <name>get_builtin_subscriber</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,660</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{20169755-3c31-4477-967c-e0b7ad76a87e}" id="id-0067-00000124" kind="ReturnType" referred="id-0065-000000ce" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{5af04129-2734-46d2-babf-d6a6b4316fad}" id="id-0065-0000014e" kind="TwowayOperation" relid="0x7" role="TwowayOperation">
-              <name>create_topic</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,760</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{6cd0a48f-b5af-4db6-9c63-a79ba779a488}" id="id-0067-00000125" kind="ReturnType" referred="id-0065-0000009c" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{907b5437-39ce-4fc4-974d-41e00266b640}" id="id-0067-00000126" kind="InParameter" referred="id-0065-0000013d" relid="0x0" role="InParameter">
-                <name>qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>360,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{0ab3874c-d2bf-4462-8000-ab8b4f3b02ce}" id="id-0067-00000127" kind="InParameter" referred="id-0065-000000f3" relid="0x0" role="InParameter">
-                <name>a_listener</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>460,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{c62c0c58-6204-473b-b78f-5719d007aa4e}" id="id-0067-0000032b" kind="InParameter" referred="id-0066-00000033" relid="0x0" role="InParameter">
-                <name>topic_name</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{56602453-5cac-4a29-bf15-7361b730be6d}" id="id-0067-0000032c" kind="InParameter" referred="id-0066-00000033" relid="0x0" role="InParameter">
-                <name>type_name</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>260,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{e74035a6-c8c4-405a-8051-8c4d11735cc8}" id="id-0067-0000032d" kind="InParameter" referred="id-0067-000001f2" relid="0x0" role="InParameter">
-                <name>mask</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>560,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{0f940ffb-b482-4581-baed-cc7a1b0bf9a1}" id="id-0065-0000014f" kind="TwowayOperation" relid="0x8" role="TwowayOperation">
-              <name>create_topic_with_profile</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,860</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{83c05f2e-78aa-4e93-8e62-64fb7b698c7b}" id="id-0067-00000128" kind="ReturnType" referred="id-0065-0000009c" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{73475718-4991-4669-a54e-5205f10de2c6}" id="id-0067-00000129" kind="InParameter" referred="id-0065-000000f3" relid="0x0" role="InParameter">
-                <name>a_listener</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>560,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{029f4052-ee01-4d95-9ad2-444fc1d30603}" id="id-0067-0000032e" kind="InParameter" referred="id-0066-00000033" relid="0x0" role="InParameter">
-                <name>topic_name</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{da0571fb-0964-48ec-b26e-5dcd45a14581}" id="id-0067-0000032f" kind="InParameter" referred="id-0066-00000033" relid="0x0" role="InParameter">
-                <name>type_name</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>260,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{ad625c85-07d5-4bdf-8943-3efec1ca7b49}" id="id-0067-00000330" kind="InParameter" referred="id-0066-00000033" relid="0x0" role="InParameter">
-                <name>library_name</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>360,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{28c9cfdd-3e8a-4a1a-b74a-1e31de095c8e}" id="id-0067-00000331" kind="InParameter" referred="id-0066-00000033" relid="0x0" role="InParameter">
-                <name>profile_name</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>460,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{a6419720-dba3-428b-9dbb-120f57066c87}" id="id-0067-00000332" kind="InParameter" referred="id-0067-000001f2" relid="0x0" role="InParameter">
-                <name>mask</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>660,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{e640ed42-df31-4f81-93d6-aaee63fdceb4}" id="id-0065-00000150" kind="TwowayOperation" relid="0x9" role="TwowayOperation">
-              <name>delete_topic</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,960</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{905ab556-9e6b-4425-b83c-bc83aff9a7d1}" id="id-0067-0000012a" kind="InParameter" referred="id-0065-0000009c" relid="0x0" role="InParameter">
-                <name>a_topic</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{38dff28f-ed5a-45d8-89cc-edfc6581f0dd}" id="id-0067-00000333" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{58160d02-77ed-4143-a960-ecce9f570018}" id="id-0065-00000151" kind="TwowayOperation" relid="0xa" role="TwowayOperation">
-              <name>find_topic</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1060</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{884e3058-2897-4e00-8a29-01ef193d4e08}" id="id-0067-0000012b" kind="ReturnType" referred="id-0065-0000009c" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{f3c31cc8-7f69-4310-9c3d-ee0aafb573f5}" id="id-0067-0000012c" kind="InParameter" referred="id-0065-00000080" relid="0x0" role="InParameter">
-                <name>timeout</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>260,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{d859af0b-492b-4ced-bfab-cd360c038fe2}" id="id-0067-00000334" kind="InParameter" referred="id-0066-00000033" relid="0x0" role="InParameter">
-                <name>topic_name</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{91c52ba0-87a4-44bd-983e-8bb82915a40d}" id="id-0065-00000152" kind="TwowayOperation" relid="0xb" role="TwowayOperation">
-              <name>lookup_topicdescription</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{a99b4bd1-fed9-4b6f-b30a-1a6873368964}" id="id-0067-0000012d" kind="ReturnType" referred="id-0065-00000098" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{16006c5d-9f58-4ae2-8ed0-2a29932677f9}" id="id-0067-00000335" kind="InParameter" referred="id-0066-00000033" relid="0x0" role="InParameter">
-                <name>name</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{12d37d0c-69c4-4aa0-9213-7af9034e957d}" id="id-0065-00000153" kind="TwowayOperation" relid="0xc" role="TwowayOperation">
-              <name>create_contentfilteredtopic</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{21a67334-ad16-4f72-b547-cccc13ab10fa}" id="id-0067-0000012e" kind="ReturnType" referred="id-0065-000000a2" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{24750656-187f-4b50-8341-8d821758acdf}" id="id-0067-0000012f" kind="InParameter" referred="id-0065-0000009c" relid="0x0" role="InParameter">
-                <name>related_topic</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>260,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{17b7cf4a-2a8e-413b-915c-57a94636138d}" id="id-0067-00000336" kind="InParameter" referred="id-0066-00000033" relid="0x0" role="InParameter">
-                <name>name</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{d9ad90ee-d6b8-403d-bbc4-5455880a6be6}" id="id-0067-00000337" kind="InParameter" referred="id-0066-00000033" relid="0x0" role="InParameter">
-                <name>filter_expression</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>360,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{1a23c6bb-ab8d-4230-91ba-4e9690a3e514}" id="id-0067-00000338" kind="InParameter" referred="id-0067-000001d8" relid="0x0" role="InParameter">
-                <name>expression_parameters</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>460,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{1338efef-c90f-45bf-a65b-b25776d9bd99}" id="id-0065-00000154" kind="TwowayOperation" relid="0xd" role="TwowayOperation">
-              <name>delete_contentfilteredtopic</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1360</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{31fae1fa-5c38-4f82-9ac7-c798999fa6fa}" id="id-0067-00000130" kind="InParameter" referred="id-0065-000000a2" relid="0x0" role="InParameter">
-                <name>a_contentfilteredtopic</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{3674aaaa-5fd1-4c05-98c4-c99689e3e1df}" id="id-0067-00000339" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{2dc11291-40d1-4b2c-ae97-2594c9096575}" id="id-0065-00000155" kind="TwowayOperation" relid="0xe" role="TwowayOperation">
-              <name>create_multitopic</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1460</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{3d5b5a6b-2c10-40ec-a45d-e4f97399ff98}" id="id-0067-00000131" kind="ReturnType" referred="id-0065-000000a7" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{f700a488-b10c-4821-8977-3c0ecd98c844}" id="id-0067-0000033a" kind="InParameter" referred="id-0066-00000033" relid="0x0" role="InParameter">
-                <name>name</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{ca454e0f-bcbc-4862-9c41-0bdf6e7a3ed2}" id="id-0067-0000033b" kind="InParameter" referred="id-0066-00000033" relid="0x0" role="InParameter">
-                <name>type_name</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>260,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{b553f4ca-68fe-42ea-9f52-dad935a546f5}" id="id-0067-0000033c" kind="InParameter" referred="id-0066-00000033" relid="0x0" role="InParameter">
-                <name>subscription_expression</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>360,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{89695eec-c9da-4338-8666-7bee3106ff37}" id="id-0067-0000033d" kind="InParameter" referred="id-0067-000001d8" relid="0x0" role="InParameter">
-                <name>expression_parameters</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>460,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{db0538ac-f8b4-44e9-baa3-6e574059167b}" id="id-0065-00000156" kind="TwowayOperation" relid="0xf" role="TwowayOperation">
-              <name>delete_multitopic</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1560</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{7d35df1b-d557-41f3-ba90-0248bff6defe}" id="id-0067-00000132" kind="InParameter" referred="id-0065-000000a7" relid="0x0" role="InParameter">
-                <name>a_multitopic</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{a8516b15-6769-456d-ae17-2c5ee99c8871}" id="id-0067-0000033e" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{c2f044a0-dc38-42fd-9a91-55ebf9acccde}" id="id-0065-00000157" kind="TwowayOperation" relid="0x10" role="TwowayOperation">
-              <name>delete_contained_entities</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1660</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{e40a1f57-fd01-420a-b3fd-305b4ad47113}" id="id-0067-0000033f" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{086f4f5f-e13c-4513-9f2d-7de2e3d30ec5}" id="id-0065-00000158" kind="TwowayOperation" relid="0x11" role="TwowayOperation">
-              <name>set_qos</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1760</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{13199f31-14a6-49b0-86c9-486ef7c4b832}" id="id-0067-00000133" kind="InParameter" referred="id-0065-0000013c" relid="0x0" role="InParameter">
-                <name>qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{1fa31447-a789-41ce-a73e-fb616592267f}" id="id-0067-00000340" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{543868eb-2b6e-496c-b4c2-176c5c7970a3}" id="id-0065-00000159" kind="TwowayOperation" relid="0x12" role="TwowayOperation">
-              <name>get_qos</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1860</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{9b1a4dab-78a5-4685-9cbc-c0c42e948804}" id="id-0067-00000134" kind="InoutParameter" referred="id-0065-0000013c" relid="0x0" role="InoutParameter">
-                <name>qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{45196a75-f961-415c-a9a7-b08bd15bbe5c}" id="id-0067-00000341" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{12fc8be7-116f-46ec-b564-9d18d897a11a}" id="id-0065-0000015a" kind="TwowayOperation" relid="0x13" role="TwowayOperation">
-              <name>set_listener</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1960</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{251691d4-8b12-4fa6-b684-d8cfdbb80282}" id="id-0067-00000135" kind="InParameter" referred="id-0065-00000107" relid="0x0" role="InParameter">
-                <name>a_listener</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{938c4114-7ac8-4790-b4a6-8e7c5b2ebe7e}" id="id-0067-00000342" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{e54d1be9-7537-4c5c-b740-9b889e9a7e76}" id="id-0067-00000343" kind="InParameter" referred="id-0067-000001f2" relid="0x0" role="InParameter">
-                <name>mask</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>260,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{dc55a1b3-396d-4ac4-9847-90bfd30093d2}" id="id-0065-0000015b" kind="TwowayOperation" relid="0x14" role="TwowayOperation">
-              <name>get_listener</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,2060</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{d15e7d8d-9d46-4ae1-9ac2-2e8c499e1ee2}" id="id-0067-00000136" kind="ReturnType" referred="id-0065-00000107" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{4d4b8f5f-cf81-449b-b2f6-872bd32bd5db}" id="id-0065-0000015c" kind="TwowayOperation" relid="0x15" role="TwowayOperation">
-              <name>ignore_participant</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,2160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{59b7b008-db35-42c3-b56f-d8d68dfcbdef}" id="id-0067-00000344" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{01539cc7-a2c2-42bb-92a6-3fd2203d0e41}" id="id-0067-00000345" kind="InParameter" referred="id-0067-00000167" relid="0x0" role="InParameter">
-                <name>handle</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{d5bb24d4-d4e4-4876-b5f6-7508240446d9}" id="id-0065-0000015d" kind="TwowayOperation" relid="0x16" role="TwowayOperation">
-              <name>ignore_topic</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,2260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{0b124489-8800-48fd-b332-de8667926465}" id="id-0067-00000346" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{394d409f-bdc7-4f59-9831-6617430cb682}" id="id-0067-00000347" kind="InParameter" referred="id-0067-00000167" relid="0x0" role="InParameter">
-                <name>handle</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{7d2a36ce-29c2-430a-ac9c-7cdd65155b21}" id="id-0065-0000015e" kind="TwowayOperation" relid="0x17" role="TwowayOperation">
-              <name>ignore_publication</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,2360</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{14a39626-16e8-42c2-bd35-5337c6d0fbb8}" id="id-0067-00000348" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{f479077b-2018-4917-945a-5ef5303baa57}" id="id-0067-00000349" kind="InParameter" referred="id-0067-00000167" relid="0x0" role="InParameter">
-                <name>handle</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{6337f55e-fc7f-4e61-8caa-5ee7ab8d7ba9}" id="id-0065-0000015f" kind="TwowayOperation" relid="0x18" role="TwowayOperation">
-              <name>ignore_subscription</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,2460</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{7912ab17-7fb8-47ae-a2ea-d2dbc93e3887}" id="id-0067-0000034a" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{4c616eea-1ab0-409e-b8eb-fe8697cef426}" id="id-0067-0000034b" kind="InParameter" referred="id-0067-00000167" relid="0x0" role="InParameter">
-                <name>handle</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{6c8fdbcd-9398-4275-b9bc-6f0fc879c3ea}" id="id-0065-00000160" kind="TwowayOperation" relid="0x19" role="TwowayOperation">
-              <name>get_domain_id</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,2560</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{9049c76f-05d4-4c5a-a9fd-8be554036db4}" id="id-0067-0000034c" kind="ReturnType" referred="id-0067-000001d4" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{89d187b7-6e2d-4021-bf50-9299fc2fa4d3}" id="id-0065-00000161" kind="TwowayOperation" relid="0x1a" role="TwowayOperation">
-              <name>assert_liveliness</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,2660</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{5fc1cbc0-8c47-42fc-a970-4e162834344c}" id="id-0067-0000034d" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{c329253d-b985-4bd5-b4ea-17bf5724fe00}" id="id-0065-00000162" kind="TwowayOperation" relid="0x1b" role="TwowayOperation">
-              <name>set_default_publisher_qos</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,2760</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{ff28657c-0e9b-4625-bf2f-d347fd2f7015}" id="id-0067-00000137" kind="InParameter" referred="id-0065-0000013f" relid="0x0" role="InParameter">
-                <name>qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{09d296d1-2f3c-4d49-9ab6-8e28716c9890}" id="id-0067-0000034e" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{c3bf1dff-8bb1-410a-8306-cd80c6fca52d}" id="id-0065-00000163" kind="TwowayOperation" relid="0x1c" role="TwowayOperation">
-              <name>get_default_publisher_qos</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,2860</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{0cfd0280-a5c3-4552-9cc2-7058cde5fdbf}" id="id-0067-00000138" kind="InoutParameter" referred="id-0065-0000013f" relid="0x0" role="InoutParameter">
-                <name>qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{32c5dd66-4144-4216-bd29-21c675888334}" id="id-0067-0000034f" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{128b56ba-1d89-4305-88b1-a64ecb787178}" id="id-0065-00000164" kind="TwowayOperation" relid="0x1d" role="TwowayOperation">
-              <name>set_default_subscriber_qos</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,2960</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{115f6d99-04e5-48cd-95a3-32dcf2e70109}" id="id-0067-00000139" kind="InParameter" referred="id-0065-00000141" relid="0x0" role="InParameter">
-                <name>qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{490eed98-b30a-4ac1-8e9e-07533ab9f1d8}" id="id-0067-00000350" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{0cd5146d-a815-490c-b917-ddc9de5432aa}" id="id-0065-00000165" kind="TwowayOperation" relid="0x1e" role="TwowayOperation">
-              <name>get_default_subscriber_qos</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,3060</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{41a3db01-6842-49e4-8ec4-d6842b2013ff}" id="id-0067-0000013a" kind="InoutParameter" referred="id-0065-00000141" relid="0x0" role="InoutParameter">
-                <name>qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{7a3120e1-df05-4389-a7cf-71c6d6e8ccb3}" id="id-0067-00000351" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{b416ad7f-4714-4a7d-a7c7-4ce5dfc70110}" id="id-0065-00000166" kind="TwowayOperation" relid="0x1f" role="TwowayOperation">
-              <name>set_default_topic_qos</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,3160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{fa1b9032-40e6-4b97-9732-924fd0d42d07}" id="id-0067-0000013b" kind="InParameter" referred="id-0065-0000013d" relid="0x0" role="InParameter">
-                <name>qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{edbb3b4c-ad4b-40f6-b3f8-67d78a69610c}" id="id-0067-00000352" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{758fb5e5-b06c-4329-a90f-18960491b1b7}" id="id-0065-00000167" kind="TwowayOperation" relid="0x20" role="TwowayOperation">
-              <name>get_default_topic_qos</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,3260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{8837687d-ef75-465d-8257-b78fbab6bf91}" id="id-0067-0000013c" kind="InoutParameter" referred="id-0065-0000013d" relid="0x0" role="InoutParameter">
-                <name>qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{fd2d8d09-c6b8-49c9-a0f8-cc292b81ce21}" id="id-0067-00000353" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{4e754f33-3463-4d8b-962a-a18fae66410d}" id="id-0065-00000168" kind="TwowayOperation" relid="0x21" role="TwowayOperation">
-              <name>get_discovered_participants</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,3360</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{a419422a-9344-4313-a4c4-14d24caab8ec}" id="id-0067-00000354" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{4b89bc26-a2b4-4934-a1dd-e1981eb2b099}" id="id-0067-00000355" kind="InoutParameter" referred="id-0067-00000168" relid="0x0" role="InoutParameter">
-                <name>participant_handles</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{e0495d7e-8cd3-48d5-819c-a59fe3c40c04}" id="id-0065-00000169" kind="TwowayOperation" relid="0x22" role="TwowayOperation">
-              <name>get_discovered_participant_data</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,3460</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{6b74548a-e564-43dc-9444-efd3bd2d7969}" id="id-0067-0000013d" kind="InoutParameter" referred="id-0065-00000142" relid="0x0" role="InoutParameter">
-                <name>participant_data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{de9dfffb-6b06-4193-8ee1-f5fd9feb18ba}" id="id-0067-00000356" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{4e2a47e0-e14e-44c2-a00d-63ff9a58ac0f}" id="id-0067-00000357" kind="InParameter" referred="id-0067-00000167" relid="0x0" role="InParameter">
-                <name>participant_handle</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>260,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{3dc43948-20e5-4a27-a2fb-6b4bbdf3cfa6}" id="id-0065-0000016a" kind="TwowayOperation" relid="0x23" role="TwowayOperation">
-              <name>get_discovered_topics</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,3560</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{84876e6a-42a0-4d03-94aa-b308db0742b9}" id="id-0067-00000358" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{c1f37e6b-4fa9-4f5a-afa7-2345eb1b60ae}" id="id-0067-00000359" kind="InoutParameter" referred="id-0067-00000168" relid="0x0" role="InoutParameter">
-                <name>topic_handles</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{c27b14e7-4a67-4be7-a03c-66666c054971}" id="id-0065-0000016b" kind="TwowayOperation" relid="0x24" role="TwowayOperation">
-              <name>get_discovered_topic_data</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,3660</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{f34c8437-0275-4ecc-92f6-5a0584fe5598}" id="id-0067-0000013e" kind="InoutParameter" referred="id-0065-00000143" relid="0x0" role="InoutParameter">
-                <name>topic_data</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{a97f7013-a8dd-4c41-8f26-1926fdebe300}" id="id-0067-0000035a" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{49bfc992-f5df-4d43-b303-99633d71ed51}" id="id-0067-0000035b" kind="InParameter" referred="id-0067-00000167" relid="0x0" role="InParameter">
-                <name>topic_handle</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>260,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{4dd82f0f-51b8-4b5a-a8dd-e48f8597365e}" id="id-0065-0000016c" kind="TwowayOperation" relid="0x25" role="TwowayOperation">
-              <name>contains_entity</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,3760</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{8ac61c0e-6fc7-4c14-9f8c-00fd2e7d6148}" id="id-0067-0000035c" kind="ReturnType" referred="id-0066-00000023" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{ba1641bc-ee64-4012-b384-24463440f654}" id="id-0067-0000035d" kind="InParameter" referred="id-0067-00000167" relid="0x0" role="InParameter">
-                <name>a_handle</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{6fce6d4c-c837-4b60-b354-26410f70df8a}" id="id-0065-0000016d" kind="TwowayOperation" relid="0x26" role="TwowayOperation">
-              <name>get_current_time</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,3860</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{bddfcd19-94cf-4091-aea2-f7cd16871403}" id="id-0067-0000013f" kind="InoutParameter" referred="id-0065-00000081" relid="0x0" role="InoutParameter">
-                <name>current_time</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{05b63672-5cab-439b-9400-582bff97a774}" id="id-0067-0000035e" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <reference guid="{5863ff9d-d433-44ba-a111-feabffd00e26}" id="id-0067-00000140" kind="Inherits" referred="id-0065-00000093" relid="0x27" role="Inherits">
-              <name>Inherits</name>
-            </reference>
-          </model>
-          <model childrelidcntr="0x9" guid="{8618bd5c-69d6-4ba3-9b56-ad662f7efe94}" id="id-0065-0000016e" kind="Object" relid="0x52" role="Object">
-            <name>DomainParticipantFactory</name>
-            <attribute kind="InterfaceSemantics">
-              <value>local</value>
-            </attribute>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrefixTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <model childrelidcntr="0x1" guid="{3ce1c5ab-14fe-4956-91a4-d6c6abea5d8b}" id="id-0065-0000016f" kind="TwowayOperation" relid="0x0" role="TwowayOperation">
-              <name>create_participant</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{a12326d2-f203-471b-92a1-11b422f87581}" id="id-0067-00000141" kind="ReturnType" referred="id-0065-00000146" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{b05cc2ff-337c-498f-8f1b-05cf478b5396}" id="id-0067-00000142" kind="InParameter" referred="id-0065-0000013c" relid="0x0" role="InParameter">
-                <name>qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>260,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{c5c06cfb-1ba1-4cf7-b3a1-2e6b2da7421d}" id="id-0067-00000143" kind="InParameter" referred="id-0065-00000107" relid="0x0" role="InParameter">
-                <name>a_listener</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>360,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{3f515376-3a1e-4294-ba80-168a2da40038}" id="id-0067-0000035f" kind="InParameter" referred="id-0067-000001d4" relid="0x0" role="InParameter">
-                <name>domain_id</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{2149a187-35d4-4345-84a1-1fe0acc7a272}" id="id-0067-00000360" kind="InParameter" referred="id-0067-000001f2" relid="0x0" role="InParameter">
-                <name>mask</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>460,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{0472a690-d2e1-4737-856e-3f411a1d5ea3}" id="id-0065-00000170" kind="TwowayOperation" relid="0x1" role="TwowayOperation">
-              <name>create_participant_with_profile</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{4082c988-87e8-4fa0-97b6-60d63ee3b35f}" id="id-0067-00000144" kind="ReturnType" referred="id-0065-00000146" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{467268db-03b5-4e0c-985f-8594f6f662b7}" id="id-0067-00000145" kind="InParameter" referred="id-0065-00000107" relid="0x0" role="InParameter">
-                <name>a_listener</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>460,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{675917ad-7652-4f74-bad1-e2090aea6706}" id="id-0067-00000361" kind="InParameter" referred="id-0067-000001d4" relid="0x0" role="InParameter">
-                <name>domain_id</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{d32f5a3a-5ae8-481f-8585-f526ad1440d0}" id="id-0067-00000362" kind="InParameter" referred="id-0066-00000033" relid="0x0" role="InParameter">
-                <name>library_name</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>260,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{f8d0ed9a-fecd-4389-9300-6d95c6b41898}" id="id-0067-00000363" kind="InParameter" referred="id-0066-00000033" relid="0x0" role="InParameter">
-                <name>profile_name</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>360,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{65e6a89e-3878-4fbe-8c1a-c3ff03037e12}" id="id-0067-00000364" kind="InParameter" referred="id-0067-000001f2" relid="0x0" role="InParameter">
-                <name>mask</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>560,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{5e9db718-7dd8-4b78-8f29-7afce0c9ec81}" id="id-0065-00000171" kind="TwowayOperation" relid="0x2" role="TwowayOperation">
-              <name>delete_participant</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{763b8624-0475-4e4e-98f5-b6c3211e6928}" id="id-0067-00000146" kind="InParameter" referred="id-0065-00000146" relid="0x0" role="InParameter">
-                <name>a_participant</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{e390220e-a3ec-402e-b292-84a90c4589b7}" id="id-0067-00000365" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{4130315a-e18a-4551-b141-8cb58641b1c6}" id="id-0065-00000172" kind="TwowayOperation" relid="0x3" role="TwowayOperation">
-              <name>lookup_participant</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,360</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{4bfd6543-86f1-400b-aab8-40cb3faffc6a}" id="id-0067-00000147" kind="ReturnType" referred="id-0065-00000146" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{776b9098-3954-4614-8e54-c79f85797d68}" id="id-0067-00000366" kind="InParameter" referred="id-0067-000001d4" relid="0x0" role="InParameter">
-                <name>domain_id</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{f54757de-ad62-481e-9a37-ab5a8dcdef9f}" id="id-0065-00000173" kind="TwowayOperation" relid="0x4" role="TwowayOperation">
-              <name>set_default_participant_qos</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,460</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{173433a3-cb80-465d-9960-3fd457352d60}" id="id-0067-00000148" kind="InParameter" referred="id-0065-0000013c" relid="0x0" role="InParameter">
-                <name>qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{8635d377-08f8-4219-86fb-c93d98d8e7f4}" id="id-0067-00000367" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{411a66ab-799d-4a25-8996-fc2bda71ebf7}" id="id-0065-00000174" kind="TwowayOperation" relid="0x5" role="TwowayOperation">
-              <name>set_default_participant_qos_with_profile</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,560</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{6bbf23f6-fa96-4c5e-a493-fe60cb292c6f}" id="id-0067-00000368" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{b9e19955-7e65-4d6f-a400-f031912cc998}" id="id-0067-00000369" kind="InParameter" referred="id-0066-00000033" relid="0x0" role="InParameter">
-                <name>library_name</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{ead2634b-0cd4-4dfb-abb4-4d369c8a7c6e}" id="id-0067-0000036a" kind="InParameter" referred="id-0066-00000033" relid="0x0" role="InParameter">
-                <name>profile_name</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>260,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{0ca98cb8-df82-4713-8767-0bb3a70335e7}" id="id-0065-00000175" kind="TwowayOperation" relid="0x6" role="TwowayOperation">
-              <name>get_default_participant_qos</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,660</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{125224c3-3b1a-46b1-80ee-ca9d65cc2425}" id="id-0067-00000149" kind="InoutParameter" referred="id-0065-0000013c" relid="0x0" role="InoutParameter">
-                <name>qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{12cb18d4-431c-4808-8689-361558ef34d1}" id="id-0067-0000036b" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{f5e360dc-04db-4a5d-8763-82164e537ef1}" id="id-0065-00000176" kind="TwowayOperation" relid="0x7" role="TwowayOperation">
-              <name>set_qos</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,760</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{daa9299a-6902-49b4-9244-ee9be3197668}" id="id-0067-0000014a" kind="InParameter" referred="id-0065-0000013b" relid="0x0" role="InParameter">
-                <name>qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{36031c37-c807-4caf-9b94-69ed4cc7b275}" id="id-0067-0000036c" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-            <model childrelidcntr="0x1" guid="{674d12cb-927b-4e2e-9770-92d5788c2abc}" id="id-0065-00000177" kind="TwowayOperation" relid="0x8" role="TwowayOperation">
-              <name>get_qos</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,860</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="SpecifyIdTag" status="meta">
-                <value/>
-              </attribute>
-              <attribute kind="VersionTag" status="meta">
-                <value/>
-              </attribute>
-              <reference guid="{8afd2ce7-31f6-4acf-86be-8847b772f8b8}" id="id-0067-0000014b" kind="InoutParameter" referred="id-0065-0000013b" relid="0x0" role="InoutParameter">
-                <name>qos</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>160,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-              <reference guid="{57addb8d-c750-4a11-9680-b0db3239335d}" id="id-0067-0000036d" kind="ReturnType" referred="id-0067-000001d6" relid="0x0" role="ReturnType">
-                <name>ReturnType</name>
-                <regnode isopaque="yes" name="PartRegs">
-                  <value/>
-                  <regnode isopaque="yes" name="InterfaceDefinition">
-                    <value/>
-                    <regnode isopaque="yes" name="Position">
-                      <value>60,60</value>
-                    </regnode>
-                  </regnode>
-                </regnode>
-              </reference>
-            </model>
-          </model>
-          <model childrelidcntr="0x0" guid="{14b976f7-962c-418e-b344-dd2ff78462cd}" id="id-0065-00000178" kind="Object" relid="0x53" role="Object">
-            <name>TypeSupport</name>
-            <attribute kind="InterfaceSemantics">
-              <value>local</value>
-            </attribute>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrefixTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-          </model>
-          <model childrelidcntr="0x1" guid="{2c714200-d641-462c-bf26-2293aad854a7}" id="id-0065-00000179" kind="Aggregate" relid="0x54" role="Aggregate">
-            <name>SampleInfo</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{ee88b06b-cd8b-4a5a-9b8a-0d8af3e25b6a}" id="id-0067-0000014c" kind="Member" referred="id-0065-00000081" relid="0x0" role="Member">
-              <name>source_timestamp</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,360</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{16ccd183-b53b-4bd7-bc3c-490516d85f39}" id="id-0067-0000036e" kind="Member" referred="id-0067-000002c3" relid="0x0" role="Member">
-              <name>sample_state</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{614b0fc2-c0a3-46e2-8b48-d11929ebc612}" id="id-0067-0000036f" kind="Member" referred="id-0067-000002c8" relid="0x0" role="Member">
-              <name>view_state</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{a8c50a2d-d410-473c-8c24-e229b970d707}" id="id-0067-00000370" kind="Member" referred="id-0067-000002cd" relid="0x0" role="Member">
-              <name>instance_state</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{4c8d1441-a5a8-424f-baf6-707dbd0a9d24}" id="id-0067-00000371" kind="Member" referred="id-0067-00000167" relid="0x0" role="Member">
-              <name>instance_handle</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,460</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{4fa5bb5e-3329-4877-848d-a26582bf4d50}" id="id-0067-00000372" kind="Member" referred="id-0067-00000167" relid="0x0" role="Member">
-              <name>publication_handle</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,560</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{e74fea75-90c0-448f-9b58-9b3e905bbb87}" id="id-0067-00000373" kind="Member" referred="id-0066-00000028" relid="0x0" role="Member">
-              <name>disposed_generation_count</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,660</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{3b58615b-6cc1-463d-972c-98a94d2e01c3}" id="id-0067-00000374" kind="Member" referred="id-0066-00000028" relid="0x0" role="Member">
-              <name>no_writers_generation_count</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,760</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{290e16f9-124e-496c-8f46-7ed2a438b312}" id="id-0067-00000375" kind="Member" referred="id-0066-00000028" relid="0x0" role="Member">
-              <name>sample_rank</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,860</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{c6d029fb-0fa0-448a-bdf0-31a9450202e2}" id="id-0067-00000376" kind="Member" referred="id-0066-00000028" relid="0x0" role="Member">
-              <name>generation_rank</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,960</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{81356fa4-ada4-4164-af68-95365767a870}" id="id-0067-00000377" kind="Member" referred="id-0066-00000028" relid="0x0" role="Member">
-              <name>absolute_generation_rank</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1060</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{fba1a42c-2a85-44e3-ad4d-c04e21f2d664}" id="id-0067-00000378" kind="Member" referred="id-0066-00000023" relid="0x0" role="Member">
-              <name>valid_data</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,1160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <reference guid="{6d8fb54a-e172-4f46-a98a-abc0ec6e11d8}" id="id-0067-00000047" kind="Collection" referred="id-0065-0000008a" relid="0xc" role="Collection">
-            <name>QosPolicyCountSeq</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="bound" status="meta">
-              <value/>
-            </attribute>
-          </reference>
-          <reference guid="{78e9e4ce-0c16-4926-9cab-98fca7f42340}" id="id-0067-00000073" kind="Collection" referred="id-0065-000000ba" relid="0x1d" role="Collection">
-            <name>DataReaderSeq</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="bound" status="meta">
-              <value/>
-            </attribute>
-          </reference>
-          <reference guid="{ea4d831c-0b5d-4558-86cb-a1dbecede78d}" id="id-0067-00000098" kind="Collection" referred="id-0065-00000108" relid="0x24" role="Collection">
-            <name>ConditionSeq</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="bound" status="meta">
-              <value/>
-            </attribute>
-          </reference>
-          <reference guid="{bd00d3e2-536b-428c-9e03-cb8db4187959}" id="id-0067-0000014d" kind="Collection" referred="id-0065-00000179" relid="0x55" role="Collection">
-            <name>SampleInfoSeq</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="bound" status="meta">
-              <value/>
-            </attribute>
-          </reference>
-          <reference guid="{2fe5da52-96b2-4647-8938-ebb93f03845d}" id="id-0067-000001d4" kind="Alias" referred="id-0066-00000028" relid="0x0" role="Alias">
-            <name>DomainId_t</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-          </reference>
-          <reference guid="{7af80fb7-37be-44c8-b3be-fb071b3f8b98}" id="id-0067-000001d6" kind="Alias" referred="id-0066-00000028" relid="0x1" role="Alias">
-            <name>ReturnCode_t</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-          </reference>
-          <reference guid="{63648047-b328-4109-a598-d73b5c303abf}" id="id-0067-000001d7" kind="Alias" referred="id-0066-00000028" relid="0x1" role="Alias">
-            <name>QosPolicyId_t</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-          </reference>
-          <reference guid="{66e4851c-b1a2-4d81-b012-8e022cc217a6}" id="id-0067-000001d8" kind="Collection" referred="id-0066-00000033" relid="0x1" role="Collection">
-            <name>StringSeq</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="bound" status="meta">
-              <value/>
-            </attribute>
-          </reference>
-          <reference guid="{47cb98dd-3048-4658-ba09-708cac3e5ee1}" id="id-0067-000001dd" kind="Constant" referred="id-0066-00000028" relid="0x3" role="Constant">
-            <name>LENGTH_UNLIMITED</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>-1</value>
-            </attribute>
-          </reference>
-          <reference guid="{71b0533d-dfa0-4c38-aef2-bbd79356393c}" id="id-0067-000001de" kind="Constant" referred="id-0066-00000028" relid="0x3" role="Constant">
-            <name>DURATION_INFINITE_SEC</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>2147483647</value>
-            </attribute>
-          </reference>
-          <reference guid="{9f13e94e-e632-43e6-8845-35ae7a316311}" id="id-0067-000001df" kind="Constant" referred="id-0066-0000002b" relid="0x3" role="Constant">
-            <name>DURATION_INFINITE_NSEC</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>2147483647</value>
-            </attribute>
-          </reference>
-          <reference guid="{c00cbe0c-59f9-48bb-8ecb-0cc857d64131}" id="id-0067-000001e0" kind="Constant" referred="id-0066-00000028" relid="0x3" role="Constant">
-            <name>DURATION_ZERO_SEC</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>0</value>
-            </attribute>
-          </reference>
-          <reference guid="{a8512bf6-3e19-47a5-8c2a-4520e2b49e9c}" id="id-0067-000001e1" kind="Constant" referred="id-0066-0000002b" relid="0x3" role="Constant">
-            <name>DURATION_ZERO_NSEC</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>0</value>
-            </attribute>
-          </reference>
-          <reference guid="{822e18b5-55fe-484f-a1d7-d0b77d14be1d}" id="id-0067-000001e2" kind="Constant" referred="id-0066-00000028" relid="0x3" role="Constant">
-            <name>TIME_INVALID_SEC</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>-1</value>
-            </attribute>
-          </reference>
-          <reference guid="{2b5c66eb-aac9-4e0e-bc66-7c7e2bf3fbc4}" id="id-0067-000001e3" kind="Constant" referred="id-0066-0000002b" relid="0x3" role="Constant">
-            <name>TIME_INVALID_NSEC</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>4294967295</value>
-            </attribute>
-          </reference>
-          <reference guid="{e7b59fbc-7ad2-4f0d-8d89-1b0318de9ed1}" id="id-0067-000001e4" kind="Constant" referred="id-0066-00000028" relid="0x3" role="Constant">
-            <name>RETCODE_OK</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>0</value>
-            </attribute>
-          </reference>
-          <reference guid="{86342260-9134-4388-9af2-d239afc7dcbb}" id="id-0067-000001e5" kind="Constant" referred="id-0066-00000028" relid="0x3" role="Constant">
-            <name>RETCODE_ERROR</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>1</value>
-            </attribute>
-          </reference>
-          <reference guid="{365e41c5-8103-423a-a0f1-7bcade5636c5}" id="id-0067-000001e6" kind="Constant" referred="id-0066-00000028" relid="0x3" role="Constant">
-            <name>RETCODE_UNSUPPORTED</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>2</value>
-            </attribute>
-          </reference>
-          <reference guid="{f9ee7160-a3d9-4953-91bd-06a551332950}" id="id-0067-000001e7" kind="Constant" referred="id-0066-00000028" relid="0x3" role="Constant">
-            <name>RETCODE_BAD_PARAMETER</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>3</value>
-            </attribute>
-          </reference>
-          <reference guid="{a8d4855f-fe24-4c25-b0de-a4beeb6f2925}" id="id-0067-000001e8" kind="Constant" referred="id-0066-00000028" relid="0x3" role="Constant">
-            <name>RETCODE_PRECONDITION_NOT_MET</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>4</value>
-            </attribute>
-          </reference>
-          <reference guid="{88a50b74-c817-4b16-820d-3631a6292452}" id="id-0067-000001e9" kind="Constant" referred="id-0066-00000028" relid="0x3" role="Constant">
-            <name>RETCODE_OUT_OF_RESOURCES</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>5</value>
-            </attribute>
-          </reference>
-          <reference guid="{5c987617-b4c4-4971-943b-d34fd0f19847}" id="id-0067-000001ea" kind="Constant" referred="id-0066-00000028" relid="0x3" role="Constant">
-            <name>RETCODE_NOT_ENABLED</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>6</value>
-            </attribute>
-          </reference>
-          <reference guid="{f5f7a86f-d94f-438b-96d7-b6df65ba24a8}" id="id-0067-000001eb" kind="Constant" referred="id-0066-00000028" relid="0x3" role="Constant">
-            <name>RETCODE_IMMUTABLE_POLICY</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>7</value>
-            </attribute>
-          </reference>
-          <reference guid="{a52e4168-636b-44a7-8ba3-a11e22f9fb5a}" id="id-0067-000001ec" kind="Constant" referred="id-0066-00000028" relid="0x3" role="Constant">
-            <name>RETCODE_INCONSISTENT_POLICY</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>8</value>
-            </attribute>
-          </reference>
-          <reference guid="{e4ce1290-b724-4824-bb76-56ebc69ec16b}" id="id-0067-000001ed" kind="Constant" referred="id-0066-00000028" relid="0x3" role="Constant">
-            <name>RETCODE_ALREADY_DELETED</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>9</value>
-            </attribute>
-          </reference>
-          <reference guid="{7b36e470-9dfe-4cc5-a389-b4d0e30e0a9c}" id="id-0067-000001ee" kind="Constant" referred="id-0066-00000028" relid="0x3" role="Constant">
-            <name>RETCODE_TIMEOUT</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>10</value>
-            </attribute>
-          </reference>
-          <reference guid="{6de3ed4b-7ab1-4753-acfa-0f1114945d6b}" id="id-0067-000001ef" kind="Constant" referred="id-0066-00000028" relid="0x3" role="Constant">
-            <name>RETCODE_NO_DATA</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>11</value>
-            </attribute>
-          </reference>
-          <reference guid="{23a28218-3ff5-4be4-8295-01e195640efd}" id="id-0067-000001f0" kind="Constant" referred="id-0066-00000028" relid="0x3" role="Constant">
-            <name>RETCODE_ILLEGAL_OPERATION</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>12</value>
-            </attribute>
-          </reference>
-          <reference guid="{88ce6fba-c5b2-4c03-8df0-b6a327ebcba2}" id="id-0067-000001f1" kind="Alias" referred="id-0066-0000002b" relid="0x3" role="Alias">
-            <name>StatusKind</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-          </reference>
-          <reference guid="{992d1d26-1d82-4eea-8c98-6c3dd6a5a37b}" id="id-0067-000001f2" kind="Alias" referred="id-0066-0000002b" relid="0x3" role="Alias">
-            <name>StatusMask</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-          </reference>
-          <reference guid="{390c8e3d-7a61-4cb1-ab0c-97cbb3fd7a30}" id="id-0067-000001f3" kind="Constant" referred="id-0066-0000002b" relid="0x3" role="Constant">
-            <name>INCONSISTENT_TOPIC_STATUS</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>1</value>
-            </attribute>
-          </reference>
-          <reference guid="{3d3d20d7-9b0d-4cc5-8ffd-1a9731baedda}" id="id-0067-000001f4" kind="Constant" referred="id-0066-0000002b" relid="0x3" role="Constant">
-            <name>OFFERED_DEADLINE_MISSED_STATUS</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>2</value>
-            </attribute>
-          </reference>
-          <reference guid="{405c4afe-1866-4a0b-8468-b66f108c2ebd}" id="id-0067-000001f5" kind="Constant" referred="id-0066-0000002b" relid="0x3" role="Constant">
-            <name>REQUESTED_DEADLINE_MISSED_STATUS</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>4</value>
-            </attribute>
-          </reference>
-          <reference guid="{10b14bda-e0e1-4eeb-ba07-2a92fb7bfb07}" id="id-0067-000001f6" kind="Constant" referred="id-0066-0000002b" relid="0x3" role="Constant">
-            <name>OFFERED_INCOMPATIBLE_QOS_STATUS</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>32</value>
-            </attribute>
-          </reference>
-          <reference guid="{37e18cc5-9bbc-450b-bad4-0ff02873a212}" id="id-0067-000001f7" kind="Constant" referred="id-0066-0000002b" relid="0x3" role="Constant">
-            <name>REQUESTED_INCOMPATIBLE_QOS_STATUS</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>64</value>
-            </attribute>
-          </reference>
-          <reference guid="{15e2b955-f873-4cad-b6c6-d94cce3f9685}" id="id-0067-000001f8" kind="Constant" referred="id-0066-0000002b" relid="0x3" role="Constant">
-            <name>SAMPLE_LOST_STATUS</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>128</value>
-            </attribute>
-          </reference>
-          <reference guid="{2fee8117-c460-4931-abef-c01bfde44c49}" id="id-0067-000001f9" kind="Constant" referred="id-0066-0000002b" relid="0x3" role="Constant">
-            <name>SAMPLE_REJECTED_STATUS</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>256</value>
-            </attribute>
-          </reference>
-          <reference guid="{983b235d-e54e-48c8-8c2f-97a936501285}" id="id-0067-000001fa" kind="Constant" referred="id-0066-0000002b" relid="0x3" role="Constant">
-            <name>DATA_ON_READERS_STATUS</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>512</value>
-            </attribute>
-          </reference>
-          <reference guid="{0921cb80-552a-47d5-88ee-210c46ba266c}" id="id-0067-000001fb" kind="Constant" referred="id-0066-0000002b" relid="0x3" role="Constant">
-            <name>DATA_AVAILABLE_STATUS</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>1024</value>
-            </attribute>
-          </reference>
-          <reference guid="{d5a8e220-5da9-48c0-b855-3da19c65a356}" id="id-0067-000001fc" kind="Constant" referred="id-0066-0000002b" relid="0x3" role="Constant">
-            <name>LIVELINESS_LOST_STATUS</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>2048</value>
-            </attribute>
-          </reference>
-          <reference guid="{366574bb-4b22-43ec-b6c8-66eb202422b7}" id="id-0067-000001fd" kind="Constant" referred="id-0066-0000002b" relid="0x3" role="Constant">
-            <name>LIVELINESS_CHANGED_STATUS</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>4096</value>
-            </attribute>
-          </reference>
-          <reference guid="{15265a69-3a8f-4070-a446-f4b7cb4ff669}" id="id-0067-000001fe" kind="Constant" referred="id-0066-0000002b" relid="0x3" role="Constant">
-            <name>PUBLICATION_MATCHED_STATUS</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>8192</value>
-            </attribute>
-          </reference>
-          <reference guid="{7f72eea7-bb4f-4cb1-8ca1-05481e4fefc0}" id="id-0067-000001ff" kind="Constant" referred="id-0066-0000002b" relid="0x3" role="Constant">
-            <name>SUBSCRIPTION_MATCHED_STATUS</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>16384</value>
-            </attribute>
-          </reference>
-          <reference guid="{c385cc93-bf7c-4209-8588-a989d7a6041f}" id="id-0067-00000200" kind="Constant" referred="id-0066-0000002b" relid="0x3" role="Constant">
-            <name>RELIABLE_WRITER_CACHE_CHANGED_STATUS</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>16777216</value>
-            </attribute>
-          </reference>
-          <reference guid="{2f13072f-80e4-4fce-a346-016fc43f8e04}" id="id-0067-00000201" kind="Constant" referred="id-0066-0000002b" relid="0x3" role="Constant">
-            <name>RELIABLE_READER_ACTIVITY_CHANGED_STATUS</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>33554432</value>
-            </attribute>
-          </reference>
-          <reference guid="{5ac8c882-8da5-48d1-8a51-8664de6b73d9}" id="id-0067-000002c3" kind="Alias" referred="id-0066-0000002b" relid="0x27" role="Alias">
-            <name>SampleStateKind</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-          </reference>
-          <reference guid="{5c97dd5c-e30a-4e5e-982b-5941ea736d23}" id="id-0067-000002c4" kind="Constant" referred="id-0066-0000002b" relid="0x27" role="Constant">
-            <name>READ_SAMPLE_STATE</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>1</value>
-            </attribute>
-          </reference>
-          <reference guid="{c6c1b717-4293-4ea5-8888-73283f554469}" id="id-0067-000002c5" kind="Constant" referred="id-0066-0000002b" relid="0x27" role="Constant">
-            <name>NOT_READ_SAMPLE_STATE</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>2</value>
-            </attribute>
-          </reference>
-          <reference guid="{e52a7097-2f47-4e71-8fbb-25708a6329ca}" id="id-0067-000002c6" kind="Alias" referred="id-0066-0000002b" relid="0x27" role="Alias">
-            <name>SampleStateMask</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-          </reference>
-          <reference guid="{9f6561a8-db66-4e2a-b809-e12d7d79f22e}" id="id-0067-000002c7" kind="Constant" referred="id-0066-0000002b" relid="0x27" role="Constant">
-            <name>ANY_SAMPLE_STATE</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>65535</value>
-            </attribute>
-          </reference>
-          <reference guid="{eae82e38-e6f6-4063-b0ef-b4fa45834f07}" id="id-0067-000002c8" kind="Alias" referred="id-0066-0000002b" relid="0x27" role="Alias">
-            <name>ViewStateKind</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-          </reference>
-          <reference guid="{30af0b37-bb5b-44e3-ab35-5edf7b82f369}" id="id-0067-000002c9" kind="Constant" referred="id-0066-0000002b" relid="0x27" role="Constant">
-            <name>NEW_VIEW_STATE</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>1</value>
-            </attribute>
-          </reference>
-          <reference guid="{dc6609b3-65aa-4a80-957f-b95df0b784c8}" id="id-0067-000002ca" kind="Constant" referred="id-0066-0000002b" relid="0x27" role="Constant">
-            <name>NOT_NEW_VIEW_STATE</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>2</value>
-            </attribute>
-          </reference>
-          <reference guid="{04fab75a-961a-447b-bd69-c034886db852}" id="id-0067-000002cb" kind="Alias" referred="id-0066-0000002b" relid="0x27" role="Alias">
-            <name>ViewStateMask</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-          </reference>
-          <reference guid="{627de5a1-3601-468b-b810-aa7558271c89}" id="id-0067-000002cc" kind="Constant" referred="id-0066-0000002b" relid="0x27" role="Constant">
-            <name>ANY_VIEW_STATE</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>65535</value>
-            </attribute>
-          </reference>
-          <reference guid="{5c99fed6-c066-42b9-86ac-4a97f68bbf97}" id="id-0067-000002cd" kind="Alias" referred="id-0066-0000002b" relid="0x27" role="Alias">
-            <name>InstanceStateKind</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-          </reference>
-          <reference guid="{bcc2e328-cbeb-4833-bf50-1df5d7434084}" id="id-0067-000002ce" kind="Constant" referred="id-0066-0000002b" relid="0x27" role="Constant">
-            <name>ALIVE_INSTANCE_STATE</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>1</value>
-            </attribute>
-          </reference>
-          <reference guid="{e1c6fd6c-781c-49ff-8fde-9fabae35ea93}" id="id-0067-000002cf" kind="Constant" referred="id-0066-0000002b" relid="0x27" role="Constant">
-            <name>NOT_ALIVE_DISPOSED_INSTANCE_STATE</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>2</value>
-            </attribute>
-          </reference>
-          <reference guid="{e0060c39-9494-44ff-a214-2f7921141c80}" id="id-0067-000002d0" kind="Constant" referred="id-0066-0000002b" relid="0x27" role="Constant">
-            <name>NOT_ALIVE_NO_WRITERS_INSTANCE_STATE</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>4</value>
-            </attribute>
-          </reference>
-          <reference guid="{84c665d4-308d-4399-b82c-2c563536cc8d}" id="id-0067-000002d1" kind="Alias" referred="id-0066-0000002b" relid="0x27" role="Alias">
-            <name>InstanceStateMask</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-          </reference>
-          <reference guid="{23d82ced-1d06-4d87-8fbe-6d1670269ac4}" id="id-0067-000002d2" kind="Constant" referred="id-0066-0000002b" relid="0x27" role="Constant">
-            <name>ANY_INSTANCE_STATE</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>65535</value>
-            </attribute>
-          </reference>
-          <reference guid="{e8c6d22f-e0e5-434f-a299-a99ea6cfa987}" id="id-0067-000002d3" kind="Constant" referred="id-0066-0000002b" relid="0x27" role="Constant">
-            <name>NOT_ALIVE_INSTANCE_STATE</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>6</value>
-            </attribute>
-          </reference>
-          <reference guid="{5f2172a2-f0a7-4b0c-8e2c-05302321d0bf}" id="id-0067-000002dc" kind="Constant" referred="id-0066-00000033" relid="0x29" role="Constant">
-            <name>USERDATA_QOS_POLICY_NAME</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>UserData</value>
-            </attribute>
-          </reference>
-          <reference guid="{342bfbee-3001-4713-a5ea-dddfca9b01cd}" id="id-0067-000002dd" kind="Constant" referred="id-0066-00000033" relid="0x29" role="Constant">
-            <name>DURABILITY_QOS_POLICY_NAME</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>Durability</value>
-            </attribute>
-          </reference>
-          <reference guid="{e865df56-22dc-4c6a-be4a-b1d323b7b4e5}" id="id-0067-000002de" kind="Constant" referred="id-0066-00000033" relid="0x29" role="Constant">
-            <name>PRESENTATION_QOS_POLICY_NAME</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>Presentation</value>
-            </attribute>
-          </reference>
-          <reference guid="{960a135a-7067-4dd8-9729-9a36abcce18c}" id="id-0067-000002df" kind="Constant" referred="id-0066-00000033" relid="0x29" role="Constant">
-            <name>DEADLINE_QOS_POLICY_NAME</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>Deadline</value>
-            </attribute>
-          </reference>
-          <reference guid="{885dfeed-2652-4be0-900f-abf60f93e712}" id="id-0067-000002e0" kind="Constant" referred="id-0066-00000033" relid="0x29" role="Constant">
-            <name>LATENCYBUDGET_QOS_POLICY_NAME</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>LatencyBudget</value>
-            </attribute>
-          </reference>
-          <reference guid="{fc9eff9b-593b-45dd-84f6-3cdf5fc55aad}" id="id-0067-000002e1" kind="Constant" referred="id-0066-00000033" relid="0x29" role="Constant">
-            <name>OWNERSHIP_QOS_POLICY_NAME</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>Ownership</value>
-            </attribute>
-          </reference>
-          <reference guid="{d595fd88-30b2-4603-aa2c-a57f65e22357}" id="id-0067-000002e2" kind="Constant" referred="id-0066-00000033" relid="0x29" role="Constant">
-            <name>OWNERSHIPSTRENGTH_QOS_POLICY_NAME</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>OwnershipStrength</value>
-            </attribute>
-          </reference>
-          <reference guid="{2d6cb837-6e20-4313-a165-c586617b6349}" id="id-0067-000002e3" kind="Constant" referred="id-0066-00000033" relid="0x29" role="Constant">
-            <name>LIVELINESS_QOS_POLICY_NAME</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>Liveliness</value>
-            </attribute>
-          </reference>
-          <reference guid="{07e31c0c-3231-42b3-98dc-a388ae679ae2}" id="id-0067-000002e4" kind="Constant" referred="id-0066-00000033" relid="0x29" role="Constant">
-            <name>TIMEBASEDFILTER_QOS_POLICY_NAME</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>TimeBasedFilter</value>
-            </attribute>
-          </reference>
-          <reference guid="{b354cef1-9129-4ca3-8c48-258b0d804a5e}" id="id-0067-000002e5" kind="Constant" referred="id-0066-00000033" relid="0x29" role="Constant">
-            <name>PARTITION_QOS_POLICY_NAME</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>Partition</value>
-            </attribute>
-          </reference>
-          <reference guid="{4b7d207f-8a78-4551-8aa7-02e74dc6f675}" id="id-0067-000002e6" kind="Constant" referred="id-0066-00000033" relid="0x29" role="Constant">
-            <name>RELIABILITY_QOS_POLICY_NAME</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>Reliability</value>
-            </attribute>
-          </reference>
-          <reference guid="{70bd1a60-33c8-4a8a-9b17-38334ebddb3c}" id="id-0067-000002e7" kind="Constant" referred="id-0066-00000033" relid="0x29" role="Constant">
-            <name>DESTINATIONORDER_QOS_POLICY_NAME</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>DestinationOrder</value>
-            </attribute>
-          </reference>
-          <reference guid="{cfd2bd41-b9af-417b-8354-94a13b32eed0}" id="id-0067-000002e8" kind="Constant" referred="id-0066-00000033" relid="0x29" role="Constant">
-            <name>HISTORY_QOS_POLICY_NAME</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>History</value>
-            </attribute>
-          </reference>
-          <reference guid="{b59b8a19-89a4-4848-a844-14233b466053}" id="id-0067-000002e9" kind="Constant" referred="id-0066-00000033" relid="0x29" role="Constant">
-            <name>RESOURCELIMITS_QOS_POLICY_NAME</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>ResourceLimits</value>
-            </attribute>
-          </reference>
-          <reference guid="{987c7a77-32a3-405e-b79c-0e4ffa535e83}" id="id-0067-000002ea" kind="Constant" referred="id-0066-00000033" relid="0x29" role="Constant">
-            <name>ENTITYFACTORY_QOS_POLICY_NAME</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>EntityFactory</value>
-            </attribute>
-          </reference>
-          <reference guid="{70754b78-bddf-4f69-9867-dfd284250706}" id="id-0067-000002eb" kind="Constant" referred="id-0066-00000033" relid="0x29" role="Constant">
-            <name>WRITERDATALIFECYCLE_QOS_POLICY_NAME</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>WriterDataLifecycle</value>
-            </attribute>
-          </reference>
-          <reference guid="{686913f1-452e-43e0-ab32-5586c0f0fed6}" id="id-0067-000002ec" kind="Constant" referred="id-0066-00000033" relid="0x29" role="Constant">
-            <name>READERDATALIFECYCLE_QOS_POLICY_NAME</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>ReaderDataLifecycle</value>
-            </attribute>
-          </reference>
-          <reference guid="{9e8145d3-32fd-469c-9ba2-5e1b37d28950}" id="id-0067-000002ed" kind="Constant" referred="id-0066-00000033" relid="0x29" role="Constant">
-            <name>TOPICDATA_QOS_POLICY_NAME</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>TopicData</value>
-            </attribute>
-          </reference>
-          <reference guid="{2f74cd87-7056-411e-8df5-ec3fde12f838}" id="id-0067-000002ee" kind="Constant" referred="id-0066-00000033" relid="0x29" role="Constant">
-            <name>GROUPDATA_QOS_POLICY_NAME</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>TransportPriority</value>
-            </attribute>
-          </reference>
-          <reference guid="{84431488-0616-42bb-b041-ff04f04afd4a}" id="id-0067-000002ef" kind="Constant" referred="id-0066-00000033" relid="0x29" role="Constant">
-            <name>LIFESPAN_QOS_POLICY_NAME</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>Lifespan</value>
-            </attribute>
-          </reference>
-          <reference guid="{25e9c88b-ecc3-49b5-856b-ce68ed556005}" id="id-0067-000002f0" kind="Constant" referred="id-0066-00000033" relid="0x29" role="Constant">
-            <name>DURABILITYSERVICE_POLICY_NAME</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>DurabilityService</value>
-            </attribute>
-          </reference>
-          <reference guid="{a5583f66-b4fd-41cb-bf8a-93f5a3ad592d}" id="id-0067-000002f1" kind="Constant" referred="id-0066-00000028" relid="0x29" role="Constant">
-            <name>INVALID_QOS_POLICY_ID</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>0</value>
-            </attribute>
-          </reference>
-          <reference guid="{900018cf-41d6-4dd2-bc12-5519f7fa71af}" id="id-0067-000002f2" kind="Constant" referred="id-0066-00000028" relid="0x29" role="Constant">
-            <name>USERDATA_QOS_POLICY_ID</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>1</value>
-            </attribute>
-          </reference>
-          <reference guid="{90cff5dc-65c5-4439-87f4-9ffe7c471ec3}" id="id-0067-000002f3" kind="Constant" referred="id-0066-00000028" relid="0x29" role="Constant">
-            <name>DURABILITY_QOS_POLICY_ID</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>2</value>
-            </attribute>
-          </reference>
-          <reference guid="{5f9654da-90dd-4c64-bdf9-b54f9c22cee3}" id="id-0067-000002f4" kind="Constant" referred="id-0066-00000028" relid="0x29" role="Constant">
-            <name>PRESENTATION_QOS_POLICY_ID</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>3</value>
-            </attribute>
-          </reference>
-          <reference guid="{f1351792-cb5c-420d-87ef-9a382e601e0f}" id="id-0067-000002f5" kind="Constant" referred="id-0066-00000028" relid="0x29" role="Constant">
-            <name>DEADLINE_QOS_POLICY_ID</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>4</value>
-            </attribute>
-          </reference>
-          <reference guid="{5e24adef-84f2-4217-935c-7919ca41349f}" id="id-0067-000002f6" kind="Constant" referred="id-0066-00000028" relid="0x29" role="Constant">
-            <name>LATENCYBUDGET_QOS_POLICY_ID</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>5</value>
-            </attribute>
-          </reference>
-          <reference guid="{04c3ccdd-029a-42b9-966c-03a39649c434}" id="id-0067-000002f7" kind="Constant" referred="id-0066-00000028" relid="0x29" role="Constant">
-            <name>OWNERSHIP_QOS_POLICY_ID</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>6</value>
-            </attribute>
-          </reference>
-          <reference guid="{73353c2c-8b07-47b5-b1d2-bf8488a53abd}" id="id-0067-000002f8" kind="Constant" referred="id-0066-00000028" relid="0x29" role="Constant">
-            <name>OWNERSHIPSTRENGTH_QOS_POLICY_ID</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>7</value>
-            </attribute>
-          </reference>
-          <reference guid="{3e13fcc4-1376-45ec-a75d-1fe3e3a21b32}" id="id-0067-000002f9" kind="Constant" referred="id-0066-00000028" relid="0x29" role="Constant">
-            <name>LIVELINESS_QOS_POLICY_ID</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>8</value>
-            </attribute>
-          </reference>
-          <reference guid="{6cc25795-4a61-42b0-92ee-b178311f6685}" id="id-0067-000002fa" kind="Constant" referred="id-0066-00000028" relid="0x29" role="Constant">
-            <name>TIMEBASEDFILTER_QOS_POLICY_ID</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>9</value>
-            </attribute>
-          </reference>
-          <reference guid="{8cc80712-a728-439a-97e9-01656d5f0798}" id="id-0067-000002fb" kind="Constant" referred="id-0066-00000028" relid="0x29" role="Constant">
-            <name>PARTITION_QOS_POLICY_ID</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>10</value>
-            </attribute>
-          </reference>
-          <reference guid="{6fe0af61-4983-4eaf-a0e4-2f95c0e61ae4}" id="id-0067-000002fc" kind="Constant" referred="id-0066-00000028" relid="0x29" role="Constant">
-            <name>RELIABILITY_QOS_POLICY_ID</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>11</value>
-            </attribute>
-          </reference>
-          <reference guid="{3d1b86b5-e1ef-44eb-a0a0-0a68b139696d}" id="id-0067-000002fd" kind="Constant" referred="id-0066-00000028" relid="0x29" role="Constant">
-            <name>DESTINATIONORDER_QOS_POLICY_ID</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>12</value>
-            </attribute>
-          </reference>
-          <reference guid="{fa43c7d0-05ed-41f8-8209-b62c8275fafe}" id="id-0067-000002fe" kind="Constant" referred="id-0066-00000028" relid="0x29" role="Constant">
-            <name>HISTORY_QOS_POLICY_ID</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>13</value>
-            </attribute>
-          </reference>
-          <reference guid="{20e774b6-a766-4159-b9a5-ddf2694e6819}" id="id-0067-000002ff" kind="Constant" referred="id-0066-00000028" relid="0x29" role="Constant">
-            <name>RESOURCELIMITS_QOS_POLICY_ID</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>14</value>
-            </attribute>
-          </reference>
-          <reference guid="{22c87c9f-59d2-4208-ac27-bf4e7ed3a26a}" id="id-0067-00000300" kind="Constant" referred="id-0066-00000028" relid="0x29" role="Constant">
-            <name>ENTITYFACTORY_QOS_POLICY_ID</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>15</value>
-            </attribute>
-          </reference>
-          <reference guid="{b47ce178-3002-41e4-b156-cd2859716e21}" id="id-0067-00000301" kind="Constant" referred="id-0066-00000028" relid="0x29" role="Constant">
-            <name>WRITERDATALIFECYCLE_QOS_POLICY_ID</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>16</value>
-            </attribute>
-          </reference>
-          <reference guid="{6444c694-b5c1-4f80-a898-3be27fb49b8e}" id="id-0067-00000302" kind="Constant" referred="id-0066-00000028" relid="0x29" role="Constant">
-            <name>READERDATALIFECYCLE_QOS_POLICY_ID</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>17</value>
-            </attribute>
-          </reference>
-          <reference guid="{a62f9110-3577-4424-8204-d55f86b042fd}" id="id-0067-00000303" kind="Constant" referred="id-0066-00000028" relid="0x29" role="Constant">
-            <name>TOPICDATA_QOS_POLICY_ID</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>18</value>
-            </attribute>
-          </reference>
-          <reference guid="{c40ef8d5-414f-463b-b547-477523ea9ac7}" id="id-0067-00000304" kind="Constant" referred="id-0066-00000028" relid="0x29" role="Constant">
-            <name>GROUPDATA_QOS_POLICY_ID</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>19</value>
-            </attribute>
-          </reference>
-          <reference guid="{d4477e99-5985-489d-9609-b8f294c8a149}" id="id-0067-00000305" kind="Constant" referred="id-0066-00000028" relid="0x29" role="Constant">
-            <name>TRANSPORTPRIORITY_QOS_POLICY_ID</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>20</value>
-            </attribute>
-          </reference>
-          <reference guid="{6ea3d1b9-4d9c-422d-b840-dd7dbdc687c1}" id="id-0067-00000306" kind="Constant" referred="id-0066-00000028" relid="0x29" role="Constant">
-            <name>LIFESPAN_QOS_POLICY_ID</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>21</value>
-            </attribute>
-          </reference>
-          <reference guid="{9a3f8cd3-6297-4271-bff0-5df4d6ef4e86}" id="id-0067-00000307" kind="Constant" referred="id-0066-00000028" relid="0x29" role="Constant">
-            <name>DURABILITYSERVICE_QOS_POLICY_ID</name>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="value">
-              <value>22</value>
-            </attribute>
-          </reference>
-          <reference guid="{3d739258-d430-4f96-965e-b0712419b322}" id="id-0067-00000308" kind="Collection" referred="id-0066-00000024" relid="0x29" role="Collection">
-            <name>OctetSeq</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="bound" status="meta">
-              <value/>
-            </attribute>
-          </reference>
-          <reference id="id-0067-0000038e" kind="Collection" referred="id-0066-00000028" relid="0x56" role="Collection">
-            <name>long_3</name>
-          </reference>
-        </model>
-      </model>
-      <model childrelidcntr="0x1" guid="{ab5b259b-a53c-4e92-a982-85860248d4ce}" id="id-0065-00000195" kind="File" relid="0xf">
-        <name>dds_rtf2_dcps_instance_handle</name>
-        <attribute kind="Path">
-          <value>connectors/dds4ccm/idl</value>
-        </attribute>
-        <attribute kind="PostPreprocessorDirectives" status="meta">
-          <value/>
-        </attribute>
-        <attribute kind="PrePreprocessorDirectives" status="meta">
-          <value/>
-        </attribute>
-        <attribute kind="PrefixTag" status="meta">
-          <value/>
-        </attribute>
-        <model childrelidcntr="0x1" guid="{639af11c-9d1e-4f6e-bb6f-90cfd4a688e1}" id="id-0065-00000196" kind="Package" relid="0x0" role="Package">
-          <name>DDS</name>
-          <attribute kind="PostPreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrePreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrefixTag" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="SpecifyIdTag" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="VersionTag" status="meta">
-            <value/>
-          </attribute>
-          <atom guid="{d0de930c-c067-42ed-b568-847c0dcbde68}" id="id-0066-00000022" kind="NativeValue" relid="0x0" role="NativeValue">
-            <name>HANDLE_NIL</name>
-          </atom>
-        </model>
-      </model>
-      <model childrelidcntr="0x1" guid="{5f33e8ef-85f4-49ef-bcbb-a2ef7ac61eb3}" id="id-0065-00000197" kind="File" relid="0x10">
-        <name>dds_rtf2_dcps_i_handle</name>
-        <attribute kind="Path">
-          <value>connectors/dds4ccm/idl</value>
-        </attribute>
-        <attribute kind="PostPreprocessorDirectives" status="meta">
-          <value/>
-        </attribute>
-        <attribute kind="PrePreprocessorDirectives" status="meta">
-          <value/>
-        </attribute>
-        <attribute kind="PrefixTag" status="meta">
-          <value/>
-        </attribute>
-        <model childrelidcntr="0x2" guid="{38efb2d6-c5ac-47be-ae87-cb4afe74bdeb}" id="id-0065-00000198" kind="Package" relid="0x0" role="Package">
-          <name>DDS</name>
-          <attribute kind="PostPreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrePreprocessorDirectives" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="PrefixTag" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="SpecifyIdTag" status="meta">
-            <value/>
-          </attribute>
-          <attribute kind="VersionTag" status="meta">
-            <value/>
-          </attribute>
-          <model childrelidcntr="0x1" guid="{d669c2b7-7879-4d7c-953d-5e3241428e92}" id="id-0065-00000199" kind="Aggregate" relid="0x0" role="Aggregate">
-            <name>NativeInstanceHandle_t</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <reference guid="{8bac54ad-db49-4c71-8611-018b48d10830}" id="id-0067-00000379" kind="ArrayMember" referred="id-0066-00000024" relid="0x0" role="ArrayMember">
-              <name>value</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,60</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-              <attribute kind="Size">
-                <value>16</value>
-              </attribute>
-            </reference>
-            <reference guid="{8136fdb0-7dbb-4225-8755-2577a3e773db}" id="id-0067-0000037a" kind="Member" referred="id-0066-0000002b" relid="0x0" role="Member">
-              <name>length</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,160</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-            <reference guid="{5a1128c6-a81c-48e0-bb50-5a582a1cd3ba}" id="id-0067-0000037b" kind="Member" referred="id-0066-0000002b" relid="0x0" role="Member">
-              <name>isValid</name>
-              <regnode isopaque="yes" name="PartRegs">
-                <value/>
-                <regnode isopaque="yes" name="InterfaceDefinition">
-                  <value/>
-                  <regnode isopaque="yes" name="Position">
-                    <value>60,260</value>
-                  </regnode>
-                </regnode>
-              </regnode>
-            </reference>
-          </model>
-          <reference guid="{ff971609-3de5-4dfd-92d3-5c05a80afaa9}" id="id-0067-00000167" kind="Alias" referred="id-0066-00000028" relid="0x1" role="Alias">
-            <name>InstanceHandle_t</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-          </reference>
-          <reference guid="{d18bc8f7-a45e-4fbb-a5f2-d48f872f7ecd}" id="id-0067-00000168" kind="Collection" referred="id-0067-00000167" relid="0x1" role="Collection">
-            <name>InstanceHandleSeq</name>
-            <attribute kind="PostPreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="PrePreprocessorDirectives" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="SpecifyIdTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="VersionTag" status="meta">
-              <value/>
-            </attribute>
-            <attribute kind="bound" status="meta">
-              <value/>
-            </attribute>
-          </reference>
-        </model>
-      </model>
-    </folder>
-    <folder childrelidcntr="0x0" guid="{69574031-9f39-4d8e-823d-d29fd48aa072}" id="id-006a-00000003" kind="ImplementationArtifacts" relid="0x1">
-      <name>ImplementationArtifacts</name>
-    </folder>
-    <folder childrelidcntr="0x0" guid="{761a1f97-c812-44a4-95d4-bedbffef5e88}" id="id-006a-00000004" kind="ComponentImplementations" relid="0x2">
-      <name>ComponentImplementations</name>
-    </folder>
-    <folder childrelidcntr="0x12" guid="{dddb800b-cb2d-44c1-8565-04c55466865d}" id="id-006a-00000005" kind="PredefinedTypes" relid="0x3">
-      <name>PredefinedTypes</name>
-      <atom guid="{fb202a59-8bd9-4a7e-aada-1816868d4387}" id="id-0066-00000023" kind="Boolean" relid="0x0">
-        <name>Boolean</name>
-      </atom>
-      <atom guid="{e4f7be2e-25d8-4a0b-9645-28580fe6b533}" id="id-0066-00000024" kind="Byte" relid="0x1">
-        <name>Byte</name>
-      </atom>
-      <atom guid="{8193fe8f-a5af-40a1-b393-de6c5d54c352}" id="id-0066-00000025" kind="Char" relid="0x2">
-        <name>Char</name>
-      </atom>
-      <atom guid="{05b11570-71e1-448c-828f-834dfe5843da}" id="id-0066-00000026" kind="WideChar" relid="0x3">
-        <name>WideChar</name>
-      </atom>
-      <atom guid="{5bded188-b1f8-4aad-b46f-44c70302479c}" id="id-0066-00000027" kind="ShortInteger" relid="0x4">
-        <name>ShortInteger</name>
-      </atom>
-      <atom guid="{82e9b301-b8d9-4ed6-adde-3f6fa870a4e1}" id="id-0066-00000028" kind="LongInteger" relid="0x5">
-        <name>LongInteger</name>
-      </atom>
-      <atom guid="{74476a32-4e8e-4476-9386-c18ca08b7169}" id="id-0066-00000029" kind="LongLongInteger" relid="0x6">
-        <name>LongLongInteger</name>
-      </atom>
-      <atom guid="{db80209c-37a2-4682-b082-c7e6c836e85a}" id="id-0066-0000002a" kind="UnsignedShortInteger" relid="0x7">
-        <name>UnsignedShortInteger</name>
-      </atom>
-      <atom guid="{9007bf15-29fc-4b32-a84a-7b7d37391b84}" id="id-0066-0000002b" kind="UnsignedLongInteger" relid="0x8">
-        <name>UnsignedLongInteger</name>
-      </atom>
-      <atom guid="{4088faaa-acb3-4f25-8e02-facd710cffc6}" id="id-0066-0000002c" kind="UnsignedLongLongInteger" relid="0x9">
-        <name>UnsignedLongLongInteger</name>
-      </atom>
-      <atom guid="{86abaec4-275b-4557-b7fc-3c37162e4c88}" id="id-0066-0000002d" kind="FloatNumber" relid="0xa">
-        <name>FloatNumber</name>
-      </atom>
-      <atom guid="{31da4bfa-4cdd-4aa3-a2b2-ca4565fe6c5e}" id="id-0066-0000002e" kind="DoubleNumber" relid="0xb">
-        <name>DoubleNumber</name>
-      </atom>
-      <atom guid="{2ff7e056-4843-4aa2-92b3-7a63d5f05f7e}" id="id-0066-0000002f" kind="LongDoubleNumber" relid="0xc">
-        <name>LongDoubleNumber</name>
-      </atom>
-      <atom guid="{9febfeb2-0029-4e17-863a-95ce95fc96c8}" id="id-0066-00000030" kind="GenericObject" relid="0xd">
-        <name>GenericObject</name>
-      </atom>
-      <atom guid="{f8a3717c-66ac-4036-82ca-cd1ae722f2f5}" id="id-0066-00000031" kind="GenericValue" relid="0xe">
-        <name>GenericValue</name>
-      </atom>
-      <atom guid="{78214cf5-c763-4757-8021-1f4048f149db}" id="id-0066-00000032" kind="GenericValueObject" relid="0xf">
-        <name>GenericValueObject</name>
-      </atom>
-      <atom guid="{27e3d44c-6193-4866-b3af-e20dff54bbab}" id="id-0066-00000033" kind="String" relid="0x10">
-        <name>String</name>
-      </atom>
-      <atom guid="{e783ca74-1607-4282-996b-f76573af40f4}" id="id-0066-00000034" kind="WideString" relid="0x11">
-        <name>WideString</name>
-      </atom>
-    </folder>
-  </folder>
-
-</project>
diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/.gitignore b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.idl b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.idl
deleted file mode 100644
index 3a0de67b9ba..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.idl
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef LATENCY_BASE_IDL
-#define LATENCY_BASE_IDL
-
-#pragma DCPS_DATA_TYPE "LatencyTest"
-
-const short MAX_DATA_SEQUENCE_LENGTH = 8192;
-typedef sequence<octet, MAX_DATA_SEQUENCE_LENGTH> octet_sequence;
-
-struct LatencyTest {
-  long seq_num;
-  octet_sequence data;
- };
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.mpc b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.mpc
deleted file mode 100644
index e50ada72fb8..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.mpc
+++ /dev/null
@@ -1,26 +0,0 @@
-project (DDS_Latency_Base_plain_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_Latency_Base_plain_stub
-  dynamicflags += LATENCY_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  requires += dds4ccm_ndds
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=LATENCY_BASE_STUB_Export \
-              -Wb,stub_export_include=LATENCY_Base_plain_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    Latency_Base.idl
-  }
-
-  opendds_ts_flags += --export=LATENCY_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    Latency_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/DDS_Receiver.mpc b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/DDS_Receiver.mpc
deleted file mode 100644
index 544d885a738..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/DDS_Receiver.mpc
+++ /dev/null
@@ -1,15 +0,0 @@
-project(*latency_receiver_plain) : ndds_idltocpp, acelib, taolib, typecode {
-  after += DDS_Latency_Base_plain_stub
-  exename = DDS_receiver
-  libpaths += ../lib
-  libout = ../lib
-  libs  += DDS_Latency_Base_plain_stub
-  includes += ../Base
-
-  requires += dds4ccm_ndds
-
-  Source_Files {
-    Latency_Receiver.cpp
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/Latency_Receiver.cpp b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/Latency_Receiver.cpp
deleted file mode 100644
index 13ccdbaddb4..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/Latency_Receiver.cpp
+++ /dev/null
@@ -1,361 +0,0 @@
-#include "ace/Get_Opt.h"
-#include "tao/ORB_Core.h"
-#include "ace/High_Res_Timer.h"
-#include "ace/Env_Value_T.h"
-#include "ace/Tokenizer_T.h"
-#if (CIAO_DDS4CCM_NDDS==1)
-# include "Latency_Base.h"
-# include "Latency_BaseSupport.h"
-# include "Latency_BasePlugin.h"
-# include <ndds/ndds_namespace_cpp.h>
-#else
-# include "Latency_BaseC.h"
-# include "Latency_BaseTypeSupportC.h"
-#endif
-
-
-bool shutdown_flag_ = false;
-
-CORBA::LongLong count_ = 0; // total count of all received messages
-
-LatencyTest * instance_ =0;
-LatencyTestDataWriter * test_data_writer_ = 0;
-
-const char * lib_name_ = 0;
-const char * prof_name_ = 0;
-
-CORBA::UShort domain_id_ = 0;
-CORBA::Boolean both_read_write_ = false;
-
-void
-split_qos (const char * qos)
-{
-  char* buf = ACE_OS::strdup (qos);
-  ACE_Tokenizer_T<char> tok (buf);
-  tok.delimiter_replace ('#', 0);
-  for (char *p = tok.next (); p; p = tok.next ())
-    {
-      if (!lib_name_)
-        {
-          lib_name_ = ACE_OS::strdup (p);
-        }
-      else if (!prof_name_)
-        {
-          prof_name_ = ACE_OS::strdup (p);
-        }
-    }
-  ACE_OS::free (buf);
-  ACE_DEBUG ((LM_DEBUG, "Receiver : Found QoS profile %C %C\n",
-    lib_name_,
-    prof_name_));
-}
-
-int
-parse_args (int argc, ACE_TCHAR *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("d:b:q:O"));
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    {
-      switch (c)
-        {
-          case 'b':
-            both_read_write_  = true;
-            break;
-          case 'd':
-            domain_id_  = ACE_OS::atoi (get_opts.opt_arg ());
-            break;
-          case 'q':
-            {
-              const char * qos = get_opts.opt_arg ();
-              split_qos (qos);
-            }
-          break;
-          case '?':
-          default:
-            printf("c = <%c>\n",c);
-            ACE_ERROR_RETURN ((LM_ERROR,
-                                "usage:\n\n"
-                                "  -d <domain_id>\n"
-                                "  -q <QoS profile>\n"
-                                "  -b use both a writer and reader per topic.\n"
-                                "\n"),
-                              -1);
-        }
-    }
-  // Indicates successful parsing of the command line
-  return 0;
-}
-
-/* The listener of events and data from the middleware */
-class HelloListener: public ::DDS::DataReaderListener {
-public:
-  void on_data_available(::DDS::DataReader *reader);
-};
-
-/* The dummy listener of events and data from the middleware */
-class DummyListener: public ::DDS::DataReaderListener {
-};
-
-void
-write_back (LatencyTest & an_instance)
-{
-  ++count_;
-
-  try
-    {
-      test_data_writer_->write(an_instance, DDS_HANDLE_NIL);
-    }
-  catch (const ::CORBA::Exception& ex)
-    {
-      ex._tao_print_exception ("Exception caught:");
-      ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                        ACE_TEXT ("while writing ping back.\n")));
-    }
-}
-
-int ACE_TMAIN(int argc, ACE_TCHAR** argv)
-{
-  ::DDS::ReturnCode_t retcode;
-  HelloListener listener;
-  DummyListener dum_listener;
-  ::DDS::DataReader *data_reader = 0;
-  ::DDS::DataReader *dum_data_reader = 0;
-  const char * type_name = 0;
-  ::DDS::Topic * send_topic = 0;
-  ::DDS::Topic * receive_topic = 0;
-  ::DDS::DataWriter * data_writer = 0;
-  ::DDS::DataWriter * dum_data_writer = 0;
-
-  ACE_Env_Value<int> id (ACE_TEXT("DDS4CCM_DEFAULT_DOMAIN_ID"), domain_id_);
-  domain_id_ = id;
-
-  int main_result = 1; /* error by default */
-  if (parse_args (argc, argv) != 0)
-    return 1;
-
-  /* Create the domain participant on domain ID 0 */
-  ::DDS::DomainParticipant *participant =
-              ::DDS::DomainParticipantFactory::get_instance()->
-                create_participant_with_profile(
-                                  domain_id_,
-                                  lib_name_,
-                                  prof_name_,
-                                  0,
-                                  DDS_STATUS_MASK_NONE);
-  if (!participant)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("Receiver : Unable to create domain participant.\n")));
-      goto clean_exit;
-    }
-  /* Register type before creating topic */
-  type_name = LatencyTestTypeSupport::get_type_name ();
-  retcode = LatencyTestTypeSupport::register_type (participant, type_name);
-  if (retcode != DDS_RETCODE_OK)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("Unable to register topic type.\n")));
-      goto clean_exit;
-    }
-
-  send_topic = participant->create_topic_with_profile (
-                      "send",
-                      type_name,
-                      lib_name_,
-                      prof_name_,
-                      0,
-                      DDS_STATUS_MASK_NONE);
-  if (!send_topic)
-    {
-      ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create topic.\n")));
-      goto clean_exit;
-    }
-
-  receive_topic = participant->create_topic_with_profile (
-                      "receive",
-                      type_name,
-                      lib_name_,
-                      prof_name_,
-                      0,
-                      DDS_STATUS_MASK_NONE);
-  if (!receive_topic)
-    {
-      ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create topic.\n")));
-      goto clean_exit;
-    }
-
-  /* Create the data reader using the default publisher */
-  data_reader = participant->create_datareader_with_profile(
-                                              send_topic,
-                                              lib_name_,
-                                              prof_name_,
-                                              &listener,
-                                              DDS_DATA_AVAILABLE_STATUS);
-
-  if (!data_reader )
-    {
-      ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create data reader.\n")));
-      goto clean_exit;
-    }
-
-  /* Create a data writer, which will not be used, but is there for
-  *   compatibility with DDS4CCM latency test, where there is always a
-  *  reader and a writer per connector
-  */
-  if (both_read_write_)
-    {
-    dum_data_writer = participant->create_datawriter_with_profile(
-                                send_topic,
-                                lib_name_,
-                                prof_name_,
-                                0,
-                                DDS_STATUS_MASK_NONE);
-    if (!dum_data_writer)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create data writer.\n")));
-        goto clean_exit;
-      }
-    }
-  /* Create the data writer using the default publisher */
-  data_writer = participant->create_datawriter_with_profile(
-                              receive_topic,
-                              lib_name_,
-                              prof_name_,
-                              0,
-                              DDS_STATUS_MASK_NONE);
-  if (!data_writer)
-    {
-      ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create data writer.\n")));
-      goto clean_exit;
-    }
-
-  /* Create a data reader, which will not be used, but is there for
-  *  compatibility with DDS4CCM latency test, where there is always a
-  *  reader and a writer per connector.
-  */
-  if (both_read_write_)
-    {
-      dum_data_reader = participant->create_datareader_with_profile(
-                                              receive_topic,
-                                              lib_name_,
-                                              prof_name_,
-                                              &dum_listener,
-                                              DDS_DATA_AVAILABLE_STATUS);
-
-    if (!dum_data_reader )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create data reader.\n")));
-        goto clean_exit;
-      }
-    }
-
-  test_data_writer_ = LatencyTestDataWriter::narrow (data_writer);
-  if (!test_data_writer_)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("DDS_StringDataWriter_narrow failed.\n")));
-      goto clean_exit;
-    }
-
-  /* --- Sleep During Asynchronous Reception ---------------------------- */
-
-  /* This thread sleeps forever. When a sample is received, RTI Data
-  * Distribution Service will call the on_data_available_callback function.
-  */
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ready to read data.\n")));
-  for (;;)
-  {
-    ACE_OS::sleep (1);
-    if (shutdown_flag_)
-      {
-        break;
-      }
-  }
-
-  /* --- Clean Up ------------------------------------------------------- */
-
-  main_result = 0;
-clean_exit:
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Exiting.")));
-  if (count_ > 0)
-    {
-      ACE_DEBUG((LM_DEBUG, "SUMMARY RECEIVER:\n "
-                          "Number of samples received: %u \n",
-                          count_));
-    }
-  else
-    {
-      ACE_DEBUG((LM_DEBUG, "SUMMARY RECEIVER:\n "
-                        "No samples received\n "));
-    }
-  if (participant)
-    {
-      retcode = participant->delete_contained_entities ();
-      if (retcode != DDS_RETCODE_OK)
-        {
-          ACE_ERROR ((LM_ERROR, ACE_TEXT ("Deletion failed.\n")));
-          main_result = 1;
-        }
-      retcode = ::DDS::DomainParticipantFactory::get_instance ()->
-                  delete_participant(participant);
-      if (retcode != DDS_RETCODE_OK)
-        {
-          ACE_ERROR ((LM_ERROR, ACE_TEXT ("Deletion failed.\n")));
-          main_result = 1;
-        }
-    }
-
-  DDSDomainParticipantFactory::finalize_instance ();
-
-  return main_result;
-}
-
-/* This method gets called back by DDS when one or more data samples
-  *  have been received.
-  */
-void HelloListener::on_data_available(::DDS::DataReader *reader)
-{
-  /* Perform a safe type-cast from a generic data reader into a
-    * specific data reader for the type "LatencyTestDataReader"
-    */
-  LatencyTestDataReader * test_reader =
-                            LatencyTestDataReader::narrow (reader);
-  if (!test_reader)
-    {
-      /* In this specific case, this will never fail */
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("::DDS::StringDataReader::narrow failed.\n")));
-      return;
-    }
-
-  /* Loop until there are messages available in the queue */
-  for(;;)
-    {
-      ::DDS::SampleInfoSeq info;
-      ::LatencyTestRTISeq sample_req;
-      ::DDS::ReturnCode_t const retcode = test_reader->take(sample_req, info);
-      if (retcode == DDS_RETCODE_NO_DATA)
-        {
-          /*  No more samples */
-          break;
-          }
-      else if (retcode != DDS_RETCODE_OK)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("Unable to take data from data reader,"
-                                " error %d.\n"),
-                                retcode));
-          return;
-        }
-      for (::DDS_Long i = 0; i < sample_req.length (); ++i)
-        {
-          if (info[i].valid_data)
-            {
-              write_back(sample_req[i]);
-            }
-        }
-      (void) test_reader->return_loan (sample_req, info);
-    }
-}
diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/DDS_Sender.mpc b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/DDS_Sender.mpc
deleted file mode 100644
index 503fbceb27b..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/DDS_Sender.mpc
+++ /dev/null
@@ -1,31 +0,0 @@
-project(*latency_sender_plain) : nddslib, acelib, taolib, typecode {
-  after += DDS_Latency_Base_plain_stub
-  exename = DDS_Sender
-  avoids += ace_for_tao
-  libpaths += ../lib
-  libout = ../lib
-  includes += ../Base
-  libs  += DDS_Latency_Base_plain_stub
-
-  requires += dds4ccm_ndds
-
-  Source_Files {
-    Latency_Sender.cpp
-  }
-}
-
-project(*ndds_latency_sender_plain) : nddslib, acelib, taolib, typecode {
-  after += DDS_Latency_Base_plain_stub
-  exename = DDS_NDDS_Sender
-  avoids += ace_for_tao
-  libpaths += ../lib
-  libout = ../lib
-  includes += ../Base
-  libs  += DDS_Latency_Base_plain_stub
-
-  requires += dds4ccm_ndds
-
-  Source_Files {
-    NDDS_Latency_Sender.cpp
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp
deleted file mode 100644
index 23ea9a9e5f6..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp
+++ /dev/null
@@ -1,774 +0,0 @@
-#include "ace/Get_Opt.h"
-#include "ace/High_Res_Timer.h"
-#include "tao/ORB_Core.h"
-#include "ace/Timer_Queue.h"
-#include "ace/Timer_Heap.h"
-#include "ace/Reactor.h"
-#include "ace/Env_Value_T.h"
-#include "Latency_Base.h"
-#include "Latency_BaseSupport.h"
-#include "Latency_BasePlugin.h"
-#include "ace/Tokenizer_T.h"
-#include "ace/OS_NS_math.h"
-
-#include <ndds/ndds_namespace_cpp.h>
-
-// Forward declarations
-class WriteTicker;
-
-// Global variables
-CORBA::UShort iterations_ = 1000;
-CORBA::UShort datalen_ = 100;
-CORBA::UShort datalen_idx_ = 0;
-CORBA::UShort nr_of_runs_ = 10;
-CORBA::UShort sleep_ = 2;
-ACE_UINT64 tv_total_ = 0;
-ACE_UINT64 tv_max_ = 0;
-ACE_UINT64 tv_min_ = 0;
-CORBA::UShort count_ = 0;
-CORBA::UShort number_of_msg_ = 0;
-bool received_ = false;
-CORBA::Long seq_num_ = 0;
-CORBA::Double sigma_duration_squared_;
-ACE_UINT64 start_time_ = 0;
-ACE_UINT64 start_time_test_ = 0;
-ACE_UINT64 end_time_test_ = 0;
-
-ACE_UINT64 * duration_times_ = 0;
-CORBA::Short * datalen_range_ = 0;
-ACE_UINT64 clock_overhead_;
-
-ACE_UINT64 unexpected_count_ = 0;
-
-LatencyTest * instance_ = 0;
-
-LatencyTestDataWriter * test_data_writer_ = 0;
-
-const char * lib_name_  = 0;
-const char * prof_name_ = 0;
-
-CORBA::UShort domain_id_ = 0;
-CORBA::Boolean both_read_write_ = false;
-
-WriteTicker * ticker_ = 0;
-
-/* The listener of events and data from the middleware */
-class HelloListener: public DDSDataReaderListener
-{
-public:
-  void on_data_available(DDSDataReader *reader);
-};
-
-// since this one is also created in the dds4ccm wrapper, we need
-// to create one here as well.
-class DummyPublisherListener :
-  public DDSPublisherListener
-{
-public:
-  virtual void on_offered_deadline_missed (
-                        DDSDataWriter* writer,
-                        const DDS_OfferedDeadlineMissedStatus& status);
-  virtual void on_liveliness_lost(
-                        DDSDataWriter* writer,
-                        const DDS_LivelinessLostStatus& status);
-  virtual void on_offered_incompatible_qos(
-                        DDSDataWriter* writer,
-                        const DDS_OfferedIncompatibleQosStatus& status);
-  virtual void on_publication_matched(
-                        DDSDataWriter* writer,
-                        const DDS_PublicationMatchedStatus& status);
-  virtual void on_reliable_writer_cache_changed(
-                        DDSDataWriter* writer,
-                        const DDS_ReliableWriterCacheChangedStatus& status);
-  virtual void on_reliable_reader_activity_changed (
-                        DDSDataWriter* writer,
-                        const DDS_ReliableReaderActivityChangedStatus& status);
-};
-
-void DummyPublisherListener::on_offered_deadline_missed (
-                        DDSDataWriter* /*writer*/,
-                        const DDS_OfferedDeadlineMissedStatus& /*status*/)
-{
-  ACE_DEBUG ((LM_DEBUG, "on_offered_deadline_missed\n"));
-  ++unexpected_count_;
-}
-
-void DummyPublisherListener::on_liveliness_lost(
-                        DDSDataWriter* /*writer*/,
-                        const DDS_LivelinessLostStatus& /*status*/)
-{
-  ++unexpected_count_;
-}
-
-void DummyPublisherListener::on_offered_incompatible_qos(
-                        DDSDataWriter* /*writer*/,
-                        const DDS_OfferedIncompatibleQosStatus& /*status*/)
-{
-  ++unexpected_count_;
-}
-
-void DummyPublisherListener::on_publication_matched(
-                        DDSDataWriter* /*writer*/,
-                        const DDS_PublicationMatchedStatus& /*status*/)
-{
-  ++unexpected_count_;
-}
-
-void DummyPublisherListener::on_reliable_writer_cache_changed(
-                        DDSDataWriter* /*writer*/,
-                        const DDS_ReliableWriterCacheChangedStatus& /*status*/)
-{
-  ++unexpected_count_;
-}
-
-void DummyPublisherListener::on_reliable_reader_activity_changed (
-                        DDSDataWriter* /*writer*/,
-                        const DDS_ReliableReaderActivityChangedStatus& /*status*/)
-{
-  ++unexpected_count_;
-}
-
-
-/* The dummy listener of events and data from the middleware */
-class DummyListener: public DDSDataReaderListener
-{
-};
-
-class WriteTicker :public ACE_Event_Handler
-{
-  public:
-    WriteTicker (void);
-    int handle_timeout (const ACE_Time_Value &, const void *);
-};
-
-void
-split_qos (const char * qos)
-{
-  char* buf = ACE_OS::strdup (qos);
-  ACE_Tokenizer_T<char> tok (buf);
-  tok.delimiter_replace ('#', 0);
-  for (char *p = tok.next (); p; p = tok.next ())
-    {
-      if (!lib_name_)
-        {
-          lib_name_ = ACE_OS::strdup (p);
-        }
-      else if (!prof_name_)
-        {
-          prof_name_ = ACE_OS::strdup (p);
-        }
-    }
-  ACE_OS::free (buf);
-  ACE_DEBUG ((LM_DEBUG, "Sender : Found QoS profile %C %C\n",
-    lib_name_,
-    prof_name_));
-}
-
-int
-parse_args (int argc, ACE_TCHAR *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("b:d:i:s:q:O"));
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    {
-      switch (c)
-        {
-          case 'd':
-            domain_id_  = ACE_OS::atoi (get_opts.opt_arg ());
-            break;
-          case 'i':
-            iterations_ = ACE_OS::atoi (get_opts.opt_arg ());
-            break;
-          case 's':
-            sleep_ = ACE_OS::atoi (get_opts.opt_arg ());
-            break;
-          case 'b':
-            both_read_write_  = true;
-            break;
-          case 'q':
-            {
-               const char * qos = get_opts.opt_arg ();
-               split_qos (qos);
-            }
-            break;
-          case '?':
-          default:
-            ACE_ERROR_RETURN ((LM_ERROR,
-                                "usage:\n\n"
-                                "  -d <domain_id >\n"
-                                "  -i <iterations >\n"
-                                "  -s <sleep>\n"
-                                "  -q <QoS profile>\n"
-                                "  -b "
-                                "\n"),
-                              -1);
-        }
-    }
-  // Indicates successful parsing of the command line
-  return 0;
-}
-
-void
-calculate_clock_overhead (void)
-{
-  int num_of_loops_clock = 320;
-  ACE_UINT64 begin_time;
-  ACE_UINT64 clock_roundtrip_time;
-  ACE_High_Res_Timer::gettimeofday_hr ().to_usec (begin_time);
-  for (int i = 0; i < num_of_loops_clock; ++i)
-    {
-      ACE_High_Res_Timer::gettimeofday_hr ().to_usec (clock_roundtrip_time);
-    }
-  ACE_UINT64 const total_time = clock_roundtrip_time - begin_time;
-  clock_overhead_ = (ACE_UINT64) (total_time / num_of_loops_clock);
-}
-
-void
-stop (void)
-{
-  if (ticker_)
-    {
-      ACE_Reactor::instance ()->cancel_timer (ticker_);
-      delete ticker_;
-      ticker_ = 0;
-    }
-}
-
-void
-init_values (void)
-{
-  delete [] duration_times_;
-  duration_times_ = new ACE_UINT64[iterations_];
-  datalen_range_ = new CORBA::Short[nr_of_runs_];
-  int start = 16;
-  for(int i = 0; i < nr_of_runs_; i++)
-    {
-      datalen_range_[i] = start;
-      start = 2 * start;
-    }
-
-  datalen_ = datalen_range_[0];
-
-  // make instances of Topic
-  instance_->seq_num = 0;
-  instance_->data.length (datalen_);
-  calculate_clock_overhead ();
-}
-
-void
-record_time (ACE_UINT64 receive_time)
-{
-  ++count_;
-  ACE_UINT64 const interval = receive_time - start_time_;
-  ACE_UINT64 const duration = interval - clock_overhead_;
-  if (count_ > iterations_)
-    {
-      ACE_ERROR ((LM_ERROR, "ERROR: Internal error while getting more "
-                  "messages back as expected.\n"));
-    }
-  else
-    {
-      duration_times_[count_-1] = duration;
-      sigma_duration_squared_ += (double)duration * (double)duration;
-      tv_total_ += duration;
-      if (duration > tv_max_ || (tv_max_ == 0L))
-        {
-          tv_max_ = duration;
-        }
-      if (duration < tv_min_ || (tv_min_ == 0L))
-        {
-          tv_min_ = duration;
-        }
-    }
-}
-
-void
-reset_results (void)
-{
-  count_ = 0;
-  delete [] duration_times_;
-  duration_times_ = new ACE_UINT64[iterations_];
-  tv_total_ = 0L;
-  tv_max_ = 0L;
-  tv_min_ = 0L;
-  number_of_msg_ = 0;
-  received_ = false;
-  seq_num_ = 0;
-  sigma_duration_squared_ = 0;
-}
-
-static int compare_two_longs (const void * long1, const void * long2)
-{
-  return (int)((*(ACE_UINT64*)long1 - *(ACE_UINT64*)long2));
-}
-
-void
-calc_results()
-{
-  // Sort all duration times.
-  qsort(duration_times_,
-        count_,
-        sizeof(ACE_UINT64),
-        compare_two_longs);
-
-  // Show latency_50_percentile, latency_90_percentile,
-  // latency_99_percentile and latency_99.99_percentile.
-  // For example duration_times[per50] is the median i.e. 50% of the
-  // samples have a latency time  <=  duration_times[per50]
-  int per50 = count_/2;
-  int per90 = (int)(count_ * 0.90);
-  int per99 = (int)(count_ * 0.990);
-  int per9999 = (int)(count_ * 0.9999);
-
-  double avg = 0;
-  double roundtrip_time_std = 0;
-  if (count_ > 0)
-    {
-      avg = (double)(tv_total_ / count_);
-      // Calculate standard deviation.
-      roundtrip_time_std  = sqrt(
-        (sigma_duration_squared_ / (double)count_) -
-        (avg * avg));
-    }
-
-  // Show values as float, in order to be comparable with RTI performance test.
-  if (count_ > 0)
-    {
-      if (datalen_idx_ == 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-            "Collecting statistics on %d samples per message size.\n"
-            "This is the roundtrip time, *not* the one-way-latency\n"
-            "Clock overhead %d\n"
-            "bytes ,stdev us,ave us, min us, 50%% us, 90%% us, 99%% us, 99.99%%,"
-            " max us\n"
-            "------,-------,-------,-------,-------,-------,-------,-------,"
-            "-------\n", count_, clock_overhead_));
-        }
-      ACE_DEBUG ((LM_DEBUG,
-        "%6d,%7.1f,%7.1f,%7.1f,%7.1f,%7.1f,%7.1f,%7.1f,%7.1f\n",
-        datalen_,
-        roundtrip_time_std,
-        avg,
-        (double)tv_min_,
-        (double)duration_times_[per50-1],
-        (double)duration_times_[per90-1],
-        (double)duration_times_[per99-1],
-        (double)duration_times_[per9999-1],
-        (double)tv_max_));
-    }
-  else
-    {
-      ACE_ERROR ((LM_ERROR, "SUMMARY SENDER latency time:\n "
-                          "No samples reveived back.\n"));
-    }
-}
-
-
-void
-write_one (void)
-{
-  if ((number_of_msg_ == 0) && (datalen_idx_ == 0))
-    {
-      ACE_High_Res_Timer::gettimeofday_hr ().to_usec (start_time_test_);
-    }
-  // First message sent always, next messages only as previous sent message
-  // is received back.
-  if ((number_of_msg_ == 0) || received_)
-    {
-      // All messages send, stop timer.
-      if ((iterations_ != 0) &&
-          (number_of_msg_ >= iterations_ ))
-        {
-          if (datalen_idx_ >= (nr_of_runs_ - 1))
-            {
-              stop();
-              calc_results();
-              ACE_High_Res_Timer::gettimeofday_hr ().to_usec (end_time_test_);
-              ACE_Reactor::instance ()->end_reactor_event_loop ();
-            }
-          else
-            {
-              calc_results();
-              reset_results();
-              ++datalen_idx_;
-              datalen_ = datalen_range_[datalen_idx_];
-              instance_->data.length (datalen_);
-            }
-        }
-      else
-        {
-          try
-            {
-              instance_->seq_num =  number_of_msg_;
-              // Keep last sent seq_num, to control if message is sent back.
-              seq_num_ = number_of_msg_;
-              received_ = false;
-              ACE_High_Res_Timer::gettimeofday_hr ().to_usec (start_time_);
-              test_data_writer_->write (*instance_, DDS_HANDLE_NIL);
-            }
-          catch (const ::CORBA::Exception& )
-            {
-              ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                          ACE_TEXT ("while writing sample with sequence_number <%u>.\n"),
-                          instance_->seq_num));
-            }
-          ++number_of_msg_;
-        }
-    }
-}
-
-void start (void)
-{
-  ticker_ = new WriteTicker();
-
-  // This->sleep_ is in ms
-  unsigned int sec = sleep_/1000;
-  unsigned int usec = (sleep_ % 1000) * 1000;
-  if (ACE_Reactor::instance ()->schedule_timer (
-                  ticker_,
-                  0,
-                  ACE_Time_Value (5, 0),
-                  ACE_Time_Value (sec, usec)) == -1)
-    {
-      ACE_ERROR ((LM_ERROR, ACE_TEXT ("start : ")
-                            ACE_TEXT ("Error scheduling timer")));
-    }
-  ACE_Reactor::instance ()->run_reactor_event_loop ();
-}
-
-void
-read (LatencyTest & an_instance, ACE_UINT64 receive_time)
-{
-  if (an_instance.seq_num == seq_num_)
-    {
-      record_time (receive_time);
-      received_ = true;
-    }
-}
-
-int ACE_TMAIN(int argc, ACE_TCHAR* argv[])
-{
-  DDS_ReturnCode_t retcode;
-  ::DDS::DataReader * data_reader = 0;
-  ::DDS::DataReader * dum_data_reader = 0;
-
-  HelloListener listener;
-  DummyListener dum_listener;
-  const char * type_name = 0;
-  int main_result = 1; /* error by default */
-
-  ::DDS::Topic * receive_topic = 0;
-  ::DDS::Topic * send_topic = 0;
-  ::DDS::DataWriter * data_writer = 0;
-  ::DDS::DataWriter * dum_data_writer = 0;
-  DummyPublisherListener * pub_listener = 0;
-  ::DDS::Publisher * pub = 0;
-
-  typedef ACE_Timer_Heap_T<ACE_Event_Handler *,
-                           ACE_Event_Handler_Handle_Timeout_Upcall,
-                           ACE_SYNCH_RECURSIVE_MUTEX,
-                           ACE_HR_Time_Policy> timer_queue_type;
-  timer_queue_type hr_timer_q_;
-
-  try
-    {
-      ACE_Env_Value<int> id (ACE_TEXT("DDS4CCM_DEFAULT_DOMAIN_ID"), domain_id_);
-      domain_id_ = id;
-
-      if (parse_args (argc, argv) != 0)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("Error arguments.\n")));
-          return 1;
-        }
-
-      (void) ACE_High_Res_Timer::global_scale_factor ();
-      ACE_Reactor::instance ()->timer_queue(&hr_timer_q_);
-
-      /* Create the domain participant */
-      DDSDomainParticipant * participant =
-                              DDSDomainParticipantFactory::get_instance()->
-                              create_participant_with_profile(
-                                  domain_id_,
-                                  lib_name_,
-                                  prof_name_,
-                                  0,
-                                  DDS_STATUS_MASK_NONE);
-      if (!participant)
-        {
-          ACE_ERROR ((LM_ERROR,
-                        ACE_TEXT ("Sender : Unable to create domain participant.\n")));
-          goto clean_exit;
-        }
-
-      /* Register type before creating topic */
-      type_name = LatencyTestTypeSupport::get_type_name();
-      retcode = LatencyTestTypeSupport::register_type (participant,
-                                                      type_name);
-      if (retcode != DDS_RETCODE_OK)
-        {
-          goto clean_exit;
-        }
-
-      send_topic = participant->create_topic_with_profile (
-                                                            "send",
-                                                            type_name,
-                                                            lib_name_,
-                                                            prof_name_,
-                                                            0,
-                                                            DDS_STATUS_MASK_NONE);
-      if (!send_topic)
-        {
-          ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create topic.\n")));
-          goto clean_exit;
-        }
-
-      receive_topic = participant->create_topic_with_profile (
-                                                            "receive",
-                                                            type_name,
-                                                            lib_name_,
-                                                            prof_name_,
-                                                            0,
-                                                            DDS_STATUS_MASK_NONE);
-      if (!receive_topic)
-        {
-          ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create topic.\n")));
-          goto clean_exit;
-        }
-
-      pub_listener = new DummyPublisherListener ();
-      pub = participant->create_publisher_with_profile (
-                                              lib_name_,
-                                              prof_name_,
-                                              0,
-                                              DDS_STATUS_MASK_NONE);
-
-      if (!pub) {
-          ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create publisher.\n")));
-          goto clean_exit;
-      }
-
-      /* Create the data writer using the publisher */
-      data_writer = pub->create_datawriter_with_profile(
-                                              send_topic,
-                                              lib_name_,
-                                              prof_name_,
-                                              pub_listener,
-                                              DDS_OFFERED_DEADLINE_MISSED_STATUS |
-                                              DDS_OFFERED_INCOMPATIBLE_QOS_STATUS |
-                                              DDS_RELIABLE_WRITER_CACHE_CHANGED_STATUS |
-                                              DDS_RELIABLE_READER_ACTIVITY_CHANGED_STATUS |
-                                              DDS_LIVELINESS_LOST_STATUS |
-                                              DDS_PUBLICATION_MATCHED_STATUS);
-
-      if (!data_writer)
-        {
-          ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create data writer.\n")));
-          goto clean_exit;
-        }
-
-      /* Create a data reader, which will not be used, but is there for
-      *  compatibility with DDS4CCM latency test, where there is always a
-      *  reader and a writer per connector.
-      */
-      if (both_read_write_)
-        {
-          dum_data_reader = participant->create_datareader_with_profile(
-                                                  send_topic,
-                                                  lib_name_,
-                                                  prof_name_,
-                                                  &dum_listener,
-                                                  DDS_DATA_AVAILABLE_STATUS);
-
-        if (!dum_data_reader )
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create dummy data reader.\n")));
-            goto clean_exit;
-          }
-        }
-
-      data_reader = participant->create_datareader_with_profile(
-                                                  receive_topic,
-                                                  lib_name_,
-                                                  prof_name_,
-                                                  &listener,
-                                                  DDS_DATA_AVAILABLE_STATUS);
-      if (!data_reader)
-        {
-          ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create data reader.\n")));
-          goto clean_exit;
-        }
-
-      /* Create a data writer, which will not be used, but is there for
-      *   compatibility with DDS4CCM latency test, where there is always a
-      *  reader and a writer per connector
-      */
-      if (both_read_write_)
-        {
-          dum_data_writer = participant->create_datawriter_with_profile(
-                                    receive_topic,
-                                      lib_name_,
-                                      prof_name_,
-                                      0,
-                                      DDS_STATUS_MASK_NONE);
-          if (!dum_data_writer)
-            {
-              ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create dummy data writer.\n")));
-              goto clean_exit;
-            }
-        }
-
-      /* Create data sample for writing */
-      instance_ = LatencyTestTypeSupport::create_data ();
-      if (instance_ == 0)
-        {
-          ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create data sample.\n")));
-          goto clean_exit;
-        }
-
-      init_values();
-
-      test_data_writer_ = LatencyTestDataWriter::narrow (data_writer);
-      if (!test_data_writer_)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("LatencyTestDataWriter_narrow failed.\n")));
-          goto clean_exit;
-        }
-
-      // Sleep a couple seconds to allow discovery to happen
-      ACE_OS::sleep (5);
-
-      // handle writing of messages
-      start();
-
-      /* --- Clean Up --- */
-      ACE_OS::sleep (5);
-      main_result = 0;
-
-  clean_exit:
-      const char * read_write_str;
-      if (both_read_write_)
-        {
-          read_write_str = "Used a extra dummy reader and writer per topic.";
-        }
-      else
-        {
-          read_write_str = "Used a reader for one topic and a writer for other topic.";
-        }
-
-      if((nr_of_runs_ -1) != datalen_idx_)
-        {
-          ACE_DEBUG ((LM_DEBUG, "SUMMARY SENDER : %u of %u runs completed.\n"
-                              " Number of messages sent of last run (%u): %u\n"
-                              "%C\n\n",
-                              datalen_idx_,
-                              nr_of_runs_,
-                              datalen_idx_ + 1,
-                              number_of_msg_,
-                              read_write_str));
-        }
-      else
-        {
-          ACE_UINT64 test_time_usec = end_time_test_ - start_time_test_;
-
-          double sec = (double)test_time_usec / (1000 * 1000);
-          ACE_DEBUG ((LM_DEBUG, "TEST successful, number of runs (%u) of "
-                                "%u messages in %3.3f seconds.\n"
-                                "%C\n\n",
-                                nr_of_runs_,
-                                number_of_msg_,
-                                sec,
-                                read_write_str));
-        }
-      ACE_DEBUG ((LM_DEBUG, "\tNumber of unexpected events : %u\n",
-                    unexpected_count_));
-      if (participant)
-        {
-          retcode = participant->delete_contained_entities ();
-          if (retcode != DDS_RETCODE_OK)
-            {
-              ACE_ERROR ((LM_ERROR, ACE_TEXT ("Deletion failed.\n")));
-              main_result = 1;
-            }
-          retcode = DDSDomainParticipantFactory::get_instance()->
-                          delete_participant (participant);
-          if (retcode != DDS_RETCODE_OK)
-            {
-              ACE_ERROR ((LM_ERROR, ACE_TEXT ("Deletion failed.\n")));
-              main_result = 1;
-            }
-        }
-    }
-  catch (const ::CORBA::Exception &ex)
-    {
-      ex._tao_print_exception("ERROR : Unexpected CORBA exception caught :");
-      main_result = 1;
-    }
-  delete [] datalen_range_;
-  delete [] duration_times_;
-  delete pub_listener;
-  DDSDomainParticipantFactory::finalize_instance ();
-  ACE_Reactor::instance ()->timer_queue(0);
-  return main_result;
-}
-
-void HelloListener::on_data_available(DDSDataReader *reader)
-{
-  LatencyTestDataReader * test_reader =
-                            LatencyTestDataReader::narrow (reader);
-  if (!test_reader)
-    {
-      /* In this specific case, this will never fail */
-      ACE_ERROR ((LM_ERROR,
-                ACE_TEXT ("LatencyTestDataReader::narrow failed.\n")));
-      return;
-    }
-
-  /* Loop until there are messages available in the queue */
-  for(;;)
-    {
-      ::DDS::SampleInfoSeq info;
-      ::LatencyTestRTISeq sample_req;
-      ::DDS::ReturnCode_t const retcode = test_reader->take(sample_req, info);
-      if (retcode == DDS_RETCODE_NO_DATA)
-        {
-          /*  No more samples */
-          break;
-        }
-      else if (retcode != DDS_RETCODE_OK)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("Unable to take data from data reader,"
-                                " error %d.\n"),
-                                retcode));
-          return;
-        }
-      for (::DDS_Long i = 0; i < sample_req.length (); ++i)
-        {
-          if (info[i].valid_data)
-            {
-              ACE_UINT64 receive_time = 0;
-              ACE_High_Res_Timer::gettimeofday_hr ().to_usec (receive_time);
-              read(sample_req[i], receive_time);
-            }
-        }
-      (void) test_reader->return_loan (sample_req, info);
-    }
-}
-
-//============================================================
-// WriteTickerHandler
-//============================================================
-WriteTicker::WriteTicker ()
-{
-}
-
-int
-WriteTicker::handle_timeout (const ACE_Time_Value &, const void *)
-{
-  write_one();
-  return 0;
-}
diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/NDDS_Latency_Sender.cpp b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/NDDS_Latency_Sender.cpp
deleted file mode 100644
index 752f1971d50..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/NDDS_Latency_Sender.cpp
+++ /dev/null
@@ -1,715 +0,0 @@
-#include "ace/Get_Opt.h"
-#include "tao/ORB_Core.h"
-#include "ace/Env_Value_T.h"
-#include "Latency_Base.h"
-#include "Latency_BaseSupport.h"
-#include "Latency_BasePlugin.h"
-#include "ace/Tokenizer_T.h"
-#include "ace/OS_NS_math.h"
-
-#include <ndds/ndds_namespace_cpp.h>
-#include <ndds/ndds_cpp.h>
-#include <ndds/clock/clock_highResolution.h>
-
-// Global variables
-CORBA::UShort iterations_ = 1000;
-CORBA::UShort datalen_ = 100;
-CORBA::UShort datalen_idx_ = 0;
-CORBA::UShort nr_of_runs_ = 10;
-CORBA::UShort sleep_ = 2;
-ACE_UINT64 tv_total_ = 0;
-ACE_UINT64 tv_max_ = 0;
-ACE_UINT64 tv_min_ = 0;
-CORBA::UShort count_ = 0;
-CORBA::UShort number_of_msg_ = 0;
-bool received_ = false;
-CORBA::Long seq_num_ = 0;
-CORBA::Double sigma_duration_squared_;
-struct RTINtpTime start_time_;
-
-ACE_UINT64 * duration_times_ = 0;
-CORBA::Short * datalen_range_ = 0;
-ACE_UINT64 clock_overhead_;
-RTIClock *timer = 0;
-LatencyTest * instance_ = 0;
-
-ACE_UINT64 unexpected_count_ = 0;
-
-LatencyTestDataWriter * test_data_writer_ = 0;
-
-const char * lib_name_  = 0;
-const char * prof_name_ = 0;
-
-CORBA::UShort domain_id_ = 0;
-CORBA::Boolean both_read_write_ = false;
-
-/* The listener of events and data from the middleware */
-class HelloListener: public DDSDataReaderListener
-{
-public:
-  void on_data_available(DDSDataReader *reader);
-};
-
-/* The dummy listener of events and data from the middleware */
-class DummyListener: public DDSDataReaderListener
-{
-};
-
-// since this one is also created in the dds4ccm wrapper, we need
-// to create one here as well.
-class DummyPublisherListener :
-  public DDSPublisherListener
-{
-public:
-  virtual void on_offered_deadline_missed (
-                        DDSDataWriter* writer,
-                        const DDS_OfferedDeadlineMissedStatus& status);
-  virtual void on_liveliness_lost(
-                        DDSDataWriter* writer,
-                        const DDS_LivelinessLostStatus& status);
-  virtual void on_offered_incompatible_qos(
-                        DDSDataWriter* writer,
-                        const DDS_OfferedIncompatibleQosStatus& status);
-  virtual void on_publication_matched(
-                        DDSDataWriter* writer,
-                        const DDS_PublicationMatchedStatus& status);
-  virtual void on_reliable_writer_cache_changed(
-                        DDSDataWriter* writer,
-                        const DDS_ReliableWriterCacheChangedStatus& status);
-  virtual void on_reliable_reader_activity_changed (
-                        DDSDataWriter* writer,
-                        const DDS_ReliableReaderActivityChangedStatus& status);
-};
-
-void DummyPublisherListener::on_offered_deadline_missed (
-                        DDSDataWriter* /*writer*/,
-                        const DDS_OfferedDeadlineMissedStatus& /*status*/)
-{
-  ACE_DEBUG ((LM_DEBUG, "on_offered_deadline_missed\n"));
-  ++unexpected_count_;
-}
-
-void DummyPublisherListener::on_liveliness_lost(
-                        DDSDataWriter* /*writer*/,
-                        const DDS_LivelinessLostStatus& /*status*/)
-{
-  ++unexpected_count_;
-}
-
-void DummyPublisherListener::on_offered_incompatible_qos(
-                        DDSDataWriter* /*writer*/,
-                        const DDS_OfferedIncompatibleQosStatus& /*status*/)
-{
-  ++unexpected_count_;
-}
-
-void DummyPublisherListener::on_publication_matched(
-                        DDSDataWriter* /*writer*/,
-                        const DDS_PublicationMatchedStatus& /*status*/)
-{
-  ++unexpected_count_;
-}
-
-void DummyPublisherListener::on_reliable_writer_cache_changed(
-                        DDSDataWriter* /*writer*/,
-                        const DDS_ReliableWriterCacheChangedStatus& /*status*/)
-{
-  ++unexpected_count_;
-}
-
-void DummyPublisherListener::on_reliable_reader_activity_changed (
-                        DDSDataWriter* /*writer*/,
-                        const DDS_ReliableReaderActivityChangedStatus& /*status*/)
-{
-  ++unexpected_count_;
-}
-
-void
-split_qos (const char * qos)
-{
-  char* buf = ACE_OS::strdup (qos);
-  ACE_Tokenizer_T<char> tok (buf);
-  tok.delimiter_replace ('#', 0);
-  for (char *p = tok.next (); p; p = tok.next ())
-    {
-      if (!lib_name_)
-        {
-          lib_name_ = ACE_OS::strdup (p);
-        }
-      else if (!prof_name_)
-        {
-          prof_name_ = ACE_OS::strdup (p);
-        }
-    }
-  ACE_OS::free (buf);
-  ACE_DEBUG ((LM_DEBUG, "Sender : Found QoS profile %C %C\n",
-    lib_name_,
-    prof_name_));
-}
-
-int
-parse_args (int argc, ACE_TCHAR *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("b:d:i:s:q:O"));
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    {
-      switch (c)
-        {
-          case 'd':
-            domain_id_  = ACE_OS::atoi (get_opts.opt_arg ());
-            break;
-          case 'i':
-            iterations_ = ACE_OS::atoi (get_opts.opt_arg ());
-            break;
-          case 's':
-            sleep_ = ACE_OS::atoi (get_opts.opt_arg ());
-            break;
-          case 'b':
-            both_read_write_  = true;
-            break;
-          case 'q':
-            {
-               const char * qos = get_opts.opt_arg ();
-               split_qos (qos);
-            }
-            break;
-          case '?':
-          default:
-            ACE_ERROR_RETURN ((LM_ERROR,
-                                "usage:\n\n"
-                                "  -d <domain_id >\n"
-                                "  -i <iterations >\n"
-                                "  -s <sleep>\n"
-                                "  -q <QoS profile>\n"
-                                "  -b "
-                                "\n"),
-                              -1);
-        }
-    }
-  // Indicates successful parsing of the command line
-  return 0;
-}
-
-void
-calculate_clock_overhead (void)
-{
-  int num_of_loops_clock = 320;
-  struct RTINtpTime begin_time = RTI_NTP_TIME_ZERO;
-  struct RTINtpTime clock_roundtrip_time = RTI_NTP_TIME_ZERO;
-
-  timer->getTime(timer, &begin_time);
-  for (int i = 0; i < num_of_loops_clock; ++i) {
-      timer->getTime(timer, &clock_roundtrip_time);
-  }
-  RTINtpTime_decrement(clock_roundtrip_time, begin_time);
-  clock_overhead_ = (ACE_UINT64)(1E6 * RTINtpTime_toDouble(&clock_roundtrip_time) /
-      (double)num_of_loops_clock);
-}
-
-void
-init_values (void)
-{
-  delete [] duration_times_;
-  duration_times_ = new ACE_UINT64[iterations_];
-  datalen_range_ = new CORBA::Short[nr_of_runs_];
-  int start = 16;
-  for(int i = 0; i < nr_of_runs_; i++)
-    {
-      datalen_range_[i] = start;
-      start = 2 * start;
-    }
-
-  datalen_ = datalen_range_[0];
-
-  // make instances of Topic
-  instance_->seq_num = 0;
-  instance_->data.length (datalen_);
-  calculate_clock_overhead ();
-}
-
-void
-record_time (struct RTINtpTime& receive_time)
-{
-  ++count_;
-  RTINtpTime roundtrip = {0,0};
-  RTINtpTime_subtract(roundtrip, receive_time, start_time_);
-  ACE_UINT64 duration =
-    (ACE_UINT64)(1E6 * RTINtpTime_toDouble(&roundtrip));// - _clock_overhead;
-
-  if (count_ > iterations_)
-    {
-      ACE_ERROR ((LM_ERROR, "ERROR: Internal error while getting more "
-                  "messages back as expected.\n"));
-    }
-  else
-    {
-      duration_times_[count_-1] = duration;
-      sigma_duration_squared_ += (double)duration * (double)duration;
-      tv_total_ += duration;
-      if (duration > tv_max_ || (tv_max_ == 0L))
-        {
-          tv_max_ = duration;
-        }
-      if (duration < tv_min_ || (tv_min_ == 0L))
-        {
-          tv_min_ = duration;
-        }
-    }
-}
-
-void
-reset_results (void)
-{
-  count_ = 0;
-  delete [] duration_times_;
-  duration_times_ = new ACE_UINT64[iterations_];
-  tv_total_ = 0L;
-  tv_max_ = 0L;
-  tv_min_ = 0L;
-  number_of_msg_ = 0;
-  received_ = false;
-  seq_num_ = 0;
-  sigma_duration_squared_ = 0;
-}
-
-static int compare_two_longs (const void * long1, const void * long2)
-{
-  return (int)((*(ACE_UINT64*)long1 - *(ACE_UINT64*)long2));
-}
-
-void
-calc_results()
-{
-  // Sort all duration times.
-  qsort(duration_times_,
-        count_,
-        sizeof(ACE_UINT64),
-        compare_two_longs);
-
-  // Show latency_50_percentile, latency_90_percentile,
-  // latency_99_percentile and latency_99.99_percentile.
-  // For example duration_times[per50] is the median i.e. 50% of the
-  // samples have a latency time  <=  duration_times[per50]
-  int per50 = count_/2;
-  int per90 = (int)(count_ * 0.90);
-  int per99 = (int)(count_ * 0.990);
-  int per9999 = (int)(count_ * 0.9999);
-
-  double avg = 0;
-  double roundtrip_time_std = 0;
-  if (count_ > 0)
-    {
-      avg = (double)(tv_total_ / count_);
-      // Calculate standard deviation.
-      roundtrip_time_std  = sqrt(
-        (sigma_duration_squared_ / (double)count_) -
-        (avg * avg));
-    }
-
-  // Show values as float, in order to be comparable with RTI performance test.
-  if (count_ > 0)
-    {
-      if (datalen_idx_ == 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-            "Collecting statistics on %d samples per message size.\n"
-            "This is the roundtrip time, *not* the one-way-latency\n"
-            "Clock overhead %d\n"
-            "bytes ,stdev us,ave us, min us, 50%% us, 90%% us, 99%% us, 99.99%%,"
-            " max us\n"
-            "------,-------,-------,-------,-------,-------,-------,-------,"
-            "-------\n", count_, clock_overhead_));
-        }
-      ACE_DEBUG ((LM_DEBUG,
-        "%6d,%7.1f,%7.1f,%7.1f,%7.1f,%7.1f,%7.1f,%7.1f,%7.1f\n",
-        datalen_,
-        roundtrip_time_std,
-        avg,
-        (double)tv_min_,
-        (double)duration_times_[per50-1],
-        (double)duration_times_[per90-1],
-        (double)duration_times_[per99-1],
-        (double)duration_times_[per9999-1],
-        (double)tv_max_));
-    }
-  else
-    {
-      ACE_ERROR ((LM_ERROR, "SUMMARY SENDER latency time:\n "
-                          "No samples reveived back.\n"));
-    }
-}
-
-
-bool
-write_one (void)
-{
-  // First message sent always, next messages only as previous sent message
-  // is received back.
-  if ((number_of_msg_ == 0) || received_)
-    {
-      // All messages send, stop timer.
-      if ((iterations_ != 0) &&
-          (number_of_msg_ >= iterations_ ))
-        {
-          if (datalen_idx_ >= (nr_of_runs_ - 1))
-            {
-              calc_results();
-              return true;
-            }
-          else
-            {
-              calc_results();
-              reset_results();
-              ++datalen_idx_;
-              datalen_ = datalen_range_[datalen_idx_];
-              instance_->data.length (datalen_);
-            }
-        }
-      else
-        {
-          try
-            {
-              instance_->seq_num =  number_of_msg_;
-              // Keep last sent seq_num, to control if message is sent back.
-              seq_num_ = number_of_msg_;
-              received_ = false;
-              RTINtpTime_setZero(&start_time_);
-              timer->getTime(timer, &start_time_);
-              test_data_writer_->write (*instance_, DDS_HANDLE_NIL);
-            }
-          catch (const CORBA::Exception& )
-            {
-              ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                          ACE_TEXT ("while writing sample with sequence_number <%u>.\n"),
-                          instance_->seq_num));
-            }
-          ++number_of_msg_;
-        }
-    }
-  return false;
-}
-
-void start (void)
-{
-  unsigned int sec = sleep_/1000;
-  unsigned int usec = (sleep_ % 1000) * 1000;
-
-  while (!write_one())
-   {
-      ACE_Time_Value sleeptime (sec, usec);
-      ACE_OS::sleep (sleeptime);
-   }
-}
-
-void
-read (LatencyTest & an_instance, struct RTINtpTime& receive_time)
-{
-  if (an_instance.seq_num == seq_num_)
-    {
-      record_time (receive_time);
-      received_ = true;
-    }
-}
-
-int ACE_TMAIN(int argc, ACE_TCHAR* argv[])
-{
-  timer = RTIHighResolutionClock_new();
-  DDS_ReturnCode_t retcode;
-  ::DDS::DataReader * data_reader = 0;
-  ::DDS::DataReader * dum_data_reader = 0;
-
-  HelloListener listener;
-  DummyListener dum_listener;
-  const char * type_name = 0;
-  int main_result = 1; /* error by default */
-
-  ::DDS::Topic * receive_topic = 0;
-  ::DDS::Topic * send_topic = 0;
-  ::DDS::DataWriter * data_writer = 0;
-  ::DDS::DataWriter * dum_data_writer = 0;
-  DummyPublisherListener * pub_listener = 0;
-  ::DDS::Publisher * pub = 0;
-
-  try
-    {
-      ACE_Env_Value<int> id (ACE_TEXT("DDS4CCM_DEFAULT_DOMAIN_ID"), domain_id_);
-      domain_id_ = id;
-
-      if (parse_args (argc, argv) != 0)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("Error arguments.\n")));
-          return 1;
-        }
-
-      /* Create the domain participant */
-      DDSDomainParticipant * participant =
-                              DDSDomainParticipantFactory::get_instance()->
-                              create_participant_with_profile(
-                                  domain_id_,
-                                  lib_name_,
-                                  prof_name_,
-                                  0,
-                                  DDS_STATUS_MASK_NONE);
-      if (!participant)
-        {
-          ACE_ERROR ((LM_ERROR,
-                        ACE_TEXT ("Sender : Unable to create domain participant.\n")));
-          goto clean_exit;
-        }
-
-      /* Register type before creating topic */
-      type_name = LatencyTestTypeSupport::get_type_name();
-      retcode = LatencyTestTypeSupport::register_type (participant,
-                                                      type_name);
-      if (retcode != DDS_RETCODE_OK)
-        {
-          goto clean_exit;
-        }
-
-      send_topic = participant->create_topic_with_profile (
-                                                            "send",
-                                                            type_name,
-                                                            lib_name_,
-                                                            prof_name_,
-                                                            0,
-                                                            DDS_STATUS_MASK_NONE);
-      if (!send_topic)
-        {
-          ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create topic.\n")));
-          goto clean_exit;
-        }
-
-      receive_topic = participant->create_topic_with_profile (
-                                                            "receive",
-                                                            type_name,
-                                                            lib_name_,
-                                                            prof_name_,
-                                                            0,
-                                                            DDS_STATUS_MASK_NONE);
-      if (!receive_topic)
-        {
-          ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create topic.\n")));
-          goto clean_exit;
-        }
-
-      pub_listener = new DummyPublisherListener ();
-      pub = participant->create_publisher_with_profile (
-                                                lib_name_,
-                                                prof_name_,
-                                                0,
-                                                DDS_STATUS_MASK_NONE);
-
-      if (!pub)
-        {
-          ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create publisher.\n")));
-          goto clean_exit;
-        }
-
-      /* Create the data writer using the publisher */
-      data_writer = pub->create_datawriter_with_profile(
-                                                send_topic,
-                                                lib_name_,
-                                                prof_name_,
-                                                pub_listener,
-                                                DDS_OFFERED_DEADLINE_MISSED_STATUS |
-                                                DDS_OFFERED_INCOMPATIBLE_QOS_STATUS |
-                                                DDS_RELIABLE_WRITER_CACHE_CHANGED_STATUS |
-                                                DDS_RELIABLE_READER_ACTIVITY_CHANGED_STATUS |
-                                                DDS_LIVELINESS_LOST_STATUS |
-                                                DDS_PUBLICATION_MATCHED_STATUS);
-      if (!data_writer)
-        {
-          ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create data writer.\n")));
-          goto clean_exit;
-        }
-
-      /* Create a data reader, which will not be used, but is there for
-      *  compatibility with DDS4CCM latency test, where there is always a
-      *  reader and a writer per connector.
-      */
-      if (both_read_write_)
-        {
-          dum_data_reader = participant->create_datareader_with_profile(
-                                                  send_topic,
-                                                  lib_name_,
-                                                  prof_name_,
-                                                  &dum_listener,
-                                                  DDS_DATA_AVAILABLE_STATUS);
-
-          if (!dum_data_reader )
-            {
-              ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create dummy data reader.\n")));
-              goto clean_exit;
-            }
-        }
-
-      data_reader = participant->create_datareader_with_profile(
-                                                  receive_topic,
-                                                  lib_name_,
-                                                  prof_name_,
-                                                  &listener,
-                                                  DDS_DATA_AVAILABLE_STATUS);
-      if (!data_reader)
-        {
-          ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create data reader.\n")));
-          goto clean_exit;
-        }
-
-      /* Create a data writer, which will not be used, but is there for
-      *   compatibility with DDS4CCM latency test, where there is always a
-      *  reader and a writer per connector
-      */
-      if (both_read_write_)
-        {
-          dum_data_writer = participant->create_datawriter_with_profile(
-                                    receive_topic,
-                                      lib_name_,
-                                      prof_name_,
-                                      0,
-                                      DDS_STATUS_MASK_NONE);
-          if (!dum_data_writer)
-            {
-              ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create dummy data writer.\n")));
-              goto clean_exit;
-            }
-        }
-
-      /* Create data sample for writing */
-      instance_ = LatencyTestTypeSupport::create_data ();
-      if (instance_ == 0)
-        {
-          ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create data sample.\n")));
-          goto clean_exit;
-        }
-
-      init_values();
-
-      test_data_writer_ = LatencyTestDataWriter::narrow (data_writer);
-      if (!test_data_writer_)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("LatencyTestDataWriter_narrow failed.\n")));
-          goto clean_exit;
-        }
-
-      // Sleep a couple seconds to allow discovery to happen
-      ACE_OS::sleep (5);
-
-      // handle writing of messages
-      start();
-
-      /* --- Clean Up --- */
-      ACE_OS::sleep (5);
-      main_result = 0;
-
-  clean_exit:
-      const char * read_write_str = 0;
-      if (both_read_write_)
-        {
-          read_write_str = "Used a extra dummy reader and writer per topic.";
-        }
-      else
-        {
-          read_write_str = "Used a reader for one topic and a writer for other topic.";
-        }
-
-      if((nr_of_runs_ -1) != datalen_idx_)
-        {
-          ACE_DEBUG ((LM_DEBUG, "SUMMARY SENDER : %u of %u runs completed.\n"
-                              " Number of messages sent of last run (%u): %u\n"
-                              "%C\n\n",
-                              datalen_idx_,
-                              nr_of_runs_,
-                              datalen_idx_ + 1,
-                              number_of_msg_,
-                              read_write_str));
-        }
-      else
-        {
-          ACE_DEBUG ((LM_DEBUG, "TEST successful, number of runs (%u) of "
-                                "%u messages.\n"
-                                "%C\n\n",
-                                nr_of_runs_,
-                                number_of_msg_,
-                                read_write_str));
-        }
-      ACE_DEBUG ((LM_DEBUG, "\tNumber of unexpected events : %u\n",
-                    unexpected_count_));
-      if (participant)
-        {
-          retcode = participant->delete_contained_entities ();
-          if (retcode != DDS_RETCODE_OK)
-            {
-              ACE_ERROR ((LM_ERROR, ACE_TEXT ("Deletion failed.\n")));
-              main_result = 1;
-            }
-          retcode = DDSDomainParticipantFactory::get_instance()->
-                          delete_participant (participant);
-          if (retcode != DDS_RETCODE_OK)
-            {
-              ACE_ERROR ((LM_ERROR, ACE_TEXT ("Deletion failed.\n")));
-              main_result = 1;
-            }
-        }
-    }
-  catch (const ::CORBA::Exception &ex)
-    {
-      ex._tao_print_exception("ERROR : Unexpected CORBA exception caught :");
-      main_result = 1;
-    }
-
-  delete [] datalen_range_;
-  delete [] duration_times_;
-  delete pub_listener;
-
-  return main_result;
-}
-
-void HelloListener::on_data_available(DDSDataReader *reader)
-{
-  LatencyTestDataReader * test_reader =
-                            LatencyTestDataReader::narrow (reader);
-  if (!test_reader)
-    {
-      /* In this specific case, this will never fail */
-      ACE_ERROR ((LM_ERROR,
-                ACE_TEXT ("LatencyTestDataReader::narrow failed.\n")));
-      return;
-    }
-
-  /* Loop until there are messages available in the queue */
-  for(;;)
-    {
-      ::DDS::SampleInfoSeq info;
-      ::LatencyTestRTISeq sample_req;
-      ::DDS::ReturnCode_t const retcode = test_reader->take(sample_req, info);
-      if (retcode == DDS_RETCODE_NO_DATA)
-        {
-          /*  No more samples */
-          break;
-        }
-      else if (retcode != DDS_RETCODE_OK)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("Unable to take data from data reader,"
-                                " error %d.\n"),
-                                retcode));
-          return;
-        }
-      for (::DDS_Long i = 0; i < sample_req.length (); ++i)
-        {
-          if (info[i].valid_data)
-            {
-              struct RTINtpTime finish_time;
-              RTINtpTime_setZero(&finish_time);
-              timer->getTime(timer, &finish_time);
-              read(sample_req[i], finish_time);
-            }
-        }
-      (void) test_reader->return_loan (sample_req, info);
-    }
-}
-
diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index ed1ff76010e..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-    Description
-    XML QoS Profile
-
-    The QoS configuration of the DDS entities in the generated example is
-    loaded from this file.
-
-    This file is used only when it is in the current working directory
-    or when the environment variable
-    NDDS_QOS_PROFILES is defined and points to this file.
-
-    For more information about XML QoS Profiles see Chapter 15 in the
-    RTI Data Distribution Service user manual.
-    -->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:noNamespaceSchemaLocation="/home/ndds/ndds.4.5b/scripts/../resource/rtiddsgen/../qos_profiles_4.5b/schema/rti_dds_qos_profiles.xsd"
-     version="4.5b">
-
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-       A QoS library is a named set of QoS profiles.
-       -->
-  <qos_library name="Latency_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-         and DataReader created in the example code.
-
-         A QoS profile groups a set of related QoS.
-         -->
-    <qos_profile name="UDPv4QoS" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <participant_qos>
-        <receiver_pool>
-          <!-- (payload) 8192 + (est. overhead) 8 + 512 -->
-          <buffer_size>8712</buffer_size>
-        </receiver_pool>
-
-        <transport_builtin>
-          <mask>DDS_TRANSPORTBUILTIN_UDPv4</mask>
-        </transport_builtin>
-
-        <property>
-          <value>
-            <element>
-              <name>dds.transport.UDPv4.builtin.parent.message_size_max</name>
-              <value>8712</value></element>
-            <element>
-              <name>dds.transport.UDPv4.builtin.recv_socket_buffer_size</name>
-              <value>17424</value></element>
-            <element>
-              <name>dds.transport.UDPv4.builtin.send_socket_buffer_size</name>
-              <value>8712</value></element>
-          </value>
-        </property>
-      </participant_qos>
-
-      <datawriter_qos>
-        <reliability>
-          <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-        </reliability>
-        <history><kind>DDS_KEEP_LAST_HISTORY_QOS</kind>
-          <depth>1</depth>
-        </history>
-        <durability>
-          <kind>VOLATILE_DURABILITY_QOS</kind>
-        </durability>
-        <resource_limits>
-          <max_instances>1</max_instances>
-          <initial_instances>1</initial_instances>
-          <max_samples>3</max_samples>
-          <initial_samples>3</initial_samples>
-          <max_samples_per_instance>3</max_samples_per_instance>
-        </resource_limits>
-        <protocol>
-          <rtps_reliable_writer>
-            <!-- piggyback every sample -->
-            <heartbeats_per_max_samples>3</heartbeats_per_max_samples>
-            <max_nack_response_delay>
-              <sec>0</sec>
-              <nanosec>0</nanosec>
-            </max_nack_response_delay>
-            <!-- 1 year -->
-            <heartbeat_period>
-              <sec>604800</sec>
-              <nanosec>1000000</nanosec>
-            </heartbeat_period>
-            <!-- 1 ms -->
-            <fast_heartbeat_period>
-              <sec>0</sec>
-              <nanosec>1000000</nanosec>
-            </fast_heartbeat_period>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <datareader_qos>
-        <reliability>
-          <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>DDS_KEEP_LAST_HISTORY_QOS</kind>
-          <depth>1</depth>
-        </history>
-        <resource_limits>
-          <initial_samples>100</initial_samples>
-          <initial_instances>1</initial_instances>
-          <max_samples>LENGTH_UNLIMITED</max_samples>
-          <max_instances>1</max_instances>
-          <max_samples_per_instance>LENGTH_UNLIMITED</max_samples_per_instance>
-        </resource_limits>
-        <durability>
-          <kind>VOLATILE_DURABILITY_QOS</kind>
-          <direct_communication>true</direct_communication>
-        </durability>
-        <protocol>
-          <rtps_reliable_reader>
-            <max_heartbeat_response_delay>
-              <sec>0</sec>
-              <nanosec>0</nanosec>
-            </max_heartbeat_response_delay>
-          </rtps_reliable_reader>
-        </protocol>
-      </datareader_qos>
-    </qos_profile>
-
-    <qos_profile name="SharedMemQos" is_default_qos="false">
-      <participant_qos>
-        <transport_builtin>
-          <mask>DDS_TRANSPORTBUILTIN_SHMEM</mask>
-        </transport_builtin>
-        <receiver_pool>
-          <buffer_size>8712</buffer_size>
-        </receiver_pool>
-        <property>
-          <value>
-            <element>
-              <name>dds.transport.shmem.builtin.parent.message_size_max</name>
-              <value>8712</value>
-            </element>
-            <element>
-              <name>dds.transport.shmem.builtin.receive_buffer_size</name>
-              <value>17424</value>
-            </element>
-          </value>
-        </property>
-      </participant_qos>
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <durability>
-          <kind>VOLATILE_DURABILITY_QOS</kind>
-        </durability>
-        <resource_limits>
-          <max_instances>1</max_instances>
-          <initial_instances>1</initial_instances>
-          <max_samples>LENGTH_UNLIMITED</max_samples>
-          <initial_samples>100</initial_samples>
-          <max_samples_per_instance>LENGTH_UNLIMITED</max_samples_per_instance>
-        </resource_limits>
-      </datawriter_qos>
-      <datareader_qos>
-        <reliability>
-          <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-        </reliability>
-        <resource_limits>
-          <initial_samples>100</initial_samples>
-          <initial_instances>1</initial_instances>
-          <max_samples>LENGTH_UNLIMITED</max_samples>
-          <max_instances>1</max_instances>
-          <max_samples_per_instance>LENGTH_UNLIMITED</max_samples_per_instance>
-        </resource_limits>
-        <durability>
-          <kind>VOLATILE_DURABILITY_QOS</kind>
-          <direct_communication>true</direct_communication>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-
-  </qos_library>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/descriptors/run_test_dds.pl b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/descriptors/run_test_dds.pl
deleted file mode 100755
index 868093f722c..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/descriptors/run_test_dds.pl
+++ /dev/null
@@ -1,47 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-foreach $i (@ARGV) {
-    if ($i eq '-b') {
-        $rw_extra = '-b:';
-    }
-}
-
-$nr_runs = 2;
-@profiles = ("Latency_Library#UDPv4QoS", "Latency_Library#SharedMemQos");
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$DDS4CCM_ROOT = "$CIAO_ROOT/connectors/dds4ccm";
-
-$tg_sender = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-$tg_receiver = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-
-$tg_sender->AddLibPath ('../lib');
-$tg_receiver->AddLibPath ('../lib');
-
-sub run_tests {
-    for ($i = 0; $i < $nr_runs; ++$i) {
-        $qos = $profiles[$i];
-
-        print "Start receiver with QoS profile <$qos>\n";
-        $R = $tg_receiver->CreateProcess ("$DDS4CCM_ROOT/performance-tests/DDSLatency/DDS_Receiver/DDS_receiver", "-q $qos $rw_extra");
-
-        $R->Spawn();
-
-        print "Start sender with QoS profile <$qos>\n";
-        $S = $tg_sender->CreateProcess ("$DDS4CCM_ROOT/performance-tests/DDSLatency/DDS_Sender/DDS_Sender", "-q $qos $rw_extra");
-
-        $S->SpawnWaitKill ($tg_sender->ProcessStartWaitInterval () + 180);
-        $R->Kill ();
-    }
-}
-
-run_tests ();
-
-exit 0;
diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/descriptors/run_test_ndds.pl b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/descriptors/run_test_ndds.pl
deleted file mode 100755
index bf0c681d5d3..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/descriptors/run_test_ndds.pl
+++ /dev/null
@@ -1,47 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-foreach $i (@ARGV) {
-    if ($i eq '-b') {
-        $rw_extra = '-b:';
-    }
-}
-
-$nr_runs = 2;
-@profiles = ("Latency_Library#UDPv4QoS", "Latency_Library#SharedMemQos");
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$DDS4CCM_ROOT = "$CIAO_ROOT/connectors/dds4ccm";
-
-$tg_sender = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-$tg_receiver = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-
-$tg_sender->AddLibPath ('../lib');
-$tg_receiver->AddLibPath ('../lib');
-
-sub run_tests {
-    for ($i = 0; $i < $nr_runs; ++$i) {
-        $qos = $profiles[$i];
-
-        print "Start receiver with QoS profile <$qos>\n";
-        $R = $tg_receiver->CreateProcess ("$DDS4CCM_ROOT/performance-tests/DDSLatency/DDS_Receiver/DDS_receiver", "-q $qos $rw_extra");
-
-        $R->Spawn();
-
-        print "Start sender with QoS profile <$qos>\n";
-        $S = $tg_sender->CreateProcess ("$DDS4CCM_ROOT/performance-tests/DDSLatency/DDS_Sender/DDS_NDDS_Sender", "-q $qos $rw_extra");
-
-        $S->SpawnWaitKill ($tg_sender->ProcessStartWaitInterval () + 180);
-        $R->Kill ();
-    }
-}
-
-run_tests ();
-
-exit 0;
diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/.gitignore b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/Base/.gitignore b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/Base/.gitignore
deleted file mode 100644
index 6ca7ba5295d..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/Base/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/THROUGHPUT_Base_stub_export.h
-/Throughput_Base.cxx
-/Throughput_Base.h
-/Throughput_BasePlugin.cxx
-/Throughput_BasePlugin.h
-/Throughput_BaseSupport.cxx
-/Throughput_BaseSupport.h
diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/Base/Throughput_Base.idl b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/Base/Throughput_Base.idl
deleted file mode 100644
index b28bd3a61bd..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/Base/Throughput_Base.idl
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * @file Throughput_Base.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef THROUGHPUT_BASE_IDL
-#define THROUGHPUT_BASE_IDL
-
-const short MAX_DATA_SEQUENCE_LENGTH = 8192;
-
-typedef enum ThroughputCommandKind
-{
-    THROUGHPUT_COMMAND_IDLE,
-    THROUGHPUT_COMMAND_START,
-    THROUGHPUT_COMMAND_COMPLETE
-} CommandKind;
-
-typedef sequence<octet, MAX_DATA_SEQUENCE_LENGTH> OctetSeq;
-
-struct ThroughputTest {
- long key;
- unsigned long long seq_num;
- OctetSeq data;
- };
-
-struct ThroughputCommand
-{
-    CommandKind  command;
-    unsigned long data_length;
-    unsigned long long current_publisher_effort;
-    unsigned long long final_publisher_effort;
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/Base/Throughput_Base.mpc b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/Base/Throughput_Base.mpc
deleted file mode 100644
index 95f1b33ca8c..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/Base/Throughput_Base.mpc
+++ /dev/null
@@ -1,26 +0,0 @@
-project (DDS_Throughput_Base_stub_plain) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_Throughput_Base_stub
-  dynamicflags += THROUGHPUT_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  requires += dds4ccm_ndds
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=THROUGHPUT_BASE_STUB_Export \
-              -Wb,stub_export_include=THROUGHPUT_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    Throughput_Base.idl
-  }
-
-  opendds_ts_flags += --export=THROUGHPUT_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    Throughput_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/.gitignore b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/.gitignore
deleted file mode 100644
index a5f27931c30..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/DDS_receiver
diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/DDS_Receiver.mpc b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/DDS_Receiver.mpc
deleted file mode 100644
index 9197cbfc596..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/DDS_Receiver.mpc
+++ /dev/null
@@ -1,15 +0,0 @@
-project(*receiver_plain) : nddslib, acelib, taolib, typecode {
-  after += DDS_Throughput_Base_stub_plain
-  exename = DDS_receiver
-  libpaths += ../lib
-  libout = ../lib
-  includes += ../Base
-  libs  += DDS_Throughput_Base_stub
-
-  requires += dds4ccm_ndds
-
-  Source_Files {
-    Throughput_Receiver.cpp
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/Throughput_Receiver.cpp b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/Throughput_Receiver.cpp
deleted file mode 100644
index c9cd6162f2a..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/Throughput_Receiver.cpp
+++ /dev/null
@@ -1,397 +0,0 @@
-#include "ace/Get_Opt.h"
-#include "tao/ORB_Core.h"
-#include "ace/Env_Value_T.h"
-#include "ace/High_Res_Timer.h"
-#include "Throughput_Base.h"
-#include "Throughput_BaseSupport.h"
-#include "Throughput_BasePlugin.h"
-
-#include <ndds/ndds_namespace_cpp.h>
-
-bool shutdown_flag = false;
-
-CORBA::LongLong count_ = 0; // total count of all received messages
-ACE_UINT64 interval_time_ = 0;
-CORBA::LongLong interval_messages_received_ = 0;
-CORBA::LongLong interval_bytes_received_ = 0;
-CORBA::Long interval_data_length_ = 0;
-CORBA::UShort run_ = 0;
-ACE_UINT64 first_time_  = 0;
-CORBA::LongLong  messages_lost_ = 0;
-CORBA::Boolean logres = false;
-CORBA::ULongLong seq_num_ = 0;
-CORBA::LongLong demand_ = 0;
-
-ThroughputTest *instance =0;
-::DDS::Topic *topic = 0;
-::DDS::Topic *cmd_topic = 0;
-
-const char *lib_name = "HelloTest_Library";
-const char *cmd_prof_name = "ThroughputCmdQoS";
-const char *prof_name = "ThroughputQoS";
-const char *part_name = "ThroughputPartQoS";
-
-CORBA::UShort domain_id = 0;
-
-  int
-  parse_args (int argc, ACE_TCHAR *argv[])
-  {
-    ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("d:O"));
-    int c;
-
-    while ((c = get_opts ()) != -1)
-      switch (c)
-        {
-       case 'd':
-          domain_id  = ACE_OS::atoi (get_opts.opt_arg ());
-          break;
-       case '?':
-        default:
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "usage: %s "
-                             "-d <domain_id >"
-                             "\n",
-                             argv [0]),
-                            -1);
-        }
-    // Indicates successful parsing of the command line
-    return 0;
-  }
-
-/* The listener of events and data from the middleware */
-class HelloListener: public ::DDS::DataReaderListener {
-public:
-  void on_data_available(::DDS::DataReader *reader);
-};
-
-/* The listener of events and command data from the middleware */
-class CmdListener: public ::DDS::DataReaderListener {
-public:
-  void on_data_available(::DDS::DataReader *reader);
-};
-
-  void
-  show_results()
-  {
-    if ((count_ > 0) && (interval_time_ > 0))
-      {
-        double per_sec = (double)1000000/ interval_time_;
-        double mbps = (interval_bytes_received_* per_sec)* (8.0/1000.0/1000.0);
-
-        if(run_ == 1)
-          {
-             ACE_DEBUG((LM_DEBUG,
-                      " bytes, demand, samples,sample/s, Mbit/s,lost samples\n"
-                      "------,-------,-------,--------,-------,------------\n"
-                      "%6u,%7q,%7q,%7.1f,%7.1f,%7q\n",
-                      interval_data_length_,
-                      demand_,
-                      interval_messages_received_,
-                      interval_messages_received_* per_sec,
-                      mbps,
-                      messages_lost_));
-          }
-        else
-          {
-            ACE_DEBUG((LM_DEBUG,"%6u,%7q,%7q,%7.1f,%7.1f,%7q\n",
-                           interval_data_length_,
-                           demand_,
-                           interval_messages_received_,
-                           interval_messages_received_* per_sec,
-                           mbps,
-                           messages_lost_));
-          }
-      }
-  }
-
-  void
-  reset_results()
-  {
-    interval_messages_received_ = 0;
-    interval_bytes_received_ = 0;
-    interval_time_=0;
-    seq_num_ = 0;
-    messages_lost_= 0;
-  }
-
-  void
-  handle_run(ThroughputCommand & an_instance)
-  {
-     if( an_instance.command == THROUGHPUT_COMMAND_START)
-       {
-         logres = true;
-         reset_results();
-         interval_data_length_ = an_instance.data_length;
-         demand_ = an_instance.current_publisher_effort;
-         ACE_High_Res_Timer::gettimeofday_hr ().to_usec (first_time_);
-      }
-    if( an_instance.command == THROUGHPUT_COMMAND_COMPLETE)
-     {
-       logres = false;
-       ACE_UINT64 last_time;
-       ACE_High_Res_Timer::gettimeofday_hr ().to_usec (last_time);
-       interval_time_ =  (last_time  - first_time_);
-       ++run_;
-       show_results();
-       if(an_instance.current_publisher_effort ==
-          an_instance.final_publisher_effort)
-         {
-           shutdown_flag = true;
-         }
-     }
-  }
-
-  void
-  record_data (ThroughputTest & an_instance)
-  {
-    ++count_; // total count of all received messages
-    if(logres == true)
-      {
-        ++interval_messages_received_;
-        interval_bytes_received_ += interval_data_length_;
-        if (an_instance.seq_num != seq_num_)
-        {
-            ++messages_lost_;
-            /* Reset sequence number */
-            seq_num_ = an_instance.seq_num;
-          }
-        ++seq_num_;
-      }
-  }
-
-  int ACE_TMAIN(int argc, ACE_TCHAR** argv)
-  {
-    ::DDS::ReturnCode_t retcode;
-    HelloListener listener;
-    CmdListener cmd_listener;
-    int main_result = 1; /* error by default */
-    ::DDS::DataReader *data_reader = 0;
-    ::DDS::DataReader *cmd_data_reader = 0;
-    const char * type_name_cmd = 0;
-    const char * type_name = 0;
-
-    ACE_Env_Value<int> id (ACE_TEXT("DDS4CCM_DEFAULT_DOMAIN_ID"), domain_id);
-    domain_id = id;
-
-    if (parse_args (argc, argv) != 0)
-      return 1;
-
-    /* Create the domain participant on domain ID 0 */
-    ::DDS::DomainParticipant *participant =
-               ::DDS::DomainParticipantFactory::get_instance()->
-        create_participant_with_profile(
-                           domain_id,          /* Domain ID */
-                           lib_name,
-                           part_name,           /* QoS */
-                           0,                   /* Listener */
-                           DDS_STATUS_MASK_NONE);
-    if (!participant)
-      {
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("Unable to create domain participant.\n")));
-        goto clean_exit;
-      }
-    /* Register type before creating topic */
-    type_name = ThroughputTestTypeSupport::get_type_name();
-    retcode = ThroughputTestTypeSupport::register_type(participant, type_name);
-      if (retcode != DDS_RETCODE_OK)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("Unable to register topic type.\n")));
-          goto clean_exit;
-        }
-    topic = participant->create_topic(
-                        "Test data",            /* Topic name*/
-                        type_name,               /* Type name */
-                        DDS_TOPIC_QOS_DEFAULT,   /* Topic QoS */
-                        0,                       /* Listener  */
-                        DDS_STATUS_MASK_NONE);
-    if (!topic)
-    {
-      ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create topic.\n")));
-      goto clean_exit;
-    }
-    /* Register type before creating command topic */
-    type_name_cmd = ThroughputCommandTypeSupport::get_type_name();
-    retcode = ThroughputCommandTypeSupport::register_type(
-        participant, type_name_cmd);
-    if (retcode != DDS_RETCODE_OK)
-      {
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("Unable to register command topic type.\n")));
-        goto clean_exit;
-      }
-    /* Create the topic "Hello, World" for the String type */
-    cmd_topic = participant->create_topic(
-                                      "Command data",           /* Topic name*/
-                                      type_name_cmd,            /* Type name */
-                                      DDS_TOPIC_QOS_DEFAULT,    /* Topic QoS */
-                                      0,                        /* Listener  */
-                                      DDS_STATUS_MASK_NONE);
-    if (!cmd_topic)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create cmd_topic.\n")));
-        goto clean_exit;
-      }
-    /* Create the data reader using the default publisher */
-    data_reader = participant->create_datareader_with_profile(
-                                                 topic,
-                                                 lib_name,
-                                                 prof_name,    /* QoS */
-                                                 &listener,    /* Listener */
-                                                 DDS_DATA_AVAILABLE_STATUS);
-    /* Create the command data reader using the default publisher */
-    cmd_data_reader = participant->create_datareader_with_profile(
-                                                 cmd_topic,
-                                                 lib_name,
-                                                 cmd_prof_name,  /* QoS */
-                                                 &cmd_listener,  /* Listener */
-                                                 DDS_DATA_AVAILABLE_STATUS);
-    if (!data_reader || !cmd_data_reader)
-      {
-         ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create data reader.\n")));
-         goto clean_exit;
-      }
-
-    /* --- Sleep During Asynchronous Reception ---------------------------- */
-
-    /* This thread sleeps forever. When a sample is received, RTI Data
-     * Distribution Service will call the on_data_available_callback function.
-    */
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ready to read data.\n")));
-    for (;;)
-    {
-      ACE_OS::sleep (1);
-      if(shutdown_flag)
-        {
-          break;
-        }
-    }
-
-    /* --- Clean Up ------------------------------------------------------- */
-
-    main_result = 0;
-clean_exit:
-
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Exiting.")));
-    if (count_ > 0)
-      {
-        ACE_DEBUG((LM_DEBUG, "SUMMARY RECEIVER:\n "
-                             "Number of samples received: %u \n",
-                             count_));
-      }
-    else
-      {
-        ACE_DEBUG((LM_DEBUG, "SUMMARY RECEIVER:\n "
-                           "No samples received\n "));
-      }
-    if (participant)
-      {
-        retcode = participant->delete_contained_entities();
-        if (retcode != DDS_RETCODE_OK)
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("Deletion failed.\n")));
-            main_result = 1;
-          }
-        retcode = ::DDS::DomainParticipantFactory::get_instance()->
-        delete_participant(participant);
-        if (retcode != DDS_RETCODE_OK)
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("Deletion failed.\n")));
-            main_result = 1;
-          }
-      }
-
-    DDSDomainParticipantFactory::finalize_instance ();
-
-    return main_result;
-  }
-
-  /* This method gets called back by DDS when one or more data samples
-   *  have been received.
-   */
-  void HelloListener::on_data_available(::DDS::DataReader *reader)
-  {
-    /* Perform a safe type-cast from a generic data reader into a
-     * specific data reader for the type "ThroughputTestDataReader"
-     */
-    ThroughputTestDataReader * test_reader =
-                             ThroughputTestDataReader::narrow(reader);
-    if (!test_reader)
-    {
-      /* In this specific case, this will never fail */
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("::DDS::StringDataReader::narrow failed.\n")));
-      return;
-    }
-
-    ThroughputTest *instance = new ThroughputTest;
-
-    /* Loop until there are messages available in the queue */
-     for(;;)
-       {
-         ::DDS::SampleInfo        info;
-         ::DDS::ReturnCode_t retcode = test_reader->take_next_sample(*instance,
-                                                                     info);
-         if (retcode == DDS_RETCODE_NO_DATA)
-           {
-             /*  No more samples */
-             break;
-           }
-         else if (retcode != DDS_RETCODE_OK)
-           {
-             ACE_ERROR ((LM_ERROR,
-                         ACE_TEXT ("Unable to take data from data reader,"
-                                   " error %d.\n"),
-                                   retcode));
-             return;
-           }
-         if (info.valid_data)
-           {
-             record_data(*instance);
-           }
-        }
-  }
- /* This method gets called back by DDS when one or more data samples
- *  have beenreceived.
- */
-  void CmdListener::on_data_available(::DDS::DataReader *reader)
-  {
-    ThroughputCommandDataReader * cmd_reader =
-                              ThroughputCommandDataReader::narrow(reader);
-
-    if (!cmd_reader)
-      {
-      /* In this specific case, this will never fail */
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("::DDS::StringDataReader::narrow failed.\n")));
-        return;
-      }
-
-    ThroughputCommand *instance = new ThroughputCommand;
-
-    /* Loop until there are messages available in the queue */
-    for(;;)
-      {
-        ::DDS::SampleInfo        info;
-        ::DDS::ReturnCode_t retcode = cmd_reader->take_next_sample(
-                                                                    *instance,
-                                                                    info);
-        if (retcode == DDS_RETCODE_NO_DATA)
-          {
-            /* No more samples */
-            break;
-          }
-        else if (retcode != DDS_RETCODE_OK)
-          {
-            ACE_ERROR ((LM_ERROR,
-                        ACE_TEXT ("Unable to take data from data reader,"
-                                  " error %d.\n"), retcode));
-            return;
-          }
-        if (info.valid_data)
-          {
-            handle_run(*instance);
-          }
-       }
-  }
diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/.gitignore b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/.gitignore
deleted file mode 100644
index e44c12611b5..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/DDS_Sender
diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/DDS_Sender.mpc b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/DDS_Sender.mpc
deleted file mode 100644
index 068cbc775d5..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/DDS_Sender.mpc
+++ /dev/null
@@ -1,15 +0,0 @@
-project(*sender_plain) : nddslib, acelib, taolib, typecode {
-  after += DDS_Throughput_Base_stub_plain
-  exename = DDS_Sender
-  avoids += ace_for_tao
-  libpaths += ../lib
-  libout = ../lib
-  includes += ../Base
-  libs  += DDS_Throughput_Base_stub
-
-  requires += dds4ccm_ndds
-
-  Source_Files {
-    Throughput_Sender.cpp
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/Throughput_Sender.cpp b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/Throughput_Sender.cpp
deleted file mode 100644
index 499241ce5d1..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/Throughput_Sender.cpp
+++ /dev/null
@@ -1,326 +0,0 @@
-#include "ace/Get_Opt.h"
-#include "ace/High_Res_Timer.h"
-#include "ace/Env_Value_T.h"
-#include "tao/ORB_Core.h"
-#include "Throughput_Base.h"
-#include "Throughput_BaseSupport.h"
-#include "Throughput_BasePlugin.h"
-
-#include <ndds/ndds_namespace_cpp.h>
-
-CORBA::UShort datalen = 1024;
-CORBA::UShort recover_time = 1; // in sec
-CORBA::ULong start_load = 1000;
-CORBA::ULong incr_load = 1000;
-CORBA::ULongLong max_load = 9000;
-CORBA::ULongLong number_of_msg = 0;
-ACE_UINT64 duration_run_ = 10;  // in sec
-
-CORBA::ULongLong load = 0;
-ACE_UINT64 start_time = 0;
-
-ThroughputTest *instance = 0;
-ThroughputCommand *instance_cmd = 0;
-::DDS::Topic *topic = 0;
-::DDS::Topic *cmd_topic = 0;
-::DDS::DataWriter *data_writer = 0;
-::DDS::DataWriter *cmd_writer = 0;
-ThroughputTestDataWriter *test_data_writer = 0;
-ThroughputCommandDataWriter *cmd_data_writer = 0;
-
-const char *lib_name = "HelloTest_Library";
-const char *cmd_prof_name = "ThroughputCmdQoS";
-const char *prof_name = "ThroughputQoS";
-const char *part_name = "ThroughputPartQoS";
-
-CORBA::UShort domain_id = 0;
-
-  int
-  parse_args (int argc, ACE_TCHAR *argv[])
-  {
-    ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("d:l:r:s:m:i:O"));
-    int c;
-
-    while ((c = get_opts ()) != -1)
-      switch (c)
-        {
-       case 'd':
-          domain_id  = ACE_OS::atoi (get_opts.opt_arg ());
-          break;
-       case 'l':
-          datalen  = ACE_OS::atoi (get_opts.opt_arg ());
-          break;
-        case 'r':
-          recover_time = ACE_OS::atoi (get_opts.opt_arg ());
-          break;
-        case 's':
-          start_load = ACE_OS::atol (get_opts.opt_arg ());
-          break;
-        case 'i':
-          incr_load = ACE_OS::atol (get_opts.opt_arg ());
-          break;
-        case 'm':
-          max_load =   ACE_OS::atol (get_opts.opt_arg ());
-          break;
-        case '?':
-        default:
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "usage: %s "
-                             "-d <domain_id >"
-                             "-l <datalen >"
-                             "-r <recover_times>"
-                             "-s <start_load>"
-                             "-i <incr_load>"
-                             "-m <max_load>"
-                             "\n",
-                             argv [0]),
-                            -1);
-        }
-    // Indicates successful parsing of the command line
-    return 0;
-  }
-
-  bool
-  write(void)
-  {
-    CORBA::Boolean test_complete = false;
-    load += incr_load;
-    if ( load > max_load)
-    {
-      return false;
-    }
-    else
-      {
-        instance_cmd->command = THROUGHPUT_COMMAND_START;
-        instance_cmd->data_length = datalen;
-        instance_cmd->current_publisher_effort = load;
-        instance_cmd->final_publisher_effort = max_load;
-        try
-          {
-            cmd_data_writer->write(*instance_cmd, DDS_HANDLE_NIL);
-          }
-        catch (const ::CORBA::Exception& ex)
-          {
-            ex._tao_print_exception ("Exception caught:");
-             ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                         ACE_TEXT ("while writing command.\n")));
-          }
-        test_complete = false;
-        // get start time
-        ACE_High_Res_Timer::gettimeofday_hr ().to_usec (start_time);
-        while (!test_complete)
-          {
-            for (CORBA::ULongLong current_load = 0;
-                 current_load < load && !test_complete;
-                 ++current_load, ++instance->seq_num)
-              {
-                try
-                  {
-                     test_data_writer->write(*instance, DDS_HANDLE_NIL);
-                     ++number_of_msg;
-                  }
-                catch (const ::CORBA::Exception&)
-                  {
-                     ACE_ERROR ((LM_ERROR,
-                                 ACE_TEXT ("ERROR: Internal Error ")
-                                 ACE_TEXT ("while updating writer "
-                                            "info for <%q>.\n"),
-                                   number_of_msg));
-                     test_complete= true;
-                   }
-              }
-            ACE_UINT64 end_time;
-            ACE_High_Res_Timer::gettimeofday_hr ().to_usec (end_time);
-            ACE_UINT64 interval = end_time - start_time;
-            if(interval > (duration_run_ * 1000 * 1000))
-              {
-                test_complete = true;
-                instance_cmd->command = THROUGHPUT_COMMAND_COMPLETE;
-                cmd_data_writer->write ( *instance_cmd, DDS_HANDLE_NIL);
-              }
-            if (!test_complete)
-              {
-                ACE_OS::sleep (recover_time);
-              }
-          }
-        return true;
-      }
-  }
-
-  int ACE_TMAIN(int argc, ACE_TCHAR* argv[])
-  {
-    ::DDS::ReturnCode_t retcode;
-    long overhead_size = 0;
-    const char * type_name_cmd = 0;
-    const char * type_name = 0;
-
-    int  main_result = 1; /* error by default */
-
-    try
-      {
-        ACE_Env_Value<int> id (ACE_TEXT("DDS4CCM_DEFAULT_DOMAIN_ID"), domain_id);
-        domain_id = id;
-
-        if (parse_args (argc, argv) != 0)
-          return 1;
-
-        /* Create the domain participant */
-        ::DDS::DomainParticipant *participant =
-                                ::DDS::DomainParticipantFactory::get_instance()->
-                                create_participant_with_profile(
-                                    domain_id,                   /* Domain ID */
-                                    lib_name,
-                                    part_name,                   /* QoS */
-                                    0,                           /* Listener */
-                                    DDS_STATUS_MASK_NONE);
-        if (!participant) {
-            ACE_ERROR ((LM_ERROR,
-                        ACE_TEXT ("Unable to create domain participant.\n")));
-            goto clean_exit;
-        }
-
-        /* Register type before creating topic */
-        type_name = ThroughputTestTypeSupport::get_type_name();
-        retcode = ThroughputTestTypeSupport::register_type(
-                                                    participant, type_name);
-        if (retcode != DDS_RETCODE_OK)
-          {
-            goto clean_exit;
-          }
-        topic = participant->create_topic(
-                                          "Test data",    /* Topic name*/
-                                          type_name,      /* Type name */
-                                          DDS_TOPIC_QOS_DEFAULT, /* Topic QoS */
-                                          0,                     /* Listener  */
-                                          DDS_STATUS_MASK_NONE);
-
-
-        if (!topic) {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create topic.\n")));
-            goto clean_exit;
-        }
-
-        /* Register type before creating topic */
-        type_name_cmd = ThroughputCommandTypeSupport::get_type_name();
-        retcode = ThroughputCommandTypeSupport::register_type(
-            participant, type_name_cmd);
-        if (retcode != DDS_RETCODE_OK)
-          {
-            goto clean_exit;
-          }
-        /* Create the topic "Command World" for the String type */
-        cmd_topic = participant->create_topic("Command data",       /* Topic name*/
-                                              type_name_cmd ,       /* Type name */
-                                              DDS_TOPIC_QOS_DEFAULT,/* Topic QoS */
-                                              0,                    /* Listener  */
-                                              DDS_STATUS_MASK_NONE);
-        if (!topic)
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create topic.\n")));
-            goto clean_exit;
-          }
-
-        /* Create the command writer using the default publisher */
-        cmd_writer = participant->create_datawriter_with_profile(
-                                    cmd_topic,
-                                    lib_name,
-                                    cmd_prof_name,      /* QoS */
-                                    0,                  /* Listener */
-                                    DDS_STATUS_MASK_NONE);
-        if (!cmd_writer)
-          {
-            ACE_ERROR ((LM_ERROR,
-                        ACE_TEXT ("Unable to create cmd data writer.\n")));
-            goto clean_exit;
-          }
-
-        /* Create the data writer using the default publisher */
-        data_writer = participant->create_datawriter_with_profile(
-                                    topic,
-                                    lib_name,
-                                    prof_name,             /* QoS */
-                                    0,                     /* Listener */
-                                    DDS_STATUS_MASK_NONE);
-        if (!data_writer)
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create data writer.\n")));
-            goto clean_exit;
-          }
-
-        /* Create data sample for writing */
-        instance = ThroughputTestTypeSupport::create_data();
-        if (instance == 0)
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create data sample.\n")));
-            goto clean_exit;
-          }
-        overhead_size = sizeof(CORBA::ULong) + sizeof(CORBA::ULongLong);
-        instance->key = 1;
-        instance->seq_num = 0;
-        //instance->data.maximum (MAX_DATA_SEQUENCE_LENGTH);
-        instance->data.length(datalen - overhead_size);
-
-        /* Create data sample for writing */
-        instance_cmd = ThroughputCommandTypeSupport::create_data();
-        if (instance_cmd == 0)
-        {
-          ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create command sample.\n")));
-          goto clean_exit;
-        }
-
-        /* Perform a safe type-cast from a generic data writer into a
-        * specific data writer for the types "ThroughputTestDataWriter"
-        * and "ThroughputCommandDataWriter"
-        */
-        test_data_writer = ThroughputTestDataWriter::narrow(data_writer);
-        cmd_data_writer =  ThroughputCommandDataWriter::narrow(cmd_writer);
-        if (!test_data_writer || !cmd_data_writer)
-          {
-            ACE_ERROR ((LM_ERROR,
-                        ACE_TEXT ("DDS_StringDataWriter_narrow failed.\n")));
-            goto clean_exit;
-        }
-
-        // Sleep a couple seconds to allow discovery to happen
-        ACE_OS::sleep (1);
-
-        /* --- Write Data ----------------------------------------------------- */
-        for(CORBA::ULong i = start_load; i < (max_load + incr_load); i+= incr_load)
-        {
-          write();
-          ACE_OS::sleep (5);
-        }
-
-        /* --- Clean Up ------------------------------------------------------- */
-        ACE_OS::sleep (5);
-
-        main_result = 0;
-clean_exit:
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Exiting.")));
-        ACE_DEBUG ((LM_DEBUG, "SUMMARY SENDER number of messages sent: %Q\n",
-                              (number_of_msg)));
-        if (participant)
-          {
-            retcode = participant->delete_contained_entities();
-            if (retcode != DDS_RETCODE_OK)
-              {
-                ACE_ERROR ((LM_ERROR, ACE_TEXT ("Deletion failed.\n")));
-                main_result = 1;
-              }
-            retcode = ::DDS::DomainParticipantFactory::get_instance()->
-                            delete_participant(participant);
-            if (retcode != DDS_RETCODE_OK)
-              {
-                ACE_ERROR ((LM_ERROR, ACE_TEXT ("Deletion failed.\n")));
-                main_result = 1;
-              }
-        }
-      }
-    catch (const ::CORBA::Exception &ex)
-      {
-        ex._tao_print_exception("ERROR : Unexpected CORBA exception caught :");
-        main_result = 1;
-      }
-    DDSDomainParticipantFactory::finalize_instance ();
-    return main_result;
-}
diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index 3377092c378..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-Description
-XML QoS Profile
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="HelloTest_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="ThroughputPartQoS" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <participant_qos>
-        <receiver_pool>
-          <buffer_size>92160</buffer_size>
-        </receiver_pool>
-        <property>
-        <value>
-          <element>
-            <name>dds.transport.builtin.mask</name>
-            <value>DDS_TRANSPORTBUILTIN_UDPv4</value>
-            <name>dds.transport.UDPv4.builtin.parent.message_size_max</name>
-            <value>9216</value>
-            <name>dds.transport.UDPv4.builtin.recv_socket_buffer_size</name>
-            <value>92160</value>
-            <name>dds.transport.UDPv4.builtin.send_socket_buffer_size</name>
-            <value>92160</value>
-          </element>
-        </value>
-      </property>
-      </participant_qos>
-      </qos_profile>
-
-    <qos_profile name="ThroughputQoS" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <participant_qos>
-      <receiver_pool>
-        <buffer_size>92160</buffer_size>
-        </receiver_pool>
-        <!--property>
-        <value>
-          <element>
-            <name>dds.transport.builtin.mask</name>
-            <value>DDS_TRANSPORTBUILTIN_UDPv4</value>
-            <name>dds.transport.UDPv4.builtin.parent.message_size_max</name>
-            <value>UDP_SIZE_MAX</value>
-            <name>dds.transport.UDPv4.builtin.recv_socket_buffer_size</name>
-            <value>UDP_SOCKET_RECV_BUFFER_SIZE</value>
-            <name>dds.transport.UDPv4.builtin.send_socket_buffer_size</name>
-            <value>UDP_SOCKET_SEND_BUFFER_SIZE</value>
-          </element>
-        </value>
-      </property-->
-      </participant_qos>
-      <datawriter_qos>
-        <reliability>
-          <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <resource_limits>
-          <max_instances>1</max_instances>
-          <initial_instances>1</initial_instances>
-          <max_samples>LENGTH_UNLIMITED</max_samples>
-          <initial_samples>100</initial_samples>
-          <max_samples_per_instance>LENGTH_UNLIMITED</max_samples_per_instance>
-        </resource_limits>
-      </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-        </reliability>
-        <resource_limits>
-          <initial_samples>100</initial_samples>
-          <initial_instances>1</initial_instances>
-          <max_samples>LENGTH_UNLIMITED</max_samples>
-          <max_instances>1</max_instances>
-          <max_samples_per_instance>LENGTH_UNLIMITED</max_samples_per_instance>
-        </resource_limits>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-         </durability>
-      </datareader_qos>
-    </qos_profile>
-
-    <qos_profile name="ThroughputCmdQoS" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <participant_qos>
-        <receiver_pool>
-          <buffer_size>92160</buffer_size>
-        </receiver_pool>
-        <!--property>
-          <value>
-            <element>
-              <name>dds.transport.builtin.mask</name>
-              <value>DDS_TRANSPORTBUILTIN_UDPv4</value>
-              <name>dds.transport.UDPv4.builtin.parent.message_size_max</name>
-              <value>UDP_SIZE_MAX</value>
-              <name>dds.transport.UDPv4.builtin.recv_socket_buffer_size</name>
-              <value>UDP_SOCKET_RECV_BUFFER_SIZE</value>
-              <name>dds.transport.UDPv4.builtin.send_socket_buffer_size</name>
-              <value>UDP_SOCKET_SEND_BUFFER_SIZE</value>
-            </element>
-          </value>
-        </property-->
-      </participant_qos>
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <resource_limits>
-          <max_instances>1</max_instances>
-          <initial_instances>1</initial_instances>
-          <max_samples>LENGTH_UNLIMITED</max_samples>
-          <initial_samples>100</initial_samples>
-          <max_samples_per_instance>LENGTH_UNLIMITED</max_samples_per_instance>
-        </resource_limits>
-      </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <resource_limits>
-          <initial_samples>100</initial_samples>
-          <initial_instances>1</initial_instances>
-          <max_samples>LENGTH_UNLIMITED</max_samples>
-          <max_instances>1</max_instances>
-          <max_samples_per_instance>LENGTH_UNLIMITED</max_samples_per_instance>
-        </resource_limits>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-         </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/descriptors/run_test_dds.pl b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/descriptors/run_test_dds.pl
deleted file mode 100755
index b9f171d62fa..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/descriptors/run_test_dds.pl
+++ /dev/null
@@ -1,26 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-
-$tg_sender = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-$tg_receiver = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-
-$tg_sender->AddLibPath ('../lib');
-$tg_receiver->AddLibPath ('../lib');
-
-print "Start receiver\n";
-$R = $tg_receiver->CreateProcess ("$CIAO_ROOT/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/DDS_receiver", "");
-$R->Spawn();
-print "Start sender\n";
-$S = $tg_sender->CreateProcess ("$CIAO_ROOT/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/DDS_Sender", "");
-$S->SpawnWaitKill ($tg_sender->ProcessStartWaitInterval () + 180);
-$R->Kill ();
-
-exit 0;
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/.gitignore b/CIAO/connectors/dds4ccm/performance-tests/Keyed/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl
deleted file mode 100644
index d36869f3ed4..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * @file Perf_Keyed_Test_Base.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef PERF_KEYED_TEST_BASE_IDL
-#define PERF_KEYED_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/Perf_Keyed_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/Perf_Keyed_Test_BaseTypeSupportImpl.h"
-
-/// Flag used to indicate message is used for initialization only
-const unsigned long INITIALIZE_SIZE = 1234;
-
-/// Flag used to indicate end of test
-const unsigned long FINISHED_SIZE = 1235;
-const unsigned long OVERHEAD_BYTES = 31;
-
-#pragma DCPS_DATA_TYPE "PerfKeyedTest"
-#pragma DCPS_DATA_KEY "PerfKeyedTest key"
-
-struct PerfKeyedTest {
-  string key; //@key
-  long entity_id;  //id of subscriber/publisher
-  unsigned long seq_num;
-  long latency_ping;
-  string bin_data;
-  unsigned long data_len;
-  unsigned long long nanotime;
-};
-
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<PerfKeyedTest> PerfKeyedTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.mpc b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.mpc
deleted file mode 100644
index e23011f227a..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_Perf_Keyed_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_Perf_Keyed_Test_Base_stub
-  dynamicflags += PERF_KEYED_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=PERF_KEYED_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=Perf_Keyed_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    Perf_Keyed_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=PERF_KEYED_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    Perf_Keyed_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.idl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.idl
deleted file mode 100644
index 9fe2a19a315..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * @file Perf_Keyed_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- *
- * by-hand translation of the idl3p.
- */
-
-#ifndef PERF_KEYED_TEST_CONNECTOR_IDL_
-#define PERF_KEYED_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Perf_Keyed_Test_Base.idl"
-
-#pragma ciao lem "Connector/Perf_Keyed_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/Perf_Keyed_Test_BaseTypeSupport.idl"
-#endif
-
-module CCM_DDS
-{
-  module ::CCM_DDS::Typed < ::PerfKeyedTest, ::PerfKeyedTestSeq> PerfKeyedTest;
-};
-
-#endif /* Perf_Keyed_Test_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc
deleted file mode 100644
index 73257fa5473..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_Perf_Keyed_Test_Base -l .. -o ../lib -u DDS Perf_Keyed_Test_Connector"
-
-project(DDS_Perf_Keyed_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_Perf_Keyed_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=PERF_KEYED_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=Perf_Keyed_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=PERF_KEYED_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=Perf_Keyed_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=PERF_KEYED_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=Perf_Keyed_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=PERF_KEYED_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Perf_Keyed_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Perf_Keyed_Test_Connector.idl
-  }
-}
-
-project(DDS_Perf_Keyed_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_Perf_Keyed_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=PERF_KEYED_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=Perf_Keyed_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    Perf_Keyed_Test_ConnectorE.idl
-  }
-}
-
-project(DDS_PK_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_Perf_Keyed_Test_Connector_lem_gen DDS_Perf_Keyed_Test_Connector_stub DDS_Perf_Keyed_Test_Base_stub
-  libs  += DDS_Perf_Keyed_Test_Base_stub DDS_Perf_Keyed_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_PK_Test_Connector_lem_stub
-  dynamicflags += PERF_KEYED_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Perf_Keyed_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    Perf_Keyed_Test_ConnectorEC.h
-    Perf_Keyed_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Perf_Keyed_Test_ConnectorEC.inl
-  }
-}
-
-project(DDS_Perf_Keyed_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_Perf_Keyed_Test_Connector_idl_gen DDS_Perf_Keyed_Test_Base_stub
-  libs  += DDS_Perf_Keyed_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Perf_Keyed_Test_Connector_stub
-  dynamicflags += PERF_KEYED_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Perf_Keyed_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    Perf_Keyed_Test_ConnectorC.h
-    Perf_Keyed_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    Perf_Keyed_Test_ConnectorC.inl
-  }
-}
-
-project(DDS_Perf_Keyed_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_PK_Test_Connector_lem_stub DDS_Perf_Keyed_Test_Connector_stub
-  sharedname = DDS_Perf_Keyed_Test_Connector_exec
-  libs += DDS_Perf_Keyed_Test_Connector_stub DDS_PK_Test_Connector_lem_stub DDS_Perf_Keyed_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += PERF_KEYED_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Perf_Keyed_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    Perf_Keyed_Test_Connector_conn.h
-    Perf_Keyed_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_Perf_Keyed_Test_Connector_svnt) : ciao_servant, dds4ccm_skel, dds4ccm_lem_stub {
-  after      += DDS_PK_Test_Connector_lem_stub DDS_Perf_Keyed_Test_Connector_exec DDS_Perf_Keyed_Test_Connector_stub
-  sharedname  = DDS_Perf_Keyed_Test_Connector_svnt
-  libs       += DDS_Perf_Keyed_Test_Connector_stub \
-                DDS_PK_Test_Connector_lem_stub  \
-                DDS_Perf_Keyed_Test_Base_stub \
-                DDS_Perf_Keyed_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += PERF_KEYED_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Perf_Keyed_Test_ConnectorS.cpp
-    Perf_Keyed_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    Perf_Keyed_Test_ConnectorS.h
-    Perf_Keyed_Test_Connector_svnt.h
-    Perf_Keyed_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/.gitignore b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/.gitignore
deleted file mode 100644
index b837dbf72b4..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/Perf_Keyed_Test_ReceiverE.idl
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.idl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.idl
deleted file mode 100644
index 0033ddaad8a..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.idl
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/Perf_Keyed_Test_Connector.idl"
-
-module Perf_Keyed_Test
-{
-  component Receiver
-  {
-    port CCM_DDS::PerfKeyedTest::DDS_Listen info_listen;
-    port CCM_DDS::PerfKeyedTest::DDS_Write write_ping;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.mpc
deleted file mode 100644
index 18df7980bdd..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.mpc
+++ /dev/null
@@ -1,146 +0,0 @@
-project(DDS_Perf_Keyed_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_Perf_Keyed_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h \
-              -I..
-
-  IDL_Files {
-    Perf_Keyed_Test_Receiver.idl
-  }
-}
-
-project(DDS_Perf_Keyed_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_Perf_Keyed_Test_Receiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    Perf_Keyed_Test_ReceiverE.idl
-  }
-}
-
-project(DDS_Perf_Keyed_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_Perf_Keyed_Test_Receiver_lem_gen DDS_Perf_Keyed_Test_Receiver_stub  \
-           DDS_Perf_Keyed_Test_Connector_stub DDS_Perf_Keyed_Test_Base_stub
-  libs  +=  Receiver_stub DDS_Perf_Keyed_Test_Connector_stub \
-            DDS_Perf_Keyed_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Perf_Keyed_Test_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    Perf_Keyed_Test_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Perf_Keyed_Test_ReceiverEC.inl
-  }
-}
-
-project(DDS_Perf_Keyed_Test_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_Perf_Keyed_Test_Receiver_idl_gen  DDS_Perf_Keyed_Test_Connector_stub \
-           DDS_Perf_Keyed_Test_Base_stub DDS_Perf_Keyed_Test_Connector_lem_gen
-  libs  += DDS_Perf_Keyed_Test_Connector_stub DDS_Perf_Keyed_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Perf_Keyed_Test_ReceiverC.cpp
-  }
-
-  Header_Files {
-    Perf_Keyed_Test_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    Perf_Keyed_Test_ReceiverC.inl
-  }
-}
-
-project(DDS_Perf_Keyed_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_Perf_Keyed_Test_Receiver_lem_stub DDS_Perf_Keyed_Test_Receiver_stub \
-             DDS_Perf_Keyed_Test_Base_stub DDS_Perf_Keyed_Test_Connector_stub \
-             DDS_PK_Test_Connector_lem_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_Perf_Keyed_Test_Base_stub \
-          DDS_Perf_Keyed_Test_Connector_stub DDS_PK_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Perf_Keyed_Test_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    Perf_Keyed_Test_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_Perf_Keyed_Test_Receiver_svnt) : ciao_servant, dds4ccm_skel, dds4ccm_lem_stub {
-  after      +=   DDS_Perf_Keyed_Test_Receiver_lem_stub DDS_Perf_Keyed_Test_Base_stub \
-                  DDS_Perf_Keyed_Test_Connector_stub DDS_Perf_Keyed_Test_Connector_svnt \
-                  DDS_Perf_Keyed_Test_Receiver_exec DDS_PK_Test_Connector_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_Perf_Keyed_Test_Base_stub \
-                DDS_Perf_Keyed_Test_Connector_stub DDS_Perf_Keyed_Test_Connector_svnt \
-                Receiver_exec DDS_PK_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Perf_Keyed_Test_ReceiverS.cpp
-    Perf_Keyed_Test_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    Perf_Keyed_Test_ReceiverS.h
-    Perf_Keyed_Test_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.cpp
deleted file mode 100644
index 3b8fa86c7e6..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.cpp
+++ /dev/null
@@ -1,245 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "Perf_Keyed_Test_Receiver_exec.h"
-#include "ace/High_Res_Timer.h"
-
-namespace CIAO_Perf_Keyed_Test_Receiver_Impl
-{
-
-  /**
-   * Facet Executor Implementation Class: info_listen_data_listener_exec_i
-   */
-
-  info_listen_data_listener_exec_i::info_listen_data_listener_exec_i (
-        ::Perf_Keyed_Test::CCM_Receiver_Context_ptr ctx,
-        Receiver_exec_i &callback)
-    : ciao_context_ (
-        ::Perf_Keyed_Test::CCM_Receiver_Context::_duplicate (ctx))
-      , callback_ (callback)
-  {
-  }
-
-  info_listen_data_listener_exec_i::~info_listen_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PerfKeyedTest::Listener
-
-  void
-  info_listen_data_listener_exec_i::on_one_data (const ::PerfKeyedTest & datum,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    // Record time, not for ping messages , already pinged back.
-    if (datum.latency_ping != -1L)
-      {
-        this->callback_.record_time (datum.data_len);
-      }
-
-    // Send back a packet if this is a ping
-    if (datum.latency_ping == 1L)
-      {
-        this->callback_.write_one (const_cast<PerfKeyedTest&> (datum));
-      }
-  }
-
-  void
-  info_listen_data_listener_exec_i::on_many_data (const ::PerfKeyedTestSeq & /* data */,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : count_ (0L)
-      , interval_time_(0L)
-      , interval_messages_received_(0L)
-      , messages_received_(0L)
-      , interval_bytes_received_(0L)
-      , bytes_received_(0L)
-      , interval_data_length_(0L)
-      , first_time_ (0L)
-      , finished_(false)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-  void
-  Receiver_exec_i::write_one (PerfKeyedTest & an_instance)
-  {
-    an_instance.latency_ping = -1L;
-    this->writer_->write_one (an_instance, ::DDS::HANDLE_NIL);
-  }
-
-  void
-  Receiver_exec_i::start ()
-  {
-    ::CCM_DDS::DataListenerControl_var dlc =
-            this->ciao_context_->get_connection_info_listen_data_control ();
-    dlc->mode (::CCM_DDS::ONE_BY_ONE);
-  }
-
-  void
-  Receiver_exec_i::record_time (unsigned long datalen)
-  {
-    ++this->count_;
-    if( datalen == INITIALIZE_SIZE)
-      {
-        // store the info for this interval
-        ACE_High_Res_Timer::gettimeofday_hr ().to_usec (this->first_time_);
-        this->messages_received_=1;
-      }
-    else if ( datalen == FINISHED_SIZE)
-      {  // store the info for this interval
-        ACE_UINT64 last_time;
-        ACE_High_Res_Timer::gettimeofday_hr ().to_usec (last_time);
-        this->interval_time_ =  (last_time  - this->first_time_);
-        this->interval_messages_received_ = ++this->messages_received_;
-        this->interval_bytes_received_ = this->bytes_received_;
-        this->finished_ = true;
-      }
-    else
-      {
-        ++this->messages_received_;
-        this->interval_data_length_ = datalen + OVERHEAD_BYTES;
-        this->bytes_received_ += datalen + OVERHEAD_BYTES;
-      }
-  }
-  // Component attributes and port operations.
-
-  ::CCM_DDS::PerfKeyedTest::CCM_Listener_ptr
-  Receiver_exec_i::get_info_listen_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_listen_data_listener_.in ()))
-      {
-        info_listen_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_listen_data_listener_exec_i (
-            this->ciao_context_.in (),
-            *this),
-            ::CCM_DDS::PerfKeyedTest::CCM_Listener::_nil ());
-
-          this->ciao_info_listen_data_listener_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::PerfKeyedTest::CCM_Listener::_duplicate (
-        this->ciao_info_listen_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_listen_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Perf_Keyed_Test::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    (void) ACE_High_Res_Timer::global_scale_factor ();
-    // enable the datalistener
-    this->start();
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-     this->writer_ = this->ciao_context_->get_connection_write_ping_data ();
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    if (!this->finished_.value ())  // proces ended before received last message
-      {
-        ACE_UINT64 last_time;
-        ACE_High_Res_Timer::gettimeofday_hr ().to_usec (last_time);
-        this->interval_time_ =  (last_time  - this->first_time_);
-        this->interval_messages_received_ = ++this->messages_received_;
-        this->interval_bytes_received_ = this->bytes_received_;
-      }
-    if ((this->count_.value () > 0) && (this->interval_time_ > 0))
-      {
-        double per_sec = (double)1000000/ this->interval_time_;
-        double mbps =
-          (this->interval_bytes_received_.value()* per_sec)* (8.0/1000.0/1000.0);
-        ACE_DEBUG((LM_DEBUG, "SUMMARY RECEIVER:\n "
-                             "Data Length: %u  Messages: %u  Messages/s(ave): "
-                             "%6.01f,   Mbps(ave): %7.01f \n",
-                       this->interval_data_length_.value(),
-                       this->interval_messages_received_.value(),
-                       this->interval_messages_received_.value()* per_sec,
-                       mbps));
-      }
-    else
-      {
-         ACE_DEBUG((LM_DEBUG, "SUMMARY RECEIVER:\n "
-                           "No samples received\n "));
-      }
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Perf_Keyed_Test_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.h
deleted file mode 100644
index 1f4403622d9..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.h
+++ /dev/null
@@ -1,157 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_PERF_KEYED_TEST_RECEIVER_EXEC_RQNPFL_H_
-#define CIAO_PERF_KEYED_TEST_RECEIVER_EXEC_RQNPFL_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Perf_Keyed_Test_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_Perf_Keyed_Test_Receiver_Impl
-{
-  class Receiver_exec_i;
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::ULong> Atomic_ULong;
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, bool> Atomic_Bool;
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Long> Atomic_Long;
-
-  /**
-   * Provider Executor Implementation Class: info_listen_data_listener_exec_i
-   */
-
-  class info_listen_data_listener_exec_i
-    : public virtual ::CCM_DDS::PerfKeyedTest::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_listen_data_listener_exec_i (
-      ::Perf_Keyed_Test::CCM_Receiver_Context_ptr ctx,
-      Receiver_exec_i &callback);
-    virtual ~info_listen_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PerfKeyedTest::Listener. */
-
-    virtual
-    void on_one_data (const ::PerfKeyedTest & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (const ::PerfKeyedTestSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    ::Perf_Keyed_Test::CCM_Receiver_Context_var ciao_context_;
-    Receiver_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CCM_DDS::PerfKeyedTest::CCM_Listener_ptr
-    get_info_listen_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_listen_status (void);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void start (void);
-    void record_time (unsigned long datalen);
-    void write_one (PerfKeyedTest & an_instance);
-
-    //@}
-
-  private:
-    ::Perf_Keyed_Test::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::CCM_DDS::PerfKeyedTest::CCM_Listener_var ciao_info_listen_data_listener_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    ::CCM_DDS::PerfKeyedTest::Writer_var writer_;
-
-    Atomic_ULong  count_;
-    ACE_UINT64 interval_time_;
-    Atomic_Long interval_messages_received_;
-    Atomic_Long messages_received_;
-    Atomic_Long interval_bytes_received_;
-    Atomic_Long bytes_received_;
-    Atomic_Long interval_data_length_;
-    ACE_UINT64 first_time_;
-    Atomic_Bool   finished_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Perf_Keyed_Test_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/.gitignore b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/.gitignore
deleted file mode 100644
index 3c777e43724..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/Perf_Keyed_Test_SenderE.idl
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.idl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.idl
deleted file mode 100644
index 5752f96bbaf..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.idl
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef DDS_PERF_KEYED_TEST_SENDER_IDL
-#define DDS_PERF_KEYED_TEST_SENDER_IDL
-
-#include "Connector/Perf_Keyed_Test_Connector.idl"
-
-
-module Perf_Keyed_Test
-{
-  component Sender
-  {
-    port CCM_DDS::PerfKeyedTest::DDS_Write info_write;
-    attribute unsigned short keys;
-    attribute unsigned long iterations;
-    attribute unsigned short latency_count; //number of samples sent before a latency ping packet is sent. default 100000, < sample_count
-    attribute unsigned short sleep; //time in ms to sleep between each send
-    attribute unsigned short spin;
-    attribute unsigned short datalen; //minimal 32
-    attribute unsigned short number_of_sub; //number of subscribers
-    provides CCM_DDS::ConnectorStatusListener connector_status;
-    port CCM_DDS::PerfKeyedTest::DDS_Listen ping_listen;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.mpc b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.mpc
deleted file mode 100644
index 262bce294f5..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_Perf_Keyed_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_Perf_Keyed_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_Perf_Keyed_Test_Connector_idl_gen DDS_Starter_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I..
-
-  IDL_Files {
-    Perf_Keyed_Test_Sender.idl
-  }
-}
-
-project(DDS_Perf_Keyed_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_Perf_Keyed_Test_Sender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    Perf_Keyed_Test_SenderE.idl
-  }
-}
-
-project(DDS_Perf_Keyed_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_Perf_Keyed_Test_Sender_lem_gen DDS_Perf_Keyed_Test_Sender_stub \
-           DDS_Perf_Keyed_Test_Base_stub
-  libs  += DDS_Perf_Keyed_Test_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Perf_Keyed_Test_SenderEC.cpp
-  }
-
-  Header_Files {
-    Perf_Keyed_Test_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Perf_Keyed_Test_SenderEC.inl
-  }
-}
-
-project(DDS_Perf_Keyed_Test_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_Perf_Keyed_Test_Sender_idl_gen DDS_Perf_Keyed_Test_Base_stub \
-           DDS_Perf_Keyed_Test_Connector_stub
-  libs  += DDS_Perf_Keyed_Test_Base_stub DDS_Perf_Keyed_Test_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Perf_Keyed_Test_SenderC.cpp
-  }
-
-  Header_Files {
-    Perf_Keyed_Test_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    Perf_Keyed_Test_SenderC.inl
-  }
-}
-
-project(DDS_Perf_Keyed_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_Perf_Keyed_Test_Sender_lem_stub DDS_Perf_Keyed_Test_Sender_stub \
-             DDS_PK_Test_Connector_lem_stub DDS_Perf_Keyed_Test_Connector_stub
-  sharedname = Sender_exec
-  libs    += Sender_stub Sender_lem_stub DDS_Perf_Keyed_Test_Base_stub \
-             DDS_PK_Test_Connector_lem_stub DDS_Perf_Keyed_Test_Connector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Perf_Keyed_Test_Sender_exec.cpp
-  }
-
-  Header_Files {
-    Perf_Keyed_Test_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_Perf_Keyed_Test_Sender_svnt) : ciao_servant, dds4ccm_skel {
-  after      += DDS_Perf_Keyed_Test_Base_stub  DDS_Perf_Keyed_Test_Sender_lem_stub \
-                DDS_Perf_Keyed_Test_Connector_stub \
-                DDS_Perf_Keyed_Test_Connector_svnt DDS_PK_Test_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub DDS_Perf_Keyed_Test_Base_stub \
-                DDS_Perf_Keyed_Test_Connector_stub DDS_Perf_Keyed_Test_Connector_svnt \
-                DDS_PK_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Perf_Keyed_Test_SenderS.cpp
-    Perf_Keyed_Test_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    Perf_Keyed_Test_SenderS.h
-    Perf_Keyed_Test_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp
deleted file mode 100644
index 7c15ba28542..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp
+++ /dev/null
@@ -1,671 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "Perf_Keyed_Test_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-#include "ace/Timer_Queue.h"
-#include "ace/High_Res_Timer.h"
-
-namespace CIAO_Perf_Keyed_Test_Sender_Impl
-{
-  /**
-   * Facet Executor Implementation Class: connector_status_exec_i
-   */
-
-  WriteTicker::WriteTicker (Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  WriteTicker::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    this->callback_.write_one ();
-    return 0;
-  }
-
-  /**
-   * Facet Executor Implementation Class: connector_status_exec_i
-   */
-
-  connector_status_exec_i::connector_status_exec_i (
-        ::Perf_Keyed_Test::CCM_Sender_Context_ptr ctx,
-        Sender_exec_i &callback,
-        Atomic_Boolean &matched,
-        int number_of_subscribers)
-    : ciao_context_ (
-        ::Perf_Keyed_Test::CCM_Sender_Context::_duplicate (ctx))
-      , callback_ (callback)
-      , matched_ (matched)
-      , number_of_subscribers_ (number_of_subscribers)
-  {
-  }
-
-  connector_status_exec_i::~connector_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-
-  void
-  connector_status_exec_i::on_inconsistent_topic (::DDS::Topic_ptr /* the_topic */,
-  const ::DDS::InconsistentTopicStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  connector_status_exec_i::on_requested_incompatible_qos (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedIncompatibleQosStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  connector_status_exec_i::on_sample_rejected (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleRejectedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  connector_status_exec_i::on_offered_deadline_missed (::DDS::DataWriter_ptr /* the_writer */,
-  const ::DDS::OfferedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  connector_status_exec_i::on_offered_incompatible_qos (::DDS::DataWriter_ptr /* the_writer */,
-  const ::DDS::OfferedIncompatibleQosStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  connector_status_exec_i::on_unexpected_status (::DDS::Entity_ptr the_entity,
-  ::DDS::StatusKind status_kind)
-  {
-    if (!::CORBA::is_nil (the_entity) && status_kind == DDS::PUBLICATION_MATCHED_STATUS)
-      {
-        ::DDS::DataWriter_var wr = ::DDS::DataWriter::_narrow (the_entity);
-        if (::CORBA::is_nil (wr.in ()))
-          {
-            throw ::CORBA::INTERNAL ();
-          }
-        ::DDS::PublicationMatchedStatus_var stat;
-        ::DDS::ReturnCode_t retval = wr->get_publication_matched_status (stat.out ());
-        if (retval == DDS::RETCODE_OK)
-          {
-            ACE_DEBUG ((LM_DEBUG, "connector_status_exec_i::on_unexpected_status - "
-                      "on_publication_matched status received. Starting application\n"));
-
-            if ((stat.in ().current_count >=
-                (this->number_of_subscribers_ + 1)) &&
-                 !this->matched_.value())
-              {
-                this->matched_ = true;
-                this->callback_.start ();
-              }
-          }
-      }
-  }
-
-  /**
-   * Facet Executor Implementation Class: ping_listen_data_listener_exec_i
-   */
-
-  ping_listen_data_listener_exec_i::ping_listen_data_listener_exec_i (
-        ::Perf_Keyed_Test::CCM_Sender_Context_ptr ctx,
-        Sender_exec_i &callback)
-    : ciao_context_ (
-        ::Perf_Keyed_Test::CCM_Sender_Context::_duplicate (ctx))
-      , callback_(callback)
-  {
-  }
-
-  ping_listen_data_listener_exec_i::~ping_listen_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PerfKeyedTest::Listener
-
-  void
-  ping_listen_data_listener_exec_i::on_one_data (const ::PerfKeyedTest & datum,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    //only interested in messages received with a latency_ping = -1 ('ping'messages)
-    if (datum.latency_ping == -1)
-      {
-        this->callback_.record_time (datum.nanotime);
-      }
-  }
-
-  void
-  ping_listen_data_listener_exec_i::on_many_data (const ::PerfKeyedTestSeq & /* data */,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : keys_ (1)
-      , iterations_ (1000)
-      , latency_count_ (100)
-      , sleep_ (10)
-      , spin_ (100)
-      , datalen_ (100)
-      , number_of_sub_ (1)
-      , matched_(false)
-      , tv_total_ (0L)
-      , tv_max_ (0L)
-      , tv_min_ (0L)
-      , count_ (0) // Number of returned pings
-      , number_of_msg_(0) // Number of sent messages
-      , timer_(false)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      WriteTicker (*this),
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Sender_exec_i::write_one (void)
-  {
-    if (this->number_of_msg_ == 0)
-      {
-        //first message
-        this->last_key_->second->data_len = INITIALIZE_SIZE;
-        this->last_key_->second->bin_data = CORBA::string_alloc(0);
-      }
-    else if ((this->iterations_ != 0) &&
-             (this->number_of_msg_ == ((this->iterations_ * this->keys_) -1)))
-      {
-        //last message
-        this->last_key_->second->data_len = FINISHED_SIZE;
-        this->last_key_->second->bin_data = CORBA::string_alloc(0);
-      }
-    else
-      {
-        this->last_key_->second->data_len = this->datalen_;
-        this->last_key_->second->bin_data = CORBA::string_alloc(this->datalen_);
-      }
-
-    if ((this->iterations_ != 0) && (this->number_of_msg_ >=
-                                    (this->iterations_ * this->keys_)))
-      {
-        this->reactor ()->cancel_timer (this->ticker_);
-        this->timer_ = false;
-      }
-    else
-      {
-        try
-          {
-            this->last_key_->second->seq_num =  this->number_of_msg_;
-            // Send some messages (latency_ping = 1L) with indicator that
-            // message has to be returned by the subscriber
-            // TO DO : use other selection if more then one key is used.
-            if (( this->number_of_msg_ % this->latency_count_) == 0)
-              {
-                 this->last_key_->second->latency_ping = 1L;
-                 ACE_High_Res_Timer::gettimeofday_hr ().to_usec (
-                               this->last_key_->second->nanotime);
-              }
-            else
-              {
-                this->last_key_->second->latency_ping = 0L;
-              }
-
-            this->writer_->write_one (this->last_key_->second,
-                                      ::DDS::HANDLE_NIL);
-          }
-        catch (const CCM_DDS::InternalError& )
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                        ACE_TEXT ("while writing a sample.\n")));
-          }
-        ++this->last_key_;
-        ++this->number_of_msg_;
-
-        if (this->last_key_ == this->samples_.end ())
-          {
-            // start over again.
-            this->last_key_ = this->samples_.begin ();
-          }
-      }
-  }
-
-  void
-  Sender_exec_i::write_one_with_spin (void)
-  {
-    double ad, bd, cd;
-    volatile double * a, * b, * c;
-
-    a = &ad;
-    b = &bd;
-    c = &cd;
-
-    for (unsigned int loop = 0;
-         this->iterations_ == 0 || loop < this->iterations_;
-         ++loop)
-      {
-        if (this->spin_ > 0)
-          {
-            // spin, spin, spin
-            for (int m = 0; m < this->spin_; ++m)
-              {
-                *a = 1.1;
-                *b = 3.1415;
-                *c = *a/(*b)*m;
-              }
-          }
-        if (this->number_of_msg_ == 0)
-          {
-            // first message
-            this->last_key_->second->data_len = INITIALIZE_SIZE;
-            this->last_key_->second->bin_data = CORBA::string_alloc(0);
-          }
-        else if ((this->iterations_ != 0) &&
-                 (this->number_of_msg_ ==
-                 ((this->iterations_ * this->keys_) -1)))
-          {
-            // last message
-            this->last_key_->second->data_len = FINISHED_SIZE;
-            this->last_key_->second->bin_data = CORBA::string_alloc(0);
-          }
-        else
-          {
-            this->last_key_->second->data_len = this->datalen_;
-            this->last_key_->second->bin_data =
-                              CORBA::string_alloc(this->datalen_);
-          }
-        try
-          {
-            this->last_key_->second->seq_num = loop;
-            this->last_key_->second->latency_ping = 0L;
-
-            // if ping required
-            if (( this->number_of_msg_ % this->latency_count_) == 0)
-              {
-                // send some messages (latency_ping = 1L) with indicator that
-                // message has to be returned by the subscriber
-                this->last_key_->second->latency_ping = 1L;
-                ACE_High_Res_Timer::gettimeofday_hr ().to_usec (
-                              this->last_key_->second->nanotime);
-              }
-            this->writer_->write_one (this->last_key_->second,
-                                      ::DDS::HANDLE_NIL);
-          }
-        catch (const CCM_DDS::InternalError& )
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                        ACE_TEXT ("while updating writer info for <%C>.\n"),
-                        this->last_key_->first.c_str ()));
-          }
-        ++this->last_key_;
-        if (this->last_key_ == this->samples_.end ())
-          {       // onto the next iteration
-            this->last_key_ = this->samples_.begin ();
-          }
-        ++this->number_of_msg_;
-      }
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i)
-      {
-        char key[7];
-        PerfKeyedTest *new_key = new PerfKeyedTest;
-        ACE_OS::sprintf (key, "KEY_%d", i);
-        new_key->key = CORBA::string_dup(key);
-        new_key->seq_num = 0;
-        ::CORBA::ULong length = this->datalen_;
-        new_key->data_len = length;
-        new_key->bin_data = CORBA::string_alloc(length);
-        this->samples_[key] = new_key;
-      }
-    this->last_key_ = this->samples_.begin ();
-    // this->sleep_ is in ms
-    unsigned int sec = this->sleep_/1000;
-    unsigned int usec = (this->sleep_ % 1000) * 1000;
-
-    // if sleep and spin both > 0, use sleep value and ignore spin value
-    if (this->sleep_ > 0) // use reactor timer to sleep
-      {
-        if (this->reactor ()->schedule_timer(
-                    this->ticker_,
-                    0,
-                    ACE_Time_Value (5, 0),
-                    ACE_Time_Value (sec, usec)) == -1)
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                                  ACE_TEXT ("Error scheduling timer")));
-          }
-        this->timer_ = true;
-      }
-    else //use spin i.o sleep
-      {
-        ACE_OS::sleep(5);
-        this->write_one_with_spin();
-      }
-  }
-
-  void
-  Sender_exec_i::record_time (unsigned long long nanotime)
-  {
-    ACE_UINT64 testend;
-    ACE_High_Res_Timer::gettimeofday_hr ().to_usec (testend);
-    ACE_UINT64 interval =  (testend  - nanotime);
-
-    ++this->count_;
-    long duration = static_cast <CORBA::Long>(interval);
-    this->tv_total_ += duration;
-    if (duration > this->tv_max_.value () || (this->tv_max_.value () == 0L))
-      this->tv_max_ = duration;
-    if (duration < this->tv_min_.value () || (this->tv_min_.value () == 0L))
-      this->tv_min_ = duration;
-  }
-  // Component attributes and port operations.
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  ::CORBA::ULong
-  Sender_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (
-    const ::CORBA::ULong iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::latency_count (void)
-  {
-    return this->latency_count_;
-  }
-
-  void
-  Sender_exec_i::latency_count (
-    const ::CORBA::UShort latency_count)
-  {
-    this->latency_count_ = latency_count;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::sleep (void)
-  {
-    return this->sleep_;
-  }
-
-  void
-  Sender_exec_i::sleep (
-    const ::CORBA::UShort sleep)
-  {
-    this->sleep_ = sleep;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::spin (void)
-  {
-    return this->spin_;
-  }
-
-  void
-  Sender_exec_i::spin (
-    const ::CORBA::UShort spin)
-  {
-    this->spin_ = spin;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::datalen (void)
-  {
-    return this->datalen_;
-  }
-
-  void
-  Sender_exec_i::datalen (
-    const ::CORBA::UShort datalen)
-  {
-    if (datalen <= OVERHEAD_BYTES)
-    {
-       ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: datalen has to be bigger as %u\n"),
-                    OVERHEAD_BYTES));
-       throw ::CORBA::BAD_PARAM ();
-    }
-    this->datalen_ = datalen - OVERHEAD_BYTES;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::number_of_sub (void)
-  {
-    return this->number_of_sub_;
-  }
-
-  void
-  Sender_exec_i::number_of_sub (
-    const ::CORBA::UShort number_of_sub)
-  {
-    if (number_of_sub > 0)
-      {
-        this->number_of_sub_ = number_of_sub;
-      }
-    else
-      {
-        this->number_of_sub_ = 1;
-      }
-  }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_connector_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_connector_status_.in ()))
-      {
-        connector_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          connector_status_exec_i (
-            this->ciao_context_.in (),
-            *this,
-            this->matched_,
-            this->number_of_sub_),
-          ::CCM_DDS::CCM_ConnectorStatusListener::_nil ());
-
-          this->ciao_connector_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_ConnectorStatusListener::_duplicate (
-        this->ciao_connector_status_.in ());
-  }
-
-  ::CCM_DDS::PerfKeyedTest::CCM_Listener_ptr
-  Sender_exec_i::get_ping_listen_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_ping_listen_data_listener_.in ()))
-      {
-        ping_listen_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          ping_listen_data_listener_exec_i (
-            this->ciao_context_.in (),
-            *this),
-          ::CCM_DDS::PerfKeyedTest::CCM_Listener::_nil ());
-
-          this->ciao_ping_listen_data_listener_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::PerfKeyedTest::CCM_Listener::_duplicate (
-        this->ciao_ping_listen_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Sender_exec_i::get_ping_listen_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Perf_Keyed_Test::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-    try
-      {
-        this->writer_ = this->ciao_context_->get_connection_info_write_data ();
-        ::CCM_DDS::DataListenerControl_var dlc =
-            this->ciao_context_->get_connection_ping_listen_data_control ();
-        dlc->mode (::CCM_DDS::ONE_BY_ONE);
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("Exception caught:");
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Sender_exec_i::ccm_activate: Exception caught\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Sender_exec_i::ccm_activate:"
-                    " Unknown exception caught\n")));
-      }
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    if (this->timer_.value ())
-      this->reactor ()->cancel_timer (this->ticker_);
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "SUMMARY SENDER number of messages sent: %u\n",
-                          (this->number_of_msg_ + 1)));
-
-    if( this->count_.value () > 0)
-      {
-        double avg = this->tv_total_.value () / this->count_.value ();
-        ACE_DEBUG ((LM_DEBUG, "SUMMARY SENDER latency time-one way, in usec :\n"
-                            "\tTotal time <%u>,\n\tNumber of latency messages <%u>,"
-                            "\n\tAvg <%6.01f>,\n\tMin <%u>,\n\tMax <%u>.\n",
-                            this->tv_total_.value ()/2,
-                            this->count_.value (),
-                            avg/2,
-                            this->tv_min_.value ()/2,
-                            this->tv_max_.value ()/2));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "SUMMARY SENDER latency time:\n "
-                            "No samples reveived back.\n"));
-      }
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Perf_Keyed_Test_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.h
deleted file mode 100644
index 864ad161bdc..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.h
+++ /dev/null
@@ -1,278 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_PERF_KEYED_TEST_SENDER_EXEC_EXWYAH_H_
-#define CIAO_PERF_KEYED_TEST_SENDER_EXEC_EXWYAH_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Perf_Keyed_Test_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-#include <map>
-
-namespace CIAO_Perf_Keyed_Test_Sender_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Long > Atomic_Long;
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
-
-  class Sender_exec_i;
-
-  /**
-   * WriteTicker
-   */
-
-  class WriteTicker :
-    public ACE_Event_Handler
-  {
-  public:
-    WriteTicker (Sender_exec_i &callback);
-    int handle_timeout (const ACE_Time_Value &, const void *);
-  private:
-    /// Maintains a handle that actually process the event
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: connector_status_exec_i
-   */
-
-  class connector_status_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    connector_status_exec_i (
-      ::Perf_Keyed_Test::CCM_Sender_Context_ptr ctx,
-      Sender_exec_i &callback,
-      Atomic_Boolean &matched,
-      int number_of_subscribers);
-    virtual ~connector_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-    const ::DDS::InconsistentTopicStatus & status);
-
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedIncompatibleQosStatus & status);
-
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleRejectedStatus & status);
-
-    virtual
-    void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-    const ::DDS::OfferedDeadlineMissedStatus & status);
-
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-    const ::DDS::OfferedIncompatibleQosStatus & status);
-
-    virtual
-    void on_unexpected_status (::DDS::Entity_ptr the_entity,
-    ::DDS::StatusKind status_kind);
-    //@}
-
-  private:
-    ::Perf_Keyed_Test::CCM_Sender_Context_var ciao_context_;
-    Sender_exec_i &callback_;
-    Atomic_Boolean &matched_;
-    int number_of_subscribers_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: ping_listen_data_listener_exec_i
-   */
-
-  class ping_listen_data_listener_exec_i
-    : public virtual ::CCM_DDS::PerfKeyedTest::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ping_listen_data_listener_exec_i (
-      ::Perf_Keyed_Test::CCM_Sender_Context_ptr ctx,
-      Sender_exec_i &callback);
-    virtual ~ping_listen_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PerfKeyedTest::Listener. */
-
-    virtual
-    void on_one_data (const ::PerfKeyedTest & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (const ::PerfKeyedTestSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    ::Perf_Keyed_Test::CCM_Sender_Context_var ciao_context_;
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-
-    virtual ::CORBA::ULong iterations (void);
-
-    virtual void iterations (::CORBA::ULong iterations);
-
-    virtual ::CORBA::UShort latency_count (void);
-
-    virtual void latency_count (::CORBA::UShort latency_count);
-
-    virtual ::CORBA::UShort sleep (void);
-
-    virtual void sleep (::CORBA::UShort sleep);
-
-    virtual ::CORBA::UShort spin (void);
-
-    virtual void spin (::CORBA::UShort spin);
-
-    virtual ::CORBA::UShort datalen (void);
-
-    virtual void datalen (::CORBA::UShort datalen);
-
-    virtual ::CORBA::UShort number_of_sub (void);
-
-    virtual void number_of_sub (::CORBA::UShort number_of_sub);
-
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_connector_status (void);
-
-    virtual ::CCM_DDS::PerfKeyedTest::CCM_Listener_ptr
-    get_ping_listen_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_ping_listen_status (void);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void start (void);
-    void write_one (void);
-    void write_one_with_spin (void);
-    void record_time (unsigned long long nanotime);
-
-    //@}
-
-  private:
-    ::Perf_Keyed_Test::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-
-    ::CORBA::UShort keys_;
-
-    ::CORBA::ULong iterations_;
-
-    ::CORBA::UShort latency_count_;
-
-    ::CORBA::UShort sleep_;
-
-    ::CORBA::UShort spin_;
-
-    ::CORBA::UShort datalen_;
-
-    ::CORBA::UShort number_of_sub_;
-    ::CCM_DDS::CCM_ConnectorStatusListener_var ciao_connector_status_;
-    ::CCM_DDS::PerfKeyedTest::CCM_Listener_var ciao_ping_listen_data_listener_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    ::CCM_DDS::PerfKeyedTest::Writer_var writer_;
-    WriteTicker *ticker_;
-
-    Atomic_Boolean matched_;
-    Atomic_Long  tv_total_;
-    Atomic_Long  tv_max_;
-    Atomic_Long  tv_min_;
-    Atomic_Long  count_;
-    CORBA::UShort number_of_msg_;
-    Atomic_Boolean timer_;
-
-    typedef std::map<ACE_CString, PerfKeyedTest_var> Writer_Table;
-    Writer_Table samples_;
-
-    Writer_Table::iterator last_key_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Perf_Keyed_Test_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/KeyedTest_Library.xml b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/KeyedTest_Library.xml
deleted file mode 100644
index 6e276c4f9b4..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/KeyedTest_Library.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--  -->
-
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-
-  <qos_profile name="LatencyQoS">
-    <datawriter_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-        <max_blocking_time>
-          <sec>DURATION_INFINITE_SEC</sec>
-          <nanosec>DURATION_INFINITE_NSEC</nanosec>
-        </max_blocking_time>
-      </reliability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-      <durability>
-        <kind>TRANSIENT_DURABILITY_QOS</kind>
-      </durability>
-      <resource_limits>
-        <max_instances>1</max_instances>
-        <initial_instances>1</initial_instances>
-        <max_samples>LENGTH_UNLIMITED</max_samples>
-        <initial_samples>100</initial_samples>
-        <max_samples_per_instance>LENGTH_UNLIMITED</max_samples_per_instance>
-      </resource_limits>
-    </datawriter_qos>
-    <datareader_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-      </reliability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-      <resource_limits>
-        <initial_samples>100</initial_samples>
-        <initial_instances>1</initial_instances>
-        <max_samples>LENGTH_UNLIMITED</max_samples>
-        <max_instances>1</max_instances>
-        <max_samples_per_instance>LENGTH_UNLIMITED</max_samples_per_instance>
-      </resource_limits>
-      <durability>
-        <kind>TRANSIENT_DURABILITY_QOS</kind>
-      </durability>
-    </datareader_qos>
-
-  </qos_profile>
-  <qos_profile name="BestEffortQoS">
-    <datawriter_qos>
-      <reliability>
-        <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-        </reliability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-      <durability>
-        <kind>TRANSIENT_DURABILITY_QOS</kind>
-      </durability>
-      <resource_limits>
-        <max_instances>1</max_instances>
-        <initial_instances>1</initial_instances>
-        <max_samples>LENGTH_UNLIMITED</max_samples>
-        <initial_samples>100</initial_samples>
-        <max_samples_per_instance>LENGTH_UNLIMITED</max_samples_per_instance>
-      </resource_limits>
-    </datawriter_qos>
-    <datareader_qos>
-      <reliability>
-        <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-      </reliability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-      <resource_limits>
-        <initial_samples>100</initial_samples>
-        <initial_instances>1</initial_instances>
-        <max_samples>LENGTH_UNLIMITED</max_samples>
-        <max_instances>1</max_instances>
-        <max_samples_per_instance>LENGTH_UNLIMITED</max_samples_per_instance>
-      </resource_limits>
-      <durability>
-        <kind>TRANSIENT_DURABILITY_QOS</kind>
-      </durability>
-    </datareader_qos>
-  </qos_profile>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan.cdp
deleted file mode 100644
index fadb6eeb0cf..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan.cdp
+++ /dev/null
@@ -1,541 +0,0 @@
-<!--  -->
-<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>Perf_Keyed_Test_Depl_1</label>
-  <UUID>Perf_Keyed_Test_Depl_1</UUID>
-
-  <implementation xmi:id="CompSvrImpl">
-    <name>CompSvr</name>
-    <source />
-    <artifact xmi:idref="CompSvrArt" />
-    <execParameter>
-      <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>edu.vanderbilt.dre.DAnCE.LocalityManager</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Perf_Keyed_Test_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Perf_Keyed_Test_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Perf_Keyed_Test_ConnectorComponentImplementation">
-    <name>Perf_Keyed_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Perf_Keyed_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="Perf_Keyed_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CCM_DDS_PerfKeyedTest_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CCM_DDS_PerfKeyedTest_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Perf_Keyed_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Perf_Keyed_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Perf_Keyed_Test_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Perf_Keyed_Test_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-  </instance>
-  <instance xmi:id="Perf_Keyed_Test_ConnectorComponentInstance">
-    <name>Perf_Keyed_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Perf_Keyed_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Perf_Keyed_Test</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>KeyedTest_Library#LatencyQoS</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="Perf_Keyed_Test_ConnectorComponentInstance2">
-    <name>Perf_Keyed_Test_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Perf_Keyed_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Perf_Keyed_Test</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>KeyedTest_Library#LatencyQoS</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="CompSvrInst">
-    <name>ComponentServerInstance</name>
-    <node>SenderNode</node>
-    <source />
-    <implementation xmi:idref="CompSvrImpl" />
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.LocalityArguments</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>-ORBSvcConfDirective "static Time_Policy_Manager '-ORBTimePolicyStrategy HR'"</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>1</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>10000</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>latency_count</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>100</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>sleep</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>spin</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>datalen</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>999</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>info_listen_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Perf_Keyed_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_listen_data_pub</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>ping_listen_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Perf_Keyed_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>ping_listen_data_control</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>ping_listen_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Perf_Keyed_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>info_listen_data_control</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Perf_Keyed_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Perf_Keyed_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>writer_connection_sub</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>write_ping_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Perf_Keyed_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>connector_status_sender</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Perf_Keyed_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="CompSvrArt">
-    <name>CompoSvrArtifactName</name>
-    <source />
-    <node />
-    <location>dance_locality_manager</location>
-  </artifact>
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="Perf_Keyed_Test_Connector_ExecArtifact">
-    <name>Perf_Keyed_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Perf_Keyed_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Perf_Keyed_Test_Connector_SvntArtifact">
-    <name>Perf_Keyed_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Perf_Keyed_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Perf_Keyed_Test_Connector_StubArtifact">
-    <name>Perf_Keyed_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Perf_Keyed_Test_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-
-  <localityConstraint>
-    <constraint>SameProcess</constraint>
-    <constrainedInstance xmi:idref="CompSvrInst" />
-    <constrainedInstance xmi:idref="SenderComponentInstance" />
-    <constrainedInstance xmi:idref="Perf_Keyed_Test_ConnectorComponentInstance" />
-  </localityConstraint>
-
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub.cdp b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub.cdp
deleted file mode 100644
index 8c54d966c8e..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub.cdp
+++ /dev/null
@@ -1,393 +0,0 @@
-<!--  -->
-<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>Perf_Keyed_Test_Depl_1</label>
-  <UUID>Perf_Keyed_Test_Depl_1</UUID>
-
-
-  <implementation xmi:id="CompSvrImpl">
-    <name>CompSvr</name>
-    <source />
-    <artifact xmi:idref="CompSvrArt" />
-    <execParameter>
-      <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>edu.vanderbilt.dre.DAnCE.LocalityManager</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Perf_Keyed_Test_ConnectorComponentImplementation">
-    <name>Perf_Keyed_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Perf_Keyed_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="Perf_Keyed_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CCM_DDS_PerfKeyedTest_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CCM_DDS_PerfKeyedTest_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Perf_Keyed_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Perf_Keyed_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Perf_Keyed_Test_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Perf_Keyed_Test_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="Perf_Keyed_Test_ConnectorComponentInstance">
-    <name>Perf_Keyed_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Perf_Keyed_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Perf_Keyed_Test</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>KeyedTest_Library#LatencyQoS</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="CompSvrInst">
-    <name>ComponentServerInstance</name>
-    <node>SenderNode</node>
-    <source />
-    <implementation xmi:idref="CompSvrImpl" />
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.LocalityArguments</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>-ORBSvcConfDirective "static Time_Policy_Manager '-ORBTimePolicyStrategy HR'"</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>1</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>0</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>latency_count</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>100</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>sleep</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>2</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>spin</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>1000</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-    <name>number_of_sub</name>
-    <value>
-      <type>
-        <kind>tk_ushort</kind>
-      </type>
-      <value>
-        <ushort>1</ushort>
-      </value>
-    </value>
-    </configProperty>
-    <configProperty>
-      <name>datalen</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>999</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-
-
-  <connection>
-    <name>info_listen_data_pub</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>ping_listen_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Perf_Keyed_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>ping_listen_data_control</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>ping_listen_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Perf_Keyed_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Perf_Keyed_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status_sender</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Perf_Keyed_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="CompSvrArt">
-    <name>CompoSvrArtifactName</name>
-    <source />
-    <node />
-    <location>dance_locality_manager</location>
-  </artifact>
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="Perf_Keyed_Test_Connector_ExecArtifact">
-    <name>Perf_Keyed_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Perf_Keyed_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Perf_Keyed_Test_Connector_SvntArtifact">
-    <name>Perf_Keyed_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Perf_Keyed_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Perf_Keyed_Test_Connector_StubArtifact">
-    <name>Perf_Keyed_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Perf_Keyed_Test_Connector_stub</location>
-  </artifact>
-
-  <localityConstraint>
-    <constraint>SameProcess</constraint>
-    <constrainedInstance xmi:idref="CompSvrInst" />
-    <constrainedInstance xmi:idref="SenderComponentInstance" />
-    <constrainedInstance xmi:idref="Perf_Keyed_Test_ConnectorComponentInstance" />
-  </localityConstraint>
-
- </Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub3.cdp b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub3.cdp
deleted file mode 100644
index 5eca7b9af73..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub3.cdp
+++ /dev/null
@@ -1,393 +0,0 @@
-<!--  -->
-<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>Perf_Keyed_Test_Depl_1</label>
-  <UUID>Perf_Keyed_Test_Depl_1</UUID>
-
-
-  <implementation xmi:id="CompSvrImpl">
-    <name>CompSvr</name>
-    <source />
-    <artifact xmi:idref="CompSvrArt" />
-    <execParameter>
-      <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>edu.vanderbilt.dre.DAnCE.LocalityManager</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Perf_Keyed_Test_ConnectorComponentImplementation">
-    <name>Perf_Keyed_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Perf_Keyed_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="Perf_Keyed_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CCM_DDS_PerfKeyedTest_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CCM_DDS_PerfKeyedTest_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Perf_Keyed_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Perf_Keyed_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Perf_Keyed_Test_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Perf_Keyed_Test_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="Perf_Keyed_Test_ConnectorComponentInstance">
-    <name>Perf_Keyed_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Perf_Keyed_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Perf_Keyed_Test</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>KeyedTest_Library#LatencyQoS</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="CompSvrInst">
-    <name>ComponentServerInstance</name>
-    <node>SenderNode</node>
-    <source />
-    <implementation xmi:idref="CompSvrImpl" />
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.LocalityArguments</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>-ORBSvcConfDirective "static Time_Policy_Manager '-ORBTimePolicyStrategy HR'"</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>1</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>0</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>latency_count</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>100</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>sleep</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>spin</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>1000</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-    <name>number_of_sub</name>
-    <value>
-      <type>
-        <kind>tk_ushort</kind>
-      </type>
-      <value>
-        <ushort>3</ushort>
-      </value>
-    </value>
-    </configProperty>
-    <configProperty>
-      <name>datalen</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>999</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-
-
-  <connection>
-    <name>info_listen_data_pub</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>ping_listen_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Perf_Keyed_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>ping_listen_data_control</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>ping_listen_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Perf_Keyed_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Perf_Keyed_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status_sender</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Perf_Keyed_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="CompSvrArt">
-    <name>CompoSvrArtifactName</name>
-    <source />
-    <node />
-    <location>dance_locality_manager</location>
-  </artifact>
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="Perf_Keyed_Test_Connector_ExecArtifact">
-    <name>Perf_Keyed_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Perf_Keyed_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Perf_Keyed_Test_Connector_SvntArtifact">
-    <name>Perf_Keyed_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Perf_Keyed_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Perf_Keyed_Test_Connector_StubArtifact">
-    <name>Perf_Keyed_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Perf_Keyed_Test_Connector_stub</location>
-  </artifact>
-
-  <localityConstraint>
-    <constraint>SameProcess</constraint>
-    <constrainedInstance xmi:idref="CompSvrInst" />
-    <constrainedInstance xmi:idref="SenderComponentInstance" />
-    <constrainedInstance xmi:idref="Perf_Keyed_Test_ConnectorComponentInstance" />
-  </localityConstraint>
-
- </Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub_BE.cdp b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub_BE.cdp
deleted file mode 100644
index e0d380e4ce0..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub_BE.cdp
+++ /dev/null
@@ -1,392 +0,0 @@
-<!--  -->
-<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>Perf_Keyed_Test_Depl_1</label>
-  <UUID>Perf_Keyed_Test_Depl_1</UUID>
-
-
-  <implementation xmi:id="CompSvrImpl">
-    <name>CompSvr</name>
-    <source />
-    <artifact xmi:idref="CompSvrArt" />
-    <execParameter>
-      <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>edu.vanderbilt.dre.DAnCE.LocalityManager</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Perf_Keyed_Test_ConnectorComponentImplementation">
-    <name>Perf_Keyed_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Perf_Keyed_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="Perf_Keyed_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CCM_DDS_PerfKeyedTest_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CCM_DDS_PerfKeyedTest_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Perf_Keyed_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Perf_Keyed_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Perf_Keyed_Test_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Perf_Keyed_Test_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="Perf_Keyed_Test_ConnectorComponentInstance">
-    <name>Perf_Keyed_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Perf_Keyed_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Perf_Keyed_Test</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>KeyedTest_Library#BestEffortQoS</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="CompSvrInst">
-    <name>ComponentServerInstance</name>
-    <node>SenderNode</node>
-    <source />
-    <implementation xmi:idref="CompSvrImpl" />
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.LocalityArguments</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>-ORBSvcConfDirective "static Time_Policy_Manager '-ORBTimePolicyStrategy HR'"</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>1</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>10000</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>latency_count</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>100</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>sleep</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>2</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>spin</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>1000</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>number_of_sub</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>3</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>datalen</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>999</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-
-
-  <connection>
-    <name>info_listen_data_pub</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>ping_listen_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Perf_Keyed_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>ping_listen_data_control</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>ping_listen_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Perf_Keyed_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Perf_Keyed_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status_sender</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Perf_Keyed_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="CompSvrArt">
-    <name>CompoSvrArtifactName</name>
-    <source />
-    <node />
-    <location>dance_locality_manager</location>
-  </artifact>
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="Perf_Keyed_Test_Connector_ExecArtifact">
-    <name>Perf_Keyed_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Perf_Keyed_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Perf_Keyed_Test_Connector_SvntArtifact">
-    <name>Perf_Keyed_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Perf_Keyed_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Perf_Keyed_Test_Connector_StubArtifact">
-    <name>Perf_Keyed_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Perf_Keyed_Test_Connector_stub</location>
-  </artifact>
-
-  <localityConstraint>
-    <constraint>SameProcess</constraint>
-    <constrainedInstance xmi:idref="CompSvrInst" />
-    <constrainedInstance xmi:idref="SenderComponentInstance" />
-  </localityConstraint>
-
- </Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_sub.cdp b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_sub.cdp
deleted file mode 100644
index 7f497be2038..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_sub.cdp
+++ /dev/null
@@ -1,247 +0,0 @@
-<!--  -->
-<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>Perf_Keyed_Test_Depl_1</label>
-  <UUID>Perf_Keyed_Test_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Perf_Keyed_Test_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Perf_Keyed_Test_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Perf_Keyed_Test_ConnectorComponentImplementation">
-    <name>Perf_Keyed_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Perf_Keyed_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="Perf_Keyed_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CCM_DDS_PerfKeyedTest_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CCM_DDS_PerfKeyedTest_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Perf_Keyed_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Perf_Keyed_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-  </instance>
-   <instance xmi:id="Perf_Keyed_Test_ConnectorComponentInstance2">
-    <name>Perf_Keyed_Test_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Perf_Keyed_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Perf_Keyed_Test</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>KeyedTest_Library#LatencyQoS</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>info_listen_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Perf_Keyed_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_listen_data_control</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Perf_Keyed_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection_sub</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>write_ping_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Perf_Keyed_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-
-  <artifact xmi:id="Perf_Keyed_Test_Connector_ExecArtifact">
-    <name>Perf_Keyed_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Perf_Keyed_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Perf_Keyed_Test_Connector_SvntArtifact">
-    <name>Perf_Keyed_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Perf_Keyed_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Perf_Keyed_Test_Connector_StubArtifact">
-    <name>Perf_Keyed_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Perf_Keyed_Test_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_sub_BE.cdp b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_sub_BE.cdp
deleted file mode 100644
index 58527776abf..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_sub_BE.cdp
+++ /dev/null
@@ -1,248 +0,0 @@
-<!--  -->
-<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>Perf_Keyed_Test_Depl_1</label>
-  <UUID>Perf_Keyed_Test_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Perf_Keyed_Test_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Perf_Keyed_Test_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Perf_Keyed_Test_ConnectorComponentImplementation">
-    <name>Perf_Keyed_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Perf_Keyed_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="Perf_Keyed_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CCM_DDS_PerfKeyedTest_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CCM_DDS_PerfKeyedTest_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Perf_Keyed_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Perf_Keyed_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-  </instance>
-   <instance xmi:id="Perf_Keyed_Test_ConnectorComponentInstance2">
-    <name>Perf_Keyed_Test_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Perf_Keyed_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Perf_Keyed_Test</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>KeyedTest_Library#BestEffortQoS</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>info_listen_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Perf_Keyed_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-
-  <connection>
-    <name>info_listen_data_control</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Perf_Keyed_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection_sub</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>write_ping_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Perf_Keyed_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-
-  <artifact xmi:id="Perf_Keyed_Test_Connector_ExecArtifact">
-    <name>Perf_Keyed_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Perf_Keyed_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Perf_Keyed_Test_Connector_SvntArtifact">
-    <name>Perf_Keyed_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Perf_Keyed_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Perf_Keyed_Test_Connector_StubArtifact">
-    <name>Perf_Keyed_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Perf_Keyed_Test_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/README b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/README
deleted file mode 100644
index 6775696acc2..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/README
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-These tests test the performance with different options.
-
--	test one publisher and one subscriber in 1 process:
-	run_test.pl with resp. Plan.cdp
-
-
--	default test (RELIABLE) , separate publisher and  subscriber:
-	run_pub.pl and run_sub.pl with resp. Plan_pub.cdp and Plan_sub.cdp .
-
--	test with one publisher and three separate subscribers:
-	run_pub3.pl with Plan_pub3.cdp  and run_sub.pl, run_sub2.pl, run_sub3.pl all with Plan_sub.cdp .
-
--	BEST_EFFORT test, separate publisher and  subscriber:
-	run_pub_BE.pl and run_sub_BE.pl with resp.  Plan_pub_BE.cdp and Plan_sub_BE.cdp .
-
-
-To test changes in the next attributes, changes this values in the publisher cdp-files:
-latency_count : indicates the number of messages minus 1 between two latency messages
-iterations : the number of messages from one instance to send. 0 = INFINITY .
-datalen: the datalen of a message (minimal 32).
-sleep:  time in ms to sleep before writing the next message
-spin: number of times to do a code loop before writing the next message, sleep has to be 0 .
-keys: number of instances. (default 1) MORE THEN 1 NOT IMPLEMENTED YET.
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index 2b998d90470..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-Description
-XML QoS Profile
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="KeyedTest_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="LatencyQoS" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>DURATION_INFINITE_SEC</sec>
-            <nanosec>DURATION_INFINITE_NSEC</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <resource_limits>
-          <max_instances>1</max_instances>
-          <initial_instances>1</initial_instances>
-          <max_samples>LENGTH_UNLIMITED</max_samples>
-          <initial_samples>100</initial_samples>
-          <max_samples_per_instance>LENGTH_UNLIMITED</max_samples_per_instance>
-        </resource_limits>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <resource_limits>
-          <initial_samples>100</initial_samples>
-          <initial_instances>1</initial_instances>
-          <max_samples>LENGTH_UNLIMITED</max_samples>
-          <max_instances>1</max_instances>
-          <max_samples_per_instance>LENGTH_UNLIMITED</max_samples_per_instance>
-        </resource_limits>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-
-    </qos_profile>
-    <qos_profile name="BestEffortQoS" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-         </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <resource_limits>
-          <max_instances>1</max_instances>
-          <initial_instances>1</initial_instances>
-          <max_samples>LENGTH_UNLIMITED</max_samples>
-          <initial_samples>100</initial_samples>
-          <max_samples_per_instance>LENGTH_UNLIMITED</max_samples_per_instance>
-        </resource_limits>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <resource_limits>
-          <initial_samples>100</initial_samples>
-          <initial_instances>1</initial_instances>
-          <max_samples>LENGTH_UNLIMITED</max_samples>
-          <max_instances>1</max_instances>
-          <max_samples_per_instance>LENGTH_UNLIMITED</max_samples_per_instance>
-        </resource_limits>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub.pl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub.pl
deleted file mode 100755
index 106b5654d7c..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub.pl
+++ /dev/null
@@ -1,225 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 1;
-@ports = ( 60001 );
-@iorbases = ( "Sender.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan_pub.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    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 < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60004 -o $ior_nsfile");
-
-$NS->Spawn ();
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60004 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60004/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$EM->Spawn ();
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$E->SpawnWaitKill (2*$tg_executor->ProcessStartWaitInterval ());
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 180 seconds to allow task to complete\n";
-sleep (180);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub3.pl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub3.pl
deleted file mode 100755
index 3cba0b8122b..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub3.pl
+++ /dev/null
@@ -1,225 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 1;
-@ports = ( 60001 );
-@iorbases = ( "Sender.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan_pub3.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    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 < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60004 -o $ior_nsfile");
-
-$NS->Spawn ();
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60004 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60004/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$EM->Spawn ();
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$E->SpawnWaitKill (2*$tg_executor->ProcessStartWaitInterval ());
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 180 seconds to allow task to complete\n";
-sleep (180);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub_BE.pl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub_BE.pl
deleted file mode 100755
index 3825e7ab803..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub_BE.pl
+++ /dev/null
@@ -1,225 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 1;
-@ports = ( 60001 );
-@iorbases = ( "Sender.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan_pub_BE.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    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 < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60004 -o $ior_nsfile");
-
-$NS->Spawn ();
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60004 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60004/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$EM->Spawn ();
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$E->SpawnWaitKill (2*$tg_executor->ProcessStartWaitInterval ());
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 180 seconds to allow task to complete\n";
-sleep (180);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub.pl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub.pl
deleted file mode 100755
index 7c1ee38890b..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub.pl
+++ /dev/null
@@ -1,225 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 1;
-@ports = ( 60002 );
-@iorbases = ( "Receiver.ior" );
-@iorfiles = 0;
-@nodenames = ( "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns1.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM1.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan_sub.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    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 < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$NS->Spawn ();
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$EM->Spawn ();
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$E->SpawnWaitKill (2*$tg_executor->ProcessStartWaitInterval ());
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 180 seconds to allow task to complete\n";
-sleep (180);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub2.pl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub2.pl
deleted file mode 100755
index fda74e578e5..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub2.pl
+++ /dev/null
@@ -1,225 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 1;
-@ports = ( 60005 );
-@iorbases = ( "Receiver.ior" );
-@iorfiles = 0;
-@nodenames = ( "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns1.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM2.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan_sub.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    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 < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60006 -o $ior_nsfile");
-
-$NS->Spawn ();
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60006 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60006/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$EM->Spawn ();
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$E->SpawnWaitKill (2*$tg_executor->ProcessStartWaitInterval ());
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 180 seconds to allow task to complete\n";
-sleep (180);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub3.pl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub3.pl
deleted file mode 100755
index acc454f47e3..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub3.pl
+++ /dev/null
@@ -1,225 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 1;
-@ports = ( 60007 );
-@iorbases = ( "Receiver.ior" );
-@iorfiles = 0;
-@nodenames = ( "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns1.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM3.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan_sub.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    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 < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60008 -o $ior_nsfile");
-
-$NS->Spawn ();
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60008 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60008/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$EM->Spawn ();
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$E->SpawnWaitKill (2*$tg_executor->ProcessStartWaitInterval ());
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 180 seconds to allow task to complete\n";
-sleep (180);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub_BE.pl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub_BE.pl
deleted file mode 100755
index 007cbba5e62..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub_BE.pl
+++ /dev/null
@@ -1,225 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 1;
-@ports = ( 60002 );
-@iorbases = ( "Receiver.ior" );
-@iorfiles = 0;
-@nodenames = ( "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns1.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM1.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan_sub_BE.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    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 < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$NS->Spawn ();
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$EM->Spawn ();
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$E->SpawnWaitKill (2*$tg_executor->ProcessStartWaitInterval ());
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 180 seconds to allow task to complete\n";
-sleep (180);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_test.pl
deleted file mode 100755
index 8768ad7f236..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_test.pl
+++ /dev/null
@@ -1,233 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$NS->Spawn ();
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$EM->Spawn ();
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2*$tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 120 seconds to allow task to complete\n";
-sleep (120);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/.gitignore b/CIAO/connectors/dds4ccm/performance-tests/Latency/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/.gitignore b/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/.gitignore
deleted file mode 100644
index 2a87f80288d..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/LatencyTT_Test_Base.cxx
-/LatencyTT_Test_Base.h
-/LatencyTT_Test_BasePlugin.cxx
-/LatencyTT_Test_BasePlugin.h
-/LatencyTT_Test_BaseSupport.cxx
-/LatencyTT_Test_BaseSupport.h
-/LatencyTT_Test_Base_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.idl b/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.idl
deleted file mode 100644
index 7de56b3076e..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * @file LatencyTT_Test_Base.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef LATENCYTT_TEST_BASE_IDL
-#define LATENCYTT_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/LatencyTT_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/LatencyTT_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "LatencyTTTest"
-
-const short MAX_DATA_SEQUENCE_LENGTH = 8192;
-
-typedef sequence<octet, MAX_DATA_SEQUENCE_LENGTH> BD_oct_seq;
-
-struct LatencyTTTest {
-  long seq_num;
-  BD_oct_seq data;
- };
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<LatencyTTTest> LatencyTTTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.mpc b/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.mpc
deleted file mode 100644
index e797df7dbac..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_LatencyTT_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_LatencyTT_Test_Base_stub
-  dynamicflags += LATENCYTT_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=LATENCYTT_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=LatencyTT_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    LatencyTT_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=LATENCYTT_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    LatencyTT_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/.gitignore b/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/.gitignore
deleted file mode 100644
index 1160975ebe2..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/LatencyTT_Test_ConnectorE.idl
-/LatencyTT_Test_Connector_conn.cpp
-/LatencyTT_Test_Connector_conn.h
-/LatencyTT_Test_Connector_conn_export.h
-/LatencyTT_Test_Connector_lem_stub_export.h
-/LatencyTT_Test_Connector_stub_export.h
-/LatencyTT_Test_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.idl b/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.idl
deleted file mode 100644
index bacb82fa723..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * @file LatencyTT_Test_Connector.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- *
- * by-hand translation of the idl3p.
- */
-
-#ifndef LATENCYTT_TEST_CONNECTOR_IDL_
-#define LATENCYTT_TEST_CONNECTOR_IDL_
-
-#include  <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/LatencyTT_Test_Base.idl"
-
-#pragma ciao lem "Connector/LatencyTT_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/LatencyTT_Test_BaseTypeSupport.idl"
-#endif
-
-module LatencyTT_Test
-{
-  module ::CCM_DDS::Typed < ::LatencyTTTest, ::LatencyTTTestSeq> LatencyTTTestConn;
-};
-
-#endif /* LatencyTT_Test_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.mpc b/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.mpc
deleted file mode 100644
index 60307471e60..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_LatencyTT_Test_Base -l .. -o ../lib -u DDS LatencyTT_Test_Connector"
-
-project(DDS_LatencyTT_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_LatencyTT_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=LATENCYTT_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=LatencyTT_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=LATENCYTT_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=LatencyTT_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=LATENCYTT_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=LatencyTT_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=LATENCYTT_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=LatencyTT_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    LatencyTT_Test_Connector.idl
-  }
-}
-
-project(DDS_LatencyTT_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_LatencyTT_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=LATENCYTT_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=LatencyTT_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    LatencyTT_Test_ConnectorE.idl
-  }
-}
-
-project(DDS_LTT_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_LatencyTT_Test_Connector_lem_gen DDS_LatencyTT_Test_Connector_stub DDS_LatencyTT_Test_Base_stub
-  libs  += DDS_LatencyTT_Test_Base_stub DDS_LatencyTT_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_LTT_Test_Connector_lem_stub
-  dynamicflags += LATENCYTT_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LatencyTT_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    LatencyTT_Test_ConnectorEC.h
-    LatencyTT_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    LatencyTT_Test_ConnectorEC.inl
-  }
-}
-
-project(DDS_LatencyTT_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_LatencyTT_Test_Connector_idl_gen DDS_LatencyTT_Test_Base_stub
-  libs  += DDS_LatencyTT_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_LatencyTT_Test_Connector_stub
-  dynamicflags += LATENCYTT_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LatencyTT_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    LatencyTT_Test_ConnectorC.h
-    LatencyTT_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    LatencyTT_Test_ConnectorC.inl
-  }
-}
-
-project(DDS_LatencyTT_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_LTT_Test_Connector_lem_stub DDS_LatencyTT_Test_Connector_stub
-  sharedname = DDS_LatencyTT_Test_Connector_exec
-  libs += DDS_LatencyTT_Test_Connector_stub DDS_LTT_Test_Connector_lem_stub DDS_LatencyTT_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += LATENCYTT_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LatencyTT_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    LatencyTT_Test_Connector_conn.h
-    LatencyTT_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_LatencyTT_Test_Connector_svnt) : ciao_servant, dds4ccm_skel, dds4ccm_lem_stub {
-  after      += DDS_LTT_Test_Connector_lem_stub DDS_LatencyTT_Test_Connector_exec DDS_LatencyTT_Test_Connector_stub
-  sharedname  = DDS_LatencyTT_Test_Connector_svnt
-  libs       += DDS_LatencyTT_Test_Connector_stub \
-                DDS_LTT_Test_Connector_lem_stub  \
-                DDS_LatencyTT_Test_Base_stub \
-                DDS_LatencyTT_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += LATENCYTT_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LatencyTT_Test_ConnectorS.cpp
-    LatencyTT_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    LatencyTT_Test_ConnectorS.h
-    LatencyTT_Test_Connector_svnt.h
-    LatencyTT_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/.gitignore b/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/.gitignore
deleted file mode 100644
index 14c8f0250ee..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/LatencyTT_Test_ReceiverE.idl
-/Receiver_exec_export.h
-/Receiver_lem_stub_export.h
-/Receiver_stub_export.h
-/Receiver_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver.idl b/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver.idl
deleted file mode 100644
index d75c6a1a3fe..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver.idl
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * @file
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/LatencyTT_Test_Connector.idl"
-
-module LatencyTT_Test
-{
-  component Receiver
-  {
-    port LatencyTTTestConn::DDS_Listen info_listen;
-    port LatencyTTTestConn::DDS_Write write_ping;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver.mpc
deleted file mode 100644
index 8782e264bfe..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver.mpc
+++ /dev/null
@@ -1,148 +0,0 @@
-project(DDS_LatencyTT_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_LatencyTT_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h \
-              -I..
-
-  IDL_Files {
-    LatencyTT_Test_Receiver.idl
-  }
-}
-
-project(DDS_LatencyTT_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_LatencyTT_Test_Receiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    LatencyTT_Test_ReceiverE.idl
-  }
-}
-
-project(DDS_LatencyTT_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_LatencyTT_Test_Receiver_lem_gen DDS_LatencyTT_Test_Receiver_stub  \
-           DDS_LatencyTT_Test_Connector_stub DDS_LatencyTT_Test_Base_stub
-  libs  +=  Receiver_stub DDS_LatencyTT_Test_Connector_stub \
-            DDS_LatencyTT_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LatencyTT_Test_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    LatencyTT_Test_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    LatencyTT_Test_ReceiverEC.inl
-  }
-}
-
-project(DDS_LatencyTT_Test_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_LatencyTT_Test_Receiver_idl_gen  DDS_LatencyTT_Test_Connector_stub \
-           DDS_LatencyTT_Test_Base_stub DDS_LatencyTT_Test_Connector_lem_gen
-  libs  += DDS_LatencyTT_Test_Connector_stub DDS_LatencyTT_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LatencyTT_Test_ReceiverC.cpp
-  }
-
-  Header_Files {
-    LatencyTT_Test_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    LatencyTT_Test_ReceiverC.inl
-  }
-}
-
-project(DDS_LatencyTT_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_LatencyTT_Test_Receiver_lem_stub DDS_LatencyTT_Test_Receiver_stub \
-             DDS_LatencyTT_Test_Base_stub DDS_LatencyTT_Test_Connector_stub \
-             DDS_LTT_Test_Connector_lem_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_LatencyTT_Test_Base_stub \
-          DDS_LatencyTT_Test_Connector_stub DDS_LTT_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LatencyTT_Test_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    LatencyTT_Test_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_LatencyTT_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_LatencyTT_Test_Receiver_lem_stub DDS_LatencyTT_Test_Base_stub \
-                  DDS_LatencyTT_Test_Connector_stub DDS_LatencyTT_Test_Connector_svnt \
-                  DDS_LatencyTT_Test_Receiver_exec DDS_LTT_Test_Connector_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_LatencyTT_Test_Base_stub \
-                DDS_LatencyTT_Test_Connector_stub DDS_LatencyTT_Test_Connector_svnt \
-                DDS_LatencyTT_Test_Connector_stub \
-                Receiver_exec DDS_LTT_Test_Connector_lem_stub
-
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LatencyTT_Test_ReceiverS.cpp
-    LatencyTT_Test_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    LatencyTT_Test_ReceiverS.h
-    LatencyTT_Test_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver_exec.cpp
deleted file mode 100644
index 168bb9fc4ad..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver_exec.cpp
+++ /dev/null
@@ -1,183 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "LatencyTT_Test_Receiver_exec.h"
-
-namespace CIAO_LatencyTT_Test_Receiver_Impl
-{
-
-  /**
-   * Facet Executor Implementation Class: info_listen_data_listener_exec_i
-   */
-
-  info_listen_data_listener_exec_i::info_listen_data_listener_exec_i (
-        ::LatencyTT_Test::CCM_Receiver_Context_ptr ctx,
-        Receiver_exec_i &callback)
-    : ciao_context_ (
-        ::LatencyTT_Test::CCM_Receiver_Context::_duplicate (ctx))
-      , callback_ (callback)
-  {
-  }
-
-  info_listen_data_listener_exec_i::~info_listen_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::LatencyTT_Test::LatencyTTTestConn::Listener
-
-  void
-  info_listen_data_listener_exec_i::on_one_data (const ::LatencyTTTest & datum,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    this->callback_.write_one (datum);
-  }
-
-  void
-  info_listen_data_listener_exec_i::on_many_data (const ::LatencyTTTestSeq & /* data */,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : count_ (0L)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-  void
-  Receiver_exec_i::write_one (const LatencyTTTest & an_instance)
-  {
-    ++this->count_;
-    this->writer_->write_one(an_instance, ::DDS::HANDLE_NIL);
-  }
-
-  void
-  Receiver_exec_i::start ()
-  {
-    ::CCM_DDS::DataListenerControl_var dlc =
-      this->ciao_context_->get_connection_info_listen_data_control ();
-    dlc->mode (::CCM_DDS::ONE_BY_ONE);
-  }
-
-  // Component attributes and port operations.
-
-  ::LatencyTT_Test::LatencyTTTestConn::CCM_Listener_ptr
-  Receiver_exec_i::get_info_listen_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_listen_data_listener_.in ()))
-      {
-        info_listen_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_listen_data_listener_exec_i (
-            this->ciao_context_.in (),
-            *this),
-            ::LatencyTT_Test::LatencyTTTestConn::CCM_Listener::_nil ());
-
-          this->ciao_info_listen_data_listener_ = tmp;
-      }
-
-    return
-      ::LatencyTT_Test::LatencyTTTestConn::CCM_Listener::_duplicate (
-        this->ciao_info_listen_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_listen_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::LatencyTT_Test::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-     this->writer_ = this->ciao_context_->get_connection_write_ping_data ();
-    // Enable the datalistener.
-    this->start();
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    if (this->count_ == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR RECEIVER: No messages sent back.\n"));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "SUMMARY RECEIVER:\n "
-                              "Total number of messages sent back: %u \n",
-                              this->count_));
-      }
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_LatencyTT_Test_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver_exec.h
deleted file mode 100644
index 7ccbf144b4e..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver_exec.h
+++ /dev/null
@@ -1,144 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_LATENCYTT_TEST_RECEIVER_EXEC_SYGLHE_H_
-#define CIAO_LATENCYTT_TEST_RECEIVER_EXEC_SYGLHE_H_
-
-#include /**/ "ace/pre.h"
-
-#include "LatencyTT_Test_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_LatencyTT_Test_Receiver_Impl
-{
-  class Receiver_exec_i;
-
-  /**
-   * Provider Executor Implementation Class: info_listen_data_listener_exec_i
-   */
-
-  class info_listen_data_listener_exec_i
-    : public virtual ::LatencyTT_Test::LatencyTTTestConn::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_listen_data_listener_exec_i (
-      ::LatencyTT_Test::CCM_Receiver_Context_ptr ctx,
-      Receiver_exec_i &callback);
-    virtual ~info_listen_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from LatencyTT_Test::LatencyTTTestConn::Listener. */
-
-    virtual
-    void on_one_data (const ::LatencyTTTest & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (const ::LatencyTTTestSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    ::LatencyTT_Test::CCM_Receiver_Context_var ciao_context_;
-    Receiver_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::LatencyTT_Test::LatencyTTTestConn::CCM_Listener_ptr
-    get_info_listen_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_listen_status (void);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void write_one (const LatencyTTTest & an_instance);
-
-    //@}
-
-  private:
-    ::LatencyTT_Test::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::LatencyTT_Test::LatencyTTTestConn::CCM_Listener_var ciao_info_listen_data_listener_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    CORBA::ULong count_;
-    ::LatencyTT_Test::LatencyTTTestConn::Writer_var writer_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void start (void);
-
-    //@}
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_LatencyTT_Test_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/.gitignore b/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/.gitignore
deleted file mode 100644
index 8a0cb781646..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/LatencyTT_Test_SenderE.idl
-/Sender_exec_export.h
-/Sender_lem_stub_export.h
-/Sender_stub_export.h
-/Sender_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender.idl b/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender.idl
deleted file mode 100644
index 91e2ef8f7fe..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef DDS_LATENCYTT_TEST_SENDER_IDL
-#define DDS_LATENCYTT_TEST_SENDER_IDL
-
-#include "Connector/LatencyTT_Test_Connector.idl"
-
-module LatencyTT_Test
-{
-  component Sender
-  {
-    port LatencyTTTestConn::DDS_Write info_write;
-    port LatencyTTTestConn::DDS_Listen ping_listen;
-
-    provides CCM_DDS::ConnectorStatusListener connector_status;
-
-    attribute unsigned long iterations;
-    attribute unsigned short sleep;
-    attribute unsigned short number_of_sub; //number of subscribers
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender.mpc b/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender.mpc
deleted file mode 100644
index afb0b7a38af..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender.mpc
+++ /dev/null
@@ -1,144 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_LatencyTT_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_LatencyTT_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_LatencyTT_Test_Connector_idl_gen DDS_Starter_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I..
-
-  IDL_Files {
-    LatencyTT_Test_Sender.idl
-  }
-}
-
-project(DDS_LatencyTT_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_LatencyTT_Test_Sender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    LatencyTT_Test_SenderE.idl
-  }
-}
-
-project(DDS_LatencyTT_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_LatencyTT_Test_Sender_lem_gen DDS_LatencyTT_Test_Sender_stub \
-           DDS_LatencyTT_Test_Base_stub
-  libs  += DDS_LatencyTT_Test_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LatencyTT_Test_SenderEC.cpp
-  }
-
-  Header_Files {
-    LatencyTT_Test_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    LatencyTT_Test_SenderEC.inl
-  }
-}
-
-project(DDS_LatencyTT_Test_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_LatencyTT_Test_Sender_idl_gen DDS_LatencyTT_Test_Base_stub \
-           DDS_LatencyTT_Test_Connector_stub
-  libs  += DDS_LatencyTT_Test_Base_stub DDS_LatencyTT_Test_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LatencyTT_Test_SenderC.cpp
-  }
-
-  Header_Files {
-    LatencyTT_Test_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    LatencyTT_Test_SenderC.inl
-  }
-}
-
-project(DDS_LatencyTT_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_LatencyTT_Test_Sender_lem_stub DDS_LatencyTT_Test_Sender_stub \
-             DDS_LTT_Test_Connector_lem_stub DDS_LatencyTT_Test_Connector_stub
-  sharedname = Sender_exec
-  libs    += Sender_stub Sender_lem_stub DDS_LatencyTT_Test_Base_stub \
-             DDS_LTT_Test_Connector_lem_stub DDS_LatencyTT_Test_Connector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LatencyTT_Test_Sender_exec.cpp
-  }
-
-  Header_Files {
-    LatencyTT_Test_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-project(DDS_LatencyTT_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_LatencyTT_Test_Base_stub  DDS_LatencyTT_Test_Sender_lem_stub \
-                DDS_LatencyTT_Test_Connector_stub \
-                DDS_LatencyTT_Test_Connector_svnt DDS_LTT_Test_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub DDS_LatencyTT_Test_Base_stub \
-                DDS_LatencyTT_Test_Connector_stub DDS_LatencyTT_Test_Connector_svnt \
-                DDS_LTT_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LatencyTT_Test_SenderS.cpp
-    LatencyTT_Test_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    LatencyTT_Test_SenderS.h
-    LatencyTT_Test_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.cpp
deleted file mode 100644
index 41c9267aef7..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.cpp
+++ /dev/null
@@ -1,691 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "LatencyTT_Test_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-#include "ace/OS_NS_math.h"
-
-#include "ace/Timer_Queue.h"
-#include "ace/High_Res_Timer.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-namespace CIAO_LatencyTT_Test_Sender_Impl
-{
-  static int compare_two_longs (const void *long1, const void *long2)
-  {
-    return (int)(*(ACE_UINT64*)long1 - *(ACE_UINT64*)long2);
-  }
-
-  /**
-   * WriteTicker
-   */
-
-  WriteTicker::WriteTicker (Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  WriteTicker::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    // Notify the subscribers
-    this->callback_.write_one ();
-    return 0;
-  }
-
-  /**
-   * Facet Executor Implementation Class: ping_listen_data_listener_exec_i
-   */
-
-  ping_listen_data_listener_exec_i::ping_listen_data_listener_exec_i (
-        ::LatencyTT_Test::CCM_Sender_Context_ptr ctx,
-        Sender_exec_i &callback)
-    : ciao_context_ (
-        ::LatencyTT_Test::CCM_Sender_Context::_duplicate (ctx))
-      , callback_ (callback)
-  {
-  }
-
-  ping_listen_data_listener_exec_i::~ping_listen_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::LatencyTT_Test::LatencyTTTestConn::Listener
-
-  void
-  ping_listen_data_listener_exec_i::on_one_data (const ::LatencyTTTest & datum,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    ACE_UINT64  receive_time = 0;
-    ACE_High_Res_Timer::gettimeofday_hr ().to_usec (receive_time);
-    this->callback_.read(const_cast<LatencyTTTest&> (datum), receive_time);
-  }
-
-  void
-  ping_listen_data_listener_exec_i::on_many_data (const ::LatencyTTTestSeq & /* data */,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: connector_status_exec_i
-   */
-
-  connector_status_exec_i::connector_status_exec_i (
-        ::LatencyTT_Test::CCM_Sender_Context_ptr ctx,
-        Sender_exec_i &callback,
-        Atomic_Boolean &matched,
-        int number_of_subscribers,
-        Atomic_Long &unexpected_count)
-    : ciao_context_ (
-        ::LatencyTT_Test::CCM_Sender_Context::_duplicate (ctx))
-      , callback_ (callback)
-      , matched_ (matched)
-      , number_of_subscribers_ (number_of_subscribers)
-      , unexpected_count_(unexpected_count)
-  {
-  }
-
-  connector_status_exec_i::~connector_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-
-  void
-  connector_status_exec_i::on_inconsistent_topic (::DDS::Topic_ptr /* the_topic */,
-  const ::DDS::InconsistentTopicStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  connector_status_exec_i::on_requested_incompatible_qos (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedIncompatibleQosStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  connector_status_exec_i::on_sample_rejected (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleRejectedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  connector_status_exec_i::on_offered_deadline_missed (::DDS::DataWriter_ptr /* the_writer */,
-  const ::DDS::OfferedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  connector_status_exec_i::on_offered_incompatible_qos (::DDS::DataWriter_ptr /* the_writer */,
-  const ::DDS::OfferedIncompatibleQosStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  connector_status_exec_i::on_unexpected_status (::DDS::Entity_ptr the_entity,
-  ::DDS::StatusKind status_kind)
-  {
-    ++this->unexpected_count_;
-    if (! ::CORBA::is_nil (the_entity) &&
-        status_kind == DDS::PUBLICATION_MATCHED_STATUS)
-      {
-        ::DDS::PublicationMatchedStatus_var stat;
-        ::DDS::DataWriter_var wr = ::DDS::DataWriter::_narrow(the_entity);
-        if(::CORBA::is_nil(wr))
-          {
-            throw ::CORBA::INTERNAL ();
-          }
-        ::DDS::ReturnCode_t retval = wr->get_publication_matched_status (stat.out ());
-        if (retval == DDS::RETCODE_OK)
-          {
-            if (stat.in ().current_count >= this->number_of_subscribers_ &&
-                !this->matched_.value())
-              {
-                this->matched_ = true;
-                this->callback_.start();
-              }
-          }
-      }
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : iterations_ (1000)
-      , sleep_ (10)
-      , number_of_sub_ (1)
-
-      , datalen_ (100)
-      , datalen_idx_ (0)
-      , nr_of_runs_ (10)
-      , matched_ (false)
-      , tv_total_ (0L)
-      , tv_max_ (0L)
-      , tv_min_ (0L)
-      , count_ (0)
-      , number_of_msg_ (0)  // Number of sent messages
-      , timer_ (false)
-      , received_ (false)
-      , seq_num_ (0)
-      , sigma_duration_squared_ (0)
-      , start_time_ (0)
-      , start_time_test_ (0)
-      , end_time_test_ (0)
-      , duration_times_ (0)
-      , datalen_range_ (0)
-      , _clock_overhead_ (0)
-      , unexpected_count_ (0)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      WriteTicker (*this),
-                      ::CORBA::NO_MEMORY ());
-    ACE_NEW_THROW_EX (this->datalen_range_,
-                      ::CORBA::Short[this->nr_of_runs_],
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->ticker_;
-    delete [] this->duration_times_;
-    delete [] datalen_range_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Sender_exec_i::write_one (void)
-  {
-    if (this->number_of_msg_ == 0 && this->datalen_idx_ == 0)
-      {
-        ACE_High_Res_Timer::gettimeofday_hr ().to_usec (this->start_time_test_);
-      }
-    // First message sent always, next messages only as previous sent message
-    // is received back.
-    if (this->number_of_msg_ == 0 || this->received_.value ())
-    {
-      // All messages send, stop timer.
-      if (this->iterations_ != 0 &&
-          this->number_of_msg_ >= this->iterations_)
-        {
-           if( this->datalen_idx_ >= (this->nr_of_runs_ - 1))
-            {
-              this->stop ();
-              this->timer_ = false;
-              this->calc_results ();
-              ACE_High_Res_Timer::gettimeofday_hr ().to_usec (this->end_time_test_);
-
-             }
-          else
-            {
-              this->calc_results ();
-              this->reset_results ();
-              ++this->datalen_idx_;
-              this->datalen_ = this->datalen_range_[this->datalen_idx_];
-              this->test_topic_.data.length (this->datalen_);
-            }
-        }
-      else
-        {
-        try
-          {
-            this->test_topic_.seq_num =  this->number_of_msg_;
-
-            // Keep last sent seq_num, to control if message is sent back.
-            this->seq_num_ = this->number_of_msg_;
-            this->received_ = false;
-            ACE_High_Res_Timer::gettimeofday_hr ().to_usec (this->start_time_);
-            this->writer_->write_one (this->test_topic_, ::DDS::HANDLE_NIL);
-          }
-        catch (const CCM_DDS::InternalError& )
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                        ACE_TEXT ("while wrinting sample with sequence_number <%u>.\n"),
-                        this->test_topic_.seq_num));
-          }
-        ++this->number_of_msg_;
-       }
-    }
-  }
-
-  void
-  Sender_exec_i::read (LatencyTTTest & an_instance, ACE_UINT64 receive_time)
-  {
-    if (an_instance.seq_num == this->seq_num_)
-      {
-        this->record_time (receive_time);
-        this->received_ = true;
-      }
-  }
-
-  void
-  Sender_exec_i::reset_results()
-  {
-    delete [] this->duration_times_;
-    this->count_ = 0;
-
-    ACE_NEW_THROW_EX (this->duration_times_,
-                      ACE_UINT64[this->iterations_],
-                      ::CORBA::NO_MEMORY ());
-
-    this->tv_total_ = 0L;
-    this->tv_max_ = 0L;
-    this->tv_min_ = 0L;
-    this->number_of_msg_ = 0;
-    this->received_ = false;
-    this->seq_num_ = 0;
-    this->sigma_duration_squared_ = 0;
-  }
-
-  void
-  Sender_exec_i::calc_results (void)
-  {
-    // Sort all duration times.
-    qsort(this->duration_times_,
-          this->count_,
-          sizeof(ACE_UINT64),
-          compare_two_longs);
-
-    // Show latency_50_percentile, latency_90_percentile,
-    // latency_99_percentile and latency_99.99_percentile.
-    // For example duration_times[per50] is the median i.e. 50% of the
-    // samples have a latency time <= duration_times[per50]
-    int const per50 = this->count_ / 2;
-    int const per90 = (int)(this->count_ * 0.90);
-    int const per99 = (int)(this->count_ * 0.990);
-    int const per9999 = (int)(this->count_ * 0.9999);
-
-    double const avg = (double)(this->tv_total_ / this->count_);
-    // Calculate standard deviation.
-    double const roundtrip_time_std  = sqrt(
-        (this->sigma_duration_squared_ / (double)this->count_) -
-        (avg * avg));
-
-    // Show values as float, in order to be comparable with RTI performance test.
-    if (this->count_ > 0)
-      {
-        if (this->datalen_idx_ == 0)
-          {
-            #if (CIAO_DDS4CCM_CONTEXT_SWITCH==1)
-              ACE_DEBUG ((LM_DEBUG, "\n\nYES, we're using a threadswitch between "
-                                    "DDS and CCM\n\n"));
-            #else
-              ACE_DEBUG ((LM_DEBUG, "\n\nNO, we're not using a threadswitch between "
-                                    "DDS and CCM\n\n"));
-            #endif
-            ACE_DEBUG ((LM_DEBUG,
-             "Collecting statistics on %d samples per message size.\n"
-             "This is the roundtrip time, *not* the one-way-latency\n"
-             "bytes ,stdev us,ave us, min us, 50%% us, 90%% us, 99%% us, 99.99%%,"
-             " max us\n"
-             "------,-------,-------,-------,-------,-------,-------,-------,"
-              "-------\n"
-             "%6d,%7.1f,%7.1f,%7.1f,%7.1f,%7.1f,%7.1f,%7.1f,%7.1f\n",
-              this->count_,
-              this->datalen_,
-              roundtrip_time_std,
-              avg,
-              (double)this->tv_min_,
-              (double)this->duration_times_[per50-1],
-              (double)this->duration_times_[per90-1],
-              (double)this->duration_times_[per99-1],
-              (double)this->duration_times_[per9999-1],
-              (double)this->tv_max_));
-          }
-        else
-          {
-            ACE_DEBUG ((LM_DEBUG,
-              "%6d,%7.1f,%7.1f,%7.1f,%7.1f,%7.1f,%7.1f,%7.1f,%7.1f\n",
-              this->datalen_,
-              roundtrip_time_std,
-              avg,
-              (double)this->tv_min_,
-              (double)this->duration_times_[per50-1],
-              (double)this->duration_times_[per90-1],
-              (double)this->duration_times_[per99-1],
-              (double)this->duration_times_[per9999-1],
-              (double)this->tv_max_));
-          }
-       }
-     else
-       {
-         ACE_ERROR ((LM_ERROR, "SUMMARY SENDER latency time:\n "
-                               "No samples received back.\n"));
-       }
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    // This->sleep_ is in ms
-    unsigned int sec = this->sleep_ / 1000;
-    unsigned int usec = (this->sleep_ % 1000) * 1000;
-    ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start - "
-              "Start test with interval <%u.%u>\n",
-              sec, usec));
-    if (this->reactor ()->schedule_timer(
-                    this->ticker_,
-                    0,
-                    ACE_Time_Value (5, 0),
-                    ACE_Time_Value (sec, usec)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                              ACE_TEXT ("Error scheduling timer")));
-      }
-    this->timer_ = true;
-  }
-
-  void
-  Sender_exec_i::stop (void)
-  {
-    if (this->timer_.value ())
-      {
-        this->reactor ()->cancel_timer (this->ticker_);
-      }
-  }
-
-  void
-  Sender_exec_i::record_time (ACE_UINT64 receive_time)
-  {
-    ACE_UINT64 interval = receive_time - this->start_time_;
-    ACE_UINT64 duration = interval - this->_clock_overhead_;
-    int i = ++this->count_;
-    this->duration_times_[i-1] = duration;
-    this->sigma_duration_squared_ += (double)duration * (double)duration;
-    this->tv_total_ += duration;
-    if (duration > this->tv_max_ || this->tv_max_ == 0L)
-      {
-        this->tv_max_ = duration;
-      }
-    if (duration < this->tv_min_ || this->tv_min_ == 0L)
-      {
-        this->tv_min_ = duration;
-      }
-  }
-
-  void
-  Sender_exec_i::calculate_clock_overhead (void)
-  {
-    int num_of_loops_clock = 320;
-    ACE_UINT64 begin_time = 0;
-    ACE_UINT64 clock_roundtrip_time = 0;
-    ACE_High_Res_Timer::gettimeofday_hr ().to_usec (begin_time);
-    for (int i = 0; i < num_of_loops_clock; ++i)
-      {
-        ACE_High_Res_Timer::gettimeofday_hr ().to_usec (clock_roundtrip_time);
-      }
-    ACE_UINT64 total_time =  clock_roundtrip_time - begin_time;
-    this->_clock_overhead_ = (long)(total_time / num_of_loops_clock);
-  }
-
-  void
-  Sender_exec_i::init_values (void)
-  {
-    delete [] this->duration_times_;
-    ACE_NEW_THROW_EX (this->duration_times_,
-                      ACE_UINT64[this->iterations_],
-                      ::CORBA::NO_MEMORY ());
-    int start = 16;
-    for (int i = 0; i < this->nr_of_runs_; i++)
-      {
-        this->datalen_range_[i] = start;
-        start = 2 * start;
-      }
-
-    this->datalen_ = this->datalen_range_[0];
-
-    // make instances of Topic
-    this->test_topic_.seq_num = 0;
-    this->test_topic_.data.length (this->datalen_);
-    calculate_clock_overhead ();
-  }
-
-  // Component attributes and port operations.
-
-  ::LatencyTT_Test::LatencyTTTestConn::CCM_Listener_ptr
-  Sender_exec_i::get_ping_listen_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_ping_listen_data_listener_.in ()))
-      {
-        ping_listen_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          ping_listen_data_listener_exec_i (
-            this->ciao_context_.in (),
-            *this),
-            ::LatencyTT_Test::LatencyTTTestConn::CCM_Listener::_nil ());
-
-          this->ciao_ping_listen_data_listener_ = tmp;
-      }
-
-    return
-      ::LatencyTT_Test::LatencyTTTestConn::CCM_Listener::_duplicate (
-        this->ciao_ping_listen_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Sender_exec_i::get_ping_listen_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_connector_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_connector_status_.in ()))
-      {
-        connector_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          connector_status_exec_i (
-            this->ciao_context_.in (),
-            *this,
-            this->matched_,
-            this->number_of_sub_,
-            this->unexpected_count_),
-          ::CCM_DDS::CCM_ConnectorStatusListener::_nil ());
-
-          this->ciao_connector_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_ConnectorStatusListener::_duplicate (
-        this->ciao_connector_status_.in ());
-  }
-
-  ::CORBA::ULong
-  Sender_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (
-    const ::CORBA::ULong iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::sleep (void)
-  {
-    return this->sleep_;
-  }
-
-  void
-  Sender_exec_i::sleep (
-    const ::CORBA::UShort sleep)
-  {
-    this->sleep_ = sleep;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::number_of_sub (void)
-  {
-    return this->number_of_sub_;
-  }
-
-  void
-  Sender_exec_i::number_of_sub (
-    const ::CORBA::UShort number_of_sub)
-  {
-    if (number_of_sub > 0)
-      {
-        this->number_of_sub_ = number_of_sub;
-      }
-    else
-      {
-        this->number_of_sub_ = 1;
-      }
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::LatencyTT_Test::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-    try
-      {
-        this->writer_ = this->ciao_context_->get_connection_info_write_data ();
-        ::CCM_DDS::DataListenerControl_var dlc =
-            this->ciao_context_->get_connection_ping_listen_data_control ();
-        dlc->mode (::CCM_DDS::ONE_BY_ONE);
-      }
-    catch (const CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("Exception caught:");
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Sender_exec_i::ccm_activate: Exception caught\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Sender_exec_i::ccm_activate: Unknown exception caught\n")));
-      }
-    this->init_values();
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    this->stop ();
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    if (this->nr_of_runs_ -1 != this->datalen_idx_)
-      {
-        if (this->datalen_idx_ == 0)
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR SENDER: No run has taken place.\n"));
-          }
-        else
-          {
-            ACE_DEBUG ((LM_DEBUG, "SUMMARY SENDER : %u of %u runs completed.\n"
-                                " Number of messages sent of last run (%u): %u\n",
-                              this->datalen_idx_,
-                              this->nr_of_runs_,
-                              this->datalen_idx_ + 1,
-                              this->number_of_msg_));
-          }
-      }
-    else
-      {
-        ACE_UINT64 test_time_usec = this->end_time_test_ -
-                                    this->start_time_test_;
-
-        double sec = (double)test_time_usec / (1000 * 1000);
-        ACE_DEBUG ((LM_DEBUG, "TEST successful, number of runs (%u) of "
-                              "%u messages in %3.3f seconds.\n",
-                               this->nr_of_runs_,
-                               this->number_of_msg_, sec));
-      }
-    ACE_DEBUG ((LM_DEBUG, "\tNumber of unexpected events : %u\n",
-                  this->unexpected_count_.value ()));
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_LatencyTT_Test_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.h
deleted file mode 100644
index 66333f35cd8..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.h
+++ /dev/null
@@ -1,269 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_LATENCYTT_TEST_SENDER_EXEC_CAXIAK_H_
-#define CIAO_LATENCYTT_TEST_SENDER_EXEC_CAXIAK_H_
-
-#include /**/ "ace/pre.h"
-
-#include "LatencyTT_Test_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_LatencyTT_Test_Sender_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Long > Atomic_Long;
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean> Atomic_Boolean;
-
-  class Sender_exec_i;
-
-  /**
-   * Write action generator
-   */
-
-  class WriteTicker :
-    public ACE_Event_Handler
-  {
-  public:
-    WriteTicker (Sender_exec_i &callback);
-    int handle_timeout (const ACE_Time_Value &, const void *);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: ping_listen_data_listener_exec_i
-   */
-
-  class ping_listen_data_listener_exec_i
-    : public virtual ::LatencyTT_Test::LatencyTTTestConn::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ping_listen_data_listener_exec_i (
-      ::LatencyTT_Test::CCM_Sender_Context_ptr ctx,
-      Sender_exec_i &callback);
-    virtual ~ping_listen_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from LatencyTT_Test::LatencyTTTestConn::Listener. */
-
-    virtual
-    void on_one_data (const ::LatencyTTTest & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (const ::LatencyTTTestSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    ::LatencyTT_Test::CCM_Sender_Context_var ciao_context_;
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: connector_status_exec_i
-   */
-
-  class connector_status_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    connector_status_exec_i (
-      ::LatencyTT_Test::CCM_Sender_Context_ptr ctx,
-      Sender_exec_i &callback,
-      Atomic_Boolean &matched,
-      int number_of_subscribers,
-      Atomic_Long &unexpected_count);
-    virtual ~connector_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-    const ::DDS::InconsistentTopicStatus & status);
-
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedIncompatibleQosStatus & status);
-
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleRejectedStatus & status);
-
-    virtual
-    void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-    const ::DDS::OfferedDeadlineMissedStatus & status);
-
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-    const ::DDS::OfferedIncompatibleQosStatus & status);
-
-    virtual
-    void on_unexpected_status (::DDS::Entity_ptr the_entity,
-    ::DDS::StatusKind status_kind);
-    //@}
-
-  private:
-    ::LatencyTT_Test::CCM_Sender_Context_var ciao_context_;
-    Sender_exec_i &callback_;
-    Atomic_Boolean &matched_;
-    int number_of_subscribers_;
-    Atomic_Long &unexpected_count_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::LatencyTT_Test::LatencyTTTestConn::CCM_Listener_ptr
-    get_ping_listen_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_ping_listen_status (void);
-
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_connector_status (void);
-
-    virtual ::CORBA::ULong iterations (void);
-
-    virtual void iterations (::CORBA::ULong iterations);
-
-    virtual ::CORBA::UShort sleep (void);
-
-    virtual void sleep (::CORBA::UShort sleep);
-
-    virtual ::CORBA::UShort number_of_sub (void);
-
-    virtual void number_of_sub (::CORBA::UShort number_of_sub);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void write_one (void);
-    void read (LatencyTTTest & instance, ACE_UINT64 receive_time);
-    void start (void);
-
-    //@}
-
-  private:
-    ::LatencyTT_Test::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::LatencyTT_Test::LatencyTTTestConn::CCM_Listener_var ciao_ping_listen_data_listener_;
-    ::CCM_DDS::CCM_ConnectorStatusListener_var ciao_connector_status_;
-
-    ::CORBA::ULong iterations_;
-
-    ::CORBA::UShort sleep_;
-
-    ::CORBA::UShort number_of_sub_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    ::LatencyTT_Test::LatencyTTTestConn::Writer_var writer_;
-    WriteTicker *ticker_;
-
-    ::CORBA::UShort datalen_;
-    ::CORBA::UShort datalen_idx_;
-    ::CORBA::UShort nr_of_runs_;
-    Atomic_Boolean matched_;
-    ACE_UINT64 tv_total_;
-    ACE_UINT64 tv_max_;
-    ACE_UINT64 tv_min_;
-    ::CORBA::UShort count_;
-    ::CORBA::UShort number_of_msg_;
-    Atomic_Boolean timer_;
-    Atomic_Boolean received_;
-    ::CORBA::Long seq_num_;
-    ::CORBA::Double sigma_duration_squared_;
-    ACE_UINT64 start_time_;
-    ACE_UINT64 start_time_test_;
-    ACE_UINT64 end_time_test_;
-
-    LatencyTTTest test_topic_;
-    ACE_UINT64* duration_times_;
-    ::CORBA::Short* datalen_range_;
-    ::CORBA::Long _clock_overhead_;
-    Atomic_Long unexpected_count_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void stop (void);
-    void calc_results (void);
-    void reset_results (void);
-    void init_values (void);
-    void calculate_clock_overhead (void);
-    void record_time (ACE_UINT64 receive_time);
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_LatencyTT_Test_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Latency_Library.xml b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Latency_Library.xml
deleted file mode 100644
index 713d330f43f..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Latency_Library.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-
-
-  <qos_profile name="UDPv4QoS">
-
-    <datawriter_qos>
-      <reliability>
-        <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-      </reliability>
-      <history>
-        <kind>KEEP_LAST_HISTORY_QOS</kind>
-        <depth>1</depth>
-      </history>
-      <durability>
-        <kind>VOLATILE_DURABILITY_QOS</kind>
-      </durability>
-      <resource_limits>
-        <max_instances>1</max_instances>
-        <initial_instances>1</initial_instances>
-        <max_samples>3</max_samples>
-        <initial_samples>3</initial_samples>
-        <max_samples_per_instance>3</max_samples_per_instance>
-      </resource_limits>
-    </datawriter_qos>
-
-    <datareader_qos>
-      <reliability>
-        <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-      </reliability>
-      <history>
-        <kind>KEEP_LAST_HISTORY_QOS</kind>
-        <depth>1</depth>
-      </history>
-      <resource_limits>
-        <initial_samples>100</initial_samples>
-        <initial_instances>1</initial_instances>
-        <max_samples>LENGTH_UNLIMITED</max_samples>
-        <max_instances>1</max_instances>
-        <max_samples_per_instance>LENGTH_UNLIMITED</max_samples_per_instance>
-      </resource_limits>
-      <durability>
-        <kind>VOLATILE_DURABILITY_QOS</kind>
-      </durability>
-    </datareader_qos>
-  </qos_profile>
-
-  <qos_profile name="SharedMemQos">
-
-    <datawriter_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-      </reliability>
-      <durability>
-        <kind>VOLATILE_DURABILITY_QOS</kind>
-      </durability>
-      <resource_limits>
-        <max_instances>1</max_instances>
-        <initial_instances>1</initial_instances>
-        <max_samples>LENGTH_UNLIMITED</max_samples>
-        <initial_samples>100</initial_samples>
-        <max_samples_per_instance>LENGTH_UNLIMITED</max_samples_per_instance>
-      </resource_limits>
-    </datawriter_qos>
-
-    <datareader_qos>
-      <reliability>
-        <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-      </reliability>
-      <resource_limits>
-        <initial_samples>100</initial_samples>
-        <initial_instances>1</initial_instances>
-        <max_samples>LENGTH_UNLIMITED</max_samples>
-        <max_instances>1</max_instances>
-        <max_samples_per_instance>LENGTH_UNLIMITED</max_samples_per_instance>
-      </resource_limits>
-      <durability>
-        <kind>VOLATILE_DURABILITY_QOS</kind>
-      </durability>
-    </datareader_qos>
-  </qos_profile>
-
-</dds>
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_SharedMem.cdp b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_SharedMem.cdp
deleted file mode 100644
index 009c8748060..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_SharedMem.cdp
+++ /dev/null
@@ -1,579 +0,0 @@
-<!--  -->
-<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>LatencyTT_Test_Depl</label>
-  <UUID>LatencyTT_Test_Depl</UUID>
-
-  <implementation xmi:id="CompSvrImpl">
-    <name>CompSvr</name>
-    <source />
-    <artifact xmi:idref="CompSvrArt" />
-    <execParameter>
-      <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>edu.vanderbilt.dre.DAnCE.LocalityManager</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_LatencyTT_Test_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_LatencyTT_Test_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="LatencyTT_Test_ConnectorComponentImplementation">
-    <name>LatencyTT_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="LatencyTT_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="LatencyTT_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_LatencyTT_Test_LatencyTTTestConn_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_LatencyTT_Test_LatencyTTTestConn_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>LatencyTT_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>LatencyTT_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_LatencyTT_Test_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_LatencyTT_Test_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-  </instance>
-
-  <instance xmi:id="LatencyTT_Test_ConnectorComponentInstance2">
-    <name>LatencyTT_Test_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="LatencyTT_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>LTT_Test</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Latency_Library#SharedMemQos</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="LatencyTT_Test_ConnectorComponentInstanceb2">
-    <name>LatencyTT_TestSec_ConnectorComponentb2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="LatencyTT_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>LTT_TestSec</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Latency_Library#SharedMemQos</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="CompSvrInst">
-    <name>ComponentServerInstance</name>
-    <node>SenderNode</node>
-    <source />
-    <implementation xmi:idref="CompSvrImpl" />
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.LocalityArguments</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>-ORBSvcConfDirective "static Time_Policy_Manager '-ORBTimePolicyStrategy HR'"</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>10000</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>sleep</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>2</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>number_of_sub</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>1</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="LatencyTT_Test_ConnectorComponentInstance">
-    <name>LatencyTT_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="LatencyTT_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>LTT_Test</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Latency_Library#SharedMemQos</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="LatencyTT_Test_ConnectorComponentInstanceb">
-    <name>LatencyTT_TestSec_ConnectorComponentb</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="LatencyTT_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>LTT_TestSec</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Latency_Library#SharedMemQos</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>info_listen_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="LatencyTT_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_listen_data_control</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="LatencyTT_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection_receiver</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>write_ping_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="LatencyTT_Test_ConnectorComponentInstanceb2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_listen_data_pub</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>ping_listen_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="LatencyTT_Test_ConnectorComponentInstanceb" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>ping_listen_data_control</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>ping_listen_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="LatencyTT_Test_ConnectorComponentInstanceb" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection_sender</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="LatencyTT_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status_sender</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="LatencyTT_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="CompSvrArt">
-    <name>CompoSvrArtifactName</name>
-    <source />
-    <node />
-    <location>dance_locality_manager</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="LatencyTT_Test_Connector_ExecArtifact">
-    <name>LatencyTT_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_LatencyTT_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="LatencyTT_Test_Connector_SvntArtifact">
-    <name>LatencyTT_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_LatencyTT_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="LatencyTT_Test_Connector_StubArtifact">
-    <name>LatencyTT_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_LatencyTT_Test_Connector_stub</location>
-  </artifact>
-
-  <localityConstraint>
-    <constraint>SameProcess</constraint>
-    <constrainedInstance xmi:idref="CompSvrInst" />
-    <constrainedInstance xmi:idref="SenderComponentInstance" />
-    <constrainedInstance xmi:idref="LatencyTT_Test_ConnectorComponentInstance" />
-    <constrainedInstance xmi:idref="LatencyTT_Test_ConnectorComponentInstanceb" />
-  </localityConstraint>
-
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_UDPv4.cdp b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_UDPv4.cdp
deleted file mode 100644
index ee24ffc15f2..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_UDPv4.cdp
+++ /dev/null
@@ -1,579 +0,0 @@
-<!--  -->
-<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>LatencyTT_Test_Depl</label>
-  <UUID>LatencyTT_Test_Depl</UUID>
-
-  <implementation xmi:id="CompSvrImpl">
-    <name>CompSvr</name>
-    <source />
-    <artifact xmi:idref="CompSvrArt" />
-    <execParameter>
-      <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>edu.vanderbilt.dre.DAnCE.LocalityManager</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_LatencyTT_Test_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_LatencyTT_Test_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="LatencyTT_Test_ConnectorComponentImplementation">
-    <name>LatencyTT_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="LatencyTT_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="LatencyTT_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_LatencyTT_Test_LatencyTTTestConn_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_LatencyTT_Test_LatencyTTTestConn_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>LatencyTT_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>LatencyTT_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_LatencyTT_Test_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_LatencyTT_Test_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-  </instance>
-
-  <instance xmi:id="LatencyTT_Test_ConnectorComponentInstance2">
-    <name>LatencyTT_Test_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="LatencyTT_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>LTT_Test</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Latency_Library#UDPv4QoS</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="LatencyTT_Test_ConnectorComponentInstanceb2">
-    <name>LatencyTT_TestSec_ConnectorComponentb2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="LatencyTT_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>LTT_TestSec</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Latency_Library#UDPv4QoS</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="CompSvrInst">
-    <name>ComponentServerInstance</name>
-    <node>SenderNode</node>
-    <source />
-    <implementation xmi:idref="CompSvrImpl" />
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.LocalityArguments</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>-ORBSvcConfDirective "static Time_Policy_Manager '-ORBTimePolicyStrategy HR'"</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>10000</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>sleep</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>2</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>number_of_sub</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>1</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="LatencyTT_Test_ConnectorComponentInstance">
-    <name>LatencyTT_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="LatencyTT_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>LTT_Test</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Latency_Library#UDPv4QoS</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="LatencyTT_Test_ConnectorComponentInstanceb">
-    <name>LatencyTT_TestSec_ConnectorComponentb</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="LatencyTT_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>LTT_TestSec</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Latency_Library#UDPv4QoS</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>info_listen_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="LatencyTT_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_listen_data_control</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="LatencyTT_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection_receiver</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>write_ping_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="LatencyTT_Test_ConnectorComponentInstanceb2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_listen_data_pub</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>ping_listen_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="LatencyTT_Test_ConnectorComponentInstanceb" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>ping_listen_data_control</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>ping_listen_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="LatencyTT_Test_ConnectorComponentInstanceb" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection_sender</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="LatencyTT_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status_sender</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="LatencyTT_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="CompSvrArt">
-    <name>CompoSvrArtifactName</name>
-    <source />
-    <node />
-    <location>dance_locality_manager</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="LatencyTT_Test_Connector_ExecArtifact">
-    <name>LatencyTT_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_LatencyTT_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="LatencyTT_Test_Connector_SvntArtifact">
-    <name>LatencyTT_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_LatencyTT_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="LatencyTT_Test_Connector_StubArtifact">
-    <name>LatencyTT_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_LatencyTT_Test_Connector_stub</location>
-  </artifact>
-
-  <localityConstraint>
-    <constraint>SameProcess</constraint>
-    <constrainedInstance xmi:idref="CompSvrInst" />
-    <constrainedInstance xmi:idref="SenderComponentInstance" />
-    <constrainedInstance xmi:idref="LatencyTT_Test_ConnectorComponentInstanceb" />
-    <constrainedInstance xmi:idref="LatencyTT_Test_ConnectorComponentInstance" />
-  </localityConstraint>
-
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/README b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/README
deleted file mode 100644
index 595876e5e2e..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/README
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-This performace test (LatencyTT) shows the latency , round trip time, with two topics.
-One for sending from publisher to subscriber and one for sending back from subscriber to publicher.
-The other Latency test (Latency) shows the latency, round trip time, with one topic.
-The test can run with different options.
-
-
--	run_test.pl : start one publisher and one subscriber in different processes
-	with resp. Plan_sub.cdp and Plan_pub.cdp
-
-
-To test changes in the next attributes, changes this values in the publisher cdp-files:
-iterations : the number of messages per run to send. Has to be greater as 0.
-sleep:  time in ms to sleep before writing the next message
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index ed1ff76010e..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-    Description
-    XML QoS Profile
-
-    The QoS configuration of the DDS entities in the generated example is
-    loaded from this file.
-
-    This file is used only when it is in the current working directory
-    or when the environment variable
-    NDDS_QOS_PROFILES is defined and points to this file.
-
-    For more information about XML QoS Profiles see Chapter 15 in the
-    RTI Data Distribution Service user manual.
-    -->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:noNamespaceSchemaLocation="/home/ndds/ndds.4.5b/scripts/../resource/rtiddsgen/../qos_profiles_4.5b/schema/rti_dds_qos_profiles.xsd"
-     version="4.5b">
-
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-       A QoS library is a named set of QoS profiles.
-       -->
-  <qos_library name="Latency_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-         and DataReader created in the example code.
-
-         A QoS profile groups a set of related QoS.
-         -->
-    <qos_profile name="UDPv4QoS" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <participant_qos>
-        <receiver_pool>
-          <!-- (payload) 8192 + (est. overhead) 8 + 512 -->
-          <buffer_size>8712</buffer_size>
-        </receiver_pool>
-
-        <transport_builtin>
-          <mask>DDS_TRANSPORTBUILTIN_UDPv4</mask>
-        </transport_builtin>
-
-        <property>
-          <value>
-            <element>
-              <name>dds.transport.UDPv4.builtin.parent.message_size_max</name>
-              <value>8712</value></element>
-            <element>
-              <name>dds.transport.UDPv4.builtin.recv_socket_buffer_size</name>
-              <value>17424</value></element>
-            <element>
-              <name>dds.transport.UDPv4.builtin.send_socket_buffer_size</name>
-              <value>8712</value></element>
-          </value>
-        </property>
-      </participant_qos>
-
-      <datawriter_qos>
-        <reliability>
-          <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-        </reliability>
-        <history><kind>DDS_KEEP_LAST_HISTORY_QOS</kind>
-          <depth>1</depth>
-        </history>
-        <durability>
-          <kind>VOLATILE_DURABILITY_QOS</kind>
-        </durability>
-        <resource_limits>
-          <max_instances>1</max_instances>
-          <initial_instances>1</initial_instances>
-          <max_samples>3</max_samples>
-          <initial_samples>3</initial_samples>
-          <max_samples_per_instance>3</max_samples_per_instance>
-        </resource_limits>
-        <protocol>
-          <rtps_reliable_writer>
-            <!-- piggyback every sample -->
-            <heartbeats_per_max_samples>3</heartbeats_per_max_samples>
-            <max_nack_response_delay>
-              <sec>0</sec>
-              <nanosec>0</nanosec>
-            </max_nack_response_delay>
-            <!-- 1 year -->
-            <heartbeat_period>
-              <sec>604800</sec>
-              <nanosec>1000000</nanosec>
-            </heartbeat_period>
-            <!-- 1 ms -->
-            <fast_heartbeat_period>
-              <sec>0</sec>
-              <nanosec>1000000</nanosec>
-            </fast_heartbeat_period>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <datareader_qos>
-        <reliability>
-          <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>DDS_KEEP_LAST_HISTORY_QOS</kind>
-          <depth>1</depth>
-        </history>
-        <resource_limits>
-          <initial_samples>100</initial_samples>
-          <initial_instances>1</initial_instances>
-          <max_samples>LENGTH_UNLIMITED</max_samples>
-          <max_instances>1</max_instances>
-          <max_samples_per_instance>LENGTH_UNLIMITED</max_samples_per_instance>
-        </resource_limits>
-        <durability>
-          <kind>VOLATILE_DURABILITY_QOS</kind>
-          <direct_communication>true</direct_communication>
-        </durability>
-        <protocol>
-          <rtps_reliable_reader>
-            <max_heartbeat_response_delay>
-              <sec>0</sec>
-              <nanosec>0</nanosec>
-            </max_heartbeat_response_delay>
-          </rtps_reliable_reader>
-        </protocol>
-      </datareader_qos>
-    </qos_profile>
-
-    <qos_profile name="SharedMemQos" is_default_qos="false">
-      <participant_qos>
-        <transport_builtin>
-          <mask>DDS_TRANSPORTBUILTIN_SHMEM</mask>
-        </transport_builtin>
-        <receiver_pool>
-          <buffer_size>8712</buffer_size>
-        </receiver_pool>
-        <property>
-          <value>
-            <element>
-              <name>dds.transport.shmem.builtin.parent.message_size_max</name>
-              <value>8712</value>
-            </element>
-            <element>
-              <name>dds.transport.shmem.builtin.receive_buffer_size</name>
-              <value>17424</value>
-            </element>
-          </value>
-        </property>
-      </participant_qos>
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <durability>
-          <kind>VOLATILE_DURABILITY_QOS</kind>
-        </durability>
-        <resource_limits>
-          <max_instances>1</max_instances>
-          <initial_instances>1</initial_instances>
-          <max_samples>LENGTH_UNLIMITED</max_samples>
-          <initial_samples>100</initial_samples>
-          <max_samples_per_instance>LENGTH_UNLIMITED</max_samples_per_instance>
-        </resource_limits>
-      </datawriter_qos>
-      <datareader_qos>
-        <reliability>
-          <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-        </reliability>
-        <resource_limits>
-          <initial_samples>100</initial_samples>
-          <initial_instances>1</initial_instances>
-          <max_samples>LENGTH_UNLIMITED</max_samples>
-          <max_instances>1</max_instances>
-          <max_samples_per_instance>LENGTH_UNLIMITED</max_samples_per_instance>
-        </resource_limits>
-        <durability>
-          <kind>VOLATILE_DURABILITY_QOS</kind>
-          <direct_communication>true</direct_communication>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-
-  </qos_library>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_test.pl
deleted file mode 100755
index c461f1a0c92..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_test.pl
+++ /dev/null
@@ -1,223 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run node daemon\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-              "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-if ($#ARGV == -1) {
-    opendir(DIR, ".");
-    @files = grep(/\.cdp$/,readdir(DIR));
-    closedir(DIR);
-}
-else {
-    @files = @ARGV;
-}
-
-create_targets ();
-init_ior_files ();
-
-foreach $file (@files) {
-    print "Starting test for deployment $file\n";
-
-    print STDERR "Starting Naming Service\n";
-
-    $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-    $NS->Spawn ();
-
-    if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                      $tg_naming->ProcessStartWaitInterval ()) == -1) {
-        print STDERR "ERROR: cannot find naming service IOR file\n";
-        $NS->Kill (); $NS->TimedWait (1);
-        exit 1;
-    }
-
-    $ns_running = 1;
-    # Set up NamingService environment
-    $ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-    # Invoke node daemon.
-    print "Invoking node daemon\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 = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-    $EM->Spawn ();
-
-    if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                    $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-    $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                                      "-x $file -k file://$ior_emfile");
-    $pl_status = $E->SpawnWaitKill (5 * $tg_executor->ProcessStartWaitInterval ());
-
-    if ($pl_status != 0) {
-        print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-        kill_open_processes ();
-        exit 1;
-    }
-
-
-    print "Sleeping 300 seconds to allow task to complete\n";
-    sleep (300);
-
-    print "Teardown the application\n";
-    $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                                      "-k file://$ior_emfile -x $file -s");
-    $E->SpawnWaitKill (5 * $tg_executor->ProcessStartWaitInterval ());
-    print "Executor finished.\n";
-
-    delete_ior_files ();
-    kill_open_processes ();
-}
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/.gitignore b/CIAO/connectors/dds4ccm/performance-tests/Throughput/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.idl b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.idl
deleted file mode 100644
index 45a19c666d6..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.idl
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * @file Throughput_Base.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef THROUGHPUT_BASE_IDL
-#define THROUGHPUT_BASE_IDL
-
-#pragma ndds typesupport "Base/Throughput_BaseSupport.h"
-#pragma opendds typesupport "Base/Throughput_BaseTypeSupportImpl.h"
-
-const short MAX_DATA_SEQUENCE_LENGTH = 8192;
-
-typedef enum ThroughputCommandKind
-{
-    THROUGHPUT_COMMAND_IDLE,
-    THROUGHPUT_COMMAND_START,
-    THROUGHPUT_COMMAND_COMPLETE
-} CommandKind;
-
-typedef sequence<octet, MAX_DATA_SEQUENCE_LENGTH> OctetSeq;
-
-#pragma DCPS_DATA_TYPE "ThroughputTest"
-
-struct ThroughputTest {
- long key;
- unsigned long long seq_num;
- OctetSeq data;
- };
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<ThroughputTest> ThroughputTestSeq;
-#endif
-
-#pragma DCPS_DATA_TYPE "ThroughputCommand"
-
-struct ThroughputCommand
-{
-    CommandKind  command;
-    unsigned long data_length;
-    unsigned long long current_publisher_effort;
-    unsigned long long final_publisher_effort;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<ThroughputCommand> ThroughputCommandSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.mpc b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.mpc
deleted file mode 100644
index 8d7b06dafcd..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_Throughput_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_Throughput_Base_stub
-  dynamicflags += THROUGHPUT_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=THROUGHPUT_BASE_STUB_Export \
-              -Wb,stub_export_include=THROUGHPUT_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    Throughput_Base.idl
-  }
-
-  opendds_ts_flags += --export=THROUGHPUT_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    Throughput_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.idl b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.idl
deleted file mode 100644
index 1d540e04466..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * @file Throughput_Connector.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- *
- * by-hand translation of the idl3p.
- */
-
-#ifndef THROUGHPUT_CONNECTOR_IDL_
-#define THROUGHPUT_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Throughput_Base.idl"
-
-#pragma ciao lem "Connector/Throughput_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/Throughput_BaseTypeSupport.idl"
-#endif
-
-module Throughput
-{
-  module ::CCM_DDS::Typed < ::ThroughputTest, ::ThroughputTestSeq> ThroughputTestConn;
-};
-
-#endif /* Throughput_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.mpc b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.mpc
deleted file mode 100644
index 46ac62d42c6..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_Throughput_Base -l .. -o ../lib -u DDS Throughput_Connector"
-
-project(DDS_Throughput_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_Throughput_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=THROUGHPUT_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=Throughput_Connector_stub_export.h \
-              -Wb,skel_export_macro=THROUGHPUT_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=Throughput_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=THROUGHPUT_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=Throughput_Connector_svnt_export.h \
-              -Wb,conn_export_macro=THROUGHPUT_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Throughput_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Throughput_Connector.idl
-  }
-}
-
-project(DDS_Throughput_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_Throughput_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=THROUGHPUT_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=Throughput_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
-
-  IDL_Files {
-    Throughput_ConnectorE.idl
-  }
-}
-
-project(DDS_TP_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_Throughput_Connector_lem_gen DDS_Throughput_Connector_stub DDS_Throughput_Base_stub
-  libs  += DDS_Throughput_Base_stub DDS_Throughput_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_TP_Test_Connector_lem_stub
-  dynamicflags += THROUGHPUT_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Throughput_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    Throughput_ConnectorEC.h
-    Throughput_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Throughput_ConnectorEC.inl
-  }
-}
-
-project(DDS_Throughput_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_Throughput_Connector_idl_gen DDS_Throughput_Base_stub
-  libs  += DDS_Throughput_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Throughput_Connector_stub
-  dynamicflags += THROUGHPUT_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Throughput_ConnectorC.cpp
-  }
-
-  Header_Files {
-    Throughput_ConnectorC.h
-    Throughput_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    Throughput_ConnectorC.inl
-  }
-}
-
-project(DDS_Throughput_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_TP_Test_Connector_lem_stub DDS_Throughput_Connector_stub
-  sharedname = DDS_Throughput_Connector_exec
-  libs += DDS_Throughput_Connector_stub DDS_TP_Test_Connector_lem_stub DDS_Throughput_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += THROUGHPUT_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Throughput_Connector_conn.cpp
-  }
-
-  Header_Files {
-    Throughput_Connector_conn.h
-    Throughput_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_Throughput_Connector_svnt) : ciao_servant, dds4ccm_skel, dds4ccm_lem_stub {
-  after      += DDS_TP_Test_Connector_lem_stub DDS_Throughput_Connector_exec DDS_Throughput_Connector_stub
-  sharedname  = DDS_Throughput_Connector_svnt
-  libs       += DDS_Throughput_Connector_stub \
-                DDS_TP_Test_Connector_lem_stub  \
-                DDS_Throughput_Base_stub \
-                DDS_Throughput_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += THROUGHPUT_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Throughput_ConnectorS.cpp
-    Throughput_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    Throughput_ConnectorS.h
-    Throughput_Connector_svnt.h
-    Throughput_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver.idl b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver.idl
deleted file mode 100644
index f09b8938611..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver.idl
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * @file
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/Throughput_Connector.idl"
-#include "SecConnector/Throughput_Sec_Connector.idl"
-
-module Throughput
-{
-  component Receiver
-  {
-    port ThroughputTestConn::DDS_Listen info_listen;
-    port ThroughputCommandConn::DDS_Listen command_listen;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver.mpc b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver.mpc
deleted file mode 100644
index 70b7c003a1b..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver.mpc
+++ /dev/null
@@ -1,150 +0,0 @@
-project(DDS_Throughput_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_Throughput_Connector_idl_gen DDS_Throughput_Sec_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h \
-              -I..
-
-  IDL_Files {
-    Throughput_Receiver.idl
-  }
-}
-
-project(DDS_Throughput_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_Throughput_Receiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    Throughput_ReceiverE.idl
-  }
-}
-
-project(DDS_Throughput_Receiver_lem_stub) : ccm_svnt, dds4ccm_base  {
-  after += DDS_Throughput_Receiver_lem_gen DDS_Throughput_Receiver_stub  \
-           DDS_Throughput_Connector_stub   DDS_Throughput_Sec_Connector_stub DDS_Throughput_Base_stub
-  libs  +=  Receiver_stub DDS_Throughput_Connector_stub DDS_Throughput_Sec_Connector_stub \
-            DDS_Throughput_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Throughput_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    Throughput_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Throughput_ReceiverEC.inl
-  }
-}
-
-project(DDS_Throughput_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_Throughput_Receiver_idl_gen  DDS_Throughput_Connector_stub DDS_Throughput_Sec_Connector_stub \
-           DDS_Throughput_Base_stub DDS_Throughput_Connector_lem_gen DDS_TP_Sec_Connector_lem_gen
-  libs  += DDS_Throughput_Connector_stub DDS_Throughput_Sec_Connector_stub DDS_Throughput_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Throughput_ReceiverC.cpp
-  }
-
-  Header_Files {
-    Throughput_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    Throughput_ReceiverC.inl
-  }
-}
-
-project(DDS_Throughput_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_Throughput_Receiver_lem_stub DDS_Throughput_Receiver_stub \
-             DDS_Throughput_Base_stub DDS_Throughput_Connector_stub DDS_Throughput_Sec_Connector_stub \
-             DDS_TP_Test_Connector_lem_stub DDS_TP_Sec_Connector_lem_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_Throughput_Base_stub \
-          DDS_Throughput_Connector_stub DDS_TP_Test_Connector_lem_stub \
-          DDS_Throughput_Sec_Connector_stub DDS_TP_Sec_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Throughput_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    Throughput_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_Throughput_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_Throughput_Receiver_lem_stub DDS_Throughput_Base_stub \
-                  DDS_Throughput_Connector_stub DDS_Throughput_Connector_svnt \
-                  DDS_Throughput_Sec_Connector_stub DDS_Throughput_Sec_Connector_svnt \
-                  DDS_Throughput_Receiver_exec DDS_TP_Test_Connector_lem_stub DDS_TP_Sec_Connector_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_Throughput_Base_stub \
-                DDS_Throughput_Connector_stub DDS_Throughput_Connector_svnt \
-                DDS_Throughput_Sec_Connector_stub DDS_Throughput_Sec_Connector_svnt \
-                Receiver_exec DDS_TP_Test_Connector_lem_stub DDS_TP_Sec_Connector_lem_stub
-
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Throughput_ReceiverS.cpp
-    Throughput_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    Throughput_ReceiverS.h
-    Throughput_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver_exec.cpp
deleted file mode 100644
index 48d041abcef..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver_exec.cpp
+++ /dev/null
@@ -1,332 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "Throughput_Receiver_exec.h"
-
-#include "ace/High_Res_Timer.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-namespace CIAO_Throughput_Receiver_Impl
-{
-
-  /**
-   * Facet Executor Implementation Class: info_listen_data_listener_exec_i
-   */
-
-  info_listen_data_listener_exec_i::info_listen_data_listener_exec_i (
-        ::Throughput::CCM_Receiver_Context_ptr ctx,
-        Receiver_exec_i &callback)
-    : ciao_context_ (
-        ::Throughput::CCM_Receiver_Context::_duplicate (ctx))
-      , callback_ (callback)
-  {
-  }
-
-  info_listen_data_listener_exec_i::~info_listen_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::Throughput::ThroughputTestConn::Listener
-
-  void
-  info_listen_data_listener_exec_i::on_one_data (const ::ThroughputTest & datum,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    this->callback_.record_data (datum);
-  }
-
-  void
-  info_listen_data_listener_exec_i::on_many_data (const ::ThroughputTestSeq & /* data */,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: command_listen_data_listener_exec_i
-   */
-
-  command_listen_data_listener_exec_i::command_listen_data_listener_exec_i (
-        ::Throughput::CCM_Receiver_Context_ptr ctx,
-        Receiver_exec_i &callback)
-    : ciao_context_ (
-        ::Throughput::CCM_Receiver_Context::_duplicate (ctx))
-      , callback_ (callback)
-  {
-  }
-
-  command_listen_data_listener_exec_i::~command_listen_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::Throughput::ThroughputCommandConn::Listener
-
-  void
-  command_listen_data_listener_exec_i::on_one_data (const ::ThroughputCommand & datum,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    this->callback_.handle_run (datum);
-  }
-
-  void
-  command_listen_data_listener_exec_i::on_many_data (const ::ThroughputCommandSeq & /* data */,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : count_ (0L), // total count of all received messages
-      interval_messages_received_(0L),
-      interval_bytes_received_(0L),
-      interval_data_length_(0L),
-      run_(0),
-      first_time_ (0L),
-      demand_ (0L),
-      seq_num_ (0L),
-      messages_lost_(0),
-      log_(false)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-  void
-  Receiver_exec_i::start (void)
-  {
-    ::CCM_DDS::DataListenerControl_var dlccmd =
-      this->ciao_context_->get_connection_command_listen_data_control ();
-    dlccmd->mode (::CCM_DDS::ONE_BY_ONE);
-    ::CCM_DDS::DataListenerControl_var dlc =
-      this->ciao_context_->get_connection_info_listen_data_control ();
-    dlc->mode (::CCM_DDS::ONE_BY_ONE);
-  }
-
-  void
-  Receiver_exec_i::reset_results (void)
-  {
-    this->interval_messages_received_ = 0;
-    this->interval_bytes_received_ = 0;
-    this->seq_num_ = 0;
-    this->messages_lost_= 0;
-  }
-
-  void
-  Receiver_exec_i::handle_run (const ThroughputCommand & an_instance)
-  {
-    if (an_instance.command == THROUGHPUT_COMMAND_START)
-      {
-        this->reset_results();
-        this->interval_data_length_ = an_instance.data_length;
-        this->demand_ = an_instance.current_publisher_effort;
-        ACE_High_Res_Timer::gettimeofday_hr ().to_usec (this->first_time_);
-        this->log_ = true;
-      }
-    else if (an_instance.command == THROUGHPUT_COMMAND_COMPLETE)
-      {
-        this->log_ = false;
-        ++this->run_;
-        ACE_UINT64 last_time;
-        ACE_High_Res_Timer::gettimeofday_hr ().to_usec (last_time);
-        ACE_UINT64 interval_time =  (last_time  - this->first_time_);
-        this->show_results (interval_time);
-      }
-  }
-
-  void
-  Receiver_exec_i::record_data (const ThroughputTest & an_instance)
-  {
-    ++this->count_; // total count of all received messages
-
-    if (this->log_.value ())
-      {
-        ++this->interval_messages_received_;
-        this->interval_bytes_received_ += this->interval_data_length_;
-        if (an_instance.seq_num != this->seq_num_)
-          {
-            ++this->messages_lost_;
-            this->seq_num_ = an_instance.seq_num;
-          }
-        ++this->seq_num_;
-      }
-  }
-
-  void
-  Receiver_exec_i::show_results (const ACE_UINT64& interval_time)
-  {
-    if (this->count_ > 0 && interval_time > 0)
-      {
-        double per_sec = (double)1000000/ interval_time;
-        double mbps = (this->interval_bytes_received_* per_sec)* (8.0/1000.0/1000.0);
-
-        if(this->run_ == 1)
-          {
-            #if (CIAO_DDS4CCM_CONTEXT_SWITCH==1)
-              ACE_DEBUG ((LM_DEBUG, "\n\nYES, we're using a threadswitch between "
-                                    "DDS and CCM\n\n"));
-            #else
-              ACE_DEBUG ((LM_DEBUG, "\n\nNO, we're not using a threadswitch between "
-                                    "DDS and CCM\n\n"));
-            #endif
-             ACE_DEBUG ((LM_DEBUG,
-                        " bytes, demand, samples,sample/s, Mbit/s,lost samples\n"));
-             ACE_DEBUG ((LM_DEBUG,
-                        "------,-------,--------,--------,-------,------------\n"));
-          }
-        ACE_DEBUG ((LM_DEBUG, "%6u,%7q,%8q,%8.1f,%7.1f,%7q\n",
-                        this->interval_data_length_,
-                        this->demand_,
-                        this->interval_messages_received_,
-                        this->interval_messages_received_ * per_sec,
-                        mbps,
-                        this->messages_lost_));
-      }
-  }
-
-  // Component attributes and port operations.
-
-  ::Throughput::ThroughputTestConn::CCM_Listener_ptr
-  Receiver_exec_i::get_info_listen_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_listen_data_listener_.in ()))
-      {
-        info_listen_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_listen_data_listener_exec_i (
-            this->ciao_context_.in (),
-            *this),
-            ::Throughput::ThroughputTestConn::CCM_Listener::_nil ());
-
-          this->ciao_info_listen_data_listener_ = tmp;
-      }
-
-    return
-      ::Throughput::ThroughputTestConn::CCM_Listener::_duplicate (
-        this->ciao_info_listen_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_listen_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::Throughput::ThroughputCommandConn::CCM_Listener_ptr
-  Receiver_exec_i::get_command_listen_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_command_listen_data_listener_.in ()))
-      {
-        command_listen_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          command_listen_data_listener_exec_i (
-            this->ciao_context_.in (),
-            *this),
-            ::Throughput::ThroughputCommandConn::CCM_Listener::_nil ());
-
-          this->ciao_command_listen_data_listener_ = tmp;
-      }
-
-    return
-      ::Throughput::ThroughputCommandConn::CCM_Listener::_duplicate (
-        this->ciao_command_listen_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_command_listen_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Throughput::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    this->start();
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    if (this->count_ > 0)
-      {
-        ACE_DEBUG((LM_DEBUG, "SUMMARY RECEIVER:\n "
-                             "Number of samples received: %u \n",
-                             this->count_));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR RECEIVER: "
-                              "No samples received\n"));
-      }
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Throughput_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver_exec.h b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver_exec.h
deleted file mode 100644
index 8ce0b44cc33..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver_exec.h
+++ /dev/null
@@ -1,197 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_THROUGHPUT_RECEIVER_EXEC_3P5DJU_H_
-#define CIAO_THROUGHPUT_RECEIVER_EXEC_3P5DJU_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Throughput_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_Throughput_Receiver_Impl
-{
-  class Receiver_exec_i;
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean> Atomic_Bool;
-
-  /**
-   * Provider Executor Implementation Class: info_listen_data_listener_exec_i
-   */
-
-  class info_listen_data_listener_exec_i
-    : public virtual ::Throughput::ThroughputTestConn::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_listen_data_listener_exec_i (
-      ::Throughput::CCM_Receiver_Context_ptr ctx,
-      Receiver_exec_i &callback);
-    virtual ~info_listen_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from Throughput::ThroughputTestConn::Listener. */
-
-    virtual
-    void on_one_data (const ::ThroughputTest & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (const ::ThroughputTestSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    ::Throughput::CCM_Receiver_Context_var ciao_context_;
-    Receiver_exec_i &callback_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: command_listen_data_listener_exec_i
-   */
-
-  class command_listen_data_listener_exec_i
-    : public virtual ::Throughput::ThroughputCommandConn::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    command_listen_data_listener_exec_i (
-      ::Throughput::CCM_Receiver_Context_ptr ctx,
-      Receiver_exec_i &callback);
-    virtual ~command_listen_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from Throughput::ThroughputCommandConn::Listener. */
-
-    virtual
-    void on_one_data (const ::ThroughputCommand & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (const ::ThroughputCommandSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    ::Throughput::CCM_Receiver_Context_var ciao_context_;
-    Receiver_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::Throughput::ThroughputTestConn::CCM_Listener_ptr
-    get_info_listen_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_listen_status (void);
-
-    virtual ::Throughput::ThroughputCommandConn::CCM_Listener_ptr
-    get_command_listen_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_command_listen_status (void);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void record_data (const ThroughputTest & an_instance);
-    void handle_run (const ThroughputCommand & an_instance);
-
-    //@}
-
-  private:
-    ::Throughput::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::Throughput::ThroughputTestConn::CCM_Listener_var ciao_info_listen_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_listen_status_;
-    ::Throughput::ThroughputCommandConn::CCM_Listener_var ciao_command_listen_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_command_listen_status_;
-    //@}
-
-    //@{
-    /** User defined members. */
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    CORBA::ULongLong count_;
-    CORBA::ULongLong interval_messages_received_;
-    CORBA::ULongLong interval_bytes_received_;
-    CORBA::ULong interval_data_length_;
-    CORBA::ULong run_;
-    ACE_UINT64 first_time_;
-    CORBA::ULongLong demand_;
-    CORBA::ULongLong seq_num_;
-    CORBA::ULongLong messages_lost_;
-    Atomic_Bool log_;
-
-    void start ();
-    void reset_results (void);
-    void show_results (const ACE_UINT64& interval_time);
-    //@}
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Throughput_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.idl b/CIAO/connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.idl
deleted file mode 100644
index 2ee2cc683d0..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * @file Throughput_Sec_Connector.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- *
- * by-hand translation of the idl3p.
- */
-
-#ifndef THROUGHPUT_SEC_CONNECTOR_IDL_
-#define THROUGHPUT_SEC_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Throughput_Base.idl"
-
-#pragma ciao lem "SecConnector/Throughput_Sec_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/Throughput_BaseTypeSupport.idl"
-#endif
-
-module Throughput
-{
-  module ::CCM_DDS::Typed < ::ThroughputCommand, ::ThroughputCommandSeq> ThroughputCommandConn;
-};
-
-#endif /* Throughput_Sec_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.mpc b/CIAO/connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.mpc
deleted file mode 100644
index 1b893eb477e..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.mpc
+++ /dev/null
@@ -1,141 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_Throughput_Base -l .. -o ../lib -u DDS Throughput_Sec_Connector"
-
-project(DDS_TP_Sec_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_Throughput_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=THROUGHPUT_SEC_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=Throughput_Sec_Connector_stub_export.h \
-              -Wb,skel_export_macro=THROUGHPUT_SEC_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=Throughput_Sec_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=THROUGHPUT_SEC_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=Throughput_Sec_Connector_svnt_export.h \
-              -Wb,conn_export_macro=THROUGHPUT_SEC_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Throughput_Sec_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Throughput_Sec_Connector.idl
-  }
-}
-
-project(DDS_TP_Sec_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_TP_Sec_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=THROUGHPUT_SEC_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=Throughput_Sec_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
-
-  IDL_Files {
-    Throughput_Sec_ConnectorE.idl
-  }
-}
-
-project(DDS_TP_Sec_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_TP_Sec_Connector_lem_gen DDS_Throughput_Sec_Connector_stub DDS_Throughput_Base_stub
-  libs  += DDS_Throughput_Base_stub DDS_Throughput_Sec_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_TP_Sec_Connector_lem_stub
-  dynamicflags += THROUGHPUT_SEC_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Throughput_Sec_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    Throughput_Sec_ConnectorEC.h
-    Throughput_Sec_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Throughput_Sec_ConnectorEC.inl
-  }
-}
-
-project(DDS_Throughput_Sec_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_TP_Sec_Connector_idl_gen DDS_Throughput_Base_stub
-  libs  += DDS_Throughput_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Throughput_Sec_Connector_stub
-  dynamicflags += THROUGHPUT_SEC_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Throughput_Sec_ConnectorC.cpp
-  }
-
-  Header_Files {
-    Throughput_Sec_ConnectorC.h
-    Throughput_Sec_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    Throughput_Sec_ConnectorC.inl
-  }
-}
-
-project(DDS_Throughput_Sec_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_TP_Sec_Connector_lem_stub DDS_Throughput_Sec_Connector_stub
-  sharedname = DDS_Throughput_Sec_Connector_exec
-  libs += DDS_Throughput_Sec_Connector_stub DDS_TP_Sec_Connector_lem_stub DDS_Throughput_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += THROUGHPUT_SEC_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Throughput_Sec_Connector_conn.cpp
-  }
-
-  Header_Files {
-    Throughput_Sec_Connector_conn.h
-    Throughput_Sec_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-project(DDS_Throughput_Sec_Connector_svnt) : ciao_servant, dds4ccm_skel, dds4ccm_lem_stub {
-  after      += DDS_TP_Sec_Connector_lem_stub DDS_Throughput_Sec_Connector_exec DDS_Throughput_Sec_Connector_stub
-  sharedname  = DDS_Throughput_Sec_Connector_svnt
-  libs       += DDS_Throughput_Sec_Connector_stub \
-                DDS_TP_Sec_Connector_lem_stub  \
-                DDS_Throughput_Base_stub \
-                DDS_Throughput_Sec_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += THROUGHPUT_SEC_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Throughput_Sec_ConnectorS.cpp
-    Throughput_Sec_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    Throughput_Sec_ConnectorS.h
-    Throughput_Sec_Connector_svnt.h
-    Throughput_Sec_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender.idl b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender.idl
deleted file mode 100644
index 9cb773135d9..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender.idl
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef DDS_THROUGHPUT_SENDER_IDL
-#define DDS_THROUGHPUT_SENDER_IDL
-
-#include "Connector/Throughput_Connector.idl"
-#include "SecConnector/Throughput_Sec_Connector.idl"
-
-module Throughput
-{
-  component Sender
-  {
-    port ThroughputTestConn::DDS_Write info_write;
-    port ThroughputCommandConn::DDS_Write command_write;
-
-    provides CCM_DDS::ConnectorStatusListener connector_status;
-
-    attribute unsigned long start_load;
-    attribute unsigned long incr_load;
-    attribute unsigned long long max_load;
-    attribute unsigned short recover_time;
-    attribute unsigned short datalen; //minimal 24
-    attribute unsigned short number_of_sub; //number of subscribers
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender.mpc b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender.mpc
deleted file mode 100644
index 9b6d0c52b09..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender.mpc
+++ /dev/null
@@ -1,148 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_Throughput_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_Throughput_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_Throughput_Connector_idl_gen DDS_Throughput_Sec_Connector_idl_gen DDS_Starter_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I..
-
-  IDL_Files {
-    Throughput_Sender.idl
-  }
-}
-
-project(DDS_Throughput_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_Throughput_Sender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    Throughput_SenderE.idl
-  }
-}
-
-project(DDS_Throughput_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_Throughput_Sender_lem_gen DDS_Throughput_Sender_stub \
-           DDS_Throughput_Base_stub
-  libs  += DDS_Throughput_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Throughput_SenderEC.cpp
-  }
-
-  Header_Files {
-    Throughput_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Throughput_SenderEC.inl
-  }
-}
-
-project(DDS_Throughput_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_Throughput_Sender_idl_gen DDS_Throughput_Base_stub \
-           DDS_Throughput_Connector_stub  DDS_Throughput_Sec_Connector_stub
-  libs  += DDS_Throughput_Base_stub DDS_Throughput_Connector_stub DDS_Throughput_Sec_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Throughput_SenderC.cpp
-  }
-
-  Header_Files {
-    Throughput_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    Throughput_SenderC.inl
-  }
-}
-
-project(DDS_Throughput_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_Throughput_Sender_lem_stub DDS_Throughput_Sender_stub \
-             DDS_TP_Test_Connector_lem_stub DDS_Throughput_Connector_stub \
-             DDS_TP_Sec_Connector_lem_stub DDS_Throughput_Sec_Connector_stub
-  sharedname = Sender_exec
-  libs    += Sender_stub Sender_lem_stub DDS_Throughput_Base_stub \
-             DDS_TP_Test_Connector_lem_stub DDS_Throughput_Connector_stub \
-             DDS_TP_Sec_Connector_lem_stub DDS_Throughput_Sec_Connector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Throughput_Sender_exec.cpp
-  }
-
-  Header_Files {
-    Throughput_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-project(DDS_Throughput_Sender_svnt) : ciao_servant, dds4ccm_skel {
-  after      += DDS_Throughput_Base_stub  DDS_Throughput_Sender_lem_stub \
-                DDS_Throughput_Connector_stub DDS_Throughput_Sec_Connector_stub \
-                DDS_Throughput_Connector_svnt DDS_TP_Test_Connector_lem_stub \
-                DDS_Throughput_Sec_Connector_svnt DDS_TP_Sec_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub DDS_Throughput_Base_stub \
-                DDS_Throughput_Connector_stub DDS_Throughput_Connector_svnt \
-                DDS_Throughput_Sec_Connector_stub DDS_Throughput_Sec_Connector_svnt \
-                DDS_TP_Test_Connector_lem_stub DDS_TP_Sec_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Throughput_SenderS.cpp
-    Throughput_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    Throughput_SenderS.h
-    Throughput_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.cpp b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.cpp
deleted file mode 100644
index 3071bf55951..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.cpp
+++ /dev/null
@@ -1,536 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "Throughput_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-#include "ace/High_Res_Timer.h"
-#include "ace/Timer_Queue.h"
-
-namespace CIAO_Throughput_Sender_Impl
-{
-
-  /**
-   * WriteTicker
-   */
-
-  WriteTicker::WriteTicker (Sender_exec_i &callback,
-                            Atomic_Boolean &running)
-    : callback_ (callback),
-      running_ (running)
-  {
-  }
-
-  int
-  WriteTicker::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    // Notify the subscribers
-    if (!this->running_.value ())
-      {
-        this->callback_.write ();
-      }
-    return 0;
-  }
-
-  /**
-   * Facet Executor Implementation Class: connector_status_exec_i
-   */
-
-  connector_status_exec_i::connector_status_exec_i (
-        ::Throughput::CCM_Sender_Context_ptr ctx,
-        int number_of_subscribers,
-        Sender_exec_i &callback)
-    : ciao_context_ (
-        ::Throughput::CCM_Sender_Context::_duplicate (ctx))
-      , number_of_subscribers_ (number_of_subscribers)
-      , callback_ (callback)
-  {
-  }
-
-  connector_status_exec_i::~connector_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-
-  void
-  connector_status_exec_i::on_inconsistent_topic (::DDS::Topic_ptr /* the_topic */,
-  const ::DDS::InconsistentTopicStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  connector_status_exec_i::on_requested_incompatible_qos (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedIncompatibleQosStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  connector_status_exec_i::on_sample_rejected (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleRejectedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  connector_status_exec_i::on_offered_deadline_missed (::DDS::DataWriter_ptr /* the_writer */,
-  const ::DDS::OfferedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  connector_status_exec_i::on_offered_incompatible_qos (::DDS::DataWriter_ptr /* the_writer */,
-  const ::DDS::OfferedIncompatibleQosStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  connector_status_exec_i::on_unexpected_status (::DDS::Entity_ptr the_entity,
-  ::DDS::StatusKind status_kind)
-  {
-    if (!CORBA::is_nil (the_entity) &&
-        status_kind == DDS::PUBLICATION_MATCHED_STATUS)
-      {
-        ::DDS::PublicationMatchedStatus_var stat;
-        DDS::DataWriter_var wr = ::DDS::DataWriter::_narrow (the_entity);
-        if(::CORBA::is_nil (wr.in ()))
-          {
-            throw ::CORBA::INTERNAL ();
-          }
-        ::DDS::ReturnCode_t retval =
-                          wr->get_publication_matched_status (stat.out ());
-        if (retval == ::DDS::RETCODE_OK)
-          {
-            if (stat.in ().current_count >= this->number_of_subscribers_ &&
-                !this->started_.value ())
-              {
-                ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_unexpected_status - "
-                          "on_publication_matched status received. Starting application\n"));
-                this->started_ = true;
-                this->callback_.start ();
-              }
-          }
-      }
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : start_load_ (100)
-      , incr_load_ (100)
-      , max_load_ (1000)
-      , recover_time_ (1) // Specifies how long (in s) to sleep after writing a
-                         // specific effort specified by start_load , incr_load
-      , datalen_ (1024)
-      , number_of_sub_ (1)
-      , ticker_ (0)
-      , duration_run_ (10)
-      , number_of_msg_ (0)
-      , load_ (0)
-      , overhead_size_ (0)
-      , running_ (false)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      WriteTicker (*this, this->running_),
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Sender_exec_i::write (void)
-  {
-    this->running_ = true;
-    CORBA::Boolean test_complete = false;
-    this->load_ += this->incr_load_;
-    if (this->load_ >= this->max_load_)
-      {
-        this->stop ();
-      }
-    else
-      {
-        this->test_topic_cmd_.command = THROUGHPUT_COMMAND_START;
-        this->test_topic_cmd_.data_length = this->datalen_;
-        this->test_topic_cmd_.current_publisher_effort = this->load_;
-        this->test_topic_cmd_.final_publisher_effort = this->max_load_;
-        try
-          {
-            this->cmd_writer_->write_one (this->test_topic_cmd_,
-                                          ::DDS::HANDLE_NIL);
-          }
-        catch (const CCM_DDS::InternalError& )
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                         ACE_TEXT ("while writing command.\n")));
-          }
-        test_complete = false;
-        // get start time
-        ACE_UINT64 start_time;
-        ACE_High_Res_Timer::gettimeofday_hr ().to_usec (start_time);
-        while (!test_complete)
-          {
-            for (CORBA::ULongLong current_load = 0;
-                 current_load < this->load_ && !test_complete;
-                 ++current_load, ++this->test_topic_.seq_num)
-              {
-                try
-                  {
-                    this->writer_->write_one (this->test_topic_,
-                                              ::DDS::HANDLE_NIL);
-                    ++this->number_of_msg_;
-                  }
-                catch (const CCM_DDS::InternalError& err)
-                  {
-                    if (err.error_code == ::DDS::RETCODE_TIMEOUT)
-                      {
-                        ACE_ERROR ((LM_ERROR,
-                                    ACE_TEXT ("ERROR: Internal Error ")
-                                    ACE_TEXT ("Write Timeout please increase "
-                                              "-maxBlockingTime parameter for "
-                                              "test\n")));
-                      }
-                    else
-                      {
-                        ACE_ERROR ((LM_ERROR,
-                                    ACE_TEXT ("ERROR: Internal Error ")
-                                    ACE_TEXT ("while updating writer ")
-                                    ACE_TEXT ("info for <%u>.\n"),
-                                    this->test_topic_.seq_num));
-                        test_complete= true;
-                      }
-                  }
-              }
-            ACE_UINT64 end_time;
-            ACE_High_Res_Timer::gettimeofday_hr ().to_usec (end_time);
-            ACE_UINT64 interval = end_time - start_time;
-            if(interval > (this->duration_run_ * 1000 * 1000))
-              {
-                test_complete = true;
-                this->test_topic_cmd_.command = THROUGHPUT_COMMAND_COMPLETE;
-                this->cmd_writer_->write_one (this->test_topic_cmd_,
-                                              ::DDS::HANDLE_NIL);
-              }
-            if (!test_complete)
-              {
-                ACE_OS::sleep (this->recover_time_);
-              }
-          }
-      }
-    this->running_ = false;
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    ACE_UINT64 const sec = this->duration_run_ + 5;
-    if (this->reactor ()->schedule_timer (
-                    this->ticker_,
-                    0,
-                    ACE_Time_Value (5, 0),
-                    ACE_Time_Value (sec, 0)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                              ACE_TEXT ("Error scheduling timer")));
-      }
-  }
-
-  void
-  Sender_exec_i::stop (void)
-  {
-    if (this->ticker_)
-      {
-        this->reactor ()->cancel_timer (this->ticker_);
-      }
-    delete this->ticker_;
-    this->ticker_ = 0;
-  }
-
-  // Component attributes and port operations.
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_connector_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_connector_status_.in ()))
-      {
-        connector_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          connector_status_exec_i (
-            this->ciao_context_.in (),
-            this->number_of_sub_,
-            *this),
-            ::CCM_DDS::CCM_ConnectorStatusListener::_nil ());
-
-          this->ciao_connector_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_ConnectorStatusListener::_duplicate (
-        this->ciao_connector_status_.in ());
-  }
-
-  ::CORBA::ULong
-  Sender_exec_i::start_load (void)
-  {
-    return this->start_load_;
-  }
-
-  void
-  Sender_exec_i::start_load (
-    const ::CORBA::ULong start_load)
-  {
-    if (start_load < 100)
-      {
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("ERROR: start_load must be greater as '100' "
-                              "and smaller as max_load\n")));
-        throw ::CORBA::BAD_PARAM ();
-      }
-    else
-      {
-        this->start_load_ = start_load;
-      }
-  }
-
-  ::CORBA::ULong
-  Sender_exec_i::incr_load (void)
-  {
-    return this->incr_load_;
-  }
-
-  void
-  Sender_exec_i::incr_load (
-    const ::CORBA::ULong incr_load)
-  {
-    if (incr_load < 100)
-      {
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("ERROR:incr_load must be greater as '99'\n")));
-        throw ::CORBA::BAD_PARAM ();
-      }
-    else
-      {
-        this->incr_load_ = incr_load;
-      }
-  }
-
-  ::CORBA::ULongLong
-  Sender_exec_i::max_load (void)
-  {
-    return this->max_load_;
-  }
-
-  void
-  Sender_exec_i::max_load (
-    const ::CORBA::ULongLong max_load)
-  {
-    if (max_load <= 100 || max_load > 90000)
-      {
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("ERROR: max_load must be greater as '100' "
-                              "and smaller as '90001'\n")));
-        throw ::CORBA::BAD_PARAM ();
-      }
-    else
-      {
-        this->max_load_ = max_load;
-      }
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::recover_time (void)
-  {
-    return this->recover_time_;
-  }
-
-  void
-  Sender_exec_i::recover_time (
-    const ::CORBA::UShort recover_time)
-  {
-    this->recover_time_ = recover_time;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::datalen (void)
-  {
-    return this->datalen_;
-  }
-
-  void
-  Sender_exec_i::datalen (
-    const ::CORBA::UShort datalen)
-  {
-    this->overhead_size_ = sizeof (CORBA::ULong) + sizeof (CORBA::ULongLong);
-    if (datalen <= this->overhead_size_ ||
-        datalen > MAX_DATA_SEQUENCE_LENGTH)
-    {
-       ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("ERROR: datalen has to be bigger"
-                            " as %u and smaller as %u\n"),
-                            this->overhead_size_,
-                            MAX_DATA_SEQUENCE_LENGTH));
-       throw ::CORBA::BAD_PARAM ();
-    }
-    this->datalen_ = datalen;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::number_of_sub (void)
-  {
-    return this->number_of_sub_;
-  }
-
-  void
-  Sender_exec_i::number_of_sub (
-    const ::CORBA::UShort number_of_sub)
-  {
-   if (number_of_sub > 0)
-      {
-        this->number_of_sub_ = number_of_sub;
-      }
-    else
-      {
-        this->number_of_sub_ = 1;
-      }
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Throughput::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    try
-      {
-        this->writer_ = this->ciao_context_->get_connection_info_write_data ();
-        this->cmd_writer_ =
-               this->ciao_context_->get_connection_command_write_data ();
-        if(CORBA::is_nil (this->writer_.in ()))
-          {
-            throw ::CORBA::INTERNAL ();
-          }
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("Exception caught:");
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Sender_exec_i::configuration_complete: "
-                    "Exception caught\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Sender_exec_i::configuration_complete:"
-                    " Unknown exception caught\n")));
-      }
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-   // Make instances of Topic
-    this->test_topic_.key = 1;
-    this->test_topic_.seq_num = 0;
-    this->test_topic_.data.length (this->datalen_ - this->overhead_size_);
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    this->stop ();
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    if (this->number_of_msg_ == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR SENDER: No messages "
-                              "sent during test.\n"));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "SUMMARY SENDER number of messages sent: %u\n",
-                              this->number_of_msg_));
-      }
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Throughput_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.h b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.h
deleted file mode 100644
index dd5d2ece208..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.h
+++ /dev/null
@@ -1,231 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_THROUGHPUT_SENDER_EXEC_1FSOUB_H_
-#define CIAO_THROUGHPUT_SENDER_EXEC_1FSOUB_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Throughput_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_Throughput_Sender_Impl
-{
-  class Sender_exec_i;
-
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
-
-  /**
-   * WriteTicker
-   */
-
-  class WriteTicker :
-    public ACE_Event_Handler
-  {
-  public:
-    WriteTicker (Sender_exec_i &callback,
-                 Atomic_Boolean &running);
-    int handle_timeout (const ACE_Time_Value &, const void *);
-  private:
-    Sender_exec_i &callback_;
-    Atomic_Boolean running_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: connector_status_exec_i
-   */
-
-  class connector_status_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    connector_status_exec_i (
-      ::Throughput::CCM_Sender_Context_ptr ctx,
-      int number_of_subscribers,
-      Sender_exec_i &callback);
-    virtual ~connector_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-    const ::DDS::InconsistentTopicStatus & status);
-
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedIncompatibleQosStatus & status);
-
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleRejectedStatus & status);
-
-    virtual
-    void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-    const ::DDS::OfferedDeadlineMissedStatus & status);
-
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-    const ::DDS::OfferedIncompatibleQosStatus & status);
-
-    virtual
-    void on_unexpected_status (::DDS::Entity_ptr the_entity,
-    ::DDS::StatusKind status_kind);
-    //@}
-
-  private:
-    ::Throughput::CCM_Sender_Context_var ciao_context_;
-    int number_of_subscribers_;
-    Sender_exec_i &callback_;
-    Atomic_Boolean started_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_connector_status (void);
-
-    virtual ::CORBA::ULong start_load (void);
-
-    virtual void start_load (::CORBA::ULong start_load);
-
-    virtual ::CORBA::ULong incr_load (void);
-
-    virtual void incr_load (::CORBA::ULong incr_load);
-
-    virtual ::CORBA::ULongLong max_load (void);
-
-    virtual void max_load (::CORBA::ULongLong max_load);
-
-    virtual ::CORBA::UShort recover_time (void);
-
-    virtual void recover_time (::CORBA::UShort recover_time);
-
-    virtual ::CORBA::UShort datalen (void);
-
-    virtual void datalen (::CORBA::UShort datalen);
-
-    virtual ::CORBA::UShort number_of_sub (void);
-
-    virtual void number_of_sub (::CORBA::UShort number_of_sub);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void write (void);
-    void start (void);
-
-    //@}
-
-  private:
-    ::Throughput::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::CCM_DDS::CCM_ConnectorStatusListener_var ciao_connector_status_;
-
-    ::CORBA::ULong start_load_;
-
-    ::CORBA::ULong incr_load_;
-
-    ::CORBA::ULongLong max_load_;
-
-    ::CORBA::UShort recover_time_;
-
-    ::CORBA::UShort datalen_;
-
-    ::CORBA::UShort number_of_sub_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    ::Throughput::ThroughputTestConn::Writer_var writer_;
-    ::Throughput::ThroughputCommandConn::Writer_var cmd_writer_;
-
-    WriteTicker *ticker_;
-
-    ACE_UINT64 duration_run_;
-    ::CORBA::ULongLong number_of_msg_;
-    ::CORBA::ULongLong load_;
-    ::CORBA::UShort overhead_size_;
-
-    ThroughputTest test_topic_;
-    ThroughputCommand test_topic_cmd_;
-    ::CORBA::Octet* buffer_;
-
-    Atomic_Boolean running_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void stop (void);
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Throughput_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/Plan_pub.cdp b/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/Plan_pub.cdp
deleted file mode 100644
index 4d33f196105..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/Plan_pub.cdp
+++ /dev/null
@@ -1,463 +0,0 @@
-<!--  -->
-<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>Throughput_Depl_2</label>
-  <UUID>Throughput_Depl_2</UUID>
-
-  <implementation xmi:id="CompSvrImpl">
-    <name>CompSvr</name>
-    <source />
-    <artifact xmi:idref="CompSvrArt" />
-    <execParameter>
-      <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>edu.vanderbilt.dre.DAnCE.LocalityManager</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Throughput_ConnectorComponentImplementation">
-    <name>Throughput_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Throughput_Connector_ExecArtifact" />
-    <artifact xmi:idref="Throughput_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Throughput_ThroughputTestConn_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Throughput_ThroughputTestConn_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Throughput_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Throughput_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Throughput_Sec_ConnectorComponentImplementation">
-    <name>Throughput_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Throughput_Sec_Connector_ExecArtifact" />
-    <artifact xmi:idref="Throughput_Sec_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Throughput_ThroughputCommandConn_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Throughput_ThroughputCommandConn_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Throughput_Sec_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Throughput_Sec_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Throughput_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Throughput_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="Throughput_ConnectorComponentInstance">
-    <name>Throughput_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Throughput_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TP_Test</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Throughput_Library#ThroughputQoS</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Throughput_Sec_ConnectorComponentInstance">
-    <name>Throughput_Sec_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Throughput_Sec_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TP_Command</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Throughput_Library#ThroughputCmdQoS</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="CompSvrInst">
-    <name>ComponentServerInstance</name>
-    <node>SenderNode</node>
-    <source />
-    <implementation xmi:idref="CompSvrImpl" />
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.LocalityArguments</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>-ORBSvcConfDirective "static Time_Policy_Manager '-ORBTimePolicyStrategy HR'"</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>start_load</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>1000</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_load</name>
-      <value>
-        <type>
-          <kind>tk_ulonglong</kind>
-        </type>
-        <value>
-          <ulonglong>5000</ulonglong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>incr_load</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>1000</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <!-- Specifies how long (in ms) to sleep after writing a specific-->
-      <!-- effort specified by start_load and incr_load -->
-      <name>recover_time</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>1</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-    <name>number_of_sub</name>
-    <value>
-      <type>
-        <kind>tk_ushort</kind>
-      </type>
-      <value>
-        <ushort>1</ushort>
-      </value>
-    </value>
-    </configProperty>
-    <configProperty>
-      <name>datalen</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>1024</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Throughput_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>writer_sec_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>command_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Throughput_Sec_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status_sender</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Throughput_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="CompSvrArt">
-    <name>CompoSvrArtifactName</name>
-    <source />
-    <node />
-    <location>dance_locality_manager</location>
-  </artifact>
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="Throughput_Connector_ExecArtifact">
-    <name>Throughput_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Throughput_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Throughput_Connector_SvntArtifact">
-    <name>Throughput_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Throughput_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Throughput_Connector_StubArtifact">
-    <name>Throughput_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Throughput_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Throughput_Sec_Connector_ExecArtifact">
-    <name>Throughput_Sec_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Throughput_Sec_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Throughput_Sec_Connector_SvntArtifact">
-    <name>Throughput_Sec_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Throughput_Sec_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Throughput_Sec_Connector_StubArtifact">
-    <name>Throughput_Sec_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Throughput_Sec_Connector_stub</location>
-  </artifact>
-
-  <localityConstraint>
-    <constraint>SameProcess</constraint>
-    <constrainedInstance xmi:idref="CompSvrInst" />
-    <constrainedInstance xmi:idref="SenderComponentInstance" />
-    <constrainedInstance xmi:idref="Throughput_ConnectorComponentInstance" />
-    <constrainedInstance xmi:idref="Throughput_Sec_ConnectorComponentInstance" />
-  </localityConstraint>
-
- </Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/Plan_sub.cdp b/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/Plan_sub.cdp
deleted file mode 100644
index 48626f435e3..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/Plan_sub.cdp
+++ /dev/null
@@ -1,369 +0,0 @@
-<!--  -->
-<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>Throughput_Depl_1</label>
-  <UUID>Throughput_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Throughput_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Throughput_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Throughput_ConnectorComponentImplementation">
-    <name>Throughput_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Throughput_Connector_ExecArtifact" />
-    <artifact xmi:idref="Throughput_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Throughput_ThroughputTestConn_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Throughput_ThroughputTestConn_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Throughput_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Throughput_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Throughput_Sec_ConnectorComponentImplementation">
-    <name>Throughput_Sec_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Throughput_Sec_Connector_ExecArtifact" />
-    <artifact xmi:idref="Throughput_Sec_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Throughput_ThroughputCommandConn_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Throughput_ThroughputCommandConn_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Throughput_Sec_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Throughput_Sec_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-  </instance>
-   <instance xmi:id="Throughput_ConnectorComponentInstance2">
-    <name>Throughput_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Throughput_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TP_Test</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Throughput_Library#ThroughputQoS</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Throughput_Sec_ConnectorComponentInstance2">
-    <name>Throughput_Sec_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Throughput_Sec_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TP_Command</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Throughput_Library#ThroughputCmdQoS</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>info_listen_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Throughput_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_listen_data_control</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Throughput_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>command_listen_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>command_listen_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Throughput_Sec_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>command_listen_data_control</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>command_listen_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Throughput_Sec_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Throughput_Connector_ExecArtifact">
-    <name>Throughput_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Throughput_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Throughput_Connector_SvntArtifact">
-    <name>Throughput_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Throughput_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Throughput_Connector_StubArtifact">
-    <name>Throughput_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Throughput_Connector_stub</location>
-  </artifact>
-
-  <artifact xmi:id="Throughput_Sec_Connector_ExecArtifact">
-    <name>Throughput_Sec_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Throughput_Sec_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Throughput_Sec_Connector_SvntArtifact">
-    <name>Throughput_Sec_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Throughput_Sec_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Throughput_Sec_Connector_StubArtifact">
-    <name>Throughput_Sec_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Throughput_Sec_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/Throughput_Library.xml b/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/Throughput_Library.xml
deleted file mode 100644
index 8c7811a3adc..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/Throughput_Library.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-
-  <qos_profile name="ThroughputQoS">
-    <!-- QoS used to configure the data writer created in the example code -->
-    <datawriter_qos>
-      <reliability>
-        <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-      </reliability>
-      <durability>
-        <kind>TRANSIENT_DURABILITY_QOS</kind>
-      </durability>
-      <resource_limits>
-        <max_instances>1</max_instances>
-        <initial_instances>1</initial_instances>
-        <max_samples>LENGTH_UNLIMITED</max_samples>
-        <initial_samples>100</initial_samples>
-        <max_samples_per_instance>LENGTH_UNLIMITED</max_samples_per_instance>
-      </resource_limits>
-    </datawriter_qos>
-    <!-- QoS used to configure the data reader created in the example code -->
-    <datareader_qos>
-      <reliability>
-        <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-      </reliability>
-      <resource_limits>
-        <initial_samples>100</initial_samples>
-        <initial_instances>1</initial_instances>
-        <max_samples>LENGTH_UNLIMITED</max_samples>
-        <max_instances>1</max_instances>
-        <max_samples_per_instance>LENGTH_UNLIMITED</max_samples_per_instance>
-      </resource_limits>
-      <durability>
-        <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-    </datareader_qos>
-  </qos_profile>
-
-  <qos_profile name="ThroughputCmdQoS">
-    <!-- QoS used to configure the data writer created in the example code -->
-    <datawriter_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-      </reliability>
-      <durability>
-        <kind>TRANSIENT_DURABILITY_QOS</kind>
-      </durability>
-      <resource_limits>
-        <max_instances>1</max_instances>
-        <initial_instances>1</initial_instances>
-        <max_samples>LENGTH_UNLIMITED</max_samples>
-        <initial_samples>100</initial_samples>
-        <max_samples_per_instance>LENGTH_UNLIMITED</max_samples_per_instance>
-      </resource_limits>
-    </datawriter_qos>
-    <!-- QoS used to configure the data reader created in the example code -->
-    <datareader_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-      </reliability>
-      <resource_limits>
-        <initial_samples>100</initial_samples>
-        <initial_instances>1</initial_instances>
-        <max_samples>LENGTH_UNLIMITED</max_samples>
-        <max_instances>1</max_instances>
-        <max_samples_per_instance>LENGTH_UNLIMITED</max_samples_per_instance>
-      </resource_limits>
-      <durability>
-        <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-    </datareader_qos>
-  </qos_profile>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index db48a83b0b2..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-Description
-XML QoS Profile
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="Throughput_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="ThroughputQoS" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <participant_qos>
-        <receiver_pool>
-          <buffer_size>92160</buffer_size>
-        </receiver_pool>
-        <property>
-          <value>
-            <element>
-              <name>dds.transport.builtin.mask</name>
-              <value>DDS_TRANSPORTBUILTIN_UDPv4</value>
-              <name>dds.transport.UDPv4.builtin.parent.message_size_max</name>
-              <value>UDP_SIZE_MAX</value>
-              <name>dds.transport.UDPv4.builtin.recv_socket_buffer_size</name>
-              <value>UDP_SOCKET_RECV_BUFFER_SIZE</value>
-              <name>dds.transport.UDPv4.builtin.send_socket_buffer_size</name>
-              <value>UDP_SOCKET_SEND_BUFFER_SIZE</value>
-            </element>
-          </value>
-        </property>
-      </participant_qos>
-      <datawriter_qos>
-        <reliability>
-          <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <resource_limits>
-          <max_instances>1</max_instances>
-          <initial_instances>1</initial_instances>
-          <max_samples>LENGTH_UNLIMITED</max_samples>
-          <initial_samples>100</initial_samples>
-          <max_samples_per_instance>LENGTH_UNLIMITED</max_samples_per_instance>
-        </resource_limits>
-      </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-        </reliability>
-        <resource_limits>
-          <initial_samples>100</initial_samples>
-          <initial_instances>1</initial_instances>
-          <max_samples>LENGTH_UNLIMITED</max_samples>
-          <max_instances>1</max_instances>
-          <max_samples_per_instance>LENGTH_UNLIMITED</max_samples_per_instance>
-        </resource_limits>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-         </durability>
-      </datareader_qos>
-    </qos_profile>
-
-    <qos_profile name="ThroughputCmdQoS" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <participant_qos>
-        <receiver_pool>
-          <buffer_size>92160</buffer_size>
-        </receiver_pool>
-        <property>
-          <value>
-            <element>
-              <name>dds.transport.builtin.mask</name>
-              <value>DDS_TRANSPORTBUILTIN_UDPv4</value>
-              <name>dds.transport.UDPv4.builtin.parent.message_size_max</name>
-              <value>UDP_SIZE_MAX</value>
-              <name>dds.transport.UDPv4.builtin.recv_socket_buffer_size</name>
-              <value>UDP_SOCKET_RECV_BUFFER_SIZE</value>
-              <name>dds.transport.UDPv4.builtin.send_socket_buffer_size</name>
-              <value>UDP_SOCKET_SEND_BUFFER_SIZE</value>
-            </element>
-          </value>
-        </property>
-      </participant_qos>
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <resource_limits>
-          <max_instances>1</max_instances>
-          <initial_instances>1</initial_instances>
-          <max_samples>LENGTH_UNLIMITED</max_samples>
-          <initial_samples>100</initial_samples>
-          <max_samples_per_instance>LENGTH_UNLIMITED</max_samples_per_instance>
-        </resource_limits>
-      </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <resource_limits>
-          <initial_samples>100</initial_samples>
-          <initial_instances>1</initial_instances>
-          <max_samples>LENGTH_UNLIMITED</max_samples>
-          <max_instances>1</max_instances>
-          <max_samples_per_instance>LENGTH_UNLIMITED</max_samples_per_instance>
-        </resource_limits>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-         </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/run_test.pl
deleted file mode 100755
index 47c701ce25e..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/run_test.pl
+++ /dev/null
@@ -1,257 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = (  "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "ReceiverNode","SenderNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$E2 = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan_sub.cdp";
-$cdp_file_two = "Plan_pub.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (5 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Start dance_plan_launcher.exe with -x $cdp_file_two -k file://$ior_emfile\n";
-$E2 = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file_two -k file://$ior_emfile");
-$pl_status = $E2->SpawnWaitKill (5 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 180 seconds to allow task to complete\n";
-sleep (180);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -s\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$E->SpawnWaitKill (5 * $tg_executor->ProcessStopWaitInterval ());
-
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file_two -s\n";
-
-$E2 = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file_two -s");
-$E2->SpawnWaitKill (5 * $tg_executor->ProcessStopWaitInterval ());
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/.gitignore b/CIAO/connectors/dds4ccm/tests/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/.gitignore b/CIAO/connectors/dds4ccm/tests/CSLDeadline/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.idl b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.idl
deleted file mode 100644
index 5bd3aa34352..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file   CSL_DeadlineTest_Base.idl
- * @author Marijke Hengstmengel <mhengstmengel@remedy.nl>
- */
-
-#ifndef CSL_DEADLINETEST_BASE_IDL
-#define CSL_DEADLINETEST_BASE_IDL
-
-#pragma ndds typesupport "Base/CSL_DeadlineTest_BaseSupport.h"
-#pragma opendds typesupport "Base/CSL_DeadlineTest_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "TestTopic"
-#pragma DCPS_DATA_KEY "TestTopic key"
-
-struct TestTopic {
-  string key; //@key
-  long x;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TestTopic> TestTopicSeq;
-#endif
-
-#endif /* CSL_DEADLINETEST_BASE_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc
deleted file mode 100644
index c3219fd1a33..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_CSL_DeadlineTest_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_CSL_DeadlineTest_Base_stub
-  dynamicflags += CSL_DEADLINETEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=CSL_DEADLINETEST_BASE_STUB_Export \
-              -Wb,stub_export_include=CSL_DeadlineTest_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    CSL_DeadlineTest_Base.idl
-  }
-
-  opendds_ts_flags += --export=CSL_DEADLINETEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    CSL_DeadlineTest_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/.gitignore
deleted file mode 100644
index 079b83fa08f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/CSL_DeadlineTest_ConnectorE.idl
-/CSL_DeadlineTest_Connector_conn.cpp
-/CSL_DeadlineTest_Connector_conn.h
-/CSL_DeadlineTest_Connector_conn_export.h
-/CSL_DeadlineTest_Connector_lem_stub_export.h
-/CSL_DeadlineTest_Connector_stub_export.h
-/CSL_DeadlineTest_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.idl b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.idl
deleted file mode 100644
index 72770442ace..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file CSL_DeadlineTest_Connector.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef CSL_DeadlineTest_CONNECTOR_IDL_
-#define CSL_DeadlineTest_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/CSL_DeadlineTest_Base.idl"
-
-#pragma ciao lem "Connector/CSL_DeadlineTest_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/CSL_DeadlineTest_BaseTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> CSLDeadlineConnector;
-
-#endif /* CSL_DeadlineTest_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc
deleted file mode 100644
index 6b5cd55c228..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_CSL_DeadlineTest_Base -l .. -o ../lib -u DDS CSL_DeadlineTest_Connector"
-
-project(DDS_CSL_DT_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_CSL_DeadlineTest_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=CSL_DEADLINETEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=CSL_DeadlineTest_Connector_stub_export.h \
-              -Wb,skel_export_macro=CSL_DEADLINETEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=CSL_DeadlineTest_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=CSL_DEADLINETEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=CSL_DeadlineTest_Connector_svnt_export.h \
-              -Wb,conn_export_macro=CSL_DEADLINETEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=CSL_DeadlineTest_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    CSL_DeadlineTest_Connector.idl
-  }
-}
-
-project(DDS_CSL_DT_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_CSL_DT_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=CSL_DEADLINETEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=CSL_DeadlineTest_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    CSL_DeadlineTest_ConnectorE.idl
-  }
-}
-
-project(DDS_CSL_DT_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_CSL_DT_Connector_lem_gen DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Base_stub
-  libs  += DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_CSL_DT_Connector_lem_stub
-  dynamicflags += CSL_DEADLINETEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_DeadlineTest_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    CSL_DeadlineTest_ConnectorEC.h
-    CSL_DeadlineTest_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    CSL_DeadlineTest_ConnectorEC.inl
-  }
-}
-
-project(DDS_CSL_DeadlineTest_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_CSL_DT_Connector_idl_gen DDS_CSL_DeadlineTest_Base_stub
-  libs  += DDS_CSL_DeadlineTest_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_CSL_DeadlineTest_Connector_stub
-  dynamicflags += CSL_DEADLINETEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_DeadlineTest_ConnectorC.cpp
-  }
-
-  Header_Files {
-    CSL_DeadlineTest_ConnectorC.h
-    CSL_DeadlineTest_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    CSL_DeadlineTest_ConnectorC.inl
-  }
-}
-
-project(DDS_CSL_DeadlineTest_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_CSL_DT_Connector_lem_stub DDS_CSL_DeadlineTest_Connector_stub
-  sharedname = DDS_CSL_DeadlineTest_Connector_exec
-  libs += DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DT_Connector_lem_stub DDS_CSL_DeadlineTest_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += CSL_DEADLINETEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_DeadlineTest_Connector_conn.cpp
-  }
-
-  Header_Files {
-    CSL_DeadlineTest_Connector_conn.h
-    CSL_DeadlineTest_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_CSL_DeadlineTest_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_CSL_DT_Connector_lem_stub DDS_CSL_DeadlineTest_Connector_exec DDS_CSL_DeadlineTest_Connector_stub
-  sharedname  = DDS_CSL_DeadlineTest_Connector_svnt
-  libs       += DDS_CSL_DeadlineTest_Connector_stub \
-                DDS_CSL_DT_Connector_lem_stub  \
-                DDS_CSL_DeadlineTest_Base_stub \
-                DDS_CSL_DeadlineTest_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += CSL_DEADLINETEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_DeadlineTest_ConnectorS.cpp
-    CSL_DeadlineTest_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    CSL_DeadlineTest_ConnectorS.h
-    CSL_DeadlineTest_Connector_svnt.h
-    CSL_DeadlineTest_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.idl b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.idl
deleted file mode 100644
index afff6a7ef12..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.idl
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * @file
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/CSL_DeadlineTest_Connector.idl"
-
-module CSL_DeadlineTest
-{
-  component Receiver
-  {
-    port CSLDeadlineConnector::DDS_Listen info_out;
-    provides CCM_DDS::ConnectorStatusListener info_out_connector_status;
-   };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc
deleted file mode 100644
index 96ca8bf00cc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc
+++ /dev/null
@@ -1,135 +0,0 @@
-project(DDS_CSL_DeadlineTest_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_CSL_DT_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h -I..
-
-  IDL_Files {
-    CSL_DeadlineTest_Receiver.idl
-  }
-}
-
-project(DDS_CSL_DeadlineTest_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_CSL_DeadlineTest_Receiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    CSL_DeadlineTest_ReceiverE.idl
-  }
-}
-
-project(DDS_CSL_DT_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_CSL_DeadlineTest_Receiver_lem_gen DDS_CSL_DeadlineTest_Receiver_stub  DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Base_stub
-  libs  +=  Receiver_stub DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_DeadlineTest_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    CSL_DeadlineTest_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    CSL_DeadlineTest_ReceiverEC.inl
-  }
-}
-
-project(DDS_CSL_DeadlineTest_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_CSL_DeadlineTest_Receiver_idl_gen  DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DT_Connector_lem_gen
-  libs  += DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_DeadlineTest_ReceiverC.cpp
-  }
-
-  Header_Files {
-    CSL_DeadlineTest_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    CSL_DeadlineTest_ReceiverC.inl
-  }
-}
-
-project(DDS_CSL_DeadlineTest_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_CSL_DT_Receiver_lem_stub DDS_CSL_DeadlineTest_Receiver_stub DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DT_Connector_lem_stub 
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DT_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_DeadlineTest_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    CSL_DeadlineTest_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_CSL_DeadlineTest_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_CSL_DT_Receiver_lem_stub DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Connector_svnt DDS_CSL_DeadlineTest_Receiver_exec DDS_CSL_DT_Connector_lem_stub 
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Connector_svnt Receiver_exec DDS_CSL_DT_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_DeadlineTest_ReceiverS.cpp
-    CSL_DeadlineTest_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    CSL_DeadlineTest_ReceiverS.h
-    CSL_DeadlineTest_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp
deleted file mode 100644
index f8e2f553741..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp
+++ /dev/null
@@ -1,191 +0,0 @@
-// -*- C++ -*-
-#include "CSL_DeadlineTest_Receiver_exec.h"
-#include "ace/Log_Msg.h"
-#include "tao/ORB_Core.h"
-
-namespace CIAO_CSL_DeadlineTest_Receiver_Impl
-{
-
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (Atomic_Boolean &deadline_missed)
-    : deadline_missed_ (deadline_missed)
-  {
-  }
-
-  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic (
-    ::DDS::Topic_ptr /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed (
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-    this->deadline_missed_ = true;
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos (
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status (
-    ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind /*status_kind*/)
-  {
-  }
-
-  //============================================================
-  // TestTopic_RawListener_exec_i
-  //============================================================
-  TestTopic_RawListener_exec_i::TestTopic_RawListener_exec_i (Atomic_ULong &received)
-      : received_ (received)
-  {
-  }
-
-  TestTopic_RawListener_exec_i::~TestTopic_RawListener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::TestTopic_RawListener
-
-  void
-  TestTopic_RawListener_exec_i::on_one_data (
-    const TestTopic & an_instance ,
-    const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    ++this->received_;
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TestTopic_RawListener: ")
-            ACE_TEXT ("received test_topic_info for <%C> at %u\n"),
-            an_instance.key.in (),
-            an_instance.x));
-  }
-
-  void
-  TestTopic_RawListener_exec_i::on_many_data (
-    const TestTopicSeq & /*an_instance */,
-    const ::CCM_DDS::ReadInfoSeq & /* info */)
-  {
-  }
-
-  //============================================================
-  // Receiver_exec_i
-  //============================================================
-  Receiver_exec_i::Receiver_exec_i (void)
-    : deadline_missed_ (false)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-  // Component attributes.
-  // Port operations.
-  ::CSLDeadlineConnector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_out_data_listener (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new TestTopic RAW listener\n")));
-    return new TestTopic_RawListener_exec_i (this->received_);
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_status (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new PortStatuslistener\n")));
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Receiver_exec_i::get_info_out_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i (this->deadline_missed_);
-  }
-
-  // Operations from Components::SessionComponent.
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::CSL_DeadlineTest::CCM_Receiver_Context::_narrow (ctx);
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    ::CCM_DDS::DataListenerControl_var lc =
-    this->context_->get_connection_info_out_data_control ();
-
-    if (::CORBA::is_nil (lc.in ()))
-      {
-        ACE_ERROR ((LM_INFO, ACE_TEXT ("Error:  Listener control receptacle is null!\n")));
-        throw ::CORBA::INTERNAL ();
-      }
-    lc->mode (::CCM_DDS::ONE_BY_ONE);
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-     if (!this->deadline_missed_.value ())
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("RECEIVER OK: Didn't receive ")
-                              ACE_TEXT ("'on_offered_deadline_missed'\n")));
-      }
-    else
-      {
-         ACE_ERROR ((LM_ERROR, ACE_TEXT ("RECEIVER ERROR: Received the unexpected ")
-                               ACE_TEXT ("'on_offered_deadline_missed'\n")));
-      }
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CSL_DeadlineTest_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.h
deleted file mode 100644
index 09383f289ca..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.h
+++ /dev/null
@@ -1,128 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_RECEIVER_EXEC_H_
-#define CIAO_RECEIVER_EXEC_H_
-
-#include "CSL_DeadlineTest_ReceiverEC.h"
-
-#include /**/ "Receiver_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-#include "ace/OS_NS_Thread.h"
-
-
-
-namespace CIAO_CSL_DeadlineTest_Receiver_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::ULong> Atomic_ULong;
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean> Atomic_Boolean;
-
-  class Receiver_exec_i;
-
-  //============================================================
-  // TestTopic_RawListener_exec_i
-  //============================================================
-  class RECEIVER_EXEC_Export TestTopic_RawListener_exec_i
-    : public virtual ::CSLDeadlineConnector::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    TestTopic_RawListener_exec_i (Atomic_ULong &);
-    virtual ~TestTopic_RawListener_exec_i (void);
-
-    virtual void
-    on_one_data (
-      const TestTopic & an_instance,
-      const ::CCM_DDS::ReadInfo & info);
-
-    virtual void
-    on_many_data (
-      const ::TestTopicSeq & data,
-      const ::CCM_DDS::ReadInfoSeq & info);
-
-  private:
-    Atomic_ULong &received_;
-  };
-
-
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  class RECEIVER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Atomic_Boolean &);
-
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-    void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                                ::DDS::StatusKind  status_kind);
-  private:
-    Atomic_Boolean &deadline_missed_;
-  };
-
-  //============================================================
-  // Receiver_exec_i
-  //============================================================
-  class RECEIVER_EXEC_Export Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    // Port operations.
-    virtual ::CSLDeadlineConnector::CCM_Listener_ptr
-    get_info_out_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_status (void);
-
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_info_out_connector_status (void);
-
-    // Operations from Components::SessionComponent.
-    virtual void
-    set_session_context (
-      ::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete (void);
-
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-
-  private:
-    ::CSL_DeadlineTest::CCM_Receiver_Context_var context_;
-    Atomic_ULong received_;
-    Atomic_Boolean deadline_missed_;
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CSL_DeadlineTest_Receiver_Impl (void);
-}
-
-#endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/.gitignore b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/.gitignore
deleted file mode 100644
index 97f2c4f5077..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/CSL_DeadlineTest_SenderE.idl
-/Sender_exec_export.h
-/Sender_lem_stub_export.h
-/Sender_stub_export.h
-/Sender_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.idl b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.idl
deleted file mode 100644
index 95ddfb14c9f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @author Marijke Hengstmengel <mhengstmengel@remedy.nl>
- */
-
-#ifndef DDS_CSL_DEADLINETEST_SENDER_IDL
-#define DDS_CSL_DEADLINETEST_SENDER_IDL
-
-#include "Connector/CSL_DeadlineTest_Connector.idl"
-
-module CSL_DeadlineTest
-{
-  component Sender
-  {
-    port CSLDeadlineConnector::DDS_Write test_topic_write;
-    provides CCM_DDS::ConnectorStatusListener test_topic_connector_status;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc
deleted file mode 100644
index 45f26e72e69..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc
+++ /dev/null
@@ -1,138 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_CSL_DeadlineTest_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_CSL_DeadlineTest_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_CSL_DT_Connector_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I ..
-
-  IDL_Files {
-    CSL_DeadlineTest_Sender.idl
-  }
-}
-
-project(DDS_CSL_DeadlineTest_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_CSL_DeadlineTest_Sender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    CSL_DeadlineTest_SenderE.idl
-  }
-}
-
-project(DDS_CSL_DeadlineTest_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_CSL_DeadlineTest_Sender_lem_gen DDS_CSL_DeadlineTest_Sender_stub DDS_CSL_DeadlineTest_Base_stub
-  libs  += DDS_CSL_DeadlineTest_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_DeadlineTest_SenderEC.cpp
-  }
-
-  Header_Files {
-    CSL_DeadlineTest_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    CSL_DeadlineTest_SenderEC.inl
-  }
-}
-
-project(DDS_CSL_DeadlineTest_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_CSL_DeadlineTest_Sender_idl_gen DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Connector_stub
-  libs  += DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_DeadlineTest_SenderC.cpp
-  }
-
-  Header_Files {
-    CSL_DeadlineTest_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    CSL_DeadlineTest_SenderC.inl
-  }
-}
-
-project(DDS_CSL_DeadlineTest_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_CSL_DeadlineTest_Sender_lem_stub DDS_CSL_DeadlineTest_Sender_stub DDS_CSL_DT_Connector_lem_stub DDS_CSL_DeadlineTest_Connector_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DT_Connector_lem_stub  DDS_CSL_DeadlineTest_Connector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_DeadlineTest_Sender_exec.cpp
-  }
-
-  Header_Files {
-    CSL_DeadlineTest_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_CSL_DeadlineTest_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_CSL_DeadlineTest_Base_stub  DDS_CSL_DeadlineTest_Sender_lem_stub DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Connector_svnt DDS_CSL_DT_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Connector_stub  DDS_CSL_DeadlineTest_Connector_svnt DDS_CSL_DT_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_DeadlineTest_SenderS.cpp
-    CSL_DeadlineTest_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    CSL_DeadlineTest_SenderS.h
-    CSL_DeadlineTest_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp
deleted file mode 100644
index a005474788c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp
+++ /dev/null
@@ -1,248 +0,0 @@
-// -*- C++ -*-
-// Test for OFFERED_DEADLINE_MISSED status : Writer failed to write data within
-// the deadline time period set in the profile.
-
-#include "CSL_DeadlineTest_Sender_exec.h"
-#include "ace/Guard_T.h"
-#include "ace/Log_Msg.h"
-#include "ace/OS_NS_unistd.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-namespace CIAO_CSL_DeadlineTest_Sender_Impl
-{
-
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (
-    Atomic_Boolean &deadline_missed,
-    ACE_Thread_ID &thread_id,
-    Sender_exec_i &callback)
-    : deadline_missed_ (deadline_missed),
-      thread_id_ (thread_id),
-      callback_ (callback)
-  {
-  }
-
-  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic (
-    ::DDS::Topic_ptr /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-    ::DDS::DataWriter_ptr the_writer,
-    const DDS::OfferedDeadlineMissedStatus & status)
-  {
-    ACE_Thread_ID t_id;
-    this->thread_id_ = t_id;
-
-    if(status.last_instance_handle != ::DDS::HANDLE_NIL && ! ::CORBA::is_nil (the_writer))
-      {
-        this->deadline_missed_ = true;
-      }
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status(
-    ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind status_kind)
-  {
-    if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS)
-      {
-        // Add 2 different instances of topic
-        this->callback_.add_instance_of_topic ("ONE",1);
-        this->callback_.add_instance_of_topic ("TWO",2);
-
-        // When we have a publication matched start write the data once
-        this->callback_.write ();
-      }
-  }
-
-  //============================================================
-  // Sender_exec_i
-  //============================================================
-  Sender_exec_i::Sender_exec_i (void)
-    : deadline_missed_ (false),
-      thread_id_listener_ (0, 0)
-  {
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-  }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_test_topic_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i (this->deadline_missed_,
-                                               this->thread_id_listener_,
-                                               *this);
-  }
-
-  // Supported operations and attributes.
-  void
-  Sender_exec_i::set_session_context (::Components::SessionContext_ptr ctx)
-  {
-    this->context_ = ::CSL_DeadlineTest::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-   }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Sender_exec_i::write (void)
-  {
-    ::CSLDeadlineConnector::Writer_var writer =
-      this->context_->get_connection_test_topic_write_data ();
-
-    if (! ::CORBA::is_nil (writer.in ()) )
-      {
-        // to force an 'offered_deadline_missed'  write the topics with a pause
-        // of 2 sec in between and in the profile the deadline is set to 1 sec.
-        for (CSL_QoSTest_Table::iterator i = this->_ktests_.begin ();
-            i != this->_ktests_.end ();
-            ++i)
-          {
-            try
-              {
-                ACE_OS::sleep (2);
-                ::DDS::InstanceHandle_t const hnd =
-                  writer->register_instance (i->second);
-                writer->write_one(i->second,hnd);
-              }
-            catch (const CCM_DDS::InternalError& )
-              {
-                ACE_ERROR ((LM_ERROR,
-                            ACE_TEXT ("Internal Error while writing topic for <%C>.\n"),
-                            i->first.c_str ()));
-              }
-          }
-      }
-  }
-
- void
-  Sender_exec_i::add_instance_of_topic (const char * key, int x)
-  {
-    TestTopic *new_key = new TestTopic;
-    new_key->key = CORBA::string_dup(key);
-    new_key->x = x;
-    this->_ktests_[key] = new_key;
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    if (this->deadline_missed_.value ())
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("SENDER OK: Received the expected ")
-                              ACE_TEXT ("'on_offered_deadline_missed'\n")));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("SENDER ERROR: did not receive the expected ")
-                              ACE_TEXT ("error 'on_offered_deadline_missed'\n")));
-      }
-    char ccm_buf [65];
-    ACE_Thread_ID ccm_thread_id;
-    ccm_thread_id.to_string (ccm_buf);
-
-    char list_buf [65];
-    this->thread_id_listener_.to_string(list_buf);
-
-    if (this->thread_id_listener_.id () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: "
-                              "Thread ID for ConnectorStatusListener not set!\n"));
-      }
-    #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (this->thread_id_listener_ == ccm_thread_id)
-      {
-        ACE_DEBUG ((LM_DEBUG, "SENDER OK: "
-                              "Thread switch for ConnectorStatusListener seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                               "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-     }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: "
-                              "Thread switch for ConnectorStatusListener "
-                              "doesn't seem to work! "
-                               "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-     }
-    #else
-    else if (this->thread_id_listener_ == ccm_thread_id)
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: ConnectorStatusListener: "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "SENDER OK: ConnectorStatusListener: "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    #endif
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CSL_DeadlineTest_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.h
deleted file mode 100644
index 678cc3c7e5e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.h
+++ /dev/null
@@ -1,104 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_SENDER_EXEC_H_
-#define CIAO_SENDER_EXEC_H_
-
-
-#include "CSL_DeadlineTest_SenderEC.h"
-
-#include /**/ "Sender_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-#include <map>
-
-namespace CIAO_CSL_DeadlineTest_Sender_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
-
-  class Sender_exec_i;
-
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  class SENDER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Atomic_Boolean &deadline_missed,
-                                    ACE_Thread_ID &thread_id,
-                                    Sender_exec_i &callback);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-      void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                                 ::DDS::StatusKind status_kind);
-  private:
-    Atomic_Boolean &deadline_missed_;
-    ACE_Thread_ID &thread_id_;
-    Sender_exec_i &callback_;
-  };
-
-  //============================================================
-  // Sender_exec_i
-  //============================================================
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-
-    // Port operations.
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_test_topic_connector_status(void);
-
-    void write (void);
-    void add_instance_of_topic (const char *, int x );
-
-  private:
-    ::CSL_DeadlineTest::CCM_Sender_Context_var context_;
-
-    Atomic_Boolean deadline_missed_;
-    ACE_Thread_ID thread_id_listener_;
-
-    TAO_SYNCH_MUTEX mutex_;
-    typedef std::map<ACE_CString, TestTopic_var> CSL_QoSTest_Table;
-    CSL_QoSTest_Table _ktests_;
- };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CSL_DeadlineTest_Sender_Impl (void);
-
-
-
-}
-
-#endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/HelloTest_Library.xml b/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/HelloTest_Library.xml
deleted file mode 100644
index a14318cb94c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/HelloTest_Library.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-  <qos_profile name="HelloProfile">
-     <datawriter_qos>
-          <reliability>
-               <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-               <max_blocking_time>
-                    <sec>2</sec>
-                    <nanosec>0</nanosec>
-               </max_blocking_time>
-         </reliability>
-          <durability>
-               <kind>TRANSIENT_DURABILITY_QOS</kind>
-          </durability>
-          <history>
-               <kind>KEEP_LAST_HISTORY_QOS</kind>
-               <depth>20</depth>
-          </history>
-          <deadline>
-               <period>
-                    <sec>1</sec>
-                    <nanosec>0</nanosec>
-               </period>
-          </deadline>
-     </datawriter_qos>
-    <datareader_qos>
-          <reliability>
-               <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-          </reliability>
-          <history>
-               <kind>KEEP_LAST_HISTORY_QOS</kind>
-               <depth>20</depth>
-          </history>
-          <durability>
-                 <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-          </durability>
-          <deadline>
-               <period>
-                    <sec>1</sec>
-                    <nanosec>0</nanosec>
-               </period>
-          </deadline>
-     </datareader_qos>
-  </qos_profile>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/Plan.cdp
deleted file mode 100644
index 01c2adc328e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/Plan.cdp
+++ /dev/null
@@ -1,412 +0,0 @@
-<!--  -->
-<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>CSL_DeadlineTest_Depl_1</label>
-  <UUID>CSL_DeadlineTest_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CSL_DeadlineTest_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CSL_DeadlineTest_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="CSL_DeadlineTest_ConnectorComponentImplementation">
-    <name>CSL_DeadlineTest_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="CSL_DeadlineTest_Connector_ExecArtifact" />
-    <artifact xmi:idref="CSL_DeadlineTest_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CSLDeadlineConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CSLDeadlineConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CSL_DeadlineTest_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CSL_DeadlineTest_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CSL_DeadlineTest_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CSL_DeadlineTest_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-  </instance>
-
-  <instance xmi:id="CSL_DeadlineTest_ConnectorComponentInstance">
-    <name>CSL_DeadlineTest_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="CSL_DeadlineTest_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestQoS</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-    <name>qos_profile</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>HelloTest_Library#HelloProfile</string>
-      </value>
-    </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="CSL_DeadlineTest_ConnectorComponentInstance2">
-    <name>CSL_DeadlineTest_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="CSL_DeadlineTest_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestQoS</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>HelloTest_Library#HelloProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-  </instance>
-
-  <connection>
-    <name>_listenercontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CSL_DeadlineTest_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_portstatuslistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CSL_DeadlineTest_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CSL_DeadlineTest_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-    <connection>
-    <name>info_out_connector_status_receiver</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CSL_DeadlineTest_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>test_topic_connector_status_sender</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>test_topic_connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CSL_DeadlineTest_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>test_topic_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CSL_DeadlineTest_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="CSL_DeadlineTest_Connector_ExecArtifact">
-    <name>CSL_DeadlineTest_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_CSL_DeadlineTest_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="CSL_DeadlineTest_Connector_SvntArtifact">
-    <name>CSL_DeadlineTest_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_CSL_DeadlineTest_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="CSL_DeadlineTest_Connector_StubArtifact">
-    <name>CSL_DeadlineTest_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_CSL_DeadlineTest_Connector_stub</location>
-  </artifact>
-
-
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index 954241ce864..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-Description
-XML QoS Profile
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="HelloTest_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="HelloProfile" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>2</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_LAST_HISTORY_QOS</kind>
-          <depth>20</depth>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-        <deadline>
-          <period>
-            <sec>1</sec>
-            <nanosec>0</nanosec>
-          </period>
-        </deadline>
-      </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_LAST_HISTORY_QOS</kind>
-          <depth>20</depth>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-        <deadline>
-          <period>
-            <sec>1</sec>
-            <nanosec>0</nanosec>
-          </period>
-        </deadline>
-        </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl
deleted file mode 100755
index f41a32df43a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl
+++ /dev/null
@@ -1,242 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 10 seconds to allow task to complete\n";
-sleep (10);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/.gitignore b/CIAO/connectors/dds4ccm/tests/CSLQoS/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl b/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl
deleted file mode 100644
index d2b1a6260fd..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file   CSL_QoSTest_Base.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef CSL_QOSTEST_BASE_IDL
-#define CSL_QOSTEST_BASE_IDL
-
-#pragma ndds typesupport "Base/CSL_QoSTest_BaseSupport.h"
-#pragma opendds typesupport "Base/CSL_QoSTest_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "TestTopic"
-#pragma DCPS_DATA_KEY "TestTopic key"
-
-struct TestTopic {
-  string key; //@key
-  long x;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TestTopic> TestTopicSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc b/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc
deleted file mode 100644
index 3782d26a74d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_CSL_QoSTest_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_CSL_QoSTest_Base_stub
-  dynamicflags += CSL_QOSTEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=CSL_QOSTEST_BASE_STUB_Export \
-              -Wb,stub_export_include=CSL_QoSTest_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    CSL_QoSTest_Base.idl
-  }
-
-  opendds_ts_flags += --export=CSL_QOSTEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    CSL_QoSTest_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.idl b/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.idl
deleted file mode 100644
index 20c524cc3a3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file CSL_QoSTest_Connector.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef CSL_QOSTEST_CONNECTOR_IDL_
-#define CSL_QOSTEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/CSL_QoSTest_Base.idl"
-
-#pragma ciao lem "Connector/CSL_QoSTest_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/CSL_QoSTest_BaseTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> CSLQoSConnector;
-
-#endif /* CSL_QoSTest_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc
deleted file mode 100644
index 06be4dfd932..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_CSL_QoSTest_Base -l .. -o ../lib -u DDS CSL_QoSTest_Connector"
-
-project(DDS_CSL_QoSTest_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_CSL_QoSTest_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=CSL_QOSTEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=CSL_QoSTest_Connector_stub_export.h \
-              -Wb,skel_export_macro=CSL_QOSTEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=CSL_QoSTest_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=CSL_QOSTEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=CSL_QoSTest_Connector_svnt_export.h \
-              -Wb,conn_export_macro=CSL_QOSTEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=CSL_QoSTest_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    CSL_QoSTest_Connector.idl
-  }
-}
-
-project(DDS_CSL_QoSTest_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_CSL_QoSTest_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=CSL_QOSTEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=CSL_QoSTest_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    CSL_QoSTest_ConnectorE.idl
-  }
-}
-
-project(DDS_CSL_QoSTest_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_CSL_QoSTest_Connector_lem_gen DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Base_stub
-  libs  += DDS_CSL_QoSTest_Base_stub DDS_CSL_QoSTest_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_CSL_QoSTest_Connector_lem_stub
-  dynamicflags += CSL_QOSTEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_QoSTest_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    CSL_QoSTest_ConnectorEC.h
-    CSL_QoSTest_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    CSL_QoSTest_ConnectorEC.inl
-  }
-}
-
-project(DDS_CSL_QoSTest_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_CSL_QoSTest_Connector_idl_gen DDS_CSL_QoSTest_Base_stub
-  libs  += DDS_CSL_QoSTest_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_CSL_QoSTest_Connector_stub
-  dynamicflags += CSL_QOSTEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_QoSTest_ConnectorC.cpp
-  }
-
-  Header_Files {
-    CSL_QoSTest_ConnectorC.h
-    CSL_QoSTest_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    CSL_QoSTest_ConnectorC.inl
-  }
-}
-
-project(DDS_CSL_QoSTest_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_CSL_QoSTest_Connector_lem_stub DDS_CSL_QoSTest_Connector_stub
-  sharedname = DDS_CSL_QoSTest_Connector_exec
-  libs += DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Connector_lem_stub DDS_CSL_QoSTest_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += CSL_QOSTEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_QoSTest_Connector_conn.cpp
-  }
-
-  Header_Files {
-    CSL_QoSTest_Connector_conn.h
-    CSL_QoSTest_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_CSL_QoSTest_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_CSL_QoSTest_Connector_lem_stub DDS_CSL_QoSTest_Connector_exec DDS_CSL_QoSTest_Connector_stub
-  sharedname  = DDS_CSL_QoSTest_Connector_svnt
-  libs       += DDS_CSL_QoSTest_Connector_stub \
-                DDS_CSL_QoSTest_Connector_lem_stub  \
-                DDS_CSL_QoSTest_Base_stub \
-                DDS_CSL_QoSTest_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += CSL_QOSTEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_QoSTest_ConnectorS.cpp
-    CSL_QoSTest_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    CSL_QoSTest_ConnectorS.h
-    CSL_QoSTest_Connector_svnt.h
-    CSL_QoSTest_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.idl b/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.idl
deleted file mode 100644
index 4a0d73b4e00..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.idl
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * @file
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/CSL_QoSTest_Connector.idl"
-
-module CSL_QoSTest
-{
-  component Receiver
-  {
-    port CSLQoSConnector::DDS_Listen info_out;
-    provides CCM_DDS::ConnectorStatusListener info_out_connector_status;
-   };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc
deleted file mode 100644
index 1aa1e5f0e88..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc
+++ /dev/null
@@ -1,135 +0,0 @@
-project(DDS_CSL_QoSTest_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_CSL_QoSTest_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h -I..
-
-  IDL_Files {
-    CSL_QoSTest_Receiver.idl
-  }
-}
-
-project(DDS_CSL_QoSTest_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_CSL_QoSTest_Receiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    CSL_QoSTest_ReceiverE.idl
-  }
-}
-
-project(DDS_CSL_QoSTest_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_CSL_QoSTest_Receiver_lem_gen DDS_CSL_QoSTest_Receiver_stub  DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Base_stub
-  libs  +=  Receiver_stub DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_QoSTest_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    CSL_QoSTest_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    CSL_QoSTest_ReceiverEC.inl
-  }
-}
-
-project(DDS_CSL_QoSTest_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_CSL_QoSTest_Receiver_idl_gen  DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Base_stub DDS_CSL_QoSTest_Connector_lem_gen
-  libs  += DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_QoSTest_ReceiverC.cpp
-  }
-
-  Header_Files {
-    CSL_QoSTest_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    CSL_QoSTest_ReceiverC.inl
-  }
-}
-
-project(DDS_CSL_QoSTest_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_CSL_QoSTest_Receiver_lem_stub DDS_CSL_QoSTest_Receiver_stub DDS_CSL_QoSTest_Base_stub DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Connector_lem_stub 
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_CSL_QoSTest_Base_stub DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_QoSTest_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    CSL_QoSTest_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_CSL_QoSTest_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_CSL_QoSTest_Receiver_lem_stub DDS_CSL_QoSTest_Base_stub DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Connector_svnt DDS_CSL_QoSTest_Receiver_exec DDS_CSL_QoSTest_Connector_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_CSL_QoSTest_Base_stub DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Connector_svnt Receiver_exec DDS_CSL_QoSTest_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_QoSTest_ReceiverS.cpp
-    CSL_QoSTest_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    CSL_QoSTest_ReceiverS.h
-    CSL_QoSTest_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp
deleted file mode 100644
index 64750dbb8d7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp
+++ /dev/null
@@ -1,211 +0,0 @@
-// -*- C++ -*-
-//Test for ConnectorStatusListener: on_requested_incompatible_qos
-
-#include "CSL_QoSTest_Receiver_exec.h"
-#include "ace/Log_Msg.h"
-
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-namespace CIAO_CSL_QoSTest_Receiver_Impl
-{
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (
-    Atomic_Boolean &incompatible,
-    ACE_Thread_ID &thread_id)
-    : incompatible_ (incompatible),
-      thread_id_ (thread_id)
-  {
-  }
-
-  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic(
-    ::DDS::Topic_ptr /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr the_reader,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-    ACE_Thread_ID t_id;
-    this->thread_id_ = t_id;
-
-    if(! ::CORBA::is_nil(the_reader))
-      {
-        this->incompatible_ = true;
-      }
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed (
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos (
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status (
-    ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind /*status_kind */)
-  {
-  }
-
-  //============================================================
-  // Receiver_exec_i
-  //============================================================
-  Receiver_exec_i::Receiver_exec_i (void)
-    : incompatible_ (false),
-      thread_id_listener_ (0, 0)
-
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  ::CSLQoSConnector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_out_data_listener (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new TestTopic RAW listener\n")));
-    return ::CSLQoSConnector::CCM_Listener::_nil ();
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Receiver_exec_i::get_info_out_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i (this->incompatible_,
-                                               this->thread_id_listener_);
-  }
-
-  // Operations from Components::SessionComponent.
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::CSL_QoSTest::CCM_Receiver_Context::_narrow (ctx);
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    if (!this->incompatible_.value ())
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("RECEIVER ERROR: did not receive the expected ")
-                               ACE_TEXT ("error 'on_requested_incompatible_qos' in Receiver\n")
-                    ));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("RECEIVER OK: Received the expected ")
-                               ACE_TEXT ("'on_requested_incompatible_qos' in Receiver\n")
-                    ));
-      }
-    //get current thread
-    char ccm_buf [65];
-    ACE_Thread_ID ccm_thread_id;
-    ccm_thread_id.to_string (ccm_buf);
-
-    char list_buf [65];
-    this->thread_id_listener_.to_string (list_buf);
-    if (this->thread_id_listener_.id () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: "
-                              "Thread ID for ConnectorStatusListener not set!\n"));
-      }
-    #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (this->thread_id_listener_ == ccm_thread_id)
-      {
-        ACE_DEBUG ((LM_DEBUG, "RECEIVER OK: "
-                              "Thread switch for ConnectorStatusListener seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                               "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-     }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: "
-                              "Thread switch for ConnectorStatusListener "
-                              "doesn't seem to work! "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    #else
-    else if (this->thread_id_listener_ == ccm_thread_id)
-      {
-        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: ConnectorStatusListener: "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "RECEIVER OK: ConnectorStatusListener: "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    #endif
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CSL_QoSTest_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.h
deleted file mode 100644
index 7f38ec76fb3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.h
+++ /dev/null
@@ -1,98 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_RECEIVER_EXEC_H_
-#define CIAO_RECEIVER_EXEC_H_
-
-#include "CSL_QoSTest_ReceiverEC.h"
-
-#include /**/ "Receiver_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-#include "ace/OS_NS_Thread.h"
-
-
-
-namespace CIAO_CSL_QoSTest_Receiver_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
-
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  class RECEIVER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Atomic_Boolean &,
-                                    ACE_Thread_ID &);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-    void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                     const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-    void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                               ::DDS::StatusKind  status_kind);
-  private:
-    Atomic_Boolean &incompatible_;
-    ACE_Thread_ID &thread_id_;
-  };
-
-  //============================================================
-  // Receiver_exec_i
-  //============================================================
-  class RECEIVER_EXEC_Export Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    // Port operations.
-    virtual ::CSLQoSConnector::CCM_Listener_ptr
-    get_info_out_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_status (void);
-
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_info_out_connector_status (void);
-
-    // Operations from Components::SessionComponent.
-    virtual void
-    set_session_context (
-      ::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-
-  private:
-    ::CSL_QoSTest::CCM_Receiver_Context_var context_;
-    Atomic_Boolean incompatible_;
-    ACE_Thread_ID thread_id_listener_;
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CSL_QoSTest_Receiver_Impl (void);
-}
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.idl b/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.idl
deleted file mode 100644
index 4e43a8ad491..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.idl
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef DDS_CSL_QOSTEST_SENDER_IDL
-#define DDS_CSL_QOSTEST_SENDER_IDL
-
-#include "Connector/CSL_QoSTest_Connector.idl"
-
-module CSL_QoSTest
-{
-  component Sender
-  {
-     port CSLQoSConnector::DDS_Write info_write;
-     provides CCM_DDS::ConnectorStatusListener test_topic_connector_status;
-
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc b/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc
deleted file mode 100644
index 77b4674e421..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc
+++ /dev/null
@@ -1,138 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_CSL_QoSTest_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_CSL_QoSTest_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_CSL_QoSTest_Connector_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I ..
-
-  IDL_Files {
-    CSL_QoSTest_Sender.idl
-  }
-}
-
-project(DDS_CSL_QoSTest_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_CSL_QoSTest_Sender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    CSL_QoSTest_SenderE.idl
-  }
-}
-
-project(DDS_CSL_QoSTest_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_CSL_QoSTest_Sender_lem_gen DDS_CSL_QoSTest_Sender_stub DDS_CSL_QoSTest_Base_stub
-  libs  += DDS_CSL_QoSTest_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_QoSTest_SenderEC.cpp
-  }
-
-  Header_Files {
-    CSL_QoSTest_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    CSL_QoSTest_SenderEC.inl
-  }
-}
-
-project(DDS_CSL_QoSTest_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_CSL_QoSTest_Sender_idl_gen DDS_CSL_QoSTest_Base_stub DDS_CSL_QoSTest_Connector_stub
-  libs  += DDS_CSL_QoSTest_Base_stub DDS_CSL_QoSTest_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_QoSTest_SenderC.cpp
-  }
-
-  Header_Files {
-    CSL_QoSTest_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    CSL_QoSTest_SenderC.inl
-  }
-}
-
-project(DDS_CSL_QoSTest_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_CSL_QoSTest_Sender_lem_stub DDS_CSL_QoSTest_Sender_stub DDS_CSL_QoSTest_Connector_lem_stub DDS_CSL_QoSTest_Connector_stub  
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub DDS_CSL_QoSTest_Base_stub DDS_CSL_QoSTest_Connector_lem_stub  DDS_CSL_QoSTest_Connector_stub  
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_QoSTest_Sender_exec.cpp
-  }
-
-  Header_Files {
-    CSL_QoSTest_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_CSL_QoSTest_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_CSL_QoSTest_Base_stub  DDS_CSL_QoSTest_Sender_lem_stub DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Connector_svnt DDS_CSL_QoSTest_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                DDS_CSL_QoSTest_Base_stub DDS_CSL_QoSTest_Connector_stub  DDS_CSL_QoSTest_Connector_svnt DDS_CSL_QoSTest_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_QoSTest_SenderS.cpp
-    CSL_QoSTest_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    CSL_QoSTest_SenderS.h
-    CSL_QoSTest_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp
deleted file mode 100644
index bf832d1bcdf..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp
+++ /dev/null
@@ -1,197 +0,0 @@
-// -*- C++ -*-
-// Test for ConnectorStatusListener: on_offered_incompatible_qos
-
-#include "CSL_QoSTest_Sender_exec.h"
-#include "ace/Log_Msg.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-namespace CIAO_CSL_QoSTest_Sender_Impl
-{
-
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (
-    Atomic_Boolean &incompatible,
-    ACE_Thread_ID &thread_id)
-      : incompatible_ (incompatible),
-        thread_id_ (thread_id)
-  {
-  }
-
-  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic(
-    ::DDS::Topic_ptr /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed (
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos (
-    ::DDS::DataWriter_ptr the_writer,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-    ACE_Thread_ID t_id;
-    this->thread_id_ = t_id;
-
-    if(! ::CORBA::is_nil(the_writer))
-      {
-        this->incompatible_ = true;
-      }
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status (
-    ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind  /*status_kind*/)
-  {
-  }
-  //============================================================
-  // Component Executor Implementation Class: Sender_exec_i
-  //============================================================
-
-  Sender_exec_i::Sender_exec_i (void)
-    : incompatible_ (false),
-      thread_id_listener_ (0, 0)
-  {
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-  }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_test_topic_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i (this->incompatible_,
-                                               this->thread_id_listener_);
-  }
-
-  // Supported operations and attributes.
-
-  void
-  Sender_exec_i::set_session_context (::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::CSL_QoSTest::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-   }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    if (!this->incompatible_.value ())
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("SENDER ERROR: did not receive the expected ")
-                               ACE_TEXT ("error 'on_offered_incompatible_qos'\n")
-                    ));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("SENDER OK: Received the expected ")
-                               ACE_TEXT ("'on_offered_incompatible_qos'\n")
-                    ));
-      }
-        //get current thread
-    char ccm_buf [65];
-    ACE_Thread_ID ccm_thread_id;
-    ccm_thread_id.to_string (ccm_buf);
-
-    char list_buf [65];
-    this->thread_id_listener_.to_string (list_buf);
-    if (this->thread_id_listener_.id () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: "
-                              "Thread ID for ConnectorStatusListener not set!\n"));
-      }
-    #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (this->thread_id_listener_ == ccm_thread_id)
-      {
-        ACE_DEBUG ((LM_DEBUG, "SENDER OK: "
-                              "Thread switch for ConnectorStatusListener seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                               "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-     }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: "
-                              "Thread switch for ConnectorStatusListener "
-                              "doesn't seem to work! "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    #else
-    else if (this->thread_id_listener_ == ccm_thread_id)
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: ConnectorStatusListener: "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "SENDER OK: ConnectorStatusListener: "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    #endif
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CSL_QoSTest_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.h
deleted file mode 100644
index 75c7bcfe932..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.h
+++ /dev/null
@@ -1,87 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_SENDER_EXEC_H_
-#define CIAO_SENDER_EXEC_H_
-
-#include "CSL_QoSTest_SenderEC.h"
-
-#include /**/ "Sender_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-namespace CIAO_CSL_QoSTest_Sender_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
-
-  class Sender_exec_i;
-
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  class SENDER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Atomic_Boolean &,
-                                    ACE_Thread_ID &);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-      void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                                 ::DDS::StatusKind  status_kind);
-  private:
-    Atomic_Boolean &incompatible_;
-    ACE_Thread_ID &thread_id_;
-  };
-
-  //============================================================
-  // Sender_exec_i
-  //============================================================
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    // Port operations.
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-      get_test_topic_connector_status(void);
-
-  private:
-    ::CSL_QoSTest::CCM_Sender_Context_var context_;
-
-    Atomic_Boolean incompatible_;
-    ACE_Thread_ID thread_id_listener_;
- };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CSL_QoSTest_Sender_Impl (void);
-}
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/Plan.cdp
deleted file mode 100644
index f95cfc5d6bc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/Plan.cdp
+++ /dev/null
@@ -1,373 +0,0 @@
-<!--  -->
-<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>CSL_QoSTest_Depl_1</label>
-  <UUID>CSL_QoSTest_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CSL_QoSTest_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CSL_QoSTest_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="CSL_QoSTest_ConnectorComponentImplementation">
-    <name>CSL_QoSTest_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="CSL_QoSTest_Connector_ExecArtifact" />
-    <artifact xmi:idref="CSL_QoSTest_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CSLQoSConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CSLQoSConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CSL_QoSTest_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CSL_QoSTest_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CSL_QoSTest_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CSL_QoSTest_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-  </instance>
-
-  <instance xmi:id="CSL_QoSTest_ConnectorComponentInstance">
-    <name>CSL_QoSTest_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="CSL_QoSTest_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestQoS</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-    <name>qos_profile</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>QoSTest_Library#SenderProfile</string>
-      </value>
-    </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="CSL_QoSTest_ConnectorComponentInstance2">
-    <name>CSL_QoSTest_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="CSL_QoSTest_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestQoS</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QoSTest_Library#ReceiverProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-  </instance>
-
-  <connection>
-    <name>info_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CSL_QoSTest_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>info_out_connector_status_receiver</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CSL_QoSTest_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>test_topic_connector_status_sender</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>test_topic_connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CSL_QoSTest_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>test_topic_writer</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CSL_QoSTest_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="CSL_QoSTest_Connector_ExecArtifact">
-    <name>CSL_QoSTest_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_CSL_QoSTest_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="CSL_QoSTest_Connector_SvntArtifact">
-    <name>CSL_QoSTest_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_CSL_QoSTest_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="CSL_QoSTest_Connector_StubArtifact">
-    <name>CSL_QoSTest_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_CSL_QoSTest_Connector_stub</location>
-  </artifact>
-
-
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/QoSTest_Library.xml b/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/QoSTest_Library.xml
deleted file mode 100644
index 9440aa13658..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/QoSTest_Library.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-  <qos_profile name="ReceiverProfile">
-    <datareader_qos>
-          <reliability>
-               <kind>RELIABLE_RELIABILITY_QOS</kind>
-          </reliability>
-          <liveliness>
-               <kind>MANUAL_BY_TOPIC_LIVELINESS_QOS</kind>
-          </liveliness>
-          <history>
-               <kind>KEEP_LAST_HISTORY_QOS</kind>
-               <depth>20</depth>
-          </history>
-          <durability>
-                 <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-          </durability>
-     </datareader_qos>
-  </qos_profile>
-  <qos_profile name="SenderProfile">
-     <datawriter_qos>
-          <reliability>
-               <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-               <max_blocking_time>
-                    <sec>2</sec>
-                    <nanosec>0</nanosec>
-               </max_blocking_time>
-         </reliability>
-          <durability>
-               <kind>TRANSIENT_DURABILITY_QOS</kind>
-          </durability>
-          <liveliness>
-               <kind>MANUAL_BY_TOPIC_LIVELINESS_QOS</kind>
-          </liveliness>
-          <history>
-               <kind>KEEP_LAST_HISTORY_QOS</kind>
-               <depth>20</depth>
-          </history>
-     </datawriter_qos>
-  </qos_profile>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index c7b66a2685c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-Description
-XML QoS Profile
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="QoSTest_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="SenderProfile" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>2</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <liveliness>
-          <kind>DDS_MANUAL_BY_PARTICIPANT_LIVELINESS_QOS</kind>
-        </liveliness>
-        <history>
-          <kind>KEEP_LAST_HISTORY_QOS</kind>
-          <depth>20</depth>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-    </qos_profile>
-
-    <qos_profile name="ReceiverProfile" is_default_qos="false">
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <liveliness>
-          <kind>DDS_MANUAL_BY_TOPIC_LIVELINESS_QOS</kind>
-        </liveliness>
-        <history>
-          <kind>KEEP_LAST_HISTORY_QOS</kind>
-          <depth>20</depth>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl
deleted file mode 100755
index c6321471979..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 10 seconds to allow task to complete\n";
-sleep (10);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/.gitignore b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl
deleted file mode 100644
index 2435b1d1108..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file   CSL_SRTest_Base.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef CSL_SRTEST_BASE_IDL
-#define CSL_SRTEST_BASE_IDL
-
-#pragma ndds typesupport "Base/CSL_SRTest_BaseSupport.h"
-#pragma opendds typesupport "Base/CSL_SRTest_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "TestTopic"
-#pragma DCPS_DATA_KEY "TestTopic key"
-
-struct TestTopic {
-  string key; //@key
-  long x;
-};
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TestTopic> TestTopicSeq;
-#endif
-
-#endif /* CSL_SRTEST_BASE_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc
deleted file mode 100644
index d1471149105..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_CSL_SRTest_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_CSL_SRTest_Base_stub
-  dynamicflags += CSL_SRTEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=CSL_SRTEST_BASE_STUB_Export \
-              -Wb,stub_export_include=CSL_SRTest_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    CSL_SRTest_Base.idl
-  }
-
-  opendds_ts_flags += --export=CSL_SRTEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    CSL_SRTest_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.idl b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.idl
deleted file mode 100644
index 3e064833a91..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file CSL_SRTest_Connector.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef CSL_SRTEST_CONNECTOR_IDL_
-#define CSL_SRTEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/CSL_SRTest_Base.idl"
-
-#pragma ciao lem "Connector/CSL_SRTest_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/CSL_SRTest_BaseTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> CSL_SR_Connector;
-
-#endif /* CSL_SRTEST_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc
deleted file mode 100644
index 2eaedc3edab..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_CSL_SRTest_Base -l .. -o ../lib -u DDS CSL_SRTest_Connector"
-
-project(DDS_CSL_SRTest_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_CSL_SRTest_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=CSL_SRTEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=CSL_SRTest_Connector_stub_export.h \
-              -Wb,skel_export_macro=CSL_SRTEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=CSL_SRTest_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=CSL_SRTEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=CSL_SRTest_Connector_svnt_export.h \
-              -Wb,conn_export_macro=CSL_SRTEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=CSL_SRTest_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    CSL_SRTest_Connector.idl
-  }
-}
-
-project(DDS_CSL_SRTest_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_CSL_SRTest_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=CSL_SRTEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=CSL_SRTest_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    CSL_SRTest_ConnectorE.idl
-  }
-}
-
-project(DDS_CSL_SRTest_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_CSL_SRTest_Connector_lem_gen DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Base_stub
-  libs  += DDS_CSL_SRTest_Base_stub DDS_CSL_SRTest_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_CSL_SRTest_Connector_lem_stub
-  dynamicflags += CSL_SRTEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_SRTest_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    CSL_SRTest_ConnectorEC.h
-    CSL_SRTest_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    CSL_SRTest_ConnectorEC.inl
-  }
-}
-
-project(DDS_CSL_SRTest_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_CSL_SRTest_Connector_idl_gen DDS_CSL_SRTest_Base_stub
-  libs  += DDS_CSL_SRTest_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_CSL_SRTest_Connector_stub
-  dynamicflags += CSL_SRTEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_SRTest_ConnectorC.cpp
-  }
-
-  Header_Files {
-    CSL_SRTest_ConnectorC.h
-    CSL_SRTest_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    CSL_SRTest_ConnectorC.inl
-  }
-}
-
-project(DDS_CSL_SRTest_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_CSL_SRTest_Connector_lem_stub DDS_CSL_SRTest_Connector_stub
-  sharedname = DDS_CSL_SRTest_Connector_exec
-  libs += DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Connector_lem_stub DDS_CSL_SRTest_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += CSL_SRTEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_SRTest_Connector_conn.cpp
-  }
-
-  Header_Files {
-    CSL_SRTest_Connector_conn.h
-    CSL_SRTest_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_CSL_SRTest_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_CSL_SRTest_Connector_lem_stub DDS_CSL_SRTest_Connector_exec DDS_CSL_SRTest_Connector_stub
-  sharedname  = DDS_CSL_SRTest_Connector_svnt
-  libs       += DDS_CSL_SRTest_Connector_stub \
-                DDS_CSL_SRTest_Connector_lem_stub  \
-                DDS_CSL_SRTest_Base_stub \
-                DDS_CSL_SRTest_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += CSL_SRTEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_SRTest_ConnectorS.cpp
-    CSL_SRTest_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    CSL_SRTest_ConnectorS.h
-    CSL_SRTest_Connector_svnt.h
-    CSL_SRTest_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.idl b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.idl
deleted file mode 100644
index 796d032255b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/CSL_SRTest_Connector.idl"
-
-module CSL_SRTest
-{
-  component Receiver
-  {
-    port CSL_SR_Connector::DDS_Listen info_out;
-    provides CCM_DDS::ConnectorStatusListener info_out_connector_status;
-    attribute unsigned long rate;
-    attribute boolean read_data;//if true, read_all is invoked.
-    attribute boolean raw_listen; //if true, raw listen port is enabled.
-   };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc
deleted file mode 100644
index fbf27cbf327..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc
+++ /dev/null
@@ -1,136 +0,0 @@
-project(DDS_CSL_SRTest_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_CSL_SRTest_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h \
-              -I..
-
-  IDL_Files {
-    CSL_SRTest_Receiver.idl
-  }
-}
-
-project(DDS_CSL_SRTest_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_CSL_SRTest_Receiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    CSL_SRTest_ReceiverE.idl
-  }
-}
-
-project(DDS_CSL_SRTest_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_CSL_SRTest_Receiver_lem_gen DDS_CSL_SRTest_Receiver_stub  DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Base_stub
-  libs  +=  Receiver_stub DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_SRTest_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    CSL_SRTest_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    CSL_SRTest_ReceiverEC.inl
-  }
-}
-
-project(DDS_CSL_SRTest_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_CSL_SRTest_Receiver_idl_gen  DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Base_stub DDS_CSL_SRTest_Connector_lem_gen
-  libs  += DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_SRTest_ReceiverC.cpp
-  }
-
-  Header_Files {
-    CSL_SRTest_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    CSL_SRTest_ReceiverC.inl
-  }
-}
-
-project(DDS_CSL_SRTest_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_CSL_SRTest_Receiver_lem_stub DDS_CSL_SRTest_Receiver_stub DDS_CSL_SRTest_Base_stub DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Connector_lem_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_CSL_SRTest_Base_stub DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_SRTest_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    CSL_SRTest_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_CSL_SRTest_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_CSL_SRTest_Receiver_lem_stub DDS_CSL_SRTest_Base_stub DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Connector_svnt DDS_CSL_SRTest_Receiver_exec DDS_CSL_SRTest_Connector_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_CSL_SRTest_Base_stub DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Connector_svnt Receiver_exec DDS_CSL_SRTest_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_SRTest_ReceiverS.cpp
-    CSL_SRTest_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    CSL_SRTest_ReceiverS.h
-    CSL_SRTest_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp
deleted file mode 100644
index 95cf1a9f244..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp
+++ /dev/null
@@ -1,516 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-/**
-  * Test for ConnectorStatusListener:REJECTED_SAMPLE status through  too much instances
-  * in Sender <max_instances>2</max_instances>, in Receiver <max_instances>1</max_instances>
- **/
-
-#include "CSL_SRTest_Receiver_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-#include "dds4ccm/impl/TimeUtilities.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-namespace CIAO_CSL_SRTest_Receiver_Impl
-{
-
-  /**
-   * Facet Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  info_out_data_listener_exec_i::info_out_data_listener_exec_i (
-        ::CSL_SRTest::CCM_Receiver_Context_ptr ctx,
-        Atomic_ULong &received)
-    : ciao_context_ (
-        ::CSL_SRTest::CCM_Receiver_Context::_duplicate (ctx))
-      , received_ (received)
-  {
-  }
-
-  info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CSL_SR_Connector::Listener
-
-  void
-  info_out_data_listener_exec_i::on_one_data (const ::TestTopic & datum,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    ++this->received_;
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TestTopic_Listener: ")
-            ACE_TEXT ("received testtopic_info for <%C> at %dl\n"),
-            datum.key.in (),
-            datum.x));
-  }
-
-  void
-  info_out_data_listener_exec_i::on_many_data (const ::TestTopicSeq & /* data */,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_status_exec_i
-   */
-
-  info_out_status_exec_i::info_out_status_exec_i (
-        ::CSL_SRTest::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::CSL_SRTest::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_status_exec_i::~info_out_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_connector_status_exec_i
-   */
-
-  info_out_connector_status_exec_i::info_out_connector_status_exec_i (
-        ::CSL_SRTest::CCM_Receiver_Context_ptr ctx,
-        Atomic_Boolean &rejected,
-        ACE_Thread_ID &thread_id)
-    : ciao_context_ (
-        ::CSL_SRTest::CCM_Receiver_Context::_duplicate (ctx))
-      , rejected_ (rejected)
-      , thread_id_ (thread_id)
-  {
-  }
-
-  info_out_connector_status_exec_i::~info_out_connector_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-
-  void
-  info_out_connector_status_exec_i::on_inconsistent_topic (::DDS::Topic_ptr /* the_topic */,
-  const ::DDS::InconsistentTopicStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_requested_incompatible_qos (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedIncompatibleQosStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_sample_rejected (::DDS::DataReader_ptr the_reader,
-  const ::DDS::SampleRejectedStatus & status)
-  {
-    ACE_Thread_ID t_id;
-    this->thread_id_ = t_id;
-    if (status.last_reason == DDS::REJECTED_BY_INSTANCES_LIMIT &&
-        ! ::CORBA::is_nil(the_reader))
-      {
-        this->rejected_ = true;
-      }
-  }
-
-  void
-  info_out_connector_status_exec_i::on_offered_deadline_missed (::DDS::DataWriter_ptr /* the_writer */,
-  const ::DDS::OfferedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_offered_incompatible_qos (::DDS::DataWriter_ptr /* the_writer */,
-  const ::DDS::OfferedIncompatibleQosStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_unexpected_status (::DDS::Entity_ptr /* the_entity */,
-  ::DDS::StatusKind /* status_kind */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * read_action_Generator
-   */
-
-  read_action_Generator::read_action_Generator (Receiver_exec_i &callback)
-    : pulse_callback_ (callback)
-  {
-  }
-
-  read_action_Generator::~read_action_Generator ()
-  {
-  }
-
-  int
-  read_action_Generator::handle_timeout (const ACE_Time_Value &,
-                                         const void *)
-  {
-    try
-      {
-        if (pulse_callback_.read_data ())
-          {
-            this->pulse_callback_.read_all();
-          }
-       }
-    catch (...)
-      {
-      }
-    return 0;
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : rate_ (0)
-      , read_data_ (false)
-      , raw_listen_ (false)
-      , received_ (0)
-      , rejected_(false)
-      , thread_id_listener_ (0, 0)
-  {
-    this->ticker_ = new read_action_Generator (*this);
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Receiver_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Receiver_exec_i::read_all (void)
-  {
-    ::CSL_SR_Connector::Reader_var reader;
-    if (this->read_data ())
-      {
-       reader = this->ciao_context_->get_connection_info_out_data();
-      }
-
-    if (::CORBA::is_nil (reader.in ()))
-      {
-        return;
-      }
-    TestTopicSeq TestTopic_infos;
-    ::CCM_DDS::ReadInfoSeq readinfoseq;
-    reader->read_all(TestTopic_infos, readinfoseq);
-    for(CORBA::ULong i = 0; i < readinfoseq.length(); ++i)
-      {
-        ACE_Time_Value tv;
-        tv <<= readinfoseq[i].source_timestamp;
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL ReadInfo ")
-                              ACE_TEXT ("-> UTC date =%#T\n"),
-                              &tv));
-      }
-    for(CORBA::ULong i = 0; i < TestTopic_infos.length(); ++i)
-      {
-         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL keyed test info : ")
-              ACE_TEXT ("Number <%d> : received TestTopic_info for <%C> at %u\n"),
-            i,
-            TestTopic_infos[i].key.in (),
-            TestTopic_infos[i].x));
-      }
-  }
-
-  // Component attributes and port operations.
-
-  ::CSL_SR_Connector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_out_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ()))
-      {
-        info_out_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_data_listener_exec_i (
-            this->ciao_context_.in (),
-            this->received_),
-            ::CSL_SR_Connector::CCM_Listener::_nil ());
-
-          this->ciao_info_out_data_listener_ = tmp;
-      }
-
-    return
-      ::CSL_SR_Connector::CCM_Listener::_duplicate (
-        this->ciao_info_out_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ()))
-      {
-        info_out_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_out_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_out_status_.in ());
-  }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Receiver_exec_i::get_info_out_connector_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_connector_status_.in ()))
-      {
-        info_out_connector_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_connector_status_exec_i (
-            this->ciao_context_.in (),
-            this->rejected_,
-            this->thread_id_listener_),
-          ::CCM_DDS::CCM_ConnectorStatusListener::_nil ());
-
-          this->ciao_info_out_connector_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_ConnectorStatusListener::_duplicate (
-        this->ciao_info_out_connector_status_.in ());
-  }
-
-  ::CORBA::ULong
-  Receiver_exec_i::rate (void)
-  {
-    return this->rate_;
-  }
-
-  void
-  Receiver_exec_i::rate (
-    const ::CORBA::ULong rate)
-  {
-    this->rate_ = rate;
-  }
-
-  ::CORBA::Boolean
-  Receiver_exec_i::read_data (void)
-  {
-    return this->read_data_;
-  }
-
-  void
-  Receiver_exec_i::read_data (
-    const ::CORBA::Boolean read_data)
-  {
-    this->read_data_ = read_data;
-  }
-
-  ::CORBA::Boolean
-  Receiver_exec_i::raw_listen (void)
-  {
-    return this->raw_listen_;
-  }
-
-  void
-  Receiver_exec_i::raw_listen (
-    const ::CORBA::Boolean raw_listen)
-  {
-    this->raw_listen_ = raw_listen;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::CSL_SRTest::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    ::CCM_DDS::DataListenerControl_var lc =
-    this->ciao_context_->get_connection_info_out_data_control ();
-
-    if (::CORBA::is_nil (lc.in ()))
-      {
-        ACE_ERROR ((LM_INFO, ACE_TEXT ("Error:  Listener control receptacle is null!\n")));
-        throw ::CORBA::INTERNAL ();
-      }
-    lc->mode (this->raw_listen_ ? ::CCM_DDS::ONE_BY_ONE : ::CCM_DDS::NOT_ENABLED);
-
-    // calculate the interval time
-    long const usec = 1000000 / this->rate_;
-    if (this->reactor ()->schedule_timer (this->ticker_,
-                                          0,
-                                          ACE_Time_Value(0, usec),
-                                          ACE_Time_Value(0, usec)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, "Unable to schedule Timer\n"));
-      }
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    this->reactor ()->cancel_timer (this->ticker_);
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    if (this->rejected_.value ())
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("RECEIVER OK: Have received the expected ")
-                              ACE_TEXT ("'on_sample_rejected'\n")
-                    ));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("RECEIVER ERROR: did not receive the expected ")
-                              ACE_TEXT ("warning 'on_sample_rejected'\n")
-                    ));
-      }
-    char ccm_buf [65];
-    ACE_Thread_ID ccm_thread_id;
-    ccm_thread_id.to_string (ccm_buf);
-
-    char list_buf [65];
-    this->thread_id_listener_.to_string (list_buf);
-
-    if (this->thread_id_listener_.id () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: "
-                              "Thread ID for ConnectorStatusListener not set!\n"));
-      }
-    #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (this->thread_id_listener_ == ccm_thread_id)
-      {
-        ACE_DEBUG ((LM_DEBUG, "RECEIVER OK: "
-                              "Thread switch for ConnectorStatusListener seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                               "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: "
-                              "Thread switch for ConnectorStatusListener "
-                              "doesn't seem to work! "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    #else
-    else if (this->thread_id_listener_ == ccm_thread_id)
-      {
-        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: ConnectorStatusListener: "
-                              "DDS seems to use a CCM thread for its callback: "
-                               "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "RECEIVER OK: ConnectorStatusListener: "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    #endif
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CSL_SRTest_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h
deleted file mode 100644
index 6bec32bc73a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h
+++ /dev/null
@@ -1,269 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_CSL_SRTEST_RECEIVER_EXEC_CKJUTE_H_
-#define CIAO_CSL_SRTEST_RECEIVER_EXEC_CKJUTE_H_
-
-#include /**/ "ace/pre.h"
-
-#include "CSL_SRTest_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-#include "ace/OS_NS_Thread.h"
-
-namespace CIAO_CSL_SRTest_Receiver_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::ULong> Atomic_ULong;
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean> Atomic_Boolean;
-
-  class Receiver_exec_i;
-  /**
-   * read_action_Generator
-   */
-  class read_action_Generator
-    : public ACE_Event_Handler
-  {
-  public:
-    read_action_Generator (Receiver_exec_i &callback);
-
-    ~read_action_Generator ();
-
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-
-  private:
-    Receiver_exec_i &pulse_callback_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  class info_out_data_listener_exec_i
-    : public virtual ::CSL_SR_Connector::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_data_listener_exec_i (
-      ::CSL_SRTest::CCM_Receiver_Context_ptr ctx,
-      Atomic_ULong &);
-    virtual ~info_out_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CSL_SR_Connector::Listener. */
-
-    virtual
-    void on_one_data (const ::TestTopic & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (const ::TestTopicSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    ::CSL_SRTest::CCM_Receiver_Context_var ciao_context_;
-    Atomic_ULong &received_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_status_exec_i
-   */
-
-  class info_out_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_status_exec_i (
-      ::CSL_SRTest::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::CSL_SRTest::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_connector_status_exec_i
-   */
-
-  class info_out_connector_status_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_connector_status_exec_i (
-      ::CSL_SRTest::CCM_Receiver_Context_ptr ctx,
-      Atomic_Boolean  &,
-      ACE_Thread_ID &);
-    virtual ~info_out_connector_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-    const ::DDS::InconsistentTopicStatus & status);
-
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedIncompatibleQosStatus & status);
-
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleRejectedStatus & status);
-
-    virtual
-    void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-    const ::DDS::OfferedDeadlineMissedStatus & status);
-
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-    const ::DDS::OfferedIncompatibleQosStatus & status);
-
-    virtual
-    void on_unexpected_status (::DDS::Entity_ptr the_entity,
-    ::DDS::StatusKind status_kind);
-    //@}
-
-  private:
-    ::CSL_SRTest::CCM_Receiver_Context_var ciao_context_;
-    Atomic_Boolean &rejected_;
-    ACE_Thread_ID &thread_id_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CSL_SR_Connector::CCM_Listener_ptr
-    get_info_out_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_status (void);
-
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_info_out_connector_status (void);
-
-    virtual ::CORBA::ULong rate (void);
-
-    virtual void rate (::CORBA::ULong rate);
-
-    virtual ::CORBA::Boolean read_data (void);
-
-    virtual void read_data (::CORBA::Boolean read_data);
-
-    virtual ::CORBA::Boolean raw_listen (void);
-
-    virtual void raw_listen (::CORBA::Boolean raw_listen);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void read_all (void);
-    //@}
-
-  private:
-    ::CSL_SRTest::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::CSL_SR_Connector::CCM_Listener_var ciao_info_out_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_;
-    ::CCM_DDS::CCM_ConnectorStatusListener_var ciao_info_out_connector_status_;
-
-    ::CORBA::ULong rate_;
-
-    ::CORBA::Boolean read_data_;
-
-    ::CORBA::Boolean raw_listen_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    read_action_Generator * ticker_;
-    Atomic_ULong received_;
-    Atomic_Boolean rejected_;
-    ACE_Thread_ID thread_id_listener_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CSL_SRTest_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.idl b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.idl
deleted file mode 100644
index 7675b067f8e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.idl
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef DDS_CSL_SRTEST_SENDER_IDL
-#define DDS_CSL_SRTEST_SENDER_IDL
-
-#include "Connector/CSL_SRTest_Connector.idl"
-
-module CSL_SRTest
-{
-  component Sender
-  {
-     port CSL_SR_Connector::DDS_Write test_topic_write;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc
deleted file mode 100644
index 5bef33fd457..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc
+++ /dev/null
@@ -1,138 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_CSL_SRTest_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_CSL_SRTest_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_CSL_SRTest_Connector_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I ..
-
-  IDL_Files {
-    CSL_SRTest_Sender.idl
-  }
-}
-
-project(DDS_CSL_SRTest_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_CSL_SRTest_Sender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    CSL_SRTest_SenderE.idl
-  }
-}
-
-project(DDS_CSL_SRTest_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_CSL_SRTest_Sender_lem_gen DDS_CSL_SRTest_Sender_stub DDS_CSL_SRTest_Base_stub
-  libs  += DDS_CSL_SRTest_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_SRTest_SenderEC.cpp
-  }
-
-  Header_Files {
-    CSL_SRTest_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    CSL_SRTest_SenderEC.inl
-  }
-}
-
-project(DDS_CSL_SRTest_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_CSL_SRTest_Sender_idl_gen DDS_CSL_SRTest_Base_stub DDS_CSL_SRTest_Connector_stub
-  libs  += DDS_CSL_SRTest_Base_stub DDS_CSL_SRTest_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_SRTest_SenderC.cpp
-  }
-
-  Header_Files {
-    CSL_SRTest_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    CSL_SRTest_SenderC.inl
-  }
-}
-
-project(DDS_CSL_SRTest_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_CSL_SRTest_Sender_lem_stub DDS_CSL_SRTest_Sender_stub DDS_CSL_SRTest_Connector_lem_stub DDS_CSL_SRTest_Connector_stub  
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub DDS_CSL_SRTest_Base_stub DDS_CSL_SRTest_Connector_lem_stub  DDS_CSL_SRTest_Connector_stub  
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_SRTest_Sender_exec.cpp
-  }
-
-  Header_Files {
-    CSL_SRTest_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_CSL_SRTest_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_CSL_SRTest_Base_stub  DDS_CSL_SRTest_Sender_lem_stub DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Connector_svnt DDS_CSL_SRTest_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                DDS_CSL_SRTest_Base_stub DDS_CSL_SRTest_Connector_stub  DDS_CSL_SRTest_Connector_svnt DDS_CSL_SRTest_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_SRTest_SenderS.cpp
-    CSL_SRTest_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    CSL_SRTest_SenderS.h
-    CSL_SRTest_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp
deleted file mode 100644
index 4a3e7028231..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp
+++ /dev/null
@@ -1,203 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "CSL_SRTest_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_CSL_SRTest_Sender_Impl
-{
-  /**
-   * Pulse Generator
-   */
-
-  pulse_Generator::pulse_Generator (Sender_exec_i &callback)
-    : pulse_callback_ (callback)
-  {
-  }
-
-  int
-  pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    // Notify the subscribers
-    this->pulse_callback_.tick ();
-    return 0;
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : rate_ (100)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      pulse_Generator (*this),
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Sender_exec_i::tick ()
-  {
-   ::CSL_SR_Connector::Writer_var writer =
-      this->ciao_context_->get_connection_test_topic_write_data ();
-
-    for (CSL_SRTest_Table::iterator i = this->_ktests_.begin ();
-         i != this->_ktests_.end ();
-         ++i)
-      {
-        try
-          {
-            if (! ::CORBA::is_nil (writer.in ()))
-              {
-                writer->write_one(i->second,::DDS::HANDLE_NIL);
-                i->second->x++;
-              }
-          }
-        catch (const CCM_DDS::InternalError& )
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while creating topic for <%C>.\n"),
-                    i->first.c_str ()));
-          }
-       }
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    // calculate the interval time
-    long const usec = 10000000 / this->rate_;
-
-    if (this->reactor ()->schedule_timer (
-                this->ticker_,
-                0,
-                ACE_Time_Value (0, usec),
-                ACE_Time_Value (0, usec)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                              ACE_TEXT ("Error scheduling timer\n")));
-      }
-  }
-
-  void
-  Sender_exec_i::stop (void)
-  {
-    this->reactor ()->cancel_timer (this->ticker_);
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n")));
-  }
-
-  void
-  Sender_exec_i::add_instance_of_topic (const char * key, int x)
-  {
-    TestTopic *new_key = new TestTopic;
-    new_key->key = CORBA::string_dup(key);
-    new_key->x = x;
-    this->_ktests_[key] = new_key;
-  }
-
-  // Component attributes and port operations.
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::CSL_SRTest::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-    //add 2 different instances of topic
-    this->add_instance_of_topic ("ONE", 1);
-    this->add_instance_of_topic ("TWO", 2);
-    this->start ();
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    this->stop ();
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CSL_SRTest_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h
deleted file mode 100644
index a62c8408d18..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h
+++ /dev/null
@@ -1,129 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_CSL_SRTEST_SENDER_EXEC_EOLJBW_H_
-#define CIAO_CSL_SRTEST_SENDER_EXEC_EOLJBW_H_
-
-#include /**/ "ace/pre.h"
-
-#include "CSL_SRTest_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-#include <map>
-
-namespace CIAO_CSL_SRTest_Sender_Impl
-{
-  class Sender_exec_i;
-
-  /**
-   * Pulse Generator
-   */
-  class pulse_Generator :
-    public ACE_Event_Handler
-  {
-  public:
-    pulse_Generator (Sender_exec_i &callback);
-
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    Sender_exec_i &pulse_callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void tick (void);
-    //@}
-
-  private:
-    ::CSL_SRTest::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    //@}
-
-    //@{
-    /** User defined members. */
-    pulse_Generator * ticker_;
-    CORBA::ULong rate_;
-
-    typedef std::map<ACE_CString, TestTopic_var> CSL_SRTest_Table;
-    CSL_SRTest_Table _ktests_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void start (void);
-    void stop (void);
-
-    void add_instance_of_topic (const char *, int x);
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CSL_SRTest_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/HelloTest_Library.xml b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/HelloTest_Library.xml
deleted file mode 100644
index f19727f38a0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/HelloTest_Library.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-  <qos_profile name="HelloProfile">
-     <datawriter_qos>
-          <reliability>
-               <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-               <max_blocking_time>
-                    <sec>0</sec>
-                    <nanosec>100000000</nanosec>
-               </max_blocking_time>
-         </reliability>
-          <durability>
-               <kind>TRANSIENT_DURABILITY_QOS</kind>
-          </durability>
-          <durability_service>
-               <history_kind>KEEP_LAST_HISTORY_QOS</history_kind>
-               <history_depth>10</history_depth>
-               <max_samples>10</max_samples>
-               <max_instances>2</max_instances>
-               <max_samples_per_instance>10</max_samples_per_instance>
-          </durability_service>
-    </datawriter_qos>
-    <datareader_qos>
-          <durability>
-                 <kind>VOLATILE_DURABILITY_QOS</kind>
-          </durability>
-          <deadline>
-               <period>
-                    <sec>DURATION_INFINITE_SEC</sec>
-                    <nanosec>DURATION_INFINITE_NSEC</nanosec>
-               </period>
-          </deadline>
-          <latency_budget>
-               <duration>
-                    <sec>0</sec>
-                    <nanosec>0</nanosec>
-               </duration>
-          </latency_budget>
-          <liveliness>
-               <kind>AUTOMATIC_LIVELINESS_QOS</kind>
-               <lease_duration>
-                    <sec>DURATION_INFINITE_SEC</sec>
-                    <nanosec>DURATION_INFINITE_NSEC</nanosec>
-               </lease_duration>
-          </liveliness>
-          <reliability>
-               <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-               <max_blocking_time>
-                    <sec>0</sec>
-                    <nanosec>100000000</nanosec>
-               </max_blocking_time>
-          </reliability>
-          <destination_order>
-                <kind>BY_RECEPTION_TIMESTAMP_DESTINATIONORDER_QOS</kind>
-          </destination_order>
-          <history>
-               <kind>KEEP_LAST_HISTORY_QOS</kind>
-               <depth>10</depth>
-          </history>
-          <resource_limits>
-               <initial_samples>1</initial_samples>
-               <initial_instances>1</initial_instances>
-               <max_samples>10</max_samples>
-               <max_instances>1</max_instances>
-               <max_samples_per_instance>10</max_samples_per_instance>
-          </resource_limits>
-          <ownership>
-               <kind>SHARED_OWNERSHIP_QOS</kind>
-          </ownership>
-          <time_based_filter>
-               <minimum_separation>
-                    <sec>0</sec>
-                    <nanosec>0</nanosec>
-               </minimum_separation>
-          </time_based_filter>
-          <reader_data_lifecycle>
-               <autopurge_nowriter_samples_delay>
-                    <sec>DURATION_INFINITE_SEC</sec>
-                    <nanosec>DURATION_INFINITE_NSEC</nanosec>
-               </autopurge_nowriter_samples_delay>
-               <autopurge_disposed_samples_delay>
-                    <sec>DURATION_INFINITE_SEC</sec>
-                    <nanosec>DURATION_INFINITE_NSEC</nanosec>
-               </autopurge_disposed_samples_delay>
-          </reader_data_lifecycle>
-     </datareader_qos>
-  </qos_profile>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/Plan.cdp
deleted file mode 100644
index e2a0b7bef7d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/Plan.cdp
+++ /dev/null
@@ -1,458 +0,0 @@
-<!--  -->
-<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>CSL_SRTest_Depl_1</label>
-  <UUID>CSL_SRTest_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CSL_SRTest_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CSL_SRTest_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="CSL_SRTest_ConnectorComponentImplementation">
-    <name>CSL_SRTest_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="CSL_SRTest_Connector_ExecArtifact" />
-    <artifact xmi:idref="CSL_SRTest_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CSL_SR_Connector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CSL_SR_Connector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CSL_SRTest_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CSL_SRTest_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CSL_SRTest_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CSL_SRTest_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>1</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <!--configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>5</ulong>
-        </value>
-      </value>
-    </configProperty-->
-    <!--configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>10</ulong>
-        </value>
-      </value>
-    </configProperty-->
-    <!--configProperty>
-      <name>get_data</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>true</boolean>
-        </value>
-      </value>
-    </configProperty-->
-    <configProperty>
-      <name>read_data</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>true</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>raw_listen</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="CSL_SRTest_ConnectorComponentInstance">
-    <name>CSL_SRTest_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="CSL_SRTest_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestQoS</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-    <name>qos_profile</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>HelloTest_Library#HelloProfile</string>
-      </value>
-    </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="CSL_SRTest_ConnectorComponentInstance2">
-    <name>CSL_SRTest_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="CSL_SRTest_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestQoS</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>HelloTest_Library#HelloProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-  </instance>
-
-  <connection>
-    <name>_listenercontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CSL_SRTest_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CSL_SRTest_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>info_out_connector_status_receiver</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CSL_SRTest_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>test_topic_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CSL_SRTest_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>info_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CSL_SRTest_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="CSL_SRTest_Connector_ExecArtifact">
-    <name>CSL_SRTest_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_CSL_SRTest_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="CSL_SRTest_Connector_SvntArtifact">
-    <name>CSL_SRTest_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_CSL_SRTest_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="CSL_SRTest_Connector_StubArtifact">
-    <name>CSL_SRTest_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_CSL_SRTest_Connector_stub</location>
-  </artifact>
-
-
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index 6af0ea977f5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-Description
-XML QoS Profile
-
-This file is used to create a situation which causes an on_rejected_sample event.
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="HelloTest_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="HelloProfile" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>0</sec>
-            <nanosec>100000000</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <durability_service>
-          <history_kind>KEEP_LAST_HISTORY_QOS</history_kind>
-          <history_depth>10</history_depth>
-           <max_samples>10</max_samples>
-          <max_samples_per_instance>10</max_samples_per_instance>
-          <max_instances>2</max_instances>
-        </durability_service>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-       </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <durability>
-          <kind>VOLATILE_DURABILITY_QOS</kind>
-        </durability>
-        <deadline>
-          <period>
-            <sec>DURATION_INFINITE_SEC</sec>
-            <nanosec>DURATION_INFINITE_NSEC</nanosec>
-          </period>
-        </deadline>
-        <latency_budget>
-          <duration>
-            <sec>0</sec>
-            <nanosec>0</nanosec>
-          </duration>
-        </latency_budget>
-        <liveliness>
-          <kind>AUTOMATIC_LIVELINESS_QOS</kind>
-          <lease_duration>
-            <sec>DURATION_INFINITE_SEC</sec>
-            <nanosec>DURATION_INFINITE_NSEC</nanosec>
-          </lease_duration>
-        </liveliness>
-        <reliability>
-          <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>0</sec>
-            <nanosec>100000000</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <destination_order>
-          <kind>BY_RECEPTION_TIMESTAMP_DESTINATIONORDER_QOS</kind>
-        </destination_order>
-        <history>
-          <kind>KEEP_LAST_HISTORY_QOS</kind>
-          <depth>10</depth>
-        </history>
-        <resource_limits>
-          <initial_samples>1</initial_samples>
-          <initial_instances>1</initial_instances>
-          <max_samples>10</max_samples>
-          <max_instances>1</max_instances>
-          <max_samples_per_instance>10</max_samples_per_instance>
-        </resource_limits>
-        <user_data>
-          <value></value>
-        </user_data>
-        <ownership>
-          <kind>SHARED_OWNERSHIP_QOS</kind>
-        </ownership>
-        <time_based_filter>
-          <minimum_separation>
-            <sec>0</sec>
-            <nanosec>0</nanosec>
-          </minimum_separation>
-        </time_based_filter>
-        <reader_data_lifecycle>
-          <autopurge_nowriter_samples_delay>
-            <sec>DURATION_INFINITE_SEC</sec>
-            <nanosec>DURATION_INFINITE_NSEC</nanosec>
-          </autopurge_nowriter_samples_delay>
-          <autopurge_disposed_samples_delay>
-            <sec>DURATION_INFINITE_SEC</sec>
-            <nanosec>DURATION_INFINITE_NSEC</nanosec>
-          </autopurge_disposed_samples_delay>
-        </reader_data_lifecycle>
-        </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl
deleted file mode 100755
index 174721086cd..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 10 seconds to allow task to complete\n";
-sleep (10);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -s\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/.gitignore b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl
deleted file mode 100644
index 29c0dd70442..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file   CSL_USTest_Base.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef CSL_USTEST_BASE_IDL
-#define CSL_USTEST_BASE_IDL
-
-#pragma ndds typesupport "Base/CSL_USTest_BaseSupport.h"
-#pragma opendds typesupport "Base/CSL_USTest_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "TestTopic"
-#pragma DCPS_DATA_KEY "TestTopic key"
-
-struct TestTopic {
-  string key; //@key
-  long x;
-};
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TestTopic> TestTopicSeq;
-#endif
-
-#endif /* CSL_USTEST_BASE_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc
deleted file mode 100644
index 9f5f5e9e8c5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_CSL_USTest_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_CSL_USTest_Base_stub
-  dynamicflags += CSL_USTEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=CSL_USTEST_BASE_STUB_Export \
-              -Wb,stub_export_include=CSL_USTest_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    CSL_USTest_Base.idl
-  }
-
-  opendds_ts_flags += --export=CSL_USTEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    CSL_USTest_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl
deleted file mode 100644
index 32ad7cf13ce..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file CSL_USTest_Connector.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef CSL_USTEST_CONNECTOR_IDL_
-#define CSL_USTEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/CSL_USTest_Base.idl"
-
-#pragma ciao lem "Connector/CSL_USTest_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/CSL_USTest_BaseTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> CSL_US_Connector;
-
-#endif /* CSL_USTest_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc
deleted file mode 100644
index 2372945f778..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_CSL_USTest_Base -l .. -o ../lib -u DDS CSL_USTest_Connector"
-
-project(DDS_CSL_USTest_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_CSL_USTest_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=CSL_USTEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=CSL_USTest_Connector_stub_export.h \
-              -Wb,skel_export_macro=CSL_USTEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=CSL_USTest_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=CSL_USTEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=CSL_USTest_Connector_svnt_export.h \
-              -Wb,conn_export_macro=CSL_USTEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=CSL_USTest_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    CSL_USTest_Connector.idl
-  }
-}
-
-project(DDS_CSL_USTest_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_CSL_USTest_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=CSL_USTEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=CSL_USTest_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    CSL_USTest_ConnectorE.idl
-  }
-}
-
-project(DDS_CSL_USTest_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_CSL_USTest_Connector_lem_gen DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Base_stub
-  libs  += DDS_CSL_USTest_Base_stub DDS_CSL_USTest_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_CSL_USTest_Connector_lem_stub
-  dynamicflags += CSL_USTEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_USTest_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    CSL_USTest_ConnectorEC.h
-    CSL_USTest_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    CSL_USTest_ConnectorEC.inl
-  }
-}
-
-project(DDS_CSL_USTest_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_CSL_USTest_Connector_idl_gen DDS_CSL_USTest_Base_stub
-  libs  += DDS_CSL_USTest_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_CSL_USTest_Connector_stub
-  dynamicflags += CSL_USTEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_USTest_ConnectorC.cpp
-  }
-
-  Header_Files {
-    CSL_USTest_ConnectorC.h
-    CSL_USTest_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    CSL_USTest_ConnectorC.inl
-  }
-}
-
-project(DDS_CSL_USTest_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_CSL_USTest_Connector_lem_stub DDS_CSL_USTest_Connector_stub
-  sharedname = DDS_CSL_USTest_Connector_exec
-  libs += DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Connector_lem_stub DDS_CSL_USTest_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += CSL_USTEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_USTest_Connector_conn.cpp
-  }
-
-  Header_Files {
-    CSL_USTest_Connector_conn.h
-    CSL_USTest_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_CSL_USTest_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_CSL_USTest_Connector_lem_stub DDS_CSL_USTest_Connector_exec DDS_CSL_USTest_Connector_stub
-  sharedname  = DDS_CSL_USTest_Connector_svnt
-  libs       += DDS_CSL_USTest_Connector_stub \
-                DDS_CSL_USTest_Connector_lem_stub  \
-                DDS_CSL_USTest_Base_stub \
-                DDS_CSL_USTest_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += CSL_USTEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_USTest_ConnectorS.cpp
-    CSL_USTest_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    CSL_USTest_ConnectorS.h
-    CSL_USTest_Connector_svnt.h
-    CSL_USTest_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.idl b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.idl
deleted file mode 100644
index aedb58ebd5f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.idl
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * @file
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/CSL_USTest_Connector.idl"
-
-module CSL_USTest
-{
-  component Receiver
-  {
-    port CSL_US_Connector::DDS_Listen info_out;
-    port CSL_US_Connector::DDS_Read info_read;
-    provides CCM_DDS::ConnectorStatusListener info_out_connector_status;
-   };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc
deleted file mode 100644
index 79dda1f9d80..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc
+++ /dev/null
@@ -1,136 +0,0 @@
-project(DDS_CSL_USTest_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_CSL_USTest_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h \
-              -I..
-
-  IDL_Files {
-    CSL_USTest_Receiver.idl
-  }
-}
-
-project(DDS_CSL_USTest_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_CSL_USTest_Receiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    CSL_USTest_ReceiverE.idl
-  }
-}
-
-project(DDS_CSL_USTest_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_CSL_USTest_Receiver_lem_gen DDS_CSL_USTest_Receiver_stub  DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Base_stub
-  libs  +=  Receiver_stub DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_USTest_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    CSL_USTest_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    CSL_USTest_ReceiverEC.inl
-  }
-}
-
-project(DDS_CSL_USTest_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_CSL_USTest_Receiver_idl_gen  DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Base_stub DDS_CSL_USTest_Connector_lem_gen
-  libs  += DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_USTest_ReceiverC.cpp
-  }
-
-  Header_Files {
-    CSL_USTest_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    CSL_USTest_ReceiverC.inl
-  }
-}
-
-project(DDS_CSL_USTest_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_CSL_USTest_Receiver_lem_stub DDS_CSL_USTest_Receiver_stub DDS_CSL_USTest_Base_stub DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Connector_lem_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_CSL_USTest_Base_stub DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_USTest_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    CSL_USTest_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_CSL_USTest_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_CSL_USTest_Receiver_lem_stub DDS_CSL_USTest_Base_stub DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Connector_svnt DDS_CSL_USTest_Receiver_exec DDS_CSL_USTest_Connector_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_CSL_USTest_Base_stub DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Connector_svnt Receiver_exec DDS_CSL_USTest_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_USTest_ReceiverS.cpp
-    CSL_USTest_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    CSL_USTest_ReceiverS.h
-    CSL_USTest_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp
deleted file mode 100644
index 5d0e0ba817e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp
+++ /dev/null
@@ -1,573 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "CSL_USTest_Receiver_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-#include "dds4ccm/impl/Utils.h"
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-namespace CIAO_CSL_USTest_Receiver_Impl
-{
-  /**
-   * Pulser
-   */
-
-  Pulser::Pulser (Receiver_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  Pulser::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    // Notify the subscribers
-    this->callback_.read_all ();
-    return 0;
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  info_out_data_listener_exec_i::info_out_data_listener_exec_i (
-        ::CSL_USTest::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::CSL_USTest::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CSL_US_Connector::Listener
-
-  void
-  info_out_data_listener_exec_i::on_one_data (const ::TestTopic & /* datum */,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-  }
-
-  void
-  info_out_data_listener_exec_i::on_many_data (const ::TestTopicSeq & /* data */,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_status_exec_i
-   */
-
-  info_out_status_exec_i::info_out_status_exec_i (
-        ::CSL_USTest::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::CSL_USTest::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_status_exec_i::~info_out_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_read_status_exec_i
-   */
-
-  info_read_status_exec_i::info_read_status_exec_i (
-        ::CSL_USTest::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::CSL_USTest::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_read_status_exec_i::~info_read_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_read_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_read_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_connector_status_exec_i
-   */
-
-  info_out_connector_status_exec_i::info_out_connector_status_exec_i (
-        ::CSL_USTest::CCM_Receiver_Context_ptr ctx,
-        Atomic_Boolean &subscription_matched_received,
-        Atomic_Boolean &liveliness_changed_received,
-        ACE_Thread_ID &thread_id_subcription_matched,
-        ACE_Thread_ID &thread_id_liveliness_changed)
-    : ciao_context_ (
-        ::CSL_USTest::CCM_Receiver_Context::_duplicate (ctx))
-      , subscription_matched_received_ (subscription_matched_received)
-      , liveliness_changed_received_ (liveliness_changed_received)
-      , thread_id_subcription_matched_ (thread_id_subcription_matched)
-      , thread_id_liveliness_changed_ (thread_id_liveliness_changed)
-  {
-  }
-
-  info_out_connector_status_exec_i::~info_out_connector_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-
-  void
-  info_out_connector_status_exec_i::on_inconsistent_topic (::DDS::Topic_ptr /* the_topic */,
-  const ::DDS::InconsistentTopicStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_requested_incompatible_qos (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedIncompatibleQosStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_sample_rejected (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleRejectedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_offered_deadline_missed (::DDS::DataWriter_ptr /* the_writer */,
-  const ::DDS::OfferedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_offered_incompatible_qos (::DDS::DataWriter_ptr /* the_writer */,
-  const ::DDS::OfferedIncompatibleQosStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_unexpected_status (::DDS::Entity_ptr the_entity,
-  ::DDS::StatusKind status_kind)
-  {
-    ACE_DEBUG ((LM_DEBUG, "RECEIVER\tConnectorStatusListener_exec_i::on_unexpected_status: "
-                          "received <%C>\n",
-                          CIAO::DDS4CCM::translate_statuskind (status_kind)));
-    ACE_Thread_ID t_id;
-
-    if (! ::CORBA::is_nil (the_entity) && status_kind == DDS::SUBSCRIPTION_MATCHED_STATUS)
-      {
-        this->subscription_matched_received_ = true;
-        this->thread_id_subcription_matched_ = t_id;
-      }
-    else if (! ::CORBA::is_nil(the_entity) && status_kind == DDS::LIVELINESS_CHANGED_STATUS)
-      {
-        this->liveliness_changed_received_ = true;
-        this->thread_id_liveliness_changed_ = t_id;
-      }
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : subscription_matched_received_ (false)
-      , liveliness_changed_received_ (false)
-      , thread_id_listener_subscription_matched_ (0, 0)
-      , thread_id_listener_liveliness_changed_ (0, 0)
-      , received_(0)
-  {
-    ACE_NEW_THROW_EX (this->pulser_,
-                      Pulser (*this),
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-    delete this->pulser_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Receiver_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
- void
-  Receiver_exec_i::read_all ()
-  {
-    ::CSL_US_Connector::Reader_var reader =
-      this->ciao_context_->get_connection_info_read_data ();
-
-    try
-      {
-        TestTopicSeq readertest_info_seq;
-        ::CCM_DDS::ReadInfoSeq readinfo_seq;
-        if (this->received_ < 30)
-          {
-            reader->read_all (readertest_info_seq, readinfo_seq);
-            ACE_DEBUG ((LM_DEBUG, "Read %u samples\n",
-                                  readinfo_seq.length ()));
-            this->received_ += readinfo_seq.length ();
-          }
-        else
-          {
-            this->reactor ()->cancel_timer (this->pulser_);
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::read_all :Stop reading.\n")));
-          }
-      }
-    catch (const CCM_DDS::NonExistent& ex)
-      {
-        for (CORBA::ULong i = 0; i < ex.indexes.length (); ++i)
-          {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ ALL: ")
-                  ACE_TEXT ("caught expected exception: index <%u>\n"),
-                  ex.indexes[i]));
-          }
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ ALL: ")
-              ACE_TEXT ("caught InternalError exception: retval <%u>\n"),
-              ex.error_code));
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: READ ALL: ");
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Receiver_exec_i::read_all : Exception caught\n")));
-      }
-  }
-  // Component attributes and port operations.
-
-  ::CSL_US_Connector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_out_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ()))
-      {
-        info_out_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_data_listener_exec_i (
-            this->ciao_context_.in ()),
-            ::CSL_US_Connector::CCM_Listener::_nil ());
-
-          this->ciao_info_out_data_listener_ = tmp;
-      }
-
-    return
-      ::CSL_US_Connector::CCM_Listener::_duplicate (
-        this->ciao_info_out_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ()))
-      {
-        info_out_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_out_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_out_status_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_read_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_read_status_.in ()))
-      {
-        info_read_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_read_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_read_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_read_status_.in ());
-  }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Receiver_exec_i::get_info_out_connector_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_connector_status_.in ()))
-      {
-        info_out_connector_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_connector_status_exec_i (
-            this->ciao_context_.in (),
-            this->subscription_matched_received_,
-            this->liveliness_changed_received_,
-            this->thread_id_listener_subscription_matched_,
-            this->thread_id_listener_liveliness_changed_),
-            ::CCM_DDS::CCM_ConnectorStatusListener::_nil ());
-
-          this->ciao_info_out_connector_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_ConnectorStatusListener::_duplicate (
-        this->ciao_info_out_connector_status_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::CSL_USTest::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    if (this->reactor ()->schedule_timer (
-                this->pulser_,
-                0,
-                ACE_Time_Value (6, 0),
-                ACE_Time_Value (3, 0)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                              ACE_TEXT ("Error scheduling timer\n")));
-      }
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    if (!this->subscription_matched_received_.value ())
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("RECEIVER ERROR: Didn't receive the expected ")
-                              ACE_TEXT ("'SUBSCRIPTION_MATCHED_STATUS'\n")));
-      }
-    else
-      {
-         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("RECEIVER OK: Received the expected ")
-                               ACE_TEXT ("'SUBSCRIPTION_MATCHED_STATUS'\n")));
-      }
-    if (!this->liveliness_changed_received_.value ())
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("RECEIVER ERROR: Didn't receive the expected ")
-                              ACE_TEXT ("'LIVELINESS_CHANGED_STATUS'\n")));
-      }
-    else
-      {
-         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("RECEIVER OK: Received the expected ")
-                               ACE_TEXT ("'LIVELINESS_CHANGED_STATUS' \n")));
-      }
-    char ccm_buf [65];
-    ACE_Thread_ID ccm_thread_id;
-    ccm_thread_id.to_string (ccm_buf);
-
-    char list_buf [65];
-    this->thread_id_listener_subscription_matched_.to_string(list_buf);
-
-    //test thread switch for SUBSCRIPTION_MATCHED_STATUS
-    if (this->thread_id_listener_subscription_matched_.id () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: "
-                              "Thread ID for 'SUBSCRIPTION_MATCHED_STATUS' not set!\n"));
-      }
-    #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (this->thread_id_listener_subscription_matched_ == ccm_thread_id)
-      {
-        ACE_DEBUG ((LM_DEBUG, "RECEIVER OK: "
-                              "Thread switch for 'SUBSCRIPTION_MATCHED_STATUS' seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-    }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: "
-                              "Thread switch for 'SUBSCRIPTION_MATCHED_STATUS' "
-                              "doesn't seem to work! "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    #else
-    else if (this->thread_id_listener_subscription_matched_ == ccm_thread_id)
-      {
-        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: 'SUBSCRIPTION_MATCHED_STATUS': "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "RECEIVER OK: 'SUBSCRIPTION_MATCHED_STATUS': "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-     }
-    #endif
-
-    //test thread switch for LIVELINESS_CHANGED_STATUS
-    char list_buf_lc [65];
-    this->thread_id_listener_liveliness_changed_.to_string(list_buf_lc);
-
-    if (this->thread_id_listener_liveliness_changed_.id () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: "
-                              "Thread ID for 'LIVELINESS_CHANGED_STATUS' not set!\n"));
-      }
-    #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (this->thread_id_listener_liveliness_changed_ == ccm_thread_id)
-      {
-        ACE_DEBUG ((LM_DEBUG, "RECEIVER OK: "
-                              "Thread switch for 'LIVELINESS_CHANGED_STATUS' seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_lc,
-                              ccm_buf));
-     }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: "
-                              "Thread switch for 'LIVELINESS_CHANGED_STATUS' "
-                              "doesn't seem to work! "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_lc,
-                              ccm_buf));
-     }
-    #else
-    else if (this->thread_id_listener_liveliness_changed_ == ccm_thread_id)
-      {
-        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: 'LIVELINESS_CHANGED_STATUS': "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_lc,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "RECEIVER OK: 'LIVELINESS_CHANGED_STATUS': "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_lc,
-                              ccm_buf));
-      }
-    #endif
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CSL_USTest_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h
deleted file mode 100644
index 88ebdc7a273..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h
+++ /dev/null
@@ -1,288 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_CSL_USTEST_RECEIVER_EXEC_GLRYKK_H_
-#define CIAO_CSL_USTEST_RECEIVER_EXEC_GLRYKK_H_
-
-#include /**/ "ace/pre.h"
-
-#include "CSL_USTest_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_CSL_USTest_Receiver_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::ULong > Atomic_ULong;
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
-
-  class Receiver_exec_i;
-
-  /**
-   * Pulser
-   */
-
-  class Pulser :
-    public ACE_Event_Handler
-  {
-  public:
-    Pulser (Receiver_exec_i &callback);
-
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    Receiver_exec_i &callback_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  class info_out_data_listener_exec_i
-    : public virtual ::CSL_US_Connector::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_data_listener_exec_i (
-      ::CSL_USTest::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CSL_US_Connector::Listener. */
-
-    virtual
-    void on_one_data (const ::TestTopic & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (const ::TestTopicSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    ::CSL_USTest::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_status_exec_i
-   */
-
-  class info_out_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_status_exec_i (
-      ::CSL_USTest::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::CSL_USTest::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_read_status_exec_i
-   */
-
-  class info_read_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_read_status_exec_i (
-      ::CSL_USTest::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_read_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::CSL_USTest::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_connector_status_exec_i
-   */
-
-  class info_out_connector_status_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_connector_status_exec_i (
-      ::CSL_USTest::CCM_Receiver_Context_ptr ctx,
-      Atomic_Boolean &subscription_matched_received,
-      Atomic_Boolean &liveliness_changed_received,
-      ACE_Thread_ID &thread_id_subcription_matched,
-      ACE_Thread_ID &thread_id_liveliness_changed);
-    virtual ~info_out_connector_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-    const ::DDS::InconsistentTopicStatus & status);
-
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedIncompatibleQosStatus & status);
-
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleRejectedStatus & status);
-
-    virtual
-    void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-    const ::DDS::OfferedDeadlineMissedStatus & status);
-
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-    const ::DDS::OfferedIncompatibleQosStatus & status);
-
-    virtual
-    void on_unexpected_status (::DDS::Entity_ptr the_entity,
-    ::DDS::StatusKind status_kind);
-    //@}
-
-  private:
-    ::CSL_USTest::CCM_Receiver_Context_var ciao_context_;
-    Atomic_Boolean &subscription_matched_received_;
-    Atomic_Boolean &liveliness_changed_received_;
-    ACE_Thread_ID &thread_id_subcription_matched_;
-    ACE_Thread_ID &thread_id_liveliness_changed_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CSL_US_Connector::CCM_Listener_ptr
-    get_info_out_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_status (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_read_status (void);
-
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_info_out_connector_status (void);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void read_all (void);
-
-    //@}
-
-  private:
-    ::CSL_USTest::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::CSL_US_Connector::CCM_Listener_var ciao_info_out_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_read_status_;
-    ::CCM_DDS::CCM_ConnectorStatusListener_var ciao_info_out_connector_status_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    Pulser *pulser_;
-
-    Atomic_Boolean subscription_matched_received_;
-    Atomic_Boolean liveliness_changed_received_;
-    ACE_Thread_ID thread_id_listener_subscription_matched_;
-    ACE_Thread_ID thread_id_listener_liveliness_changed_;
-    Atomic_ULong received_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CSL_USTest_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.idl b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.idl
deleted file mode 100644
index 4cdc3107c58..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef DDS_CSL_USTEST_SENDER_IDL
-#define DDS_CSL_USTEST_SENDER_IDL
-
-#include "Connector/CSL_USTest_Connector.idl"
-
-module CSL_USTest
-{
-  component Sender
-  {
-    port CSL_US_Connector::DDS_Write test_topic_write;
-    provides CCM_DDS::ConnectorStatusListener test_topic_connector_status;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc
deleted file mode 100644
index ec9ebf7f815..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc
+++ /dev/null
@@ -1,138 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_CSL_USTest_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_CSL_USTest_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_CSL_USTest_Connector_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I..
-
-  IDL_Files {
-    CSL_USTest_Sender.idl
-  }
-}
-
-project(DDS_CSL_USTest_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_CSL_USTest_Sender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    CSL_USTest_SenderE.idl
-  }
-}
-
-project(DDS_CSL_USTest_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_CSL_USTest_Sender_lem_gen DDS_CSL_USTest_Sender_stub DDS_CSL_USTest_Base_stub
-  libs  += DDS_CSL_USTest_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_USTest_SenderEC.cpp
-  }
-
-  Header_Files {
-    CSL_USTest_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    CSL_USTest_SenderEC.inl
-  }
-}
-
-project(DDS_CSL_USTest_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_CSL_USTest_Sender_idl_gen DDS_CSL_USTest_Base_stub DDS_CSL_USTest_Connector_stub
-  libs  += DDS_CSL_USTest_Base_stub DDS_CSL_USTest_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_USTest_SenderC.cpp
-  }
-
-  Header_Files {
-    CSL_USTest_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    CSL_USTest_SenderC.inl
-  }
-}
-
-project(DDS_CSL_USTest_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_CSL_USTest_Sender_lem_stub DDS_CSL_USTest_Sender_stub DDS_CSL_USTest_Connector_lem_stub DDS_CSL_USTest_Connector_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub DDS_CSL_USTest_Base_stub DDS_CSL_USTest_Connector_lem_stub  DDS_CSL_USTest_Connector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_USTest_Sender_exec.cpp
-  }
-
-  Header_Files {
-    CSL_USTest_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_CSL_USTest_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_CSL_USTest_Base_stub  DDS_CSL_USTest_Sender_lem_stub DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Connector_svnt DDS_CSL_USTest_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                DDS_CSL_USTest_Base_stub DDS_CSL_USTest_Connector_stub  DDS_CSL_USTest_Connector_svnt DDS_CSL_USTest_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_USTest_SenderS.cpp
-    CSL_USTest_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    CSL_USTest_SenderS.h
-    CSL_USTest_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp
deleted file mode 100644
index ba268353c2e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp
+++ /dev/null
@@ -1,580 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "CSL_USTest_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-#include "dds4ccm/impl/Utils.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-namespace CIAO_CSL_USTest_Sender_Impl
-{
-  /**
-   * Write action generator
-   */
-
-  pulse_Generator::pulse_Generator (Sender_exec_i &callback)
-    : pulse_callback_ (callback)
-  {
-  }
-
-  int
-  pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    // Notify the subscribers
-    this->pulse_callback_.tick ();
-    return 0;
-  }
-
-  /**
-   * Facet Executor Implementation Class: test_topic_connector_status_exec_i
-   */
-
-  test_topic_connector_status_exec_i::test_topic_connector_status_exec_i (
-        ::CSL_USTest::CCM_Sender_Context_ptr ctx,
-        Atomic_Boolean &publication_matched_received,
-        Atomic_Boolean &liveliness_lost_received,
-        Atomic_Boolean &reliable_dr_activity_changed_received,
-        Atomic_Boolean &reliable_writer_cache_changed_received,
-        ACE_Thread_ID &thread_id_publication_matched,
-        ACE_Thread_ID &thread_id_liveliness_lost,
-        ACE_Thread_ID &thread_id_reliable_dr_activity_changed,
-        ACE_Thread_ID &thread_id_reliable_writer_cache_changed)
-    : ciao_context_ (
-        ::CSL_USTest::CCM_Sender_Context::_duplicate (ctx))
-      , publication_matched_received_ (publication_matched_received)
-      , liveliness_lost_received_ (liveliness_lost_received)
-      , reliable_dr_activity_changed_received_ (reliable_dr_activity_changed_received)
-      , reliable_writer_cache_changed_received_ (reliable_writer_cache_changed_received)
-      , thread_id_publication_matched_ (thread_id_publication_matched)
-      , thread_id_liveliness_lost_ (thread_id_liveliness_lost)
-      , thread_id_reliable_dr_activity_changed_ (thread_id_reliable_dr_activity_changed)
-      , thread_id_reliable_writer_cache_changed_ (thread_id_reliable_writer_cache_changed)
-  {
-  }
-
-  test_topic_connector_status_exec_i::~test_topic_connector_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-
-  void
-  test_topic_connector_status_exec_i::on_inconsistent_topic (::DDS::Topic_ptr /* the_topic */,
-  const ::DDS::InconsistentTopicStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  test_topic_connector_status_exec_i::on_requested_incompatible_qos (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedIncompatibleQosStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  test_topic_connector_status_exec_i::on_sample_rejected (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleRejectedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  test_topic_connector_status_exec_i::on_offered_deadline_missed (::DDS::DataWriter_ptr /* the_writer */,
-  const ::DDS::OfferedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  test_topic_connector_status_exec_i::on_offered_incompatible_qos (::DDS::DataWriter_ptr /* the_writer */,
-  const ::DDS::OfferedIncompatibleQosStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  test_topic_connector_status_exec_i::on_unexpected_status (::DDS::Entity_ptr the_entity,
-  ::DDS::StatusKind status_kind)
-  {
-    ACE_Thread_ID t_id;
-    ACE_DEBUG ((LM_DEBUG, "SENDER\t\tConnectorStatusListener_exec_i::on_unexpected_status: "
-                          "received <%C>\n",
-                          CIAO::DDS4CCM::translate_statuskind (status_kind)));
-
-    if (! ::CORBA::is_nil(the_entity) && status_kind == DDS::LIVELINESS_LOST_STATUS)
-      {
-        this->liveliness_lost_received_ = true;
-        this->thread_id_liveliness_lost_ = t_id;
-    }
-    else if (! ::CORBA::is_nil(the_entity) && status_kind == DDS::PUBLICATION_MATCHED_STATUS)
-      {
-        this->publication_matched_received_ = true;
-        this->thread_id_publication_matched_ = t_id;
-
-      }
-#if (CIAO_DDS4CCM_NDDS==1)
-    else if (! ::CORBA::is_nil(the_entity) && status_kind == DDS::RELIABLE_READER_ACTIVITY_CHANGED_STATUS)
-      {
-        this->reliable_dr_activity_changed_received_ = true;
-        this->thread_id_reliable_dr_activity_changed_ = t_id;
-      }
-    else if (! ::CORBA::is_nil(the_entity) && status_kind == DDS::RELIABLE_WRITER_CACHE_CHANGED_STATUS)
-      {
-        this->reliable_writer_cache_changed_received_ = true;
-        this->thread_id_reliable_writer_cache_changed_ = t_id;
-      }
-#endif
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : publication_matched_received_ (false)
-      , liveliness_lost_received_ (false)
-      , reliable_dr_activity_changed_received_ (false)
-      , reliable_writer_cache_changed_received_ (false)
-      , thread_id_listener_publication_matched_ (0, 0)
-      , thread_id_listener_liveliness_lost_ (0, 0)
-      , thread_id_reliable_dr_activity_changed_ (0, 0)
-      , thread_id_reliable_writer_cache_changed_ (0, 0)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      pulse_Generator (*this),
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Sender_exec_i::tick ()
-  {
-    ::CSL_US_Connector::Writer_var writer =
-      this->ciao_context_->get_connection_test_topic_write_data ();
-
-    for (CSL_SRTest_Table::iterator i = this->_ktests_.begin ();
-         i != this->_ktests_.end ();
-         ++i)
-      {
-        try
-          {
-            if (! ::CORBA::is_nil (writer.in ()))
-              {
-                writer->write_one(i->second,::DDS::HANDLE_NIL);
-                ACE_DEBUG ((LM_DEBUG, "Written sample: <%C> - <%d>\n",
-                  i->first.c_str (),
-                  i->second->x));
-                i->second->x++;
-              }
-            else ACE_ERROR ((LM_ERROR, "Unable to write sample: <%C> - <%d>\n",
-                                        i->first.c_str (),
-                                        i->second->x));
-          }
-        catch (const CCM_DDS::InternalError& )
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while creating topic for <%C>.\n"),
-                    i->first.c_str ()));
-          }
-     }
-  }
-
- void
-  Sender_exec_i::add_instance_of_topic (const char * key, int x)
-  {
-    TestTopic *new_key = new TestTopic;
-    new_key->key = CORBA::string_dup(key);
-    new_key->x = x;
-    this->_ktests_[key] = new_key;
-  }
-
-  // Component attributes and port operations.
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_test_topic_connector_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_test_topic_connector_status_.in ()))
-      {
-        test_topic_connector_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          test_topic_connector_status_exec_i (
-            this->ciao_context_.in (),
-            this->publication_matched_received_,
-            this->liveliness_lost_received_,
-            this->reliable_dr_activity_changed_received_,
-            this->reliable_writer_cache_changed_received_,
-            this->thread_id_listener_publication_matched_,
-            this->thread_id_listener_liveliness_lost_,
-            this->thread_id_reliable_dr_activity_changed_,
-            this->thread_id_reliable_writer_cache_changed_),
-            ::CCM_DDS::CCM_ConnectorStatusListener::_nil ());
-
-          this->ciao_test_topic_connector_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_ConnectorStatusListener::_duplicate (
-        this->ciao_test_topic_connector_status_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::CSL_USTest::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-    // Add 2 different instances of topic
-    this->add_instance_of_topic ("ONE", 1);
-    this->add_instance_of_topic ("TWO", 2);
-    // calculate the interval time
-    if (this->reactor ()->schedule_timer (
-                this->ticker_,
-                0,
-                ACE_Time_Value (3, 0),
-                ACE_Time_Value (1, 0)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                              ACE_TEXT ("Error scheduling timer\n")));
-      }
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    this->reactor ()->cancel_timer (this->ticker_);
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n")));
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    if (!this->publication_matched_received_.value ())
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("SENDER ERROR: Didn't receive the expected ")
-                              ACE_TEXT ("'PUBLICATION_MATCHED_STATUS'\n")
-                    ));
-      }
-    else
-      {
-         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("SENDER OK: Received the expected ")
-                               ACE_TEXT ("'PUBLICATION_MATCHED_STATUS'\n")
-                    ));
-      }
-    if (!this->liveliness_lost_received_.value ())
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("SENDER ERROR: Didn't receive the expected ")
-                              ACE_TEXT ("'LIVELINESS_LOST_STATUS'\n")
-                    ));
-      }
-    else
-      {
-         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("SENDER OK: Received the expected ")
-                               ACE_TEXT ("'LIVELINESS_LOST_STATUS'\n")
-                    ));
-      }
-#if (CIAO_DDS4CCM_NDDS==1)
-    if (!this->reliable_dr_activity_changed_received_.value ())
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("SENDER ERROR: Didn't receive the expected ")
-                              ACE_TEXT ("'RELIABLE_READER_ACTIVITY_CHANGED_STATUS'\n")
-                    ));
-      }
-    else
-      {
-         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("SENDER OK: Received the expected ")
-                               ACE_TEXT ("'RELIABLE_READER_ACTIVITY_CHANGED_STATUS'\n")
-                    ));
-      }
-    if (!this->reliable_writer_cache_changed_received_.value ())
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("SENDER ERROR: Didn't receive the expected ")
-                              ACE_TEXT ("'RELIABLE_WRITER_CACHE_CHANGED_STATUS'\n")
-                    ));
-      }
-    else
-      {
-         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("SENDER OK: Received the expected ")
-                               ACE_TEXT ("'RELIABLE_WRITER_CACHE_CHANGED_STATUS'\n")
-                    ));
-      }
-#endif
-
-    //get current thread
-    char ccm_buf [65];
-    ACE_Thread_ID ccm_thread_id;
-    ccm_thread_id.to_string (ccm_buf);
-
-    //test thread switch for PUBLICATION_MATCHED_STATUS
-
-    char list_buf_pm [65];
-    this->thread_id_listener_publication_matched_.to_string(list_buf_pm);
-    if (this->thread_id_listener_publication_matched_.id () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: "
-                              "Thread ID for 'PUBLICATION_MATCHED_STATUS' not set!\n"));
-      }
-    #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (this->thread_id_listener_publication_matched_== ccm_thread_id)
-      {
-        ACE_DEBUG ((LM_DEBUG, "SENDER OK: "
-                              "Thread switch for 'PUBLICATION_MATCHED_STATUS' seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_pm,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: "
-                              "Thread switch for 'PUBLICATION_MATCHED_STATUS' "
-                              "doesn't seem to work! "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_pm,
-                              ccm_buf));
-      }
-    #else
-    else if (this->thread_id_listener_publication_matched_== ccm_thread_id)
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: 'PUBLICATION_MATCHED_STATUS': "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_pm,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "SENDER OK: 'PUBLICATION_MATCHED_STATUS': "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_pm,
-                              ccm_buf));
-      }
-    #endif
-
-    // Test thread switch for LIVELINESS_LOST_STATUS
-    char list_buf_ll [65];
-    this->thread_id_listener_liveliness_lost_.to_string(list_buf_ll);
-    if (this->thread_id_listener_liveliness_lost_.id () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: "
-                              "Thread ID for 'LIVELINESS_LOST_STATUS' not set!\n"));
-      }
-    #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (this->thread_id_listener_liveliness_lost_== ccm_thread_id)
-      {
-        ACE_DEBUG ((LM_DEBUG, "SENDER OK: "
-                              "Thread switch for 'LIVELINESS_LOST_STATUS' seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                               "listener <%C> - component <%C>\n",
-                              list_buf_ll,
-                              ccm_buf));
-     }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: "
-                              "Thread switch for 'LIVELINESS_LOST_STATUS' "
-                              "doesn't seem to work! "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_ll,
-                              ccm_buf));
-      }
-    #else
-    else if (this->thread_id_listener_liveliness_lost_== ccm_thread_id)
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: 'LIVELINESS_LOST_STATUS': "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_ll,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "SENDER OK: 'LIVELINESS_LOST_STATUS': "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_ll,
-                              ccm_buf));
-      }
-    #endif
-
-#if (CIAO_DDS4CCM_NDDS==1)
-    //test thread switch for RELIABLE_READER_ACTIVITY_CHANGED_STATUS
-    char list_buf_ra [65];
-    this->thread_id_reliable_dr_activity_changed_.to_string(list_buf_ra);
-
-    if (this->thread_id_reliable_dr_activity_changed_.id () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: "
-                              "Thread ID for 'RELIABLE_READER_ACTIVITY_CHANGED_STATUS' not set!\n"));
-      }
-    #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (this->thread_id_reliable_dr_activity_changed_== ccm_thread_id)
-      {
-        ACE_DEBUG ((LM_DEBUG, "SENDER OK: "
-                              "Thread switch for 'RELIABLE_READER_ACTIVITY_CHANGED_STATUS' seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_ra,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: "
-                              "Thread switch for 'RELIABLE_READER_ACTIVITY_CHANGED_STATUS' "
-                              "doesn't seem to work! "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_ra,
-                              ccm_buf));
-     }
-    #else
-    else if (this->thread_id_reliable_dr_activity_changed_== ccm_thread_id)
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: 'RELIABLE_READER_ACTIVITY_CHANGED_STATUS': "
-                              "DDS seems to use a CCM thread for its callback: "
-                               "listener <%C> - component <%C>\n",
-                              list_buf_ra,
-                              ccm_buf));
-     }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "SENDER OK: 'RELIABLE_READER_ACTIVITY_CHANGED_STATUS': "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_ra,
-                              ccm_buf));
-      }
-    #endif
-#endif
-
-#if (CIAO_DDS4CCM_NDDS==1)
-    //test thread switch for RELIABLE_WRITER_CACHE_CHANGED_STATUS
-    char list_buf_rw [65];
-    this->thread_id_reliable_writer_cache_changed_.to_string (list_buf_rw);
-
-    if (this->thread_id_reliable_writer_cache_changed_.id () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: "
-                              "Thread ID for 'RELIABLE_WRITER_CACHE_CHANGED_STATUS' not set!\n"));
-      }
-    #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (this->thread_id_reliable_writer_cache_changed_== ccm_thread_id)
-      {
-        ACE_DEBUG ((LM_DEBUG, "SENDER OK: "
-                              "Thread switch for 'RELIABLE_WRITER_CACHE_CHANGED_STATUS' seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                               "listener <%C> - component <%C>\n",
-                              list_buf_rw,
-                              ccm_buf));
-    }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: "
-                              "Thread switch for 'RELIABLE_WRITER_CACHE_CHANGED_STATUS' "
-                              "doesn't seem to work! "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_rw,
-                              ccm_buf));
-      }
-    #else
-    else if (this->thread_id_reliable_writer_cache_changed_== ccm_thread_id)
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: 'RELIABLE_WRITER_CACHE_CHANGED_STATUS': "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_rw,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "SENDER OK: 'RELIABLE_WRITER_CACHE_CHANGED_STATUS': "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_rw,
-                              ccm_buf));
-      }
-    #endif
-#endif
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CSL_USTest_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h
deleted file mode 100644
index 74ae7db32ff..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h
+++ /dev/null
@@ -1,205 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_CSL_USTEST_SENDER_EXEC_R1USM7_H_
-#define CIAO_CSL_USTEST_SENDER_EXEC_R1USM7_H_
-
-#include /**/ "ace/pre.h"
-
-#include "CSL_USTest_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-#include <map>
-
-namespace CIAO_CSL_USTest_Sender_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
-
-  class Sender_exec_i;
-
-  /**
-   * Write action generator
-   */
-
-  class pulse_Generator :
-    public ACE_Event_Handler
-  {
-  public:
-    pulse_Generator (Sender_exec_i &callback);
-
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    Sender_exec_i &pulse_callback_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: test_topic_connector_status_exec_i
-   */
-
-  class test_topic_connector_status_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    test_topic_connector_status_exec_i (
-      ::CSL_USTest::CCM_Sender_Context_ptr ctx,
-      Atomic_Boolean &publication_matched_received,
-      Atomic_Boolean &liveliness_lost_received,
-      Atomic_Boolean &reliable_dr_activity_changed_received,
-      Atomic_Boolean &reliable_writer_cache_changed_received,
-      ACE_Thread_ID &thread_id_publication_matched,
-      ACE_Thread_ID &thread_id_liveliness_lost,
-      ACE_Thread_ID &thread_id_reliable_dr_activity_changed,
-      ACE_Thread_ID &thread_id_reliable_writer_cache_changed);
-    virtual ~test_topic_connector_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-    const ::DDS::InconsistentTopicStatus & status);
-
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedIncompatibleQosStatus & status);
-
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleRejectedStatus & status);
-
-    virtual
-    void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-    const ::DDS::OfferedDeadlineMissedStatus & status);
-
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-    const ::DDS::OfferedIncompatibleQosStatus & status);
-
-    virtual
-    void on_unexpected_status (::DDS::Entity_ptr the_entity,
-    ::DDS::StatusKind status_kind);
-    //@}
-
-  private:
-    ::CSL_USTest::CCM_Sender_Context_var ciao_context_;
-    Atomic_Boolean &publication_matched_received_;
-    Atomic_Boolean &liveliness_lost_received_;
-    Atomic_Boolean &reliable_dr_activity_changed_received_;
-    Atomic_Boolean &reliable_writer_cache_changed_received_;
-    ACE_Thread_ID &thread_id_publication_matched_;
-    ACE_Thread_ID &thread_id_liveliness_lost_;
-    ACE_Thread_ID &thread_id_reliable_dr_activity_changed_;
-    ACE_Thread_ID &thread_id_reliable_writer_cache_changed_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_test_topic_connector_status (void);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void tick (void);
-
-    //@}
-
-  private:
-    ::CSL_USTest::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::CCM_DDS::CCM_ConnectorStatusListener_var ciao_test_topic_connector_status_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    Atomic_Boolean publication_matched_received_;
-    Atomic_Boolean liveliness_lost_received_;
-    Atomic_Boolean reliable_dr_activity_changed_received_;
-    Atomic_Boolean reliable_writer_cache_changed_received_;
-    ACE_Thread_ID thread_id_listener_publication_matched_;
-    ACE_Thread_ID thread_id_listener_liveliness_lost_;
-    ACE_Thread_ID thread_id_reliable_dr_activity_changed_;
-    ACE_Thread_ID thread_id_reliable_writer_cache_changed_;
-    pulse_Generator * ticker_;
-
-    TAO_SYNCH_MUTEX mutex_;
-    typedef std::map<ACE_CString, TestTopic_var> CSL_SRTest_Table;
-    CSL_SRTest_Table _ktests_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void add_instance_of_topic (const char *, int x);
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CSL_USTest_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/CSL_Library.xml b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/CSL_Library.xml
deleted file mode 100644
index eac65f2581f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/CSL_Library.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-  <qos_profile name="CSLProfile">
-     <datawriter_qos>
-          <reliability>
-               <kind>RELIABLE_RELIABILITY_QOS</kind>
-         </reliability>
-          <durability>
-               <kind>TRANSIENT_DURABILITY_QOS</kind>
-          </durability>
-          <history>
-               <kind>KEEP_LAST_HISTORY_QOS</kind>
-               <depth>200</depth>
-          </history>
-        <liveliness>
-          <kind>MANUAL_BY_TOPIC_LIVELINESS_QOS</kind>
-          <lease_duration>
-            <sec>1</sec>
-            <nanosec>0</nanosec>
-          </lease_duration>
-        </liveliness>
-     </datawriter_qos>
-    <datareader_qos>
-          <reliability>
-               <kind>RELIABLE_RELIABILITY_QOS</kind>
-          </reliability>
-          <history>
-               <kind>KEEP_LAST_HISTORY_QOS</kind>
-               <depth>20</depth>
-          </history>
-          <durability>
-                 <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-          </durability>
-     </datareader_qos>
-  </qos_profile>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/Plan.cdp
deleted file mode 100644
index 0a4fd735998..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/Plan.cdp
+++ /dev/null
@@ -1,432 +0,0 @@
-<!--  -->
-<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>CSL_USTest_Depl_1</label>
-  <UUID>CSL_USTest_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CSL_USTest_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CSL_USTest_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="CSL_USTest_ConnectorComponentImplementation">
-    <name>CSL_USTest_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="CSL_USTest_Connector_ExecArtifact" />
-    <artifact xmi:idref="CSL_USTest_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CSL_US_Connector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CSL_US_Connector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CSL_USTest_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CSL_USTest_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CSL_USTest_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CSL_USTest_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-  </instance>
-
-  <instance xmi:id="CSL_USTest_ConnectorComponentInstance">
-    <name>CSL_USTest_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="CSL_USTest_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CSL_Library#CSLProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestUS</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="CSL_USTest_ConnectorComponentInstance2">
-    <name>CSL_USTest_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="CSL_USTest_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CSL_Library#CSLProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestUS</string>
-        </value>
-      </value>
-    </configProperty>
-   </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-  </instance>
-
-  <connection>
-    <name>info_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CSL_USTest_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_listenercontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CSL_USTest_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CSL_USTest_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-    <connection>
-    <name>info_out_connector_status_receiver</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CSL_USTest_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>test_topic_connector_status_sender</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>test_topic_connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CSL_USTest_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>test_topic_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CSL_USTest_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_read_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_read_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CSL_USTest_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="CSL_USTest_Connector_ExecArtifact">
-    <name>CSL_USTest_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_CSL_USTest_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="CSL_USTest_Connector_SvntArtifact">
-    <name>CSL_USTest_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_CSL_USTest_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="CSL_USTest_Connector_StubArtifact">
-    <name>CSL_USTest_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_CSL_USTest_Connector_stub</location>
-  </artifact>
-
-
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index 63f96806879..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-Description
-XML QoS Profile
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="CSL_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="CSLProfile" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_LAST_HISTORY_QOS</kind>
-          <depth>200</depth>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>1</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-        <liveliness>
-          <kind>DDS_MANUAL_BY_TOPIC_LIVELINESS_QOS</kind>
-          <lease_duration>
-            <sec>1</sec>
-            <nanosec>0</nanosec>
-          </lease_duration>
-        </liveliness>
-      </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_LAST_HISTORY_QOS</kind>
-          <depth>20</depth>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl
deleted file mode 100755
index 2b535b3e697..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 20 seconds to allow task to complete\n";
-sleep (20);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/.gitignore b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.idl
deleted file mode 100644
index 8855d45864d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file CoherentUpdate_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef COHERENT_UPDATE_TEST_BASE_IDL
-#define COHERENT_UPDATE_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/CoherentUpdate_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/CoherentUpdate_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "CoherentUpdateTest"
-#pragma DCPS_DATA_KEY "CoherentUpdateTest symbol"
-
-struct CoherentUpdateTest {
-  string symbol; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<CoherentUpdateTest> CoherentUpdateTestSeq;
-#endif
-
-#endif /* COHERENT_UPDATE_TEST_BASE_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.mpc
deleted file mode 100644
index 37658d27e27..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (CoherentUpdate_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = CoherentUpdate_Test_Base_stub
-  dynamicflags += COHERENT_UPDATE_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=COHERENT_UPDATE_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=CoherentUpdate_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    CoherentUpdate_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=COHERENT_UPDATE_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    CoherentUpdate_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.idl b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.idl
deleted file mode 100644
index 7bd2be52b1b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file Reader_Starter.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef COHERENT_WRITE_STARTER_IDL
-#define COHERENT_WRITE_STARTER_IDL
-
-#pragma ciao lem "Base/Reader_StarterE.idl"
-
-interface CoherentUpdateStarter
-{
-  void set_reader_properties (in unsigned short nr_iterations);
-  void start_read (in unsigned short run);
-};
-
-interface CoherentUpdateRestarter
-{
-  void restart_update ();
-};
-
-#endif /* COHERENT_WRITE_STARTER_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.mpc b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.mpc
deleted file mode 100644
index be474990c28..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.mpc
+++ /dev/null
@@ -1,109 +0,0 @@
-project(DDS_Coh_Update_ReaderStarter_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=READER_STARTER_STUB_Export \
-              -Wb,stub_export_include=Reader_Starter_stub_export.h \
-              -Wb,skel_export_macro=READER_STARTER_SVNT_Export \
-              -Wb,skel_export_include=Reader_Starter_svnt_export.h \
-              -Wb,svnt_export_macro=READER_STARTER_SVNT_Export \
-              -Wb,svnt_export_include=Reader_Starter_svnt_export.h \
-              -Wb,exec_export_macro=READER_STARTER_EXEC_Export \
-              -Wb,exec_export_include=Reader_Starter_exec_export.h -I..
-
-  IDL_Files {
-    Reader_Starter.idl
-  }
-}
-
-project(DDS_Coh_Update_ReaderStarter_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_Coh_Update_ReaderStarter_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=READER_STARTER_LEM_STUB_Export \
-              -Wb,stub_export_include=Reader_Starter_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    Reader_StarterE.idl
-  }
-}
-
-project(DDS_Coh_Update_ReaderStarter_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_Coh_Update_ReaderStarter_lem_gen DDS_Coh_Update_ReaderStarter_stub
-  libs  += Reader_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Reader_Starter_lem_stub
-  dynamicflags += READER_STARTER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_StarterEC.cpp
-  }
-
-  Header_Files {
-    Reader_StarterEC.h
-    Reader_Starter_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Reader_StarterEC.inl
-  }
-}
-
-project(DDS_Coh_Update_ReaderStarter_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_Coh_Update_ReaderStarter_idl_gen
-  libs  +=
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Reader_Starter_stub
-  dynamicflags += READER_STARTER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_StarterC.cpp
-  }
-
-  Header_Files {
-    Reader_StarterC.h
-    Reader_Starter_stub_export.h
-  }
-
-  Inline_Files {
-    Reader_StarterC.inl
-  }
-}
-
-
-project(DDS_Coh_Update_ReaderStarter_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_Coh_Update_ReaderStarter_lem_stub DDS_Coh_Update_ReaderStarter_stub
-  sharedname  = Reader_Starter_svnt
-  libs       += Reader_Starter_stub Reader_Starter_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += READER_STARTER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_StarterS.cpp
-    Reader_Starter_svnt.cpp
-  }
-
-  Header_Files {
-    Reader_StarterS.h
-    Reader_Starter_svnt.h
-    Reader_Starter_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/.gitignore
deleted file mode 100644
index cd0af09aae3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/CoherentUpdate_Connector_conn_export.h
-/CoherentUpdate_Connector_lem_stub_export.h
-/CoherentUpdate_Connector_stub_export.h
-/CoherentUpdate_Connector_svnt_export.h
-/CoherentUpdate_Test_ConnectorE.idl
-/CoherentUpdate_Test_Connector_conn.cpp
-/CoherentUpdate_Test_Connector_conn.h
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.idl
deleted file mode 100644
index 22e01fc79fb..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file CoherentUpdate_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef COHERENT_UPDATE_TEST_CONNECTOR_IDL_
-#define COHERENT_UPDATE_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/CoherentUpdate_Test_Base.idl"
-
-#pragma ciao lem "Connector/CoherentUpdate_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/CoherentUpdate_Test_BaseTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::CoherentUpdateTest, ::CoherentUpdateTestSeq> CoherentUpdate_Test;
-
-#endif /* COHERENT_UPDATE_TEST_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.mpc
deleted file mode 100644
index 3b33c29bfcc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.mpc
+++ /dev/null
@@ -1,146 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p CoherentUpdate_TestBase -l .. -o ../lib -u DDS CoherentUpdate_Test_Connector"
-
-project(CoherentUpdate_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen CoherentUpdate_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=COHERENT_UPDATE_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=CoherentUpdate_Connector_stub_export.h \
-              -Wb,skel_export_macro=COHERENT_UPDATE_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=CoherentUpdate_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=COHERENT_UPDATE_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=CoherentUpdate_Connector_svnt_export.h \
-              -Wb,conn_export_macro=COHERENT_UPDATE_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=CoherentUpdate_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    CoherentUpdate_Test_Connector.idl
-  }
-}
-
-project(CoherentUpdate_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += CoherentUpdate_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=COHERENT_UPDATE_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=CoherentUpdate_Connector_lem_stub_export.h \
-              -SS -Gxhst -Sci \
-              -I ..
-
-  IDL_Files {
-    CoherentUpdate_Test_ConnectorE.idl
-  }
-}
-
-project(CoherentUpdate_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += CoherentUpdate_Connector_lem_gen CoherentUpdate_Connector_stub CoherentUpdate_Test_Base_stub
-  libs  += CoherentUpdate_Test_Base_stub CoherentUpdate_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = CoherentUpdate_Connector_lem_stub
-  dynamicflags += COHERENT_UPDATE_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CoherentUpdate_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    CoherentUpdate_Test_ConnectorEC.h
-    CoherentUpdate_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    CoherentUpdate_Test_ConnectorEC.inl
-  }
-}
-
-project(CoherentUpdate_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += CoherentUpdate_Connector_idl_gen CoherentUpdate_Test_Base_stub
-  libs  += CoherentUpdate_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = CoherentUpdate_Connector_stub
-  dynamicflags += COHERENT_UPDATE_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CoherentUpdate_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    CoherentUpdate_Test_ConnectorC.h
-    CoherentUpdate_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    CoherentUpdate_Test_ConnectorC.inl
-  }
-}
-
-project(CoherentUpdate_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += CoherentUpdate_Connector_lem_stub CoherentUpdate_Connector_stub \
-             CoherentUpdate_Test_Base_stub
-  sharedname = CoherentUpdate_Connector_exec
-  libs += CoherentUpdate_Connector_stub CoherentUpdate_Connector_lem_stub \
-          CoherentUpdate_Test_Base_stub CoherentUpdate_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COHERENT_UPDATE_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CoherentUpdate_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    CoherentUpdate_Test_Connector_conn.h
-    CoherentUpdate_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(CoherentUpdate_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += CoherentUpdate_Connector_lem_stub \
-                CoherentUpdate_Connector_exec \
-                CoherentUpdate_Connector_stub
-  sharedname  = CoherentUpdate_Connector_svnt
-  libs       += CoherentUpdate_Connector_stub \
-                CoherentUpdate_Connector_lem_stub  \
-                CoherentUpdate_Test_Base_stub \
-                CoherentUpdate_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COHERENT_UPDATE_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CoherentUpdate_Test_ConnectorS.cpp
-    CoherentUpdate_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    CoherentUpdate_Test_ConnectorS.h
-    CoherentUpdate_Test_Connector_svnt.h
-    CoherentUpdate_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/.gitignore b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/.gitignore
deleted file mode 100644
index d07e6648dc0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/CoherentUpdate_Test_ReceiverE.idl
-/Receiver_exec_export.h
-/Receiver_lem_stub_export.h
-/Receiver_stub_export.h
-/Receiver_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.idl
deleted file mode 100644
index ab41ad8e412..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.idl
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/CoherentUpdate_Test_Connector.idl"
-#include "Base/Reader_Starter.idl"
-
-module CoherentUpdate_Test
-{
-  component Receiver
-  {
-    port CoherentUpdate_Test::DDS_Read info_out;
-
-    provides CoherentUpdateStarter reader_start;
-    uses CoherentUpdateRestarter updater_restart;
-
-    attribute unsigned short nr_runs;
-    attribute unsigned short iterations;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.mpc
deleted file mode 100644
index 5c0974fb005..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.mpc
+++ /dev/null
@@ -1,154 +0,0 @@
-project(CoherentUpdate_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += CoherentUpdate_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h -I..
-
-  IDL_Files {
-    CoherentUpdate_Test_Receiver.idl
-  }
-}
-
-project(CoherentUpdate_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += CoherentUpdate_Test_Receiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    CoherentUpdate_Test_ReceiverE.idl
-  }
-}
-
-project(CoherentUpdate_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += CoherentUpdate_Test_Receiver_lem_gen CoherentUpdate_Test_Receiver_stub  \
-           CoherentUpdate_Connector_stub CoherentUpdate_Test_Base_stub \
-           DDS_Coh_Update_ReaderStarter_stub
-  libs  +=  Receiver_stub CoherentUpdate_Connector_stub \
-            CoherentUpdate_Test_Base_stub Reader_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CoherentUpdate_Test_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    CoherentUpdate_Test_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    CoherentUpdate_Test_ReceiverEC.inl
-  }
-}
-
-project(CoherentUpdate_Test_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += CoherentUpdate_Test_Receiver_idl_gen  CoherentUpdate_Connector_stub \
-           CoherentUpdate_Test_Base_stub CoherentUpdate_Connector_lem_gen \
-           DDS_Coh_Update_ReaderStarter_stub DDS_Coh_Update_ReaderStarter_lem_stub
-  libs  += CoherentUpdate_Connector_stub CoherentUpdate_Test_Base_stub \
-           Reader_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CoherentUpdate_Test_ReceiverC.cpp
-  }
-
-  Header_Files {
-    CoherentUpdate_Test_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    CoherentUpdate_Test_ReceiverC.inl
-  }
-}
-
-project(CoherentUpdate_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += CoherentUpdate_Test_Receiver_lem_stub CoherentUpdate_Test_Receiver_stub \
-             CoherentUpdate_Test_Base_stub CoherentUpdate_Connector_stub \
-             CoherentUpdate_Connector_lem_stub \
-             DDS_Coh_Update_ReaderStarter_lem_stub DDS_Coh_Update_ReaderStarter_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub CoherentUpdate_Test_Base_stub \
-          CoherentUpdate_Connector_stub CoherentUpdate_Connector_lem_stub \
-          Reader_Starter_lem_stub Reader_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL READER_STARTER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CoherentUpdate_Test_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    CoherentUpdate_Test_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(CoherentUpdate_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   CoherentUpdate_Test_Receiver_lem_stub CoherentUpdate_Test_Base_stub \
-                  CoherentUpdate_Connector_stub CoherentUpdate_Connector_svnt \
-                  CoherentUpdate_Test_Receiver_exec CoherentUpdate_Connector_lem_stub \
-                  DDS_Coh_Update_ReaderStarter_stub \
-                  DDS_Coh_Update_ReaderStarter_svnt DDS_Coh_Update_ReaderStarter_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub CoherentUpdate_Test_Base_stub \
-                CoherentUpdate_Connector_stub CoherentUpdate_Connector_svnt \
-                Receiver_exec CoherentUpdate_Connector_lem_stub \
-                Reader_Starter_stub Reader_Starter_svnt \
-                Reader_Starter_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CoherentUpdate_Test_ReceiverS.cpp
-    CoherentUpdate_Test_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    CoherentUpdate_Test_ReceiverS.h
-    CoherentUpdate_Test_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.cpp
deleted file mode 100644
index a6d4750a855..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.cpp
+++ /dev/null
@@ -1,376 +0,0 @@
-// -*- C++ -*-
-#include "CoherentUpdate_Test_Receiver_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/OS_NS_unistd.h"
-#include "ace/Reactor.h"
-#include "ace/Log_Msg.h"
-
-namespace CIAO_CoherentUpdate_Test_Receiver_Impl
-{
-  //============================================================
-  // read_action_Generator
-  //============================================================
-  read_action_Generator::read_action_Generator (Receiver_exec_i &callback,
-                                                int run)
-    : callback_ (callback),
-      run_ (run)
-  {
-  }
-
-  read_action_Generator::~read_action_Generator ()
-  {
-  }
-
-  int
-  read_action_Generator::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Checking if last sample "
-                          "is available in DDS...\n"));
-    if (this->callback_.check_last ())
-      this->callback_.run (this->run_);
-    return 0;
-  }
-
-  //============================================================
-  // Facet Executor Implementation Class: reader_start_exec_i
-  //============================================================
-
-  reader_start_exec_i::reader_start_exec_i (
-        ::CoherentUpdate_Test::CCM_Receiver_Context_ptr ctx,
-        Receiver_exec_i & callback)
-    : ciao_context_ (
-        ::CoherentUpdate_Test::CCM_Receiver_Context::_duplicate (ctx))
-      , callback_ (callback)
-  {
-  }
-
-  reader_start_exec_i::~reader_start_exec_i (void)
-  {
-  }
-
-  // Operations from ::CoherentUpdateStarter
-
-  void
-  reader_start_exec_i::set_reader_properties (
-    ::CORBA::UShort nr_iterations)
-  {
-    this->callback_.iterations (nr_iterations);
-  }
-
-  void
-  reader_start_exec_i::start_read (
-    ::CORBA::UShort run)
-  {
-    this->callback_.start_read (run);
-  }
-
-  //============================================================
-  // Component Executor Implementation Class: Receiver_exec_i
-  //============================================================
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : nr_runs_ (5),
-      iterations_ (10),
-      run_ (0),
-      last_iter_ (0),
-      ticker_ (0)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  bool
-  Receiver_exec_i::check_last ()
-  {
-    try
-      {
-        ::CoherentUpdate_Test::Reader_var reader =
-          this->ciao_context_->get_connection_info_out_data ();
-        if (::CORBA::is_nil (reader.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_last - "
-                                  "Unable to retrieve reader from context.\n"));
-            return false;
-          }
-        CoherentUpdateTest coherentwrite_info;
-        ::CCM_DDS::ReadInfo readinfo;
-        coherentwrite_info.symbol = CORBA::string_dup ("KEY_1");
-        reader->read_one_last (
-                coherentwrite_info,
-                readinfo,
-                ::DDS::HANDLE_NIL);
-                ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_last - "
-                              "last iteration <%d> - <%d>\n",
-                               coherentwrite_info.iteration,
-                               (this->run_ + 1) * this->iterations_ - 1));
-        return coherentwrite_info.iteration >= (this->run_ + 1) * this->iterations_ - 1;
-      }
-    catch (const ::CCM_DDS::InternalError &)
-      {
-      }
-    catch (const ::CCM_DDS::NonExistent &)
-      {
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::check_last: "
-                              "ERROR: Unexpected exception caught\n"));
-      }
-    return false;
-  }
-
-  // Supported operations and attributes.
-  void
-  Receiver_exec_i::read_all (::CoherentUpdate_Test::Reader_ptr reader)
-  {
-    try
-      {
-        CoherentUpdateTestSeq coherentwrite_info_seq;
-        ::CCM_DDS::ReadInfoSeq readinfo_seq;
-        reader->read_all (coherentwrite_info_seq, readinfo_seq);
-
-        for (CORBA::ULong it = 0; it < coherentwrite_info_seq.length (); ++it)
-          {
-            if (coherentwrite_info_seq[it].iteration > this->last_iter_)
-              {
-                if (coherentwrite_info_seq[it].iteration == ++this->last_iter_)
-                  {
-                    ACE_DEBUG ((LM_DEBUG, "OK: "));
-                  }
-                else
-                  {
-                    ACE_ERROR ((LM_ERROR, "ERROR: "));
-                  }
-                ACE_DEBUG ((LM_DEBUG, "expected: <%u> - "
-                                      "received <%d>\n",
-                                      this->last_iter_,
-                                      coherentwrite_info_seq[it].iteration));
-               }
-          }
-        if (this->run_ < this->nr_runs () + 1)
-          {
-             CoherentUpdateRestarter_var restarter =
-              this->ciao_context_->get_connection_updater_restart ();
-            if (! ::CORBA::is_nil (restarter))
-              {
-                restarter->restart_update ();
-              }
-            else
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::read_all -"
-                                      "Unable to restart.\n"));
-              }
-          }
-        else
-          {
-            ACE_DEBUG ((LM_DEBUG, "Finished: wait for shutdown\n"));
-          }
-      }
-    catch (const CCM_DDS::NonExistent& ex)
-      {
-        for (CORBA::ULong i = 0; i < ex.indexes.length (); ++i)
-          {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ ALL: ")
-                  ACE_TEXT ("caught expected exception: index <%u>\n"),
-                  ex.indexes[i]));
-          }
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ ALL: ")
-              ACE_TEXT ("caught InternalError exception: retval <%u>\n"),
-              ex.error_code));
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: READ ALL: ");
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Receiver_exec_i::read_all : Exception caught\n")));
-      }
-  }
-
-  void
-  Receiver_exec_i::start_read (CORBA::UShort run)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      read_action_Generator (*this, run),
-                      ::CORBA::INTERNAL ());
-    if (this->reactor ()->schedule_timer (
-                                          this->ticker_,
-                                          0,
-                                          ACE_Time_Value(1, 0),
-                                          ACE_Time_Value(1, 0)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, "Unable to schedule Timer\n"));
-      }
-  }
-
-  void
-  Receiver_exec_i::run (CORBA::UShort run)
-  {
-    if (this->ticker_)
-      {
-        this->reactor ()->cancel_timer (this->ticker_);
-        delete this->ticker_;
-        this->ticker_ = 0;
-      }
-    ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::run - "
-                          "Starting run number <%d>\n",
-                          run));
-    this->run_ = run;
-    ::CoherentUpdate_Test::Reader_var reader =
-      this->ciao_context_->get_connection_info_out_data ();
-    if (! ::CORBA::is_nil (reader.in ()))
-      {
-        this->read_all (reader);
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::run - "
-                              "Unable to start: reader is nil.\n"));
-      }
-  }
-
-  // Supported operations and attributes.
-
-  ACE_Reactor*
-  Receiver_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  // Component attributes and port operations.
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::CCM_CoherentUpdateStarter_ptr
-  Receiver_exec_i::get_reader_start (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_reader_start_.in ()))
-      {
-        reader_start_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          reader_start_exec_i (
-            this->ciao_context_.in (),
-            *this),
-          ::CCM_CoherentUpdateStarter::_nil ());
-
-        this->ciao_reader_start_ = tmp;
-      }
-
-    return
-      ::CCM_CoherentUpdateStarter::_duplicate (
-        this->ciao_reader_start_.in ());
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::nr_runs (void)
-  {
-    return
-      this->nr_runs_;
-  }
-
-  void
-  Receiver_exec_i::nr_runs (
-    const ::CORBA::UShort nr_runs)
-  {
-    this->nr_runs_ =
-      nr_runs;
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Receiver_exec_i::iterations (::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::CoherentUpdate_Test::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    if (this->ticker_)
-      {
-        this->reactor ()->cancel_timer (this->ticker_);
-        delete this->ticker_;
-        this->ticker_ = 0;
-      }
-    if (this->run_ == 1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: ")
-            ACE_TEXT ("Test did not run")
-            ACE_TEXT ("events.\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Finished coherent update test.\n")));
-      }
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CoherentUpdate_Test_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.h
deleted file mode 100644
index 92349ce6df1..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.h
+++ /dev/null
@@ -1,141 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_COHERENTUPDATE_TEST_RECEIVER_EXEC_94WCEL_H_
-#define CIAO_COHERENTUPDATE_TEST_RECEIVER_EXEC_94WCEL_H_
-
-#include /**/ "ace/pre.h"
-
-#include "CoherentUpdate_Test_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_CoherentUpdate_Test_Receiver_Impl
-{
-  class Receiver_exec_i;
-
-  //============================================================
-  // read_action_Generator
-  //============================================================
-  class read_action_Generator
-    : public ACE_Event_Handler
-  {
-  public:
-    read_action_Generator (Receiver_exec_i &callback,
-                           int run);
-
-    ~read_action_Generator ();
-
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    Receiver_exec_i &callback_;
-    int run_;
-  };
-
-  class RECEIVER_EXEC_Export reader_start_exec_i
-    : public virtual ::CCM_CoherentUpdateStarter,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    reader_start_exec_i (
-      ::CoherentUpdate_Test::CCM_Receiver_Context_ptr ctx,
-      Receiver_exec_i & callback);
-    virtual ~reader_start_exec_i (void);
-
-    // Operations and attributes from CoherentUpdateStarter
-
-    virtual
-    void set_reader_properties (
-      ::CORBA::UShort nr_iterations);
-
-    virtual
-    void start_read (
-      ::CORBA::UShort run);
-
-  private:
-    ::CoherentUpdate_Test::CCM_Receiver_Context_var ciao_context_;
-    Receiver_exec_i &callback_;
-  };
-
-
-  class RECEIVER_EXEC_Export Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_status (void);
-
-    virtual ::CCM_CoherentUpdateStarter_ptr
-    get_reader_start (void);
-
-    virtual ::CORBA::UShort
-    nr_runs (void);
-
-    virtual void
-    nr_runs (
-      ::CORBA::UShort nr_runs);
-
-    ::CORBA::UShort iterations (void);
-    void iterations (::CORBA::UShort iterations);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-
-
-
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete (void);
-
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    bool check_last ();
-
-    void start_read (CORBA::UShort run);
-    void run (CORBA::UShort run);
-
-  private:
-    ::CoherentUpdate_Test::CCM_Receiver_Context_var ciao_context_;
-    ::CCM_CoherentUpdateStarter_var ciao_reader_start_;
-
-    ::CORBA::UShort nr_runs_;
-
-    ::CORBA::UShort iterations_;
-    ::CORBA::UShort run_;
-    ::CORBA::Long last_iter_;
-
-    read_action_Generator *ticker_;
-
-    void read_all (
-      ::CoherentUpdate_Test::Reader_ptr reader);
-
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CoherentUpdate_Test_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/.gitignore b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/.gitignore
deleted file mode 100644
index 86849fed249..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/CoherentUpdate_Test_SenderE.idl
-/Sender_exec_export.h
-/Sender_lem_stub_export.h
-/Sender_stub_export.h
-/Sender_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.idl
deleted file mode 100644
index b9c3e548001..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_COHERENT_UPDATE_TEST_SENDER_IDL
-#define DDS_COHERENT_UPDATE_TEST_SENDER_IDL
-
-#include "Connector/CoherentUpdate_Test_Connector.idl"
-#include "Base/Reader_Starter.idl"
-
-module CoherentUpdate_Test
-{
-  component Sender
-  {
-    port CoherentUpdate_Test::DDS_Update info_update;
-
-    uses CoherentUpdateStarter start_reader;
-    provides CoherentUpdateRestarter restart_updater;
-
-    attribute unsigned short iterations;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.mpc
deleted file mode 100644
index 56c819695ef..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.mpc
+++ /dev/null
@@ -1,153 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p CoherentUpdate_TestBase -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(CoherentUpdate_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += CoherentUpdate_Connector_idl_gen DDS_Starter_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I ..
-
-  IDL_Files {
-    CoherentUpdate_Test_Sender.idl
-  }
-}
-
-project(CoherentUpdate_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += CoherentUpdate_Test_Sender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    CoherentUpdate_Test_SenderE.idl
-  }
-}
-
-project(CoherentUpdate_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += CoherentUpdate_Test_Sender_lem_gen CoherentUpdate_Test_Sender_stub \
-           CoherentUpdate_Test_Base_stub DDS_Coh_Update_ReaderStarter_stub
-  libs  += CoherentUpdate_Test_Base_stub Sender_stub Reader_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CoherentUpdate_Test_SenderEC.cpp
-  }
-
-  Header_Files {
-    CoherentUpdate_Test_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    CoherentUpdate_Test_SenderEC.inl
-  }
-}
-
-project(CoherentUpdate_Test_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += CoherentUpdate_Test_Sender_idl_gen CoherentUpdate_Test_Base_stub \
-           CoherentUpdate_Connector_stub DDS_Coh_Update_ReaderStarter_stub \
-           DDS_Coh_Update_ReaderStarter_lem_stub
-  libs  += CoherentUpdate_Test_Base_stub CoherentUpdate_Connector_stub \
-           Reader_Starter_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CoherentUpdate_Test_SenderC.cpp
-  }
-
-  Header_Files {
-    CoherentUpdate_Test_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    CoherentUpdate_Test_SenderC.inl
-  }
-}
-
-project(CoherentUpdate_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += CoherentUpdate_Test_Sender_lem_stub CoherentUpdate_Test_Sender_stub \
-             CoherentUpdate_Connector_lem_stub CoherentUpdate_Connector_stub \
-             DDS_Coh_Update_ReaderStarter_lem_stub
-  sharedname = Sender_exec
-  libs    += Sender_stub Sender_lem_stub CoherentUpdate_Test_Base_stub \
-             CoherentUpdate_Connector_lem_stub CoherentUpdate_Connector_stub \
-             Reader_Starter_stub Reader_Starter_lem_stub \
-             Reader_Starter_lem_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CoherentUpdate_Test_Sender_exec.cpp
-  }
-
-  Header_Files {
-    CoherentUpdate_Test_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(CoherentUpdate_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += CoherentUpdate_Test_Base_stub  CoherentUpdate_Test_Sender_lem_stub \
-                CoherentUpdate_Connector_stub \
-                CoherentUpdate_Connector_svnt CoherentUpdate_Connector_lem_stub \
-                DDS_Coh_Update_ReaderStarter_stub DDS_Coh_Update_ReaderStarter_svnt \
-                DDS_Coh_Update_ReaderStarter_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub CoherentUpdate_Test_Base_stub \
-                CoherentUpdate_Connector_stub CoherentUpdate_Connector_svnt \
-                CoherentUpdate_Connector_lem_stub Reader_Starter_stub \
-                Reader_Starter_svnt Reader_Starter_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CoherentUpdate_Test_SenderS.cpp
-    CoherentUpdate_Test_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    CoherentUpdate_Test_SenderS.h
-    CoherentUpdate_Test_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.cpp
deleted file mode 100644
index b60ed95945a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.cpp
+++ /dev/null
@@ -1,250 +0,0 @@
-// -*- C++ -*-
-#include "CoherentUpdate_Test_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-#include "ace/Log_Msg.h"
-
-#define SAMPLE_KEY_NAME "KEY_1"
-
-namespace CIAO_CoherentUpdate_Test_Sender_Impl
-{
-  //============================================================
-  // WriteHandler
-  //============================================================
-  WriteHandler::WriteHandler (Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  WriteHandler::handle_exception (ACE_HANDLE)
-  {
-    this->callback_.start ();
-    return 0;
-  }
-
-  //============================================================
-  // Facet Executor Implementation Class: restart_updater_exec_i
-  //============================================================
-
-  restart_updater_exec_i::restart_updater_exec_i (
-        ::CoherentUpdate_Test::CCM_Sender_Context_ptr ctx,
-        Sender_exec_i & callback)
-    : ciao_context_ (
-        ::CoherentUpdate_Test::CCM_Sender_Context::_duplicate (ctx)),
-      callback_ (callback)
-  {
-  }
-
-  restart_updater_exec_i::~restart_updater_exec_i (void)
-  {
-  }
-
-  // Operations from ::CoherentUpdateRestarter
-
-  void
-  restart_updater_exec_i::restart_update (void)
-  {
-    this->callback_.restart ();
-  }
-
-  //============================================================
-  // Component Executor Implementation Class: Sender_exec_i
-  //============================================================
-
-  Sender_exec_i::Sender_exec_i (void)
-    : iterations_ (3),
-      run_ (1),
-      total_iter (0),
-      wh_ (0)
-  {
-    ACE_NEW_THROW_EX (this->wh_,
-                      WriteHandler (*this),
-                      CORBA::INTERNAL ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->wh_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  // Component attributes and port operations.
-
-  ::CCM_CoherentUpdateRestarter_ptr
-  Sender_exec_i::get_restart_updater (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_restart_updater_.in ()))
-      {
-        restart_updater_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          restart_updater_exec_i (
-            this->ciao_context_.in (),
-            *this),
-            ::CCM_CoherentUpdateRestarter::_nil ());
-
-          this->ciao_restart_updater_ = tmp;
-      }
-
-    return
-      ::CCM_CoherentUpdateRestarter::_duplicate (
-        this->ciao_restart_updater_.in ());
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::CoherentUpdate_Test::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-    try
-      {
-        ::CoherentUpdate_Test::Updater_var updater =
-          this->ciao_context_->get_connection_info_update_data ();
-        updater->is_coherent_write (true);
-
-        // First create an instance for consecutive updating.
-        CoherentUpdateTest new_key;
-        new_key.symbol = CORBA::string_dup(SAMPLE_KEY_NAME);
-        new_key.iteration = 0;
-        updater->create_one (new_key);
-
-        this->reactor ()->notify (this->wh_);
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("Exception caught:");
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: GET_CONNECTION_START_READER : Exception caught\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: GET_CONNECTION_START_READER : Unknown exception caught\n")));
-      }
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-  }
-
-  void
-  Sender_exec_i::restart (void)
-  {
-    ++this->run_;
-    delete this->wh_;
-    ACE_NEW_THROW_EX (this->wh_,
-                      WriteHandler (*this),
-                      CORBA::INTERNAL ());
-    this->reactor ()->notify (this->wh_);
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    ::CoherentUpdateStarter_var starter =
-        this->ciao_context_->get_connection_start_reader ();
-
-    if (! ::CORBA::is_nil (starter.in ()))
-      {
-        starter->set_reader_properties (this->iterations_);
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Unable to start the reader\n")));
-      }
-
-    ACE_DEBUG ((LM_DEBUG, "Start run <%d> with <%u> iterations\n",
-                          this->run_,
-                          this->iterations ()));
-
-    CoherentUpdateTestSeq update_many_seq;
-    update_many_seq.length (this->iterations_);
-    for (int i = 1; i < this->iterations_ + 1; ++i)
-      {
-        CoherentUpdateTest new_key;
-        new_key.symbol = CORBA::string_dup(SAMPLE_KEY_NAME);
-        new_key.iteration = ++total_iter;
-        update_many_seq[i-1] = new_key;
-      }
-
-    ::CoherentUpdate_Test::Updater_var updater =
-        this->ciao_context_->get_connection_info_update_data ();
-    updater->update_many (update_many_seq);
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Written <%u> keys uptil now\n"),
-                total_iter));
-    ACE_OS::sleep (2);
-    starter->start_read (this->run_);
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CoherentUpdate_Test_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.h
deleted file mode 100644
index bb6be68fcd7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.h
+++ /dev/null
@@ -1,135 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_COHERENTUPDATE_TEST_SENDER_EXEC_VI4L1L_H_
-#define CIAO_COHERENTUPDATE_TEST_SENDER_EXEC_VI4L1L_H_
-
-#include /**/ "ace/pre.h"
-
-#include "CoherentUpdate_Test_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_CoherentUpdate_Test_Sender_Impl
-{
-  class Sender_exec_i;
-
-  //============================================================
-  // WriteHandler
-  //============================================================
-  class WriteHandler :
-    public ACE_Event_Handler
-  {
-  public:
-    WriteHandler (Sender_exec_i &callback);
-    virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-
-  //============================================================
-  // Provider Executor Implementation Class: restart_updater_exec_i
-  //============================================================
-
-  class restart_updater_exec_i
-    : public virtual ::CCM_CoherentUpdateRestarter,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    restart_updater_exec_i (
-      ::CoherentUpdate_Test::CCM_Sender_Context_ptr ctx,
-      Sender_exec_i & callback);
-    virtual ~restart_updater_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CoherentUpdateRestarter. */
-
-    virtual
-    void restart_update (void);
-    //@}
-
-  private:
-    ::CoherentUpdate_Test::CCM_Sender_Context_var ciao_context_;
-    Sender_exec_i &callback_;
-  };
-
-  //============================================================
-  // Component Executor Implementation Class: Sender_exec_i
-  //============================================================
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CCM_CoherentUpdateRestarter_ptr
-    get_restart_updater (void);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void start (void);
-    void restart (void);
-    //@}
-
-  private:
-    ::CoherentUpdate_Test::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes and port operations. */
-    ::CCM_CoherentUpdateRestarter_var ciao_restart_updater_;
-
-    ::CORBA::UShort iterations_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    CORBA::UShort run_;
-    CORBA::ULong total_iter;
-    WriteHandler *wh_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CoherentUpdate_Test_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/Plan.cdp
deleted file mode 100644
index 8ac3c21fef5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/Plan.cdp
+++ /dev/null
@@ -1,385 +0,0 @@
-<!--  -->
-<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>CoherentUpdate_TestDepl_1</label>
-  <UUID>CoherentUpdate_TestDepl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CoherentUpdate_Test_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CoherentUpdate_Test_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="CoherentUpdate_Test_ConnectorComponentImplementation">
-    <name>CoherentUpdate_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="CoherentUpdate_Connector_ExecArtifact" />
-    <artifact xmi:idref="CoherentUpdate_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CoherentUpdate_Test_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CoherentUpdate_Test_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CoherentUpdate_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CoherentUpdate_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CoherentUpdate_Test_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CoherentUpdate_Test_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-    <configProperty>
-      <name>nr_runs</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="CoherentUpdate_Test_ConnectorComponentInstance">
-    <name>CoherentUpdate_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="CoherentUpdate_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CoherentUpdater_Library#CoherentUpdaterProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CoherentUpdate_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="CoherentUpdate_Test_ConnectorComponentInstance2">
-    <name>CoherentUpdate_Test_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="CoherentUpdate_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CoherentUpdater_Library#CoherentUpdaterProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CoherentUpdate_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>4</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>info_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>passive_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CoherentUpdate_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>updater_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_update_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>observable_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CoherentUpdate_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>reader_starter</name>
-    <internalEndpoint>
-      <portName>start_reader</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>reader_start</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>restart_updater</name>
-    <internalEndpoint>
-      <portName>updater_restart</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>restart_updater</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="CoherentUpdate_Connector_ExecArtifact">
-    <name>CoherentUpdate_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>CoherentUpdate_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="CoherentUpdate_Connector_SvntArtifact">
-    <name>CoherentUpdate_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>CoherentUpdate_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="CoherentUpdate_Connector_StubArtifact">
-    <name>CoherentUpdate_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>CoherentUpdate_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index c9a46586ffb..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-Description
-XML QoS Profile
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="CoherentUpdater_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="CoherentUpdaterProfile" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>10</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/run_test.pl
deleted file mode 100755
index c5b1964e047..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 30 seconds to allow task to complete\n";
-sleep (30);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/.gitignore b/CIAO/connectors/dds4ccm/tests/CoherentWriter/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/.gitignore
deleted file mode 100644
index ffebb99f763..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/.gitignore
+++ /dev/null
@@ -1,12 +0,0 @@
-/CoherentWrite_Test_Base.cxx
-/CoherentWrite_Test_Base.h
-/CoherentWrite_Test_BasePlugin.cxx
-/CoherentWrite_Test_BasePlugin.h
-/CoherentWrite_Test_BaseSupport.cxx
-/CoherentWrite_Test_BaseSupport.h
-/CoherentWrite_Test_Base_stub_export.h
-/Reader_StarterE.idl
-/Reader_Starter_exec_export.h
-/Reader_Starter_lem_stub_export.h
-/Reader_Starter_stub_export.h
-/Reader_Starter_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.idl
deleted file mode 100644
index 58d4b9d347e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file CoherentWrite_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef COHERENT_WRITE_TEST_BASE_IDL
-#define COHERENT_WRITE_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/CoherentWrite_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/CoherentWrite_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "CoherentWriteTest"
-#pragma DCPS_DATA_KEY "CoherentWriteTest symbol"
-
-struct CoherentWriteTest {
-  string symbol; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<CoherentWriteTest> CoherentWriteTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.mpc
deleted file mode 100644
index 1fc2c2b7903..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (CoherentWrite_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = CoherentWrite_Test_Base_stub
-  dynamicflags += COHERENT_WRITE_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=COHERENT_WRITE_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=CoherentWrite_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    CoherentWrite_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=COHERENT_WRITE_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    CoherentWrite_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.idl b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.idl
deleted file mode 100644
index fc0847932dc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file Reader_Starter.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef COHERENT_WRITE_STARTER_IDL
-#define COHERENT_WRITE_STARTER_IDL
-
-#pragma ciao lem "Base/Reader_StarterE.idl"
-
-interface CoherentWriteStarter
-{
-  void set_reader_properties (in unsigned short nr_iterations);
-  void start_read (in unsigned short run);
-};
-
-interface CoherentWriteRestarter
-{
-  void restart_write ();
-};
-
-#endif /* COHERENT_WRITE_STARTER_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.mpc b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.mpc
deleted file mode 100644
index 2b15e9e7c45..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.mpc
+++ /dev/null
@@ -1,109 +0,0 @@
-project(DDS_Coherent_Reader_Starter_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=READER_STARTER_STUB_Export \
-              -Wb,stub_export_include=Reader_Starter_stub_export.h \
-              -Wb,skel_export_macro=READER_STARTER_SVNT_Export \
-              -Wb,skel_export_include=Reader_Starter_svnt_export.h \
-              -Wb,svnt_export_macro=READER_STARTER_SVNT_Export \
-              -Wb,svnt_export_include=Reader_Starter_svnt_export.h \
-              -Wb,exec_export_macro=READER_STARTER_EXEC_Export \
-              -Wb,exec_export_include=Reader_Starter_exec_export.h -I..
-
-  IDL_Files {
-    Reader_Starter.idl
-  }
-}
-
-project(DDS_Coherent_Reader_Starter_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_Coherent_Reader_Starter_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=READER_STARTER_LEM_STUB_Export \
-              -Wb,stub_export_include=Reader_Starter_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    Reader_StarterE.idl
-  }
-}
-
-project(DDS_Coherent_Reader_Starter_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_Coherent_Reader_Starter_lem_gen DDS_Coherent_Reader_Starter_stub
-  libs  += Reader_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Reader_Starter_lem_stub
-  dynamicflags += READER_STARTER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_StarterEC.cpp
-  }
-
-  Header_Files {
-    Reader_StarterEC.h
-    Reader_Starter_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Reader_StarterEC.inl
-  }
-}
-
-project(DDS_Coherent_Reader_Starter_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_Coherent_Reader_Starter_idl_gen
-  libs  +=
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Reader_Starter_stub
-  dynamicflags += READER_STARTER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_StarterC.cpp
-  }
-
-  Header_Files {
-    Reader_StarterC.h
-    Reader_Starter_stub_export.h
-  }
-
-  Inline_Files {
-    Reader_StarterC.inl
-  }
-}
-
-
-project(DDS_Coherent_Reader_Starter_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_Coherent_Reader_Starter_lem_stub DDS_Coherent_Reader_Starter_stub
-  sharedname  = Reader_Starter_svnt
-  libs       += Reader_Starter_stub Reader_Starter_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += READER_STARTER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_StarterS.cpp
-    Reader_Starter_svnt.cpp
-  }
-
-  Header_Files {
-    Reader_StarterS.h
-    Reader_Starter_svnt.h
-    Reader_Starter_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/.gitignore
deleted file mode 100644
index 3f22aee3083..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/CoherentWrite_Test_ConnectorE.idl
-/CoherentWrite_Test_Connector_conn.cpp
-/CoherentWrite_Test_Connector_conn.h
-/CoherentWrite_Test_Connector_conn_export.h
-/CoherentWrite_Test_Connector_lem_stub_export.h
-/CoherentWrite_Test_Connector_stub_export.h
-/CoherentWrite_Test_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.idl
deleted file mode 100644
index 270b1189a74..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file CoherentWrite_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef COHERENT_WRITE_TEST_CONNECTOR_IDL_
-#define COHERENT_WRITE_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/CoherentWrite_Test_Base.idl"
-
-#pragma ciao lem "Connector/CoherentWrite_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/CoherentWrite_Test_BaseTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::CoherentWriteTest, ::CoherentWriteTestSeq> CoherentWriteTestConnector;
-
-#endif /* CoherentWrite_Test_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.mpc
deleted file mode 100644
index cc2fac6fbf8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p CoherentWrite_Test_Base -l .. -o ../lib -u DDS CoherentWrite_Test_Connector"
-
-project(CoherentWrite_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen CoherentWrite_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=COHERENT_WRITE_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=CoherentWrite_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=COHERENT_WRITE_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=CoherentWrite_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=COHERENT_WRITE_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=CoherentWrite_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=COHERENT_WRITE_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=CoherentWrite_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    CoherentWrite_Test_Connector.idl
-  }
-}
-
-project(CoherentWrite_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += CoherentWrite_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=COHERENT_WRITE_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=CoherentWrite_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    CoherentWrite_Test_ConnectorE.idl
-  }
-}
-
-project(CoherentWrite_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += CoherentWrite_Test_Connector_lem_gen CoherentWrite_Test_Connector_stub CoherentWrite_Test_Base_stub
-  libs  += CoherentWrite_Test_Base_stub CoherentWrite_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = CoherentWrite_Test_Connector_lem_stub
-  dynamicflags += COHERENT_WRITE_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CoherentWrite_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    CoherentWrite_Test_ConnectorEC.h
-    CoherentWrite_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    CoherentWrite_Test_ConnectorEC.inl
-  }
-}
-
-project(CoherentWrite_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += CoherentWrite_Test_Connector_idl_gen CoherentWrite_Test_Base_stub
-  libs  += CoherentWrite_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = CoherentWrite_Test_Connector_stub
-  dynamicflags += COHERENT_WRITE_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CoherentWrite_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    CoherentWrite_Test_ConnectorC.h
-    CoherentWrite_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    CoherentWrite_Test_ConnectorC.inl
-  }
-}
-
-project(CoherentWrite_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += CoherentWrite_Test_Connector_lem_stub CoherentWrite_Test_Connector_stub CoherentWrite_Test_Base_stub
-  sharedname = CoherentWrite_Test_Connector_exec
-  libs += CoherentWrite_Test_Connector_stub CoherentWrite_Test_Connector_lem_stub CoherentWrite_Test_Base_stub CoherentWrite_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COHERENT_WRITE_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CoherentWrite_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    CoherentWrite_Test_Connector_conn.h
-    CoherentWrite_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(CoherentWrite_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += CoherentWrite_Test_Connector_lem_stub CoherentWrite_Test_Connector_exec CoherentWrite_Test_Connector_stub
-  sharedname  = CoherentWrite_Test_Connector_svnt
-  libs       += CoherentWrite_Test_Connector_stub \
-                CoherentWrite_Test_Connector_lem_stub  \
-                CoherentWrite_Test_Base_stub \
-                CoherentWrite_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COHERENT_WRITE_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CoherentWrite_Test_ConnectorS.cpp
-    CoherentWrite_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    CoherentWrite_Test_ConnectorS.h
-    CoherentWrite_Test_Connector_svnt.h
-    CoherentWrite_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/.gitignore b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/.gitignore
deleted file mode 100644
index 15ee47edcab..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/CoherentWrite_Test_ReceiverE.idl
-/Receiver_exec_export.h
-/Receiver_lem_stub_export.h
-/Receiver_stub_export.h
-/Receiver_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.idl
deleted file mode 100644
index 8591550a8ea..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/CoherentWrite_Test_Connector.idl"
-#include "Base/Reader_Starter.idl"
-
-module CoherentWrite_Test
-{
-  component Receiver
-  {
-    port CoherentWriteTestConnector::DDS_Get info_out;
-
-    provides CoherentWriteStarter reader_start;
-    uses CoherentWriteRestarter writer_restart;
-
-    attribute unsigned short nr_runs;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.mpc
deleted file mode 100644
index e66cc09b7ae..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.mpc
+++ /dev/null
@@ -1,155 +0,0 @@
-project(CoherentWrite_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += CoherentWrite_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h \
-              -I..
-
-  IDL_Files {
-    CoherentWrite_Test_Receiver.idl
-  }
-}
-
-project(CoherentWrite_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += CoherentWrite_Test_Receiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    CoherentWrite_Test_ReceiverE.idl
-  }
-}
-
-project(CoherentWrite_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += CoherentWrite_Test_Receiver_lem_gen CoherentWrite_Test_Receiver_stub  \
-           CoherentWrite_Test_Connector_stub CoherentWrite_Test_Base_stub \
-           DDS_Coherent_Reader_Starter_stub
-  libs  +=  Receiver_stub CoherentWrite_Test_Connector_stub \
-            CoherentWrite_Test_Base_stub Reader_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CoherentWrite_Test_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    CoherentWrite_Test_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    CoherentWrite_Test_ReceiverEC.inl
-  }
-}
-
-project(CoherentWrite_Test_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += CoherentWrite_Test_Receiver_idl_gen  CoherentWrite_Test_Connector_stub \
-           CoherentWrite_Test_Base_stub CoherentWrite_Test_Connector_lem_gen \
-           DDS_Coherent_Reader_Starter_stub DDS_Coherent_Reader_Starter_lem_stub
-  libs  += CoherentWrite_Test_Connector_stub CoherentWrite_Test_Base_stub \
-           Reader_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CoherentWrite_Test_ReceiverC.cpp
-  }
-
-  Header_Files {
-    CoherentWrite_Test_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    CoherentWrite_Test_ReceiverC.inl
-  }
-}
-
-project(CoherentWrite_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += CoherentWrite_Test_Receiver_lem_stub CoherentWrite_Test_Receiver_stub \
-             CoherentWrite_Test_Base_stub CoherentWrite_Test_Connector_stub \
-             CoherentWrite_Test_Connector_lem_stub \
-             DDS_Coherent_Reader_Starter_lem_stub DDS_Coherent_Reader_Starter_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub CoherentWrite_Test_Base_stub \
-          CoherentWrite_Test_Connector_stub CoherentWrite_Test_Connector_lem_stub \
-          Reader_Starter_lem_stub Reader_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL READER_STARTER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CoherentWrite_Test_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    CoherentWrite_Test_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(CoherentWrite_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   CoherentWrite_Test_Receiver_lem_stub CoherentWrite_Test_Base_stub \
-                  CoherentWrite_Test_Connector_stub CoherentWrite_Test_Connector_svnt \
-                  CoherentWrite_Test_Receiver_exec CoherentWrite_Test_Connector_lem_stub \
-                  DDS_Coherent_Reader_Starter_stub \
-                  DDS_Coherent_Reader_Starter_svnt DDS_Coherent_Reader_Starter_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub CoherentWrite_Test_Base_stub \
-                CoherentWrite_Test_Connector_stub CoherentWrite_Test_Connector_svnt \
-                Receiver_exec CoherentWrite_Test_Connector_lem_stub \
-                Reader_Starter_stub Reader_Starter_svnt \
-                Reader_Starter_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CoherentWrite_Test_ReceiverS.cpp
-    CoherentWrite_Test_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    CoherentWrite_Test_ReceiverS.h
-    CoherentWrite_Test_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.cpp
deleted file mode 100644
index 061c5f5cd15..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.cpp
+++ /dev/null
@@ -1,498 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "CoherentWrite_Test_Receiver_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_CoherentWrite_Test_Receiver_Impl
-{
-  /**
-   * Read action Generator
-   */
-
-  read_action_Generator::read_action_Generator (Receiver_exec_i &callback,
-                                                int run)
-    : callback_ (callback),
-      run_ (run)
-  {
-  }
-
-  read_action_Generator::~read_action_Generator ()
-  {
-  }
-
-  int
-  read_action_Generator::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Checking if last sample "
-                          "is available in DDS...\n"));
-    // Use get_many for every even number. In that case, don't check whether
-    // the last sample has arrived since the samples are read by then (the
-    // getter only reads unread samples).
-    if (this->run_ % 2 == 1)
-      {
-        // Odd number so check if the last sample is available in DDS.
-        if (this->callback_.check_last ())
-          this->callback_.run (this->run_);
-      }
-    else
-      this->callback_.run (this->run_);
-    return 0;
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_status_exec_i
-   */
-
-  info_out_status_exec_i::info_out_status_exec_i (
-        ::CoherentWrite_Test::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::CoherentWrite_Test::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_status_exec_i::~info_out_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: reader_start_exec_i
-   */
-
-  reader_start_exec_i::reader_start_exec_i (
-        ::CoherentWrite_Test::CCM_Receiver_Context_ptr ctx,
-        Receiver_exec_i &callback)
-    : ciao_context_ (
-        ::CoherentWrite_Test::CCM_Receiver_Context::_duplicate (ctx))
-      , callback_ (callback)
-  {
-  }
-
-  reader_start_exec_i::~reader_start_exec_i (void)
-  {
-  }
-
-  // Operations from ::CoherentWriteStarter
-
-  void
-  reader_start_exec_i::set_reader_properties (::CORBA::UShort nr_iterations)
-  {
-    this->callback_.iterations (nr_iterations);
-  }
-
-  void
-  reader_start_exec_i::start_read (::CORBA::UShort run)
-  {
-    this->callback_.start_read (run);
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : nr_runs_ (0)
-      , iterations_ (10)
-      , run_ (0)
-      , last_iter_ (0)
-      , ticker_ (0)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Receiver_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  bool
-  Receiver_exec_i::check_last (void)
-  {
-    try
-      {
-        ::CoherentWriteTestConnector::Reader_var reader =
-          this->ciao_context_->get_connection_info_out_data ();
-        CoherentWriteTest coherentwrite_info;
-        ::CCM_DDS::ReadInfo readinfo;
-        coherentwrite_info.symbol = CORBA::string_dup ("KEY_1");
-        reader->read_one_last (
-                coherentwrite_info,
-                readinfo,
-                ::DDS::HANDLE_NIL);
-                ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_last - "
-                              "last iteration <%d> - <%d>\n",
-                               coherentwrite_info.iteration,
-                               (this->run_ + 1) * this->iterations_ - 1));
-        return coherentwrite_info.iteration >= (this->run_ + 1) * this->iterations_ - 1;
-      }
-    catch (const ::CCM_DDS::InternalError &)
-      {
-      }
-    catch (const ::CCM_DDS::NonExistent &)
-      {
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::check_last: "
-                              "ERROR: Unexpected exception caught\n"));
-      }
-    return false;
-  }
-
-  void
-  Receiver_exec_i::check_iters (const char * test,
-                                const CoherentWriteTestSeq& coherentwrite_info_seq)
-  {
-    for (CORBA::ULong it = 0; it < coherentwrite_info_seq.length (); ++it)
-      {
-        if (coherentwrite_info_seq[it].iteration > this->last_iter_)
-          {
-            if (coherentwrite_info_seq[it].iteration == ++this->last_iter_)
-              {
-                ACE_DEBUG ((LM_DEBUG, "%C ALL OK: ", test));
-              }
-            else
-              {
-                ACE_ERROR ((LM_ERROR, "%C ALL ERROR: ", test));
-              }
-            ACE_DEBUG ((LM_DEBUG, "expected: <%u> - "
-                                  "received <%d>\n",
-                                  this->last_iter_,
-                                  coherentwrite_info_seq[it].iteration));
-            }
-      }
-    if (this->run_ < this->nr_runs () + 1)
-      {
-        ::CoherentWriteRestarter_var restarter =
-          this->ciao_context_->get_connection_writer_restart ();
-        if (!::CORBA::is_nil (restarter.in ()))
-          restarter->restart_write ();
-        else
-          ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_all - "
-                                "Unable to restart the writer "
-                                "since the restarter is nil.\n"));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "Finished: wait for shutdown\n"));
-      }
-  }
-
-  void
-  Receiver_exec_i::get_all (void)
-  {
-    try
-      {
-        ::CoherentWriteTestConnector::Getter_var getter =
-          this->ciao_context_->get_connection_info_out_fresh_data ();
-
-        if (::CORBA::is_nil (getter.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_all - "
-                                  "Unable to get samples since "
-                                  "getter is nil.\n"));
-            return;
-          }
-        DDS::Duration_t to;
-        to.sec = 5;
-        to.nanosec = 0;
-        getter->time_out (to);
-
-        CoherentWriteTestSeq coherentwrite_info_seq;
-        ::CCM_DDS::ReadInfoSeq readinfo_seq;
-        getter->get_many (coherentwrite_info_seq, readinfo_seq);
-
-        this->check_iters ("GET", coherentwrite_info_seq);
-      }
-    catch (const CCM_DDS::NonExistent& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: GET ALL: ")
-              ACE_TEXT ("caught NonExistent exception\n")));
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: GET ALL: ")
-              ACE_TEXT ("caught InternalError exception: retval <%u>\n"),
-              ex.error_code));
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: GET ALL: ");
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Receiver_exec_i::get_all : Exception caught\n")));
-      }
-  }
-
-  void
-  Receiver_exec_i::read_all (void)
-  {
-    try
-      {
-        ::CoherentWriteTestConnector::Reader_var reader =
-          this->ciao_context_->get_connection_info_out_data ();
-
-        if (::CORBA::is_nil (reader.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "Receiver_exec_i::read_all - "
-                                  "Unable to read since reader or "
-                                  "restarter is nil.\n"));
-            return;
-          }
-
-        CoherentWriteTestSeq coherentwrite_info_seq;
-        ::CCM_DDS::ReadInfoSeq readinfo_seq;
-        reader->read_all (coherentwrite_info_seq, readinfo_seq);
-
-        this->check_iters ("READ", coherentwrite_info_seq);
-      }
-    catch (const CCM_DDS::NonExistent& ex)
-      {
-        for (CORBA::ULong i = 0; i < ex.indexes.length (); ++i)
-          {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ ALL: ")
-                  ACE_TEXT ("caught expected exception: index <%u>\n"),
-                  ex.indexes[i]));
-          }
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ ALL: ")
-              ACE_TEXT ("caught InternalError exception: retval <%u>\n"),
-              ex.error_code));
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: READ ALL: ");
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Receiver_exec_i::read_all : Exception caught\n")));
-      }
-  }
-
-  void
-  Receiver_exec_i::start_read (CORBA::UShort run)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      read_action_Generator (*this, run),
-                      ::CORBA::INTERNAL ());
-    if (this->reactor ()->schedule_timer (
-                                          this->ticker_,
-                                          0,
-                                          ACE_Time_Value(1, 0),
-                                          ACE_Time_Value(1, 0)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, "Unable to schedule Timer\n"));
-      }
-  }
-
-  void
-  Receiver_exec_i::run (CORBA::UShort run)
-  {
-    if (this->ticker_)
-      {
-        this->reactor ()->cancel_timer (this->ticker_);
-        delete this->ticker_;
-        this->ticker_ = 0;
-      }
-    ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::run - "
-                          "Starting run number <%d>\n",
-                          run));
-    this->run_ = run;
-    if (this->run_ % 2 == 1)
-      this->read_all ();
-    else
-      this->get_all ();
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Receiver_exec_i::iterations (::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-  // Component attributes and port operations.
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ()))
-      {
-        info_out_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_out_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_out_status_.in ());
-  }
-
-  ::CCM_CoherentWriteStarter_ptr
-  Receiver_exec_i::get_reader_start (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_reader_start_.in ()))
-      {
-        reader_start_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          reader_start_exec_i (
-            this->ciao_context_.in (),
-            *this),
-            ::CCM_CoherentWriteStarter::_nil ());
-
-          this->ciao_reader_start_ = tmp;
-      }
-
-    return
-      ::CCM_CoherentWriteStarter::_duplicate (
-        this->ciao_reader_start_.in ());
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::nr_runs (void)
-  {
-    return this->nr_runs_;
-  }
-
-  void
-  Receiver_exec_i::nr_runs (
-    const ::CORBA::UShort nr_runs)
-  {
-    this->nr_runs_ = nr_runs;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::CoherentWrite_Test::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    if (this->ticker_)
-      {
-        this->reactor ()->cancel_timer (this->ticker_);
-        delete this->ticker_;
-        this->ticker_ = 0;
-      }
-    if (this->run_ == 1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: ")
-            ACE_TEXT ("Test did not run")
-            ACE_TEXT ("events.\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Finished coherent write test.\n")));
-      }
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CoherentWrite_Test_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.h
deleted file mode 100644
index ae74291ae77..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.h
+++ /dev/null
@@ -1,214 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_COHERENTWRITE_TEST_RECEIVER_EXEC_Q0HRJG_H_
-#define CIAO_COHERENTWRITE_TEST_RECEIVER_EXEC_Q0HRJG_H_
-
-#include /**/ "ace/pre.h"
-
-#include "CoherentWrite_Test_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_CoherentWrite_Test_Receiver_Impl
-{
-  class Receiver_exec_i;
-
-  /**
-   * Read action Generator
-   */
-  class read_action_Generator
-    : public ACE_Event_Handler
-  {
-  public:
-    read_action_Generator (Receiver_exec_i &callback,
-                           int run);
-
-    ~read_action_Generator ();
-
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    Receiver_exec_i &callback_;
-    int run_;
-  };
-
-
-  /**
-   * Provider Executor Implementation Class: info_out_status_exec_i
-   */
-
-  class info_out_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_status_exec_i (
-      ::CoherentWrite_Test::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::CoherentWrite_Test::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: reader_start_exec_i
-   */
-
-  class reader_start_exec_i
-    : public virtual ::CCM_CoherentWriteStarter,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    reader_start_exec_i (
-      ::CoherentWrite_Test::CCM_Receiver_Context_ptr ctx,
-      Receiver_exec_i &callback);
-
-    virtual ~reader_start_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CoherentWriteStarter. */
-
-    virtual
-    void set_reader_properties (::CORBA::UShort nr_iterations);
-
-    virtual
-    void start_read (::CORBA::UShort run);
-    //@}
-
-  private:
-    ::CoherentWrite_Test::CCM_Receiver_Context_var ciao_context_;
-    Receiver_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_status (void);
-
-    virtual ::CCM_CoherentWriteStarter_ptr
-    get_reader_start (void);
-
-    virtual ::CORBA::UShort nr_runs (void);
-
-    virtual void nr_runs (::CORBA::UShort nr_runs);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    bool check_last (void);
-    void start_read (CORBA::UShort run);
-    void run (CORBA::UShort run);
-
-    ::CORBA::UShort iterations (void);
-    void iterations (::CORBA::UShort iterations);
-    //@}
-
-  private:
-    ::CoherentWrite_Test::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_;
-    ::CCM_CoherentWriteStarter_var ciao_reader_start_;
-
-    ::CORBA::UShort nr_runs_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    CORBA::UShort   iterations_;
-    CORBA::UShort   run_;
-    CORBA::Long     last_iter_;
-
-    read_action_Generator *ticker_;
-
-    void check_iters (const char * test,
-                      const CoherentWriteTestSeq& coherentwrite_info_seq);
-
-    void get_all (void);
-    void read_all (void);
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CoherentWrite_Test_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/.gitignore b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/.gitignore
deleted file mode 100644
index ddc0ac818d7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/CoherentWrite_Test_SenderE.idl
-/Sender_exec_export.h
-/Sender_lem_stub_export.h
-/Sender_stub_export.h
-/Sender_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.idl
deleted file mode 100644
index 0e9cfb46df9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_COHERENT_WRITE_TEST_SENDER_IDL
-#define DDS_COHERENT_WRITE_TEST_SENDER_IDL
-
-#include "Connector/CoherentWrite_Test_Connector.idl"
-#include "Base/Reader_Starter.idl"
-
-module CoherentWrite_Test
-{
-  component Sender
-  {
-    port CoherentWriteTestConnector::DDS_Write info_write;
-
-    uses CoherentWriteStarter start_reader;
-    provides CoherentWriteRestarter restart_writer;
-
-    attribute unsigned short iterations;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.mpc
deleted file mode 100644
index bc87dee5517..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.mpc
+++ /dev/null
@@ -1,153 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p CoherentWrite_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(CoherentWrite_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += CoherentWrite_Test_Connector_idl_gen DDS_Starter_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I..
-
-  IDL_Files {
-    CoherentWrite_Test_Sender.idl
-  }
-}
-
-project(CoherentWrite_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += CoherentWrite_Test_Sender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    CoherentWrite_Test_SenderE.idl
-  }
-}
-
-project(CoherentWrite_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += CoherentWrite_Test_Sender_lem_gen CoherentWrite_Test_Sender_stub \
-           CoherentWrite_Test_Base_stub DDS_Coherent_Reader_Starter_stub
-  libs  += CoherentWrite_Test_Base_stub Sender_stub Reader_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CoherentWrite_Test_SenderEC.cpp
-  }
-
-  Header_Files {
-    CoherentWrite_Test_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    CoherentWrite_Test_SenderEC.inl
-  }
-}
-
-project(CoherentWrite_Test_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += CoherentWrite_Test_Sender_idl_gen CoherentWrite_Test_Base_stub \
-           CoherentWrite_Test_Connector_stub DDS_Coherent_Reader_Starter_stub \
-           DDS_Coherent_Reader_Starter_lem_stub
-  libs  += CoherentWrite_Test_Base_stub CoherentWrite_Test_Connector_stub \
-           Reader_Starter_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CoherentWrite_Test_SenderC.cpp
-  }
-
-  Header_Files {
-    CoherentWrite_Test_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    CoherentWrite_Test_SenderC.inl
-  }
-}
-
-project(CoherentWrite_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += CoherentWrite_Test_Sender_lem_stub CoherentWrite_Test_Sender_stub \
-             CoherentWrite_Test_Connector_lem_stub CoherentWrite_Test_Connector_stub \
-             DDS_Coherent_Reader_Starter_lem_stub
-  sharedname = Sender_exec
-  libs    += Sender_stub Sender_lem_stub CoherentWrite_Test_Base_stub \
-             CoherentWrite_Test_Connector_lem_stub CoherentWrite_Test_Connector_stub \
-             Reader_Starter_stub Reader_Starter_lem_stub \
-             Reader_Starter_lem_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CoherentWrite_Test_Sender_exec.cpp
-  }
-
-  Header_Files {
-    CoherentWrite_Test_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(CoherentWrite_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += CoherentWrite_Test_Base_stub  CoherentWrite_Test_Sender_lem_stub \
-                CoherentWrite_Test_Connector_stub \
-                CoherentWrite_Test_Connector_svnt CoherentWrite_Test_Connector_lem_stub \
-                DDS_Coherent_Reader_Starter_stub DDS_Coherent_Reader_Starter_svnt \
-                DDS_Coherent_Reader_Starter_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub CoherentWrite_Test_Base_stub \
-                CoherentWrite_Test_Connector_stub CoherentWrite_Test_Connector_svnt \
-                CoherentWrite_Test_Connector_lem_stub Reader_Starter_stub \
-                Reader_Starter_svnt Reader_Starter_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CoherentWrite_Test_SenderS.cpp
-    CoherentWrite_Test_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    CoherentWrite_Test_SenderS.h
-    CoherentWrite_Test_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.cpp
deleted file mode 100644
index 0c7f99cf703..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.cpp
+++ /dev/null
@@ -1,265 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "CoherentWrite_Test_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_CoherentWrite_Test_Sender_Impl
-{
-  /**
-   * WriteHandler
-   */
-
-  WriteHandler::WriteHandler (Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  WriteHandler::handle_exception (ACE_HANDLE)
-  {
-    this->callback_.start ();
-    return 0;
-  }
-
-  /**
-   * Facet Executor Implementation Class: restart_writer_exec_i
-   */
-
-  restart_writer_exec_i::restart_writer_exec_i (
-        ::CoherentWrite_Test::CCM_Sender_Context_ptr ctx,
-        Sender_exec_i &callback)
-    : ciao_context_ (
-        ::CoherentWrite_Test::CCM_Sender_Context::_duplicate (ctx))
-      , callback_ (callback)
-  {
-  }
-
-  restart_writer_exec_i::~restart_writer_exec_i (void)
-  {
-  }
-
-  // Operations from ::CoherentWriteRestarter
-
-  void
-  restart_writer_exec_i::restart_write (void)
-  {
-    this->callback_.restart ();
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : iterations_ (0)
-      , run_ (1)
-      , total_iter (0)
-      , wh_ (0)
-  {
-        ACE_NEW_THROW_EX (this->wh_,
-                          WriteHandler (*this),
-                          ::CORBA::INTERNAL ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->wh_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Sender_exec_i::restart (void)
-  {
-    ++this->run_;
-    delete this->wh_;
-    ACE_NEW_THROW_EX (this->wh_,
-                      WriteHandler (*this),
-                      ::CORBA::INTERNAL ());
-    this->reactor ()->notify (this->wh_);
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    ::CoherentWriteTestConnector::Writer_var writer =
-      this->ciao_context_->get_connection_info_write_data ();
-
-    CoherentWriteStarter_var starter =
-      this->ciao_context_->get_connection_start_reader ();
-    if (::CORBA::is_nil (starter.in ()) ||
-        ::CORBA::is_nil (writer.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Unable to start the reader\n")));
-        return;
-      }
-
-    writer->is_coherent_write (true);
-    starter->set_reader_properties (this->iterations_);
-
-    ACE_DEBUG ((LM_DEBUG, "Start run <%d> with <%u> iterations\n",
-                          this->run_,
-                          this->iterations ()));
-
-    CoherentWriteTestSeq write_many_seq (this->iterations_);
-    write_many_seq.length (this->iterations_);
-    for (int i = 1; i < this->iterations_ + 1; ++i)
-      {
-        CoherentWriteTest new_key;
-        new_key.symbol = CORBA::string_dup("KEY_1");
-        new_key.iteration = ++total_iter;
-        write_many_seq[i-1] = new_key;
-      }
-    writer->write_many (write_many_seq);
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Written <%u> keys uptil now\n"),
-                total_iter));
-    ACE_OS::sleep (2);
-    starter->start_read (this->run_);
-  }
-
-  // Component attributes and port operations.
-
-  ::CCM_CoherentWriteRestarter_ptr
-  Sender_exec_i::get_restart_writer (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_restart_writer_.in ()))
-      {
-        restart_writer_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          restart_writer_exec_i (
-            this->ciao_context_.in (),
-            *this),
-            ::CCM_CoherentWriteRestarter::_nil ());
-
-          this->ciao_restart_writer_ = tmp;
-      }
-
-    return
-      ::CCM_CoherentWriteRestarter::_duplicate (
-        this->ciao_restart_writer_.in ());
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::CoherentWrite_Test::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-    try
-      {
-        this->reactor ()->notify (this->wh_);
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("Exception caught:");
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: GET_CONNECTION_START_READER : Exception caught\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: GET_CONNECTION_START_READER : Unknown exception caught\n")));
-      }
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CoherentWrite_Test_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.h
deleted file mode 100644
index cca68b9c6f8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.h
+++ /dev/null
@@ -1,162 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_COHERENTWRITE_TEST_SENDER_EXEC_MVBFHL_H_
-#define CIAO_COHERENTWRITE_TEST_SENDER_EXEC_MVBFHL_H_
-
-#include /**/ "ace/pre.h"
-
-#include "CoherentWrite_Test_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_CoherentWrite_Test_Sender_Impl
-{
-
-  class Sender_exec_i;
-
-  /**
-   * WriteHandler
-   */
-
-  class WriteHandler :
-    public ACE_Event_Handler
-  {
-  public:
-    WriteHandler (Sender_exec_i &callback);
-    virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: restart_writer_exec_i
-   */
-
-  class restart_writer_exec_i
-    : public virtual ::CCM_CoherentWriteRestarter,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    restart_writer_exec_i (
-      ::CoherentWrite_Test::CCM_Sender_Context_ptr ctx,
-      Sender_exec_i &callback);
-    virtual ~restart_writer_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CoherentWriteRestarter. */
-
-    virtual
-    void restart_write (void);
-    //@}
-
-  private:
-    ::CoherentWrite_Test::CCM_Sender_Context_var ciao_context_;
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CCM_CoherentWriteRestarter_ptr
-    get_restart_writer (void);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void start (void);
-    void restart (void);
-
-    //@}
-
-  private:
-    ::CoherentWrite_Test::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::CCM_CoherentWriteRestarter_var ciao_restart_writer_;
-
-    ::CORBA::UShort iterations_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    CORBA::UShort run_;
-    CORBA::ULong total_iter;
-
-    WriteHandler *wh_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CoherentWrite_Test_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/CoherentWriter_Library.xml b/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/CoherentWriter_Library.xml
deleted file mode 100644
index 20d72e051a0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/CoherentWriter_Library.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-
-  <qos_profile name="CoherentWriterProfile">
-    <!-- QoS used to configure the data writer created in the example code -->
-    <datawriter_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-        <max_blocking_time>
-          <sec>10</sec>
-          <nanosec>0</nanosec>
-        </max_blocking_time>
-      </reliability>
-      <durability>
-        <kind>TRANSIENT_DURABILITY_QOS</kind>
-      </durability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-    </datawriter_qos>
-    <!-- QoS used to configure the data reader created in the example code -->
-    <datareader_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-      </reliability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-      <durability>
-        <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-      </durability>
-    </datareader_qos>
-    <publisher_qos>
-      <presentation>
-        <access_scope>INSTANCE_PRESENTATION_QOS</access_scope>
-        <coherent_access>true</coherent_access>
-        <ordered_access>false</ordered_access>
-      </presentation>
-    </publisher_qos>
-  </qos_profile>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/Plan.cdp
deleted file mode 100644
index f6e3a9e655d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/Plan.cdp
+++ /dev/null
@@ -1,462 +0,0 @@
-<!--  -->
-<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>CoherentWrite_Test_Depl_1</label>
-  <UUID>CoherentWrite_Test_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CoherentWrite_Test_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CoherentWrite_Test_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="CoherentWrite_Test_StateConnectorImplementation">
-    <name>CoherentWrite_Test_StateConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="CoherentWrite_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="CoherentWrite_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CoherentWriteTestConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CoherentWriteTestConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CoherentWrite_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CoherentWrite_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="CoherentWrite_Test_EventConnectorImplementation">
-    <name>CoherentWrite_Test_EventConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="CoherentWrite_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="CoherentWrite_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CoherentWriteTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CoherentWriteTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CoherentWrite_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CoherentWrite_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CoherentWrite_Test_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CoherentWrite_Test_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-    <configProperty>
-      <name>nr_runs</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="CoherentWrite_Test_SenderConnectorInstance">
-    <name>CoherentWrite_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="CoherentWrite_Test_EventConnectorImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CoherentWriter_Library#CoherentWriterProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CoherentWrite_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="CoherentWrite_Test_ReceiverConnectorInstance">
-    <name>CoherentWrite_Test_ReceiverConnector</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="CoherentWrite_Test_StateConnectorImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CoherentWriter_Library#CoherentWriterProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CoherentWrite_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>4</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>info_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CoherentWrite_Test_ReceiverConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_out_fresh_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_fresh_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_observer_fresh_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CoherentWrite_Test_ReceiverConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CoherentWrite_Test_SenderConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>reader_starter</name>
-    <internalEndpoint>
-      <portName>start_reader</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>reader_start</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>restart_writer</name>
-    <internalEndpoint>
-      <portName>writer_restart</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>restart_writer</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="CoherentWrite_Test_Connector_ExecArtifact">
-    <name>CoherentWrite_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>CoherentWrite_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="CoherentWrite_Test_Connector_SvntArtifact">
-    <name>CoherentWrite_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>CoherentWrite_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="CoherentWrite_Test_Connector_StubArtifact">
-    <name>CoherentWrite_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>CoherentWrite_Test_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index 7caa8986861..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-Description
-XML QoS Profile
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="CoherentWriter_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="CoherentWriterProfile" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>10</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/run_test.pl
deleted file mode 100755
index 638d55cd247..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 30 seconds to allow task to complete\n";
-sleep (30);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -s\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Base/Collocated_Base.idl b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Base/Collocated_Base.idl
deleted file mode 100644
index 9fe01e52f7f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Base/Collocated_Base.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef COLLACATED_BASE_
-#define COLLACATED_BASE_
-
-#pragma ndds typesupport "Base/Collocated_BaseSupport.h"
-#pragma opendds typesupport "Base/Collocated_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "CoPubSub::Test_msg"
-
-module CoPubSub {
-  struct Test_msg {
-    string hello;
-    long msgId;
-  };
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence <Test_msg> Test_msgSeq;
-#endif
-};
-
-
-#endif // COLLACATED_BASE_
-
diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Base/Collocated_Base.mpc b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Base/Collocated_Base.mpc
deleted file mode 100644
index d939fdc6348..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Base/Collocated_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (Collocated_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = Collocated_Base_stub
-  dynamicflags += COLLACATED_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=COLLACATED_BASE_STUB_Export \
-              -Wb,stub_export_include=Collocated_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    Collocated_Base.idl
-  }
-
-  opendds_ts_flags += --export=COLLACATED_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    Collocated_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.idl b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.idl
deleted file mode 100644
index 28225040991..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.idl
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef COLLACATED_CONNECTOR_
-#define COLLACATED_CONNECTOR_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Collocated_Base.idl"
-
-#pragma ciao lem "Connector/Collocated_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/Collocated_BaseTypeSupport.idl"
-#endif
-
-module CoPubSub {
-  module CCM_DDS::Typed <Test_msg, Test_msgSeq> Test_conn;
-};
-
-#endif // COLLACATED_CONNECTOR_
-
diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.mpc
deleted file mode 100644
index 8555202b1e6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.mpc
+++ /dev/null
@@ -1,144 +0,0 @@
-project(Collocated_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen Collocated_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=COLLACATED_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=Collocated_Connector_stub_export.h \
-              -Wb,skel_export_macro=COLLACATED_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=Collocated_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=COLLACATED_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=Collocated_Connector_svnt_export.h \
-              -Wb,conn_export_macro=COLLACATED_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Collocated_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Collocated_Connector.idl
-  }
-}
-
-project(Collocated_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += Collocated_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=COLLACATED_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=Collocated_Connector_lem_stub_export.h \
-              -SS -Gxhst -Sci \
-              -I ..
-
-  IDL_Files {
-    Collocated_ConnectorE.idl
-  }
-}
-
-project(Collocated_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += Collocated_Connector_lem_gen Collocated_Connector_stub Collocated_Base_stub
-  libs  += Collocated_Base_stub Collocated_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Collocated_Connector_lem_stub
-  dynamicflags += COLLACATED_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Collocated_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    Collocated_ConnectorEC.h
-    Collocated_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Collocated_ConnectorEC.inl
-  }
-}
-
-project(Collocated_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += Collocated_Connector_idl_gen Collocated_Base_stub
-  libs  += Collocated_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Collocated_Connector_stub
-  dynamicflags += COLLACATED_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Collocated_ConnectorC.cpp
-  }
-
-  Header_Files {
-    Collocated_ConnectorC.h
-    Collocated_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    Collocated_ConnectorC.inl
-  }
-}
-
-project(Collocated_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += Collocated_Connector_lem_stub Collocated_Connector_stub \
-             Collocated_Base_stub
-  sharedname = Collocated_Connector_exec
-  libs += Collocated_Connector_stub Collocated_Connector_lem_stub \
-          Collocated_Base_stub Collocated_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COLLACATED_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Collocated_Connector_conn.cpp
-  }
-
-  Header_Files {
-    Collocated_Connector_conn.h
-    Collocated_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(Collocated_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += Collocated_Connector_lem_stub \
-                Collocated_Connector_exec \
-                Collocated_Connector_stub
-  sharedname  = Collocated_Connector_svnt
-  libs       += Collocated_Connector_stub \
-                Collocated_Connector_lem_stub  \
-                Collocated_Base_stub \
-                Collocated_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COLLACATED_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Collocated_ConnectorS.cpp
-    Collocated_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    Collocated_ConnectorS.h
-    Collocated_Connector_svnt.h
-    Collocated_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component.idl b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component.idl
deleted file mode 100644
index 4471ce44144..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component.idl
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef PUBSUB_COMPONENT_
-#define PUBSUB_COMPONENT_
-
-#include <Components.idl>
-#include "Connector/Collocated_Connector.idl"
-
-module CoPubSub {
-  component PubSub_comp {
-    port Test_conn::DDS_Write TestPub;
-    port Test_conn::DDS_Listen TestSub;
-  };
-};
-
-#endif // PUBSUB_COMPONENT_
diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component.mpc b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component.mpc
deleted file mode 100644
index 1aa98495166..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component.mpc
+++ /dev/null
@@ -1,143 +0,0 @@
-project(PubSubComponent_idl_gen) : componentidldefaults, dds4ccm {
-  after += Collocated_Connector_idl_gen DDS_Starter_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=PUBSUB_COMPONENT_STUB_Export \
-              -Wb,stub_export_include=PubSub_Component_stub_export.h \
-              -Wb,skel_export_macro=PUBSUB_COMPONENT_SVNT_Export \
-              -Wb,skel_export_include=PubSub_Component_svnt_export.h \
-              -Wb,svnt_export_macro=PUBSUB_COMPONENT_SVNT_Export \
-              -Wb,svnt_export_include=PubSub_Component_svnt_export.h \
-              -Wb,exec_export_macro=PUBSUB_COMPONENT_EXEC_Export \
-              -Wb,exec_export_include=PubSub_Component_exec_export.h \
-              -I ..
-
-  IDL_Files {
-    PubSub_Component.idl
-  }
-}
-
-project(PubSubComponent_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += PubSubComponent_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=PUBSUB_COMPONENT_LEM_STUB_Export \
-              -Wb,stub_export_include=PubSubComponent_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    PubSub_ComponentE.idl
-  }
-}
-
-project(PubSubComponent_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += PubSubComponent_lem_gen PubSubComponent_stub \
-           Collocated_Base_stub
-  libs  += Collocated_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = PubSub_Component_lem_stub
-  dynamicflags += PUBSUB_COMPONENT_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PubSub_ComponentEC.cpp
-  }
-
-  Header_Files {
-    PubSub_ComponentEC.h
-    PubSub_Component_lem_stub_export.h
-  }
-
-  Inline_Files {
-    PubSub_ComponentEC.inl
-  }
-}
-
-project(PubSubComponent_stub) : ccm_stub, dds4ccm_base {
-  after += PubSubComponent_idl_gen Collocated_Base_stub \
-           Collocated_Connector_stub
-  libs  += Collocated_Base_stub Collocated_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = PubSub_Component_stub
-  dynamicflags += PUBSUB_COMPONENT_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PubSub_ComponentC.cpp
-  }
-
-  Header_Files {
-    PubSub_ComponentC.h
-    PubSub_Component_stub_export.h
-  }
-
-  Inline_Files {
-    PubSub_ComponentC.inl
-  }
-}
-
-project(PubSubComponent_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += PubSubComponent_lem_stub PubSubComponent_stub \
-             Collocated_Connector_lem_stub Collocated_Connector_stub
-  sharedname = PubSub_Component_exec
-  libs    += PubSub_Component_stub PubSub_Component_lem_stub Collocated_Base_stub \
-             Collocated_Connector_lem_stub Collocated_Connector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += PUBSUB_COMPONENT_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PubSub_Component_exec.cpp
-  }
-
-  Header_Files {
-    PubSub_Component_exec.h
-    PubSub_Component_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(PubSubComponent_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += Collocated_Base_stub  PubSubComponent_lem_stub \
-                Collocated_Connector_stub \
-                Collocated_Connector_svnt Collocated_Connector_lem_stub
-  sharedname  = PubSub_Component_svnt
-  libs       += PubSub_Component_stub PubSub_Component_lem_stub Collocated_Base_stub \
-                Collocated_Connector_stub Collocated_Connector_svnt \
-                Collocated_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += PUBSUB_COMPONENT_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PubSub_ComponentS.cpp
-    PubSub_Component_svnt.cpp
-  }
-
-  Header_Files {
-    PubSub_ComponentS.h
-    PubSub_Component_svnt.h
-    PubSub_Component_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component_exec.cpp
deleted file mode 100644
index 462f0ebbdf4..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component_exec.cpp
+++ /dev/null
@@ -1,301 +0,0 @@
-// -*- C++ -*-
-#include "PubSub_Component_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_CoPubSub_PubSub_comp_Impl
-{
-
-
-  /**
-   * WriteHandler
-   */
-  WriteHandler::WriteHandler (PubSub_comp_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  WriteHandler::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    return this->callback_.tick ();
-  }
-
-  /**
-   * Facet Executor Implementation Class: TestSub_data_listener_exec_i
-   */
-
-  TestSub_data_listener_exec_i::TestSub_data_listener_exec_i (
-        ::CoPubSub::CCM_PubSub_comp_Context_ptr ctx)
-    : ciao_context_ (
-        ::CoPubSub::CCM_PubSub_comp_Context::_duplicate (ctx))
-  {
-  }
-
-  TestSub_data_listener_exec_i::~TestSub_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CoPubSub::Test_conn::Listener
-
-  void
-  TestSub_data_listener_exec_i::on_one_data (
-    const ::CoPubSub::Test_msg & datum,
-    const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    ACE_DEBUG ((LM_DEBUG, "TestSub_data_listener_exec_i::on_one_data - "
-              "New data received: <%C> - <%d>\n",
-              datum.hello.in (), datum.msgId));
-  }
-
-  void
-  TestSub_data_listener_exec_i::on_many_data (
-    const ::CoPubSub::Test_msgSeq & /* data */,
-    const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: TestSub_status_exec_i
-   */
-
-  TestSub_status_exec_i::TestSub_status_exec_i (
-        ::CoPubSub::CCM_PubSub_comp_Context_ptr ctx)
-    : ciao_context_ (
-        ::CoPubSub::CCM_PubSub_comp_Context::_duplicate (ctx))
-  {
-  }
-
-  TestSub_status_exec_i::~TestSub_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  TestSub_status_exec_i::on_requested_deadline_missed (
-    ::DDS::DataReader_ptr /* the_reader */,
-    const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  TestSub_status_exec_i::on_sample_lost (
-    ::DDS::DataReader_ptr /* the_reader */,
-    const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Component Executor Implementation Class: PubSub_comp_exec_i
-   */
-
-  PubSub_comp_exec_i::PubSub_comp_exec_i (void)
-    : count_(-3)
-  {
-    ticker_ = new WriteHandler (*this);
-  }
-
-  PubSub_comp_exec_i::~PubSub_comp_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  PubSub_comp_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  int
-  PubSub_comp_exec_i::tick (void)
-  {
-    CoPubSub::Test_msg sample;
-    sample.hello = CORBA::string_dup("CoPubSub Test Message");
-    sample.msgId = ++this->count_;
-
-    // Reference to the writer interface for the DDS4CCM connector for msg type
-    ::CoPubSub::Test_conn::Writer_var writer;
-
-    writer = ciao_context_->get_connection_TestPub_data();
-
-    if (CORBA::is_nil(writer.in()))
-      {
-        ACE_ERROR ((LM_ERROR, "PubSub_comp_exec_i::tick - Writer seems nil.\n"));
-        return -1; // Don't reschedule timer
-      }
-
-    try
-      {
-          writer->write_one(sample, DDS::HANDLE_NIL);
-          ACE_DEBUG ((LM_DEBUG, "PubSub_comp_exec_i::tick - "
-                    "Sample has been written: <%C> - <%d>\n",
-                    sample.hello.in (), sample.msgId));
-      }
-    catch (const CCM_DDS::InternalError &) // catch "normal" exception
-      {
-        ACE_ERROR ((LM_ERROR, "PubSub_comp_exec_i::tick - "
-                  "ERROR: caught InternalError.\n"));
-
-        return -1; // Don't reschedule timer
-      }
-    catch (const CORBA::Exception & ex)
-      {
-        ex._tao_print_exception("PubSub_comp_exec_i::tick - ERROR: ");
-        return -1; // Don't reschedule timer
-      }
-    catch (...) // catch everything else. If this is called something is wrong
-      {
-        ACE_ERROR ((LM_ERROR, "PubSub_comp_exec_i::tick - "
-                  "ERROR: caught unknown exception.\n"));
-        return -1; // Don't reschedule timer
-      }
-    return 0;
-  }
-
-  // Component attributes and port operations.
-
-  ::CoPubSub::Test_conn::CCM_Listener_ptr
-  PubSub_comp_exec_i::get_TestSub_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_TestSub_data_listener_.in ()))
-      {
-        TestSub_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          TestSub_data_listener_exec_i (
-            this->ciao_context_.in ()),
-            ::CoPubSub::Test_conn::CCM_Listener::_nil ());
-
-          this->ciao_TestSub_data_listener_ = tmp;
-      }
-
-    return
-      ::CoPubSub::Test_conn::CCM_Listener::_duplicate (
-        this->ciao_TestSub_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  PubSub_comp_exec_i::get_TestSub_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_TestSub_status_.in ()))
-      {
-        TestSub_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          TestSub_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_TestSub_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_TestSub_status_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  PubSub_comp_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::CoPubSub::CCM_PubSub_comp_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  PubSub_comp_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  PubSub_comp_exec_i::ccm_activate (void)
-  {
-    CCM_DDS::DataListenerControl_var control =
-        ciao_context_->get_connection_TestSub_data_control();
-
-    if (! CORBA::is_nil(control.in()))
-      {
-          try
-            {
-              control->mode(CCM_DDS::ONE_BY_ONE);
-            }
-          catch (const CORBA::Exception & ex)
-            {
-              ex._tao_print_exception("PubSub_comp_exec_i::ccm_activate - ERROR: ");
-            }
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "PubSub_comp_exec_i::ccm_activate - "
-                  "ERROR: Data listener control seems nil.\n"));
-      }
-
-    ACE_Time_Value delay(3, 0);  // timer = 3 seconds + 0 usec = 3 sec
-    ACE_Time_Value repeat(3, 0); // timer = 3 seconds + 0 usec = 3 sec
-
-    if (this->reactor()->schedule_timer(this->ticker_,
-                                            0,
-                                            delay,
-                                            repeat) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, "PubSub_comp_exec_i::ccm_activate - "
-                  "ERROR: Unable to schedule timer.\n"));
-      }
-    else
-      ACE_DEBUG ((LM_DEBUG, "PubSub_comp_exec_i::ccm_activate - "
-                "Timer is up and running.\n"));
-  }
-
-  void
-  PubSub_comp_exec_i::ccm_passivate (void)
-  {
-    this->reactor()->cancel_timer(this->ticker_);
-  }
-
-  void
-  PubSub_comp_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" PUBSUB_COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CoPubSub_PubSub_comp_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      PubSub_comp_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component_exec.h b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component_exec.h
deleted file mode 100644
index 7391ebf1357..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component_exec.h
+++ /dev/null
@@ -1,169 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_PUBSUB_COMPONENT_EXEC_VCU9KR_H_
-#define CIAO_PUBSUB_COMPONENT_EXEC_VCU9KR_H_
-
-#include /**/ "ace/pre.h"
-
-#include "PubSub_ComponentEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "PubSub_Component_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_CoPubSub_PubSub_comp_Impl
-{
-  class PubSub_comp_exec_i;
-
-  /**
-   * WriteHandler
-   */
-  class WriteHandler :
-    public ACE_Event_Handler
-  {
-  public:
-    WriteHandler (PubSub_comp_exec_i &callback);
-    virtual int handle_timeout (const ACE_Time_Value &, const void *);
-  private:
-    PubSub_comp_exec_i &callback_;
-  };
-
-
-  /**
-   * Provider Executor Implementation Class: TestSub_data_listener_exec_i
-   */
-
-  class TestSub_data_listener_exec_i
-    : public virtual ::CoPubSub::Test_conn::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    TestSub_data_listener_exec_i (
-      ::CoPubSub::CCM_PubSub_comp_Context_ptr ctx);
-    virtual ~TestSub_data_listener_exec_i (void);
-
-    /** @name Operations and attributes from CoPubSub::Test_conn::Listener */
-    //@{
-
-    virtual
-    void on_one_data (
-      const ::CoPubSub::Test_msg & datum,
-      const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (
-      const ::CoPubSub::Test_msgSeq & data,
-      const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    ::CoPubSub::CCM_PubSub_comp_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: TestSub_status_exec_i
-   */
-
-  class TestSub_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    TestSub_status_exec_i (
-      ::CoPubSub::CCM_PubSub_comp_Context_ptr ctx);
-    virtual ~TestSub_status_exec_i (void);
-
-    /** @name Operations and attributes from CCM_DDS::PortStatusListener */
-    //@{
-
-    virtual
-    void on_requested_deadline_missed (
-      ::DDS::DataReader_ptr the_reader,
-      const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (
-      ::DDS::DataReader_ptr the_reader,
-      const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::CoPubSub::CCM_PubSub_comp_Context_var ciao_context_;
-  };
-
-  /**
-   * Component Executor Implementation Class: PubSub_comp_exec_i
-   */
-
-  class PubSub_comp_exec_i
-    : public virtual PubSub_comp_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    PubSub_comp_exec_i (void);
-    virtual ~PubSub_comp_exec_i (void);
-
-    /** @name Supported operations and attributes. */
-    //@{
-
-    //@}
-
-    /** @name Component attributes and port operations. */
-    //@{
-
-    virtual ::CoPubSub::Test_conn::CCM_Listener_ptr
-    get_TestSub_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_TestSub_status (void);
-    //@}
-
-    /** @name Operations from Components::SessionComponent. */
-    //@{
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    /** @name User defined public operations. */
-    //@{
-    int tick (void);
-
-    //@}
-
-  private:
-    ::CoPubSub::CCM_PubSub_comp_Context_var ciao_context_;
-
-    /** @name Component attributes. */
-    //@{
-    ::CoPubSub::Test_conn::CCM_Listener_var ciao_TestSub_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_TestSub_status_;
-    //@}
-
-    /** @name User defined members. */
-    //@{
-    WriteHandler *ticker_;
-
-    ::CORBA::Long count_;
-    //@}
-
-    /** @name User defined private operations. */
-    //@{
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" PUBSUB_COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CoPubSub_PubSub_comp_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component.idl b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component.idl
deleted file mode 100644
index 791e62294f0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component.idl
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef SUB_COMPONENT_
-#define SUB_COMPONENT_
-
-#include <Components.idl>
-#include "Connector/Collocated_Connector.idl"
-
-module CoPubSub {
-  component Sub_comp {
-    port Test_conn::DDS_Listen TestSub;
-  };
-};
-
-#endif // SUB_COMPONENT_
diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component.mpc b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component.mpc
deleted file mode 100644
index 371880ecee3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component.mpc
+++ /dev/null
@@ -1,143 +0,0 @@
-project(SubComponent_idl_gen) : componentidldefaults, dds4ccm {
-  after += Collocated_Connector_idl_gen DDS_Starter_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=PUBSUB_COMPONENT_STUB_Export \
-              -Wb,stub_export_include=Sub_Component_stub_export.h \
-              -Wb,skel_export_macro=PUBSUB_COMPONENT_SVNT_Export \
-              -Wb,skel_export_include=Sub_Component_svnt_export.h \
-              -Wb,svnt_export_macro=PUBSUB_COMPONENT_SVNT_Export \
-              -Wb,svnt_export_include=Sub_Component_svnt_export.h \
-              -Wb,exec_export_macro=PUBSUB_COMPONENT_EXEC_Export \
-              -Wb,exec_export_include=Sub_Component_exec_export.h \
-              -I ..
-
-  IDL_Files {
-    Sub_Component.idl
-  }
-}
-
-project(SubComponent_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += SubComponent_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=PUBSUB_COMPONENT_LEM_STUB_Export \
-              -Wb,stub_export_include=SubComponent_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    Sub_ComponentE.idl
-  }
-}
-
-project(SubComponent_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += SubComponent_lem_gen SubComponent_stub \
-           Collocated_Base_stub
-  libs  += Collocated_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sub_Component_lem_stub
-  dynamicflags += PUBSUB_COMPONENT_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Sub_ComponentEC.cpp
-  }
-
-  Header_Files {
-    Sub_ComponentEC.h
-    Sub_Component_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Sub_ComponentEC.inl
-  }
-}
-
-project(SubComponent_stub) : ccm_stub, dds4ccm_base {
-  after += SubComponent_idl_gen Collocated_Base_stub \
-           Collocated_Connector_stub
-  libs  += Collocated_Base_stub Collocated_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sub_Component_stub
-  dynamicflags += PUBSUB_COMPONENT_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Sub_ComponentC.cpp
-  }
-
-  Header_Files {
-    Sub_ComponentC.h
-    Sub_Component_stub_export.h
-  }
-
-  Inline_Files {
-    Sub_ComponentC.inl
-  }
-}
-
-project(SubComponent_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += SubComponent_lem_stub SubComponent_stub \
-             Collocated_Connector_lem_stub Collocated_Connector_stub
-  sharedname = Sub_Component_exec
-  libs    += Sub_Component_stub Sub_Component_lem_stub Collocated_Base_stub \
-             Collocated_Connector_lem_stub Collocated_Connector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += PUBSUB_COMPONENT_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Sub_Component_exec.cpp
-  }
-
-  Header_Files {
-    Sub_Component_exec.h
-    Sub_Component_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(SubComponent_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += Collocated_Base_stub  SubComponent_lem_stub \
-                Collocated_Connector_stub \
-                Collocated_Connector_svnt Collocated_Connector_lem_stub
-  sharedname  = Sub_Component_svnt
-  libs       += Sub_Component_stub Sub_Component_lem_stub Collocated_Base_stub \
-                Collocated_Connector_stub Collocated_Connector_svnt \
-                Collocated_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += PUBSUB_COMPONENT_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Sub_ComponentS.cpp
-    Sub_Component_svnt.cpp
-  }
-
-  Header_Files {
-    Sub_ComponentS.h
-    Sub_Component_svnt.h
-    Sub_Component_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component_exec.cpp
deleted file mode 100644
index a644b08d8cd..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component_exec.cpp
+++ /dev/null
@@ -1,199 +0,0 @@
-// -*- C++ -*-
-#include "Sub_Component_exec.h"
-
-namespace CIAO_CoPubSub_Sub_comp_Impl
-{
-
-  /**
-   * Facet Executor Implementation Class: TestSub_data_listener_exec_i
-   */
-
-  TestSub_data_listener_exec_i::TestSub_data_listener_exec_i (
-        ::CoPubSub::CCM_Sub_comp_Context_ptr ctx)
-    : ciao_context_ (
-        ::CoPubSub::CCM_Sub_comp_Context::_duplicate (ctx))
-  {
-  }
-
-  TestSub_data_listener_exec_i::~TestSub_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CoPubSub::Test_conn::Listener
-
-  void
-  TestSub_data_listener_exec_i::on_one_data (
-    const ::CoPubSub::Test_msg & datum,
-    const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    ACE_DEBUG ((LM_DEBUG, "TestSub_data_listener_exec_i::on_one_data - "
-              "New data received: <%C> - <%d>\n",
-              datum.hello.in (), datum.msgId));
-  }
-
-  void
-  TestSub_data_listener_exec_i::on_many_data (
-    const ::CoPubSub::Test_msgSeq & /* data */,
-    const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: TestSub_status_exec_i
-   */
-
-  TestSub_status_exec_i::TestSub_status_exec_i (
-        ::CoPubSub::CCM_Sub_comp_Context_ptr ctx)
-    : ciao_context_ (
-        ::CoPubSub::CCM_Sub_comp_Context::_duplicate (ctx))
-  {
-  }
-
-  TestSub_status_exec_i::~TestSub_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  TestSub_status_exec_i::on_requested_deadline_missed (
-    ::DDS::DataReader_ptr /* the_reader */,
-    const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  TestSub_status_exec_i::on_sample_lost (
-    ::DDS::DataReader_ptr /* the_reader */,
-    const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Component Executor Implementation Class: Sub_comp_exec_i
-   */
-
-  Sub_comp_exec_i::Sub_comp_exec_i (void){
-  }
-
-  Sub_comp_exec_i::~Sub_comp_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-
-  // Component attributes and port operations.
-
-  ::CoPubSub::Test_conn::CCM_Listener_ptr
-  Sub_comp_exec_i::get_TestSub_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_TestSub_data_listener_.in ()))
-      {
-        TestSub_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          TestSub_data_listener_exec_i (
-            this->ciao_context_.in ()),
-            ::CoPubSub::Test_conn::CCM_Listener::_nil ());
-
-          this->ciao_TestSub_data_listener_ = tmp;
-      }
-
-    return
-      ::CoPubSub::Test_conn::CCM_Listener::_duplicate (
-        this->ciao_TestSub_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Sub_comp_exec_i::get_TestSub_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_TestSub_status_.in ()))
-      {
-        TestSub_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          TestSub_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_TestSub_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_TestSub_status_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sub_comp_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::CoPubSub::CCM_Sub_comp_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sub_comp_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sub_comp_exec_i::ccm_activate (void)
-  {
-    CCM_DDS::DataListenerControl_var control =
-      ciao_context_->get_connection_TestSub_data_control();
-
-    if (! CORBA::is_nil(control.in()))
-      {
-         try
-          {
-            control->mode(CCM_DDS::ONE_BY_ONE);
-          }
-         catch (const CORBA::Exception & ex)
-            {
-              ex._tao_print_exception("Sub_comp_exec_i::ccm_activate - ERROR: ");
-            }
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "Sub_comp_exec_i::ccm_activate - "
-                  "ERROR: Listener control is nil.\n"));
-      }
-  }
-
-  void
-  Sub_comp_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sub_comp_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" PUBSUB_COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CoPubSub_Sub_comp_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sub_comp_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component_exec.h b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component_exec.h
deleted file mode 100644
index 4b6c45083f7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component_exec.h
+++ /dev/null
@@ -1,148 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_SUB_COMPONENT_EXEC_SXAYYT_H_
-#define CIAO_SUB_COMPONENT_EXEC_SXAYYT_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Sub_ComponentEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sub_Component_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_CoPubSub_Sub_comp_Impl
-{
-
-  /**
-   * Provider Executor Implementation Class: TestSub_data_listener_exec_i
-   */
-
-  class TestSub_data_listener_exec_i
-    : public virtual ::CoPubSub::Test_conn::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    TestSub_data_listener_exec_i (
-      ::CoPubSub::CCM_Sub_comp_Context_ptr ctx);
-    virtual ~TestSub_data_listener_exec_i (void);
-
-    /** @name Operations and attributes from CoPubSub::Test_conn::Listener */
-    //@{
-
-    virtual
-    void on_one_data (
-      const ::CoPubSub::Test_msg & datum,
-      const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (
-      const ::CoPubSub::Test_msgSeq & data,
-      const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    ::CoPubSub::CCM_Sub_comp_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: TestSub_status_exec_i
-   */
-
-  class TestSub_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    TestSub_status_exec_i (
-      ::CoPubSub::CCM_Sub_comp_Context_ptr ctx);
-    virtual ~TestSub_status_exec_i (void);
-
-    /** @name Operations and attributes from CCM_DDS::PortStatusListener */
-    //@{
-
-    virtual
-    void on_requested_deadline_missed (
-      ::DDS::DataReader_ptr the_reader,
-      const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (
-      ::DDS::DataReader_ptr the_reader,
-      const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::CoPubSub::CCM_Sub_comp_Context_var ciao_context_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sub_comp_exec_i
-   */
-
-  class Sub_comp_exec_i
-    : public virtual Sub_comp_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sub_comp_exec_i (void);
-    virtual ~Sub_comp_exec_i (void);
-
-    /** @name Supported operations and attributes. */
-    //@{
-
-    //@}
-
-    /** @name Component attributes and port operations. */
-    //@{
-
-    virtual ::CoPubSub::Test_conn::CCM_Listener_ptr
-    get_TestSub_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_TestSub_status (void);
-    //@}
-
-    /** @name Operations from Components::SessionComponent. */
-    //@{
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    /** @name User defined public operations. */
-    //@{
-
-    //@}
-
-  private:
-    ::CoPubSub::CCM_Sub_comp_Context_var ciao_context_;
-
-    /** @name Component attributes. */
-    //@{
-    ::CoPubSub::Test_conn::CCM_Listener_var ciao_TestSub_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_TestSub_status_;
-    //@}
-
-    /** @name User defined members. */
-    //@{
-
-    //@}
-
-    /** @name User defined private operations. */
-    //@{
-
-    //@}
-  };
-
-  extern "C" PUBSUB_COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CoPubSub_Sub_comp_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/descriptors/Plan.cdp
deleted file mode 100644
index c8b624d3b41..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/descriptors/Plan.cdp
+++ /dev/null
@@ -1,654 +0,0 @@
-<!--  -->
-<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>CollocatedDepl_1</label>
-  <UUID>CollocatedDepl_1</UUID>
-
-  <implementation xmi:id="SubComponentImplementation">
-    <name>SubComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sub_Component_ExecArtifact" />
-    <artifact xmi:idref="Sub_Component_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CoPubSub_Sub_comp_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CoPubSub_Sub_comp_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sub_Component_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sub_Component_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="PubSubComponentImplementation">
-    <name>PubSubComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="PubSub_Component_ExecArtifact" />
-    <artifact xmi:idref="PubSub_Component_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CoPubSub_PubSub_comp_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CoPubSub_PubSub_comp_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PubSub_Component_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PubSub_Component_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="CollocatedConnectorComponentImplementation">
-    <name>CollocatedConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Collocated_Connector_ExecArtifact" />
-    <artifact xmi:idref="Collocated_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CoPubSub_Test_conn_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CoPubSub_Test_conn_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Collocated_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Collocated_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <!-- SubComponent1 and its connector -->
-  <instance xmi:id="SubComponentInstance1">
-    <name>SubComponent1</name>
-    <node>Node</node>
-    <source/>
-    <implementation xmi:idref="SubComponentImplementation" />
-  </instance>
-
-  <instance xmi:id="SubComponent1Connector">
-    <name>SubComponent1Connector</name>
-    <node>Node</node>
-    <source/>
-    <implementation xmi:idref="CollocatedConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CollocatedTopic</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>push_consumer_filter</name>
-      <value>
-        <type>
-          <kind>tk_struct</kind>
-          <struct>
-            <name>QueryFilter</name>
-            <typeId>IDL:CCM_DDS/QueryFilter:1.0</typeId>
-            <member>
-              <name>expression</name>
-              <type>
-                <kind>tk_string</kind>
-              </type>
-            </member>
-            <member>
-              <name>parameters</name>
-              <type>
-                <kind>tk_sequence</kind>
-                <sequence>
-                  <elementType>
-                    <kind>tk_string</kind>
-                  </elementType>
-                </sequence>
-              </type>
-            </member>
-          </struct>
-        </type>
-        <value>
-          <member>
-            <name>expression</name>
-            <value>
-              <string>msgId &lt; %0</string>
-            </value>
-          </member>
-          <member>
-            <name>parameters</name>
-            <value>
-              <element>
-                <string>1</string>
-              </element>
-            </value>
-          </member>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <!-- SubComponent2 and its connector -->
-  <instance xmi:id="SubComponentInstance2">
-    <name>SubComponent2</name>
-    <node>Node</node>
-    <source/>
-    <implementation xmi:idref="SubComponentImplementation" />
-  </instance>
-
-  <instance xmi:id="SubComponent2Connector">
-    <name>SubComponent2Connector</name>
-    <node>Node</node>
-    <source/>
-    <implementation xmi:idref="CollocatedConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CollocatedTopic</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>push_consumer_filter</name>
-      <value>
-        <type>
-          <kind>tk_struct</kind>
-          <struct>
-            <name>QueryFilter</name>
-            <typeId>IDL:CCM_DDS/QueryFilter:1.0</typeId>
-            <member>
-              <name>expression</name>
-              <type>
-                <kind>tk_string</kind>
-              </type>
-            </member>
-            <member>
-              <name>parameters</name>
-              <type>
-                <kind>tk_sequence</kind>
-                <sequence>
-                  <elementType>
-                    <kind>tk_string</kind>
-                  </elementType>
-                </sequence>
-              </type>
-            </member>
-          </struct>
-        </type>
-        <value>
-          <member>
-            <name>expression</name>
-            <value>
-              <string>msgId &lt; %0</string>
-            </value>
-          </member>
-          <member>
-            <name>parameters</name>
-            <value>
-              <element>
-                <string>1</string>
-              </element>
-            </value>
-          </member>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <!-- PubSubComponent and its connector -->
-  <instance xmi:id="PubSubComponentInstance">
-    <name>PubSubComponent</name>
-    <node>Node</node>
-    <source/>
-    <implementation xmi:idref="PubSubComponentImplementation" />
-  </instance>
-
-  <instance xmi:id="PubSubComponentConnector">
-    <name>PubSubComponentConnector</name>
-    <node>Node</node>
-    <source/>
-    <implementation xmi:idref="CollocatedConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CollocatedTopic</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>push_consumer_filter</name>
-      <value>
-        <type>
-          <kind>tk_struct</kind>
-          <struct>
-            <name>QueryFilter</name>
-            <typeId>IDL:CCM_DDS/QueryFilter:1.0</typeId>
-            <member>
-              <name>expression</name>
-              <type>
-                <kind>tk_string</kind>
-              </type>
-            </member>
-            <member>
-              <name>parameters</name>
-              <type>
-                <kind>tk_sequence</kind>
-                <sequence>
-                  <elementType>
-                    <kind>tk_string</kind>
-                  </elementType>
-                </sequence>
-              </type>
-            </member>
-          </struct>
-        </type>
-        <value>
-          <member>
-            <name>expression</name>
-            <value>
-              <string>msgId &lt; %0</string>
-            </value>
-          </member>
-          <member>
-            <name>parameters</name>
-            <value>
-              <element>
-                <string>1</string>
-              </element>
-            </value>
-          </member>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <!-- pubsub writer connection -->
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>TestPub_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="PubSubComponentInstance"/>
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="PubSubComponentConnector"/>
-    </internalEndpoint>
-  </connection>
-
-  <!-- pub sub listener connections -->
-  <connection>
-    <name>pubsub_listener_filter</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>TestSub_filter_config</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="PubSubComponentInstance"/>
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_filter_config</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="PubSubComponentConnector"/>
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>pubsub_data_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>TestSub_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="PubSubComponentInstance"/>
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="PubSubComponentConnector"/>
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>pubsub_listener_control</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>TestSub_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="PubSubComponentInstance"/>
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="PubSubComponentConnector"/>
-    </internalEndpoint>
-  </connection>
-
-  <!-- sub1 listener connections -->
-  <connection>
-    <name>sub1_listener_filter</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>TestSub_filter_config</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SubComponentInstance1"/>
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_filter_config</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SubComponent1Connector"/>
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>sub1_data_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>TestSub_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SubComponentInstance1"/>
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SubComponent1Connector"/>
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>sub1_listener_control</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>TestSub_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SubComponentInstance1"/>
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SubComponent1Connector"/>
-    </internalEndpoint>
-  </connection>
-
-  <!-- sub2 listener connections -->
-  <connection>
-    <name>sub2_listener_filter</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>TestSub_filter_config</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SubComponentInstance2"/>
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_filter_config</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SubComponent2Connector"/>
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>sub2_data_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>TestSub_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SubComponentInstance2"/>
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SubComponent2Connector"/>
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>sub2_listener_control</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>TestSub_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SubComponentInstance2"/>
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SubComponent2Connector"/>
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Collocated_Connector_ExecArtifact">
-    <name>Collocated_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>Collocated_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Collocated_Connector_SvntArtifact">
-    <name>Collocated_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>Collocated_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Collocated_Connector_StubArtifact">
-    <name>Collocated_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>Collocated_Connector_stub</location>
-  </artifact>
-
-  <artifact xmi:id="Sub_Component_ExecArtifact">
-    <name>Sub_Component_exec</name>
-    <source/>
-    <node/>
-    <location>Sub_Component_exec</location>
-  </artifact>
-  <artifact xmi:id="Sub_Component_SvntArtifact">
-    <name>Sub_Component_svnt</name>
-    <source/>
-    <node/>
-    <location>Sub_Component_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sub_Component_StubArtifact">
-    <name>Sub_Component_stub</name>
-    <source/>
-    <node/>
-    <location>Sub_Component_stub</location>
-  </artifact>
-
-  <artifact xmi:id="PubSub_Component_ExecArtifact">
-    <name>PubSub_Component_exec</name>
-    <source/>
-    <node/>
-    <location>PubSub_Component_exec</location>
-  </artifact>
-  <artifact xmi:id="PubSub_Component_SvntArtifact">
-    <name>PubSub_Component_svnt</name>
-    <source/>
-    <node/>
-    <location>PubSub_Component_svnt</location>
-  </artifact>
-  <artifact xmi:id="PubSub_Component_StubArtifact">
-    <name>PubSub_Component_stub</name>
-    <source/>
-    <node/>
-    <location>PubSub_Component_stub</location>
-  </artifact>
-
-  <localityConstraint>
-    <constraint>SameProcess</constraint>
-    <constrainedInstance xmi:idref="PubSubComponentInstance"/>
-    <constrainedInstance xmi:idref="PubSubComponentConnector"/>
-  </localityConstraint>
-
-  <localityConstraint>
-    <constraint>SameProcess</constraint>
-    <constrainedInstance xmi:idref="SubComponentInstance1"/>
-    <constrainedInstance xmi:idref="SubComponent1Connector"/>
-    <constrainedInstance xmi:idref="SubComponentInstance2"/>
-    <constrainedInstance xmi:idref="SubComponent2Connector"/>
-  </localityConstraint>
-
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/descriptors/run_test.pl
deleted file mode 100755
index 255dca278d1..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 1;
-@ports = ( 60001 );
-@iorbases = ( "NodeApp.ior" );
-@iorfiles = 0;
-@nodenames = ( "Node" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 30 seconds to allow task to complete\n";
-sleep (30);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/.gitignore b/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/.gitignore
deleted file mode 100644
index e600c6c5059..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-/Connector
-/DiffDir.cxx
-/DiffDir.h
-/DiffDirPlugin.cxx
-/DiffDirPlugin.h
-/DiffDirSupport.cxx
-/DiffDirSupport.h
-/DiffDir_Common_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.idl b/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.idl
deleted file mode 100644
index c860f65027c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.idl
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef DIFFDIR_IDL
-#define DIFFDIR_IDL
-
-#pragma ndds typesupport "DiffDirSupport.h"
-#pragma opendds typesupport "DiffDirTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "DiffDirType"
-#pragma DCPS_DATA_KEY "DiffDirType value"
-
-struct DiffDirType {
-  string value; //@key
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<DiffDirType> DiffDirTypeSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpb b/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpb
deleted file mode 100644
index 0d50c8147b0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-feature (dds4ccm_ndds) {
-  dds_ts_flags += -d Connector
-}
-
-feature (dds4ccm_opendds) {
-  dds_ts_flags += -o Connector
-}
diff --git a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpc b/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpc
deleted file mode 100644
index 615ff24a7d2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpc
+++ /dev/null
@@ -1,26 +0,0 @@
-project (DiffDir_stub) : taoidldefaults, \
-                         dds4ccm_ts_default, DiffDir {
-  sharedname = DiffDir_stub
-  dynamicflags += DIFFDIR_COMMON_STUB_BUILD_DLL
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=DIFFDIR_COMMON_STUB_Export \
-              -Wb,stub_export_include=DiffDir_Common_stub_export.h \
-              -o Connector
-
-  IDL_Files {
-    idlflags += -Gxhst
-    DiffDir.idl
-    gendir = Connector
-  }
-
-  opendds_ts_flags += --export=DIFFDIR_COMMON_STUB_Export
-
-  DDSGenerator_Files {
-    DiffDir.idl
-    gendir = Connector
-  }
-
-  Source_Files {
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.idl b/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.idl
deleted file mode 100644
index f4a400ab732..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.idl
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef DIFFDIR_CONNECTOR_IDL
-#define DIFFDIR_CONNECTOR_IDL
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "DiffDir.idl"
-
-#pragma ciao lem "DiffDir_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Connector/DiffDirTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::DiffDirType, ::DiffDirTypeSeq> DiffDirConnector;
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.mpc
deleted file mode 100644
index e3cefe05fad..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.mpc
+++ /dev/null
@@ -1,135 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -b dds4ccm_base DiffDir_Connector"
-
-project(DiffDir_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DiffDir_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=DIFFDIR_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=DiffDir_Connector_stub_export.h \
-              -Wb,skel_export_macro=DIFFDIR_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=DiffDir_Connector_svnt_export.h \
-              -Wb,conn_export_macro=DIFFDIR_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=DiffDir_Connector_conn_export.h \
-              -Gxhex -Gxhsk -Gxhst \
-              -o Connector
-  IDL_Files {
-    DiffDir_Connector.idl
-    gendir = Connector
-  }
-}
-
-project(DiffDir_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  after    += DiffDir_Connector_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=DIFFDIR_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=DiffDir_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -o Connector
-
-  IDL_Files {
-    Connector/DiffDir_ConnectorE.idl
-    gendir = Connector
-  }
-}
-
-project(DiffDir_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub  {
-  after    += DiffDir_Connector_lem_gen DiffDir_Connector_stub
-  libs     += DiffDir_Connector_stub
-  includes += .
-
-  sharedname = DiffDir_Connector_lem_stub
-  dynamicflags += DIFFDIR_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector/DiffDir_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    Connector/DiffDir_ConnectorEC.h
-    Connector/DiffDir_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Connector/DiffDir_ConnectorEC.inl
-  }
-}
-
-project(DiffDir_Connector_stub) : ccm_stub, dds4ccm_base {
-  after    += DiffDir_Connector_idl_gen DiffDir_stub
-  libs     += DiffDir_stub
-  includes += .
-
-  sharedname = DiffDir_Connector_stub
-  dynamicflags += DIFFDIR_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector/DiffDir_ConnectorC.cpp
-  }
-
-  Header_Files {
-    Connector/DiffDir_ConnectorC.h
-    Connector/DiffDir_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    Connector/DiffDir_ConnectorC.inl
-  }
-}
-
-project(DiffDir_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after    += DiffDir_Connector_lem_stub DiffDir_Connector_stub
-  sharedname = DiffDir_Connector_exec
-  libs     += DiffDir_Connector_stub DiffDir_Connector_lem_stub DiffDir_stub
-  includes += .
-
-  dynamicflags += DIFFDIR_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector/DiffDir_Connector_conn.cpp
-  }
-
-  Header_Files {
-    Connector/DiffDir_Connector_conn.h
-    Connector/DiffDir_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DiffDir_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DiffDir_Connector_lem_stub
-  sharedname  = DiffDir_Connector_svnt
-  libs       += DiffDir_Connector_stub DiffDir_Connector_lem_stub DiffDir_stub
-  includes   += .
-
-  dynamicflags += DIFFDIR_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector/DiffDir_ConnectorS.cpp
-    Connector/DiffDir_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    Connector/DiffDir_ConnectorS.h
-    Connector/DiffDir_Connector_svnt.h
-    Connector/DiffDir_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.idl
deleted file mode 100644
index db1caed274a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.idl
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * @file CFT_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef CONTENTFILTEREDTOPIC_TEST_BASE_IDL
-#define CONTENTFILTEREDTOPIC_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/CFT_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/CFT_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "CFTTwoDimensionalTest"
-#pragma DCPS_DATA_KEY "CFTTwoDimensionalTest symbol"
-
-struct CFTTwoDimensionalTest {
-  string symbol; //@key
-  long x;
-  long y;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<CFTTwoDimensionalTest> CFTTwoDimensionalTestSeq;
-#endif
-
-#pragma DCPS_DATA_TYPE "CFTThreeDimensionalTest"
-#pragma DCPS_DATA_KEY "CFTThreeDimensionalTest symbol"
-
-struct CFTThreeDimensionalTest {
-  string symbol; //@key
-  long x;
-  long y;
-  long z;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<CFTThreeDimensionalTest> CFTThreeDimensionalTestSeq;
-#endif
-
-#endif /* CONTENTFILTEREDTOPIC_TEST_BASE_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.mpc
deleted file mode 100644
index 072bebbed80..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (CFT_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = CFT_Test_Base_stub
-  dynamicflags += CONTENTFILTEREDTOPIC_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=CONTENTFILTEREDTOPIC_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=CFT_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    CFT_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=CONTENTFILTEREDTOPIC_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    CFT_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component.idl
deleted file mode 100644
index 332b0c5eb7c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component.idl
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef COMPONENT_IDL
-#define COMPONENT_IDL
-
-#include "Connector/CFT_Test_Connector.idl"
-
-module CFT_Test
-{
-  component CFTTestComponent
-  {
-    port CFTTwoDimensionalTestConn::DDS_Get two_dim_get;
-    port CFTThreeDimensionalTestConn::DDS_Get three_dim_get;
-    port CFTThreeDimensionalTestConn::DDS_Read three_dim_read;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component.mpc
deleted file mode 100644
index c932730b398..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-project(CFT_Test_Component_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += CFT_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=COMPONENT_STUB_Export \
-              -Wb,stub_export_include=Component_stub_export.h \
-              -Wb,skel_export_macro=COMPONENT_SVNT_Export \
-              -Wb,skel_export_include=Component_svnt_export.h \
-              -Wb,svnt_export_macro=COMPONENT_SVNT_Export \
-              -Wb,svnt_export_include=Component_svnt_export.h \
-              -Wb,exec_export_macro=COMPONENT_EXEC_Export \
-              -Wb,exec_export_include=Component_exec_export.h -I..
-
-  IDL_Files {
-    CFT_Test_Component.idl
-  }
-}
-
-project(CFT_Test_Component_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += CFT_Test_Component_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=COMPONENT_LEM_STUB_Export \
-              -Wb,stub_export_include=Component_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    CFT_Test_ComponentE.idl
-  }
-}
-
-project(CFT_Test_Component_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += CFT_Test_Component_lem_gen CFT_Test_Component_stub  \
-           CFT_Test_Connector_stub CFT_Test_Base_stub
-  libs  +=  Component_stub CFT_Test_Connector_stub \
-            CFT_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Component_lem_stub
-  dynamicflags += COMPONENT_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFT_Test_ComponentEC.cpp
-  }
-
-  Header_Files {
-    CFT_Test_ComponentEC.h
-    Component_lem_stub_export.h
-  }
-
-  Inline_Files {
-    CFT_Test_ComponentEC.inl
-  }
-}
-
-project(CFT_Test_Component_stub) : ccm_stub, dds4ccm_base {
-  after += CFT_Test_Component_idl_gen  CFT_Test_Connector_stub \
-           CFT_Test_Base_stub CFT_Test_Connector_lem_gen
-  libs  += CFT_Test_Connector_stub CFT_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Component_stub
-  dynamicflags += COMPONENT_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFT_Test_ComponentC.cpp
-  }
-
-  Header_Files {
-    CFT_Test_ComponentC.h
-    Component_stub_export.h
-  }
-
-  Inline_Files {
-    CFT_Test_ComponentC.inl
-  }
-}
-
-project(CFT_Test_Component_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += CFT_Test_Component_lem_stub CFT_Test_Component_stub \
-             CFT_Test_Base_stub CFT_Test_Connector_stub \
-             CFT_Test_Connector_lem_stub 
-  sharedname = Component_exec
-  libs += Component_stub Component_lem_stub CFT_Test_Base_stub \
-          CFT_Test_Connector_stub CFT_Test_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COMPONENT_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFT_Test_Component_exec.cpp
-  }
-
-  Header_Files {
-    CFT_Test_Component_exec.h
-    Component_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(CFT_Test_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   CFT_Test_Component_lem_stub CFT_Test_Base_stub \
-                  CFT_Test_Connector_stub CFT_Test_Connector_svnt \
-                  CFT_Test_Component_exec CFT_Test_Connector_lem_stub 
-  sharedname  = Component_svnt
-  libs       += Component_stub Component_lem_stub CFT_Test_Base_stub \
-                CFT_Test_Connector_stub CFT_Test_Connector_svnt \
-                Component_exec CFT_Test_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COMPONENT_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFT_Test_ComponentS.cpp
-    CFT_Test_Component_svnt.cpp
-  }
-
-  Header_Files {
-    CFT_Test_ComponentS.h
-    CFT_Test_Component_svnt.h
-    Component_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component_exec.cpp
deleted file mode 100644
index 223ca8b96b3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component_exec.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-// -*- C++ -*-
-#include "CFT_Test_Component_exec.h"
-
-namespace CIAO_CFT_Test_CFTTestComponent_Impl
-{
-  //============================================================
-  // Component_exec_i
-  //============================================================
-  Component_exec_i::Component_exec_i (void)
-  {
-  }
-
-  Component_exec_i::~Component_exec_i (void)
-  {
-  }
-
-  // Operations from Components::SessionComponent.
-  void
-  Component_exec_i::set_session_context (::Components::SessionContext_ptr ctx)
-  {
-    this->context_ = ::CFT_Test::CCM_CFTTestComponent_Context::_narrow (ctx);
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Component_exec_i::get_two_dim_get_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Component_exec_i::get_three_dim_get_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Component_exec_i::get_three_dim_read_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  void
-  Component_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Component_exec_i::ccm_activate (void)
-  {
-    // if deployment succeeds, this test succeeds
-    ACE_DEBUG ((LM_DEBUG, "Component_exec_i::ccm_activate - "
-                          "OK : Test succeeded. Two "
-                          "ContentfilteredTopics can "
-                          "be created.\n"));
-  }
-
-  void
-  Component_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Component_exec_i::ccm_remove (void)
-  {
-  }
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CFTTest_Component_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Component_exec_i);
-
-    return retval;
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component_exec.h b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component_exec.h
deleted file mode 100644
index b6349f7f40a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component_exec.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_COMPONENT_EXEC_H_
-#define CIAO_COMPONENT_EXEC_H_
-
-#include "CFT_Test_ComponentEC.h"
-
-#include /**/ "Component_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-namespace CIAO_CFT_Test_CFTTestComponent_Impl
-{
-  //============================================================
-  // Component_exec_i
-  //============================================================
-  class COMPONENT_EXEC_Export Component_exec_i
-    : public virtual CFTTestComponent_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Component_exec_i (void);
-    virtual ~Component_exec_i (void);
-
-    // Operations from Components::SessionComponent.
-    virtual void
-    set_session_context (
-      ::Components::SessionContext_ptr ctx);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_two_dim_get_status (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_three_dim_get_status (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_three_dim_read_status (void);
-
-    virtual void configuration_complete (void);
-
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-
-  private:
-    ::CFT_Test::CCM_CFTTestComponent_Context_var context_;
-  };
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CFTTest_Component_Impl (void);
-}
-
-#endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.idl
deleted file mode 100644
index df556d08cab..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file CFT_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef CONTENTFILTEREDTOPIC_TEST_CONNECTOR_IDL_
-#define CONTENTFILTEREDTOPIC_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/CFT_Test_Base.idl"
-
-#pragma ciao lem "Connector/CFT_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/CFT_Test_BaseTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::CFTTwoDimensionalTest, ::CFTTwoDimensionalTestSeq> CFTTwoDimensionalTestConn;
-module ::CCM_DDS::Typed < ::CFTThreeDimensionalTest, ::CFTThreeDimensionalTestSeq> CFTThreeDimensionalTestConn;
-#endif /* CONTENTFILTEREDTOPIC_TEST_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.mpc
deleted file mode 100644
index 0d248c5b0be..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p CFT_Test_Base -l .. -o ../lib -u DDS CFT_Test_Connector"
-
-project(CFT_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen CFT_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=CONTENTFILTEREDTOPIC_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=CFT_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=CONTENTFILTEREDTOPIC_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=CFT_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=CONTENTFILTEREDTOPIC_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=CFT_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=CONTENTFILTEREDTOPIC_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=CFT_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    CFT_Test_Connector.idl
-  }
-}
-
-project(CFT_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += CFT_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=CONTENTFILTEREDTOPIC_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=CFT_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    CFT_Test_ConnectorE.idl
-  }
-}
-
-project(CFT_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += CFT_Test_Connector_lem_gen CFT_Test_Connector_stub CFT_Test_Base_stub
-  libs  += CFT_Test_Base_stub CFT_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = CFT_Test_Connector_lem_stub
-  dynamicflags += CONTENTFILTEREDTOPIC_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFT_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    CFT_Test_ConnectorEC.h
-    CFT_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    CFT_Test_ConnectorEC.inl
-  }
-}
-
-project(CFT_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += CFT_Test_Connector_idl_gen CFT_Test_Base_stub
-  libs  += CFT_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = CFT_Test_Connector_stub
-  dynamicflags += CONTENTFILTEREDTOPIC_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFT_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    CFT_Test_ConnectorC.h
-    CFT_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    CFT_Test_ConnectorC.inl
-  }
-}
-
-project(CFT_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += CFT_Test_Connector_lem_stub CFT_Test_Connector_stub CFT_Test_Base_stub
-  sharedname = CFT_Test_Connector_exec
-  libs += CFT_Test_Connector_stub CFT_Test_Connector_lem_stub CFT_Test_Base_stub CFT_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += CONTENTFILTEREDTOPIC_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFT_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    CFT_Test_Connector_conn.h
-    CFT_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(CFT_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += CFT_Test_Connector_lem_stub CFT_Test_Connector_exec CFT_Test_Connector_stub
-  sharedname  = CFT_Test_Connector_svnt
-  libs       += CFT_Test_Connector_stub \
-                CFT_Test_Connector_lem_stub  \
-                CFT_Test_Base_stub \
-                CFT_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += CONTENTFILTEREDTOPIC_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFT_Test_ConnectorS.cpp
-    CFT_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    CFT_Test_ConnectorS.h
-    CFT_Test_Connector_svnt.h
-    CFT_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/descriptors/Plan.cdp
deleted file mode 100644
index 74d797ad7dc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/descriptors/Plan.cdp
+++ /dev/null
@@ -1,419 +0,0 @@
-<!--  -->
-<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>CFTTest_Depl</label>
-  <UUID>CFTTest_Depl</UUID>
-
-  <implementation xmi:id="ComponentImplementation">
-    <name>ComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Component_ExecArtifact" />
-    <artifact xmi:idref="Component_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CFTTest_Component_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CFT_Test_CFTTestComponent_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="TwoDim_CFT_Test_ConnectorImplementation">
-    <name>TwoDim_CFT_Test_ConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="CFT_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="CFT_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CFTTwoDimensionalTestConn_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CFTTwoDimensionalTestConn_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CFT_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CFT_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="ThreeDim_CFT_Test_ConnectorImplementation">
-    <name>ThreeDim_CFT_Test_ConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="CFT_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="CFT_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CFTThreeDimensionalTestConn_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CFTThreeDimensionalTestConn_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CFT_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CFT_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="ComponentInstance">
-    <name>Component</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ComponentImplementation" />
-  </instance>
-
-  <instance xmi:id="TwoDim_CFT_Test_ConnectorInstance">
-    <name>TwoDim_CFT_Test_Connector</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="TwoDim_CFT_Test_ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TwoDimensionalTopic</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ThreeDim_CFT_Test_ConnectorInstance">
-    <name>ThreeDim_CFT_Test_Connector</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ThreeDim_CFT_Test_ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ThreeDimensionalTopic</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>pull_observer_filter</name>
-      <value>
-        <type>
-          <kind>tk_struct</kind>
-          <struct>
-            <name>QueryFilter</name>
-            <typeId>IDL:CCM_DDS/QueryFilter:1.0</typeId>
-            <member>
-              <name>expression</name>
-              <type>
-                <kind>tk_string</kind>
-              </type>
-            </member>
-            <member>
-              <name>parameters</name>
-              <type>
-                <kind>tk_sequence</kind>
-                <sequence>
-                  <elementType>
-                    <kind>tk_string</kind>
-                  </elementType>
-                </sequence>
-              </type>
-            </member>
-          </struct>
-        </type>
-        <value>
-          <member>
-            <name>expression</name>
-            <value>
-              <string>( (x > %0) AND (x &lt; %1) )</string>
-            </value>
-          </member>
-          <member>
-            <name>parameters</name>
-            <value>
-              <element>
-                <string>2</string>
-              </element>
-              <element>
-                <string>5</string>
-              </element>
-            </value>
-          </member>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>passive_observer_filter</name>
-      <value>
-        <type>
-          <kind>tk_struct</kind>
-          <struct>
-            <name>QueryFilter</name>
-            <typeId>IDL:CCM_DDS/QueryFilter:1.0</typeId>
-            <member>
-              <name>expression</name>
-              <type>
-                <kind>tk_string</kind>
-              </type>
-            </member>
-            <member>
-              <name>parameters</name>
-              <type>
-                <kind>tk_sequence</kind>
-                <sequence>
-                  <elementType>
-                    <kind>tk_string</kind>
-                  </elementType>
-                </sequence>
-              </type>
-            </member>
-          </struct>
-        </type>
-        <value>
-          <member>
-            <name>expression</name>
-            <value>
-              <string>( (x &lt; %0) OR (x > %1) )</string>
-            </value>
-          </member>
-          <member>
-            <name>parameters</name>
-            <value>
-              <element>
-                <string>2</string>
-              </element>
-              <element>
-                <string>5</string>
-              </element>
-            </value>
-          </member>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>two_dim_get_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>two_dim_get_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="TwoDim_CFT_Test_ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>three_dim_get_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>three_dim_get_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ThreeDim_CFT_Test_ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>three_dim_read_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>three_dim_read_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>passive_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ThreeDim_CFT_Test_ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>three_dim_get_filter_confit</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>three_dim_get_filter_config</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_observer_filter_config</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ThreeDim_CFT_Test_ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="CFT_Test_Connector_ExecArtifact">
-    <name>CFT_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>CFT_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="CFT_Test_Connector_SvntArtifact">
-    <name>CFT_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>CFT_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="CFT_Test_Connector_StubArtifact">
-    <name>CFT_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>CFT_Test_Connector_stub</location>
-  </artifact>
-
-  <artifact xmi:id="Component_ExecArtifact">
-    <name>Component_exec</name>
-    <source/>
-    <node/>
-    <location>Component_exec</location>
-  </artifact>
-  <artifact xmi:id="Component_SvntArtifact">
-    <name>Component_svnt</name>
-    <source/>
-    <node/>
-    <location>Component_svnt</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/descriptors/run_test.pl
deleted file mode 100755
index 415d3a8df9d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 1;
-@ports = ( 60001 );
-@iorbases = ( "Component.ior" );
-@iorfiles = 0;
-@nodenames = ( "ComponentNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 10 seconds to allow task to complete\n";
-sleep (10);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Deployments/WrongQuery.cdp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Deployments/WrongQuery.cdp
deleted file mode 100644
index bc767abfca1..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Deployments/WrongQuery.cdp
+++ /dev/null
@@ -1,255 +0,0 @@
-<!--  -->
-<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>ReadGet_Test_Depl_1</label>
-  <UUID>ReadGet_Test_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_ReadGet_Test_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_ReadGet_Test_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="ReadGet_Test_ReceiverConnectorImplementation">
-    <name>ReadGet_Test_ReceiverConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="ReadGet_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="ReadGet_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_ReadGet_Test_QueryConditionTestConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_ReadGet_Test_QueryConditionTestConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CFT_ReadGet_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CFT_ReadGet_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-    <configProperty>
-      <name>report_errors</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ReadGet_Test_ReceiverConnectorInstance">
-    <name>ReadGet_Test_ReceiverConnector</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReadGet_Test_ReceiverConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReadGet_Test</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>passive_observer_filter</name>
-      <value>
-        <type>
-          <kind>tk_struct</kind>
-          <struct>
-            <name>QueryFilter</name>
-            <typeId>IDL:CCM_DDS/QueryFilter:1.0</typeId>
-            <member>
-              <name>expression</name>
-              <type>
-                <kind>tk_string</kind>
-              </type>
-            </member>
-            <member>
-              <name>parameters</name>
-              <type>
-                <kind>tk_sequence</kind>
-                <sequence>
-                  <elementType>
-                    <kind>tk_string</kind>
-                  </elementType>
-                </sequence>
-              </type>
-            </member>
-          </struct>
-        </type>
-        <value>
-          <member>
-            <name>expression</name>
-            <value>
-              <string>( (x > %0) AND (x &lt; %1) )</string>
-            </value>
-          </member>
-          <member>
-            <name>parameters</name>
-            <value>
-              <element>
-                <string>2</string>
-              </element>
-              <element>
-                <string>5</string>
-              </element>
-            </value>
-          </member>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>get_port_filter_config</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>get_port_filter_config</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>passive_observer_filter_config</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReadGet_Test_ReceiverConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="ReadGet_Test_Connector_ExecArtifact">
-    <name>CFT_ReadGet_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>CFT_ReadGet_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="ReadGet_Test_Connector_SvntArtifact">
-    <name>CFT_ReadGet_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>CFT_ReadGet_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="ReadGet_Test_Connector_StubArtifact">
-    <name>CFT_ReadGet_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>ReadGet_Test_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Deployments/run_test.pl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Deployments/run_test.pl
deleted file mode 100755
index 8a4460518c9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Deployments/run_test.pl
+++ /dev/null
@@ -1,214 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 1;
-@ports = ( 60001 );
-@iorbases = ( "NodeApp1.ior" );
-@iorfiles = 0;
-@nodenames = ( "ReceiverNode" );
-
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../ReadGet/lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../ReadGet/lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../ReadGet/lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../ReadGet/lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run node daemon\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-              "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-if ($#ARGV == -1) {
-    opendir(DIR, ".");
-    @files = grep(/\.cdp$/,readdir(DIR));
-    closedir(DIR);
-}
-else {
-    @files = @ARGV;
-}
-
-create_targets ();
-init_ior_files ();
-
-foreach $file (@files) {
-    print "*********** Starting test for deployment $file ***********\n";
-
-    print STDERR "Starting Naming Service\n";
-
-    $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-    $NS->Spawn ();
-
-    if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                      $tg_naming->ProcessStartWaitInterval ()) == -1) {
-        print STDERR "ERROR: cannot find naming service IOR file\n";
-        $NS->Kill (); $NS->TimedWait (1);
-        exit 1;
-    }
-
-    $ns_running = 1;
-    # Set up NamingService environment
-    $ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-    # Invoke node daemon.
-    print "Invoking node daemon\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 = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-    $EM->Spawn ();
-
-    if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                    $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-    $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                                      "-x $file -k file://$ior_emfile -q");
-    $pl_status = $E->SpawnWaitKill (5 * $tg_executor->ProcessStartWaitInterval ());
-    if ($pl_status != 0) {
-        print "OK: dance_plan_launcher reported a problem <$pl_status>\n";
-        kill_open_processes ();
-    }
-    else {
-        print STDERR "ERROR: dance_plan_launcher did not report an error\n";
-        kill_open_processes ();
-    }
-    delete_ior_files ();
-    kill_open_processes ();
-}
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.idl
deleted file mode 100644
index f7d819efe29..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file CFTLE_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_BASE_IDL
-#define CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/CFTLE_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/CFTLE_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "ContentFilteredTopicListenEventTest"
-#pragma DCPS_DATA_KEY "ContentFilteredTopicListenEventTest key"
-
-struct ContentFilteredTopicListenEventTest {
-  string key; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<ContentFilteredTopicListenEventTest> ContentFilteredTopicListenEventTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.mpc
deleted file mode 100644
index 59e839f1dc5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_CFTLE_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_CFTLE_Test_Base_stub
-  dynamicflags += CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=CFTLE_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    CFTLE_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    CFTLE_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.idl
deleted file mode 100644
index 04395d584eb..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file CFTLE_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_CONNECTOR_IDL_
-#define CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/CFTLE_Test_Base.idl"
-
-#pragma ciao lem "Connector/CFTLE_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/CFTLE_Test_BaseTypeSupport.idl"
-#endif
-
-module CFTLE_Test
-{
-  module ::CCM_DDS::Typed < ::ContentFilteredTopicListenEventTest, ::ContentFilteredTopicListenEventTestSeq> ContentFilteredTopicListenEventTestConnector;
-};
-
-#endif /* CFTLE_Test_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.mpc
deleted file mode 100644
index 3a5a0b192f7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_CFTLE_Test_Base -l .. -o ../lib -u DDS CFTLE_Test_Connector"
-
-project(DDS_CFTLE_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_CFTLE_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=CFTLE_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=CFTLE_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=CFTLE_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=CFTLE_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    CFTLE_Test_Connector.idl
-  }
-}
-
-project(DDS_CFTLE_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_CFTLE_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=CFTLE_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    CFTLE_Test_ConnectorE.idl
-  }
-}
-
-project(DDS_CFTLE_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_CFTLE_Test_Connector_lem_gen DDS_CFTLE_Test_Connector_stub DDS_CFTLE_Test_Base_stub
-  libs  += DDS_CFTLE_Test_Base_stub DDS_CFTLE_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_CFTLE_Test_Connector_lem_stub
-  dynamicflags += CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFTLE_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    CFTLE_Test_ConnectorEC.h
-    CFTLE_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    CFTLE_Test_ConnectorEC.inl
-  }
-}
-
-project(DDS_CFTLE_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_CFTLE_Test_Connector_idl_gen DDS_CFTLE_Test_Base_stub
-  libs  += DDS_CFTLE_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_CFTLE_Test_Connector_stub
-  dynamicflags += CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFTLE_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    CFTLE_Test_ConnectorC.h
-    CFTLE_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    CFTLE_Test_ConnectorC.inl
-  }
-}
-
-project(DDS_CFTLE_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_CFTLE_Test_Connector_lem_stub DDS_CFTLE_Test_Connector_stub DDS_CFTLE_Test_Base_stub
-  sharedname = DDS_CFTLE_Test_Connector_exec
-  libs += DDS_CFTLE_Test_Connector_stub DDS_CFTLE_Test_Connector_lem_stub DDS_CFTLE_Test_Base_stub DDS_CFTLE_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFTLE_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    CFTLE_Test_Connector_conn.h
-    CFTLE_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_CFTLE_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_CFTLE_Test_Connector_lem_stub DDS_CFTLE_Test_Connector_exec DDS_CFTLE_Test_Connector_stub
-  sharedname  = DDS_CFTLE_Test_Connector_svnt
-  libs       += DDS_CFTLE_Test_Connector_stub \
-                DDS_CFTLE_Test_Connector_lem_stub  \
-                DDS_CFTLE_Test_Base_stub \
-                DDS_CFTLE_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFTLE_Test_ConnectorS.cpp
-    CFTLE_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    CFTLE_Test_ConnectorS.h
-    CFTLE_Test_Connector_svnt.h
-    CFTLE_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver.idl
deleted file mode 100644
index ef595aa217d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/CFTLE_Test_Connector.idl"
-
-module CFTLE_Test
-{
-  component Receiver
-  {
-    port ContentFilteredTopicListenEventTestConnector::DDS_Listen info_listen;
-
-    attribute unsigned short keys;
-    attribute unsigned short iterations;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver.mpc
deleted file mode 100644
index 5c52a76f4f3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver.mpc
+++ /dev/null
@@ -1,146 +0,0 @@
-project(DDS_CFTLE_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_CFTLE_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h \
-              -I..
-
-  IDL_Files {
-    CFTLE_Test_Receiver.idl
-  }
-}
-
-project(DDS_CFTLE_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_CFTLE_Test_Receiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    CFTLE_Test_ReceiverE.idl
-  }
-}
-
-project(DDS_CFTLE_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_CFTLE_Test_Receiver_lem_gen DDS_CFTLE_Test_Receiver_stub  \
-           DDS_CFTLE_Test_Connector_stub DDS_CFTLE_Test_Base_stub
-  libs  +=  Receiver_stub DDS_CFTLE_Test_Connector_stub \
-            DDS_CFTLE_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFTLE_Test_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    CFTLE_Test_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    CFTLE_Test_ReceiverEC.inl
-  }
-}
-
-project(DDS_CFTLE_Test_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_CFTLE_Test_Receiver_idl_gen  DDS_CFTLE_Test_Connector_stub \
-           DDS_CFTLE_Test_Base_stub DDS_CFTLE_Test_Connector_lem_gen
-  libs  += DDS_CFTLE_Test_Connector_stub DDS_CFTLE_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFTLE_Test_ReceiverC.cpp
-  }
-
-  Header_Files {
-    CFTLE_Test_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    CFTLE_Test_ReceiverC.inl
-  }
-}
-
-project(DDS_CFTLE_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_CFTLE_Test_Receiver_lem_stub DDS_CFTLE_Test_Receiver_stub \
-             DDS_CFTLE_Test_Base_stub DDS_CFTLE_Test_Connector_stub \
-             DDS_CFTLE_Test_Connector_lem_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_CFTLE_Test_Base_stub \
-          DDS_CFTLE_Test_Connector_stub DDS_CFTLE_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFTLE_Test_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    CFTLE_Test_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_CFTLE_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_CFTLE_Test_Receiver_lem_stub DDS_CFTLE_Test_Base_stub \
-                  DDS_CFTLE_Test_Connector_stub DDS_CFTLE_Test_Connector_svnt \
-                  DDS_CFTLE_Test_Receiver_exec DDS_CFTLE_Test_Connector_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_CFTLE_Test_Base_stub \
-                DDS_CFTLE_Test_Connector_stub DDS_CFTLE_Test_Connector_svnt \
-                Receiver_exec DDS_CFTLE_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFTLE_Test_ReceiverS.cpp
-    CFTLE_Test_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    CFTLE_Test_ReceiverS.h
-    CFTLE_Test_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.cpp
deleted file mode 100644
index 44b10bf7e3d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.cpp
+++ /dev/null
@@ -1,355 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "CFTLE_Test_Receiver_exec.h"
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-#define MIN_ITERATION 2
-#define MAX_ITERATION 5
-
-#define SAMPLES_PER_KEY 2
-
-namespace CIAO_CFTLE_Test_Receiver_Impl
-{
-
-  /**
-   * Facet Executor Implementation Class: info_listen_data_listener_exec_i
-   */
-
-  info_listen_data_listener_exec_i::info_listen_data_listener_exec_i (
-        ::CFTLE_Test::CCM_Receiver_Context_ptr ctx,
-        ACE_Thread_ID &thread_id,
-        Atomic_Long &samples_received)
-    : ciao_context_ (
-        ::CFTLE_Test::CCM_Receiver_Context::_duplicate (ctx))
-      , thread_id_ (thread_id)
-      , samples_received_ (samples_received)
-  {
-  }
-
-  info_listen_data_listener_exec_i::~info_listen_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CFTLE_Test::ContentFilteredTopicListenEventTestConnector::Listener
-
-  void
-  info_listen_data_listener_exec_i::on_one_data (const ::ContentFilteredTopicListenEventTest & datum,
-  const ::CCM_DDS::ReadInfo & info)
-  {
-    ACE_Thread_ID t_id;
-    this->thread_id_ = t_id;
-    ++this->samples_received_;
-    ACE_DEBUG ((LM_DEBUG, "ContentFilteredTopicListenEventTest_Listener::on_one_data: "
-                          "key <%C> - iteration <%d>\n",
-                          datum.key.in (),
-                          datum.iteration));
-    if (info.instance_handle == ::DDS::HANDLE_NIL)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: ContentFilteredTopicListenEventTest_Listener::on_one_data: "
-                              "instance handle seems to be invalid "
-                              "key <%C> - iteration <%d>\n",
-                              datum.key.in (),
-                              datum.iteration));
-      }
-    if (info.source_timestamp.sec == 0 &&
-        info.source_timestamp.nanosec == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: ContentFilteredTopicListenEventTest_Listener::on_one_data: "
-                              "source timestamp seems to be invalid (nil) "
-                              "key <%C> - iteration <%d>\n",
-                              datum.key.in (),
-                              datum.iteration));
-      }
-    if (datum.iteration <= MIN_ITERATION ||
-        datum.iteration  > MAX_ITERATION )
-      {
-        ACE_ERROR ((LM_ERROR, "ContentFilteredTopicListenEventTest_Listener::on_one_data: "
-                              "ERROR: Unexpected iteration received.\n"));
-      }
-  }
-
-  void
-  info_listen_data_listener_exec_i::on_many_data (const ::ContentFilteredTopicListenEventTestSeq & /* data */,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_listen_status_exec_i
-   */
-
-  info_listen_status_exec_i::info_listen_status_exec_i (
-        ::CFTLE_Test::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::CFTLE_Test::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_listen_status_exec_i::~info_listen_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_listen_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_listen_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : keys_ (5)
-      , iterations_ (10)
-      , thread_id_listener_ (0, 0)
-      , samples_expected_ (keys_ * SAMPLES_PER_KEY)
-      , samples_received_ (0)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-  void
-  Receiver_exec_i::start (void)
-  {
-    ::CCM_DDS::DataListenerControl_var dlc =
-        this->ciao_context_->get_connection_info_listen_data_control ();
-    dlc->mode (::CCM_DDS::ONE_BY_ONE);
-  }
-
-  // Component attributes and port operations.
-
-  ::CFTLE_Test::ContentFilteredTopicListenEventTestConnector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_listen_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_listen_data_listener_.in ()))
-      {
-        info_listen_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_listen_data_listener_exec_i (
-            this->ciao_context_.in (),
-            this->thread_id_listener_,
-            this->samples_received_),
-            ::CFTLE_Test::ContentFilteredTopicListenEventTestConnector::CCM_Listener::_nil ());
-
-          this->ciao_info_listen_data_listener_ = tmp;
-      }
-
-    return
-      ::CFTLE_Test::ContentFilteredTopicListenEventTestConnector::CCM_Listener::_duplicate (
-        this->ciao_info_listen_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_listen_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_listen_status_.in ()))
-      {
-        info_listen_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_listen_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_listen_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_listen_status_.in ());
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Receiver_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-
-    this->samples_expected_ = SAMPLES_PER_KEY * this->keys_;
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Receiver_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::CFTLE_Test::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    ::CFTLE_Test::ContentFilteredTopicListenEventTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_info_listen_data ();
-    if (CORBA::is_nil (reader.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::configuration_complete - "
-                              "Error get reader connection.\n"));
-      }
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_activate - "
-                          "Start listening.\n"));
-    start ();
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    char ccm_buf [65];
-    ACE_Thread_ID ccm_thread_id;
-    ccm_thread_id.to_string (ccm_buf);
-
-    char list_buf [65];
-    this->thread_id_listener_.to_string (list_buf);
-
-
-    if (this->thread_id_listener_.id () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
-                              "Thread ID for ReaderListener not set!\n"));
-      }
-    #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (this->thread_id_listener_ == ccm_thread_id)
-      {
-        ACE_DEBUG ((LM_DEBUG, "CFT_EVENT: "
-                              "Thread switch for ReaderListener seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: CFT_EVENT: "
-                              "Thread switch for ReaderListener "
-                              "doesn't seem to work! "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    #else
-    else if (this->thread_id_listener_ == ccm_thread_id)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: CFT_EVENT: ReaderListener: "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "CFT_EVENT: ReaderListener: "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    #endif
-    if (this->samples_received_ != this->samples_expected_)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: CFT_EVENT: ReaderListener: "
-                              "Unexpected number of samples received: "
-                              "expected <%d> - received <%d>\n",
-                              this->samples_expected_,
-                              this->samples_received_.value ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "CFT_EVENT: ReaderListener: "
-                              "Expected number of samples received: "
-                              "expected <%d> - received <%d>\n",
-                              this->samples_expected_,
-                              this->samples_received_.value ()));
-      }
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CFTLE_Test_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.h
deleted file mode 100644
index a5d193bd04e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.h
+++ /dev/null
@@ -1,189 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_CFTLE_TEST_RECEIVER_EXEC_NV4QAC_H_
-#define CIAO_CFTLE_TEST_RECEIVER_EXEC_NV4QAC_H_
-
-#include /**/ "ace/pre.h"
-
-#include "CFTLE_Test_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_CFTLE_Test_Receiver_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Long> Atomic_Long;
-
-  /**
-   * Provider Executor Implementation Class: info_listen_data_listener_exec_i
-   */
-
-  class info_listen_data_listener_exec_i
-    : public virtual ::CFTLE_Test::ContentFilteredTopicListenEventTestConnector::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_listen_data_listener_exec_i (
-      ::CFTLE_Test::CCM_Receiver_Context_ptr ctx,
-      ACE_Thread_ID &thread_id,
-      Atomic_Long &samples_received);
-    virtual ~info_listen_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CFTLE_Test::ContentFilteredTopicListenEventTestConnector::Listener. */
-
-    virtual
-    void on_one_data (const ::ContentFilteredTopicListenEventTest & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (const ::ContentFilteredTopicListenEventTestSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    ::CFTLE_Test::CCM_Receiver_Context_var ciao_context_;
-    ACE_Thread_ID &thread_id_;
-    Atomic_Long &samples_received_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_listen_status_exec_i
-   */
-
-  class info_listen_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_listen_status_exec_i (
-      ::CFTLE_Test::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_listen_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::CFTLE_Test::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CFTLE_Test::ContentFilteredTopicListenEventTestConnector::CCM_Listener_ptr
-    get_info_listen_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_listen_status (void);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void start (void);
-
-    //@}
-
-  private:
-    ::CFTLE_Test::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::CFTLE_Test::ContentFilteredTopicListenEventTestConnector::CCM_Listener_var ciao_info_listen_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_listen_status_;
-
-    ::CORBA::UShort keys_;
-
-    ::CORBA::UShort iterations_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    ACE_Thread_ID thread_id_listener_;
-
-    CORBA::Long samples_expected_;
-    Atomic_Long samples_received_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CFTLE_Test_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender.idl
deleted file mode 100644
index a7f807f0e64..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender.idl
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_SENDER_IDL
-#define DDS_CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_SENDER_IDL
-
-#include "Connector/CFTLE_Test_Connector.idl"
-
-module CFTLE_Test
-{
-  component Sender
-  {
-    port ContentFilteredTopicListenEventTestConnector::DDS_Write info_write;
-
-    attribute unsigned short keys;
-    attribute unsigned short iterations;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender.mpc
deleted file mode 100644
index 6715e986b2d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_CFTLE_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_CFTLE_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_CFTLE_Test_Connector_idl_gen DDS_Starter_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I ..
-
-  IDL_Files {
-    CFTLE_Test_Sender.idl
-  }
-}
-
-project(DDS_CFTLE_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_CFTLE_Test_Sender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    CFTLE_Test_SenderE.idl
-  }
-}
-
-project(DDS_CFTLE_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_CFTLE_Test_Sender_lem_gen DDS_CFTLE_Test_Sender_stub \
-           DDS_CFTLE_Test_Base_stub
-  libs  += DDS_CFTLE_Test_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFTLE_Test_SenderEC.cpp
-  }
-
-  Header_Files {
-    CFTLE_Test_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    CFTLE_Test_SenderEC.inl
-  }
-}
-
-project(DDS_CFTLE_Test_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_CFTLE_Test_Sender_idl_gen DDS_CFTLE_Test_Base_stub \
-           DDS_CFTLE_Test_Connector_stub
-  libs  += DDS_CFTLE_Test_Base_stub DDS_CFTLE_Test_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFTLE_Test_SenderC.cpp
-  }
-
-  Header_Files {
-    CFTLE_Test_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    CFTLE_Test_SenderC.inl
-  }
-}
-
-project(DDS_CFTLE_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_CFTLE_Test_Sender_lem_stub DDS_CFTLE_Test_Sender_stub \
-             DDS_CFTLE_Test_Connector_lem_stub DDS_CFTLE_Test_Connector_stub
-  sharedname = Sender_exec
-  libs    += Sender_stub Sender_lem_stub DDS_CFTLE_Test_Base_stub \
-             DDS_CFTLE_Test_Connector_lem_stub DDS_CFTLE_Test_Connector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFTLE_Test_Sender_exec.cpp
-  }
-
-  Header_Files {
-    CFTLE_Test_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_CFTLE_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_CFTLE_Test_Base_stub  DDS_CFTLE_Test_Sender_lem_stub \
-                DDS_CFTLE_Test_Connector_stub \
-                DDS_CFTLE_Test_Connector_svnt DDS_CFTLE_Test_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub DDS_CFTLE_Test_Base_stub \
-                DDS_CFTLE_Test_Connector_stub DDS_CFTLE_Test_Connector_svnt \
-                DDS_CFTLE_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFTLE_Test_SenderS.cpp
-    CFTLE_Test_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    CFTLE_Test_SenderS.h
-    CFTLE_Test_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender_exec.cpp
deleted file mode 100644
index 0352ef020de..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender_exec.cpp
+++ /dev/null
@@ -1,257 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "CFTLE_Test_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_CFTLE_Test_Sender_Impl
-{
-  /**
-   * WriteTicker
-   */
-
-  WriteTicker::WriteTicker (Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  WriteTicker::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    // Notify the subscribers
-    this->callback_.write_one ();
-    return 0;
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : keys_ (5)
-      , iterations_ (10)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      WriteTicker (*this),
-                      CORBA::INTERNAL ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Sender_exec_i::write_one (void)
-  {
-    if (this->last_key_ != this->samples_.end ())
-      {
-        try
-          {
-            ::CFTLE_Test::ContentFilteredTopicListenEventTestConnector::Writer_var writer =
-              this->ciao_context_->get_connection_info_write_data ();
-            ++this->last_key_->second->iteration;
-            writer->write_one (this->last_key_->second, ::DDS::HANDLE_NIL);
-            ACE_DEBUG ((LM_DEBUG, "Written key <%C> - <%u>\n",
-                          this->last_key_->first.c_str (),
-                          this->last_key_->second->iteration));
-          }
-        catch (const CCM_DDS::InternalError& )
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                        ACE_TEXT ("while updating writer info for <%C>.\n"),
-                          this->last_key_->first.c_str ()));
-          }
-        ++this->last_key_;
-      }
-    else
-      {
-        //onto the next iteration
-        this->last_key_ = this->samples_.begin ();
-        while (this->last_key_ != this->samples_.end ())
-          {
-            if (this->last_key_->second->iteration == this->iterations_)
-              {
-                //next key
-                ++this->last_key_;
-              }
-            else
-              {
-                break;
-              }
-          }
-        if (this->last_key_ == this->samples_.end ())
-          {
-            this->reactor ()->cancel_timer (this->ticker_);
-          }
-      }
-  }
-
-
-  void
-  Sender_exec_i::start (void)
-  {
-    ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard,
-                        this->mutex_, CORBA::INTERNAL ());
-
-    for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i)
-      {
-        char key[7];
-        ContentFilteredTopicListenEventTest *new_key = new ContentFilteredTopicListenEventTest;
-        ACE_OS::sprintf (key, "KEY_%d", i);
-        new_key->key = CORBA::string_dup(key);
-        new_key->iteration = 0;
-
-        this->samples_[key] = new_key;
-      }
-   this->last_key_ = this->samples_.begin ();
-   if (this->reactor ()->schedule_timer (
-                this->ticker_,
-                0,
-                ACE_Time_Value (5, 50000),
-                ACE_Time_Value (0, 50000)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                              ACE_TEXT ("Error scheduling timer")));
-      }
-  }
-
-  // Component attributes and port operations.
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::CFTLE_Test::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-    try
-      {
-        start ();
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("Exception caught:");
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Sender_exec_i::ccm_activate: Exception caught\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Sender_exec_i::ccm_activate: Unknown exception caught\n")));
-      }
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CFTLE_Test_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender_exec.h
deleted file mode 100644
index 23ebae100fa..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender_exec.h
+++ /dev/null
@@ -1,142 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_CFTLE_TEST_SENDER_EXEC_VCGUTW_H_
-#define CIAO_CFTLE_TEST_SENDER_EXEC_VCGUTW_H_
-
-#include /**/ "ace/pre.h"
-
-#include "CFTLE_Test_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-#include <map>
-
-namespace CIAO_CFTLE_Test_Sender_Impl
-{
-  class Sender_exec_i;
-
-  /**
-   * WriteTicker
-   */
-
-  class WriteTicker :
-    public ACE_Event_Handler
-  {
-  public:
-    WriteTicker (Sender_exec_i &callback);
-    int handle_timeout (const ACE_Time_Value &, const void *);
-  private:
-    /// Maintains a handle that actually process the event
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void start (void);
-    void write_one (void);
-
-    //@}
-
-  private:
-    ::CFTLE_Test::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-
-    ::CORBA::UShort keys_;
-
-    ::CORBA::UShort iterations_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    WriteTicker *ticker_;
-
-    TAO_SYNCH_MUTEX mutex_;
-    typedef std::map<ACE_CString, ContentFilteredTopicListenEventTest_var> Writer_Table;
-    Writer_Table samples_;
-
-    Writer_Table::iterator last_key_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CFTLE_Test_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/descriptors/Plan.cdp
deleted file mode 100644
index 521e7fb5cef..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/descriptors/Plan.cdp
+++ /dev/null
@@ -1,441 +0,0 @@
-<!--  -->
-<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>CFTLE_Test_Depl_1</label>
-  <UUID>CFTLE_Test_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CFTLE_Test_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CFTLE_Test_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="CFTLE_Test_ConnectorComponentImplementation">
-    <name>CFTLE_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="CFTLE_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="CFTLE_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CFTLE_Test_ContentFilteredTopicListenEventTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CFTLE_Test_ContentFilteredTopicListenEventTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CFTLE_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CFTLE_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CFTLE_Test_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CFTLE_Test_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="CFTLE_Test_ConnectorComponentInstance">
-    <name>CFTLE_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="CFTLE_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CFTLE_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="CFTLE_Test_ConnectorComponentInstance2">
-    <name>CFTLE_Test_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="CFTLE_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CFTLE_Test</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>push_consumer_filter</name>
-      <value>
-        <type>
-          <kind>tk_struct</kind>
-          <struct>
-            <name>QueryFilter</name>
-            <typeId>IDL:CCM_DDS/QueryFilter:1.0</typeId>
-            <member>
-              <name>expression</name>
-              <type>
-                <kind>tk_string</kind>
-              </type>
-            </member>
-            <member>
-              <name>parameters</name>
-              <type>
-                <kind>tk_sequence</kind>
-                <sequence>
-                  <elementType>
-                    <kind>tk_string</kind>
-                  </elementType>
-                </sequence>
-              </type>
-            </member>
-          </struct>
-        </type>
-        <value>
-          <member>
-            <name>expression</name>
-            <value>
-              <string>( (iteration > %0) AND (iteration &lt; %1) )</string>
-            </value>
-          </member>
-          <member>
-            <name>parameters</name>
-            <value>
-              <element>
-                <string>2</string>
-              </element>
-              <element>
-                <string>5</string>
-              </element>
-            </value>
-          </member>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>info_listen_reader_receiver</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CFTLE_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_listen_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CFTLE_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_listen_data_control</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CFTLE_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CFTLE_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="CFTLE_Test_Connector_ExecArtifact">
-    <name>CFTLE_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_CFTLE_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="CFTLE_Test_Connector_SvntArtifact">
-    <name>CFTLE_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_CFTLE_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="CFTLE_Test_Connector_StubArtifact">
-    <name>CFTLE_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_CFTLE_Test_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/descriptors/run_test.pl
deleted file mode 100755
index d8b4eca445d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 30 seconds to allow task to complete\n";
-sleep (30);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.idl
deleted file mode 100644
index 40911e517e4..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file Exception_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef CFT_EXCEPTION_TEST_BASE_IDL
-#define CFT_EXCEPTION_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/Exception_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/Exception_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "CFTExceptionTest"
-#pragma DCPS_DATA_KEY "CFTExceptionTest symbol"
-
-struct CFTExceptionTest {
-  string symbol; //@key
-  long x;
-  long y;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<CFTExceptionTest> CFTExceptionTestSeq;
-#endif
-
-#endif /* CFT_EXCEPTION_TEST_BASE_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.mpc
deleted file mode 100644
index 11b3f8805fa..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (CFT_Exception_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = CFT_Exception_Test_Base_stub
-  dynamicflags += CFT_EXCEPTION_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=CFT_EXCEPTION_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=CFT_Exception_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    Exception_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=CFT_EXCEPTION_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    Exception_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/.gitignore b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/.gitignore
deleted file mode 100644
index 6dc72fd9a88..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/Component_exec_export.h
-/Component_lem_stub_export.h
-/Component_stub_export.h
-/Component_svnt_export.h
-/Exception_Test_ComponentE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component.idl
deleted file mode 100644
index 232907f01c6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component.idl
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef COMPONENT_IDL
-#define COMPONENT_IDL
-
-#include "Connector/Exception_Test_Connector.idl"
-
-module CFT_Exception_Test
-{
-  component CFTTestComponent
-  {
-    port CFTExceptionTestConn::DDS_Get getter;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component.mpc
deleted file mode 100644
index 2abef71a064..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-project(CFT_Exception_Test_Component_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += CFT_Exception_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=COMPONENT_STUB_Export \
-              -Wb,stub_export_include=Component_stub_export.h \
-              -Wb,skel_export_macro=COMPONENT_SVNT_Export \
-              -Wb,skel_export_include=Component_svnt_export.h \
-              -Wb,svnt_export_macro=COMPONENT_SVNT_Export \
-              -Wb,svnt_export_include=Component_svnt_export.h \
-              -Wb,exec_export_macro=COMPONENT_EXEC_Export \
-              -Wb,exec_export_include=Component_exec_export.h -I..
-
-  IDL_Files {
-    Exception_Test_Component.idl
-  }
-}
-
-project(CFT_Exception_Test_Component_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += CFT_Exception_Test_Component_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=COMPONENT_LEM_STUB_Export \
-              -Wb,stub_export_include=Component_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    Exception_Test_ComponentE.idl
-  }
-}
-
-project(CFT_Exception_Test_Component_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += CFT_Exception_Test_Component_lem_gen CFT_Exception_Test_Component_stub  \
-           CFT_Exception_Test_Connector_stub CFT_Exception_Test_Base_stub
-  libs  +=  Component_stub CFT_Exception_Test_Connector_stub \
-            CFT_Exception_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Component_lem_stub
-  dynamicflags += COMPONENT_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Exception_Test_ComponentEC.cpp
-  }
-
-  Header_Files {
-    Exception_Test_ComponentEC.h
-    Component_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Exception_Test_ComponentEC.inl
-  }
-}
-
-project(CFT_Exception_Test_Component_stub) : ccm_stub, dds4ccm_base {
-  after += CFT_Exception_Test_Component_idl_gen  CFT_Exception_Test_Connector_stub \
-           CFT_Exception_Test_Base_stub CFT_Exception_Test_Connector_lem_gen
-  libs  += CFT_Exception_Test_Connector_stub CFT_Exception_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Component_stub
-  dynamicflags += COMPONENT_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Exception_Test_ComponentC.cpp
-  }
-
-  Header_Files {
-    Exception_Test_ComponentC.h
-    Component_stub_export.h
-  }
-
-  Inline_Files {
-    Exception_Test_ComponentC.inl
-  }
-}
-
-project(CFT_Exception_Test_Component_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += CFT_Exception_Test_Component_lem_stub CFT_Exception_Test_Component_stub \
-             CFT_Exception_Test_Base_stub CFT_Exception_Test_Connector_stub \
-             CFT_Exception_Test_Connector_lem_stub 
-  sharedname = Component_exec
-  libs += Component_stub Component_lem_stub CFT_Exception_Test_Base_stub \
-          CFT_Exception_Test_Connector_stub CFT_Exception_Test_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COMPONENT_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Exception_Test_Component_exec.cpp
-  }
-
-  Header_Files {
-    Exception_Test_Component_exec.h
-    Component_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(CFT_Exception_Test_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   CFT_Exception_Test_Component_lem_stub CFT_Exception_Test_Base_stub \
-                  CFT_Exception_Test_Connector_stub CFT_Exception_Test_Connector_svnt \
-                  CFT_Exception_Test_Component_exec CFT_Exception_Test_Connector_lem_stub 
-  sharedname  = Component_svnt
-  libs       += Component_stub Component_lem_stub CFT_Exception_Test_Base_stub \
-                CFT_Exception_Test_Connector_stub CFT_Exception_Test_Connector_svnt \
-                Component_exec CFT_Exception_Test_Connector_lem_stub  
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COMPONENT_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Exception_Test_ComponentS.cpp
-    Exception_Test_Component_svnt.cpp
-  }
-
-  Header_Files {
-    Exception_Test_ComponentS.h
-    Exception_Test_Component_svnt.h
-    Component_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component_exec.cpp
deleted file mode 100644
index beaf2f4956a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component_exec.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-// -*- C++ -*-
-#include "Exception_Test_Component_exec.h"
-
-namespace CIAO_CFT_Exception_Test_CFTTestComponent_Impl
-{
-  //============================================================
-  // Component_exec_i
-  //============================================================
-  Component_exec_i::Component_exec_i (void)
-  {
-  }
-
-  Component_exec_i::~Component_exec_i (void)
-  {
-  }
-
-  // Operations from Components::SessionComponent.
-  void
-  Component_exec_i::set_session_context (::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::CFT_Exception_Test::CCM_CFTTestComponent_Context::_narrow (ctx);
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Component_exec_i::get_getter_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  void
-  Component_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Component_exec_i::test_set_query_parameters ()
-  {
-    bool exception_caught = false;
-    try
-      {
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::test_set_query_parameters: Test exception\n"));
-        ::DDS::StringSeq parameters;
-        parameters.length (2);
-        parameters[0] = CORBA::string_dup ("2");
-        parameters[1] = CORBA::string_dup ("43");
-
-        this->filter_config_->set_filter_parameters (parameters);
-      }
-    catch (const ::CCM_DDS::InternalError&)
-      {
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::test_set_query_parameters - "
-                              "caught expected InternalErr exception.\n"));
-        exception_caught = true;
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Receiver_exec_i::test_set_query_parameters: ");
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::test_set_query_parameters - "
-                              "Exception caught\n"));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::test_set_query_parameters - "
-                              "caught unknown exception\n"));
-      }
-    if (!exception_caught)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::test_set_query_parameters - "
-                              "Didn't catch the exprected exception\n"));
-      }
-  }
-
-  void
-  Component_exec_i::ccm_activate (void)
-  {
-    this->filter_config_ =
-      this->context_->get_connection_getter_filter_config ();
-    this->test_set_query_parameters ();
-  }
-
-  void
-  Component_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Component_exec_i::ccm_remove (void)
-  {
-  }
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CFTTest_Component_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Component_exec_i);
-
-    return retval;
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component_exec.h b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component_exec.h
deleted file mode 100644
index f8367688ab0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component_exec.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_COMPONENT_EXEC_H_
-#define CIAO_COMPONENT_EXEC_H_
-
-#include "Exception_Test_ComponentEC.h"
-
-#include /**/ "Component_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-namespace CIAO_CFT_Exception_Test_CFTTestComponent_Impl
-{
-  //============================================================
-  // Component_exec_i
-  //============================================================
-  class COMPONENT_EXEC_Export Component_exec_i
-    : public virtual CFTTestComponent_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Component_exec_i (void);
-    virtual ~Component_exec_i (void);
-
-    // Operations from Components::SessionComponent.
-    virtual void
-    set_session_context (
-      ::Components::SessionContext_ptr ctx);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_getter_status(void);
-
-    virtual void configuration_complete (void);
-
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-
-  private:
-    ::CFT_Exception_Test::CCM_CFTTestComponent_Context_var context_;
-    ::CCM_DDS::ContentFilterSetting_var filter_config_;
-
-    void
-    test_set_query_parameters ();
-  };
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CFTTest_Component_Impl (void);
-}
-
-#endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.idl
deleted file mode 100644
index dc039960236..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.idl
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * @file Exception_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef CFT_EXCEPTION_TEST_CONNECTOR_IDL_
-#define CFT_EXCEPTION_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Exception_Test_Base.idl"
-
-#pragma ciao lem "Connector/Exception_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/Exception_Test_BaseTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::CFTExceptionTest, ::CFTExceptionTestSeq> CFTExceptionTestConn;
-#endif /* CFT_EXCEPTION_TEST_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.mpc
deleted file mode 100644
index 3f1aa68a9dd..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p CFT_Exception_Test_Base -l .. -o ../lib -u DDS CFT_Exception_Test_Connector"
-
-project(CFT_Exception_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen CFT_Exception_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=CFT_EXCEPTION_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=CFT_Exception_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=CFT_EXCEPTION_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=CFT_Exception_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=CFT_EXCEPTION_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=CFT_Exception_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=CFT_EXCEPTION_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=CFT_Exception_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Exception_Test_Connector.idl
-  }
-}
-
-project(CFT_Exception_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += CFT_Exception_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=CFT_EXCEPTION_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=CFT_Exception_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    Exception_Test_ConnectorE.idl
-  }
-}
-
-project(CFT_Exception_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += CFT_Exception_Test_Connector_lem_gen CFT_Exception_Test_Connector_stub CFT_Exception_Test_Base_stub
-  libs  += CFT_Exception_Test_Base_stub CFT_Exception_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = CFT_Exception_Test_Connector_lem_stub
-  dynamicflags += CFT_EXCEPTION_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Exception_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    Exception_Test_ConnectorEC.h
-    Exception_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Exception_Test_ConnectorEC.inl
-  }
-}
-
-project(CFT_Exception_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += CFT_Exception_Test_Connector_idl_gen CFT_Exception_Test_Base_stub
-  libs  += CFT_Exception_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = CFT_Exception_Test_Connector_stub
-  dynamicflags += CFT_EXCEPTION_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Exception_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    Exception_Test_ConnectorC.h
-    Exception_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    Exception_Test_ConnectorC.inl
-  }
-}
-
-project(CFT_Exception_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += CFT_Exception_Test_Connector_lem_stub CFT_Exception_Test_Connector_stub CFT_Exception_Test_Base_stub
-  sharedname = CFT_Exception_Test_Connector_exec
-  libs += CFT_Exception_Test_Connector_stub CFT_Exception_Test_Connector_lem_stub CFT_Exception_Test_Base_stub CFT_Exception_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += CFT_EXCEPTION_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Exception_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    Exception_Test_Connector_conn.h
-    Exception_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(CFT_Exception_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += CFT_Exception_Test_Connector_lem_stub CFT_Exception_Test_Connector_exec CFT_Exception_Test_Connector_stub
-  sharedname  = CFT_Exception_Test_Connector_svnt
-  libs       += CFT_Exception_Test_Connector_stub \
-                CFT_Exception_Test_Connector_lem_stub  \
-                CFT_Exception_Test_Base_stub \
-                CFT_Exception_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += CFT_EXCEPTION_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Exception_Test_ConnectorS.cpp
-    Exception_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    Exception_Test_ConnectorS.h
-    Exception_Test_Connector_svnt.h
-    Exception_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/descriptors/Plan.cdp
deleted file mode 100644
index 66b371dbb3b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/descriptors/Plan.cdp
+++ /dev/null
@@ -1,193 +0,0 @@
-<!--  -->
-<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>CFTTest_Depl</label>
-  <UUID>CFTTest_Depl</UUID>
-
-  <implementation xmi:id="ComponentImplementation">
-    <name>ComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Component_ExecArtifact" />
-    <artifact xmi:idref="Component_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CFTTest_Component_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CFT_Exception_Test_CFTTestComponent_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="CFT_Exception_Test_ConnectorImplementation">
-    <name>CFT_Exception_Test_ConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="CFT_Exception_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="CFT_Exception_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CFTExceptionTestConn_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CFTExceptionTestConn_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CFT_Exception_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CFT_Exception_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-
-  <instance xmi:id="ComponentInstance">
-    <name>Component</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ComponentImplementation" />
-  </instance>
-
-  <instance xmi:id="CFT_Exception_Test_ConnectorInstance">
-    <name>CFT_Exception_Test_Connector</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="CFT_Exception_Test_ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ExceptionTopic</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>getter_filter_config</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>getter_filter_config</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_filter_config</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CFT_Exception_Test_ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="CFT_Exception_Test_Connector_ExecArtifact">
-    <name>CFT_Exception_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>CFT_Exception_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="CFT_Exception_Test_Connector_SvntArtifact">
-    <name>CFT_Exception_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>CFT_Exception_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="CFT_Exception_Test_Connector_StubArtifact">
-    <name>CFT_Exception_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>CFT_Exception_Test_Connector_stub</location>
-  </artifact>
-
-  <artifact xmi:id="Component_ExecArtifact">
-    <name>Component_exec</name>
-    <source/>
-    <node/>
-    <location>Component_exec</location>
-  </artifact>
-  <artifact xmi:id="Component_SvntArtifact">
-    <name>Component_svnt</name>
-    <source/>
-    <node/>
-    <location>Component_svnt</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/descriptors/run_test.pl
deleted file mode 100755
index 4b792aab84f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "Component.ior", "Sender.ior" );
-@iorfiles = 0;
-@nodenames = ( "ComponentNode", "SenderNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 10 seconds to allow task to complete\n";
-sleep (10);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/.gitignore b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/.gitignore
deleted file mode 100644
index ff64ba3a619..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/.gitignore
+++ /dev/null
@@ -1,12 +0,0 @@
-/ReadGet_StarterE.idl
-/ReadGet_Starter_exec_export.h
-/ReadGet_Starter_lem_stub_export.h
-/ReadGet_Starter_stub_export.h
-/ReadGet_Starter_svnt_export.h
-/ReadGet_Test_Base.cxx
-/ReadGet_Test_Base.h
-/ReadGet_Test_BasePlugin.cxx
-/ReadGet_Test_BasePlugin.h
-/ReadGet_Test_BaseSupport.cxx
-/ReadGet_Test_BaseSupport.h
-/ReadGet_Test_Base_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Starter.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Starter.idl
deleted file mode 100644
index b61d30c7687..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Starter.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file ReadGet_Starter.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef QUERYCONDITION_STARTER_IDL
-#define QUERYCONDITION_STARTER_IDL
-
-#pragma ciao lem "Base/ReadGet_StarterE.idl"
-
-interface ReadGetStarter
-{
-  void set_reader_properties (in unsigned short nr_keys,
-                              in unsigned short nr_iterations);
-  void start_read (in unsigned short run);
-};
-
-interface ReadGetRestarter
-{
-  void restart_write ();
-};
-
-#endif /* QUERYCONDITION_STARTER_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Starter.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Starter.mpc
deleted file mode 100644
index 806cd6640ad..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Starter.mpc
+++ /dev/null
@@ -1,109 +0,0 @@
-project(CFT_ReadGet_Starter_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=READER_STARTER_STUB_Export \
-              -Wb,stub_export_include=ReadGet_Starter_stub_export.h \
-              -Wb,skel_export_macro=READER_STARTER_SVNT_Export \
-              -Wb,skel_export_include=ReadGet_Starter_svnt_export.h \
-              -Wb,svnt_export_macro=READER_STARTER_SVNT_Export \
-              -Wb,svnt_export_include=ReadGet_Starter_svnt_export.h \
-              -Wb,exec_export_macro=READER_STARTER_EXEC_Export \
-              -Wb,exec_export_include=ReadGet_Starter_exec_export.h -I..
-
-  IDL_Files {
-    ReadGet_Starter.idl
-  }
-}
-
-project(CFT_ReadGet_Starter_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += CFT_ReadGet_Starter_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=READER_STARTER_LEM_STUB_Export \
-              -Wb,stub_export_include=ReadGet_Starter_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    ReadGet_StarterE.idl
-  }
-}
-
-project(CFT_ReadGet_Starter_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += CFT_ReadGet_Starter_lem_gen CFT_ReadGet_Starter_stub
-  libs  += CFT_ReadGet_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = CFT_ReadGet_Starter_lem_stub
-  dynamicflags += READER_STARTER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_StarterEC.cpp
-  }
-
-  Header_Files {
-    ReadGet_StarterEC.h
-    ReadGet_Starter_lem_stub_export.h
-  }
-
-  Inline_Files {
-    ReadGet_StarterEC.inl
-  }
-}
-
-project(CFT_ReadGet_Starter_stub) : ccm_stub, dds4ccm_base {
-  after += CFT_ReadGet_Starter_idl_gen
-  libs  +=
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = CFT_ReadGet_Starter_stub
-  dynamicflags += READER_STARTER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_StarterC.cpp
-  }
-
-  Header_Files {
-    ReadGet_StarterC.h
-    ReadGet_Starter_stub_export.h
-  }
-
-  Inline_Files {
-    ReadGet_StarterC.inl
-  }
-}
-
-
-project(CFT_ReadGet_Starter_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += CFT_ReadGet_Starter_lem_stub CFT_ReadGet_Starter_stub
-  sharedname  = CFT_ReadGet_Starter_svnt
-  libs       += CFT_ReadGet_Starter_stub CFT_ReadGet_Starter_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += READER_STARTER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_StarterS.cpp
-    ReadGet_Starter_svnt.cpp
-  }
-
-  Header_Files {
-    ReadGet_StarterS.h
-    ReadGet_Starter_svnt.h
-    ReadGet_Starter_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.idl
deleted file mode 100644
index 7fadf380e9f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file ReadGet_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef QUERY_CONDITION_TEST_BASE_IDL
-#define QUERY_CONDITION_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/ReadGet_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/ReadGet_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "QueryConditionTest"
-#pragma DCPS_DATA_KEY "QueryConditionTest symbol"
-
-struct QueryConditionTest {
-  string symbol; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<QueryConditionTest> QueryConditionTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.mpc
deleted file mode 100644
index 9feeba0ab26..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project(CFT_ReadGet_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = CFT_ReadGet_Test_Base_stub
-  dynamicflags += QUERY_CONDITION_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=QUERY_CONDITION_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=ReadGet_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    ReadGet_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=QUERY_CONDITION_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    ReadGet_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/.gitignore
deleted file mode 100644
index 652f3acd8d5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/ReadGet_Test_ConnectorE.idl
-/ReadGet_Test_Connector_conn.cpp
-/ReadGet_Test_Connector_conn.h
-/ReadGet_Test_Connector_conn_export.h
-/ReadGet_Test_Connector_lem_stub_export.h
-/ReadGet_Test_Connector_stub_export.h
-/ReadGet_Test_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.idl
deleted file mode 100644
index 7a280e41771..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file ReadGet_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef QUERY_CONDITION_TEST_CONNECTOR_IDL_
-#define QUERY_CONDITION_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/ReadGet_Test_Base.idl"
-
-#pragma ciao lem "Connector/ReadGet_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/ReadGet_Test_BaseTypeSupport.idl"
-#endif
-
-module ReadGet_Test
-{
-  module ::CCM_DDS::Typed < ::QueryConditionTest, ::QueryConditionTestSeq> QueryConditionTestConnector;
-};
-
-#endif /* QUERY_CONDITION_TEST_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.mpc
deleted file mode 100644
index 1b1e27f6218..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.mpc
+++ /dev/null
@@ -1,146 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p ReadGet_Test_Base -l .. -o ../lib -u DDS ReadGet_Test_Connector"
-
-project(CFT_ReadGet_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen CFT_ReadGet_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=QUERY_CONDITION_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=ReadGet_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=QUERY_CONDITION_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=ReadGet_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=QUERY_CONDITION_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=ReadGet_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=QUERY_CONDITION_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=ReadGet_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    ReadGet_Test_Connector.idl
-  }
-}
-
-project(CFT_ReadGet_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += CFT_ReadGet_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=QUERY_CONDITION_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=ReadGet_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    ReadGet_Test_ConnectorE.idl
-  }
-}
-
-project(CFT_ReadGet_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += CFT_ReadGet_Test_Connector_lem_gen CFT_ReadGet_Test_Connector_stub \
-           CFT_ReadGet_Test_Base_stub
-  libs  += CFT_ReadGet_Test_Base_stub CFT_ReadGet_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = CFT_ReadGet_Test_Connector_lem_stub
-  dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    ReadGet_Test_ConnectorEC.h
-    ReadGet_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    ReadGet_Test_ConnectorEC.inl
-  }
-}
-
-project(CFT_ReadGet_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += CFT_ReadGet_Test_Connector_idl_gen CFT_ReadGet_Test_Base_stub
-  libs  += CFT_ReadGet_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = CFT_ReadGet_Test_Connector_stub
-  dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    ReadGet_Test_ConnectorC.h
-    ReadGet_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    ReadGet_Test_ConnectorC.inl
-  }
-}
-
-project(CFT_ReadGet_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += CFT_ReadGet_Test_Connector_lem_stub CFT_ReadGet_Test_Connector_stub \
-             CFT_ReadGet_Test_Base_stub
-  sharedname = CFT_ReadGet_Test_Connector_exec
-  libs += CFT_ReadGet_Test_Connector_stub CFT_ReadGet_Test_Connector_lem_stub \
-          CFT_ReadGet_Test_Base_stub CFT_ReadGet_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    ReadGet_Test_Connector_conn.h
-    ReadGet_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(CFT_ReadGet_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += CFT_ReadGet_Test_Connector_lem_stub CFT_ReadGet_Test_Connector_exec \
-                CFT_ReadGet_Test_Connector_stub
-  sharedname  = CFT_ReadGet_Test_Connector_svnt
-  libs       += CFT_ReadGet_Test_Connector_stub \
-                CFT_ReadGet_Test_Connector_lem_stub  \
-                CFT_ReadGet_Test_Base_stub \
-                CFT_ReadGet_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_Test_ConnectorS.cpp
-    ReadGet_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    ReadGet_Test_ConnectorS.h
-    ReadGet_Test_Connector_svnt.h
-    ReadGet_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/README b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/README
deleted file mode 100644
index 3f742b997d4..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/README
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-This test will test whether the ContentFilteredTopic
-on the DDS_Get and DDS_Read port works and that these ContentFilteredTopics are
-not shared among the ports.
-
-The sender writes a number of samples to DDS and informs the receiver the amount
-of samples written. The samples will stay in DDS (KEEP_ALL).
-The receiver than starts reading the samples.
-
-This test will also test whether the parameters can be changed and if so, whether
-they were changed correctly.
-
-The Sender writes a number of keys (adjustable by deployment plan) each with
-20 iterations (fixed) to DDS.
-
-#The test consists of three runs:
-1. No samples are written. Just test whether the correct exception is thrown and
-   that the filters are set correctly.
-2. The sender writes no. keys * 20 iterations to DDS and informs the Receiver
-   that these samples were written. Once read, the Receiver will set a new set of
-   query parameters. After that it'll inform the Sender that the next bunch of
-   samples can be written to DDS.
-3. Once written, the sender again will inform the Receiver that the samples were
-   written upon which the Receiver will start reading.
-
-#The following actions are taken by the Receiver component:
-1. Each run, it'll poll whether the last sample is received.
-2. If received, it performs the following tasks:
-  a. Invoke get_one on the getter of the Getter and get sample by sample.
-  b. Invoke the read_all on the reader of the Getter port.
-  c. Invoke the read_all on the reader of the Reader port.
-3. Everytime a unexpected sample is received an error message is written.
-4. Afterwards a status message is shown whether the correct number of samples
-   were read.
-
-#Queries:
-The queries are set by the deployment plan.
-The query expression for the getter (pull_observer_filter) looks like this:
-  ( (iteration > %0) AND (iteration < %1) )
-The query expression for the reader (passive_observer_filter) looks like this:
-  ( (iteration < %0) OR (iteration > %1) )
-
-The parameters during the second run are 2 and 5
-The parameters during the third run are 22 and 34
-
-#Regarding the received number of samples:
-
-- Get actions
-The Getter port should receive 2 samples during the second run and 11 during the
-third run but since all samples of the last key are read when polling for the
-latest sample in DDS and the Getter will only get unread samples, the getter
-should get (#keys - 1) * (2 + 11).
-
-- Read actions
-* On the reader port
-The amount of data read on the reader port depends on the number of iterations
-written.
-
-Filtered out during the second run : 2, 3, 4 and 5 (4 samples)
-Filtered out during the third run : 22-34 (13 samples)
-
-Since the reader also reads read samples, the samples read during the second run
-will also be read during the third run. So the total number of samples on the
-Reader port will be :
-  ((this->iterations_ - 4) * this->keys_ * 2) +
-  ((this->iterations_ - 13) * this->keys_)
-
-There'll be also a read action on the Getter port. This'll result in the same amount
-of samples as on the Getter port but the samples of the second run will be read
-twice and we don't need to decrement the number of keys with one since the Reader
-reads also read samples. The following formule determines the number of samples on
-the Getter port:
-  Filtered in during the second run : 3 and 4 (2 samples)
-  Filtered in during the third run : 22-34 (11 samples)
-
-  ((2 + 2 + 11) * this->keys_);
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/.gitignore b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/.gitignore
deleted file mode 100644
index 0adde6366f3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/ReadGet_Test_ReceiverE.idl
-/Receiver_exec_export.h
-/Receiver_lem_stub_export.h
-/Receiver_stub_export.h
-/Receiver_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver.idl
deleted file mode 100644
index b9e00adc9fa..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/ReadGet_Test_Connector.idl"
-#include "Base/ReadGet_Starter.idl"
-
-module ReadGet_Test
-{
-  component Receiver
-  {
-    port QueryConditionTestConnector::DDS_Get get_port;
-
-    port QueryConditionTestConnector::DDS_Read read_port;
-
-    provides ReadGetStarter reader_start;
-    uses ReadGetRestarter writer_restart;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver.mpc
deleted file mode 100644
index 6f8f07619f3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver.mpc
+++ /dev/null
@@ -1,155 +0,0 @@
-project(CFT_ReadGet_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += CFT_ReadGet_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h \
-              -I..
-
-  IDL_Files {
-    ReadGet_Test_Receiver.idl
-  }
-}
-
-project(CFT_ReadGet_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += CFT_ReadGet_Test_Receiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    ReadGet_Test_ReceiverE.idl
-  }
-}
-
-project(CFT_ReadGet_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += CFT_ReadGet_Test_Receiver_lem_gen CFT_ReadGet_Test_Receiver_stub  \
-           CFT_ReadGet_Test_Connector_stub CFT_ReadGet_Test_Base_stub \
-           CFT_ReadGet_Starter_stub
-  libs  +=  Receiver_stub CFT_ReadGet_Test_Connector_stub \
-            CFT_ReadGet_Test_Base_stub CFT_ReadGet_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_Test_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    ReadGet_Test_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    ReadGet_Test_ReceiverEC.inl
-  }
-}
-
-project(CFT_ReadGet_Test_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += CFT_ReadGet_Test_Receiver_idl_gen  CFT_ReadGet_Test_Connector_stub \
-           CFT_ReadGet_Test_Base_stub CFT_ReadGet_Test_Connector_lem_gen \
-           CFT_ReadGet_Starter_stub CFT_ReadGet_Starter_lem_stub
-  libs  += CFT_ReadGet_Test_Connector_stub CFT_ReadGet_Test_Base_stub \
-           CFT_ReadGet_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_Test_ReceiverC.cpp
-  }
-
-  Header_Files {
-    ReadGet_Test_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    ReadGet_Test_ReceiverC.inl
-  }
-}
-
-project(CFT_ReadGet_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += CFT_ReadGet_Test_Receiver_lem_stub CFT_ReadGet_Test_Receiver_stub \
-             CFT_ReadGet_Test_Base_stub CFT_ReadGet_Test_Connector_stub \
-             CFT_ReadGet_Test_Connector_lem_stub \
-             CFT_ReadGet_Starter_lem_stub CFT_ReadGet_Starter_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub CFT_ReadGet_Test_Base_stub \
-          CFT_ReadGet_Test_Connector_stub CFT_ReadGet_Test_Connector_lem_stub \
-          CFT_ReadGet_Starter_lem_stub CFT_ReadGet_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL READER_STARTER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_Test_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    ReadGet_Test_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(CFT_ReadGet_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   CFT_ReadGet_Test_Receiver_lem_stub CFT_ReadGet_Test_Base_stub \
-                  CFT_ReadGet_Test_Connector_stub CFT_ReadGet_Test_Connector_svnt \
-                  CFT_ReadGet_Test_Receiver_exec CFT_ReadGet_Test_Connector_lem_stub \
-                  CFT_ReadGet_Starter_stub \
-                  CFT_ReadGet_Starter_svnt CFT_ReadGet_Starter_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub CFT_ReadGet_Test_Base_stub \
-                CFT_ReadGet_Test_Connector_stub CFT_ReadGet_Test_Connector_svnt \
-                Receiver_exec CFT_ReadGet_Test_Connector_lem_stub \
-                CFT_ReadGet_Starter_stub CFT_ReadGet_Starter_svnt \
-                CFT_ReadGet_Starter_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_Test_ReceiverS.cpp
-    ReadGet_Test_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    ReadGet_Test_ReceiverS.h
-    ReadGet_Test_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp
deleted file mode 100644
index 600cece9081..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp
+++ /dev/null
@@ -1,1004 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "ReadGet_Test_Receiver_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-#define QUERY_GETTER_PORT "( (iteration > %0) AND (iteration < %1) )"
-#define QUERY_READER_PORT "( (iteration < %0) OR (iteration > %1) )"
-
-// initial values set in deploymentplan as well.
-// Need to be the same
-#define ITER1_VALUE1 "2"
-#define ITER1_VALUE2 "5"
-
-#define ITER2_VALUE1 "22"
-#define ITER2_VALUE2 "34"
-
-// Samples received on the getter port:
-// 2 during the first run.
-// 12 during the second run
-// Beware that the last key (key no 5) is
-// not read by the getter since this one is
-// already read during check_last
-// (see constructor Receiver_exec_i).
-#define SAMPLES_PER_KEY_GETTER (2 + 11)
-
-// Samples received on the Reader port depend on the
-// number of iterations send. The sender informs the
-// Receiver about this number by invoking set_reader_properties.
-// The number of expected samples on the receiver port are set
-// when the iterations are set (see Receiver_exec_i::iterations).
-// Besides this, this test also reads on the reader port. This'll
-// result in the same amount of samples of the read on the getter
-// port.
-
-namespace CIAO_ReadGet_Test_Receiver_Impl
-{
-  /**
-   * read_action_Generator
-   */
-
-  read_action_Generator::read_action_Generator (Receiver_exec_i &callback,
-                                                int run)
-    : callback_ (callback),
-      run_ (run)
-  {
-  }
-
-  read_action_Generator::~read_action_Generator ()
-  {
-  }
-
-  int
-  read_action_Generator::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Checking if last sample ")
-                          ACE_TEXT ("is available in DDS...\n")));
-    if (this->run_ == 1 || this->callback_.check_last ())
-      {
-        this->callback_.run (this->run_);
-      }
-    return 0;
-  }
-
-  /**
-   * Facet Executor Implementation Class: get_port_status_exec_i
-   */
-
-  get_port_status_exec_i::get_port_status_exec_i (
-        ::ReadGet_Test::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::ReadGet_Test::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  get_port_status_exec_i::~get_port_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  get_port_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  get_port_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: read_port_status_exec_i
-   */
-
-  read_port_status_exec_i::read_port_status_exec_i (
-        ::ReadGet_Test::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::ReadGet_Test::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  read_port_status_exec_i::~read_port_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  read_port_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  read_port_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: reader_start_exec_i
-   */
-
-  reader_start_exec_i::reader_start_exec_i (
-        ::ReadGet_Test::CCM_Receiver_Context_ptr ctx,
-        Receiver_exec_i & callback)
-    : ciao_context_ (
-        ::ReadGet_Test::CCM_Receiver_Context::_duplicate (ctx))
-      , callback_ (callback)
-  {
-  }
-
-  reader_start_exec_i::~reader_start_exec_i (void)
-  {
-  }
-
-  // Operations from ::ReadGetStarter
-
-  void
-  reader_start_exec_i::set_reader_properties (::CORBA::UShort nr_keys,
-  ::CORBA::UShort nr_iterations)
-  {
-    this->callback_.keys (nr_keys);
-    this->callback_.iterations (nr_iterations);
-  }
-
-  void
-  reader_start_exec_i::start_read (::CORBA::UShort run)
-  {
-    this->callback_.start_read (run);
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : iterations_ (20),
-      keys_ (5),
-      has_run_ (false),
-      current_iter_value1_ (ACE_OS::atoi (ITER1_VALUE1)),
-      current_iter_value2_ (ACE_OS::atoi (ITER1_VALUE2)),
-      ticker_ (0),
-      samples_expected_reader_ (0),
-      samples_received_reader_ (0),
-      samples_expected_getter_ (0),
-      samples_received_getter_ (0)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Receiver_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  bool
-  Receiver_exec_i::check_last ()
-  {
-    bool retvalue = false;
-    try
-      {
-        ::ReadGet_Test::QueryConditionTestConnector::Reader_var get_reader =
-          this->ciao_context_->get_connection_get_port_data ();
-        if (::CORBA::is_nil (get_reader.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_last - ")
-                                  ACE_TEXT ("Reader of DDS_Get is nil.\n")));
-            return false;
-          }
-        QueryConditionTest queryfiltertest_info;
-        ::CCM_DDS::ReadInfo readinfo;
-        char key[10];
-        ACE_OS::sprintf (key, "KEY_%d", this->keys_);
-        queryfiltertest_info.symbol = CORBA::string_dup (key);
-        get_reader->read_one_last (
-                queryfiltertest_info,
-                readinfo,
-                ::DDS::HANDLE_NIL);
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver_exec_i::check_last - ")
-                              ACE_TEXT ("last iteration <%d> - <%d>\n"),
-                              queryfiltertest_info.iteration,
-                              this->current_iter_value2_ - 1));
-        retvalue = queryfiltertest_info.iteration >= this->current_iter_value2_ - 1;
-      }
-    catch (const ::CCM_DDS::InternalError &)
-      {
-        retvalue = false;
-      }
-    catch (const ::CCM_DDS::NonExistent &)
-      {
-        retvalue = false;
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::check_last: "
-                              "ERROR: Unexpected exception caught\n"));
-        retvalue = false;
-      }
-    return retvalue;
-  }
-
-  // Supported operations and attributes.
-  void
-  Receiver_exec_i::check_iter_on_reader_port (const QueryConditionTest & sample)
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ ALL ON READER PORT : ")
-        ACE_TEXT ("sample received for <%C>: iteration <%u>\n"),
-        sample.symbol.in (),
-        sample.iteration));
-    if (sample.iteration > this->current_iter_value1_ &&
-        sample.iteration < this->current_iter_value2_ &&
-        sample.iteration > 20) //don't count the first run...
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ ALL ON READER PORT : ")
-                              ACE_TEXT ("Didn't expect samples between ")
-                              ACE_TEXT ("%d and %d\n"),
-                              this->current_iter_value1_,
-                              this->current_iter_value2_));
-      }
-  }
-
-  void
-  Receiver_exec_i::check_iter_on_getter_port (const QueryConditionTest & sample,
-                                              const char * test)
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%C ALL ON GETTER PORT : ")
-        ACE_TEXT ("sample received for <%C>: iteration <%u>\n"),
-        test,
-        sample.symbol.in (),
-        sample.iteration));
-    if (sample.iteration <= ACE_OS::atoi (ITER1_VALUE1))
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: %C ALL ON GETTER PORT : ")
-                              ACE_TEXT ("Didn't expect samples with iterations ")
-                              ACE_TEXT ("<= %d\n"),
-                              test,
-                              this->current_iter_value1_));
-      }
-    if (sample.iteration > this->current_iter_value2_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: %C ALL ON GETTER PORT : ")
-                              ACE_TEXT ("Didn't expect samples with iterations ")
-                              ACE_TEXT ("> %d\n"),
-                              test,
-                              this->current_iter_value2_));
-      }
-  }
-
-  void
-  Receiver_exec_i::read_all_on_reader_port (void)
-  {
-    ::ReadGet_Test::QueryConditionTestConnector::Reader_var read_reader =
-      this->ciao_context_->get_connection_read_port_data ();
-
-    if (::CORBA::is_nil (read_reader))
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Receiver_exec_i::read_all_on_reader_port - ")
-                              ACE_TEXT ("ERROR: No Reader on Reader port\n")));
-        return;
-      }
-    QueryConditionTestSeq queryfiltertest_info_seq;
-    ::CCM_DDS::ReadInfoSeq readinfo_seq;
-    read_reader->read_all (queryfiltertest_info_seq, readinfo_seq);
-    if (queryfiltertest_info_seq.length () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR : Receiver_exec_i::read_all_on_reader_port : ")
-                              ACE_TEXT ("No samples available in Reader!\n")));
-      }
-    for (CORBA::ULong it = 0; it < queryfiltertest_info_seq.length (); ++it)
-      {
-        this->check_iter_on_reader_port (queryfiltertest_info_seq[it]);
-      }
-    this->samples_received_reader_ += queryfiltertest_info_seq.length ();
-  }
-
-  void
-  Receiver_exec_i::read_all_on_getter_port (void)
-  {
-    ::ReadGet_Test::QueryConditionTestConnector::Reader_var get_reader =
-      this->ciao_context_->get_connection_get_port_data ();
-
-    if (::CORBA::is_nil (get_reader))
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::read_all_on_getter_port - ")
-                              ACE_TEXT ("No Reader on Getter port\n")));
-        return;
-      }
-    QueryConditionTestSeq queryfiltertest_info_seq;
-    ::CCM_DDS::ReadInfoSeq readinfo_seq;
-    get_reader->read_all (queryfiltertest_info_seq, readinfo_seq);
-    if (queryfiltertest_info_seq.length () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR : Receiver_exec_i::read_all_on_getter_port : ")
-                              ACE_TEXT ("No samples available in Reader!\n")));
-      }
-    for (CORBA::ULong it = 0; it < queryfiltertest_info_seq.length (); ++it)
-      {
-        this->check_iter_on_getter_port (queryfiltertest_info_seq[it], "READ");
-      }
-    this->samples_received_reader_ += queryfiltertest_info_seq.length ();
-  }
-
-  void
-  Receiver_exec_i::get_all_on_getter_port (void)
-  {
-    ::ReadGet_Test::QueryConditionTestConnector::Getter_var get_getter =
-      this->ciao_context_->get_connection_get_port_fresh_data ();
-
-    if (::CORBA::is_nil (get_getter))
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::get_all_on_getter_port - ")
-                              ACE_TEXT ("No Getter on Getter port\n")));
-        return;
-      }
-    // Set time_out on getter
-    DDS::Duration_t to;
-    to.sec = 5;
-    to.nanosec = 0;
-    get_getter->time_out (to);
-
-    QueryConditionTest_var qf_info;
-    ::CCM_DDS::ReadInfo readinfo;
-    CORBA::Boolean result = get_getter->get_one (qf_info.out (), readinfo);
-    if (result)
-      {
-        if (ACE_OS::strlen (qf_info->symbol.in ()) == 0)
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::get_all_on_getter_port - ")
-                                  ACE_TEXT ("Name of key seems to be empty-> bailing out\n")));
-            return;
-          }
-        this->check_iter_on_getter_port (*qf_info, "GET");
-        ++this->samples_received_getter_;
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::get_all_on_getter_port - ")
-                              ACE_TEXT ("time out when retrieving ")
-                              ACE_TEXT ("first sample.\n")));
-      }
-    while (result)
-      {
-        result = get_getter->get_one (qf_info.out (), readinfo);
-        if (result)
-          {
-            this->check_iter_on_getter_port (*qf_info, "GET");
-            ++this->samples_received_getter_;
-          }
-      }
-  }
-
-  void
-  Receiver_exec_i::test_all ()
-  {
-    const char * test = "GET ALL";
-    try
-      {
-        get_all_on_getter_port ();
-        ACE_DEBUG ((LM_DEBUG, "=================================="
-                              "==================================\n"));
-
-        test = "READ ALL GETTER";
-        read_all_on_getter_port ();
-        ACE_DEBUG ((LM_DEBUG, "=================================="
-                              "==================================\n"));
-
-        test = "READ ALL READER";
-        read_all_on_reader_port ();
-        ACE_DEBUG ((LM_DEBUG, "=================================="
-                              "==================================\n"));
-      }
-    catch (const CCM_DDS::NonExistent& ex)
-      {
-        for (CORBA::ULong i = 0; i < ex.indexes.length (); ++i)
-          {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ERROR %C: ")
-                  ACE_TEXT ("caught expected exception: index <%u>\n"),
-                  test,
-                  ex.indexes[i]));
-          }
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: %C: ")
-              ACE_TEXT ("caught InternalError exception: retval <%u>\n"),
-              test,
-              ex.error_code));
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception (test);
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Receiver_exec_i::test_all : Exception caught\n")));
-      }
-  }
-
-  void
-  Receiver_exec_i::check_filter ()
-  {
-    this->check_filter_getter ();
-    this->check_filter_reader ();
-  }
-
-  void
-  Receiver_exec_i::check_filter_getter (void)
-  {
-    ::CCM_DDS::QueryFilter_var filter;
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver_exec_i::check_filter <GETTER> - ")
-                          ACE_TEXT ("checking filter\n")));
-
-    try
-      {
-        ::ReadGet_Test::QueryConditionTestConnector::Getter_var get_getter =
-          this->ciao_context_->get_connection_get_port_fresh_data ();
-        if (::CORBA::is_nil (get_getter.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter <GETTER> - ")
-                                  ACE_TEXT ("Unable to get getter interface\n")));
-            throw ::CCM_DDS::InternalError ();
-          }
-        CORBA::Object_var cmp = get_getter->_get_component ();
-        if (::CORBA::is_nil (cmp.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter <GETTER> - ")
-                                  ACE_TEXT ("Unable to get component interface\n")));
-            throw ::CCM_DDS::InternalError ();
-          }
-        ::ReadGet_Test::QueryConditionTestConnector::CCM_DDS_State_var conn =
-          ::ReadGet_Test::QueryConditionTestConnector::CCM_DDS_State::_narrow (cmp.in ());
-        if (::CORBA::is_nil (conn.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter <GETTER> - ")
-                                  ACE_TEXT ("Unable to narrow connector interface\n")));
-            throw ::CCM_DDS::InternalError ();
-          }
-
-        filter = conn->pull_observer_filter ();
-        if (!filter)
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter <GETTER> - ")
-                                  ACE_TEXT ("Filter is nil\n")));
-            return;
-          }
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter <GETTER> - ")
-                              ACE_TEXT ("caught InternalError exception: retval <%u>\n"),
-                              ex.error_code));
-        return;
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Receiver_exec_i::check_filter: ");
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter <GETTER> - ")
-                              ACE_TEXT ("Exception caught\n")));
-        return;
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter <GETTER> - ")
-                              ACE_TEXT ("caught unknown exception\n")));
-        return;
-      }
-
-    //check query
-    bool error = false;
-    ::CORBA::String_var expression = filter->expression.in ();
-    if (ACE_OS::strcmp (expression.in (), QUERY_GETTER_PORT) != 0)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter <GETTER> - ")
-                              ACE_TEXT ("Unexpected query when retrieving filter: ")
-                              ACE_TEXT ("expected <%C> - received <%C>\n"),
-                              QUERY_GETTER_PORT, expression.in ()));
-        error = true;
-      }
-    //check current parameters.
-    if (filter->parameters.length () != 2)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter <GETTER> - ")
-                              ACE_TEXT ("Unexpected number of parameters: ")
-                              ACE_TEXT ("expected <%d> - received <%d>\n"),
-                              2, filter->parameters.length ()));
-        error = true;
-      }
-
-    if (filter->parameters.length () >= 1)
-      {
-        CORBA::String_var param = ::CORBA::string_dup (filter->parameters[0].in ());
-        if (ACE_OS::atoi (param.in ()) != this->current_iter_value1_)
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter <GETTER> - ")
-                                  ACE_TEXT ("Unexpected param value: ")
-                                  ACE_TEXT ("expected <%d> - received <%C>\n"),
-                                  this->current_iter_value1_,
-                                  param.in ()));
-            error = true;
-          }
-      }
-    if (filter->parameters.length () >= 2)
-      {
-        CORBA::String_var param = ::CORBA::string_dup (filter->parameters[1].in ());
-        if (ACE_OS::atoi (param.in ()) != this->current_iter_value2_)
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter <GETTER> - ")
-                                  ACE_TEXT ("Unexpected param value: ")
-                                  ACE_TEXT ("expected <%d> - received <%C>\n"),
-                                  this->current_iter_value2_,
-                                  param.in ()));
-            error = true;
-          }
-      }
-    if (!error)
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver_exec_i::check_filter <GETTER> - ")
-                              ACE_TEXT ("Passed check_filter test.\n")));
-      }
-  }
-
-  void
-  Receiver_exec_i::check_filter_reader (void)
-  {
-    ::CCM_DDS::QueryFilter_var filter;
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver_exec_i::check_filter <READER> - ")
-                          ACE_TEXT ("checking filter\n")));
-
-    try
-      {
-        ::ReadGet_Test::QueryConditionTestConnector::Reader_var reader =
-          this->ciao_context_->get_connection_read_port_data ();
-        if (::CORBA::is_nil (reader.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter <READER> - ")
-                                  ACE_TEXT ("Unable to get getter interface\n")));
-            throw ::CCM_DDS::InternalError ();
-          }
-        CORBA::Object_var cmp = reader->_get_component ();
-        if (::CORBA::is_nil (cmp.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter <READER> - ")
-                                  ACE_TEXT ("Unable to get component interface\n")));
-            throw ::CCM_DDS::InternalError ();
-          }
-        ::ReadGet_Test::QueryConditionTestConnector::CCM_DDS_State_var conn =
-          ::ReadGet_Test::QueryConditionTestConnector::CCM_DDS_State::_narrow (cmp.in ());
-        if (::CORBA::is_nil (conn.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter <READER> - ")
-                                  ACE_TEXT ("Unable to narrow connector interface\n")));
-            throw ::CCM_DDS::InternalError ();
-          }
-
-        filter = conn->passive_observer_filter ();
-        if (!filter)
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter <READER> - ")
-                                  ACE_TEXT ("Filter is nil\n")));
-            return;
-          }
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter <READER> - ")
-                              ACE_TEXT ("caught InternalError exception: retval <%u>\n"),
-                              ex.error_code));
-        return;
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Receiver_exec_i::check_filter: ");
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter <READER> - ")
-                              ACE_TEXT ("Exception caught\n")));
-        return;
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter <READER> - ")
-                              ACE_TEXT ("caught unknown exception\n")));
-        return;
-      }
-
-    //check query
-    bool error = false;
-    ::CORBA::String_var expression = ::CORBA::string_dup (filter->expression.in  ());
-    if (ACE_OS::strcmp (expression.in (), QUERY_READER_PORT) != 0)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter <READER> - ")
-                              ACE_TEXT ("Unexpected query when retrieving filter: ")
-                              ACE_TEXT ("expected <%C> - received <%C>\n"),
-                              QUERY_READER_PORT, expression.in ()));
-        error = true;
-      }
-    //check current parameters.
-    if (filter->parameters.length () != 2)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter <READER> - ")
-                              ACE_TEXT ("Unexpected number of parameters: ")
-                              ACE_TEXT ("expected <%d> - received <%d>\n"),
-                              2, filter->parameters.length ()));
-        error = true;
-      }
-
-    if (filter->parameters.length () >= 1)
-      {
-        CORBA::String_var param = ::CORBA::string_dup (filter->parameters[0].in ());
-        if (ACE_OS::atoi (param.in ()) != this->current_iter_value1_)
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter <READER> - ")
-                                  ACE_TEXT ("Unexpected param value: ")
-                                  ACE_TEXT ("expected <%d> - received <%C>\n"),
-                                  this->current_iter_value1_,
-                                  param.in ()));
-            error = true;
-          }
-      }
-    if (filter->parameters.length () >= 2)
-      {
-        CORBA::String_var param = ::CORBA::string_dup (filter->parameters[1].in ());
-        if (ACE_OS::atoi (param.in ()) != this->current_iter_value2_)
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter <READER> - ")
-                                  ACE_TEXT ("Unexpected param value: ")
-                                  ACE_TEXT ("expected <%d> - received <%C>\n"),
-                                  this->current_iter_value2_,
-                                  param.in ()));
-            error = true;
-          }
-      }
-    if (!error)
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver_exec_i::check_filter <READER> - ")
-                              ACE_TEXT ("Passed check_filter test.\n")));
-      }
-  }
-
-  void
-  Receiver_exec_i::test_set_query_parameters ()
-  {
-    try
-      {
-        ::CCM_DDS::ContentFilterSetting_var get_filter_setting =
-          this->ciao_context_->get_connection_get_port_filter_config ();
-        if (::CORBA::is_nil (get_filter_setting.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::test_set_query_parameters - ")
-                                  ACE_TEXT ("Filter config interface for Getter port is nil.\n")));
-            throw ::CCM_DDS::InternalError ();
-          }
-        ::CCM_DDS::ContentFilterSetting_var read_filter_setting =
-          this->ciao_context_->get_connection_read_port_filter_config ();
-        if (::CORBA::is_nil (read_filter_setting.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::test_set_query_parameters - ")
-                                  ACE_TEXT ("Filter config interface for Reader port is nil.\n")));
-            throw ::CCM_DDS::InternalError ();
-          }
-
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver_exec_i::test_set_query_parameters: Set parameters\n")));
-        ::DDS::StringSeq parameters;
-        parameters.length (2);
-        parameters[0] = ::CORBA::string_dup (ITER2_VALUE1);
-        parameters[1] = ::CORBA::string_dup (ITER2_VALUE2);
-        get_filter_setting->set_filter_parameters (parameters);
-        read_filter_setting->set_filter_parameters (parameters);
-
-        this->current_iter_value1_ = ACE_OS::atoi (ITER2_VALUE1);
-        this->current_iter_value2_ = ACE_OS::atoi (ITER2_VALUE2);
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("DONE Receiver_exec_i::test_set_query_parameters\n")));
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::test_set_query_parameters - ")
-                              ACE_TEXT ("caught InternalError exception: retval <%u>\n"),
-                              ex.error_code));
-        return;
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Receiver_exec_i::test_set_query_parameters: ");
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::test_set_query_parameters - ")
-                              ACE_TEXT ("Exception caught\n")));
-        return;
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::test_set_query_parameters - ")
-                              ACE_TEXT ("caught unknown exception\n")));
-        return;
-      }
-  }
-
-  void
-  Receiver_exec_i::start_read (CORBA::UShort run)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      read_action_Generator (*this, run),
-                      ::CORBA::INTERNAL ());
-
-    if (this->reactor ()->schedule_timer (this->ticker_,
-                                          0,
-                                          ACE_Time_Value(1, 0),
-                                          ACE_Time_Value(1, 0)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to schedule Timer\n")));
-      }
-  }
-
-  void
-  Receiver_exec_i::run (CORBA::UShort run)
-  {
-    if (this->ticker_)
-      {
-        this->reactor ()->cancel_timer (this->ticker_);
-        delete this->ticker_;
-        this->ticker_ = 0;
-      }
-
-    ReadGetRestarter_var restarter = this->ciao_context_->get_connection_writer_restart ();
-    if (::CORBA::is_nil (restarter.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::run - ")
-                              ACE_TEXT ("Unable to start run since restarter ")
-                              ACE_TEXT ("is nil.\n")));
-        return;
-      }
-
-    this->has_run_ = true;
-
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver_exec_i::run - ")
-                          ACE_TEXT ("Starting run number <%d>\n"),
-                          run));
-    switch (run)
-    {
-      case 1:
-        {
-          check_filter ();
-          restarter->restart_write ();
-        }
-        break;
-      case 2:
-        {
-          test_all ();
-          check_filter ();
-          test_set_query_parameters ();
-          restarter->restart_write ();
-        }
-        break;
-      case 3:
-        {
-          test_all ();
-          check_filter ();
-        }
-        break;
-    }
-  }
-
-  void
-  Receiver_exec_i::iterations (::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-    // during first iteration, 2,3,4 and 5 are filtered out
-    // during the second iteration 22-34 are fitered out but the
-    // iterations of the first run are also received during the
-    // second run
-    // The last addition is from the read action on the getter port.
-    // During the first run, two samples are received. The second run
-    // includes the two samples from the first run and 11 samples (22-34)
-    // from the second run.
-    this->samples_expected_reader_ =
-      ((this->iterations_ - 4) * this->keys_ * 2) +
-      ((this->iterations_ - 13) * this->keys_) +
-      ((2 + 2 + 11) * this->keys_);
-  }
-
-  void
-  Receiver_exec_i::keys (::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-    this->samples_expected_getter_ = (keys_ - 1) * SAMPLES_PER_KEY_GETTER;
-  }
-
-  // Component attributes and port operations.
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_get_port_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_get_port_status_.in ()))
-      {
-        get_port_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          get_port_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_get_port_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_get_port_status_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_read_port_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_read_port_status_.in ()))
-      {
-        read_port_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          read_port_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_read_port_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_read_port_status_.in ());
-  }
-
-  ::CCM_ReadGetStarter_ptr
-  Receiver_exec_i::get_reader_start (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_reader_start_.in ()))
-      {
-        reader_start_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          reader_start_exec_i (
-            this->ciao_context_.in (),
-            *this),
-            ::CCM_ReadGetStarter::_nil ());
-
-          this->ciao_reader_start_ = tmp;
-      }
-
-    return
-      ::CCM_ReadGetStarter::_duplicate (
-        this->ciao_reader_start_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::ReadGet_Test::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    if (this->ticker_)
-      {
-        this->reactor ()->cancel_timer (this->ticker_);
-      }
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    if (this->samples_received_reader_ != this->samples_expected_reader_)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: READGET READER: "
-                              "Unexpected number of samples received: "
-                              "expected <%d> - received <%d>\n",
-                              this->samples_expected_reader_,
-                              this->samples_received_reader_));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "READGET READER: "
-                              "Expected number of samples received: "
-                              "expected <%d> - received <%d>\n",
-                              this->samples_expected_reader_,
-                              this->samples_received_reader_));
-      }
-    if (this->samples_received_getter_ != this->samples_expected_getter_)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: READGET GETTER: "
-                              "Unexpected number of samples received: "
-                              "expected <%d> - received <%d>\n",
-                              this->samples_expected_getter_,
-                              this->samples_received_getter_));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "READGET GETTER: "
-                              "Expected number of samples received: "
-                              "expected <%d> - received <%d>\n",
-                              this->samples_expected_getter_,
-                              this->samples_received_getter_));
-      }
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_ReadGet_Test_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h
deleted file mode 100644
index 424abbe32c5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h
+++ /dev/null
@@ -1,256 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_READGET_TEST_RECEIVER_EXEC_MX3XMT_H_
-#define CIAO_READGET_TEST_RECEIVER_EXEC_MX3XMT_H_
-
-#include /**/ "ace/pre.h"
-
-#include "ReadGet_Test_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_ReadGet_Test_Receiver_Impl
-{
-  class Receiver_exec_i;
-
-  /**
-   * read_action_Generator
-   */
-
-  class read_action_Generator
-    : public ACE_Event_Handler
-  {
-  public:
-    read_action_Generator (Receiver_exec_i &callback,
-                           int run);
-
-    ~read_action_Generator ();
-
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    Receiver_exec_i &callback_;
-    int run_;
-
-  };
-
-  /**
-   * Provider Executor Implementation Class: get_port_status_exec_i
-   */
-
-  class get_port_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    get_port_status_exec_i (
-      ::ReadGet_Test::CCM_Receiver_Context_ptr ctx);
-    virtual ~get_port_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::ReadGet_Test::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: read_port_status_exec_i
-   */
-
-  class read_port_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    read_port_status_exec_i (
-      ::ReadGet_Test::CCM_Receiver_Context_ptr ctx);
-    virtual ~read_port_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::ReadGet_Test::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: reader_start_exec_i
-   */
-
-  class reader_start_exec_i
-    : public virtual ::CCM_ReadGetStarter,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    reader_start_exec_i (
-      ::ReadGet_Test::CCM_Receiver_Context_ptr ctx,
-      Receiver_exec_i & callback);
-    virtual ~reader_start_exec_i (void);
-
-    //@{
-    /** Operations and attributes from ReadGetStarter. */
-
-    virtual
-    void set_reader_properties (::CORBA::UShort nr_keys,
-    ::CORBA::UShort nr_iterations);
-
-    virtual
-    void start_read (::CORBA::UShort run);
-    //@}
-
-  private:
-    ::ReadGet_Test::CCM_Receiver_Context_var ciao_context_;
-    Receiver_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_get_port_status (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_read_port_status (void);
-
-    virtual ::CCM_ReadGetStarter_ptr
-    get_reader_start (void);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void iterations (::CORBA::UShort iterations);
-    void keys (::CORBA::UShort keys);
-
-    bool check_last ();
-    void start_read (CORBA::UShort run);
-    void run (CORBA::UShort run);
-    //@}
-
-  private:
-    ::ReadGet_Test::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_get_port_status_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_read_port_status_;
-    ::CCM_ReadGetStarter_var ciao_reader_start_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    CORBA::UShort   iterations_;
-    CORBA::UShort   keys_;
-    bool            has_run_;
-
-    int current_iter_value1_;
-    int current_iter_value2_;
-
-    read_action_Generator *ticker_;
-
-    CORBA::ULong samples_expected_reader_;
-    CORBA::ULong samples_received_reader_;
-    CORBA::ULong samples_expected_getter_;
-    CORBA::ULong samples_received_getter_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void test_all (void);
-    void read_all_on_getter_port (void);
-    void get_all_on_getter_port (void);
-    void read_all_on_reader_port (void);
-    void check_iter_on_getter_port (const QueryConditionTest & sample,
-                                    const char * test);
-    void check_iter_on_reader_port (const QueryConditionTest & sample);
-
-    void check_filter (void);
-    void check_filter_reader (void);
-    void check_filter_getter (void);
-    void test_set_query_parameters (void);
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_ReadGet_Test_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender.idl
deleted file mode 100644
index 7c4c9a22ae9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_QUERY_CONDITION_TEST_SENDER_IDL
-#define DDS_QUERY_CONDITION_TEST_SENDER_IDL
-
-#include "Connector/ReadGet_Test_Connector.idl"
-#include "Base/ReadGet_Starter.idl"
-
-module ReadGet_Test
-{
-  component Sender
-  {
-    port ReadGet_Test::QueryConditionTestConnector::DDS_Write info_write;
-    provides CCM_DDS::ConnectorStatusListener sender_connector_status;
-
-    uses ReadGetStarter start_reader;
-    provides ReadGetRestarter restart_writer;
-
-    attribute unsigned short keys;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender.mpc
deleted file mode 100644
index f0cd858c212..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender.mpc
+++ /dev/null
@@ -1,153 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p ReadGet_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(CFT_ReadGet_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += CFT_ReadGet_Test_Connector_idl_gen CFT_ReadGet_Starter_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I ..
-
-  IDL_Files {
-    ReadGet_Test_Sender.idl
-  }
-}
-
-project(CFT_ReadGet_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += CFT_ReadGet_Test_Sender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    ReadGet_Test_SenderE.idl
-  }
-}
-
-project(CFT_ReadGet_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += CFT_ReadGet_Test_Sender_lem_gen CFT_ReadGet_Test_Sender_stub \
-           CFT_ReadGet_Test_Base_stub CFT_ReadGet_Starter_stub
-  libs  += CFT_ReadGet_Test_Base_stub Sender_stub CFT_ReadGet_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_Test_SenderEC.cpp
-  }
-
-  Header_Files {
-    ReadGet_Test_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    ReadGet_Test_SenderEC.inl
-  }
-}
-
-project(CFT_ReadGet_Test_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += CFT_ReadGet_Test_Sender_idl_gen CFT_ReadGet_Test_Base_stub \
-           CFT_ReadGet_Test_Connector_stub CFT_CFT_ReadGet_Starter_stub \
-           CFT_CFT_ReadGet_Starter_lem_stub
-  libs  += CFT_ReadGet_Test_Base_stub CFT_ReadGet_Test_Connector_stub \
-           CFT_ReadGet_Starter_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_Test_SenderC.cpp
-  }
-
-  Header_Files {
-    ReadGet_Test_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    ReadGet_Test_SenderC.inl
-  }
-}
-
-project(CFT_ReadGet_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += CFT_ReadGet_Test_Sender_lem_stub CFT_ReadGet_Test_Sender_stub \
-             CFT_ReadGet_Test_Connector_lem_stub CFT_ReadGet_Test_Connector_stub \
-             CFT_ReadGet_Starter_lem_stub
-  sharedname = Sender_exec
-  libs    += Sender_stub Sender_lem_stub CFT_ReadGet_Test_Base_stub \
-             CFT_ReadGet_Test_Connector_lem_stub CFT_ReadGet_Test_Connector_stub \
-             CFT_ReadGet_Starter_stub CFT_ReadGet_Starter_lem_stub \
-             CFT_ReadGet_Starter_lem_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_Test_Sender_exec.cpp
-  }
-
-  Header_Files {
-    ReadGet_Test_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(CFT_ReadGet_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += CFT_ReadGet_Test_Base_stub  CFT_ReadGet_Test_Sender_lem_stub \
-                CFT_ReadGet_Test_Connector_stub \
-                CFT_ReadGet_Test_Connector_svnt CFT_ReadGet_Test_Connector_lem_stub \
-                CFT_ReadGet_Starter_stub CFT_ReadGet_Starter_svnt \
-                CFT_ReadGet_Starter_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub CFT_ReadGet_Test_Base_stub \
-                CFT_ReadGet_Test_Connector_stub CFT_ReadGet_Test_Connector_svnt \
-                CFT_ReadGet_Test_Connector_lem_stub CFT_ReadGet_Starter_stub \
-                CFT_ReadGet_Starter_svnt CFT_ReadGet_Starter_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_Test_SenderS.cpp
-    ReadGet_Test_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    ReadGet_Test_SenderS.h
-    ReadGet_Test_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp
deleted file mode 100644
index 15937591fce..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp
+++ /dev/null
@@ -1,338 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "ReadGet_Test_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-#define ITERATIONS 20
-
-namespace CIAO_ReadGet_Test_Sender_Impl
-{
-  /**
-   * WriteHandler
-   */
-
-  WriteHandler::WriteHandler (Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  WriteHandler::handle_exception (ACE_HANDLE)
-  {
-    this->callback_.start ();
-    return 0;
-  }
-
-  /**
-   * Facet Executor Implementation Class: restart_writer_exec_i
-   */
-
-  restart_writer_exec_i::restart_writer_exec_i (
-        ::ReadGet_Test::CCM_Sender_Context_ptr ctx,
-        Sender_exec_i & callback)
-    : ciao_context_ (
-        ::ReadGet_Test::CCM_Sender_Context::_duplicate (ctx))
-      , callback_ (callback)
-  {
-  }
-
-  restart_writer_exec_i::~restart_writer_exec_i (void)
-  {
-  }
-
-  // Operations from ::ReadGetRestarter
-
-  void
-  restart_writer_exec_i::restart_write (void)
-  {
-    this->callback_.restart ();
-  }
-
-  /**
-   * Component Executor Implementation Class: ConnectorStatusListener_exec_i
-   */
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (
-    Sender_exec_i &callback)
-    : callback_ (callback)
-    , started_ (false)
-  {
-  }
-
-  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic (
-    ::DDS::Topic_ptr /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status(
-    ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind status_kind)
-  {
-    if (!this->started_ && status_kind == ::DDS::PUBLICATION_MATCHED_STATUS)
-      {
-        this->started_ = true;
-        this->callback_.get_started ();
-      }
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : keys_ (5)
-      , iterations_ (ITERATIONS)
-      , run_ (1)
-      , wh_ (0)
-  {
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-  }
-
-  // Component attributes and port operations.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  ::CCM_ReadGetRestarter_ptr
-  Sender_exec_i::get_restart_writer (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_restart_writer_.in ()))
-      {
-        restart_writer_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          restart_writer_exec_i (
-            this->ciao_context_.in (),
-            *this),
-            ::CCM_ReadGetRestarter::_nil ());
-
-          this->ciao_restart_writer_ = tmp;
-      }
-
-    return
-      ::CCM_ReadGetRestarter::_duplicate (
-        this->ciao_restart_writer_.in ());
-  }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_sender_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i (*this);
-  }
-
-  void
-  Sender_exec_i::restart (void)
-  {
-    ++this->run_;
-    delete this->wh_;
-    ACE_NEW_THROW_EX (this->wh_,
-                      WriteHandler (*this),
-                      CORBA::INTERNAL ());
-    this->reactor ()->notify (this->wh_);
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    ::ReadGet_Test::QueryConditionTestConnector::Writer_var writer =
-      this->ciao_context_->get_connection_info_write_data ();
-    ReadGetStarter_var starter =
-      this->ciao_context_->get_connection_start_reader ();
-
-    if (::CORBA::is_nil (starter.in ()) ||
-        ::CORBA::is_nil (writer.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Sender_exec_i::start - ")
-                              ACE_TEXT ("Unable to start the reader\n")));
-        return;
-      }
-    starter->set_reader_properties (this->keys_, this->iterations_);
-
-    if (this->run_ > 1)
-      {
-        for (CORBA::UShort iter_key = 1; iter_key < this->keys_ + 1; ++iter_key)
-          {
-            char key[7];
-            QueryConditionTest new_key;
-            ACE_OS::sprintf (key, "KEY_%d", iter_key);
-            new_key.symbol = CORBA::string_dup(key);
-            CORBA::UShort iter = 1;
-            if (this->run_ == 3)
-              {
-                iter = this->iterations_ + 1;
-              }
-            while (iter < (this->run_ - 1) * this->iterations_ + 1)
-              {
-                new_key.iteration = iter;
-                writer->write_one (new_key, ::DDS::HANDLE_NIL);
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Written key <%C> with <%d>\n"),
-                            key, iter));
-                ++iter;
-              }
-          }
-        ACE_OS::sleep (1);
-      }
-    starter->start_read (this->run_);
-  }
-
-  void
-  Sender_exec_i::get_started (void)
-  {
-    try
-      {
-        ACE_NEW_THROW_EX (this->wh_,
-                          WriteHandler (*this),
-                          CORBA::INTERNAL ());
-        this->reactor ()->notify (this->wh_);
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("Exception caught:");
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: GET_CONNECTION_START_READER : Exception caught\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: GET_CONNECTION_START_READER : Unknown exception caught\n")));
-      }
-  }
-
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::ReadGet_Test::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    delete this->wh_;
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_ReadGet_Test_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.h
deleted file mode 100644
index 48723c18067..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.h
+++ /dev/null
@@ -1,195 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_READGET_TEST_SENDER_EXEC_2M2XYF_H_
-#define CIAO_READGET_TEST_SENDER_EXEC_2M2XYF_H_
-
-#include /**/ "ace/pre.h"
-
-#include "ReadGet_Test_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_ReadGet_Test_Sender_Impl
-{
-  class Sender_exec_i;
-
-  /**
-   * WriteHandler
-   */
-  class WriteHandler :
-    public ACE_Event_Handler
-  {
-  public:
-    WriteHandler (Sender_exec_i &callback);
-    virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: restart_writer_exec_i
-   */
-
-  class restart_writer_exec_i
-    : public virtual ::CCM_ReadGetRestarter,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    restart_writer_exec_i (
-      ::ReadGet_Test::CCM_Sender_Context_ptr ctx,
-      Sender_exec_i & callback);
-    virtual ~restart_writer_exec_i (void);
-
-    //@{
-    /** Operations and attributes from ReadGetRestarter. */
-
-    virtual
-    void restart_write (void);
-    //@}
-
-  private:
-    ::ReadGet_Test::CCM_Sender_Context_var ciao_context_;
-    Sender_exec_i & callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: ConnectorStatusListener_exec_i
-   */
-  class SENDER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Sender_exec_i &callback);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-      void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                                 ::DDS::StatusKind status_kind);
-  private:
-    Sender_exec_i &callback_;
-    bool started_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CCM_ReadGetRestarter_ptr
-    get_restart_writer (void);
-
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_sender_connector_status (void);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void get_started (void);
-    void start (void);
-    void restart (void);
-    //@}
-
-  private:
-    ::ReadGet_Test::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::CCM_ReadGetRestarter_var ciao_restart_writer_;
-
-    ::CORBA::UShort keys_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    CORBA::UShort iterations_;
-    CORBA::UShort run_;
-    WriteHandler *wh_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_ReadGet_Test_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/Plan.cdp
deleted file mode 100644
index a972b294dd1..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/Plan.cdp
+++ /dev/null
@@ -1,622 +0,0 @@
-<!--  -->
-<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>ReadGet_Test_Depl_1</label>
-  <UUID>ReadGet_Test_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_ReadGet_Test_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_ReadGet_Test_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="ReadGet_Test_ReceiverConnectorImplementation">
-    <name>ReadGet_Test_ReceiverConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="ReadGet_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="ReadGet_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_ReadGet_Test_QueryConditionTestConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_ReadGet_Test_QueryConditionTestConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CFT_ReadGet_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CFT_ReadGet_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="ReadGet_Test_SenderConnectorImplementation">
-    <name>ReadGet_Test_ReceiverConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="ReadGet_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="ReadGet_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_ReadGet_Test_QueryConditionTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_ReadGet_Test_QueryConditionTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CFT_ReadGet_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CFT_ReadGet_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_ReadGet_Test_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_ReadGet_Test_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-  </instance>
-
-  <instance xmi:id="ReadGet_Test_SenderConnectorInstance">
-    <name>ReadGet_Test_SenderConnector</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReadGet_Test_SenderConnectorImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QueryCondition_Library#QueryConditionProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReadGet_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="ReadGet_Test_ReceiverConnectorInstance">
-    <name>ReadGet_Test_ReceiverConnector</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReadGet_Test_ReceiverConnectorImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QueryCondition_Library#QueryConditionProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReadGet_Test</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>pull_observer_filter</name>
-      <value>
-        <type>
-          <kind>tk_struct</kind>
-          <struct>
-            <name>QueryFilter</name>
-            <typeId>IDL:CCM_DDS/QueryFilter:1.0</typeId>
-            <member>
-              <name>expression</name>
-              <type>
-                <kind>tk_string</kind>
-              </type>
-            </member>
-            <member>
-              <name>parameters</name>
-              <type>
-                <kind>tk_sequence</kind>
-                <sequence>
-                  <elementType>
-                    <kind>tk_string</kind>
-                  </elementType>
-                </sequence>
-              </type>
-            </member>
-          </struct>
-        </type>
-        <value>
-          <member>
-            <name>expression</name>
-            <value>
-              <string>( (iteration > %0) AND (iteration &lt; %1) )</string>
-            </value>
-          </member>
-          <member>
-            <name>parameters</name>
-            <value>
-              <element>
-                <string>2</string>
-              </element>
-              <element>
-                <string>5</string>
-              </element>
-            </value>
-          </member>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>passive_observer_filter</name>
-      <value>
-        <type>
-          <kind>tk_struct</kind>
-          <struct>
-            <name>QueryFilter</name>
-            <typeId>IDL:CCM_DDS/QueryFilter:1.0</typeId>
-            <member>
-              <name>expression</name>
-              <type>
-                <kind>tk_string</kind>
-              </type>
-            </member>
-            <member>
-              <name>parameters</name>
-              <type>
-                <kind>tk_sequence</kind>
-                <sequence>
-                  <elementType>
-                    <kind>tk_string</kind>
-                  </elementType>
-                </sequence>
-              </type>
-            </member>
-          </struct>
-        </type>
-        <value>
-          <member>
-            <name>expression</name>
-            <value>
-              <string>( (iteration &lt; %0) OR (iteration > %1) )</string>
-            </value>
-          </member>
-          <member>
-            <name>parameters</name>
-            <value>
-              <element>
-                <string>2</string>
-              </element>
-              <element>
-                <string>5</string>
-              </element>
-            </value>
-          </member>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>8</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>read_port_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>read_port_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>passive_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReadGet_Test_ReceiverConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>get_port_fresh_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>get_port_fresh_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_observer_fresh_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReadGet_Test_ReceiverConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>get_port_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>get_port_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReadGet_Test_ReceiverConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>get_port_filter_config</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>get_port_filter_config</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_observer_filter_config</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReadGet_Test_ReceiverConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>read_port_filter_config</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>read_port_filter_config</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>passive_observer_filter_config</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReadGet_Test_ReceiverConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReadGet_Test_SenderConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>reader_starter</name>
-    <internalEndpoint>
-      <portName>start_reader</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>reader_start</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>restart_writer</name>
-    <internalEndpoint>
-      <portName>writer_restart</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>restart_writer</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>sender_connector_status_sender</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>sender_connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReadGet_Test_SenderConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="ReadGet_Test_Connector_ExecArtifact">
-    <name>CFT_ReadGet_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>CFT_ReadGet_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="ReadGet_Test_Connector_SvntArtifact">
-    <name>CFT_ReadGet_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>CFT_ReadGet_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="ReadGet_Test_Connector_StubArtifact">
-    <name>CFT_ReadGet_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>ReadGet_Test_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/QueryCondition_Library.xml b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/QueryCondition_Library.xml
deleted file mode 100644
index b9cba6277a3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/QueryCondition_Library.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-
-  <qos_profile name="QueryConditionProfile">
-    <!-- QoS used to configure the data writer created in the example code -->
-    <datawriter_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-        <max_blocking_time>
-          <sec>10</sec>
-          <nanosec>0</nanosec>
-        </max_blocking_time>
-      </reliability>
-      <durability>
-        <kind>TRANSIENT_DURABILITY_QOS</kind>
-      </durability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-    </datawriter_qos>
-    <!-- QoS used to configure the data reader created in the example code -->
-    <datareader_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-      </reliability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-      <durability>
-        <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-      </durability>
-    </datareader_qos>
-  </qos_profile>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index 37e7ff8dec9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-Description
-XML QoS Profile
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="QueryCondition_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="QueryConditionProfile" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>10</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/run_test.pl
deleted file mode 100755
index 638d55cd247..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 30 seconds to allow task to complete\n";
-sleep (30);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -s\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.idl
deleted file mode 100644
index da7e51836c0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file CFTLS_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_BASE_IDL
-#define CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/CFTLS_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/CFTLS_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "ContentFilteredTopicListenStateTest"
-#pragma DCPS_DATA_KEY "ContentFilteredTopicListenStateTest key"
-
-struct ContentFilteredTopicListenStateTest {
-  string key; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<ContentFilteredTopicListenStateTest> ContentFilteredTopicListenStateTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.mpc
deleted file mode 100644
index 5b30e442ccf..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_CFTLS_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_CFTLS_Test_Base_stub
-  dynamicflags += CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=CFTLS_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    CFTLS_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    CFTLS_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.idl
deleted file mode 100644
index 84dbf35b5a0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file CFTLS_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_CONNECTOR_IDL_
-#define CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/CFTLS_Test_Base.idl"
-
-#pragma ciao lem "Connector/CFTLS_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/CFTLS_Test_BaseTypeSupport.idl"
-#endif
-
-module CFTLS_Test
-{
-  module ::CCM_DDS::Typed < ::ContentFilteredTopicListenStateTest, ::ContentFilteredTopicListenStateTestSeq> ContentFilteredTopicListenStateTestConnector;
-};
-
-#endif /* CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.mpc
deleted file mode 100644
index 8ac8d9af7a9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_CFTLS_Test_Base -l .. -o ../lib -u DDS CFTLS_Test_Connector"
-
-project(DDS_CFTLS_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_CFTLS_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=CFTLS_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=CFTLS_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=CFTLS_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=CFTLS_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    CFTLS_Test_Connector.idl
-  }
-}
-
-project(DDS_CFTLS_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_CFTLS_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=CFTLS_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    CFTLS_Test_ConnectorE.idl
-  }
-}
-
-project(DDS_CFTLS_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_CFTLS_Test_Connector_lem_gen DDS_CFTLS_Test_Connector_stub DDS_CFTLS_Test_Base_stub
-  libs  += DDS_CFTLS_Test_Base_stub DDS_CFTLS_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_CFTLS_Test_Connector_lem_stub
-  dynamicflags += CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFTLS_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    CFTLS_Test_ConnectorEC.h
-    CFTLS_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    CFTLS_Test_ConnectorEC.inl
-  }
-}
-
-project(DDS_CFTLS_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_CFTLS_Test_Connector_idl_gen DDS_CFTLS_Test_Base_stub
-  libs  += DDS_CFTLS_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_CFTLS_Test_Connector_stub
-  dynamicflags += CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFTLS_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    CFTLS_Test_ConnectorC.h
-    CFTLS_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    CFTLS_Test_ConnectorC.inl
-  }
-}
-
-project(DDS_CFTLS_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_CFTLS_Test_Connector_lem_stub DDS_CFTLS_Test_Connector_stub DDS_CFTLS_Test_Base_stub
-  sharedname = DDS_CFTLS_Test_Connector_exec
-  libs += DDS_CFTLS_Test_Connector_stub DDS_CFTLS_Test_Connector_lem_stub DDS_CFTLS_Test_Base_stub DDS_CFTLS_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFTLS_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    CFTLS_Test_Connector_conn.h
-    CFTLS_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_CFTLS_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_CFTLS_Test_Connector_lem_stub DDS_CFTLS_Test_Connector_exec DDS_CFTLS_Test_Connector_stub
-  sharedname  = DDS_CFTLS_Test_Connector_svnt
-  libs       += DDS_CFTLS_Test_Connector_stub \
-                DDS_CFTLS_Test_Connector_lem_stub  \
-                DDS_CFTLS_Test_Base_stub \
-                DDS_CFTLS_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFTLS_Test_ConnectorS.cpp
-    CFTLS_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    CFTLS_Test_ConnectorS.h
-    CFTLS_Test_Connector_svnt.h
-    CFTLS_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver.idl
deleted file mode 100644
index c0a22c26b01..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/CFTLS_Test_Connector.idl"
-
-module CFTLS_Test
-{
-  component Receiver
-  {
-    port ContentFilteredTopicListenStateTestConnector::DDS_StateListen info_state;
-
-    attribute unsigned short keys;
-    attribute unsigned short iterations;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver.mpc
deleted file mode 100644
index f881b671225..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-project(DDS_CFTLS_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_CFTLS_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h -I..
-
-  IDL_Files {
-    CFTLS_Test_Receiver.idl
-  }
-}
-
-project(DDS_CFTLS_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_CFTLS_Test_Receiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    CFTLS_Test_ReceiverE.idl
-  }
-}
-
-project(DDS_CFTLS_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_CFTLS_Test_Receiver_lem_gen DDS_CFTLS_Test_Receiver_stub  \
-           DDS_CFTLS_Test_Connector_stub DDS_CFTLS_Test_Base_stub
-  libs  +=  Receiver_stub DDS_CFTLS_Test_Connector_stub \
-            DDS_CFTLS_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFTLS_Test_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    CFTLS_Test_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    CFTLS_Test_ReceiverEC.inl
-  }
-}
-
-project(DDS_CFTLS_Test_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_CFTLS_Test_Receiver_idl_gen  DDS_CFTLS_Test_Connector_stub \
-           DDS_CFTLS_Test_Base_stub DDS_CFTLS_Test_Connector_lem_gen
-  libs  += DDS_CFTLS_Test_Connector_stub DDS_CFTLS_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFTLS_Test_ReceiverC.cpp
-  }
-
-  Header_Files {
-    CFTLS_Test_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    CFTLS_Test_ReceiverC.inl
-  }
-}
-
-project(DDS_CFTLS_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_CFTLS_Test_Receiver_lem_stub DDS_CFTLS_Test_Receiver_stub \
-             DDS_CFTLS_Test_Base_stub DDS_CFTLS_Test_Connector_stub \
-             DDS_CFTLS_Test_Connector_lem_stub 
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_CFTLS_Test_Base_stub \
-          DDS_CFTLS_Test_Connector_stub DDS_CFTLS_Test_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFTLS_Test_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    CFTLS_Test_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_CFTLS_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_CFTLS_Test_Receiver_lem_stub DDS_CFTLS_Test_Base_stub \
-                  DDS_CFTLS_Test_Connector_stub DDS_CFTLS_Test_Connector_svnt \
-                  DDS_CFTLS_Test_Receiver_exec DDS_CFTLS_Test_Connector_lem_stub 
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_CFTLS_Test_Base_stub \
-                DDS_CFTLS_Test_Connector_stub DDS_CFTLS_Test_Connector_svnt \
-                Receiver_exec DDS_CFTLS_Test_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFTLS_Test_ReceiverS.cpp
-    CFTLS_Test_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    CFTLS_Test_ReceiverS.h
-    CFTLS_Test_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.cpp
deleted file mode 100644
index 5aeaa515d78..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.cpp
+++ /dev/null
@@ -1,271 +0,0 @@
-// -*- C++ -*-
-#include "CFTLS_Test_Receiver_exec.h"
-#include "ace/Log_Msg.h"
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-#define QUERY "( (iteration > %0) AND (iteration < %1) )"
-
-#define MIN_ITERATION "2"
-#define MAX_ITERATION "5"
-
-#define SAMPLES_PER_KEY 2 //only iteration 3 and 4 should be coming in....
-
-namespace CIAO_CFTLS_Test_Receiver_Impl
-{
-  //============================================================
-  // ContentFilteredTopicListenStateTest_Listener_exec_i
-  //============================================================
-  ContentFilteredTopicListenStateTest_Listener::ContentFilteredTopicListenStateTest_Listener (
-                                              ACE_Thread_ID &thread_id,
-                                              Atomic_Long &samples_received)
-    : thread_id_ (thread_id),
-      samples_received_ (samples_received)
-  {
-  }
-
-  ContentFilteredTopicListenStateTest_Listener::~ContentFilteredTopicListenStateTest_Listener (void)
-  {
-  }
-
-  void
-  ContentFilteredTopicListenStateTest_Listener::on_creation (
-                      const ContentFilteredTopicListenStateTest& an_instance,
-                      const CCM_DDS::ReadInfo& /*read_info*/)
-  {
-    ++this->samples_received_;
-
-    ACE_DEBUG ((LM_DEBUG, "ContentFilteredTopicListenStateTest_Listener::on_creation: "
-                            "key <%C> - iteration <%d>\n",
-                            an_instance.key.in (),
-                            an_instance.iteration));
-    if (an_instance.iteration <= ACE_OS::atoi (MIN_ITERATION) ||
-        an_instance.iteration  > ACE_OS::atoi (MAX_ITERATION) )
-      {
-        ACE_ERROR ((LM_ERROR, "ContentFilteredTopicListenStateTest_Listener::on_creation: "
-                              "ERROR: Unexpected iteration received.\n"));
-      }
-  }
-
-  void
-  ContentFilteredTopicListenStateTest_Listener::on_one_update (
-                      const ContentFilteredTopicListenStateTest& an_instance,
-                      const CCM_DDS::ReadInfo& /*read_info*/)
-  {
-    ACE_Thread_ID t_id;
-    this->thread_id_ = t_id;
-    ++this->samples_received_;
-
-    ACE_DEBUG ((LM_DEBUG, "ContentFilteredTopicListenStateTest_Listener::on_one_update: "
-                            "key <%C> - iteration <%d>\n",
-                            an_instance.key.in (),
-                            an_instance.iteration));
-
-    if (an_instance.iteration <= ACE_OS::atoi (MIN_ITERATION) ||
-        an_instance.iteration  > ACE_OS::atoi (MAX_ITERATION) )
-      {
-        ACE_ERROR ((LM_ERROR, "ContentFilteredTopicListenStateTest_Listener::on_one_update: "
-                              "ERROR: Unexpected iteration received.\n"));
-      }
-  }
-
-  void
-  ContentFilteredTopicListenStateTest_Listener::on_many_updates (
-                      const ContentFilteredTopicListenStateTestSeq& /*an_instance*/,
-                      const CCM_DDS::ReadInfoSeq& /*read_info*/)
-  {
-  }
-
-  void
-  ContentFilteredTopicListenStateTest_Listener::on_deletion (
-                      const ContentFilteredTopicListenStateTest& /*an_instance*/,
-                      const CCM_DDS::ReadInfo& /*read_info*/)
-  {
-  }
-
-  //============================================================
-  // Receiver_exec_i
-  //============================================================
-  Receiver_exec_i::Receiver_exec_i (void)
-    : thread_id_listener_ (0, 0),
-      iterations_ (10),
-      keys_ (5),
-      samples_expected_ (keys_ * SAMPLES_PER_KEY),
-      samples_received_ (0)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::start ()
-  {
-    ::CCM_DDS::DataListenerControl_var dlc =
-        this->context_->get_connection_info_state_data_control ();
-    dlc->mode (::CCM_DDS::ONE_BY_ONE);
-  }
-
-  ::CFTLS_Test::ContentFilteredTopicListenStateTestConnector::CCM_StateListener_ptr
-  Receiver_exec_i::get_info_state_data_listener (void)
-  {
-    return new ContentFilteredTopicListenStateTest_Listener (
-                this->thread_id_listener_,
-                this->samples_received_);
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_state_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Receiver_exec_i::iterations (::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Receiver_exec_i::keys (::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-
-    this->samples_expected_ = SAMPLES_PER_KEY * this->keys_;
-  }
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::CFTLS_Test::CCM_Receiver_Context::_narrow (ctx);
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    ::CFTLS_Test::ContentFilteredTopicListenStateTestConnector::Reader_var reader =
-      this->context_->get_connection_info_state_data ();
-    if (CORBA::is_nil (reader.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::configuration_complete - "
-                              "Error get reader connection.\n"));
-      }
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_activate - "
-                          "Start listening.\n"));
-    start ();
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    char ccm_buf [65];
-    ACE_Thread_ID ccm_thread_id;
-    ccm_thread_id.to_string (ccm_buf);
-
-    char list_buf [65];
-    this->thread_id_listener_.to_string (list_buf);
-
-
-    if (this->thread_id_listener_.id () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
-                              "Thread ID for ReaderListener not set!\n"));
-      }
-    #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (this->thread_id_listener_ == ccm_thread_id)
-      {
-        ACE_DEBUG ((LM_DEBUG, "CFT_STATE: "
-                              "Thread switch for ReaderListener seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                               "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-     }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: CFT_STATE: "
-                              "Thread switch for ReaderListener "
-                              "doesn't seem to work! "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-     }
-    #else
-    else if (this->thread_id_listener_ == ccm_thread_id)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: CFT_STATE: ReaderListener: "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "CFT_STATE: ReaderListener: "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-     }
-    #endif
-
-    if (this->samples_received_ != this->samples_expected_)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: CFT_STATE: ReaderListener: "
-                              "Unexpected number of samples received: "
-                              "expected <%d> - received <%d>\n",
-                              this->samples_expected_,
-                              this->samples_received_.value ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "CFT_STATE: ReaderListener: "
-                              "Expected number of samples received: "
-                              "expected <%d> - received <%d>\n",
-                              this->samples_expected_,
-                              this->samples_received_.value ()));
-      }
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CFTLS_Test_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.h
deleted file mode 100644
index 656dbaa4846..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.h
+++ /dev/null
@@ -1,111 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_RECEIVER_EXEC_H_
-#define CIAO_RECEIVER_EXEC_H_
-
-#include "CFTLS_Test_ReceiverEC.h"
-
-#include /**/ "Receiver_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-#include "ace/OS_NS_Thread.h"
-
-#include "ace/Task.h"
-
-namespace CIAO_CFTLS_Test_Receiver_Impl
-{
-  class Receiver_exec_i;
-
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Long> Atomic_Long;
-
-  //============================================================
-  // ContentFilteredTopicListenStateTest_Listener_exec_i
-  //============================================================
-  class RECEIVER_EXEC_Export ContentFilteredTopicListenStateTest_Listener
-    : public virtual ::CFTLS_Test::ContentFilteredTopicListenStateTestConnector::CCM_StateListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ContentFilteredTopicListenStateTest_Listener (
-                            ACE_Thread_ID &thread_id,
-                            Atomic_Long &samples_received);
-    virtual ~ContentFilteredTopicListenStateTest_Listener (void);
-
-    virtual void
-    on_creation (const ContentFilteredTopicListenStateTest& an_instance,
-                 const CCM_DDS::ReadInfo& read_info);
-
-    virtual void
-    on_one_update (const ContentFilteredTopicListenStateTest& an_instance,
-                   const CCM_DDS::ReadInfo& read_info);
-
-    virtual void
-    on_many_updates (const ContentFilteredTopicListenStateTestSeq& an_instance,
-                     const CCM_DDS::ReadInfoSeq& read_info);
-
-    virtual void
-    on_deletion (const ContentFilteredTopicListenStateTest& an_instance,
-                 const CCM_DDS::ReadInfo& read_info);
-
-  private:
-    ACE_Thread_ID &thread_id_;
-    Atomic_Long &samples_received_;
-  };
-
-  //============================================================
-  // Receiver_exec_i
-  //============================================================
-  class RECEIVER_EXEC_Export Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    void start ();
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-
-    virtual ::CFTLS_Test::ContentFilteredTopicListenStateTestConnector::CCM_StateListener_ptr
-    get_info_state_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_state_status (void);
-
-    virtual void
-    set_session_context (
-      ::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete (void);
-
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-
-  private:
-    ::CFTLS_Test::CCM_Receiver_Context_var context_;
-
-    ACE_Thread_ID thread_id_listener_;
-
-    CORBA::UShort iterations_;
-    CORBA::UShort keys_;
-
-    CORBA::Long samples_expected_;
-    Atomic_Long samples_received_;
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CFTLS_Test_Receiver_Impl (void);
-}
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender.idl
deleted file mode 100644
index 1d30d34f57a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender.idl
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_SENDER_IDL
-#define DDS_CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_SENDER_IDL
-
-#include "Connector/CFTLS_Test_Connector.idl"
-
-module CFTLS_Test
-{
-  component Sender
-  {
-    port ContentFilteredTopicListenStateTestConnector::DDS_Update info_update;
-
-    attribute unsigned short keys;
-    attribute unsigned short iterations;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender.mpc
deleted file mode 100644
index 1fdabb4b0cc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_CFTLS_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_CFTLS_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_CFTLS_Test_Connector_idl_gen DDS_Starter_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I ..
-
-  IDL_Files {
-    CFTLS_Test_Sender.idl
-  }
-}
-
-project(DDS_CFTLS_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_CFTLS_Test_Sender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    CFTLS_Test_SenderE.idl
-  }
-}
-
-project(DDS_CFTLS_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_CFTLS_Test_Sender_lem_gen DDS_CFTLS_Test_Sender_stub \
-           DDS_CFTLS_Test_Base_stub
-  libs  += DDS_CFTLS_Test_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFTLS_Test_SenderEC.cpp
-  }
-
-  Header_Files {
-    CFTLS_Test_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    CFTLS_Test_SenderEC.inl
-  }
-}
-
-project(DDS_CFTLS_Test_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_CFTLS_Test_Sender_idl_gen DDS_CFTLS_Test_Base_stub \
-           DDS_CFTLS_Test_Connector_stub
-  libs  += DDS_CFTLS_Test_Base_stub DDS_CFTLS_Test_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFTLS_Test_SenderC.cpp
-  }
-
-  Header_Files {
-    CFTLS_Test_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    CFTLS_Test_SenderC.inl
-  }
-}
-
-project(DDS_CFTLS_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_CFTLS_Test_Sender_lem_stub DDS_CFTLS_Test_Sender_stub \
-             DDS_CFTLS_Test_Connector_lem_stub DDS_CFTLS_Test_Connector_stub 
-  sharedname = Sender_exec
-  libs    += Sender_stub Sender_lem_stub DDS_CFTLS_Test_Base_stub \
-             DDS_CFTLS_Test_Connector_lem_stub DDS_CFTLS_Test_Connector_stub 
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFTLS_Test_Sender_exec.cpp
-  }
-
-  Header_Files {
-    CFTLS_Test_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_CFTLS_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_CFTLS_Test_Base_stub  DDS_CFTLS_Test_Sender_lem_stub \
-                DDS_CFTLS_Test_Connector_stub \
-                DDS_CFTLS_Test_Connector_svnt DDS_CFTLS_Test_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub DDS_CFTLS_Test_Base_stub \
-                DDS_CFTLS_Test_Connector_stub DDS_CFTLS_Test_Connector_svnt \
-                DDS_CFTLS_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFTLS_Test_SenderS.cpp
-    CFTLS_Test_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    CFTLS_Test_SenderS.h
-    CFTLS_Test_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender_exec.cpp
deleted file mode 100644
index ba27bdbbc04..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender_exec.cpp
+++ /dev/null
@@ -1,241 +0,0 @@
-// -*- C++ -*-
-#include "CFTLS_Test_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-#include "ace/Log_Msg.h"
-#include "ace/Date_Time.h"
-
-namespace CIAO_CFTLS_Test_Sender_Impl
-{
-  /**
-   * StartHandler
-   */
-  StartHandler::StartHandler(Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-    this->reference_counting_policy ().value
-      (ACE_Event_Handler::Reference_Counting_Policy::ENABLED);
-  }
-
-  int
-  StartHandler::handle_exception (ACE_HANDLE)
-  {
-    this->callback_.run ();
-    return 0;
-  }
-
-  /**
-   * UpdateTicker
-   */
-  UpdateTicker::UpdateTicker (Sender_exec_i &callback)
-    : callback_ (callback),
-      last_iter_ (0)
-  {
-  }
-
-  int
-  UpdateTicker::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    // Notify the subscribers
-    this->callback_.update_one (++this->last_iter_);
-    return 0;
-  }
-
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : keys_ (5)
-      , iterations_ (10)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      UpdateTicker (*this),
-                      CORBA::INTERNAL ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  void
-  Sender_exec_i::update_one (CORBA::UShort iter)
-  {
-    ::CFTLS_Test::ContentFilteredTopicListenStateTestConnector::Updater_var
-      updater = this->ciao_context_->get_connection_info_update_data ();
-    if (iter <= this->iterations ())
-      {
-        for (CORBA::UShort i = 1; i < this->keys () + 1; ++i)
-          {
-            char key[7];
-            ACE_OS::sprintf (key, "KEY_%d", i);
-            ContentFilteredTopicListenStateTest update_key;
-            update_key.key = CORBA::string_dup (key);
-            update_key.iteration = iter;
-            updater->update_one (update_key, ::DDS::HANDLE_NIL);
-            ACE_DEBUG ((LM_DEBUG, "Updated key <%C> - <%u>\n",
-                          key, iter));
-
-          }
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::update_one - "
-                              "Finished updating. Cancel Timer.\n"));
-        this->reactor ()->cancel_timer (this->ticker_);
-      }
-  }
-
-  void
-  Sender_exec_i::run ()
-  {
-    ::CFTLS_Test::ContentFilteredTopicListenStateTestConnector::Updater_var
-      updater = this->ciao_context_->get_connection_info_update_data ();
-
-    // First create the instances for consecutive updating.
-    for (CORBA::UShort i = 1; i < this->keys () + 1; ++i)
-      {
-        char key[7];
-        ACE_OS::sprintf (key, "KEY_%d", i);
-        ContentFilteredTopicListenStateTest new_key;
-        new_key.key = CORBA::string_dup(key);
-        new_key.iteration = 0;
-        updater->create_one (new_key);
-      }
-
-   if (this->reactor ()->schedule_timer (
-                this->ticker_,
-                0,
-                ACE_Time_Value (5, 50000),
-                ACE_Time_Value (0, 50000)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::run : ")
-                              ACE_TEXT ("Error scheduling timer")));
-      }
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    StartHandler* rh = 0;
-    ACE_NEW (rh,
-             StartHandler (*this));
-    ACE_Event_Handler_var safe_handler (rh);
-    this->reactor ()->notify (rh);
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  // Component attributes and port operations.
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::CFTLS_Test::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-    try
-      {
-        start ();
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("Exception caught:");
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Sender_exec_i::ccm_activate: Exception caught\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Sender_exec_i::ccm_activate: Unknown exception caught\n")));
-      }
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CFTLS_Test_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender_exec.h
deleted file mode 100644
index df81462c9e2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender_exec.h
+++ /dev/null
@@ -1,123 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_CFTLS_TEST_SENDER_EXEC_NYP61D_H_
-#define CIAO_CFTLS_TEST_SENDER_EXEC_NYP61D_H_
-
-#include /**/ "ace/pre.h"
-
-#include "CFTLS_Test_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_CFTLS_Test_Sender_Impl
-{
-  class Sender_exec_i;
-
-  /**
-   * StartHandler
-   */
-  class StartHandler : public ACE_Event_Handler
-  {
-  public:
-    StartHandler (Sender_exec_i &callback);
-    virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * UpdateTicker
-   */
-  class UpdateTicker : public ACE_Event_Handler
-  {
-  public:
-    UpdateTicker (Sender_exec_i &callback);
-    int handle_timeout (const ACE_Time_Value &, const void *);
-  private:
-    /// Maintains a handle that actually process the event
-    Sender_exec_i &callback_;
-    CORBA::UShort last_iter_;
-  };
-
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void start (void);
-    void run (void);
-    void update_one (CORBA::UShort iter);
-    //@}
-
-  private:
-    ::CFTLS_Test::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-
-    ::CORBA::UShort keys_;
-
-    ::CORBA::UShort iterations_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    UpdateTicker *ticker_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CFTLS_Test_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/descriptors/Plan.cdp
deleted file mode 100644
index e9c9826a614..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/descriptors/Plan.cdp
+++ /dev/null
@@ -1,441 +0,0 @@
-<!--  -->
-<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>CFTLS_Test_Depl_1</label>
-  <UUID>CFTLS_Test_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CFTLS_Test_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CFTLS_Test_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="CFTLS_Test_ConnectorComponentImplementation">
-    <name>CFTLS_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="CFTLS_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="CFTLS_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CFTLS_Test_ContentFilteredTopicListenStateTestConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CFTLS_Test_ContentFilteredTopicListenStateTestConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CFTLS_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CFTLS_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CFTLS_Test_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CFTLS_Test_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="CFTLS_Test_ConnectorComponentInstance">
-    <name>CFTLS_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="CFTLS_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CFTLS_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="CFTLS_Test_ConnectorComponentInstance2">
-    <name>CFTLS_Test_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="CFTLS_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CFTLS_Test</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>push_state_observer_filter</name>
-      <value>
-        <type>
-          <kind>tk_struct</kind>
-          <struct>
-            <name>QueryFilter</name>
-            <typeId>IDL:CCM_DDS/QueryFilter:1.0</typeId>
-            <member>
-              <name>expression</name>
-              <type>
-                <kind>tk_string</kind>
-              </type>
-            </member>
-            <member>
-              <name>parameters</name>
-              <type>
-                <kind>tk_sequence</kind>
-                <sequence>
-                  <elementType>
-                    <kind>tk_string</kind>
-                  </elementType>
-                </sequence>
-              </type>
-            </member>
-          </struct>
-        </type>
-        <value>
-          <member>
-            <name>expression</name>
-            <value>
-              <string>( (iteration > %0) AND (iteration &lt; %1) )</string>
-            </value>
-          </member>
-          <member>
-            <name>parameters</name>
-            <value>
-              <element>
-                <string>2</string>
-              </element>
-              <element>
-                <string>5</string>
-              </element>
-            </value>
-          </member>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>info_state_rdr</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_state_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CFTLS_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_state_dl</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_state_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CFTLS_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_state_dc</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_state_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CFTLS_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>updater_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_update_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>observable_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CFTLS_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="CFTLS_Test_Connector_ExecArtifact">
-    <name>CFTLS_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_CFTLS_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="CFTLS_Test_Connector_SvntArtifact">
-    <name>CFTLS_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_CFTLS_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="CFTLS_Test_Connector_StubArtifact">
-    <name>CFTLS_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_CFTLS_Test_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/descriptors/run_test.pl
deleted file mode 100755
index 0fd038e4fe3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 40 seconds to allow task to complete\n";
-sleep (40);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/.gitignore b/CIAO/connectors/dds4ccm/tests/DDSEntity/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/DDSEntity/Base/.gitignore
deleted file mode 100644
index e2af81adef2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Base/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/Writer_Base.cxx
-/Writer_Base.h
-/Writer_BasePlugin.cxx
-/Writer_BasePlugin.h
-/Writer_BaseSupport.cxx
-/Writer_BaseSupport.h
-/Writer_Base_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.idl b/CIAO/connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.idl
deleted file mode 100644
index 525042673a8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file Writer_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef WRITER_BASE_IDL
-#define WRITER_BASE_IDL
-
-#pragma ndds typesupport "Base/Writer_BaseSupport.h"
-#pragma opendds typesupport "Base/Writer_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "WriterTest"
-#pragma DCPS_DATA_KEY "WriterTest key"
-
-struct WriterTest {
-  string key; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<WriterTest> WriterTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.mpc b/CIAO/connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.mpc
deleted file mode 100644
index ee28c32ab45..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_DDSWriterEntityBase_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_DDSWriterEntityBase_stub
-  dynamicflags += WRITER_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=WRITER_BASE_STUB_Export \
-              -Wb,stub_export_include=Writer_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    Writer_Base.idl
-  }
-
-  opendds_ts_flags += --export=WRITER_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    Writer_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/.gitignore
deleted file mode 100644
index e8f96f6e9cb..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/Writer_ConnectorE.idl
-/Writer_Connector_conn.cpp
-/Writer_Connector_conn.h
-/Writer_Connector_conn_export.h
-/Writer_Connector_lem_stub_export.h
-/Writer_Connector_stub_export.h
-/Writer_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.idl b/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.idl
deleted file mode 100644
index 421f8585ccd..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file Writer_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef WRITER_CONNECTOR_IDL_
-#define WRITER_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Writer_Base.idl"
-
-#pragma ciao lem "Connector/Writer_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/Writer_BaseTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::WriterTest, ::WriterTestSeq> WriterTestConnector;
-
-#endif /* Writer_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.mpc b/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.mpc
deleted file mode 100644
index 9412a344dc9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_DDSWriterEntityBase -l .. -o ../lib -u DDS Writer_Connector"
-
-project(DDS_DDSWriterEntityConnector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_DDSWriterEntityBase_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=WRITER_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=Writer_Connector_stub_export.h \
-              -Wb,skel_export_macro=WRITER_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=Writer_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=WRITER_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=Writer_Connector_svnt_export.h \
-              -Wb,conn_export_macro=WRITER_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Writer_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Writer_Connector.idl
-  }
-}
-
-project(DDS_DDSWriterEntityConnector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_DDSWriterEntityConnector_idl_gen
-  idlflags += -Wb,stub_export_macro=WRITER_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=Writer_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    Writer_ConnectorE.idl
-  }
-}
-
-project(DDS_DDSWriterEntityConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_DDSWriterEntityConnector_lem_gen DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityBase_stub
-  libs  += DDS_DDSWriterEntityBase_stub DDS_DDSWriterEntityConnector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_DDSWriterEntityConnector_lem_stub
-  dynamicflags += WRITER_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    Writer_ConnectorEC.h
-    Writer_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Writer_ConnectorEC.inl
-  }
-}
-
-project(DDS_DDSWriterEntityConnector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_DDSWriterEntityConnector_idl_gen DDS_DDSWriterEntityBase_stub
-  libs  += DDS_DDSWriterEntityBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_DDSWriterEntityConnector_stub
-  dynamicflags += WRITER_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_ConnectorC.cpp
-  }
-
-  Header_Files {
-    Writer_ConnectorC.h
-    Writer_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    Writer_ConnectorC.inl
-  }
-}
-
-project(DDS_DDSWriterEntityConnector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_DDSWriterEntityConnector_lem_stub DDS_DDSWriterEntityConnector_stub
-  sharedname = DDS_DDSWriterEntityConnector_exec
-  libs += DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityConnector_lem_stub DDS_DDSWriterEntityBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += WRITER_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_Connector_conn.cpp
-  }
-
-  Header_Files {
-    Writer_Connector_conn.h
-    Writer_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_DDSWriterEntityConnector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_DDSWriterEntityConnector_lem_stub DDS_DDSWriterEntityConnector_exec DDS_DDSWriterEntityConnector_stub
-  sharedname  = DDS_DDSWriterEntityConnector_svnt
-  libs       += DDS_DDSWriterEntityConnector_stub \
-                DDS_DDSWriterEntityConnector_lem_stub  \
-                DDS_DDSWriterEntityBase_stub \
-                DDS_DDSWriterEntityConnector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += WRITER_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_ConnectorS.cpp
-    Writer_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    Writer_ConnectorS.h
-    Writer_Connector_svnt.h
-    Writer_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/README b/CIAO/connectors/dds4ccm/tests/DDSEntity/README
deleted file mode 100644
index b38dcbae1ca..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/README
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-Test which shows how to use the DDSDataWriter and DDSDataReader
-directly.
-
-We use the Datawriter and DataReader from the DDS4CCM library.
-After typecasting it can be used to perform operations on DDS directly.
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/.gitignore b/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/.gitignore
deleted file mode 100644
index f2f7d84b894..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/Receiver_exec_export.h
-/Receiver_lem_stub_export.h
-/Receiver_stub_export.h
-/Receiver_svnt_export.h
-/Writer_ReceiverE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.idl b/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.idl
deleted file mode 100644
index 344e3826c91..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/Writer_Connector.idl"
-
-module Writer
-{
-  component Receiver
-  {
-    port WriterTestConnector::DDS_Listen info_out;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.mpc
deleted file mode 100644
index 399ff061ff2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.mpc
+++ /dev/null
@@ -1,138 +0,0 @@
-project(DDS_DDSWriterEntityReceiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_DDSWriterEntityConnector_idl_gen
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h \
-              -I..
-
-  IDL_Files {
-    Writer_Receiver.idl
-  }
-}
-
-project(DDS_DDSWriterEntityReceiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_DDSWriterEntityReceiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    Writer_ReceiverE.idl
-  }
-}
-
-project(DDS_DDSWriterEntityReceiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_DDSWriterEntityReceiver_lem_gen DDS_DDSWriterEntityReceiver_stub  DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityBase_stub
-  libs  +=  Receiver_stub DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    Writer_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Writer_ReceiverEC.inl
-  }
-}
-
-project(DDS_DDSWriterEntityReceiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_DDSWriterEntityReceiver_idl_gen  DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityBase_stub DDS_DDSWriterEntityConnector_lem_gen
-  libs  += DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_ReceiverC.cpp
-  }
-
-  Header_Files {
-    Writer_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    Writer_ReceiverC.inl
-  }
-}
-
-project(DDS_DDSWriterEntityReceiver_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_DDSWriterEntityReceiver_lem_stub DDS_DDSWriterEntityReceiver_stub DDS_DDSWriterEntityBase_stub DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityConnector_lem_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_DDSWriterEntityBase_stub DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityConnector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-  requires += dds4ccm_ndds
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    Writer_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_DDSWriterEntityReceiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_DDSWriterEntityReceiver_lem_stub DDS_DDSWriterEntityBase_stub DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityConnector_svnt DDS_DDSWriterEntityReceiver_exec DDS_DDSWriterEntityConnector_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_DDSWriterEntityBase_stub DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityConnector_svnt Receiver_exec DDS_DDSWriterEntityConnector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-  requires += dds4ccm_ndds
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_ReceiverS.cpp
-    Writer_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    Writer_ReceiverS.h
-    Writer_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver_exec.cpp
deleted file mode 100644
index 616c6e25646..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver_exec.cpp
+++ /dev/null
@@ -1,308 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "Writer_Receiver_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-#include "Connector/Writer_Connector_conn.h"
-#include <dds4ccm/impl/CCM_DataReader.h>
-
-namespace CIAO_Writer_Receiver_Impl
-{
-
-  /**
-   * Facet Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  info_out_data_listener_exec_i::info_out_data_listener_exec_i (
-        ::Writer::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::Writer::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::WriterTestConnector::Listener
-
-  void
-  info_out_data_listener_exec_i::on_one_data (const ::WriterTest & datum,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("WriterTest_Listener: ")
-            ACE_TEXT ("received writer info for <%C> at %u\n"),
-            datum.key.in (),
-            datum.iteration));
-  }
-
-  void
-  info_out_data_listener_exec_i::on_many_data (const ::WriterTestSeq & data,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    for (CORBA::ULong i = 0; i < data.length (); ++i)
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("WriterTest_Listener: ")
-                ACE_TEXT ("received writer info for <%C> at %u\n"),
-                data[i].key.in (),
-                data[i].iteration));
-      }
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_status_exec_i
-   */
-
-  info_out_status_exec_i::info_out_status_exec_i (
-        ::Writer::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::Writer::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_status_exec_i::~info_out_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void){
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-
-  // Component attributes and port operations.
-
-  ::WriterTestConnector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_out_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ()))
-      {
-        info_out_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_data_listener_exec_i (
-            this->ciao_context_.in ()),
-            ::WriterTestConnector::CCM_Listener::_nil ());
-
-          this->ciao_info_out_data_listener_ = tmp;
-      }
-
-    return
-      ::WriterTestConnector::CCM_Listener::_duplicate (
-        this->ciao_info_out_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ()))
-      {
-        info_out_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_out_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_out_status_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Writer::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    WriterTestDataReader * reader = 0;
-
-    ::DDS::DataReader_var dds_dr =
-      this->ciao_context_->get_connection_info_out_dds_entity ();
-
-    if (::CORBA::is_nil (dds_dr.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                    "Datareader connection is NIL.\n"));
-        throw ::CORBA::INTERNAL ();
-      }
-
-    ::CIAO::DDS4CCM::CCM_DataReader * ccm_dr =
-      dynamic_cast < ::CIAO::DDS4CCM::CCM_DataReader *  > (dds_dr.in ());
-
-    if (ccm_dr)
-      {
-        typedef ::CIAO::NDDS::DDS_DataReader_Base DataReader_type;
-
-        ::DDS::DataReader_var tmp = ccm_dr->get_dds_entity ();
-        if (! ::CORBA::is_nil (tmp.in ()))
-          {
-            DataReader_type * typed_ccm_dr =
-              dynamic_cast <DataReader_type*> (tmp.in ());
-            if (typed_ccm_dr)
-              {
-                DDSDataReader* dds_reader = typed_ccm_dr->get_rti_entity ();
-                if (dds_reader)
-                  {
-                    reader = ::CIAO_WriterTestConnector_DDS_Event_Impl
-                             ::WriterTest_DDS_Traits
-                             ::datareader_type::narrow (dds_reader);
-                    if (!reader)
-                      {
-                        ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                    "Error narrowing to a typed "
-                                    "DDS DataReader.\n"));
-                        throw ::CORBA::INTERNAL ();
-                      }
-                  }
-                else
-                  {
-                    ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                "Error getting DDS Datareader.\n"));
-                    throw ::CORBA::INTERNAL ();
-                  }
-              }
-            else
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                            "Error casting DataReader to typed DataReader\n"));
-                throw ::CORBA::INTERNAL ();
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                        "::DDS::DataReader of CCM DataReader seems nil\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                    "Error casting DDS::DataReader to CCM_DataReader\n"));
-        throw ::CORBA::INTERNAL ();
-      }
-
-    ::CIAO_WriterTestConnector_DDS_Event_Impl::WriterTest_DDS_Traits::dds_seq_type
-      data;
-    ::CIAO_WriterTestConnector_DDS_Event_Impl::WriterTest_DDS_Traits::sampleinfo_seq_type
-      sample_info_seq;
-
-    ::DDS::ReturnCode_t const result = reader->take (
-                data,
-                sample_info_seq,
-                1,
-                0);
-
-    ACE_DEBUG ((LM_DEBUG, "Take returned %C with %d samples\n",
-                ::CIAO::DDS4CCM::translate_retcode (result), data.length ()));
-
-    ::DDS::ReturnCode_t const result_loan = reader->return_loan (data, sample_info_seq);
-
-    ACE_DEBUG ((LM_DEBUG, "Return loan returned %C\n",
-                ::CIAO::DDS4CCM::translate_retcode (result_loan)));
-
-    ::CCM_DDS::DataListenerControl_var lc =
-      this->ciao_context_->get_connection_info_out_data_control ();
-
-    if (::CORBA::is_nil (lc.in ()))
-      {
-        ACE_ERROR ((LM_INFO, ACE_TEXT ("Error:  Listener control receptacle is null!\n")));
-        throw ::CORBA::INTERNAL ();
-      }
-    lc->mode (::CCM_DDS::ONE_BY_ONE);
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Writer_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver_exec.h
deleted file mode 100644
index 82201909a1b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver_exec.h
+++ /dev/null
@@ -1,169 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_WRITER_RECEIVER_EXEC_VZNVAP_H_
-#define CIAO_WRITER_RECEIVER_EXEC_VZNVAP_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Writer_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-class WriterTestDataReader;
-
-namespace CIAO_Writer_Receiver_Impl
-{
-
-  /**
-   * Provider Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  class info_out_data_listener_exec_i
-    : public virtual ::WriterTestConnector::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_data_listener_exec_i (
-      ::Writer::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from WriterTestConnector::Listener. */
-
-    virtual
-    void on_one_data (const ::WriterTest & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (const ::WriterTestSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    ::Writer::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_status_exec_i
-   */
-
-  class info_out_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_status_exec_i (
-      ::Writer::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::Writer::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::WriterTestConnector::CCM_Listener_ptr
-    get_info_out_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_status (void);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-
-    //@}
-
-  private:
-    ::Writer::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::WriterTestConnector::CCM_Listener_var ciao_info_out_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_;
-    //@}
-
-    //@{
-    /** User defined members. */
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Writer_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/.gitignore b/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/.gitignore
deleted file mode 100644
index 809d63704bc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/Sender_exec_export.h
-/Sender_lem_stub_export.h
-/Sender_stub_export.h
-/Sender_svnt_export.h
-/Writer_SenderE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.idl b/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.idl
deleted file mode 100644
index 13bdad07c59..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.idl
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_WRITER_ENTITY_SENDER_IDL
-#define DDS_WRITER_ENTITY_SENDER_IDL
-
-#include "Connector/Writer_Connector.idl"
-
-module Writer
-{
-  component Sender
-  {
-    port WriterTestConnector::DDS_Write info_write;
-    attribute unsigned short rate;
-    attribute unsigned short iterations;
-    attribute unsigned short keys;
-  };
-};
-
-#endif /* DDS_WRITER_ENTITY_SENDER_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.mpc b/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.mpc
deleted file mode 100644
index 82039febd68..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.mpc
+++ /dev/null
@@ -1,150 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_DDSWriterEntityBase -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_DDSWriterEntitySender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_DDSWriterEntityConnector_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I ..
-
-  IDL_Files {
-    Writer_Sender.idl
-  }
-}
-
-project(DDS_DDSWriterEntitySender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_DDSWriterEntitySender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    Writer_SenderE.idl
-  }
-}
-
-project(DDS_DDSWriterEntitySender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_DDSWriterEntitySender_lem_gen DDS_DDSWriterEntitySender_stub \
-           DDS_DDSWriterEntityBase_stub
-  libs  += DDS_DDSWriterEntityBase_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_SenderEC.cpp
-  }
-
-  Header_Files {
-    Writer_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Writer_SenderEC.inl
-  }
-}
-
-project(DDS_DDSWriterEntitySender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_DDSWriterEntitySender_idl_gen DDS_DDSWriterEntityBase_stub \
-           DDS_DDSWriterEntityConnector_stub
-  libs  += DDS_DDSWriterEntityBase_stub DDS_DDSWriterEntityConnector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_SenderC.cpp
-  }
-
-  Header_Files {
-    Writer_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    Writer_SenderC.inl
-  }
-}
-
-project(DDS_DDSWriterEntitySender_exec) : ciao_executor, dds4ccm_impl {
-  after += DDS_DDSWriterEntitySender_lem_stub DDS_DDSWriterEntitySender_stub \
-           DDS_DDSWriterEntityConnector_lem_stub DDS_DDSWriterEntityConnector_stub \
-           DDS_DDSWriterEntityConnector_exec
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub DDS_DDSWriterEntityBase_stub \
-          DDS_DDSWriterEntityConnector_lem_stub DDS_DDSWriterEntityConnector_stub \
-          DDS_DDSWriterEntityConnector_exec
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  requires += dds4ccm_ndds
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_Sender_exec.cpp
-  }
-
-  Header_Files {
-    Writer_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_DDSWriterEntitySender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after += DDS_DDSWriterEntityBase_stub DDS_DDSWriterEntitySender_lem_stub \
-           DDS_DDSWriterEntityConnector_stub \
-           DDS_DDSWriterEntityConnector_svnt DDS_DDSWriterEntityConnector_lem_stub
-  sharedname = Sender_svnt
-  libs += Sender_stub Sender_lem_stub DDS_DDSWriterEntityBase_stub \
-          DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityConnector_svnt \
-          DDS_DDSWriterEntityConnector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-  requires += dds4ccm_ndds
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_SenderS.cpp
-    Writer_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    Writer_SenderS.h
-    Writer_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.cpp
deleted file mode 100644
index c9301a67feb..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.cpp
+++ /dev/null
@@ -1,386 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "Writer_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-#include "Base/Writer_BaseSupport.h"
-#include "Connector/Writer_Connector_conn.h"
-
-namespace CIAO_Writer_Sender_Impl
-{
-  /**
-   * Pulse Generator
-   */
-
-  pulse_Generator::pulse_Generator (Sender_exec_i &callback)
-    : pulse_callback_ (callback)
-  {
-  }
-
-  int
-  pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    // Notify the subscribers
-    this->pulse_callback_.tick ();
-    return 0;
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : rate_ (0)
-      , iterations_ (0)
-      , keys_ (0)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      pulse_Generator (*this),
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Sender_exec_i::unregister_handles ()
-  {
-    for (Writer_Table::iterator i = this->ktests_.begin ();
-         i != this->ktests_.end ();
-         ++i)
-      {
-        try
-          {
-            DDS_InstanceHandle_t hnd = this->handles_[i->first.c_str ()];
-            this->writer_->unregister_instance (i->second, hnd);
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Unregistered <%C> - iteration <%d> - valid handle <%d>\n"),
-                      i->first.c_str (),
-                      i->second->iteration,
-                      hnd));
-          }
-        catch (...)
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: ")
-                    ACE_TEXT ("unknown exception caught during unregister_instance.\n")));
-          }
-      }
-  }
-
-  void
-  Sender_exec_i::register_handles()
-  {
-    Writer_Table::iterator i = this->ktests_.begin ();
-    for (i = this->ktests_.begin(); i != this->ktests_.end(); ++i)
-      {
-        DDS_InstanceHandle_t const hnd = this->writer_->register_instance (i->second);
-        if (DDS_InstanceHandle_is_nil (&hnd))
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Unable to register handle for <%C> - iteration <%d>\n"),
-              i->first.c_str (), i->second->iteration));
-          }
-        else
-          {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Registering instance for <%C>\n"),
-                        i->second->key.in ()));
-            this->handles_[i->first.c_str ()] = hnd;
-          }
-     }
-  }
-
-  void
-  Sender_exec_i::write_keyed ()
-  {
-    if (this->last_key != this->ktests_.end ())
-      {
-        ++this->last_key->second->iteration;
-        DDS_InstanceHandle_t hnd = this->handles_[this->last_key->first.c_str ()];
-        DDS_ReturnCode_t const retval = this->writer_->write (this->last_key->second, hnd);
-        if (retval == DDS_RETCODE_OK)
-          {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Written keyed <%C> - iteration <%d> - valid handle <%d>\n"),
-                    this->last_key->first.c_str (),
-                    this->last_key->second->iteration,
-                    hnd.isValid));
-          }
-        else ACE_ERROR ((LM_ERROR, ACE_TEXT ("Error writing key <%C> - retcode %C\n"),
-                    CIAO::DDS4CCM::translate_retcode (retval)));
-
-        ++this->last_key;
-      }
-    else
-      {
-        //onto the next iteration
-        this->last_key = this->ktests_.begin ();
-        while (this->last_key != this->ktests_.end ())
-          {
-            if (this->last_key->second->iteration == this->iterations_)
-              {
-                // Next key
-                ++this->last_key;
-              }
-            else
-              {
-                break;
-              }
-          }
-        if (this->last_key == this->ktests_.end ())
-          {
-            unregister_handles ();
-            this->stop ();
-          }
-      }
-  }
-
-  void
-  Sender_exec_i::tick ()
-  {
-    write_keyed ();
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    long usec = 1000000 / this->rate_;
-    if (this->reactor ()->schedule_timer (
-                this->ticker_,
-                0,
-                ACE_Time_Value (0, usec),
-                ACE_Time_Value (0, usec)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                              ACE_TEXT ("Error scheduling timer")));
-      }
-  }
-
-  void
-  Sender_exec_i::stop (void)
-  {
-    if (this->ticker_)
-      {
-        this->reactor ()->cancel_timer (this->ticker_);
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n")));
-        delete this->ticker_;
-        this->ticker_ = 0;
-      }
-  }
-
-  // Component attributes and port operations.
-
-  ::CORBA::UShort
-  Sender_exec_i::rate (void)
-  {
-    return this->rate_;
-  }
-
-  void
-  Sender_exec_i::rate (
-    const ::CORBA::UShort rate)
-  {
-    this->rate_ = rate;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Writer::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-    ::DDS::DataWriter_var dds_dw =
-      this->ciao_context_->get_connection_info_write_dds_entity ();
-
-    if (::CORBA::is_nil (dds_dw.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR : Sender_exec_i::ccm_activate - "
-                    "Datawriter connection is NIL.\n"));
-        throw ::CORBA::INTERNAL ();
-      }
-
-    ::CIAO::DDS4CCM::CCM_DataWriter * ccm_dw =
-      dynamic_cast < ::CIAO::DDS4CCM::CCM_DataWriter * > (dds_dw.in ());
-
-    if (ccm_dw)
-      {
-        ::DDS::DataWriter_var tmp = ccm_dw->get_dds_entity ();
-        if (! ::CORBA::is_nil (tmp.in ()))
-          {
-            typedef ::CIAO::NDDS::DDS_DataWriter_Base DataWriter_type;
-            DataWriter_type * typed_ccm_dw = dynamic_cast <DataWriter_type *> (tmp.in ());
-            if (typed_ccm_dw)
-              {
-                DDSDataWriter* dds_datawriter = typed_ccm_dw->get_rti_entity ();
-                if (dds_datawriter)
-                  {
-                    this->writer_ =
-                      ::CIAO_WriterTestConnector_DDS_Event_Impl::WriterTest_DDS_Traits::datawriter_type::narrow (dds_datawriter);
-                    if (!this->writer_)
-                      {
-                        ACE_ERROR ((LM_ERROR, "ERROR : Sender_exec_i::ccm_activate - "
-                                    "Error narrowing to a typed "
-                                    "DDS DataWriter.\n"));
-                        throw ::CORBA::INTERNAL ();
-                      }
-                  }
-                else
-                  {
-                    ACE_ERROR ((LM_ERROR, "ERROR : Sender_exec_i::ccm_activate - "
-                                "Error getting DDS DataWriter.\n"));
-                    throw ::CORBA::INTERNAL ();
-                  }
-              }
-            else
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR : Sender_exec_i::ccm_activate - "
-                            "Error casting DataWriter to typed DataWriter\n"));
-                throw ::CORBA::INTERNAL ();
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR : Sender_exec_i::ccm_activate - "
-                    "::DDS::DataWriter of CCM DataWriter seems nil\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR : Sender_exec_i::ccm_activate - "
-                    "Error casting DataWriter to CCM_DataWriter\n"));
-        throw ::CORBA::INTERNAL ();
-      }
-
-    this->start ();
-
-    ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard,
-                        this->mutex_, CORBA::INTERNAL ());
-
-    for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i)
-      {
-        char key[7];
-        WriterTest *new_key = new WriterTest;
-        ACE_OS::sprintf (key, "KEY_%d", i);
-        new_key->key = CORBA::string_dup(key);
-        new_key->iteration = 0;
-
-        this->ktests_[key] = new_key;
-      }
-    this->last_key = this->ktests_.begin ();
-    register_handles ();
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    this->stop ();
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Writer_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.h
deleted file mode 100644
index 8164d4b4f58..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.h
+++ /dev/null
@@ -1,162 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_WRITER_SENDER_EXEC_CPQPH1_H_
-#define CIAO_WRITER_SENDER_EXEC_CPQPH1_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Writer_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-#include "dds4ccm/impl/ndds/DataWriter_T.h"
-
-#include <map>
-
-class WriterTestDataWriter;
-namespace CIAO_Writer_Sender_Impl
-{
-  class Sender_exec_i;
-
-  /**
-   * Pulse Generator
-   */
-  class pulse_Generator :
-    public ACE_Event_Handler
-  {
-  public:
-    pulse_Generator (Sender_exec_i &callback);
-    /// Handle the timeout.
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    /// Maintains a handle that actually process the event
-    Sender_exec_i &pulse_callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CORBA::UShort rate (void);
-
-    virtual void rate (::CORBA::UShort rate);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void tick (void);
-    //@}
-
-  private:
-    ::Writer::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-
-    ::CORBA::UShort rate_;
-
-    ::CORBA::UShort iterations_;
-
-    ::CORBA::UShort keys_;
-    //@}
-
-    //@{
-    /** User defined members. */
-
-    WriterTestDataWriter * writer_;
-
-    pulse_Generator * ticker_;
-
-    TAO_SYNCH_MUTEX mutex_;
-    typedef std::map<ACE_CString, WriterTest_var> Writer_Table;
-    Writer_Table ktests_;
-
-    typedef std::map<ACE_CString, DDS_InstanceHandle_t> Writer_Table_Handles;
-    Writer_Table_Handles handles_;
-
-    Writer_Table::iterator last_key;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void start (void);
-    void stop (void);
-
-    void register_handles ();
-    void unregister_handles ();
-    void write_keyed ();
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Writer_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/DDSEntity/descriptors/Plan.cdp
deleted file mode 100644
index 0565cc072ff..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/descriptors/Plan.cdp
+++ /dev/null
@@ -1,382 +0,0 @@
-<!--  -->
-<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>DDSWriterEntity_Depl_1</label>
-  <UUID>DDSWriterEntity_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Writer_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Writer_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Writer_ConnectorComponentImplementation">
-    <name>Writer_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Writer_Connector_ExecArtifact" />
-    <artifact xmi:idref="Writer_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_WriterTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_WriterTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Writer_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Writer_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Writer_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Writer_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-  </instance>
-  <instance xmi:id="Writer_ConnectorComponentInstance">
-    <name>Writer_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Writer_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DDSWriterEntity</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="Writer_ConnectorComponentInstance2">
-    <name>Writer_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Writer_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DDSWriterEntity</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Writer_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>_datacontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Writer_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Writer_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>reader_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Writer_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="Writer_Connector_ExecArtifact">
-    <name>Writer_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_DDSWriterEntityConnector_exec</location>
-  </artifact>
-  <artifact xmi:id="Writer_Connector_SvntArtifact">
-    <name>Writer_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_DDSWriterEntityConnector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Writer_Connector_StubArtifact">
-    <name>Writer_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_DDSWriterEntityConnector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/DDSEntity/descriptors/run_test.pl
deleted file mode 100755
index 87984594507..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 60 seconds to allow task to complete\n";
-sleep (60);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/Derived/DDS_Derived_Connector_T.h b/CIAO/connectors/dds4ccm/tests/Derived/DDS_Derived_Connector_T.h
deleted file mode 100644
index 392479178a2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Derived/DDS_Derived_Connector_T.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#if !defined DERIVED_CONNECTOR_T
-#define DERIVED_CONNECTOR_T
-
-#include "connectors/dds4ccm/impl/DDS_Event_Connector_T.h"
-#include "connectors/dds4ccm/impl/DDS_State_Connector_T.h"
-
-template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED, typename SEQ_TYPE>
-class MyEvent_Connector_T
-  : public virtual DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED, SEQ_TYPE>
-{
-  virtual ::CCM_fooA_ptr get_my_foo (void)
-  {
-    return ::CCM_fooA::_nil ();
-  }
-};
-
-template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED, typename SEQ_TYPE>
-class MyState_Connector_T
-  : public virtual DDS_State_Connector_T<DDS_TYPE, CCM_TYPE, FIXED, SEQ_TYPE>
-{
-  virtual ::CCM_fooB_ptr get_my_foo (void)
-  {
-    return ::CCM_fooB::_nil ();
-  }
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/Derived/Derived.idl b/CIAO/connectors/dds4ccm/tests/Derived/Derived.idl
deleted file mode 100644
index c6b05f3fdfe..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Derived/Derived.idl
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef DERIVED_IDL
-#define DERIVED_IDL
-
-#pragma ndds typesupport "DerivedSupport.h"
-#pragma opendds typesupport "DerivedTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "DerivedType"
-#pragma DCPS_DATA_KEY "DerivedType value"
-
-struct DerivedType {
-  string value; //@key
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<DerivedType> DerivedTypeSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/Derived/Derived.mpc b/CIAO/connectors/dds4ccm/tests/Derived/Derived.mpc
deleted file mode 100644
index 8d33e93b753..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Derived/Derived.mpc
+++ /dev/null
@@ -1,22 +0,0 @@
-project (Derived_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = Derived_stub
-  dynamicflags += NOMODULE_COMMON_STUB_BUILD_DLL
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=NOMODULE_COMMON_STUB_Export \
-              -Wb,stub_export_include=Derived_Common_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    Derived.idl
-  }
-
-  opendds_ts_flags += --export=NOMODULE_COMMON_STUB_Export
-
-  DDSGenerator_Files {
-    Derived.idl
-  }
-
-  Source_Files {
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.idl b/CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.idl
deleted file mode 100644
index ed4059534f7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.idl
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef DERIVED_CONNECTOR_IDL
-#define DERIVED_CONNECTOR_IDL
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Derived.idl"
-
-#pragma ciao lem "Derived_ConnectorE.idl"
-
-#pragma dds4ccm impl "DDS_Derived_Connector_T.h"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "DerivedTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::DerivedType, ::DerivedTypeSeq> DerivedTypeConnector;
-
-interface fooA
-{
-  void send (in long value);
-};
-
-interface fooB
-{
-  void send (in long value);
-};
-
-// @todo, module here should go away again
-module DerivedTypeConnector {
-  connector MyEvent : DerivedTypeConnector::DDS_Event
-  {
-    provides fooA my_foo;
-  };
-
-  connector MyState : DerivedTypeConnector::DDS_State
-  {
-    provides fooB my_foo;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.mpc
deleted file mode 100644
index ad959acfab8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.mpc
+++ /dev/null
@@ -1,129 +0,0 @@
-project(Derived_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  custom_only = 1
-  after += Derived_stub
-  idlflags += -Wb,stub_export_macro=DERIVED_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=Derived_Connector_stub_export.h \
-              -Wb,skel_export_macro=DERIVED_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=Derived_Connector_svnt_export.h \
-              -Wb,conn_export_macro=DERIVED_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Derived_Connector_conn_export.h \
-              -Gxhex -Gxhsk -Gxhst
-  IDL_Files {
-    Derived_Connector.idl
-  }
-}
-
-project(Derived_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += Derived_Connector_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=DERIVED_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=Derived_Connector_lem_stub_export.h \
-              -SS -Gxhst
-
-  IDL_Files {
-    Derived_ConnectorE.idl
-  }
-}
-
-project(Derived_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub  {
-  after += Derived_Connector_lem_gen Derived_Connector_stub
-  libs  +=  Derived_Connector_stub
-
-
-  sharedname = Derived_Connector_lem_stub
-  dynamicflags += DERIVED_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Derived_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    Derived_ConnectorEC.h
-    Derived_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Derived_ConnectorEC.inl
-  }
-}
-
-project(Derived_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += Derived_Connector_idl_gen Derived_stub
-  libs  += Derived_stub
-
-
-  sharedname = Derived_Connector_stub
-  dynamicflags += DERIVED_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Derived_ConnectorC.cpp
-  }
-
-  Header_Files {
-    Derived_ConnectorC.h
-    Derived_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    Derived_ConnectorC.inl
-  }
-}
-
-project(Derived_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += Derived_Connector_lem_stub Derived_Connector_stub
-  sharedname = Derived_Connector_exec
-  libs += Derived_Connector_stub Derived_Connector_lem_stub Derived_stub
-
-  dynamicflags += DERIVED_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Derived_Connector_conn.cpp
-  }
-
-  Header_Files {
-    DDS_Derived_Connector_T.h
-    Derived_Connector_conn.h
-    Derived_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(Derived_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += Derived_Connector_lem_stub
-  sharedname  = Derived_Connector_svnt
-  libs       += Derived_Connector_stub Derived_Connector_lem_stub  Derived_stub
-
-
-  dynamicflags += DERIVED_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Derived_ConnectorS.cpp
-    Derived_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    Derived_ConnectorS.h
-    Derived_Connector_svnt.h
-    Derived_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/.gitignore b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/.gitignore
deleted file mode 100644
index e1cae80e694..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/DNM_Base.cxx
-/DNM_Base.h
-/DNM_BasePlugin.cxx
-/DNM_BasePlugin.h
-/DNM_BaseSupport.cxx
-/DNM_BaseSupport.h
-/DNM_Base_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.idl b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.idl
deleted file mode 100644
index 69588857156..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.idl
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * @file DNM_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DOUBLE_NESTED_MODULE_BASE_IDL
-#define DOUBLE_NESTED_MODULE_BASE_IDL
-
-#pragma ndds typesupport "Base/DNM_BaseSupport.h"
-#pragma opendds typesupport "Base/DNM_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "X::Y::Z::DNM_Test_Struct"
-#pragma DCPS_DATA_KEY "X::Y::Z::DNM_Test_Struct key"
-
-module X
-{
-  module Y
-  {
-    module Z
-    {
-      struct DNM_Test_Struct {
-        string key; //@key
-        long iter;
-      };
-      #if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<DNM_Test_Struct> DNM_Test_StructSeq;
-#endif
-    };
-  };
-};
-
-
-#endif /* DOUBLE_NESTED_MODULE_BASE_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.mpc b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.mpc
deleted file mode 100644
index 8e0e78a1536..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_DNM_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_DNM_Base_stub
-  dynamicflags += DOUBLE_NESTED_MODULE_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=DOUBLE_NESTED_MODULE_BASE_STUB_Export \
-              -Wb,stub_export_include=DNM_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    DNM_Base.idl
-  }
-
-  opendds_ts_flags += --export=DOUBLE_NESTED_MODULE_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    DNM_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/.gitignore
deleted file mode 100644
index c99c27aaf24..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/DNM_ConnectorE.idl
-/DNM_Connector_conn.cpp
-/DNM_Connector_conn.h
-/DNM_Connector_conn_export.h
-/DNM_Connector_lem_stub_export.h
-/DNM_Connector_stub_export.h
-/DNM_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.idl b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.idl
deleted file mode 100644
index 68ad2eec4e9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.idl
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * @file DNM_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DOUBLE_NESTED_MODULE_CONNECTOR_IDL_
-#define DOUBLE_NESTED_MODULE_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/DNM_Base.idl"
-
-#pragma ciao lem "Connector/DNM_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/DNM_BaseTypeSupport.idl"
-#endif
-
-module DNM_Test_Connector
-{
-  module Nested_Connector
-  {
-    module ::CCM_DDS::Typed < X::Y::Z::DNM_Test_Struct, X::Y::Z::DNM_Test_StructSeq> DNM_TestConnector;
-  };
-};
-
-#endif /* DOUBLE_NESTED_MODULE_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.mpc b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.mpc
deleted file mode 100644
index c9c973ddf85..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.mpc
+++ /dev/null
@@ -1,140 +0,0 @@
-project(DDS_DNM_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_DNM_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=DOUBLE_NESTED_MODULE_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=DNM_Connector_stub_export.h \
-              -Wb,skel_export_macro=DOUBLE_NESTED_MODULE_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=DNM_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=DOUBLE_NESTED_MODULE_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=DNM_Connector_svnt_export.h \
-              -Wb,conn_export_macro=DOUBLE_NESTED_MODULE_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=DNM_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    DNM_Connector.idl
-  }
-}
-
-project(DDS_DNM_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_DNM_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=DOUBLE_NESTED_MODULE_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=DNM_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    DNM_ConnectorE.idl
-  }
-}
-
-project(DDS_DNM_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_DNM_Connector_lem_gen DDS_DNM_Connector_stub DDS_DNM_Base_stub
-  libs  += DDS_DNM_Base_stub DDS_DNM_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_DNM_Connector_lem_stub
-  dynamicflags += DOUBLE_NESTED_MODULE_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    DNM_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    DNM_ConnectorEC.h
-    DNM_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    DNM_ConnectorEC.inl
-  }
-}
-
-project(DDS_DNM_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_DNM_Connector_idl_gen DDS_DNM_Base_stub
-  libs  += DDS_DNM_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_DNM_Connector_stub
-  dynamicflags += DOUBLE_NESTED_MODULE_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    DNM_ConnectorC.cpp
-  }
-
-  Header_Files {
-    DNM_ConnectorC.h
-    DNM_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    DNM_ConnectorC.inl
-  }
-}
-
-project(DDS_DNM_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_DNM_Connector_lem_stub DDS_DNM_Connector_stub
-  sharedname = DDS_DNM_Connector_exec
-  libs += DDS_DNM_Connector_stub DDS_DNM_Connector_lem_stub DDS_DNM_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += DOUBLE_NESTED_MODULE_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    DNM_Connector_conn.cpp
-  }
-
-  Header_Files {
-    DNM_Connector_conn.h
-    DNM_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_DNM_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_DNM_Connector_lem_stub DDS_DNM_Connector_exec DDS_DNM_Connector_stub
-  sharedname  = DDS_DNM_Connector_svnt
-  libs       += DDS_DNM_Connector_stub \
-                DDS_DNM_Connector_lem_stub  \
-                DDS_DNM_Base_stub \
-                DDS_DNM_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += DOUBLE_NESTED_MODULE_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    DNM_ConnectorS.cpp
-    DNM_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    DNM_ConnectorS.h
-    DNM_Connector_svnt.h
-    DNM_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/.gitignore b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/.gitignore
deleted file mode 100644
index 102a5abb4c9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/Sender_exec_export.h
-/Sender_lem_stub_export.h
-/Sender_stub_export.h
-/Sender_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.idl b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.idl
deleted file mode 100644
index afa5b6ce2f2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file DNM_Sender.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DNM_SENDER_IDL
-#define DNM_SENDER_IDL
-
-#include "Connector/DNM_Connector.idl"
-
-module DNM_Test_Sender
-{
-  module Nested_Sender
-  {
-    component Sender
-    {
-      port DNM_Test_Connector::Nested_Connector::DNM_TestConnector::DDS_Write info_write;
-    };
-  };
-};
-
-#endif /* DNM_SENDER_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.mpc b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.mpc
deleted file mode 100644
index 1bd753bbdb3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.mpc
+++ /dev/null
@@ -1,143 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_DNM_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DNM_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_DNM_Connector_idl_gen DDS_Starter_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I ..
-
-  IDL_Files {
-    DNM_Sender.idl
-  }
-}
-
-project(DNM_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DNM_Sender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    DNM_SenderE.idl
-  }
-}
-
-project(DNM_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DNM_Sender_lem_gen DNM_Sender_stub DDS_DNM_Base_stub
-  libs  += DDS_DNM_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    DNM_SenderEC.cpp
-  }
-
-  Header_Files {
-    DNM_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    DNM_SenderEC.inl
-  }
-}
-
-project(DNM_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DNM_Sender_idl_gen DDS_DNM_Base_stub DDS_DNM_Connector_stub
-  libs  += DDS_DNM_Base_stub DDS_DNM_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    DNM_SenderC.cpp
-  }
-
-  Header_Files {
-    DNM_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    DNM_SenderC.inl
-  }
-}
-
-project(DNM_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DNM_Sender_lem_stub DNM_Sender_stub \
-             DDS_DNM_Connector_lem_stub DDS_DNM_Connector_stub 
-  sharedname = Sender_exec
-  libs    += Sender_stub Sender_lem_stub DDS_DNM_Base_stub \
-             DDS_DNM_Connector_lem_stub DDS_DNM_Connector_stub 
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    DNM_Sender_exec.cpp
-  }
-
-  Header_Files {
-    DNM_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DNM_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_DNM_Base_stub  DNM_Sender_lem_stub \
-                DDS_DNM_Connector_stub \
-                DDS_DNM_Connector_svnt DDS_DNM_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub DDS_DNM_Base_stub \
-                DDS_DNM_Connector_stub DDS_DNM_Connector_svnt \
-                DDS_DNM_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    DNM_SenderS.cpp
-    DNM_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    DNM_SenderS.h
-    DNM_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender_exec.cpp
deleted file mode 100644
index 7e5830ccb3e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender_exec.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-// -*- C++ -*-
-#include "DNM_Sender_exec.h"
-#include "Base/DNM_BaseC.h"
-
-namespace CIAO_DNM_Test_Sender_Nested_Sender_Sender_Impl
-{
-  //============================================================
-  // Component Executor Implementation Class: Sender_exec_i
-  //============================================================
-  Sender_exec_i::Sender_exec_i (void)
-  {
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-  }
-
-  void
-  Sender_exec_i::set_session_context (::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::DNM_Test_Sender::Nested_Sender::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-    ::DNM_Test_Connector::Nested_Connector::DNM_TestConnector::Writer_var writer =
-      this->context_->get_connection_info_write_data ();
-
-    ::X::Y::Z::DNM_Test_Struct dnm;
-    dnm.key = CORBA::string_dup ("KEY_1");
-    dnm.iter = 10;
-    writer->write_one (dnm, ::DDS::HANDLE_NIL);
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CoherentWrite_Test_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender_exec.h
deleted file mode 100644
index 9d9361ff4b5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender_exec.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_SENDER_EXEC_H_
-#define CIAO_SENDER_EXEC_H_
-
-
-#include "DNM_SenderEC.h"
-
-#include /**/ "Sender_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-namespace CIAO_DNM_Test_Sender_Nested_Sender_Sender_Impl
-{
-  //============================================================
-  // Sender_exec_i
-  //============================================================
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete (void);
-
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-
-  private:
-    ::DNM_Test_Sender::Nested_Sender::CCM_Sender_Context_var context_;
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CoherentWrite_Test_Sender_Impl (void);
-}
-
-#endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/.gitignore b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/.gitignore
deleted file mode 100644
index c9d8f7c47b3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/Event_Connection_Test_Base.cxx
-/Event_Connection_Test_Base.h
-/Event_Connection_Test_BasePlugin.cxx
-/Event_Connection_Test_BasePlugin.h
-/Event_Connection_Test_BaseSupport.cxx
-/Event_Connection_Test_BaseSupport.h
-/Event_Connection_Test_Base_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl
deleted file mode 100644
index 5f4a523d5d7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file Event_Connection_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef EVENT_CONNECTION_TEST_BASE_IDL
-#define EVENT_CONNECTION_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/Event_Connection_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/Event_Connection_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "Event_ConnectionTest"
-#pragma DCPS_DATA_KEY "Event_ConnectionTest key"
-
-struct Event_ConnectionTest {
-  string key; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<Event_ConnectionTest> Event_ConnectionTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc
deleted file mode 100644
index e953e70512c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_ECT_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_ECT_Base_stub
-  dynamicflags += EVENT_CONNECTION_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=EVENT_CONNECTION_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=Event_Connection_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    Event_Connection_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=EVENT_CONNECTION_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    Event_Connection_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/.gitignore
deleted file mode 100644
index 985cef62666..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/Event_Connection_Test_ConnectorE.idl
-/Event_Connection_Test_Connector_conn.cpp
-/Event_Connection_Test_Connector_conn.h
-/Event_Connection_Test_Connector_conn_export.h
-/Event_Connection_Test_Connector_lem_stub_export.h
-/Event_Connection_Test_Connector_stub_export.h
-/Event_Connection_Test_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.idl
deleted file mode 100644
index 771620f19c7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file Event_Connection_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef KEYED_TEST_CONNECTOR_IDL_
-#define KEYED_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Event_Connection_Test_Base.idl"
-
-#pragma ciao lem "Connector/Event_Connection_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/Event_Connection_Test_BaseTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::Event_ConnectionTest, ::Event_ConnectionTestSeq> Event_ConnectionConnector;
-
-#endif /* Event_Connection_Test_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc
deleted file mode 100644
index 3a53d8ad1b7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_ECT_Base -l .. -o ../lib -u DDS Event_Connection_Test_Connector"
-
-project(DDS_ECT_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_ECT_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=EVENT_CONNECTION_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=Event_Connection_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=EVENT_CONNECTION_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=Event_Connection_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=EVENT_CONNECTION_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=Event_Connection_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=EVENT_CONNECTION_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Event_Connection_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Event_Connection_Test_Connector.idl
-  }
-}
-
-project(DDS_ECT_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_ECT_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=EVENT_CONNECTION_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=Event_Connection_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    Event_Connection_Test_ConnectorE.idl
-  }
-}
-
-project(DDS_ECT_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_ECT_Connector_lem_gen DDS_ECT_Connector_stub DDS_ECT_Base_stub
-  libs  += DDS_ECT_Base_stub DDS_ECT_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_ECT_Connector_lem_stub
-  dynamicflags += EVENT_CONNECTION_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Event_Connection_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    Event_Connection_Test_ConnectorEC.h
-    Event_Connection_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Event_Connection_Test_ConnectorEC.inl
-  }
-}
-
-project(DDS_ECT_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_ECT_Connector_idl_gen DDS_ECT_Base_stub
-  libs  += DDS_ECT_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_ECT_Connector_stub
-  dynamicflags += EVENT_CONNECTION_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Event_Connection_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    Event_Connection_Test_ConnectorC.h
-    Event_Connection_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    Event_Connection_Test_ConnectorC.inl
-  }
-}
-
-project(DDS_ECT_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_ECT_Connector_lem_stub DDS_ECT_Connector_stub
-  sharedname = DDS_ECT_Connector_exec
-  libs += DDS_ECT_Connector_stub DDS_ECT_Connector_lem_stub DDS_ECT_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += EVENT_CONNECTION_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Event_Connection_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    Event_Connection_Test_Connector_conn.h
-    Event_Connection_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_ECT_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_ECT_Connector_lem_stub DDS_ECT_Connector_exec DDS_ECT_Connector_stub
-  sharedname  = DDS_ECT_Connector_svnt
-  libs       += DDS_ECT_Connector_stub \
-                DDS_ECT_Connector_lem_stub  \
-                DDS_ECT_Base_stub \
-                DDS_ECT_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += EVENT_CONNECTION_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Event_Connection_Test_ConnectorS.cpp
-    Event_Connection_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    Event_Connection_Test_ConnectorS.h
-    Event_Connection_Test_Connector_svnt.h
-    Event_Connection_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/README b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/README
deleted file mode 100644
index a0d80b6fb37..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/README
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-This test tests all possible connections between
-a Sender and a DDS Event connector and a Receiver and a
-DDS Event connector.
-The Sender requests the following connections:
-  * A writer
-  * A DDS writer
-
-The Receiver expects the following listeners to be created:
-  * A ConnectorStatusListener
-  * A PortStatusListener for the DDS_Listen port
-  * A PortStatusListener for the DDS_Get port
-  * A 'normal' listener
-
-The Receiver requests the following connections:
-  * A reader
-  * A getter
-  * A DDS reader
-  * A DataControlListener
-
-This test tests every single connection and reports an error when
-a connections couldn't be esthablished.
-
-No actual read/write/listen operations are performed.
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/.gitignore b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/.gitignore
deleted file mode 100644
index 10c2d70efdc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/Event_Connection_Test_ReceiverE.idl
-/Receiver_exec_export.h
-/Receiver_lem_stub_export.h
-/Receiver_stub_export.h
-/Receiver_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.idl
deleted file mode 100644
index 627c3e4909b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.idl
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/Event_Connection_Test_Connector.idl"
-
-module Event_Connection_Test
-{
-  component Receiver
-  {
-    port Event_ConnectionConnector::DDS_Listen  info_listen;
-    port Event_ConnectionConnector::DDS_Get     info_get;
-    provides CCM_DDS::ConnectorStatusListener status_listener;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.mpc
deleted file mode 100644
index dc9166a24d9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.mpc
+++ /dev/null
@@ -1,135 +0,0 @@
-project(DDS_ECT_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_ECT_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h -I..
-
-  IDL_Files {
-    Event_Connection_Test_Receiver.idl
-  }
-}
-
-project(DDS_ECT_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_ECT_Receiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    Event_Connection_Test_ReceiverE.idl
-  }
-}
-
-project(DDS_ECT_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_ECT_Receiver_lem_gen DDS_ECT_Receiver_stub  DDS_ECT_Connector_stub DDS_ECT_Base_stub
-  libs  +=  Receiver_stub DDS_ECT_Connector_stub DDS_ECT_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Event_Connection_Test_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    Event_Connection_Test_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Event_Connection_Test_ReceiverEC.inl
-  }
-}
-
-project(DDS_ECT_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_ECT_Receiver_idl_gen  DDS_ECT_Connector_stub DDS_ECT_Base_stub DDS_ECT_Connector_lem_gen
-  libs  += DDS_ECT_Connector_stub DDS_ECT_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Event_Connection_Test_ReceiverC.cpp
-  }
-
-  Header_Files {
-    Event_Connection_Test_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    Event_Connection_Test_ReceiverC.inl
-  }
-}
-
-project(DDS_ECT_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_ECT_Receiver_lem_stub DDS_ECT_Receiver_stub DDS_ECT_Base_stub DDS_ECT_Connector_stub DDS_ECT_Connector_lem_stub 
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_ECT_Base_stub DDS_ECT_Connector_stub DDS_ECT_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Event_Connection_Test_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    Event_Connection_Test_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_ECT_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_ECT_Receiver_lem_stub DDS_ECT_Base_stub DDS_ECT_Connector_stub DDS_ECT_Connector_svnt DDS_ECT_Receiver_exec DDS_ECT_Connector_lem_stub 
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_ECT_Base_stub DDS_ECT_Connector_stub DDS_ECT_Connector_svnt Receiver_exec DDS_ECT_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Event_Connection_Test_ReceiverS.cpp
-    Event_Connection_Test_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    Event_Connection_Test_ReceiverS.h
-    Event_Connection_Test_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.cpp
deleted file mode 100644
index 4a1f6c95500..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.cpp
+++ /dev/null
@@ -1,264 +0,0 @@
-// -*- C++ -*-
-#include "Event_Connection_Test_Receiver_exec.h"
-#include "ace/Log_Msg.h"
-
-namespace CIAO_Event_Connection_Test_Receiver_Impl
-{
-  //============================================================
-  // Receiver_exec_i
-  //============================================================
-  Receiver_exec_i::Receiver_exec_i (void)
-    : //DDS_Get
-      getter_ok_ (false),
-      getter_reader_ok_ (false),
-      getter_dds_data_reader_ok_ (false),
-      getter_filter_config_ok_ (false),
-      //DDS_Listen
-      listen_data_control_ok_ (false),
-      listen_reader_ok_ (false),
-      listen_dds_data_reader_ok_ (false),
-      listen_filter_config_ok_ (false),
-      //Provides
-      listen_port_status_created_ (false),
-      get_port_status_created_ (false),
-      get_status_listener_created_ (false),
-      raw_listener_created_ (false)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Port operations.
-  ::Event_ConnectionConnector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_listen_data_listener (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new Event_ConnectionTest RAW listener\n")));
-    this->raw_listener_created_ = true;
-    return ::Event_ConnectionConnector::CCM_Listener::_nil ();
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_listen_status (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new PortStatuslistener for DDS_Listen\n")));
-    this->listen_port_status_created_ = true;
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_get_status (void)
-  {
-    this->get_port_status_created_ = true;
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Receiver_exec_i::get_status_listener(void)
-  {
-    this->get_status_listener_created_ = true;
-    return ::CCM_DDS::CCM_ConnectorStatusListener::_nil ();
-  }
-
-  // Operations from Components::SessionComponent.
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::Event_Connection_Test::CCM_Receiver_Context::_narrow (ctx);
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    //DDS_Get
-    ::Event_ConnectionConnector::Getter_var getter_getter =
-      this->context_->get_connection_info_get_fresh_data ();
-    if (! ::CORBA::is_nil (getter_getter))
-      {
-        this->getter_ok_ = true;
-      }
-    ::DDS::DataReader_var getter_dds_data_reader =
-      this->context_->get_connection_info_get_dds_entity ();
-    if (! ::CORBA::is_nil (getter_dds_data_reader))
-      {
-        this->getter_dds_data_reader_ok_ = true;
-      }
-
-    ::Event_ConnectionConnector::Reader_var getter_reader =
-      this->context_->get_connection_info_get_data ();
-    if (! ::CORBA::is_nil (getter_reader))
-      {
-        this->getter_reader_ok_ = true;
-      }
-
-    ::CCM_DDS::ContentFilterSetting_var getter_filter_config =
-      this->context_->get_connection_info_get_filter_config ();
-    if (! ::CORBA::is_nil (getter_filter_config))
-      {
-        this->getter_filter_config_ok_ = true;
-      }
-
-    //DDS_Listen
-    ::CCM_DDS::DataListenerControl_var listen_data_control =
-      this->context_->get_connection_info_listen_data_control ();
-    if (! ::CORBA::is_nil (listen_data_control))
-      {
-        this->listen_data_control_ok_ = true;
-      }
-
-    ::Event_ConnectionConnector::Reader_var listen_reader =
-      this->context_->get_connection_info_listen_data ();
-    if (! ::CORBA::is_nil (listen_reader))
-      {
-        this->listen_reader_ok_ = true;
-      }
-
-    ::DDS::DataReader_var listen_dds_data_reader =
-      this->context_->get_connection_info_listen_dds_entity ();
-    if (! ::CORBA::is_nil (listen_dds_data_reader))
-      {
-        this->listen_dds_data_reader_ok_ = true;
-      }
-
-    ::CCM_DDS::ContentFilterSetting_var listen_filter_config =
-      this->context_->get_connection_info_listen_filter_config ();
-    if (! ::CORBA::is_nil (listen_filter_config))
-      {
-        this->listen_filter_config_ok_ = true;
-      }
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    //DDS_Get
-    if (!this->getter_ok_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get getter failed\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get getter passed\n")));
-      }
-    if (!this->getter_dds_data_reader_ok_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get DDS reader of DDS_Get failed\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get DDS reader of DDS_Get passed\n")));
-      }
-    if (!this->getter_reader_ok_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get reader of DDS_Get failed\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get reader of DDS_Get passed\n")));
-      }
-    if (!this->getter_filter_config_ok_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get filter config of DDS_Get failed\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get filter config of DDS_Get passed\n")));
-      }
-    //DDS_Listen
-    if (!this->listen_data_control_ok_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get data listen control of DDS_Listen failed\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get data listen control of DDS_Listen passed\n")));
-      }
-    if (!this->listen_reader_ok_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get reader of DDS_Listen failed\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get reader of DDS_Listen passed\n")));
-      }
-    if (!this->listen_dds_data_reader_ok_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get dds reader of DDS_Listen failed\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get dds reader of DDS_Listen passed\n")));
-      }
-    if (!this->listen_filter_config_ok_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get filter config of DDS_Listen failed\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get filter config of DDS_Listen passed\n")));
-      }
-    //Provides
-    if (!this->raw_listener_created_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : listener not created\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Listener was created\n")));
-      }
-    if (!this->listen_port_status_created_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : PortStatusListener of DDS_Listen not created\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : PortStatusListener of DDS_Listen was created\n")));
-      }
-    if (!this->get_port_status_created_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : PortStatusListener of DDS_Get not created\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : PortStatusListener of DDS_Get was created\n")));
-      }
-    if (!this->get_status_listener_created_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : ConnectorStatusListener not created\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : ConnectorStatusListener was created\n")));
-      }
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Event_Connection_Test_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.h
deleted file mode 100644
index 1818e387d4f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.h
+++ /dev/null
@@ -1,79 +0,0 @@
-// -*- C++ -*-
-#ifndef EVENT_CONNECTION_RECEIVER_EXEC_H_
-#define EVENT_CONNECTION_RECEIVER_EXEC_H_
-
-#include "Event_Connection_Test_ReceiverEC.h"
-
-#include /**/ "Receiver_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-namespace CIAO_Event_Connection_Test_Receiver_Impl
-{
-  //============================================================
-  // Receiver_exec_i
-  //============================================================
-  class RECEIVER_EXEC_Export Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    // Port operations.
-    virtual ::Event_ConnectionConnector::CCM_Listener_ptr
-    get_info_listen_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_listen_status (void);
-
-    //DDS_Get
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_get_status (void);
-
-    virtual CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_status_listener(void);
-
-    // Operations from Components::SessionComponent.
-    virtual void
-    set_session_context (
-      ::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete (void);
-
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-
-  private:
-    ::Event_Connection_Test::CCM_Receiver_Context_var context_;
-
-    bool getter_ok_;
-    bool getter_reader_ok_;
-    bool getter_dds_data_reader_ok_;
-    bool getter_filter_config_ok_;
-
-    //DDS_Listen
-    bool listen_data_control_ok_;
-    bool listen_reader_ok_;
-    bool listen_dds_data_reader_ok_;
-    bool listen_filter_config_ok_;
-
-    //Provide checks
-    bool listen_port_status_created_;
-    bool get_port_status_created_;
-    bool get_status_listener_created_;
-    bool raw_listener_created_;
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Event_Connection_Test_Receiver_Impl (void);
-}
-
-#endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/.gitignore b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/.gitignore
deleted file mode 100644
index 021736f2ef6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/Event_Connection_Test_SenderE.idl
-/Sender_exec_export.h
-/Sender_lem_stub_export.h
-/Sender_stub_export.h
-/Sender_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.idl
deleted file mode 100644
index cd21c5158cb..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.idl
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_EVENT_CONNECTION_TEST_SENDER_IDL
-#define DDS_EVENT_CONNECTION_TEST_SENDER_IDL
-
-#include "Connector/Event_Connection_Test_Connector.idl"
-
-module Event_Connection_Test
-{
-  component Sender
-  {
-    port Event_ConnectionConnector::DDS_Write info_write;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc
deleted file mode 100644
index 70da2a16c63..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc
+++ /dev/null
@@ -1,138 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_ECT_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_ECT_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_ECT_Connector_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I ..
-
-  IDL_Files {
-    Event_Connection_Test_Sender.idl
-  }
-}
-
-project(DDS_ECT_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_ECT_Sender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    Event_Connection_Test_SenderE.idl
-  }
-}
-
-project(DDS_ECT_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_ECT_Sender_lem_gen DDS_ECT_Sender_stub DDS_ECT_Base_stub
-  libs  += DDS_ECT_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Event_Connection_Test_SenderEC.cpp
-  }
-
-  Header_Files {
-    Event_Connection_Test_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Event_Connection_Test_SenderEC.inl
-  }
-}
-
-project(DDS_ECT_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_ECT_Sender_idl_gen DDS_ECT_Base_stub DDS_ECT_Connector_stub
-  libs  += DDS_ECT_Base_stub DDS_ECT_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Event_Connection_Test_SenderC.cpp
-  }
-
-  Header_Files {
-    Event_Connection_Test_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    Event_Connection_Test_SenderC.inl
-  }
-}
-
-project(DDS_ECT_Sender_exec) : ciao_executor, dds4ccm_base {
-  after   += DDS_ECT_Sender_lem_stub DDS_ECT_Sender_stub DDS_ECT_Connector_lem_stub DDS_ECT_Connector_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub DDS_ECT_Base_stub DDS_ECT_Connector_lem_stub DDS_ECT_Connector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Event_Connection_Test_Sender_exec.cpp
-  }
-
-  Header_Files {
-    Event_Connection_Test_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_ECT_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_ECT_Base_stub  DDS_ECT_Sender_lem_stub DDS_ECT_Connector_stub DDS_ECT_Connector_svnt  DDS_ECT_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                DDS_ECT_Base_stub DDS_ECT_Connector_stub DDS_ECT_Connector_svnt DDS_ECT_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Event_Connection_Test_SenderS.cpp
-    Event_Connection_Test_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    Event_Connection_Test_SenderS.h
-    Event_Connection_Test_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.cpp
deleted file mode 100644
index ab7d1aee693..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-// -*- C++ -*-
-#include "Event_Connection_Test_Sender_exec.h"
-
-namespace CIAO_Event_Connection_Test_Sender_Impl
-{
-  //============================================================
-  // Sender_exec_i
-  //============================================================
-  Sender_exec_i::Sender_exec_i (void)
-    : writer_ok_ (false),
-      writer_dds_datawriter_ok_ (false)
-  {
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-  }
-
-  void
-  Sender_exec_i::set_session_context (::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::Event_Connection_Test::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    ::Event_ConnectionConnector::Writer_var writer =
-        this->context_->get_connection_info_write_data ();
-    if (! ::CORBA::is_nil (writer.in ()))
-      {
-        this->writer_ok_ = true;
-      }
-    ::DDS::DataWriter_var writer_dds_datawriter =
-        this->context_->get_connection_info_write_dds_entity ();
-    if (! ::CORBA::is_nil (writer_dds_datawriter.in ()))
-      {
-        this->writer_dds_datawriter_ok_ = true;
-      }
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    if (!this->writer_ok_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Sender : get writer failed\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender : Get writer passed\n")));
-      }
-    if (!this->writer_dds_datawriter_ok_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Sender : get dds writer failed\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender : Get dds writer passed\n")));
-      }
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Event_Connection_Test_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.h
deleted file mode 100644
index 4509c06bf87..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// -*- C++ -*-
-#ifndef EVENT_CONNECTION_SENDER_EXEC_H_
-#define EVENT_CONNECTION_SENDER_EXEC_H_
-
-
-#include "Event_Connection_Test_SenderEC.h"
-
-#include /**/ "Sender_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-namespace CIAO_Event_Connection_Test_Sender_Impl
-{
-  //============================================================
-  // Sender_exec_i
-  //============================================================
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete (void);
-
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-
-  private:
-    ::Event_Connection_Test::CCM_Sender_Context_var context_;
-
-    bool writer_ok_;
-    bool writer_dds_datawriter_ok_;
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Event_Connection_Test_Sender_Impl (void);
-}
-
-#endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/descriptors/Plan.cdp
deleted file mode 100644
index 98af0e2eddb..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/descriptors/Plan.cdp
+++ /dev/null
@@ -1,549 +0,0 @@
-<!--  -->
-<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>Event_Connection_Test_Depl_1</label>
-  <UUID>Event_Connection_Test_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Event_Connection_Test_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Event_Connection_Test_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Event_Connection_Test_ConnectorComponentImplementation">
-    <name>Event_Connection_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Event_Connection_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="Event_Connection_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Event_ConnectionConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Event_ConnectionConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Event_Connection_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Event_Connection_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Event_Connection_Test_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Event_Connection_Test_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-  </instance>
-  <instance xmi:id="Event_Connection_Test_ConnectorComponentInstance">
-    <name>Event_Connection_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Event_Connection_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Event_Connection_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="Event_Connection_Test_ConnectorComponentInstance2">
-    <name>Event_Connection_Test_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Event_Connection_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Event_Connection_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-  </instance>
-
-  <connection>
-    <name>listen_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Event_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>listen_portstatuslistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Event_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>listen_rawlistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Event_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>listen_datacontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Event_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>listen_dds_reader</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Event_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>listen_filter_config</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_filter_config</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_filter_config</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Event_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>getter_portstatuslistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Event_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>getter_fresh_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_fresh_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_fresh_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Event_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>getter_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Event_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>getter_dds_reader</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Event_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>getter_filter_config</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_filter_config</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_filter_config</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Event_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>status_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-     <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Event_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Event_Connection_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_dds_writer</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Event_Connection_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="Event_Connection_Test_Connector_ExecArtifact">
-    <name>Event_Connection_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_ECT_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Event_Connection_Test_Connector_SvntArtifact">
-    <name>Event_Connection_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_ECT_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Event_Connection_Test_Connector_StubArtifact">
-    <name>Event_Connection_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_ECT_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl
deleted file mode 100755
index c6321471979..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 10 seconds to allow task to complete\n";
-sleep (10);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/.gitignore b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/.gitignore
deleted file mode 100644
index 77e8d9f2fe7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/FSS_Event_Base.cxx
-/FSS_Event_Base.h
-/FSS_Event_BasePlugin.cxx
-/FSS_Event_BasePlugin.h
-/FSS_Event_BaseSupport.cxx
-/FSS_Event_BaseSupport.h
-/FSS_Event_Base_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl
deleted file mode 100644
index 5f863dfc852..00000000000
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file FSS_Event_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef FIXED_SIZE_STRUCT_EVENT_BASE_IDL
-#define FIXED_SIZE_STRUCT_EVENT_BASE_IDL
-
-#pragma ndds typesupport "Base/FSS_Event_BaseSupport.h"
-#pragma opendds typesupport "Base/FSS_Event_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "FixedStructSizeTest"
-
-struct FixedStructSizeTest {
-  long one;
-  long two;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<FixedStructSizeTest> FixedStructSizeTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.mpc b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.mpc
deleted file mode 100644
index d3e00ad4ba2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_FSS_Event_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_FSS_Event_Base_stub
-  dynamicflags += FIXED_SIZE_STRUCT_EVENT_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=FIXED_SIZE_STRUCT_EVENT_BASE_STUB_Export \
-              -Wb,stub_export_include=FSS_Event_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    FSS_Event_Base.idl
-  }
-
-  opendds_ts_flags += --export=FIXED_SIZE_STRUCT_EVENT_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    FSS_Event_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/.gitignore
deleted file mode 100644
index 769eec5ea57..00000000000
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/FSS_Event_ConnectorE.idl
-/FSS_Event_Connector_conn.cpp
-/FSS_Event_Connector_conn.h
-/FSS_Event_Connector_conn_export.h
-/FSS_Event_Connector_lem_stub_export.h
-/FSS_Event_Connector_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.idl b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.idl
deleted file mode 100644
index 3f15d247191..00000000000
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file FSS_Event_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef FIXED_SIZE_STRUCT_EVENT_CONNECTOR_IDL_
-#define FIXED_SIZE_STRUCT_EVENT_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/FSS_Event_Base.idl"
-
-#pragma ciao lem "Connector/FSS_Event_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/FSS_Event_BaseTypeSupport.idl"
-#endif
-
-module FSS_Event
-{
-  module ::CCM_DDS::Typed < ::FixedStructSizeTest, ::FixedStructSizeTestSeq> FixedStructSizeTestConnector;
-};
-
-#endif /* FSS_Event_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc
deleted file mode 100644
index 5a30d625af0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc
+++ /dev/null
@@ -1,140 +0,0 @@
-project(DDS_FSS_Event_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_FSS_Event_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=FIXED_SIZE_STRUCT_EVENT_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=FSS_Event_Connector_stub_export.h \
-              -Wb,skel_export_macro=FIXED_SIZE_STRUCT_EVENT_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=FSS_Event_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=FIXED_SIZE_STRUCT_EVENT_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=FSS_Event_Connector_svnt_export.h \
-              -Wb,conn_export_macro=FIXED_SIZE_STRUCT_EVENT_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=FSS_Event_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    FSS_Event_Connector.idl
-  }
-}
-
-project(DDS_FSS_Event_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_FSS_Event_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=FIXED_SIZE_STRUCT_EVENT_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=FSS_Event_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    FSS_Event_ConnectorE.idl
-  }
-}
-
-project(DDS_FSS_Event_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_FSS_Event_Connector_lem_gen DDS_FSS_Event_Connector_stub DDS_FSS_Event_Base_stub
-  libs  += DDS_FSS_Event_Base_stub DDS_FSS_Event_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_FSS_Event_Connector_lem_stub
-  dynamicflags += FIXED_SIZE_STRUCT_EVENT_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    FSS_Event_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    FSS_Event_ConnectorEC.h
-    FSS_Event_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    FSS_Event_ConnectorEC.inl
-  }
-}
-
-project(DDS_FSS_Event_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_FSS_Event_Connector_idl_gen DDS_FSS_Event_Base_stub
-  libs  += DDS_FSS_Event_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_FSS_Event_Connector_stub
-  dynamicflags += FIXED_SIZE_STRUCT_EVENT_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    FSS_Event_ConnectorC.cpp
-  }
-
-  Header_Files {
-    FSS_Event_ConnectorC.h
-    FSS_Event_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    FSS_Event_ConnectorC.inl
-  }
-}
-
-project(DDS_FSS_Event_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_FSS_Event_Connector_lem_stub DDS_FSS_Event_Connector_stub
-  sharedname = DDS_FSS_Event_Connector_exec
-  libs += DDS_FSS_Event_Connector_stub DDS_FSS_Event_Connector_lem_stub DDS_FSS_Event_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += FIXED_SIZE_STRUCT_EVENT_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    FSS_Event_Connector_conn.cpp
-  }
-
-  Header_Files {
-    FSS_Event_Connector_conn.h
-    FSS_Event_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_FSS_Event_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_FSS_Event_Connector_lem_stub DDS_FSS_Event_Connector_exec DDS_FSS_Event_Connector_stub
-  sharedname  = DDS_FSS_Event_Connector_svnt
-  libs       += DDS_FSS_Event_Connector_stub \
-                DDS_FSS_Event_Connector_lem_stub  \
-                DDS_FSS_Event_Base_stub \
-                DDS_FSS_Event_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += FIXED_SIZE_STRUCT_EVENT_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    FSS_Event_ConnectorS.cpp
-    FSS_Event_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    FSS_Event_ConnectorS.h
-    FSS_Event_Connector_svnt.h
-    FSS_Event_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/.gitignore b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/.gitignore
deleted file mode 100644
index 37d860c1fd1..00000000000
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/FSS_State_Base.cxx
-/FSS_State_Base.h
-/FSS_State_BasePlugin.cxx
-/FSS_State_BasePlugin.h
-/FSS_State_BaseSupport.cxx
-/FSS_State_BaseSupport.h
-/FSS_State_Base_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl
deleted file mode 100644
index d09fc6a6884..00000000000
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file FSS_State_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef FIXED_SIZE_STRUCT_STATE_BASE_IDL
-#define FIXED_SIZE_STRUCT_STATE_BASE_IDL
-
-#pragma ndds typesupport "Base/FSS_State_BaseSupport.h"
-#pragma opendds typesupport "Base/FSS_State_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "FixedStructSizeTest"
-
-struct FixedStructSizeTest {
-  long one;
-  long two;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<FixedStructSizeTest> FixedStructSizeTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.mpc b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.mpc
deleted file mode 100644
index e5e929febc7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_FSS_State_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_FSS_State_Base_stub
-  dynamicflags += FIXED_SIZE_STRUCT_STATE_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=FIXED_SIZE_STRUCT_STATE_BASE_STUB_Export \
-              -Wb,stub_export_include=FSS_State_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    FSS_State_Base.idl
-  }
-
-  opendds_ts_flags += --export=FIXED_SIZE_STRUCT_STATE_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    FSS_State_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/.gitignore
deleted file mode 100644
index 6b972d0ecd6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/FSS_State_ConnectorE.idl
-/FSS_State_Connector_conn.cpp
-/FSS_State_Connector_conn.h
-/FSS_State_Connector_conn_export.h
-/FSS_State_Connector_lem_stub_export.h
-/FSS_State_Connector_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.idl b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.idl
deleted file mode 100644
index 0ee2f8d5638..00000000000
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file FSS_State_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef FIXED_SIZE_STRUCT_STATE_CONNECTOR_IDL_
-#define FIXED_SIZE_STRUCT_STATE_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/FSS_State_Base.idl"
-
-#pragma ciao lem "Connector/FSS_State_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/FSS_State_BaseTypeSupport.idl"
-#endif
-
-module FSS_State
-{
-  module ::CCM_DDS::Typed < ::FixedStructSizeTest, ::FixedStructSizeTestSeq> FixedStructSizeTestConnector;
-};
-
-#endif /* FSS_State_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc
deleted file mode 100644
index b92636ed14c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_FSS_State_Base -l .. -o ../lib -u DDS FSS_State_Connector"
-
-project(DDS_FSS_State_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_FSS_State_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=FIXED_SIZE_STRUCT_STATE_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=FSS_State_Connector_stub_export.h \
-              -Wb,skel_export_macro=FIXED_SIZE_STRUCT_STATE_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=FSS_State_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=FIXED_SIZE_STRUCT_STATE_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=FSS_State_Connector_svnt_export.h \
-              -Wb,conn_export_macro=FIXED_SIZE_STRUCT_STATE_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=FSS_State_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    FSS_State_Connector.idl
-  }
-}
-
-project(DDS_FSS_State_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_FSS_State_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=FIXED_SIZE_STRUCT_STATE_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=FSS_State_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    FSS_State_ConnectorE.idl
-  }
-}
-
-project(DDS_FSS_State_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_FSS_State_Connector_lem_gen DDS_FSS_State_Connector_stub DDS_FSS_State_Base_stub
-  libs  += DDS_FSS_State_Base_stub DDS_FSS_State_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_FSS_State_Connector_lem_stub
-  dynamicflags += FIXED_SIZE_STRUCT_STATE_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    FSS_State_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    FSS_State_ConnectorEC.h
-    FSS_State_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    FSS_State_ConnectorEC.inl
-  }
-}
-
-project(DDS_FSS_State_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_FSS_State_Connector_idl_gen DDS_FSS_State_Base_stub
-  libs  += DDS_FSS_State_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_FSS_State_Connector_stub
-  dynamicflags += FIXED_SIZE_STRUCT_STATE_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    FSS_State_ConnectorC.cpp
-  }
-
-  Header_Files {
-    FSS_State_ConnectorC.h
-    FSS_State_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    FSS_State_ConnectorC.inl
-  }
-}
-
-project(DDS_FSS_State_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_FSS_State_Connector_lem_stub DDS_FSS_State_Connector_stub DDS_FSS_State_Base_stub
-  sharedname = DDS_FSS_State_Connector_exec
-  libs += DDS_FSS_State_Connector_stub DDS_FSS_State_Connector_lem_stub DDS_FSS_State_Base_stub DDS_FSS_State_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += FIXED_SIZE_STRUCT_STATE_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    FSS_State_Connector_conn.cpp
-  }
-
-  Header_Files {
-    FSS_State_Connector_conn.h
-    FSS_State_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_FSS_State_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_FSS_State_Connector_lem_stub DDS_FSS_State_Connector_exec DDS_FSS_State_Connector_stub
-  sharedname  = DDS_FSS_State_Connector_svnt
-  libs       += DDS_FSS_State_Connector_stub \
-                DDS_FSS_State_Connector_lem_stub  \
-                DDS_FSS_State_Base_stub \
-                DDS_FSS_State_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += FIXED_SIZE_STRUCT_STATE_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    FSS_State_ConnectorS.cpp
-    FSS_State_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    FSS_State_ConnectorS.h
-    FSS_State_Connector_svnt.h
-    FSS_State_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.idl
deleted file mode 100644
index 9e56e98005b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file GCE_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef GET_COMPONENT_EVENT_TEST_BASE_IDL
-#define GET_COMPONENT_EVENT_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/GCE_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/GCE_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "GCETest"
-#pragma DCPS_DATA_KEY "GCETest symbol"
-
-struct GCETest {
-  string symbol; //@key
-  long x;
-  long y;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<GCETest> GCETestSeq;
-#endif
-
-#endif /* GET_COMPONENT_EVENT_TEST_BASE_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.mpc
deleted file mode 100644
index 7ac420f122b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (GCE_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = GCE_Test_Base_stub
-  dynamicflags += GET_COMPONENT_EVENT_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=GET_COMPONENT_EVENT_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=GCE_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    GCE_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=GET_COMPONENT_EVENT_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    GCE_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component.idl b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component.idl
deleted file mode 100644
index cbf76c3a7d6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef COMPONENT_IDL
-#define COMPONENT_IDL
-
-#include "Connector/GCE_Test_Connector.idl"
-
-module GCE_Test
-{
-  component GetComponentEventTestComponent
-  {
-    port GCETestConnector::DDS_Listen  info_listen;
-    port GCETestConnector::DDS_Get     info_get;
-    provides CCM_DDS::ConnectorStatusListener status_listener;
-
-    port GCETestConnector::DDS_Write info_write;
-
-    attribute boolean act_as_sender;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component.mpc
deleted file mode 100644
index ab3f20f1130..00000000000
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-project(GCE_Test_Component_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += GCE_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=COMPONENT_STUB_Export \
-              -Wb,stub_export_include=Component_stub_export.h \
-              -Wb,skel_export_macro=COMPONENT_SVNT_Export \
-              -Wb,skel_export_include=Component_svnt_export.h \
-              -Wb,svnt_export_macro=COMPONENT_SVNT_Export \
-              -Wb,svnt_export_include=Component_svnt_export.h \
-              -Wb,exec_export_macro=COMPONENT_EXEC_Export \
-              -Wb,exec_export_include=Component_exec_export.h -I..
-
-  IDL_Files {
-    GCE_Test_Component.idl
-  }
-}
-
-project(GCE_Test_Component_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += GCE_Test_Component_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=COMPONENT_LEM_STUB_Export \
-              -Wb,stub_export_include=Component_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    GCE_Test_ComponentE.idl
-  }
-}
-
-project(GCE_Test_Component_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += GCE_Test_Component_lem_gen GCE_Test_Component_stub  \
-           GCE_Test_Connector_stub GCE_Test_Base_stub
-  libs  +=  Component_stub GCE_Test_Connector_stub \
-            GCE_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Component_lem_stub
-  dynamicflags += COMPONENT_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GCE_Test_ComponentEC.cpp
-  }
-
-  Header_Files {
-    GCE_Test_ComponentEC.h
-    Component_lem_stub_export.h
-  }
-
-  Inline_Files {
-    GCE_Test_ComponentEC.inl
-  }
-}
-
-project(GCE_Test_Component_stub) : ccm_stub, dds4ccm_base {
-  after += GCE_Test_Component_idl_gen  GCE_Test_Connector_stub \
-           GCE_Test_Base_stub GCE_Test_Connector_lem_gen
-  libs  += GCE_Test_Connector_stub GCE_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Component_stub
-  dynamicflags += COMPONENT_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GCE_Test_ComponentC.cpp
-  }
-
-  Header_Files {
-    GCE_Test_ComponentC.h
-    Component_stub_export.h
-  }
-
-  Inline_Files {
-    GCE_Test_ComponentC.inl
-  }
-}
-
-project(GCE_Test_Component_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += GCE_Test_Component_lem_stub GCE_Test_Component_stub \
-             GCE_Test_Base_stub GCE_Test_Connector_stub \
-             GCE_Test_Connector_lem_stub 
-  sharedname = Component_exec
-  libs += Component_stub Component_lem_stub GCE_Test_Base_stub \
-          GCE_Test_Connector_stub GCE_Test_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COMPONENT_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GCE_Test_Component_exec.cpp
-  }
-
-  Header_Files {
-    GCE_Test_Component_exec.h
-    Component_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(GCE_Test_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   GCE_Test_Component_lem_stub GCE_Test_Base_stub \
-                  GCE_Test_Connector_stub GCE_Test_Connector_svnt \
-                  GCE_Test_Component_exec GCE_Test_Connector_lem_stub 
-  sharedname  = Component_svnt
-  libs       += Component_stub Component_lem_stub GCE_Test_Base_stub \
-                GCE_Test_Connector_stub GCE_Test_Connector_svnt \
-                Component_exec GCE_Test_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COMPONENT_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GCE_Test_ComponentS.cpp
-    GCE_Test_Component_svnt.cpp
-  }
-
-  Header_Files {
-    GCE_Test_ComponentS.h
-    GCE_Test_Component_svnt.h
-    Component_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component_exec.cpp
deleted file mode 100644
index e51b418c453..00000000000
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component_exec.cpp
+++ /dev/null
@@ -1,420 +0,0 @@
-// -*- C++ -*-
-#include "GCE_Test_Component_exec.h"
-
-namespace CIAO_GCE_Test_GetComponentEventTestComponent_Impl
-{
-  //============================================================
-  // Component_exec_i
-  //============================================================
-  Component_exec_i::Component_exec_i (void)
-    : act_as_sender_ (false)
-  {
-  }
-
-  Component_exec_i::~Component_exec_i (void)
-  {
-  }
-
-  ::CORBA::Boolean
-  Component_exec_i::act_as_sender (void)
-  {
-    return this->act_as_sender_;
-  }
-
-  void
-  Component_exec_i::act_as_sender (::CORBA::Boolean act_as_sender)
-  {
-    this->act_as_sender_ = act_as_sender;
-  }
-
-  ::GCETestConnector::CCM_Listener_ptr
-  Component_exec_i::get_info_listen_data_listener (void)
-  {
-    return ::GCETestConnector::CCM_Listener::_nil ();
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Component_exec_i::get_info_listen_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Component_exec_i::get_info_get_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Component_exec_i::get_status_listener (void)
-  {
-    return ::CCM_DDS::CCM_ConnectorStatusListener::_nil ();
-  }
-
-  // Operations from Components::SessionComponent.
-  void
-  Component_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::GCE_Test::CCM_GetComponentEventTestComponent_Context::_narrow (ctx);
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Component_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Component_exec_i::test_writer ()
-  {
-    //DDS_Update -> Writer
-    try
-      {
-        ::GCETestConnector::Writer_var writer_data =
-          this->context_->get_connection_info_write_data ();
-        if (! ::CORBA::is_nil (writer_data.in ()))
-          {
-            CORBA::Object_var cmp = writer_data->_get_component ();
-            ::GCETestConnector::CCM_DDS_Event_var conn =
-              ::GCETestConnector::CCM_DDS_Event::_narrow (cmp.in ());
-            if (::CORBA::is_nil (conn.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_writer - ")
-                                      ACE_TEXT ("Unable to get component interface of ")
-                                      ACE_TEXT ("writer_data\n")));
-              }
-            else
-              {
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_writer - ")
-                                      ACE_TEXT ("Writer on DDS_Write port returned a ")
-                                      ACE_TEXT ("reference on _get_component.\n")));
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_writer - "
-                                  ACE_TEXT ("writer_data is NIL.\n"))));
-          }
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Component_exec_i::test_writer: ");
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_writer - ")
-                              ACE_TEXT ("CORBA exception caught while testing ")
-                              ACE_TEXT ("writer_data\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_writer - ")
-                              ACE_TEXT ("Unknown exception caught while testing ")
-                              ACE_TEXT ("writer_data\n")));
-      }
-
-    try
-      {
-        ::DDS::DataWriter_var writer_dds_entity =
-          this->context_->get_connection_info_write_dds_entity ();
-        if (! ::CORBA::is_nil (writer_dds_entity.in ()))
-          {
-            CORBA::Object_var cmp = writer_dds_entity->_get_component ();
-            ::GCETestConnector::CCM_DDS_Event_var conn =
-              ::GCETestConnector::CCM_DDS_Event::_narrow (cmp.in ());
-            if (::CORBA::is_nil (conn.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_writer - ")
-                                      ACE_TEXT ("Unable to get component interface of ")
-                                      ACE_TEXT ("writer_dds_entity\n")));
-              }
-            else
-              {
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_writer - ")
-                                      ACE_TEXT ("dds_entity on DDS_Write port returned a ")
-                                      ACE_TEXT ("reference on _get_component.\n")));
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_writer - "
-                                  ACE_TEXT ("writer_dds_entity is NIL.\n"))));
-          }
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Component_exec_i::test_writer: ");
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_writer - ")
-                              ACE_TEXT ("CORBA exception caught while testing ")
-                              ACE_TEXT ("write_dds_entity\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_writer - ")
-                              ACE_TEXT ("Unknown exception caught while testing ")
-                              ACE_TEXT ("writer_data\n")));
-      }
-  }
-
-  void
-  Component_exec_i::test_getter ()
-  {
-    //Reader on DDS_Get
-    try
-      {
-        ::GCETestConnector::Reader_var getter_data =
-          this->context_->get_connection_info_get_data ();
-        if (! ::CORBA::is_nil (getter_data.in ()))
-          {
-            CORBA::Object_var cmp = getter_data->_get_component ();
-            ::GCETestConnector::CCM_DDS_Event_var conn =
-              ::GCETestConnector::CCM_DDS_Event::_narrow (cmp.in ());
-            if (::CORBA::is_nil (conn.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
-                                      ACE_TEXT ("Unable to get component interface of ")
-                                      ACE_TEXT ("getter_data\n")));
-              }
-            else
-              {
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_getter - ")
-                                      ACE_TEXT ("Reader on DDS_Get port returned a ")
-                                      ACE_TEXT ("reference on _get_component.\n")));
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
-                                  ACE_TEXT ("getter_data is NIL.\n")));
-          }
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Component_exec_i::test_getter: ");
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
-                              ACE_TEXT ("CORBA exception caught while testing ")
-                              ACE_TEXT ("getter_data\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
-                              ACE_TEXT ("Unknown exception caught while testing ")
-                              ACE_TEXT ("getter_data\n")));
-      }
-
-    //Getter on DDS_Get
-    try
-      {
-        ::GCETestConnector::Getter_var getter_fresh_data =
-          this->context_->get_connection_info_get_fresh_data ();
-        if (! ::CORBA::is_nil (getter_fresh_data.in ()))
-          {
-            CORBA::Object_var cmp = getter_fresh_data->_get_component ();
-            ::GCETestConnector::CCM_DDS_Event_var conn =
-              ::GCETestConnector::CCM_DDS_Event::_narrow (cmp.in ());
-            if (::CORBA::is_nil (conn.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
-                                      ACE_TEXT ("Unable to get component interface of ")
-                                      ACE_TEXT ("getter_fresh_data\n")));
-              }
-            else
-              {
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_getter - ")
-                                      ACE_TEXT ("Getter on DDS_Get port returned a ")
-                                      ACE_TEXT ("reference on _get_component.\n")));
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
-                                  ACE_TEXT ("getter_fresh_data is NIL.\n")));
-          }
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Component_exec_i::test_getter: ");
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
-                              ACE_TEXT ("CORBA exception caught while testing ")
-                              ACE_TEXT ("getter_fresh_data\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
-                              ACE_TEXT ("Unknown exception caught while testing ")
-                              ACE_TEXT ("getter_fresh_data\n")));
-      }
-
-    //Getter on DDS_Get
-    try
-      {
-        ::DDS::DataReader_var getter_dds_entity =
-          this->context_->get_connection_info_get_dds_entity ();
-        if (! ::CORBA::is_nil (getter_dds_entity.in ()))
-          {
-            CORBA::Object_var cmp = getter_dds_entity->_get_component ();
-            ::GCETestConnector::CCM_DDS_Event_var conn =
-              ::GCETestConnector::CCM_DDS_Event::_narrow (cmp.in ());
-            if (::CORBA::is_nil (conn.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
-                                      ACE_TEXT ("Unable to get component interface of ")
-                                      ACE_TEXT ("getter_dds_entity\n")));
-              }
-            else
-              {
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_getter - ")
-                                      ACE_TEXT ("dds_entity on DDS_Get port returned a ")
-                                      ACE_TEXT ("reference on _get_component.\n")));
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
-                                  ACE_TEXT ("getter_dds_entity is NIL.\n")));
-          }
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Component_exec_i::test_getter: ");
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
-                              ACE_TEXT ("CORBA exception caught while testing ")
-                              ACE_TEXT ("get_dds_entity\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
-                              ACE_TEXT ("Unknown exception caught while testing ")
-                              ACE_TEXT ("get_dds_entity\n")));
-      }
-  }
-
-  void
-  Component_exec_i::test_listener ()
-  {
-    try
-      {
-         //DDS_Listen
-        ::GCETestConnector::Reader_var listen_data =
-          this->context_->get_connection_info_listen_data ();
-        if (! ::CORBA::is_nil (listen_data.in ()))
-          {
-            CORBA::Object_var cmp = listen_data->_get_component ();
-            ::GCETestConnector::CCM_DDS_Event_var conn =
-              ::GCETestConnector::CCM_DDS_Event::_narrow (cmp.in ());
-            if (::CORBA::is_nil (conn.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ")
-                                      ACE_TEXT ("Unable to get component interface of ")
-                                      ACE_TEXT ("listen_data\n")));
-              }
-            else
-              {
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_listener - ")
-                                      ACE_TEXT ("Reader on DDS_Listen port returned a ")
-                                      ACE_TEXT ("reference on _get_component.\n")));
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ")
-                                  ACE_TEXT ("listen_data is NIL.\n")));
-          }
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Component_exec_i::test_listener: ");
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ")
-                              ACE_TEXT ("CORBA exception caught while testing ")
-                              ACE_TEXT ("listen_data\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ")
-                              ACE_TEXT ("Unknown exception caught while testing ")
-                              ACE_TEXT ("listen_data\n")));
-      }
-
-    try
-      {
-        ::CCM_DDS::DataListenerControl_var  listen_data_control =
-          this->context_->get_connection_info_listen_data_control ();
-        if (! ::CORBA::is_nil (listen_data_control.in ()))
-          {
-            CORBA::Object_var cmp = listen_data_control->_get_component ();
-            ::GCETestConnector::CCM_DDS_Event_var conn =
-              ::GCETestConnector::CCM_DDS_Event::_narrow (cmp.in ());
-            if (::CORBA::is_nil (conn.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ")
-                                      ACE_TEXT ("Unable to get component interface of ")
-                                      ACE_TEXT ("listen_data_control\n")));
-              }
-            else
-              {
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_listener - ")
-                                      ACE_TEXT ("DataControl on DDS_Listen port returned a ")
-                                      ACE_TEXT ("reference on _get_component.\n")));
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ")
-                                  ACE_TEXT ("listen_data_control is NIL.\n")));
-          }
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Component_exec_i::test_listener: ");
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ")
-                              ACE_TEXT ("CORBA exception caught while testing ")
-                              ACE_TEXT ("listen_data_control\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ")
-                              ACE_TEXT ("Unknown exception caught while testing ")
-                              ACE_TEXT ("listen_data_control\n")));
-      }
-  }
-
-  void
-  Component_exec_i::ccm_activate (void)
-  {
-    if (this->act_as_sender_)
-      {
-        this->test_writer ();
-      }
-    else
-      {
-        this->test_getter ();
-        this->test_listener ();
-      }
-  }
-
-  void
-  Component_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Component_exec_i::ccm_remove (void)
-  {
-  }
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_GetComponentEventTest_Component_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Component_exec_i);
-
-    return retval;
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component_exec.h b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component_exec.h
deleted file mode 100644
index 79db6fd36e7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component_exec.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_COMPONENT_EXEC_H_
-#define CIAO_COMPONENT_EXEC_H_
-
-#include "GCE_Test_ComponentEC.h"
-
-#include /**/ "Component_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-namespace CIAO_GCE_Test_GetComponentEventTestComponent_Impl
-{
-  //============================================================
-  // Component_exec_i
-  //============================================================
-  class COMPONENT_EXEC_Export Component_exec_i
-    : public virtual GetComponentEventTestComponent_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Component_exec_i (void);
-    virtual ~Component_exec_i (void);
-
-    ::CORBA::Boolean
-    act_as_sender (void);
-
-    void
-    act_as_sender (::CORBA::Boolean act_as_sender);
-
-    virtual ::GCETestConnector::CCM_Listener_ptr
-    get_info_listen_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_listen_status (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_get_status (void);
-
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_status_listener (void);
-
-    // Operations from Components::SessionComponent.
-    virtual void
-    set_session_context (
-      ::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete (void);
-
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-
-  private:
-    ::GCE_Test::CCM_GetComponentEventTestComponent_Context_var context_;
-    ::CORBA::Boolean act_as_sender_;
-    void test_writer (void);
-    void test_getter (void);
-    void test_listener (void);
-  };
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_GetComponentEventTest_Component_Impl (void);
-}
-
-#endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.idl
deleted file mode 100644
index ae80f12bf6a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file GCE_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef GET_COMPONENT_EVENT_TEST_CONNECTOR_IDL_
-#define GET_COMPONENT_EVENT_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/GCE_Test_Base.idl"
-
-#pragma ciao lem "Connector/GCE_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/GCE_Test_BaseTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::GCETest, ::GCETestSeq> GCETestConnector;
-
-#endif /* GET_COMPONENT_EVENT_TEST_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.mpc
deleted file mode 100644
index 802e33ce66d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p GCE_Test_Base -l .. -o ../lib -u DDS GCE_Test_Connector"
-
-project(GCE_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen GCE_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=GET_COMPONENT_EVENT_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=GCE_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=GET_COMPONENT_EVENT_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=GCE_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=GET_COMPONENT_EVENT_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=GCE_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=GET_COMPONENT_EVENT_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=GCE_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    GCE_Test_Connector.idl
-  }
-}
-
-project(GCE_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += GCE_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=GET_COMPONENT_EVENT_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=GCE_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    GCE_Test_ConnectorE.idl
-  }
-}
-
-project(GCE_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += GCE_Test_Connector_lem_gen GCE_Test_Connector_stub GCE_Test_Base_stub
-  libs  += GCE_Test_Base_stub GCE_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = GCE_Test_Connector_lem_stub
-  dynamicflags += GET_COMPONENT_EVENT_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GCE_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    GCE_Test_ConnectorEC.h
-    GCE_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    GCE_Test_ConnectorEC.inl
-  }
-}
-
-project(GCE_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += GCE_Test_Connector_idl_gen GCE_Test_Base_stub
-  libs  += GCE_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = GCE_Test_Connector_stub
-  dynamicflags += GET_COMPONENT_EVENT_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GCE_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    GCE_Test_ConnectorC.h
-    GCE_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    GCE_Test_ConnectorC.inl
-  }
-}
-
-project(GCE_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += GCE_Test_Connector_lem_stub GCE_Test_Connector_stub GCE_Test_Base_stub
-  sharedname = GCE_Test_Connector_exec
-  libs += GCE_Test_Connector_stub GCE_Test_Connector_lem_stub GCE_Test_Base_stub GCE_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += GET_COMPONENT_EVENT_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GCE_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    GCE_Test_Connector_conn.h
-    GCE_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(GCE_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += GCE_Test_Connector_lem_stub GCE_Test_Connector_exec GCE_Test_Connector_stub
-  sharedname  = GCE_Test_Connector_svnt
-  libs       += GCE_Test_Connector_stub \
-                GCE_Test_Connector_lem_stub  \
-                GCE_Test_Base_stub \
-                GCE_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += GET_COMPONENT_EVENT_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GCE_Test_ConnectorS.cpp
-    GCE_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    GCE_Test_ConnectorS.h
-    GCE_Test_Connector_svnt.h
-    GCE_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/descriptors/Plan.cdp
deleted file mode 100644
index de9f38b7dc6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/descriptors/Plan.cdp
+++ /dev/null
@@ -1,361 +0,0 @@
-<!--  -->
-<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>GetComponentEventTest_Depl</label>
-  <UUID>GetComponentEventTest_Depl</UUID>
-
-  <implementation xmi:id="ComponentImplementation">
-    <name>ComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Component_ExecArtifact" />
-    <artifact xmi:idref="Component_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_GetComponentEventTest_Component_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_GCE_Test_GetComponentEventTestComponent_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="GCE_Test_ConnectorImplementation">
-    <name>GCE_Test_ConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="GCE_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="GCE_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_GCETestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_GCETestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>GCE_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>GCE_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <!-- act as sender-->
-  <instance xmi:id="ComponentInstance1">
-    <name>Sender</name>
-    <node>SenderNode</node>
-    <source/>
-    <implementation xmi:idref="ComponentImplementation" />
-    <configProperty>
-      <name>act_as_sender</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>true</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="GCE_Test_ConnectorInstance1">
-    <name>GCE_Test_Connector1</name>
-    <node>SenderNode</node>
-    <source/>
-    <implementation xmi:idref="GCE_Test_ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>GetComponentEventTopic</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <!-- act as receiver -->
-  <instance xmi:id="ComponentInstance2">
-    <name>Receiver</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ComponentImplementation" />
-    <configProperty>
-      <name>act_as_sender</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="GCE_Test_ConnectorInstance2">
-    <name>GCE_Test_Connector2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="GCE_Test_ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>GetComponentEventTopic</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <!-- SENDER COMPONENT CONNECTIONS -->
-  <connection>
-    <name>write_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance1" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="GCE_Test_ConnectorInstance1" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>write_dds_entity</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance1" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="GCE_Test_ConnectorInstance1" />
-    </internalEndpoint>
-  </connection>
-
-  <!-- RECEIVER COMPONENT CONNECTIONS -->
-  <!--   DDS_Get port -->
-  <connection>
-    <name>get_data_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance2" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="GCE_Test_ConnectorInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>get_dds_entity_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance2" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="GCE_Test_ConnectorInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>get_fresh_data_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_fresh_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance2" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_fresh_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="GCE_Test_ConnectorInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <!--   DDS_Listen port -->
-  <connection>
-    <name>listen_data_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance2" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="GCE_Test_ConnectorInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>listen_data_control_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance2" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="GCE_Test_ConnectorInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="GCE_Test_Connector_ExecArtifact">
-    <name>GCE_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>GCE_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="GCE_Test_Connector_SvntArtifact">
-    <name>GCE_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>GCE_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="GCE_Test_Connector_StubArtifact">
-    <name>GCE_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>GCE_Test_Connector_stub</location>
-  </artifact>
-
-  <artifact xmi:id="Component_ExecArtifact">
-    <name>Component_exec</name>
-    <source/>
-    <node/>
-    <location>Component_exec</location>
-  </artifact>
-  <artifact xmi:id="Component_SvntArtifact">
-    <name>Component_svnt</name>
-    <source/>
-    <node/>
-    <location>Component_svnt</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/descriptors/run_test.pl
deleted file mode 100755
index 955469ac4bc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "Sender.ior", "Receiver.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 5 seconds to allow task to complete\n";
-sleep (5);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.idl
deleted file mode 100644
index 28624e01777..00000000000
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file GCS_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef GET_COMPONENT_STATE_TEST_BASE_IDL
-#define GET_COMPONENT_STATE_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/GCS_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/GCS_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "GCSTest"
-#pragma DCPS_DATA_KEY "GCSTest symbol"
-
-struct GCSTest {
-  string symbol; //@key
-  long x;
-  long y;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<GCSTest> GCSTestSeq;
-#endif
-
-#endif /* GET_COMPONENT_STATE_TEST_BASE_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.mpc
deleted file mode 100644
index 7756e763040..00000000000
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (GCS_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = GCS_Test_Base_stub
-  dynamicflags += GET_COMPONENT_STATE_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=GET_COMPONENT_STATE_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=GCS_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    GCS_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=GET_COMPONENT_STATE_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    GCS_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component.idl b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component.idl
deleted file mode 100644
index ec5ce2468b9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef COMPONENT_IDL
-#define COMPONENT_IDL
-
-#include "Connector/GCS_Test_Connector.idl"
-
-module GCS_Test
-{
-  component GetComponentStateTestComponent
-  {
-    port GCSTestConnector::DDS_Read info_read;
-    port GCSTestConnector::DDS_Get info_get;
-    port GCSTestConnector::DDS_Listen info_listen;
-    port GCSTestConnector::DDS_StateListen info_statelisten;
-
-    port GCSTestConnector::DDS_Update info_update;
-
-    attribute boolean act_as_sender;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component.mpc
deleted file mode 100644
index 929c3edd9f3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-project(GCS_Test_Component_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += GCS_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=COMPONENT_STUB_Export \
-              -Wb,stub_export_include=Component_stub_export.h \
-              -Wb,skel_export_macro=COMPONENT_SVNT_Export \
-              -Wb,skel_export_include=Component_svnt_export.h \
-              -Wb,svnt_export_macro=COMPONENT_SVNT_Export \
-              -Wb,svnt_export_include=Component_svnt_export.h \
-              -Wb,exec_export_macro=COMPONENT_EXEC_Export \
-              -Wb,exec_export_include=Component_exec_export.h -I..
-
-  IDL_Files {
-    GCS_Test_Component.idl
-  }
-}
-
-project(GCS_Test_Component_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += GCS_Test_Component_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=COMPONENT_LEM_STUB_Export \
-              -Wb,stub_export_include=Component_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    GCS_Test_ComponentE.idl
-  }
-}
-
-project(GCS_Test_Component_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += GCS_Test_Component_lem_gen GCS_Test_Component_stub  \
-           GCS_Test_Connector_stub GCS_Test_Base_stub
-  libs  +=  Component_stub GCS_Test_Connector_stub \
-            GCS_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Component_lem_stub
-  dynamicflags += COMPONENT_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GCS_Test_ComponentEC.cpp
-  }
-
-  Header_Files {
-    GCS_Test_ComponentEC.h
-    Component_lem_stub_export.h
-  }
-
-  Inline_Files {
-    GCS_Test_ComponentEC.inl
-  }
-}
-
-project(GCS_Test_Component_stub) : ccm_stub, dds4ccm_base {
-  after += GCS_Test_Component_idl_gen  GCS_Test_Connector_stub \
-           GCS_Test_Base_stub GCS_Test_Connector_lem_gen
-  libs  += GCS_Test_Connector_stub GCS_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Component_stub
-  dynamicflags += COMPONENT_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GCS_Test_ComponentC.cpp
-  }
-
-  Header_Files {
-    GCS_Test_ComponentC.h
-    Component_stub_export.h
-  }
-
-  Inline_Files {
-    GCS_Test_ComponentC.inl
-  }
-}
-
-project(GCS_Test_Component_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += GCS_Test_Component_lem_stub GCS_Test_Component_stub \
-             GCS_Test_Base_stub GCS_Test_Connector_stub \
-             GCS_Test_Connector_lem_stub 
-  sharedname = Component_exec
-  libs += Component_stub Component_lem_stub GCS_Test_Base_stub \
-          GCS_Test_Connector_stub GCS_Test_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COMPONENT_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GCS_Test_Component_exec.cpp
-  }
-
-  Header_Files {
-    GCS_Test_Component_exec.h
-    Component_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(GCS_Test_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   GCS_Test_Component_lem_stub GCS_Test_Base_stub \
-                  GCS_Test_Connector_stub GCS_Test_Connector_svnt \
-                  GCS_Test_Component_exec GCS_Test_Connector_lem_stub 
-  sharedname  = Component_svnt
-  libs       += Component_stub Component_lem_stub GCS_Test_Base_stub \
-                GCS_Test_Connector_stub GCS_Test_Connector_svnt \
-                Component_exec GCS_Test_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COMPONENT_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GCS_Test_ComponentS.cpp
-    GCS_Test_Component_svnt.cpp
-  }
-
-  Header_Files {
-    GCS_Test_ComponentS.h
-    GCS_Test_Component_svnt.h
-    Component_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component_exec.cpp
deleted file mode 100644
index e4227a18f31..00000000000
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component_exec.cpp
+++ /dev/null
@@ -1,612 +0,0 @@
-// -*- C++ -*-
-#include "GCS_Test_Component_exec.h"
-
-namespace CIAO_GCS_Test_GetComponentStateTestComponent_Impl
-{
-  //============================================================
-  // Component_exec_i
-  //============================================================
-  Component_exec_i::Component_exec_i (void)
-    : act_as_sender_ (false)
-  {
-  }
-
-  Component_exec_i::~Component_exec_i (void)
-  {
-  }
-
-  ::CORBA::Boolean
-  Component_exec_i::act_as_sender (void)
-  {
-    return this->act_as_sender_;
-  }
-
-  void
-  Component_exec_i::act_as_sender (::CORBA::Boolean act_as_sender)
-  {
-    this->act_as_sender_ = act_as_sender;
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Component_exec_i::get_info_read_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Component_exec_i::get_info_get_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::GCSTestConnector::CCM_Listener_ptr
-  Component_exec_i::get_info_listen_data_listener (void)
-  {
-    return ::GCSTestConnector::CCM_Listener::_nil ();
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Component_exec_i::get_info_listen_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::GCSTestConnector::CCM_StateListener_ptr
-  Component_exec_i::get_info_statelisten_data_listener (void)
-  {
-    return ::GCSTestConnector::CCM_StateListener::_nil ();
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Component_exec_i::get_info_statelisten_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  // Operations from Components::SessionComponent.
-  void
-  Component_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::GCS_Test::CCM_GetComponentStateTestComponent_Context::_narrow (ctx);
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Component_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Component_exec_i::test_updater ()
-  {
-    //DDS_Update -> Writer
-    try
-      {
-        ::GCSTestConnector::Updater_var updater_data =
-          this->context_->get_connection_info_update_data ();
-        if (! ::CORBA::is_nil (updater_data.in ()))
-          {
-            CORBA::Object_var cmp = updater_data->_get_component ();
-            ::GCSTestConnector::CCM_DDS_State_var conn =
-              ::GCSTestConnector::CCM_DDS_State::_narrow (cmp.in ());
-            if (::CORBA::is_nil (conn.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_updater - ")
-                                      ACE_TEXT ("Unable to get component interface of ")
-                                      ACE_TEXT ("updater_data\n")));
-              }
-            else
-              {
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_updater - ")
-                                      ACE_TEXT ("Writer on DDS_Update port returned a ")
-                                      ACE_TEXT ("reference on _get_component.\n")));
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_updater - "
-                                  ACE_TEXT ("updater_data is NIL.\n"))));
-          }
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Component_exec_i::test_updater: ");
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_updater - ")
-                              ACE_TEXT ("CORBA exception caught while testing ")
-                              ACE_TEXT ("updater_data\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_updater - ")
-                              ACE_TEXT ("Unknown exception caught while testing ")
-                              ACE_TEXT ("updater_data\n")));
-      }
-
-    try
-      {
-        ::DDS::DataWriter_var updater_dds_entity =
-          this->context_->get_connection_info_update_dds_entity ();
-        if (! ::CORBA::is_nil (updater_dds_entity.in ()))
-          {
-            CORBA::Object_var cmp = updater_dds_entity->_get_component ();
-            ::GCSTestConnector::CCM_DDS_State_var conn =
-              ::GCSTestConnector::CCM_DDS_State::_narrow (cmp.in ());
-            if (::CORBA::is_nil (conn.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_updater - ")
-                                      ACE_TEXT ("Unable to get component interface of ")
-                                      ACE_TEXT ("updater_dds_entity\n")));
-              }
-            else
-              {
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_updater - ")
-                                      ACE_TEXT ("dds entity on DDS_Update port returned a ")
-                                      ACE_TEXT ("reference on _get_component.\n")));
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_updater - "
-                                  ACE_TEXT ("updater_dds_entity is NIL.\n"))));
-          }
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Component_exec_i::test_updater: ");
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_updater - ")
-                              ACE_TEXT ("CORBA exception caught while testing ")
-                              ACE_TEXT ("update_dds_entity\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_updater - ")
-                              ACE_TEXT ("Unknown exception caught while testing ")
-                              ACE_TEXT ("update_dds_entity\n")));
-      }
-  }
-
-  void
-  Component_exec_i::test_reader ()
-  {
-    //DDS_Read -> Reader
-    try
-      {
-        ::GCSTestConnector::Reader_var reader_data =
-          this->context_->get_connection_info_read_data ();
-        if (! ::CORBA::is_nil (reader_data.in ()))
-          {
-            CORBA::Object_var cmp = reader_data->_get_component ();
-            ::GCSTestConnector::CCM_DDS_State_var conn =
-              ::GCSTestConnector::CCM_DDS_State::_narrow (cmp.in ());
-            if (::CORBA::is_nil (conn.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_reader - ")
-                                      ACE_TEXT ("Unable to get component interface of ")
-                                      ACE_TEXT ("data_reader\n")));
-              }
-            else
-              {
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_reader - ")
-                                      ACE_TEXT ("Reader on DDS_Read port returned a ")
-                                      ACE_TEXT ("reference on _get_component.\n")));
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_reader - "
-                                  ACE_TEXT ("reader_data is NIL.\n"))));
-          }
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Component_exec_i::test_reader: ");
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_reader - ")
-                              ACE_TEXT ("CORBA exception caught while testing ")
-                              ACE_TEXT ("data_reader\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_reader - ")
-                              ACE_TEXT ("Unknown exception caught while testing ")
-                              ACE_TEXT ("data_reader\n")));
-      }
-
-    try
-      {
-        ::DDS::DataReader_var datareader =
-          this->context_->get_connection_info_read_dds_entity ();
-        if (! ::CORBA::is_nil (datareader.in ()))
-          {
-            CORBA::Object_var cmp = datareader->_get_component ();
-            ::GCSTestConnector::CCM_DDS_State_var conn =
-              ::GCSTestConnector::CCM_DDS_State::_narrow (cmp.in ());
-            if (::CORBA::is_nil (conn.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_reader - ")
-                                      ACE_TEXT ("Unable to get component interface of ")
-                                      ACE_TEXT ("dds_entity\n")));
-              }
-            else
-              {
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_reader - ")
-                                      ACE_TEXT ("DDS Entity on DDS_Read port returned a ")
-                                      ACE_TEXT ("reference on _get_component.\n")));
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_reader - "
-                                  ACE_TEXT ("data entity is NIL.\n"))));
-          }
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Component_exec_i::test_reader: ");
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_reader - ")
-                              ACE_TEXT ("CORBA exception caught while testing ")
-                              ACE_TEXT ("read_dds_entity\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_reader - ")
-                              ACE_TEXT ("Unknown exception caught while testing ")
-                              ACE_TEXT ("read_dds_entity\n")));
-      }
-  }
-
-  void
-  Component_exec_i::test_getter ()
-  {
-    //Reader on DDS_Get
-    try
-      {
-        ::GCSTestConnector::Reader_var getter_data =
-          this->context_->get_connection_info_get_data ();
-        if (! ::CORBA::is_nil (getter_data.in ()))
-          {
-            CORBA::Object_var cmp = getter_data->_get_component ();
-            ::GCSTestConnector::CCM_DDS_State_var conn =
-              ::GCSTestConnector::CCM_DDS_State::_narrow (cmp.in ());
-            if (::CORBA::is_nil (conn.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
-                                      ACE_TEXT ("Unable to get component interface of ")
-                                      ACE_TEXT ("getter_data\n")));
-              }
-            else
-              {
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_getter - ")
-                                      ACE_TEXT ("Reader on DDS_Get port returned a ")
-                                      ACE_TEXT ("reference on _get_component.\n")));
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
-                                  ACE_TEXT ("getter_data is NIL.\n")));
-          }
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Component_exec_i::test_getter: ");
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
-                              ACE_TEXT ("CORBA exception caught while testing ")
-                              ACE_TEXT ("getter_data\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
-                              ACE_TEXT ("Unknown exception caught while testing ")
-                              ACE_TEXT ("getter_data\n")));
-      }
-
-    try
-      {
-        ::DDS::DataReader_var getter_dds_entity =
-          this->context_->get_connection_info_get_dds_entity ();
-        if (! ::CORBA::is_nil (getter_dds_entity.in ()))
-          {
-            CORBA::Object_var cmp = getter_dds_entity->_get_component ();
-            ::GCSTestConnector::CCM_DDS_State_var conn =
-              ::GCSTestConnector::CCM_DDS_State::_narrow (cmp.in ());
-            if (::CORBA::is_nil (conn.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
-                                      ACE_TEXT ("Unable to get component interface of ")
-                                      ACE_TEXT ("getter_dds_entity\n")));
-              }
-            else
-              {
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_getter - ")
-                                      ACE_TEXT ("dds_entity on DDS_Get port returned a ")
-                                      ACE_TEXT ("reference on _get_component.\n")));
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
-                                  ACE_TEXT ("getter_dds_entity is NIL.\n")));
-          }
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Component_exec_i::test_getter: ");
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
-                              ACE_TEXT ("CORBA exception caught while testing ")
-                              ACE_TEXT ("get_dds_entity\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
-                              ACE_TEXT ("Unknown exception caught while testing ")
-                              ACE_TEXT ("get_dds_entity\n")));
-      }
-
-    //Getter on DDS_Get
-    try
-      {
-        ::GCSTestConnector::Getter_var getter_fresh_data =
-          this->context_->get_connection_info_get_fresh_data ();
-        if (! ::CORBA::is_nil (getter_fresh_data.in ()))
-          {
-            CORBA::Object_var cmp = getter_fresh_data->_get_component ();
-            ::GCSTestConnector::CCM_DDS_State_var conn =
-              ::GCSTestConnector::CCM_DDS_State::_narrow (cmp.in ());
-            if (::CORBA::is_nil (conn.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
-                                      ACE_TEXT ("Unable to get component interface of ")
-                                      ACE_TEXT ("getter_fresh_data\n")));
-              }
-            else
-              {
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_getter - ")
-                                      ACE_TEXT ("Getter on DDS_Get port returned a ")
-                                      ACE_TEXT ("reference on _get_component.\n")));
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
-                                  ACE_TEXT ("getter_fresh_data is NIL.\n")));
-          }
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Component_exec_i::test_getter: ");
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
-                              ACE_TEXT ("CORBA exception caught while testing ")
-                              ACE_TEXT ("getter_fresh_data\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
-                              ACE_TEXT ("Unknown exception caught while testing ")
-                              ACE_TEXT ("getter_fresh_data\n")));
-      }
-  }
-
-  void
-  Component_exec_i::test_listener ()
-  {
-    try
-      {
-        //DDS_Listen
-        ::GCSTestConnector::Reader_var listen_data =
-          this->context_->get_connection_info_listen_data ();
-        if (! ::CORBA::is_nil (listen_data.in ()))
-          {
-            CORBA::Object_var cmp = listen_data->_get_component ();
-            ::GCSTestConnector::CCM_DDS_State_var conn =
-              ::GCSTestConnector::CCM_DDS_State::_narrow (cmp.in ());
-            if (::CORBA::is_nil (conn.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ")
-                                      ACE_TEXT ("Unable to get component interface of ")
-                                      ACE_TEXT ("listen_data\n")));
-              }
-            else
-              {
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_listener - ")
-                                      ACE_TEXT ("Reader on DDS_Listen port returned a ")
-                                      ACE_TEXT ("reference on _get_component.\n")));
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ")
-                                  ACE_TEXT ("listen_data is NIL.\n")));
-          }
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Component_exec_i::test_listener: ");
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ")
-                              ACE_TEXT ("CORBA exception caught while testing ")
-                              ACE_TEXT ("listen_data\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ")
-                              ACE_TEXT ("Unknown exception caught while testing ")
-                              ACE_TEXT ("listen_data\n")));
-      }
-
-    try
-      {
-        ::CCM_DDS::DataListenerControl_var  listen_data_control =
-          this->context_->get_connection_info_listen_data_control ();
-        if (! ::CORBA::is_nil (listen_data_control.in ()))
-          {
-            CORBA::Object_var cmp = listen_data_control->_get_component ();
-            ::GCSTestConnector::CCM_DDS_State_var conn =
-              ::GCSTestConnector::CCM_DDS_State::_narrow (cmp.in ());
-            if (::CORBA::is_nil (conn.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ")
-                                      ACE_TEXT ("Unable to get component interface of ")
-                                      ACE_TEXT ("listen_data_control\n")));
-              }
-            else
-              {
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_listener - ")
-                                      ACE_TEXT ("DataControl on DDS_Listen port returned a ")
-                                      ACE_TEXT ("reference on _get_component.\n")));
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ")
-                                  ACE_TEXT ("listen_data_control is NIL.\n")));
-          }
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Component_exec_i::test_listener: ");
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ")
-                              ACE_TEXT ("CORBA exception caught while testing ")
-                              ACE_TEXT ("listen_data_control\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ")
-                              ACE_TEXT ("Unknown exception caught while testing ")
-                              ACE_TEXT ("listen_data_control\n")));
-      }
-  }
-
-  void
-  Component_exec_i::test_statelistener ()
-  {
-    //DDS_StateListen
-    try
-      {
-        ::GCSTestConnector::Reader_var statelisten_data =
-          this->context_->get_connection_info_statelisten_data ();
-        if (! ::CORBA::is_nil (statelisten_data.in ()))
-          {
-            CORBA::Object_var cmp = statelisten_data->_get_component ();
-            ::GCSTestConnector::CCM_DDS_State_var conn =
-              ::GCSTestConnector::CCM_DDS_State::_narrow (cmp.in ());
-            if (::CORBA::is_nil (conn.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_statelistener - ")
-                                      ACE_TEXT ("Unable to get component interface of ")
-                                      ACE_TEXT ("statelisten_data\n")));
-              }
-            else
-              {
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_statelistener - ")
-                                      ACE_TEXT ("Reader on DDS_StateListen port returned a ")
-                                      ACE_TEXT ("reference on _get_component.\n")));
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_statelistener - ")
-                                  ACE_TEXT ("statelisten_data is NIL.\n")));
-          }
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Component_exec_i::test_statelistener: ");
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ")
-                              ACE_TEXT ("CORBA exception caught while testing ")
-                              ACE_TEXT ("statelisten_data\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_statelistener - ")
-                              ACE_TEXT ("Unknown exception caught while testing ")
-                              ACE_TEXT ("statelisten_data\n")));
-      }
-
-    try
-      {
-        ::CCM_DDS::StateListenerControl_var statelisten_data_control =
-          this->context_->get_connection_info_statelisten_data_control ();
-        if (! ::CORBA::is_nil (statelisten_data_control.in ()))
-          {
-            CORBA::Object_var cmp = statelisten_data_control->_get_component ();
-            ::GCSTestConnector::CCM_DDS_State_var conn =
-              ::GCSTestConnector::CCM_DDS_State::_narrow (cmp.in ());
-            if (::CORBA::is_nil (conn.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_statelistener - ")
-                                      ACE_TEXT ("Unable to get component interface of ")
-                                      ACE_TEXT ("statelisten_data_control\n")));
-              }
-            else
-              {
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_statelistener - ")
-                                      ACE_TEXT ("DataControl on DDS_StateListen port returned a ")
-                                      ACE_TEXT ("reference on _get_component.\n")));
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_statelistener - ")
-                                  ACE_TEXT ("statelisten_data_control is NIL.\n")));
-          }
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Component_exec_i::test_statelistener: ");
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ")
-                              ACE_TEXT ("CORBA exception caught while testing ")
-                              ACE_TEXT ("statelisten_data_control\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_statelistener - ")
-                              ACE_TEXT ("Unknown exception caught while testing ")
-                              ACE_TEXT ("statelisten_data_control\n")));
-      }
-  }
-
-  void
-  Component_exec_i::ccm_activate (void)
-  {
-    if (this->act_as_sender_)
-      {
-        this->test_updater ();
-      }
-    else
-      {
-        this->test_reader ();
-        this->test_getter ();
-        this->test_listener ();
-        this->test_statelistener ();
-      }
-  }
-
-  void
-  Component_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Component_exec_i::ccm_remove (void)
-  {
-  }
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_GetComponentStateTest_Component_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Component_exec_i);
-
-    return retval;
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component_exec.h b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component_exec.h
deleted file mode 100644
index 0d749d19194..00000000000
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component_exec.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_COMPONENT_EXEC_H_
-#define CIAO_COMPONENT_EXEC_H_
-
-#include "GCS_Test_ComponentEC.h"
-
-#include /**/ "Component_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-namespace CIAO_GCS_Test_GetComponentStateTestComponent_Impl
-{
-  //============================================================
-  // Component_exec_i
-  //============================================================
-  class COMPONENT_EXEC_Export Component_exec_i
-    : public virtual GetComponentStateTestComponent_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Component_exec_i (void);
-    virtual ~Component_exec_i (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_read_status (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_get_status (void);
-
-    virtual ::GCSTestConnector::CCM_Listener_ptr
-    get_info_listen_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_listen_status (void);
-
-    virtual ::GCSTestConnector::CCM_StateListener_ptr
-    get_info_statelisten_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_statelisten_status (void);
-
-    ::CORBA::Boolean
-    act_as_sender (void);
-
-    void
-    act_as_sender (::CORBA::Boolean act_as_sender);
-
-    // Operations from Components::SessionComponent.
-    virtual void
-    set_session_context (
-      ::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete (void);
-
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-
-  private:
-    ::GCS_Test::CCM_GetComponentStateTestComponent_Context_var context_;
-    ::CORBA::Boolean act_as_sender_;
-    void test_updater (void);
-    void test_reader (void);
-    void test_getter (void);
-    void test_listener (void);
-    void test_statelistener (void);
-  };
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_GetComponentStateTest_Component_Impl (void);
-}
-
-#endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.idl
deleted file mode 100644
index c4c89e62b17..00000000000
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file GCS_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef GET_COMPONENT_STATE_TEST_CONNECTOR_IDL_
-#define GET_COMPONENT_STATE_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/GCS_Test_Base.idl"
-
-#pragma ciao lem "Connector/GCS_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/GCS_Test_BaseTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::GCSTest, ::GCSTestSeq> GCSTestConnector;
-
-#endif /* GET_COMPONENT_STATE_TEST_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.mpc
deleted file mode 100644
index 033a3b36eda..00000000000
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p GCS_Test_Base -l .. -o ../lib -u DDS GCS_Test_Connector"
-
-project(GCS_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen GCS_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=GET_COMPONENT_STATE_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=GCS_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=GET_COMPONENT_STATE_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=GCS_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=GET_COMPONENT_STATE_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=GCS_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=GET_COMPONENT_STATE_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=GCS_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    GCS_Test_Connector.idl
-  }
-}
-
-project(GCS_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += GCS_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=GET_COMPONENT_STATE_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=GCS_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    GCS_Test_ConnectorE.idl
-  }
-}
-
-project(GCS_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += GCS_Test_Connector_lem_gen GCS_Test_Connector_stub GCS_Test_Base_stub
-  libs  += GCS_Test_Base_stub GCS_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = GCS_Test_Connector_lem_stub
-  dynamicflags += GET_COMPONENT_STATE_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GCS_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    GCS_Test_ConnectorEC.h
-    GCS_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    GCS_Test_ConnectorEC.inl
-  }
-}
-
-project(GCS_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += GCS_Test_Connector_idl_gen GCS_Test_Base_stub
-  libs  += GCS_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = GCS_Test_Connector_stub
-  dynamicflags += GET_COMPONENT_STATE_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GCS_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    GCS_Test_ConnectorC.h
-    GCS_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    GCS_Test_ConnectorC.inl
-  }
-}
-
-project(GCS_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += GCS_Test_Connector_lem_stub GCS_Test_Connector_stub GCS_Test_Base_stub
-  sharedname = GCS_Test_Connector_exec
-  libs += GCS_Test_Connector_stub GCS_Test_Connector_lem_stub GCS_Test_Base_stub GCS_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += GET_COMPONENT_STATE_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GCS_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    GCS_Test_Connector_conn.h
-    GCS_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(GCS_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += GCS_Test_Connector_lem_stub GCS_Test_Connector_exec GCS_Test_Connector_stub
-  sharedname  = GCS_Test_Connector_svnt
-  libs       += GCS_Test_Connector_stub \
-                GCS_Test_Connector_lem_stub  \
-                GCS_Test_Base_stub \
-                GCS_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += GET_COMPONENT_STATE_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GCS_Test_ConnectorS.cpp
-    GCS_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    GCS_Test_ConnectorS.h
-    GCS_Test_Connector_svnt.h
-    GCS_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/GetComponent/State/descriptors/Plan.cdp
deleted file mode 100644
index fa4016877d9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/descriptors/Plan.cdp
+++ /dev/null
@@ -1,441 +0,0 @@
-<!--  -->
-<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>GetComponentStateTest_Depl</label>
-  <UUID>GetComponentStateTest_Depl</UUID>
-
-  <implementation xmi:id="ComponentImplementation">
-    <name>ComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Component_ExecArtifact" />
-    <artifact xmi:idref="Component_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_GetComponentStateTest_Component_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_GCS_Test_GetComponentStateTestComponent_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="GCS_Test_ConnectorImplementation">
-    <name>GCS_Test_ConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="GCS_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="GCS_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_GCSTestConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_GCSTestConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>GCS_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>GCS_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <!-- act as sender-->
-  <instance xmi:id="ComponentInstance1">
-    <name>Sender</name>
-    <node>SenderNode</node>
-    <source/>
-    <implementation xmi:idref="ComponentImplementation" />
-    <configProperty>
-      <name>act_as_sender</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>true</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="GCS_Test_ConnectorInstance1">
-    <name>GCS_Test_Connector1</name>
-    <node>SenderNode</node>
-    <source/>
-    <implementation xmi:idref="GCS_Test_ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>GetComponentStateTopic</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <!-- act as receiver -->
-  <instance xmi:id="ComponentInstance2">
-    <name>Receiver</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ComponentImplementation" />
-    <configProperty>
-      <name>act_as_sender</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="GCS_Test_ConnectorInstance2">
-    <name>GCS_Test_Connector2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="GCS_Test_ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>GetComponentStateTopic</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <!-- SENDER COMPONENT CONNECTIONS -->
-  <connection>
-    <name>update_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_update_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance1" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>observable_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="GCS_Test_ConnectorInstance1" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>update_dds_entity</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_update_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance1" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>observable_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="GCS_Test_ConnectorInstance1" />
-    </internalEndpoint>
-  </connection>
-
-  <!-- RECEIVER COMPONENT CONNECTIONS -->
-  <!--   DDS_Get port -->
-  <connection>
-    <name>get_data_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance2" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="GCS_Test_ConnectorInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>get_fresh_data_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_fresh_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance2" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_observer_fresh_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="GCS_Test_ConnectorInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>get_dds_entity_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance2" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_observer_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="GCS_Test_ConnectorInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <!--   DDS_Read port -->
-  <connection>
-    <name>read_data_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_read_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance2" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>passive_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="GCS_Test_ConnectorInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>read_dds_entity_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_read_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance2" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>passive_observer_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="GCS_Test_ConnectorInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <!--   DDS_Listen port -->
-  <connection>
-    <name>listen_data_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance2" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="GCS_Test_ConnectorInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>listen_data_control_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance2" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_observer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="GCS_Test_ConnectorInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <!--   DDS_StateListen port -->
-  <connection>
-    <name>statelisten_data_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_statelisten_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance2" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="GCS_Test_ConnectorInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>statelisten_data_control_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_statelisten_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance2" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="GCS_Test_ConnectorInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="GCS_Test_Connector_ExecArtifact">
-    <name>GCS_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>GCS_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="GCS_Test_Connector_SvntArtifact">
-    <name>GCS_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>GCS_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="GCS_Test_Connector_StubArtifact">
-    <name>GCS_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>GCS_Test_Connector_stub</location>
-  </artifact>
-
-  <artifact xmi:id="Component_ExecArtifact">
-    <name>Component_exec</name>
-    <source/>
-    <node/>
-    <location>Component_exec</location>
-  </artifact>
-  <artifact xmi:id="Component_SvntArtifact">
-    <name>Component_svnt</name>
-    <source/>
-    <node/>
-    <location>Component_svnt</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/GetComponent/State/descriptors/run_test.pl
deleted file mode 100755
index 955469ac4bc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "Sender.ior", "Receiver.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 5 seconds to allow task to complete\n";
-sleep (5);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/.gitignore b/CIAO/connectors/dds4ccm/tests/Getter/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Getter/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/Getter/Base/.gitignore
deleted file mode 100644
index f1884aa728c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Getter/Base/.gitignore
+++ /dev/null
@@ -1,12 +0,0 @@
-/Get_InvokerE.idl
-/Get_Invoker_exec_export.h
-/Get_Invoker_lem_stub_export.h
-/Get_Invoker_stub_export.h
-/Get_Invoker_svnt_export.h
-/Getter_Test_Base.cxx
-/Getter_Test_Base.h
-/Getter_Test_BasePlugin.cxx
-/Getter_Test_BasePlugin.h
-/Getter_Test_BaseSupport.cxx
-/Getter_Test_BaseSupport.h
-/Getter_Test_Base_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.idl b/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.idl
deleted file mode 100644
index cc639fc2100..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @file Get_Invoker.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef GETTER_INVOKER_IDL
-#define GETTER_INVOKER_IDL
-
-#pragma ciao lem "Base/Get_InvokerE.idl"
-
-interface GetInvoker
-{
-  void start_timeout_get_one ();
-  void start_timeout_get_many ();
-  void start_get_one (in string key, in long fixed_key, in long iteration);
-  void start_get_many (in short keys, in long iterations);
-};
-
-#endif /* SAMPLE_INFO_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc b/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc
deleted file mode 100644
index 6db55753faf..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc
+++ /dev/null
@@ -1,111 +0,0 @@
-project(DDS_Get_Invoker_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after +=
-  idlflags += -Wb,stub_export_macro=GET_INVOKER_STUB_Export \
-              -Wb,stub_export_include=Get_Invoker_stub_export.h \
-              -Wb,skel_export_macro=GET_INVOKER_SVNT_Export \
-              -Wb,skel_export_include=Get_Invoker_svnt_export.h \
-              -Wb,svnt_export_macro=GET_INVOKER_SVNT_Export \
-              -Wb,svnt_export_include=Get_Invoker_svnt_export.h \
-              -Wb,exec_export_macro=GET_INVOKER_EXEC_Export \
-              -Wb,exec_export_include=Get_Invoker_exec_export.h -I..
-
-  IDL_Files {
-    Get_Invoker.idl
-  }
-}
-
-project(DDS_Get_Invoker_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_Get_Invoker_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=GET_INVOKER_LEM_STUB_Export \
-              -Wb,stub_export_include=Get_Invoker_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    Get_InvokerE.idl
-  }
-}
-
-project(DDS_Get_Invoker_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_Get_Invoker_lem_gen DDS_Get_Invoker_stub
-  libs  += Get_Invoker_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Get_Invoker_lem_stub
-  dynamicflags += GET_INVOKER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Get_InvokerEC.cpp
-  }
-
-  Header_Files {
-    Get_InvokerEC.h
-    Get_Invoker_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Get_InvokerEC.inl
-  }
-}
-
-project(DDS_Get_Invoker_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_Get_Invoker_idl_gen
-  libs  +=
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Get_Invoker_stub
-  dynamicflags += GET_INVOKER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Get_InvokerC.cpp
-  }
-
-  Header_Files {
-    Get_InvokerC.h
-    Get_Invoker_stub_export.h
-  }
-
-  Inline_Files {
-    Get_InvokerC.inl
-  }
-}
-
-
-project(DDS_Get_Invoker_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_Get_Invoker_lem_stub DDS_Get_Invoker_stub \
-                  DDS_Get_Invoker_idl_gen
-  sharedname  = Get_Invoker_svnt
-  libs       += Get_Invoker_stub Get_Invoker_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += GET_INVOKER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Get_InvokerS.cpp
-    Get_Invoker_svnt.cpp
-  }
-
-  Header_Files {
-    Get_InvokerS.h
-    Get_Invoker_svnt.h
-    Get_Invoker_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl
deleted file mode 100644
index e36c901337a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * @file Getter_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef GETTER_TEST_BASE_IDL
-#define GETTER_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/Getter_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/Getter_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "GetterTest"
-
-struct GetterTest {
-  string key;
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<GetterTest> GetterTestSeq;
-#endif
-
-#pragma DCPS_DATA_TYPE "GetterFixed"
-
-struct GetterFixed {
-  long key;
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<GetterFixed> GetterFixedSeq;
-#endif
-
-#endif /* GETTER_TEST_BASE_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc
deleted file mode 100644
index e48e419a2a2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_Getter_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_Getter_Test_Base_stub
-  dynamicflags += GETTER_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=GETTER_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=Getter_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    Getter_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=GETTER_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    Getter_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/Getter/Connector/.gitignore
deleted file mode 100644
index 2f55a351484..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Getter/Connector/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/Getter_Test_ConnectorE.idl
-/Getter_Test_Connector_conn.cpp
-/Getter_Test_Connector_conn.h
-/Getter_Test_Connector_conn_export.h
-/Getter_Test_Connector_lem_stub_export.h
-/Getter_Test_Connector_stub_export.h
-/Getter_Test_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl
deleted file mode 100644
index ad8902eb561..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * @file Getter_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef GETTER_TEST_CONNECTOR_IDL_
-#define GETTER_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Getter_Test_Base.idl"
-
-#pragma ciao lem "Connector/Getter_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/Getter_Test_BaseTypeSupport.idl"
-#endif
-
-module Getter_Test
-{
-  module ::CCM_DDS::Typed < ::GetterTest, ::GetterTestSeq> GetterTestConnector;
-  module ::CCM_DDS::Typed < ::GetterFixed, ::GetterFixedSeq> GetterFixedConnector;
-};
-
-#endif /* GETTER_TEST_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc
deleted file mode 100644
index 45c6a8b80ac..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_Getter_Test_Base -l .. -o ../lib -u DDS Getter_Test_Connector"
-
-project(DDS_Getter_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_Getter_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=GETTER_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=Getter_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=GETTER_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=Getter_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=GETTER_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=Getter_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=GETTER_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Getter_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Getter_Test_Connector.idl
-  }
-}
-
-project(DDS_Getter_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_Getter_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=GETTER_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=Getter_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    Getter_Test_ConnectorE.idl
-  }
-}
-
-project(DDS_Getter_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_Getter_Test_Connector_lem_gen DDS_Getter_Test_Connector_stub DDS_Getter_Test_Base_stub
-  libs  += DDS_Getter_Test_Base_stub DDS_Getter_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Getter_Test_Connector_lem_stub
-  dynamicflags += GETTER_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Getter_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    Getter_Test_ConnectorEC.h
-    Getter_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Getter_Test_ConnectorEC.inl
-  }
-}
-
-project(DDS_Getter_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_Getter_Test_Connector_idl_gen DDS_Getter_Test_Base_stub
-  libs  += DDS_Getter_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Getter_Test_Connector_stub
-  dynamicflags += GETTER_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Getter_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    Getter_Test_ConnectorC.h
-    Getter_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    Getter_Test_ConnectorC.inl
-  }
-}
-
-project(DDS_Getter_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_Getter_Test_Connector_lem_stub DDS_Getter_Test_Connector_stub DDS_Getter_Test_Base_stub
-  sharedname = DDS_Getter_Test_Connector_exec
-  libs += DDS_Getter_Test_Connector_stub DDS_Getter_Test_Connector_lem_stub DDS_Getter_Test_Base_stub DDS_Getter_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += GETTER_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Getter_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    Getter_Test_Connector_conn.h
-    Getter_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_Getter_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_Getter_Test_Connector_lem_stub DDS_Getter_Test_Connector_exec DDS_Getter_Test_Connector_stub
-  sharedname  = DDS_Getter_Test_Connector_svnt
-  libs       += DDS_Getter_Test_Connector_stub \
-                DDS_Getter_Test_Connector_lem_stub  \
-                DDS_Getter_Test_Base_stub \
-                DDS_Getter_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += GETTER_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Getter_Test_ConnectorS.cpp
-    Getter_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    Getter_Test_ConnectorS.h
-    Getter_Test_Connector_svnt.h
-    Getter_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/README b/CIAO/connectors/dds4ccm/tests/Getter/README
deleted file mode 100644
index b99c9300e05..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Getter/README
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-This test tests the Getter.
-
-Before the Sender starts writing samples to DDS, he informs the
-Receiver (via a 'normal' CCM interface) about how many keys and
-iterations to get from DDS. The receiver starts waiting on those
-samples by calling get_one or get_many, using a timeout.
-
-In the meantime the Sender will sleep for half a second before actual
-writing the samples to DDS.
-Once the DDS connector on the receiver side receives the written samples,
-he should wake up and should return the samples to the user code.
-
-So the starting points for the Receiver to start 'working' are:
-. start_timeout_get_one ();
-. start_timeout_get_many ();
-. start_get_one (in string key, in long fixed_key, in long iteration);
-. start_get_many (in short keys, in long iterations);
-
-In order to prevent deadlocks an event handler on the reactor is created
-for each sample to be received. This event handler is created during invocation
-of the latter two methods.
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/.gitignore b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/.gitignore
deleted file mode 100644
index 0093957d491..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/Getter_Test_ReceiverE.idl
-/Receiver_exec_export.h
-/Receiver_lem_stub_export.h
-/Receiver_stub_export.h
-/Receiver_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.idl
deleted file mode 100644
index 431bc426ae0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/Getter_Test_Connector.idl"
-#include "Base/Get_Invoker.idl"
-
-module Getter_Test
-{
-  component Receiver
-  {
-    port GetterTestConnector::DDS_Get info_get;
-    port GetterFixedConnector::DDS_Get info_fixed;
-
-    provides GetInvoker getter_invoke;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc
deleted file mode 100644
index fadaa44b2a5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc
+++ /dev/null
@@ -1,154 +0,0 @@
-project(DDS_Getter_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_Getter_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h -I..
-
-  IDL_Files {
-    Getter_Test_Receiver.idl
-  }
-}
-
-project(DDS_Getter_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_Getter_Test_Receiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    Getter_Test_ReceiverE.idl
-  }
-}
-
-project(DDS_Getter_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_Getter_Test_Receiver_lem_gen DDS_Getter_Test_Receiver_stub  \
-           DDS_Getter_Test_Connector_stub DDS_Getter_Test_Base_stub \
-           DDS_Get_Invoker_stub
-  libs  +=  Receiver_stub DDS_Getter_Test_Connector_stub \
-            DDS_Getter_Test_Base_stub Get_Invoker_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Getter_Test_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    Getter_Test_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Getter_Test_ReceiverEC.inl
-  }
-}
-
-project(DDS_Getter_Test_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_Getter_Test_Receiver_idl_gen  DDS_Getter_Test_Connector_stub \
-           DDS_Getter_Test_Base_stub DDS_Getter_Test_Connector_lem_gen \
-           DDS_Get_Invoker_stub DDS_Get_Invoker_lem_stub
-  libs  += DDS_Getter_Test_Connector_stub DDS_Getter_Test_Base_stub \
-           Get_Invoker_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Getter_Test_ReceiverC.cpp
-  }
-
-  Header_Files {
-    Getter_Test_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    Getter_Test_ReceiverC.inl
-  }
-}
-
-project(DDS_Getter_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_Getter_Test_Receiver_lem_stub DDS_Getter_Test_Receiver_stub \
-             DDS_Getter_Test_Base_stub DDS_Getter_Test_Connector_stub \
-             DDS_Getter_Test_Connector_lem_stub \
-             DDS_Get_Invoker_lem_stub DDS_Get_Invoker_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_Getter_Test_Base_stub \
-          DDS_Getter_Test_Connector_stub DDS_Getter_Test_Connector_lem_stub \
-          Get_Invoker_lem_stub Get_Invoker_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Getter_Test_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    Getter_Test_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_Getter_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_Getter_Test_Receiver_lem_stub DDS_Getter_Test_Base_stub \
-                  DDS_Getter_Test_Connector_stub DDS_Getter_Test_Connector_svnt \
-                  DDS_Getter_Test_Receiver_exec DDS_Getter_Test_Connector_lem_stub \
-                  DDS_Get_Invoker_stub \
-                  DDS_Get_Invoker_svnt DDS_Get_Invoker_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_Getter_Test_Base_stub \
-                DDS_Getter_Test_Connector_stub DDS_Getter_Test_Connector_svnt \
-                Receiver_exec DDS_Getter_Test_Connector_lem_stub \
-                Get_Invoker_stub Get_Invoker_svnt \
-                Get_Invoker_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Getter_Test_ReceiverS.cpp
-    Getter_Test_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    Getter_Test_ReceiverS.h
-    Getter_Test_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp
deleted file mode 100644
index bd20a56aec6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp
+++ /dev/null
@@ -1,868 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "Getter_Test_Receiver_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-#include "ace/OS_NS_sys_time.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-#include "dds4ccm/impl/dds4ccm_utils.h"
-
-namespace CIAO_Getter_Test_Receiver_Impl
-{
-
-  /**
-   * Facet Executor Implementation Class: info_get_status_exec_i
-   */
-
-  info_get_status_exec_i::info_get_status_exec_i (
-        ::Getter_Test::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::Getter_Test::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_get_status_exec_i::~info_get_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_get_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_get_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_fixed_status_exec_i
-   */
-
-  info_fixed_status_exec_i::info_fixed_status_exec_i (
-        ::Getter_Test::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::Getter_Test::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_fixed_status_exec_i::~info_fixed_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_fixed_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_fixed_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: getter_invoke_exec_i
-   */
-
-  getter_invoke_exec_i::getter_invoke_exec_i (
-        ::Getter_Test::CCM_Receiver_Context_ptr ctx,
-        Receiver_exec_i & callback)
-    : ciao_context_ (
-        ::Getter_Test::CCM_Receiver_Context::_duplicate (ctx))
-      , callback_ (callback)
-  {
-  }
-
-  getter_invoke_exec_i::~getter_invoke_exec_i (void)
-  {
-  }
-
-  // Operations from ::GetInvoker
-
-  void
-  getter_invoke_exec_i::start_timeout_get_one (void)
-  {
-    this->callback_.timeout_get_one ();
-  }
-
-  void
-  getter_invoke_exec_i::start_timeout_get_many (void)
-  {
-    this->callback_.timeout_get_many ();
-  }
-
-  void
-  getter_invoke_exec_i::start_get_one (const char * key,
-  ::CORBA::Long fixed_key,
-  ::CORBA::Long iteration)
-  {
-    this->callback_.start_get_one (key, fixed_key, iteration);
-  }
-
-  void
-  getter_invoke_exec_i::start_get_many (::CORBA::Short keys,
-  ::CORBA::Long iterations)
-  {
-    this->callback_.start_get_many (keys, iterations);
-  }
-
-  /**
-   * GetOneHandler
-   */
-  GetOneHandler::GetOneHandler (Receiver_exec_i &callback,
-                                const char * key,
-                                CORBA::Long fixed_key,
-                                CORBA::Long iteration)
-    : callback_ (callback)
-      , key_ (CORBA::string_dup (key))
-      , fixed_key_ (fixed_key)
-      , iteration_ (iteration)
-  {
-    this->reference_counting_policy ().value (
-      ACE_Event_Handler::Reference_Counting_Policy::ENABLED);
-
-  }
-
-  GetOneHandler::~GetOneHandler (void)
-  {
-  }
-
-  int
-  GetOneHandler::handle_exception (ACE_HANDLE)
-  {
-    this->callback_.get_one (this->key_.in (), this->fixed_key_, this->iteration_);
-    return 0;
-  }
-
-  /**
-   * GetManyHandler
-   */
-  GetManyHandler::GetManyHandler (Receiver_exec_i &callback,
-                                  CORBA::UShort keys,
-                                  CORBA::Long iterations)
-    : callback_ (callback),
-      keys_ (keys),
-      iterations_ (iterations)
-  {
-    this->reference_counting_policy ().value (
-      ACE_Event_Handler::Reference_Counting_Policy::ENABLED);
-  }
-
-  GetManyHandler::~GetManyHandler (void)
-  {
-  }
-
-  int
-  GetManyHandler::handle_exception (ACE_HANDLE)
-  {
-    this->callback_.get_many (this->keys_, this->iterations_);
-    return 0;
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void) :
-    fixed_handle_ (DDS::HANDLE_NIL),
-    variable_handle_ (DDS::HANDLE_NIL)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Receiver_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Receiver_exec_i::start_get_one (const char * key,
-                                  CORBA::Long fixed_key,
-                                  CORBA::Long iteration)
-  {
-    GetOneHandler* rh = new GetOneHandler (*this,
-                                           key,
-                                           fixed_key,
-                                           iteration);
-    ACE_Event_Handler_var safe_event_handler (rh);
-    this->reactor ()->notify (rh);
-  }
-
-  void
-  Receiver_exec_i::start_get_many (CORBA::Short keys,
-                         CORBA::Long iterations)
-  {
-    GetManyHandler* rh = new  GetManyHandler (*this, keys, iterations);
-    ACE_Event_Handler_var safe_event_handler (rh);
-    this->reactor ()->notify (rh);
- }
-
-  void
-  Receiver_exec_i::get_many (CORBA::Short keys , CORBA::Long iterations)
-  {
-    // this is very hard to test in a controlled environment.
-    // When data arrives in DDS, the waiting ends and the
-    // Getter starts to read the data. In this test we expected
-    // therefor more then one, and less then but not exactly max_delivered_data.
-    // On the other hand, when the user want to have all the
-    // samples in DDS, one shouldn't use the wait method.
-    // Since the spec is not clear about this, the test will
-    // pass when at least one sample is returned.
-     ::Getter_Test::GetterTestConnector::Getter_var getter =
-      this->ciao_context_->get_connection_info_get_fresh_data ();
-
-    DDS::Duration_t to;
-    to.sec = 20;
-    to.nanosec = 0;
-    getter->time_out (to);
-    getter->max_delivered_data (40);
-    ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::get_many: "
-                          "Start getting data from DDS: "
-                          "#keys <%d> - #iterations <%d> with timeout: "
-                          "sec <%d> - nanosec <%u>\n",
-                          keys, iterations,
-                          getter->time_out ().sec,
-                          getter->time_out ().nanosec));
-
-    GetterTestSeq gettertest_seq;
-    ::CCM_DDS::ReadInfoSeq readinfo;
-    bool const result = getter->get_many (gettertest_seq, readinfo);
-    if (result)
-      {
-        if (gettertest_seq.length () == 0)
-          {
-            ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_many: "
-                                  "No data returned. "
-                                  "number of samples: "
-                                  "expected at least one - received <0>\n"));
-          }
-        if (gettertest_seq.length () == 1)
-          {
-            ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_many: "
-                                  "Not enough data returned. "
-                                  "number of samples: "
-                                  "expected at least two - received <1>\n"));
-          }
-        if (gettertest_seq.length () > 40)
-          {
-            ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_many: "
-                                  "To much data returned. "
-                                  "number of samples: "
-                                  "expected not more then 40 - received <1>\n"));
-           }
-        for (CORBA::ULong i = 0; i < gettertest_seq.length (); ++i)
-          {
-            ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::get_many: "
-                                  "Returned data : key <%C> - iteration <%d> - handle "
-                                  DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER
-                                  "\n",
-                                  gettertest_seq[i].key.in (),
-                                  gettertest_seq[i].iteration,
-                                  DDS_INSTANCE_HANDLE_LOG(readinfo[i].instance_handle)));
-          }
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: GET MANY: "
-                              "Time out occurred\n"));
-      }
-    // Wait a while before reading.
-    ACE_Time_Value tv (3, 0);
-    ACE_OS::sleep (tv);
-    this->read_many (keys, iterations, gettertest_seq);
-  }
-
-  void
-  Receiver_exec_i::read_many (CORBA::Short keys ,
-                              CORBA::Long iterations,
-                              const GetterTestSeq& gettertest_seq)
-  {
-    ::Getter_Test::GetterTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_info_get_data ();
-
-    GetterTestSeq read_seq;
-    ::CCM_DDS::ReadInfoSeq readinfos;
-    ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::read_many - "
-                "Start checking samples in DDS\n"));
-    reader->read_all (read_seq, readinfos);
-    // we expect all samples written during the test for get one (KEY_1)
-    // AND all samples written during the test for get many (number of keys)
-    ::CORBA::ULong expected =
-      static_cast < ::CORBA::ULong > (iterations * (keys + 1));
-    if (read_seq.length () != expected)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::read_many - "
-                              "Unexpected number of samples received: "
-                              "expected <%d> - received <%u>\n",
-                              expected, read_seq.length ()));
-      }
-    for (::CORBA::ULong i = 0; i < read_seq.length (); ++i)
-      {
-        ACE_DEBUG ((LM_DEBUG, "READ ALL : Receiver_exec_i::read_many - "
-                              "Sample received: key <%C> - iteration <%d> - "
-                              "sample_read_state <%C>\n",
-                              read_seq[i].key.in (),
-                              read_seq[i].iteration,
-                              CIAO::DDS4CCM::translate_ccm_dds_accessstatus (readinfos[i].access_status)));
-      }
-
-    for (::CORBA::Short key = 0; key < keys; ++key)
-      {
-        ::CORBA::Long iter = 0;
-        char str_key[8];
-        ACE_OS::sprintf (str_key, "KEY_%d", key + 1);
-        for (::CORBA::ULong i = 0; i < read_seq.length (); ++i)
-          {
-            if (ACE_OS::strcmp (read_seq[i].key.in (), str_key) == 0)
-              ++iter;
-            if (iter > iterations)
-              ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::read_many - "
-                          "Unexpected number of iterations received "
-                          "for key <%C>: <%d>\n",
-                          str_key,
-                          iter));
-          }
-      }
-    // check which sample states should be ALREADY_SEEN/FRESH_INFO
-    for (::CORBA::ULong readed = 0; readed < read_seq.length (); ++readed)
-      {
-        ::CCM_DDS::AccessStatus received_access_status =
-          readinfos[readed].access_status;
-        bool found = false;
-
-        for (::CORBA::ULong got = 0;
-             got < gettertest_seq.length () && !found;
-             ++got)
-          {
-            if (ACE_OS::strcmp (read_seq[readed].key.in (),
-                                gettertest_seq[got].key.in ()) == 0 &&
-                read_seq[readed].iteration == gettertest_seq[got].iteration)
-              {
-                found = true;
-                if (received_access_status != ::CCM_DDS::ALREADY_SEEN)
-                  {
-                    ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::read_many - "
-                                "Unexpected access state received: "
-                                "expected <%C> - received <%C>\n",
-                                CIAO::DDS4CCM::translate_ccm_dds_accessstatus (::CCM_DDS::ALREADY_SEEN),
-                                CIAO::DDS4CCM::translate_ccm_dds_accessstatus (received_access_status)));
-                  }
-              }
-          }
-        // Samples which are not read by get_many or get_one (the samples belonging to
-        // KEY_1), should have FRESH_INFO as access status.
-        if (!found && ACE_OS::strcmp (read_seq[readed].key.in (), "KEY_1") != 0)
-          {
-            if (received_access_status != ::CCM_DDS::FRESH_INFO)
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::read_many - "
-                            "Unexpected access state received for sample "
-                            "<%C>:<%d> : "
-                            "expected <%C> - received <%C>\n",
-                            read_seq[readed].key.in (),
-                            read_seq[readed].iteration,
-                            CIAO::DDS4CCM::translate_ccm_dds_accessstatus (::CCM_DDS::FRESH_INFO),
-                            CIAO::DDS4CCM::translate_ccm_dds_accessstatus (received_access_status)));
-              }
-          }
-      }
-  }
-
-
-  void
-  Receiver_exec_i::get_one_fixed (CORBA::Long fixed_key, CORBA::Long iteration)
-  {
-    ::Getter_Test::GetterFixedConnector::Getter_var fixed =
-      this->ciao_context_->get_connection_info_fixed_fresh_data ();
-
-    DDS::Duration_t to;
-    to.sec = 5;
-    to.nanosec = 0;
-    fixed->time_out (to);
-    ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::get_one_fixed: "
-                          "Start getting data from DDS: "
-                          "key <%u> - iteration <%d> "
-                          " with timeout: "
-                          "sec <%u> - nanosec <%u>\n",
-                          fixed_key, iteration,
-                          fixed->time_out ().sec,
-                          fixed->time_out ().nanosec));
-    GetterFixed gettertest_info;
-    ::CCM_DDS::ReadInfo readinfo;
-    ACE_Time_Value const tv = ACE_OS::gettimeofday ();
-    CORBA::Boolean const result = fixed->get_one (gettertest_info, readinfo);
-    if (result)
-      {
-        if (this->fixed_handle_ == DDS::HANDLE_NIL)
-          {
-            this->fixed_handle_ = readinfo.instance_handle;
-          }
-        ACE_Time_Value dur = ACE_OS::gettimeofday () - tv;
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::get_one_fixed: "
-                               "get_one took <%#T>\n",
-                               &dur));
-        if (gettertest_info.key != fixed_key)
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR FIXED: GET ONE: "
-                                  "Expected key does "
-                                  "not match received key: "
-                                  "expected <%u> - received <%C>\n",
-                                  fixed_key,
-                                  gettertest_info.key));
-          }
-        if (gettertest_info.iteration != iteration)
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR FIXED: GET ONE: "
-                                  "Expected iteration does "
-                                  "not match received iteration: "
-                                  "expected <%d> - received <%d>\n",
-                                  iteration,
-                                  gettertest_info.iteration));
-          }
-        // check readinfo struct.
-        if ((readinfo.instance_handle != ::DDS::HANDLE_NIL) &&
-            (this->fixed_handle_ != readinfo.instance_handle))
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR FIXED: GET MANY: ")
-                    ACE_TEXT ("received instance handle should be nil or not change ")
-                    ACE_TEXT ("for unkeyed data: ")
-                    ACE_TEXT ("key <%u> - iteration <%u> handle ")
-                    DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER
-                    ACE_TEXT ("\n"),
-                    gettertest_info.key,
-                    gettertest_info.iteration,
-                    DDS_INSTANCE_HANDLE_LOG(readinfo.instance_handle)));
-          }
-        if (readinfo.source_timestamp.sec == 0 &&
-            readinfo.source_timestamp.nanosec == 0)
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR FIXED: READ ONE LAST: "
-                                "source timestamp seems to be invalid (nil) "
-                                "key <%u> - iteration <%d>\n",
-                                gettertest_info.key,
-                                gettertest_info.iteration));
-          }
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::get_one_fixed: "
-                              "Returned data : key <%u> - iteration <%d>\n",
-                              gettertest_info.key,
-                              gettertest_info.iteration));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR FIXED: GET ONE: "
-                              "Time out while waiting for "
-                              "key <%u> - iteration <%d>\n",
-                              fixed_key,
-                              iteration));
-      }
-  }
-
-  void
-  Receiver_exec_i::get_one_variable (const char * key, CORBA::Long iteration)
-  {
-    ::Getter_Test::GetterTestConnector::Getter_var getter =
-      this->ciao_context_->get_connection_info_get_fresh_data ();
-
-    DDS::Duration_t to;
-    to.sec = 5;
-    to.nanosec = 0;
-    getter->time_out (to);
-    ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::get_one_variable: "
-                          "Start getting data from DDS: "
-                          "key <%C> - iteration <%d> "
-                          " with timeout: "
-                          "sec <%d> - nanosec <%u>\n",
-                          key, iteration,
-                          getter->time_out ().sec,
-                          getter->time_out ().nanosec));
-    GetterTest_var gettertest_info;
-    ::CCM_DDS::ReadInfo readinfo;
-    ACE_Time_Value tv = ACE_OS::gettimeofday ();
-    CORBA::Boolean const result = getter->get_one (gettertest_info.out (), readinfo);
-    if (result)
-      {
-        if (this->variable_handle_ == DDS::HANDLE_NIL)
-          {
-            this->variable_handle_ = readinfo.instance_handle;
-          }
-        ACE_Time_Value dur = ACE_OS::gettimeofday () - tv;
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::get_one_variable: "
-                               "get_one took <%#T>\n",
-                               &dur));
-        if (ACE_OS::strcmp (gettertest_info->key, key) != 0)
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR VARIABLE: GET ONE: "
-                                  "Expected key does "
-                                  "not match received key: "
-                                  "expected <%C> - received <%C>\n",
-                                  key,
-                                  gettertest_info->key.in ()));
-          }
-        if (gettertest_info->iteration != iteration)
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR VARIABLE: GET ONE: "
-                                  "Expected iteration does "
-                                  "not match received iteration: "
-                                  "expected <%d> - received <%d>\n",
-                                  iteration,
-                                  gettertest_info->iteration));
-          }
-        // check readinfo struct.
-        if ((readinfo.instance_handle != ::DDS::HANDLE_NIL) &&
-            (this->fixed_handle_ != readinfo.instance_handle))
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR VARIABLE: GET MANY: ")
-                    ACE_TEXT ("received instance handle should be nil or not change ")
-                    ACE_TEXT ("for unkeyed data: ")
-                    ACE_TEXT ("key <%C> - iteration <%u> - handle ")
-                    DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER
-                    ACE_TEXT ("\n"),
-                    gettertest_info->key.in (),
-                    gettertest_info->iteration,
-                    DDS_INSTANCE_HANDLE_LOG(readinfo.instance_handle)));
-          }
-        if (readinfo.source_timestamp.sec == 0 &&
-            readinfo.source_timestamp.nanosec == 0)
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR VARIABLE: READ ONE LAST: "
-                                "source timestamp seems to be invalid (nil) "
-                                "key <%C> - iteration <%d>\n",
-                                gettertest_info->key.in (),
-                                gettertest_info->iteration));
-          }
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::get_one_variable: "
-                              "Returned data : key <%C> - iteration <%d>\n",
-                              gettertest_info->key.in (),
-                              gettertest_info->iteration));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR VARIABLE: GET ONE: "
-                              "Time out while waiting for "
-                              "key <%C> - iteration <%d>\n",
-                              key,
-                              iteration));
-      }
-  }
-
-  void
-  Receiver_exec_i::get_one (const char * key,
-                            CORBA::Long fixed_key,
-                            CORBA::Long iteration)
-  {
-    this->get_one_variable (key, iteration);
-    this->get_one_fixed (fixed_key, iteration);
-  }
-
-  void
-  Receiver_exec_i::timeout_get_one_fixed (void)
-  {
-    try
-      {
-        ::Getter_Test::GetterFixedConnector::Getter_var fixed =
-          this->ciao_context_->get_connection_info_fixed_fresh_data ();
-
-        DDS::Duration_t to;
-        to.sec = 1;
-        to.nanosec = 0;
-        fixed->time_out (to);
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::timeout_get_one_fixed: "
-                              "Start getting data from DDS: timeout: "
-                              "sec <%d> - nanosec <%u>\n",
-                              fixed->time_out ().sec,
-                              fixed->time_out ().nanosec));
-        GetterFixed gettertest_info;
-        ::CCM_DDS::ReadInfo readinfo;
-        CORBA::Boolean const result = fixed->get_one (gettertest_info, readinfo);
-        if (result)
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR FIXED: TIMEOUT GET ONE: "
-                                  "Returning true when get no data.\n"));
-          }
-        else
-          {
-            ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::timeout_get_one_fixed: "
-                                  "Expected to return no data.\n"));
-          }
-      }
-    catch (const CCM_DDS::InternalError& )
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR FIXED: TIMEOUT GET ONE: "
-                               "Caught unexcepted InternalError "
-                               "exception\n"));
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR FIXED: TIMEOUT GET ONE:");
-        ACE_ERROR ((LM_ERROR,
-                "ERROR: Receiver_exec_i::timeout_get_one_fixed : Exception caught\n"));
-      }
-  }
-
-  void
-  Receiver_exec_i::timeout_get_one_variable (void)
-  {
-    try
-      {
-        ::Getter_Test::GetterTestConnector::Getter_var getter =
-          this->ciao_context_->get_connection_info_get_fresh_data ();
-
-        DDS::Duration_t to;
-        to.sec = 1;
-        to.nanosec = 0;
-        getter->time_out (to);
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::timeout_get_one_variable: "
-                              "Start getting data from DDS: timeout: "
-                              "sec <%d> - nanosec <%u>\n",
-                              getter->time_out ().sec,
-                              getter->time_out ().nanosec));
-        GetterTest_var gettertest_info;;
-        ::CCM_DDS::ReadInfo readinfo;
-        CORBA::Boolean result = getter->get_one (gettertest_info.out (), readinfo);
-        if (result)
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR VARIABLE: TIMEOUT GET ONE: "
-                                  "Returning true when get no data.\n"));
-          }
-        else
-          {
-            ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::timeout_get_one_variable: "
-                                  "Expected to return no data.\n"));
-          }
-      }
-    catch (const CCM_DDS::InternalError& )
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR VARIABLE: TIMEOUT GET ONE: "
-                               "Caught unexcepted InternalError "
-                               "exception\n"));
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR VARIABLE: TIMEOUT GET ONE:");
-        ACE_ERROR ((LM_ERROR,
-                "ERROR: Receiver_exec_i::timeout_get_one_variable : Exception caught\n"));
-      }
-  }
-
-  void
-  Receiver_exec_i::timeout_get_one (void)
-  {
-    this->timeout_get_one_variable ();
-    this->timeout_get_one_fixed ();
-  }
-
-  void
-  Receiver_exec_i::timeout_get_many (void)
-  {
-    try
-      {
-        ::Getter_Test::GetterTestConnector::Getter_var getter =
-          this->ciao_context_->get_connection_info_get_fresh_data ();
-
-        DDS::Duration_t to;
-        to.sec = 3;
-        to.nanosec = 0;
-        getter->time_out (to);
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::timeout_get_many: "
-                              "Start getting data from DDS: timeout: "
-                              "sec <%d> - nanosec <%u>\n",
-                              getter->time_out ().sec,
-                              getter->time_out ().nanosec));
-        GetterTestSeq gettertest_seq;
-        ::CCM_DDS::ReadInfoSeq readinfo;
-        CORBA::Boolean const result = getter->get_many (gettertest_seq, readinfo);
-        if (result)
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: TIMEOUT GET MANY: "
-                                  "Returning true when get no data.\n"));
-          }
-        else
-          {
-            ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::timeout_get_many: "
-                                  "Expected to return no data.\n"));
-          }
-      }
-    catch (const CCM_DDS::InternalError&)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: TIMEOUT GET MANY: "
-                               "Caught unexcepted InternalError "
-                               "exception\n"));
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: TIMEOUT GET MANY:");
-        ACE_ERROR ((LM_ERROR,
-                      "ERROR: Receiver_exec_i::timeout_get_many : Exception caught\n"));
-      }
-  }
-
-  // Component attributes and port operations.
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_get_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_get_status_.in ()))
-      {
-        info_get_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_get_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_get_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_get_status_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_fixed_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_fixed_status_.in ()))
-      {
-        info_fixed_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_fixed_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_fixed_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_fixed_status_.in ());
-  }
-
-  ::CCM_GetInvoker_ptr
-  Receiver_exec_i::get_getter_invoke (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_getter_invoke_.in ()))
-      {
-        getter_invoke_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          getter_invoke_exec_i (
-            this->ciao_context_.in (),
-            *this),
-            ::CCM_GetInvoker::_nil ());
-
-          this->ciao_getter_invoke_ = tmp;
-      }
-
-    return
-      ::CCM_GetInvoker::_duplicate (
-        this->ciao_getter_invoke_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Getter_Test::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Getter_Test_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h
deleted file mode 100644
index 4f9b4fd9ab5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h
+++ /dev/null
@@ -1,277 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_GETTER_TEST_RECEIVER_EXEC_5BQU2A_H_
-#define CIAO_GETTER_TEST_RECEIVER_EXEC_5BQU2A_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Getter_Test_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_Getter_Test_Receiver_Impl
-{
-  class Receiver_exec_i;
-
-  /**
-   * GetOneHandler
-   */
-  class GetOneHandler
-    : public ACE_Event_Handler
-  {
-  public:
-    GetOneHandler (Receiver_exec_i &,
-                   const char * key,
-                   CORBA::Long fixed_key,
-                   CORBA::Long iteration);
-    virtual ~GetOneHandler ();
-
-    virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
-
-  private:
-    Receiver_exec_i &callback_;
-    CORBA::String_var key_;
-    CORBA::Long fixed_key_;
-    CORBA::Long iteration_;
-  };
-
-  /**
-   * GetManyHandler
-   */
-  class GetManyHandler
-    : public ACE_Event_Handler
-  {
-  public:
-    GetManyHandler (Receiver_exec_i &,
-                   CORBA::UShort keys,
-                   CORBA::Long iterations);
-    virtual ~GetManyHandler ();
-
-    virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
-
-  private:
-    Receiver_exec_i &callback_;
-    CORBA::UShort keys_;
-    CORBA::Long   iterations_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_get_status_exec_i
-   */
-
-  class info_get_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_get_status_exec_i (
-      ::Getter_Test::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_get_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::Getter_Test::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_fixed_status_exec_i
-   */
-
-  class info_fixed_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_fixed_status_exec_i (
-      ::Getter_Test::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_fixed_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::Getter_Test::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: getter_invoke_exec_i
-   */
-
-  class getter_invoke_exec_i
-    : public virtual ::CCM_GetInvoker,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    getter_invoke_exec_i (
-      ::Getter_Test::CCM_Receiver_Context_ptr ctx,
-      Receiver_exec_i & callback);
-    virtual ~getter_invoke_exec_i (void);
-
-    //@{
-    /** Operations and attributes from GetInvoker. */
-
-    virtual
-    void start_timeout_get_one (void);
-
-    virtual
-    void start_timeout_get_many (void);
-
-    virtual
-    void start_get_one (const char * key,
-    ::CORBA::Long fixed_key,
-    ::CORBA::Long iteration);
-
-    virtual
-    void start_get_many (::CORBA::Short keys,
-    ::CORBA::Long iterations);
-    //@}
-
-  private:
-    ::Getter_Test::CCM_Receiver_Context_var ciao_context_;
-    Receiver_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_get_status (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_fixed_status (void);
-
-    virtual ::CCM_GetInvoker_ptr
-    get_getter_invoke (void);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void start_get_one (const char * key,
-                        CORBA::Long fixed_key,
-                        CORBA::Long iteration);
-    void timeout_get_one (void);
-    void timeout_get_many (void);
-    void get_one (const char * key,
-                  CORBA::Long fixed_key,
-                  CORBA::Long iteration);
-
-    void start_get_many (CORBA::Short keys, CORBA::Long iterations);
-
-    void get_many (CORBA::Short keys, CORBA::Long iterations);
-
-    //@}
-
-  private:
-    ::Getter_Test::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_get_status_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_fixed_status_;
-    ::CCM_GetInvoker_var ciao_getter_invoke_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    DDS::InstanceHandle_t fixed_handle_;
-    DDS::InstanceHandle_t variable_handle_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void timeout_get_one_fixed (void);
-    void timeout_get_one_variable (void);
-
-    void get_one_fixed (CORBA::Long fixed_key, CORBA::Long iteration);
-    void get_one_variable (const char * key, CORBA::Long iteration);
-
-    void read_many (CORBA::Short keys ,
-                    CORBA::Long iterations,
-                    const GetterTestSeq& gettertest_seq);
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Getter_Test_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Sender/.gitignore b/CIAO/connectors/dds4ccm/tests/Getter/Sender/.gitignore
deleted file mode 100644
index d9099de70bf..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Getter/Sender/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/Getter_Test_SenderE.idl
-/Sender_exec_export.h
-/Sender_lem_stub_export.h
-/Sender_stub_export.h
-/Sender_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.idl
deleted file mode 100644
index acc67383c3f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_GETTER_TEST_SENDER_IDL
-#define DDS_GETTER_TEST_SENDER_IDL
-
-#include "Connector/Getter_Test_Connector.idl"
-#include "Base/Get_Invoker.idl"
-
-module Getter_Test
-{
-  component Sender
-  {
-    port GetterTestConnector::DDS_Write info_write;
-    port GetterFixedConnector::DDS_Write info_fixed;
-
-    provides CCM_DDS::ConnectorStatusListener info_out_connector_status;
-
-    uses GetInvoker invoke_getter;
-
-    attribute unsigned short keys;
-    attribute unsigned short iterations;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc
deleted file mode 100644
index e08b4d402a0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc
+++ /dev/null
@@ -1,149 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_Getter_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_Getter_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_Getter_Test_Connector_idl_gen DDS_Starter_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I ..
-
-  IDL_Files {
-    Getter_Test_Sender.idl
-  }
-}
-
-project(DDS_Getter_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_Getter_Test_Sender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    Getter_Test_SenderE.idl
-  }
-}
-
-project(DDS_Getter_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_Getter_Test_Sender_lem_gen DDS_Getter_Test_Sender_stub \
-           DDS_Getter_Test_Base_stub DDS_Get_Invoker_stub
-  libs  += DDS_Getter_Test_Base_stub Sender_stub Get_Invoker_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Getter_Test_SenderEC.cpp
-  }
-
-  Header_Files {
-    Getter_Test_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Getter_Test_SenderEC.inl
-  }
-}
-
-project(DDS_Getter_Test_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_Getter_Test_Sender_idl_gen DDS_Getter_Test_Base_stub \
-           DDS_Getter_Test_Connector_stub DDS_Get_Invoker_stub \
-           DDS_Get_Invoker_lem_stub
-  libs  += DDS_Getter_Test_Base_stub DDS_Getter_Test_Connector_stub \
-           Get_Invoker_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Getter_Test_SenderC.cpp
-  }
-
-  Header_Files {
-    Getter_Test_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    Getter_Test_SenderC.inl
-  }
-}
-
-project(DDS_Getter_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_Getter_Test_Sender_lem_stub DDS_Getter_Test_Sender_stub \
-             DDS_Getter_Test_Connector_lem_stub DDS_Getter_Test_Connector_stub 
-  sharedname = Sender_exec
-  libs    += Sender_stub Sender_lem_stub DDS_Getter_Test_Base_stub \
-             DDS_Getter_Test_Connector_lem_stub DDS_Getter_Test_Connector_stub \
-             Get_Invoker_stub 
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Getter_Test_Sender_exec.cpp
-  }
-
-  Header_Files {
-    Getter_Test_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_Getter_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_Getter_Test_Base_stub  DDS_Getter_Test_Sender_lem_stub \
-                DDS_Getter_Test_Connector_stub \
-                DDS_Getter_Test_Connector_svnt DDS_Getter_Test_Connector_lem_stub \
-                DDS_Get_Invoker_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub DDS_Getter_Test_Base_stub \
-                DDS_Getter_Test_Connector_stub DDS_Getter_Test_Connector_svnt \
-                DDS_Getter_Test_Connector_lem_stub Get_Invoker_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Getter_Test_SenderS.cpp
-    Getter_Test_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    Getter_Test_SenderS.h
-    Getter_Test_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp
deleted file mode 100644
index 86cce2badfc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp
+++ /dev/null
@@ -1,378 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "Getter_Test_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_Getter_Test_Sender_Impl
-{
-  /**
-   * Pulse generator
-   */
-  pulse_Generator::pulse_Generator (Sender_exec_i &callback)
-    : pulse_callback_ (callback)
-  {
-  }
-
-  int
-  pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    this->pulse_callback_.tick ();
-    return 0;
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_connector_status_exec_i
-   */
-
-  info_out_connector_status_exec_i::info_out_connector_status_exec_i (
-        ::Getter_Test::CCM_Sender_Context_ptr ctx,
-        Sender_exec_i &callback)
-    : ciao_context_ (
-        ::Getter_Test::CCM_Sender_Context::_duplicate (ctx))
-      , callback_ (callback)
-  {
-  }
-
-  info_out_connector_status_exec_i::~info_out_connector_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-
-  void
-  info_out_connector_status_exec_i::on_inconsistent_topic (::DDS::Topic_ptr /* the_topic */,
-  const ::DDS::InconsistentTopicStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_requested_incompatible_qos (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedIncompatibleQosStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_sample_rejected (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleRejectedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_offered_deadline_missed (::DDS::DataWriter_ptr /* the_writer */,
-  const ::DDS::OfferedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_offered_incompatible_qos (::DDS::DataWriter_ptr /* the_writer */,
-  const ::DDS::OfferedIncompatibleQosStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_unexpected_status (::DDS::Entity_ptr /* the_entity */,
-  ::DDS::StatusKind status_kind)
-  {
-    if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS)
-      {
-        this->callback_.start ();
-      }
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : keys_ (5)
-      , iterations_ (10)
-      , done_ (false)
-      , ccm_activated_ (false)
-      , last_iter_ (1)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      pulse_Generator (*this),
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  // Component attributes and port operations.
-  void
-  Sender_exec_i::start_timeout_tests (void)
-  {
-    GetInvoker_var invoker =
-      this->ciao_context_->get_connection_invoke_getter ();
-
-    invoker->start_timeout_get_one ();
-    invoker->start_timeout_get_many ();
-  }
-
-  void
-  Sender_exec_i::write_many (void)
-  {
-    ::Getter_Test::GetterTestConnector::Writer_var writer =
-      this->ciao_context_->get_connection_info_write_data ();
-    GetInvoker_var invoker =
-      this->ciao_context_->get_connection_invoke_getter ();
-
-    // Prepare the samples.
-    GetterTestSeq write_many (this->keys_ * this->iterations_);
-    write_many.length (this->keys_ * this->iterations_);
-
-    // since the test for get_one already writes samples to DDS with
-    // key=KEY_1 we start with key = 2 when writing many samples.
-    for (CORBA::UShort key = 2; key < this->keys_ + 2; ++key)
-      {
-        GetterTest new_key;
-        char tmp[7];
-        ACE_OS::sprintf (tmp, "KEY_%d", key);
-        new_key.key = CORBA::string_dup(tmp);
-        for (CORBA::UShort iter = 1; iter < this->iterations_ + 1; ++iter)
-          {
-            new_key.iteration = iter;
-            write_many[(iter - 1) + ((key - 2) * 10)] = new_key;
-          }
-      }
-    try
-      {
-        // Inform the receiver that the sender has written many
-        // samples to DDS.
-        invoker->start_get_many (this->keys_, this->iterations_);
-        // Wait a while before writing the samples.
-        ACE_Time_Value tv (2, 0);
-        ACE_OS::sleep (tv);
-        // Now start writing.
-        writer->write_many (write_many);
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("write_many : written <%u> samples\n"),
-              write_many.length ()));
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                    ACE_TEXT ("while write many writer info: index <%d> - retval <%d>\n"),
-                      ex.index, ex.error_code));
-      }
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    // Start can be called more than once...
-    if (!this->done_ && this->ccm_activated_)
-      {
-        this->done_ = true;
-        start_timeout_tests ();
-        if (this->reactor ()->schedule_timer (
-                    this->ticker_,
-                    0,
-                    ACE_Time_Value (0, 500000),
-                    ACE_Time_Value (0, 500000)) == -1)
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                                  ACE_TEXT ("Error scheduling timer\n")));
-          }
-      }
-  }
-
-  void
-  Sender_exec_i::tick (void)
-  {
-    ::Getter_Test::GetterTestConnector::Writer_var writer =
-      this->ciao_context_->get_connection_info_write_data ();
-    ::Getter_Test::GetterFixedConnector::Writer_var fixed =
-      this->ciao_context_->get_connection_info_fixed_data ();
-    ::GetInvoker_var invoker =
-      this->ciao_context_->get_connection_invoke_getter ();
-
-    if (this->last_iter_ <= this->iterations_)
-      {
-        GetterFixed  fixed_key;
-        GetterTest *new_key = new GetterTest;
-        new_key->key = CORBA::string_dup ("KEY_1");
-        fixed_key.key = 1;
-        // Inform the receiver that this class (as the sender) is about to
-        // write samples to DDS.
-        invoker->start_get_one ("KEY_1", 1, last_iter_);
-
-        new_key->iteration = last_iter_;
-        fixed_key.iteration = last_iter_;
-
-        ACE_Time_Value tv (0, 50000);
-        ACE_OS::sleep (tv);
-
-        writer->write_one (*new_key, ::DDS::HANDLE_NIL);
-        fixed->write_one (fixed_key, ::DDS::HANDLE_NIL);
-        ACE_DEBUG ((LM_DEBUG, "Written keys <%C> and <%u> with <%d>\n",
-                    new_key->key.in (), fixed_key.key, last_iter_));
-
-        ++last_iter_;
-        delete new_key;
-    }
-   else
-    {
-      // Stop the timer at forehand.
-      this->reactor ()->cancel_timer (this->ticker_);
-      // Perform the last test.
-      this->write_many ();
-    }
-  }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_info_out_connector_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_connector_status_.in ()))
-      {
-        info_out_connector_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_connector_status_exec_i (
-            this->ciao_context_.in (),
-            *this),
-            ::CCM_DDS::CCM_ConnectorStatusListener::_nil ());
-
-          this->ciao_info_out_connector_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_ConnectorStatusListener::_duplicate (
-        this->ciao_info_out_connector_status_.in ());
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Getter_Test::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-    this->ccm_activated_ = true;
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    this->reactor ()->cancel_timer (this->ticker_);
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n")));
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    if (!this->done_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::ccm_remove : ")
-                              ACE_TEXT ("Never got start signal\n")));
-      }
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Getter_Test_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h
deleted file mode 100644
index cb017322f97..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h
+++ /dev/null
@@ -1,189 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_GETTER_TEST_SENDER_EXEC_HCBIGK_H_
-#define CIAO_GETTER_TEST_SENDER_EXEC_HCBIGK_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Getter_Test_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_Getter_Test_Sender_Impl
-{
-  class Sender_exec_i;
-
-  /**
-   * Pulse generator.
-   */
-  class pulse_Generator :
-    public ACE_Event_Handler
-  {
-  public:
-    pulse_Generator (Sender_exec_i &callback);
-
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    Sender_exec_i &pulse_callback_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_connector_status_exec_i
-   */
-
-  class info_out_connector_status_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_connector_status_exec_i (
-      ::Getter_Test::CCM_Sender_Context_ptr ctx,
-      Sender_exec_i & callback);
-    virtual ~info_out_connector_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-    const ::DDS::InconsistentTopicStatus & status);
-
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedIncompatibleQosStatus & status);
-
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleRejectedStatus & status);
-
-    virtual
-    void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-    const ::DDS::OfferedDeadlineMissedStatus & status);
-
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-    const ::DDS::OfferedIncompatibleQosStatus & status);
-
-    virtual
-    void on_unexpected_status (::DDS::Entity_ptr the_entity,
-    ::DDS::StatusKind status_kind);
-    //@}
-
-  private:
-    ::Getter_Test::CCM_Sender_Context_var ciao_context_;
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_info_out_connector_status (void);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void start (void);
-    void tick (void);
-    //@}
-
-  private:
-    ::Getter_Test::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::CCM_DDS::CCM_ConnectorStatusListener_var ciao_info_out_connector_status_;
-
-    ::CORBA::UShort keys_;
-
-    ::CORBA::UShort iterations_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    bool          done_;
-    bool          ccm_activated_;
-    CORBA::ULong last_iter_;
-    pulse_Generator * ticker_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void start_timeout_tests (void);
-    void write_many (void);
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Getter_Test_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/descriptors/Getter_Library.xml b/CIAO/connectors/dds4ccm/tests/Getter/descriptors/Getter_Library.xml
deleted file mode 100644
index 7f8f5e589e4..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Getter/descriptors/Getter_Library.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--  -->
-
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-  <qos_profile name="GetterProfile">
-    <datawriter_qos>
-          <durability>
-               <kind>TRANSIENT_DURABILITY_QOS</kind>
-          </durability>
-          <reliability>
-               <kind>RELIABLE_RELIABILITY_QOS</kind>
-               <max_blocking_time>
-                    <sec>10</sec>
-                    <nanosec>0</nanosec>
-               </max_blocking_time>
-         </reliability>
-          <history>
-               <kind>KEEP_ALL_HISTORY_QOS</kind>
-               <depth>1</depth>
-          </history>
-    </datawriter_qos>
-    <datareader_qos>
-          <durability>
-                 <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-          </durability>
-          <reliability>
-               <kind>RELIABLE_RELIABILITY_QOS</kind>
-          </reliability>
-          <history>
-               <kind>KEEP_ALL_HISTORY_QOS</kind>
-          </history>
-     </datareader_qos>
-  </qos_profile>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/Getter/descriptors/Plan.cdp
deleted file mode 100644
index bc1ffd81232..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Getter/descriptors/Plan.cdp
+++ /dev/null
@@ -1,542 +0,0 @@
-<!--  -->
-<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>Getter_Test_Depl_1</label>
-  <UUID>Getter_Test_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Getter_Test_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Getter_Test_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Getter_Fixed_ConnectorComponentImplementation">
-    <name>Getter_Fixed_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Getter_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="Getter_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Getter_Test_GetterFixedConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Getter_Test_GetterFixedConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Getter_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Getter_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Getter_Test_ConnectorComponentImplementation">
-    <name>Getter_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Getter_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="Getter_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Getter_Test_GetterTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Getter_Test_GetterTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Getter_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Getter_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Getter_Test_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Getter_Test_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-  </instance>
-
-  <instance xmi:id="Getter_Test_ConnectorComponentInstance">
-    <name>Getter_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Getter_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Getter_Library#GetterProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Getter_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="Getter_Test_ConnectorComponentInstance2">
-    <name>Getter_Test_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Getter_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Getter_Library#GetterProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Getter_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <!-- FIXED -->
-  <instance xmi:id="Getter_Fixed_ConnectorComponentInstance">
-    <name>Getter_Fixed_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Getter_Fixed_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Getter_Fixed</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="Getter_Fixed_ConnectorComponentInstance2">
-    <name>Getter_Fixed_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Getter_Fixed_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Getter_Fixed</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>info_get_fresh_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_fresh_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_fresh_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Getter_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_get_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Getter_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_fixed_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_fixed_fresh_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_fresh_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Getter_Fixed_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_out_connector_status_sender</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Getter_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Getter_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>fixed_writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_fixed_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Getter_Fixed_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>reader_starter</name>
-    <internalEndpoint>
-      <portName>invoke_getter</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>getter_invoke</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="Getter_Test_Connector_ExecArtifact">
-    <name>Getter_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Getter_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Getter_Test_Connector_SvntArtifact">
-    <name>Getter_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Getter_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Getter_Test_Connector_StubArtifact">
-    <name>Getter_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Getter_Test_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/Getter/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index 6c565b5b209..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Getter/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-Description
-XML QoS Profile
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="Getter_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="GetterProfile" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>10</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/Getter/descriptors/run_test.pl
deleted file mode 100755
index 5f6eda59235..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Getter/descriptors/run_test.pl
+++ /dev/null
@@ -1,249 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                  "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 30 seconds to allow task to complete\n";
-sleep (30);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -s\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/HomeDerived/Base/Hello_Base.idl b/CIAO/connectors/dds4ccm/tests/HomeDerived/Base/Hello_Base.idl
deleted file mode 100644
index 262effa164f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/HomeDerived/Base/Hello_Base.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file Hello_Base.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef HELLO_BASE_IDL
-#define HELLO_BASE_IDL
-
-#pragma ndds typesupport "Base/Hello_BaseSupport.h"
-#pragma opendds typesupport "Base/Hello_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "DDSHello"
-
-struct DDSHello {
-  string hello;
-  short iterator;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<DDSHello> DDSHelloSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/HomeDerived/Base/Hello_Base.mpc b/CIAO/connectors/dds4ccm/tests/HomeDerived/Base/Hello_Base.mpc
deleted file mode 100644
index ac400cd71d3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/HomeDerived/Base/Hello_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (Home_Hello_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = Home_Hello_Base_stub
-  dynamicflags += HELLO_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=HELLO_BASE_STUB_Export \
-              -Wb,stub_export_include=Hello_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    Hello_Base.idl
-  }
-
-  opendds_ts_flags += --export=HELLO_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    Hello_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/HomeDerived/Connector1/Hello_Connector.idl b/CIAO/connectors/dds4ccm/tests/HomeDerived/Connector1/Hello_Connector.idl
deleted file mode 100644
index 4b20fa3c416..00000000000
--- a/CIAO/connectors/dds4ccm/tests/HomeDerived/Connector1/Hello_Connector.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file Hello_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef HELLO_CONNECTOR_IDL_
-#define HELLO_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Hello_Base.idl"
-
-#pragma ciao lem "Connector1/Hello_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/Hello_BaseTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::DDSHello, ::DDSHelloSeq> Foo_conn;
-
-#endif /* HELLO_CONNECTOR_IDL_ */
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/HomeDerived/Connector1/Hello_Connector.mpc b/CIAO/connectors/dds4ccm/tests/HomeDerived/Connector1/Hello_Connector.mpc
deleted file mode 100644
index 0071d626167..00000000000
--- a/CIAO/connectors/dds4ccm/tests/HomeDerived/Connector1/Hello_Connector.mpc
+++ /dev/null
@@ -1,149 +0,0 @@
-project(Home_Hello_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after  += DDS4CCM_idl_gen Home_Hello_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=HELLO_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=Hello_Connector_stub_export.h \
-              -Wb,skel_export_macro=HELLO_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=Hello_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=HELLO_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=Hello_Connector_svnt_export.h \
-              -Wb,conn_export_macro=HELLO_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Hello_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Hello_Connector.idl
-  }
-}
-
-project(Home_Hello_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += Home_Hello_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=HELLO_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=Hello_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    Hello_ConnectorE.idl
-  }
-}
-
-project(Home_Hello_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after  += Home_Hello_Connector_lem_gen \
-            Home_Hello_Connector_stub \
-            Home_Hello_Base_stub
-  libs   += Home_Hello_Base_stub \
-            Home_Hello_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Home_Hello_Connector_lem_stub
-  dynamicflags += HELLO_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Hello_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    Hello_ConnectorEC.h
-    Hello_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Hello_ConnectorEC.inl
-  }
-}
-
-project(Home_Hello_Connector_stub) : ccm_stub, dds4ccm_base {
-  after  += Home_Hello_Connector_idl_gen Home_Hello_Base_stub
-  libs   += Home_Hello_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Home_Hello_Connector_stub
-  dynamicflags += HELLO_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Hello_ConnectorC.cpp
-  }
-
-  Header_Files {
-    Hello_ConnectorC.h
-    Hello_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    Hello_ConnectorC.inl
-  }
-}
-
-project(Home_Hello_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after  += Home_Hello_Connector_lem_stub \
-            Home_Hello_Connector_stub \
-            Home_Hello_Base_stub
-  sharedname = Home_Hello_Connector_exec
-  libs += Home_Hello_Connector_stub \
-          Home_Hello_Connector_lem_stub \
-          Home_Hello_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += HELLO_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Hello_Connector_conn.cpp
-  }
-
-  Header_Files {
-    Hello_Connector_conn.h
-    Hello_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(Home_Hello_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += Home_Hello_Connector_lem_stub \
-                Home_Hello_Connector_exec \
-                Home_Hello_Connector_stub
-  sharedname  = Home_Hello_Connector_svnt
-  libs       += Home_Hello_Connector_stub \
-                Home_Hello_Connector_lem_stub  \
-                Home_Hello_Base_stub \
-                Home_Hello_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += HELLO_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Hello_ConnectorS.cpp
-    Hello_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    Hello_ConnectorS.h
-    Hello_Connector_svnt.h
-    Hello_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/HomeDerived/Connector2/Hello_Connector2.idl b/CIAO/connectors/dds4ccm/tests/HomeDerived/Connector2/Hello_Connector2.idl
deleted file mode 100644
index db9a415bf82..00000000000
--- a/CIAO/connectors/dds4ccm/tests/HomeDerived/Connector2/Hello_Connector2.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file Hello_Connector2.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef HELLO_CONNECTOR2_IDL_
-#define HELLO_CONNECTOR2_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Hello_Base.idl"
-
-#pragma ciao lem "Connector2/Hello_Connector2E.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/Hello_BaseTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::DDSHello, ::DDSHelloSeq> Bar_conn;
-
-#endif /* HELLO_CONNECTOR_IDL_ */
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/HomeDerived/Connector2/Hello_Connector2.mpc b/CIAO/connectors/dds4ccm/tests/HomeDerived/Connector2/Hello_Connector2.mpc
deleted file mode 100644
index 34106691416..00000000000
--- a/CIAO/connectors/dds4ccm/tests/HomeDerived/Connector2/Hello_Connector2.mpc
+++ /dev/null
@@ -1,149 +0,0 @@
-project(Home_Hello_Connector2_idl_gen) : connectoridldefaults, dds4ccm {
-  after  += DDS4CCM_idl_gen Home_Hello_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=HELLO_CONNECTOR2_STUB_Export \
-              -Wb,stub_export_include=Hello_Connector2_stub_export.h \
-              -Wb,skel_export_macro=HELLO_CONNECTOR2_SVNT_Export \
-              -Wb,skel_export_include=Hello_Connector2_svnt_export.h \
-              -Wb,svnt_export_macro=HELLO_CONNECTOR2_SVNT_Export \
-              -Wb,svnt_export_include=Hello_Connector2_svnt_export.h \
-              -Wb,conn_export_macro=HELLO_CONNECTOR2_CONN_Export \
-              -Wb,conn_export_include=Hello_Connector2_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Hello_Connector2.idl
-  }
-}
-
-project(Home_Hello_Connector2_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += Home_Hello_Connector2_idl_gen
-  idlflags += -Wb,stub_export_macro=HELLO_CONNECTOR2_LEM_STUB_Export \
-              -Wb,stub_export_include=Hello_Connector2_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    Hello_Connector2E.idl
-  }
-}
-
-project(Home_Hello_Connector2_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after  += Home_Hello_Connector2_lem_gen \
-            Home_Hello_Connector2_stub \
-            Home_Hello_Base_stub
-  libs   += Home_Hello_Base_stub \
-            Home_Hello_Connector2_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Home_Hello_Connector2_lem_stub
-  dynamicflags += HELLO_CONNECTOR2_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Hello_Connector2EC.cpp
-  }
-
-  Header_Files {
-    Hello_Connector2EC.h
-    Hello_Connector2_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Hello_Connector2EC.inl
-  }
-}
-
-project(Home_Hello_Connector2_stub) : ccm_stub, dds4ccm_base {
-  after  += Home_Hello_Connector2_idl_gen Home_Hello_Base_stub
-  libs   += Home_Hello_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Home_Hello_Connector2_stub
-  dynamicflags += HELLO_CONNECTOR2_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Hello_Connector2C.cpp
-  }
-
-  Header_Files {
-    Hello_Connector2C.h
-    Hello_Connector2_stub_export.h
-  }
-
-  Inline_Files {
-    Hello_Connector2C.inl
-  }
-}
-
-project(Home_Hello_Connector2_exec) : ciao_executor, dds4ccm_impl {
-  after  += Home_Hello_Connector2_lem_stub \
-            Home_Hello_Connector2_stub \
-            Home_Hello_Base_stub
-  sharedname = Home_Hello_Connector2_exec
-  libs += Home_Hello_Connector2_stub \
-          Home_Hello_Connector2_lem_stub \
-          Home_Hello_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += HELLO_CONNECTOR2_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Hello_Connector2_conn.cpp
-  }
-
-  Header_Files {
-    Hello_Connector2_conn.h
-    Hello_Connector2_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(Home_Hello_Connector2_svnt) : ciao_servant, dds4ccm_impl {
-  after      += Home_Hello_Connector2_lem_stub \
-                Home_Hello_Connector2_exec \
-                Home_Hello_Connector2_stub
-  sharedname  = Home_Hello_Connector2_svnt
-  libs       += Home_Hello_Connector2_stub \
-                Home_Hello_Connector2_lem_stub  \
-                Home_Hello_Base_stub \
-                Home_Hello_Connector2_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += HELLO_CONNECTOR2_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Hello_Connector2S.cpp
-    Hello_Connector2_svnt.cpp
-  }
-
-  Header_Files {
-    Hello_Connector2S.h
-    Hello_Connector2_svnt.h
-    Hello_Connector2_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender.idl b/CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender.idl
deleted file mode 100644
index d1692eb1582..00000000000
--- a/CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender.idl
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef DDS_SENDER_IDL
-#define DDS_SENDER_IDL
-
-#include "Connector1/Hello_Connector.idl"
-#include "Connector2/Hello_Connector2.idl"
-
-module Hello
-{
-  interface Base_obj
-  {
-  };
-
-  interface Derived_obj : Base_obj
-  {
-  };
-
-  component Base_comp
-  {
-    provides Base_obj baseFacet;
-    uses Base_obj baseRecept;
-    port Foo_conn::DDS_Write fooPub;
-    port Foo_conn::DDS_Listen fooSub;
-    attribute short baseAttr;
-  };
-
-  home Base_compHome manages Base_comp {
-  };
-
-  component Derived_comp : Base_comp
-  {
-    provides Derived_obj derivedFacet;
-    uses Derived_obj derivedRecept;
-    attribute long long derivedAttr;
-    port Bar_conn::DDS_Write barPub;
-    port Bar_conn::DDS_Listen barSub;
-
-  };
-
-  home Derived_compHome : Base_compHome manages Derived_comp {
-  };
-
- component DerivedEmpty_comp : Base_comp {
-  };
-
-
-
-
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender.mpc b/CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender.mpc
deleted file mode 100644
index accf17584fb..00000000000
--- a/CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-project(Home_Hello_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  avoids += ace_for_tao
-  after  += Home_Hello_Connector_idl_gen Home_Hello_Connector2_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=HELLO_SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=HELLO_SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=HELLO_SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=HELLO_SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I ..
-
-  IDL_Files {
-    Hello_Sender.idl
-  }
-}
-
-project(Home_Hello_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  avoids += ace_for_tao
-  after  += Home_Hello_Sender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=HELLO_SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    Hello_SenderE.idl
-  }
-}
-
-project(Home_Hello_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  avoids += ace_for_tao
-  after  += Home_Hello_Sender_lem_gen Home_Hello_Sender_stub Home_Hello_Base_stub
-  libs   += Home_Hello_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += HELLO_SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Hello_SenderEC.cpp
-  }
-
-  Header_Files {
-    Hello_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Hello_SenderEC.inl
-  }
-}
-
-project(Home_Hello_Sender_stub) : ccm_stub, dds4ccm_base {
-  avoids += ace_for_tao
-  after  += Home_Hello_Sender_idl_gen Home_Hello_Base_stub Home_Hello_Connector_stub Home_Hello_Connector2_stub
-  libs   += Home_Hello_Base_stub Home_Hello_Connector_stub Home_Hello_Connector2_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += HELLO_SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Hello_SenderC.cpp
-  }
-
-  Header_Files {
-    Hello_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    Hello_SenderC.inl
-  }
-}
-
-project(Home_Hello_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after  += Home_Hello_Sender_lem_stub Home_Hello_Sender_stub Home_Hello_Connector_lem_stub Home_Hello_Connector_stub \
-            Home_Hello_Connector2_lem_stub Home_Hello_Connector2_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub Home_Hello_Base_stub Home_Hello_Connector_lem_stub Home_Hello_Connector_stub \
-          Home_Hello_Connector2_lem_stub Home_Hello_Connector2_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += HELLO_SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Hello_Sender_exec.cpp
-  }
-
-  Header_Files {
-    Hello_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(Home_Hello_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  avoids     += ace_for_tao
-  after      += Home_Hello_Base_stub  Home_Hello_Sender_lem_stub Home_Hello_Connector_stub Home_Hello_Connector_svnt  Home_Hello_Connector_lem_stub \
-                Home_Hello_Connector2_stub Home_Hello_Connector2_svnt  Home_Hello_Connector2_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                Home_Hello_Base_stub Home_Hello_Connector_stub Home_Hello_Connector_svnt Home_Hello_Connector_lem_stub \
-                Home_Hello_Connector2_stub Home_Hello_Connector2_svnt Home_Hello_Connector2_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += HELLO_SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Hello_SenderS.cpp
-    Hello_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    Hello_SenderS.h
-    Hello_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender_exec.cpp
deleted file mode 100644
index 7024dbf18ef..00000000000
--- a/CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender_exec.cpp
+++ /dev/null
@@ -1,723 +0,0 @@
-// -*- C++ -*-
-#include "Hello_Sender_exec.h"
-#include "ace/Guard_T.h"
-#include "ace/Log_Msg.h"
-#include "tao/ORB_Core.h"
-#include "ace/Date_Time.h"
-#include "ace/OS_NS_unistd.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_Hello_Base_comp_Impl
-{
-
-  fooSub_data_listener_exec_i::fooSub_data_listener_exec_i (
-        ::Hello::CCM_Base_comp_Context_ptr ctx)
-    : ciao_context_ (
-        ::Hello::CCM_Base_comp_Context::_duplicate (ctx))
-  {
-  }
-
-  fooSub_data_listener_exec_i::~fooSub_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from Listener
-  void
-  fooSub_data_listener_exec_i::on_one_data (
-    const ::DDSHello & /* datum */,
-    const ::CCM_DDS::ReadInfo & /* info */)
-  {
-  }
-
-  void
-  fooSub_data_listener_exec_i::on_many_data (
-    const ::DDSHelloSeq & /* data */,
-    const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    /* Your code here. */
-  }
-
-  fooSub_status_exec_i::fooSub_status_exec_i (
-        ::Hello::CCM_Base_comp_Context_ptr ctx)
-    : ciao_context_ (
-        ::Hello::CCM_Base_comp_Context::_duplicate (ctx))
-  {
-  }
-
-  fooSub_status_exec_i::~fooSub_status_exec_i (void)
-  {
-    //ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("~fooSub_status_exec_i\n")));
-  }
-
-  void
-  fooSub_status_exec_i::on_requested_deadline_missed (
-    ::DDS::DataReader_ptr /* the_reader */,
-    const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  fooSub_status_exec_i::on_sample_lost (
-    ::DDS::DataReader_ptr /* the_reader */,
-    const ::DDS::SampleLostStatus & /* status */)
-  {
-     //ACE_DEBUG ((LM_ERROR, ACE_TEXT("port status listener::on_sample_lost\n")));
-  }
-
-  //============================================================
-  // Component Executor Implementation Class: Base_comp_exec_i
-  //============================================================
-
-  Base_comp_exec_i::Base_comp_exec_i (void)
-    : baseAttr_ (1)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Base_comp: -2- Base_comp_exec_i::"
-                                  "Base_comp_exec_i \n"));
-  }
-
-  Base_comp_exec_i::~Base_comp_exec_i (void)
-  {
-     ACE_DEBUG ((LM_DEBUG, "Base_comp: -10- Base_comp_exec_i::"
-                                      "~Base_comp_exec_i \n"));
-  }
-
-  // Supported operations and attributes.
-
-  // Component attributes and port operations.
-
-  ::CORBA::Short
-   Base_comp_exec_i::baseAttr (void)
-  {
-    return this->baseAttr_;
-  }
-
-  void
-  Base_comp_exec_i::baseAttr (
-    ::CORBA::Short baseAttr)
-  {
-    this->baseAttr_ = baseAttr;
-  }
-
-  ::Foo_conn::CCM_Listener_ptr
-   Base_comp_exec_i::get_fooSub_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_fooSub_data_listener_.in ()))
-      {
-        fooSub_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          fooSub_data_listener_exec_i (
-            this->ciao_context_.in ()),
-          ::Foo_conn::CCM_Listener::_nil ());
-
-        this->ciao_fooSub_data_listener_ = tmp;
-      }
-
-    return
-      ::Foo_conn::CCM_Listener::_duplicate (
-        this->ciao_fooSub_data_listener_.in ());
-  }
-
-
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-   Base_comp_exec_i::get_fooSub_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_fooSub_status_.in ()))
-      {
-        fooSub_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          fooSub_status_exec_i (
-            this->ciao_context_.in ()),
-           ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-        this->ciao_fooSub_status_ = tmp;
-      }
-
-    return
-       ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_fooSub_status_.in ());
-  }
-
-  ::Hello::CCM_Base_obj_ptr
-   Base_comp_exec_i::get_baseFacet (void)
-  {
-    return 0;
-  }
-
-  // Operations from Components::SessionComponent.
-  void
-  Base_comp_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Hello::CCM_Base_comp_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Base_comp_exec_i::configuration_complete (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Base_comp: -3- Base_comp_exec_i::"
-                                      "configuration_complete \n"));
-  }
-
-  void
-  Base_comp_exec_i::ccm_activate (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Base_comp: -4- Base_comp_exec_i::"
-                                      "ccm_activate \n"));
-  }
-
-  void
-  Base_comp_exec_i::ccm_passivate (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Base_comp: -8- Base_comp_exec_i::"
-                                      "ccm_passivate \n"));
-  }
-
-  void
-  Base_comp_exec_i::ccm_remove (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Base_comp: -9- Base_comp_exec_i::"
-                                      "ccm_remove \n"));
-  }
-
-
-  extern "C" HELLO_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Hello_Base_comp_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Base_comp_exec_i);
-
-    return retval;
-  }
-
-}
-namespace CIAO_Hello_Base_comp_Impl
-{
-  //============================================================
-  // Home Executor Implementation Class: SenderHome_exec_i
-  //============================================================
-
-  Base_compHome_exec_i::Base_compHome_exec_i ()
-  {
-    ACE_DEBUG ((LM_DEBUG, " Base_compHome: -2- Base_compHome_exec_i::"
-                              "Base_compHome_exec_i \n"));
-  }
-
-  Base_compHome_exec_i::~Base_compHome_exec_i (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, " Base_compHome: -11- Base_compHome_exec_i::"
-                              "~Base_compHome_exec_i \n"));
-  }
-
-  // All operations and attributes.
-
-  // Factory operations.
-
-  // Finder operations.
-
-  // Implicit operations.
-
-  ::Components::EnterpriseComponent_ptr
-   Base_compHome_exec_i::create (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, " Base_compHome: -3- Base_compHome_exec_i::create\n"));
-    ACE_DEBUG ((LM_DEBUG, "(%P|%t) creating Base_compHome\n"));
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-
-    ACE_NEW_THROW_EX (
-      retval,
-      CIAO_Hello_Base_comp_Impl::Base_comp_exec_i (),
-      ::CORBA::NO_MEMORY ());
-    return retval;
-  }
-
-  extern "C" HELLO_SENDER_EXEC_Export ::Components::HomeExecutorBase_ptr
-  create_Hello_SenderHome_Impl (void)
-  {
-     ACE_DEBUG ((LM_DEBUG, " Base_compHome: -1- create_Hello_Base_compHome_Impl \n"));
-
-    ::Components::HomeExecutorBase_ptr retval =
-      ::Components::HomeExecutorBase::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Base_compHome_exec_i ());
-
-    return retval;
-  }
-}
-
-//============================================================
-  // Component Executor Implementation Class: Derived_comp_exec_i
-  //============================================================
-namespace CIAO_Hello_Derived_comp_Impl
-{
-  barSub_data_listener_exec_i::barSub_data_listener_exec_i (
-         ::Hello::CCM_Derived_comp_Context_ptr ctx)
-     : ciao_context_ (
-         ::Hello::CCM_Derived_comp_Context::_duplicate (ctx))
-  {
-  }
-
-  barSub_data_listener_exec_i::~barSub_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from Listener
-  void
-  barSub_data_listener_exec_i::on_one_data (
-     const ::DDSHello & /* datum */,
-     const ::CCM_DDS::ReadInfo & /* info */)
-  {
-  }
-
-  void
-  barSub_data_listener_exec_i::on_many_data (
-    const ::DDSHelloSeq & /* data */,
-    const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-     /* Your code here. */
-  }
-
-
-  barSub_status_exec_i::barSub_status_exec_i (
-           ::Hello::CCM_Base_comp_Context_ptr ctx)
-       : ciao_context_ (
-           ::Hello::CCM_Base_comp_Context::_duplicate (ctx))
-  {
-  }
-
-  barSub_status_exec_i::~barSub_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  barSub_status_exec_i::on_requested_deadline_missed (
-    ::DDS::DataReader_ptr /* the_reader */,
-    const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  barSub_status_exec_i::on_sample_lost (
-     ::DDS::DataReader_ptr /* the_reader */,
-     const ::DDS::SampleLostStatus & /* status */)
-  {
-  }
-
-  Derived_comp_exec_i::Derived_comp_exec_i (void)
-    : baseAttr_ (10),
-      derivedAttr_ (100)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Derived_comp: -2- Derived_comp_exec_i::"
-                                  "Derived_comp_exec_i \n"));
-  }
-
-  Derived_comp_exec_i::~Derived_comp_exec_i (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Derived_comp: -10- Derived_comp_exec_i::"
-                                      "~Derived_comp_exec_i \n"));
-  }
-
-  // Supported operations and attributes.
-  ::CORBA::LongLong
-  Derived_comp_exec_i::derivedAttr (void)
-  {
-    return this->derivedAttr_;
-  }
-
-  void
-  Derived_comp_exec_i::derivedAttr (
-  ::CORBA::LongLong derivedAttr)
-  {
-    this->derivedAttr_ = derivedAttr;
-  }
-
-
-  ::CORBA::Short
-  Derived_comp_exec_i::baseAttr (void)
-  {
-    return this->baseAttr_;
-  }
-
-  void
-  Derived_comp_exec_i::baseAttr (
-     ::CORBA::Short baseAttr)
-  {
-    this->baseAttr_ = baseAttr;
-  }
-
-  // Component attributes and port operations.
-
-  ::Foo_conn::CCM_Listener_ptr
-  Derived_comp_exec_i::get_fooSub_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_fooSub_data_listener_.in ()))
-      {
-      CIAO_Hello_Base_comp_Impl::fooSub_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          CIAO_Hello_Base_comp_Impl::fooSub_data_listener_exec_i (
-            this->ciao_context_.in ()),
-          ::Foo_conn::CCM_Listener::_nil ());
-
-        this->ciao_fooSub_data_listener_ = tmp;
-      }
-
-    return
-      ::Foo_conn::CCM_Listener::_duplicate (
-        this->ciao_fooSub_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Derived_comp_exec_i::get_fooSub_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_fooSub_status_.in ()))
-      {
-      CIAO_Hello_Base_comp_Impl::fooSub_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          CIAO_Hello_Base_comp_Impl::fooSub_status_exec_i (
-            this->ciao_context_.in ()),
-           ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-        this->ciao_fooSub_status_ = tmp;
-      }
-
-    return
-       ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_fooSub_status_.in ());
-  }
-
-  ::Bar_conn::CCM_Listener_ptr
-  Derived_comp_exec_i::get_barSub_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_barSub_data_listener_.in ()))
-      {
-      barSub_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          barSub_data_listener_exec_i (
-            this->ciao_context_.in ()),
-          ::Bar_conn::CCM_Listener::_nil ());
-
-        this->ciao_barSub_data_listener_ = tmp;
-      }
-
-    return
-      ::Bar_conn::CCM_Listener::_duplicate (
-        this->ciao_barSub_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Derived_comp_exec_i::get_barSub_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_barSub_status_.in ()))
-      {
-        barSub_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          barSub_status_exec_i (
-            this->ciao_context_.in ()),
-           ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-        this->ciao_barSub_status_ = tmp;
-      }
-
-    return
-       ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_barSub_status_.in ());
-  }
-
-  ::Hello::CCM_Base_obj_ptr
-  Derived_comp_exec_i::get_baseFacet (void)
-  {
-    return 0;
-  }
-
-  ::Hello::CCM_Derived_obj_ptr
-  Derived_comp_exec_i::get_derivedFacet (void)
-  {
-    return 0;
-  }
-
-  // Operations from Components::SessionComponent.
-  void
-  Derived_comp_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Derived_comp: -3- Derived_comp_exec_i::"
-                                          ":set_session_contexti \n"));
-    this->ciao_context_ =
-      ::Hello::CCM_Derived_comp_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Derived_comp_exec_i::configuration_complete (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Derived_comp: -4- Derived_comp_exec_i::"
-                                      "configuration_complete \n"));
-  }
-
-  void
-  Derived_comp_exec_i::ccm_activate (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Derived_comp: -5- Derived_comp_exec_i::"
-                                      "ccm_activate \n"));
-  }
-
-  void
-  Derived_comp_exec_i::ccm_passivate (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Derived_comp: -8- Derived_comp_exec_i::"
-                                      "ccm_passivate \n"));
-  }
-
-  void
-  Derived_comp_exec_i::ccm_remove (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Derived_comp: -9- Derived_comp_exec_i::"
-                                      "ccm_remove \n"));
-  }
-
-
-  extern "C" HELLO_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Hello_Derived_comp_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Derived_comp_exec_i);
-
-    return retval;
-  }
-
-}
-namespace  CIAO_Hello_Derived_comp_Impl
-{
-  //============================================================
-  // Home Executor Implementation Class: Derived_compHome_exec_i
-  //============================================================
-
-  Derived_compHome_exec_i::Derived_compHome_exec_i ()
-  {
-    ACE_DEBUG ((LM_DEBUG, "Derived_compHome: -2- Derived_compHome_exec_i::"
-                              "Derived_compHome_exec_i \n"));
-
-    //compare current and original thread
-   }
-
-  Derived_compHome_exec_i::~Derived_compHome_exec_i (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Derived_compHome: -11- Derived_compHome_exec_i::"
-                          "~Derived_compHome_exec_i \n"));
-  }
-
-  // All operations and attributes.
-
-  // Factory operations.
-
-  // Finder operations.
-
-  // Implicit operations.
-
-  ::Components::EnterpriseComponent_ptr
-   Derived_compHome_exec_i::create (void)
-  {
-     ACE_DEBUG ((LM_DEBUG, "Derived_compHome: -3- Derived_compHome_exec_i::create\n"));
-    ACE_DEBUG ((LM_DEBUG, "(%P|%t) creating Derived_compHome\n"));
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-
-    ACE_NEW_THROW_EX (
-      retval,
-      CIAO_Hello_Derived_comp_Impl::Derived_comp_exec_i (),
-      ::CORBA::NO_MEMORY ());
-
-    return retval;
-  }
-
-  extern "C" HELLO_SENDER_EXEC_Export ::Components::HomeExecutorBase_ptr
-  create_Hello_Derived_compHome_Impl (void)
-  {
-
-     ACE_DEBUG ((LM_DEBUG, "Derived_compHome: -1- create_Hello_Derived_compHome_Impl \n"));
-
-    ::Components::HomeExecutorBase_ptr retval =
-      ::Components::HomeExecutorBase::_nil ();
-
-
-    ACE_NEW_NORETURN (
-      retval,
-      Derived_compHome_exec_i ());
-
-   return retval;
-  }
-}
-//============================================================
-  // Component Executor Implementation Class: DerivedEmpty_comp_exec_i
-  //============================================================
-namespace CIAO_Hello_DerivedEmpty_comp_Impl
-{
-  DerivedEmpty_comp_exec_i::DerivedEmpty_comp_exec_i (void)
-    : baseAttr_ (1)
-  {
-    ACE_DEBUG ((LM_DEBUG, "DerivedEmpty_comp: -2- DerivedEmpty_comp_exec_i::"
-                                  "DerivedEmpty_comp_exec_i \n"));
-  }
-
-  DerivedEmpty_comp_exec_i::~DerivedEmpty_comp_exec_i (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "DerivedEmpty_comp: -10- DerivedEmpty_comp_exec_i::"
-                                      "~DerivedEmpty_comp_exec_i \n"));
-  }
-
-  // Supported operations and attributes.
-
-  ::CORBA::Short
-  DerivedEmpty_comp_exec_i::baseAttr (void)
-  {
-    return this->baseAttr_;
-  }
-
-  void
-  DerivedEmpty_comp_exec_i::baseAttr (
-     ::CORBA::Short baseAttr)
-  {
-    this->baseAttr_ = baseAttr;
-  }
-
-  // Component attributes and port operations.
-
-
-  ::Foo_conn::CCM_Listener_ptr
-  DerivedEmpty_comp_exec_i::get_fooSub_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_fooSub_data_listener_.in ()))
-      {
-      CIAO_Hello_Base_comp_Impl::fooSub_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          CIAO_Hello_Base_comp_Impl::fooSub_data_listener_exec_i (
-            this->ciao_context_.in ()),
-          ::Foo_conn::CCM_Listener::_nil ());
-
-        this->ciao_fooSub_data_listener_ = tmp;
-      }
-
-    return
-      ::Foo_conn::CCM_Listener::_duplicate (
-        this->ciao_fooSub_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  DerivedEmpty_comp_exec_i::get_fooSub_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_fooSub_status_.in ()))
-       {
-      CIAO_Hello_Base_comp_Impl::fooSub_status_exec_i *tmp = 0;
-         ACE_NEW_RETURN (
-           tmp,
-           CIAO_Hello_Base_comp_Impl::fooSub_status_exec_i (
-             this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-         this->ciao_fooSub_status_ = tmp;
-       }
-
-    return
-        ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-         this->ciao_fooSub_status_.in ());
-  }
-
-
-  ::Hello::CCM_Base_obj_ptr
-   DerivedEmpty_comp_exec_i::get_baseFacet (void)
-   {
-     return 0;
-   }
-  // Operations from Components::SessionComponent.
-
-  void
-  DerivedEmpty_comp_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Hello::CCM_DerivedEmpty_comp_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  DerivedEmpty_comp_exec_i::configuration_complete (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "DerivedEmpty_comp: -3- DerivedEmpty_comp_exec_i::"
-                                      "configuration_completei \n"));
-    /* Your code here. */
-  }
-
-  void
-  DerivedEmpty_comp_exec_i::ccm_activate (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "DerivedEmpty_comp: -4- DerivedEmpty_comp_exec_i::"
-                                      "ccm_activate \n"));
-  }
-
-  void
-  DerivedEmpty_comp_exec_i::ccm_passivate (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "DerivedEmpty_comp: -8- DerivedEmpty_comp_exec_i::"
-                                      "ccm_passivate \n"));
-  }
-
-  void
-  DerivedEmpty_comp_exec_i::ccm_remove (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "DerivedEmpty_comp: -9- DerivedEmpty_comp_exec_i::"
-                                      "ccm_remove \n"));
-  }
-
-
-  extern "C" HELLO_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Hello_DerivedEmpty_comp_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      DerivedEmpty_comp_exec_i);
-
-    return retval;
-  }
-
-}
diff --git a/CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender_exec.h
deleted file mode 100644
index de5a3d6d89b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender_exec.h
+++ /dev/null
@@ -1,365 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_HELLO_SENDER_EXEC_YPB9XX_H_
-#define CIAO_HELLO_SENDER_EXEC_YPB9XX_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Hello_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-#include <map>
-
-namespace CIAO_Hello_Base_comp_Impl
-{
-
-  class HELLO_SENDER_EXEC_Export fooSub_data_listener_exec_i
-    : public virtual ::Foo_conn::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    fooSub_data_listener_exec_i (
-      ::Hello::CCM_Base_comp_Context_ptr ctx);
-
-    virtual ~fooSub_data_listener_exec_i (void);
-
-    // Operations and attributes from Hello::Listener
-
-    virtual
-    void on_one_data (
-      const ::DDSHello & datum,
-      const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (
-      const ::DDSHelloSeq & data,
-      const ::CCM_DDS::ReadInfoSeq & infos);
-
-  private:
-    ::Hello::CCM_Base_comp_Context_var ciao_context_;
-  };
-
-  class HELLO_SENDER_EXEC_Export fooSub_status_exec_i
-      : public virtual ::CCM_DDS::CCM_PortStatusListener,
-        public virtual ::CORBA::LocalObject
-  {
-  public:
-    fooSub_status_exec_i (
-      ::Hello::CCM_Base_comp_Context_ptr ctx);
-    virtual ~fooSub_status_exec_i (void);
-
-    // Operations and attributes from CCM_DDS::PortStatusListener
-
-    virtual
-    void on_requested_deadline_missed (
-      ::DDS::DataReader_ptr the_reader,
-      const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (
-      ::DDS::DataReader_ptr the_reader,
-      const ::DDS::SampleLostStatus & status);
-
-  private:
-    ::Hello::CCM_Base_comp_Context_var ciao_context_;
-  };
-
-
-  class Base_comp_exec_i;
-
-  class HELLO_SENDER_EXEC_Export Base_comp_exec_i
-    : public virtual Base_comp_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Base_comp_exec_i (void);
-    virtual ~Base_comp_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-    virtual ::CORBA::Short
-    baseAttr (void);
-
-    virtual void
-    baseAttr (::CORBA::Short baseAttr);
-
-    virtual ::Foo_conn::CCM_Listener_ptr
-    get_fooSub_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_fooSub_status (void);
-
-    virtual ::Hello::CCM_Base_obj_ptr
-    get_baseFacet (void);
-
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete (void);
-
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-  private:
-    ::Hello::CCM_Base_comp_Context_var ciao_context_;
-    ::CCM_DDS::CCM_ConnectorStatusListener_var ciao_connector_status_;
-    ::Foo_conn::CCM_Listener_var ciao_fooSub_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_fooSub_status_;
-    CORBA::Short baseAttr_;
- };
-
-  extern "C" HELLO_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Hello_Base_comp_Impl (void);
-}
-namespace CIAO_Hello_Base_comp_Impl
-{
-  class HELLO_SENDER_EXEC_Export Base_compHome_exec_i
-    : public virtual Base_compHome_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Base_compHome_exec_i (void);
-
-    virtual ~Base_compHome_exec_i (void);
-
-    // All operations and attributes.
-
-    // Factory operations.
-
-    // Finder operations.
-
-    // Implicit operations.
-
-    virtual ::Components::EnterpriseComponent_ptr
-    create (void);
-  private:
-
-  };
-
-  extern "C" HELLO_SENDER_EXEC_Export ::Components::HomeExecutorBase_ptr
-  create_Hello_Base_compHome_Impl (void);
-}
-
-namespace CIAO_Hello_Derived_comp_Impl
-{
-
-  class HELLO_SENDER_EXEC_Export barSub_data_listener_exec_i
-      : public virtual ::Bar_conn::CCM_Listener,
-        public virtual ::CORBA::LocalObject
-  {
-  public:
-    barSub_data_listener_exec_i (
-      ::Hello::CCM_Derived_comp_Context_ptr ctx);
-
-    virtual ~barSub_data_listener_exec_i (void);
-
-    // Operations and attributes from Hello::Listener
-
-    virtual
-    void on_one_data (
-      const ::DDSHello & datum,
-      const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (
-      const ::DDSHelloSeq & data,
-      const ::CCM_DDS::ReadInfoSeq & infos);
-
-  private:
-    ::Hello::CCM_Derived_comp_Context_var ciao_context_;
-  };
-
-  class HELLO_SENDER_EXEC_Export barSub_status_exec_i
-       : public virtual ::CCM_DDS::CCM_PortStatusListener,
-         public virtual ::CORBA::LocalObject
-  {
-  public:
-    barSub_status_exec_i (
-       ::Hello::CCM_Base_comp_Context_ptr ctx);
-    virtual ~barSub_status_exec_i (void);
-
-    // Operations and attributes from CCM_DDS::PortStatusListener
-
-    virtual
-    void on_requested_deadline_missed (
-      ::DDS::DataReader_ptr the_reader,
-      const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (
-      ::DDS::DataReader_ptr the_reader,
-      const ::DDS::SampleLostStatus & status);
-
-  private:
-    ::Hello::CCM_Base_comp_Context_var ciao_context_;
-  };
-
-  class HELLO_SENDER_EXEC_Export Derived_comp_exec_i
-    : public virtual Derived_comp_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Derived_comp_exec_i (void);
-    virtual ~Derived_comp_exec_i (void);
-
-    //@{
-    /** Component attributes and port operations. */
-    virtual ::CORBA::LongLong
-    derivedAttr (void);
-
-    virtual void
-    derivedAttr (::CORBA::LongLong);
-
-    virtual ::CORBA::Short
-    baseAttr (void);
-
-    virtual void
-    baseAttr (::CORBA::Short baseAttr);
-
-    virtual ::Foo_conn::CCM_Listener_ptr
-    get_fooSub_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_fooSub_status (void);
-
-    virtual ::Bar_conn::CCM_Listener_ptr
-    get_barSub_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_barSub_status (void);
-
-    virtual ::Hello::CCM_Base_obj_ptr
-    get_baseFacet (void);
-
-    virtual ::Hello::CCM_Derived_obj_ptr
-    get_derivedFacet (void);
-
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete (void);
-
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-  private:
-    ::Hello::CCM_Derived_comp_Context_var ciao_context_;
-    ::Foo_conn::CCM_Listener_var ciao_fooSub_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_fooSub_status_;
-    ::Bar_conn::CCM_Listener_var ciao_barSub_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_barSub_status_;
-
-    CORBA::Short baseAttr_;
-    CORBA::ULongLong derivedAttr_;
- //   Atomic_Boolean ready_to_start_;
-  };
-
-  extern "C" HELLO_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Hello_Derived_comp_Impl (void);
-}
-
-
-namespace  CIAO_Hello_Derived_comp_Impl
-{
-  class HELLO_SENDER_EXEC_Export Derived_compHome_exec_i
-    : public virtual Derived_compHome_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Derived_compHome_exec_i (void);
-
-    virtual ~Derived_compHome_exec_i (void);
-
-    // All operations and attributes.
-
-    // Factory operations.
-    // Finder operations.
-
-    // Implicit operations.
-
-    virtual ::Components::EnterpriseComponent_ptr
-    create (void);
-  private:
-
-  };
-
-  extern "C" HELLO_SENDER_EXEC_Export ::Components::HomeExecutorBase_ptr
-  create_Hello_Derived_compHome_Impl (void);
-}
-
-namespace CIAO_Hello_DerivedEmpty_comp_Impl
-{
- class HELLO_SENDER_EXEC_Export DerivedEmpty_comp_exec_i
-    : public virtual DerivedEmpty_comp_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-   DerivedEmpty_comp_exec_i (void);
-    virtual ~DerivedEmpty_comp_exec_i (void);
-
-    //@{
-    /** Component attributes and port operations. */
-    virtual ::CORBA::Short
-    baseAttr (void);
-
-    virtual void
-    baseAttr (::CORBA::Short baseAttr);
-
-    virtual ::Foo_conn::CCM_Listener_ptr
-    get_fooSub_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_fooSub_status (void);
-
-    virtual ::Hello::CCM_Base_obj_ptr
-    get_baseFacet (void);
-
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete (void);
-
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-  private:
-    ::Hello::CCM_DerivedEmpty_comp_Context_var ciao_context_;
-    ::Foo_conn::CCM_Listener_var ciao_fooSub_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_fooSub_status_;
-    CORBA::Short baseAttr_;
-    CORBA::ULongLong derivedAttr_;
-  };
-
-  extern "C" HELLO_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Hello_DerivedEmpty_comp_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/HomeDerived/descriptors/DeploymentPlan.cdp b/CIAO/connectors/dds4ccm/tests/HomeDerived/descriptors/DeploymentPlan.cdp
deleted file mode 100644
index 563002a03d0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/HomeDerived/descriptors/DeploymentPlan.cdp
+++ /dev/null
@@ -1,753 +0,0 @@
-<!--  -->
-<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>Hello_Depl_1</label>
-  <UUID>Hello_Depl_1</UUID>
-
-  <implementation xmi:id="DerivedEmpty_compComponentImplementation">
-    <name>DerivedEmpty_compComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="DerivedEmpty_comp_ExecArtifact" />
-    <artifact xmi:idref="DerivedEmpty_comp_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_DerivedEmpty_comp_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_DerivedEmpty_comp_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DerivedEmpty_comp_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DerivedEmpty_comp_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Foo_ConnectorComponentImplementation">
-    <name>Foo_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Foo_Connector_ExecArtifact" />
-    <artifact xmi:idref="Foo_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Foo_conn_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Foo_conn_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Foo_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Foo_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Bar_ConnectorComponentImplementation">
-    <name>Bar_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Bar_Connector_ExecArtifact" />
-    <artifact xmi:idref="Bar_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Bar_conn_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Bar_conn_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Bar_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Bar_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-
-  <implementation xmi:id="Base_compHomeComponentImplementation">
-    <name>Base_compHomeComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Base_compHome_ExecArtifact" />
-    <artifact xmi:idref="Base_compHome_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>home factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_Base_compHome_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_Base_compHome_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Base_compHome_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Base_compHome_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Base_compComponentImplementation">
-    <name>Base_compComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Base_compHome_ExecArtifact" />
-    <artifact xmi:idref="Base_compHome_SvntArtifact" />
-    <execParameter>
-      <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>edu.vanderbilt.dre.CCM.HomedComponent</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Derived_compHomeComponentImplementation">
-    <name>Derived_compHomeComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Derived_compHome_ExecArtifact" />
-    <artifact xmi:idref="Derived_compHome_SvntArtifact" />
-    <execParameter>
-      <name>home factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_Derived_compHome_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_Derived_compHome_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Derived_compHome_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Derived_compHome_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Derived_compComponentImplementation">
-    <name>Derived_compComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Derived_compHome_ExecArtifact" />
-    <artifact xmi:idref="Derived_compHome_SvntArtifact" />
-    <execParameter>
-      <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>edu.vanderbilt.dre.CCM.HomedComponent</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-
-  <instance xmi:id="Foo_Connector_1_ComponentInstance">
-    <name>Foo_Connector_1_Component</name>
-    <node>Node1</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Foo_ConnectorComponentImplementation" />
-     <configProperty>
-      <name>domain_id</name>
-      <value>
-        <type>
-          <kind>tk_long</kind>
-        </type>
-        <value>
-          <long>9</long>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Foo_Connector_2_ComponentInstance">
-    <name>Foo_Connector_2_Component</name>
-    <node>Node1</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Foo_ConnectorComponentImplementation" />
-     <configProperty>
-      <name>domain_id</name>
-      <value>
-        <type>
-          <kind>tk_long</kind>
-        </type>
-        <value>
-          <long>9</long>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Bar_Connector_1_ComponentInstance">
-    <name>Bar_Connector_1_Component</name>
-    <node>Node1</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Bar_ConnectorComponentImplementation" />
-     <configProperty>
-      <name>domain_id</name>
-      <value>
-        <type>
-          <kind>tk_long</kind>
-        </type>
-        <value>
-          <long>99</long>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Bar_Connector_2_ComponentInstance">
-    <name>Bar_Connector_2_Component</name>
-    <node>Node1</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Bar_ConnectorComponentImplementation" />
-     <configProperty>
-      <name>domain_id</name>
-      <value>
-        <type>
-          <kind>tk_long</kind>
-        </type>
-        <value>
-          <long>99</long>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Derived_comp_1_ComponentInstance">
-    <name>Derived_comp_1_Component</name>
-    <node>Node1</node>
-    <source/>
-    <implementation xmi:idref="Derived_compComponentImplementation" />
-    <configProperty>
-      <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Derived_compHome_1_Component</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Derived_comp_2_ComponentInstance">
-    <name>Derived_comp_2_Component</name>
-    <node>Node1</node>
-    <source/>
-    <implementation xmi:idref="Derived_compComponentImplementation" />
-    <configProperty>
-      <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Derived_compHome_2_Component</string>
-        </value>
-      </value>
-    </configProperty>
- </instance>
-
- <instance xmi:id="Derived_compHome_1_ComponentInstance">
-    <name>Derived_compHome_1_Component</name>
-    <node>Node1</node>
-    <source/>
-    <implementation xmi:idref="Derived_compHomeComponentImplementation" />
-  </instance>
-
- <instance xmi:id="Derived_compHome_2_ComponentInstance">
-    <name>Derived_compHome_2_Component</name>
-    <node>Node1</node>
-    <source/>
-    <implementation xmi:idref="Derived_compHomeComponentImplementation" />
-  </instance>
-
-  <instance xmi:id="DerivedEmpty_compComponentInstance">
-    <name>DerivedEmpty_compComponent</name>
-    <node>Node1</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="DerivedEmpty_compComponentImplementation" />
-  </instance>
-
-
-  <connection>
-    <name>writer_1_foo_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>fooPub_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Derived_comp_1_ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Foo_Connector_1_ComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_2_foo_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>fooPub_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Derived_comp_2_ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Foo_Connector_2_ComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_1_bar_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>barPub_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Derived_comp_1_ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Bar_Connector_1_ComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_2_bar_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>barPub_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Derived_comp_2_ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Bar_Connector_2_ComponentInstance" />
-    </internalEndpoint>
-   </connection>
-
-   <connection>
-   <name>MessageConnection1</name>
-    <internalEndpoint>
-      <portName>baseRecept</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Derived_comp_1_ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>baseFacet</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Derived_comp_2_ComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-   <name>MessageConnection2</name>
-    <internalEndpoint>
-      <portName>baseRecept</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Derived_comp_2_ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>baseFacet</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Derived_comp_1_ComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-   <name>MessageConnectionDerived1</name>
-    <internalEndpoint>
-      <portName>derivedRecept</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Derived_comp_1_ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>derivedFacet</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Derived_comp_2_ComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-   <name>MessageConnectionDerived2</name>
-    <internalEndpoint>
-      <portName>derivedRecept</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Derived_comp_2_ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>derivedFacet</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Derived_comp_1_ComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-
-  <artifact xmi:id="Base_compHome_ExecArtifact">
-    <name>Base_compHome_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Base_compHome_SvntArtifact">
-    <name>Base_compHome_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Base_compHome_StubArtifact">
-    <name>Base_compHome_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-
-
-  <artifact xmi:id="Derived_compHome_ExecArtifact">
-    <name>Derived_compHome_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Derived_compHome_SvntArtifact">
-    <name>Derived_compHome_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Derived_compHome_StubArtifact">
-    <name>Derived_compHome_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-
-
-
-  <artifact xmi:id="Foo_Connector_ExecArtifact">
-    <name>Foo_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>Home_Hello_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Foo_Connector_SvntArtifact">
-    <name>Foo_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>Home_Hello_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Foo_Connector_StubArtifact">
-    <name>Foo_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>Home_Hello_Connector_stub</location>
-  </artifact>
-
-  <artifact xmi:id="Bar_Connector_ExecArtifact">
-    <name>Bar_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>Home_Hello_Connector2_exec</location>
-  </artifact>
-  <artifact xmi:id="Bar_Connector_SvntArtifact">
-    <name>Bar_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>Home_Hello_Connector2_svnt</location>
-  </artifact>
-  <artifact xmi:id="Bar_Connector_StubArtifact">
-    <name>Bar_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>Home_Hello_Connector2_stub</location>
-  </artifact>
-
-
-
-  <artifact xmi:id="DerivedEmpty_comp_ExecArtifact">
-    <name>DerivedEmpty_comp_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="DerivedEmpty_comp_SvntArtifact">
-    <name>DerivedEmpty_comp_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="DerivedEmpty_comp_StubArtifact">
-    <name>DerivedEmpty_comp_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-
-   <localityConstraint>
-    <constraint>DifferentProcess</constraint>
-    <constrainedInstance xmi:idref="Derived_comp_1_ComponentInstance" />
-    <constrainedInstance xmi:idref="Derived_comp_2_ComponentInstance" />
-  </localityConstraint>
-
-  <localityConstraint>
-    <constraint>SameProcess</constraint>
-    <constrainedInstance xmi:idref="Derived_comp_1_ComponentInstance" />
-    <constrainedInstance xmi:idref="Foo_Connector_1_ComponentInstance" />
-    <constrainedInstance xmi:idref="Bar_Connector_1_ComponentInstance" />
-    <constrainedInstance xmi:idref="Derived_compHome_1_ComponentInstance" />
-  </localityConstraint>
-
-  <localityConstraint>
-    <constraint>SameProcess</constraint>
-    <constrainedInstance xmi:idref="Derived_comp_2_ComponentInstance" />
-    <constrainedInstance xmi:idref="Foo_Connector_2_ComponentInstance" />
-    <constrainedInstance xmi:idref="Bar_Connector_2_ComponentInstance" />
-    <constrainedInstance xmi:idref="Derived_compHome_2_ComponentInstance" />
-  </localityConstraint>
-
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/HomeDerived/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/HomeDerived/descriptors/run_test.pl
deleted file mode 100755
index 5e41171ee32..00000000000
--- a/CIAO/connectors/dds4ccm/tests/HomeDerived/descriptors/run_test.pl
+++ /dev/null
@@ -1,250 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-$DDS4CCM_TRACE_ENABLE = "$ENV{'DDS4CCM_TRACE_ENABLE'}";
-
-#$ENV{'DANCE_LOG_LEVEL'}=10;
-#$ENV{'CIAO_LOG_LEVEL'}=10;
-#$ENV{'DANCE_TRACE_ENABLE'}=1;
-#$ENV{'CIAO_TRACE_ENABLE'}=1;
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "Node1.ior", "Node2.ior" );
-@iorfiles = 0;
-@nodenames = ( "Node1", "Node2" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "DeploymentPlan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 10 seconds to allow task to complete\n";
-sleep (10);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/Base/HomeT_Base.idl b/CIAO/connectors/dds4ccm/tests/HomeTest/Base/HomeT_Base.idl
deleted file mode 100644
index ce6bd87d89a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/HomeTest/Base/HomeT_Base.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file HomeT_Base.idl
- * @author  Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef HOMET_BASE_IDL
-#define HOMET_BASE_IDL
-
-#pragma ndds typesupport "Base/HomeT_BaseSupport.h"
-#pragma opendds typesupport "Base/HomeT_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "HomeTest"
-
-struct HomeTest {
-  string hello;
-  short iterator;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<HomeTest> HomeTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/Base/HomeT_Base.mpc b/CIAO/connectors/dds4ccm/tests/HomeTest/Base/HomeT_Base.mpc
deleted file mode 100644
index 5c0feebd8a5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/HomeTest/Base/HomeT_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (HomeT_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname =HomeT_Base_stub
-  dynamicflags += HOMET_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=HOMET_BASE_STUB_Export \
-              -Wb,stub_export_include=HomeT_Base_stub_export.h              
-
-  IDL_Files {
-    idlflags += -Gxhst
-    HomeT_Base.idl
-  }
-
-  opendds_ts_flags += --export=HOMET_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    HomeT_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.idl b/CIAO/connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.idl
deleted file mode 100644
index a79e1fbba8c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file HomeT_Connector.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef HOMET_CONNECTOR_IDL_
-#define HOMET_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/HomeT_Base.idl"
-
-#pragma ciao lem "Connector/HomeT_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/HomeT_BaseTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::HomeTest, ::HomeTestSeq> ConnComp;
-
-#endif /* HOMET_CONNECTOR_IDL_ */
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.mpc b/CIAO/connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.mpc
deleted file mode 100644
index 55fe9a1a65d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.mpc
+++ /dev/null
@@ -1,150 +0,0 @@
-project(HomeT_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after  += DDS4CCM_idl_gen HomeT_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=HOMET_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=HomeT_Connector_stub_export.h \
-              -Wb,skel_export_macro=HOMET_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=HomeT_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=HOMET_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=HomeT_Connector_svnt_export.h \
-              -Wb,conn_export_macro=HOMET_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=HomeT_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    HomeT_Connector.idl
-  }
-}
-
-project(HomeT_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += HomeT_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=HOMET_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=HomeT_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    HomeT_ConnectorE.idl
-  }
-}
-
-project(HomeT_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after  += HomeT_Connector_lem_gen \
-            HomeT_Connector_stub \
-            HomeT_Base_stub
-  libs   += HomeT_Base_stub \
-            HomeT_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = HomeT_Connector_lem_stub
-  dynamicflags += HOMET_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    HomeT_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    HomeT_ConnectorEC.h
-    HomeT_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    HomeT_ConnectorEC.inl
-  }
-}
-
-project(HomeT_Connector_stub) : ccm_stub, dds4ccm_base {
-  after  += HomeT_Connector_idl_gen HomeT_Base_stub
-  libs   += HomeT_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = HomeT_Connector_stub
-  dynamicflags += HOMET_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    HomeT_ConnectorC.cpp
-  }
-
-  Header_Files {
-    HomeT_ConnectorC.h
-    HomeT_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    HomeT_ConnectorC.inl
-  }
-}
-
-project(HomeT_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after  += HomeT_Connector_lem_stub \
-            HomeT_Connector_stub \
-            HomeT_Base_stub
-  sharedname = HomeT_Connector_exec
-  libs += HomeT_Connector_stub \
-          HomeT_Connector_lem_stub \
-          HomeT_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += HOMET_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-   HomeT_Connector_conn.cpp
-  }
-
-  Header_Files {
-    HomeT_Connector_conn.h
-    HomeT_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(HomeT_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += HomeT_Connector_lem_stub \
-                HomeT_Connector_exec \
-                HomeT_Connector_stub
-  sharedname  = HomeT_Connector_svnt
-  libs       += HomeT_Connector_stub \
-                HomeT_Connector_lem_stub  \
-                HomeT_Base_stub \
-                HomeT_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += HOMET_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    HomeT_ConnectorS.cpp
-    HomeT_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    HomeT_ConnectorS.h
-    HomeT_Connector_svnt.h
-    HomeT_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-    HomeT_ConnectorS.inl
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_Home.mpc b/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_Home.mpc
deleted file mode 100644
index 2d7c73d6b01..00000000000
--- a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_Home.mpc
+++ /dev/null
@@ -1,167 +0,0 @@
-project(HomeT_HomeC_idl_gen): componentidldefaults, dds4ccm {
-  custom_only = 1
-  after = HomeT_Base_stub HomeT_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=HOMET_HOMEC_STUB_Export \
-              -Wb,stub_export_include=HomeT_HomeC_stub_export.h \
-              -Wb,skel_export_macro=HOMET_HOMEC_SVNT_Export \
-              -Wb,skel_export_include=HomeT_HomeC_svnt_export.h \
-              -Wb,exec_export_macro=HOMET_HOMEC_EXEC_Export \
-              -Wb,exec_export_include=HomeT_HomeC_exec_export.h \
-              -I..
-
-  IDL_Files {
-    HomeT_HomeC.idl
-  }
-}
-
-project(HomeT_HomeC_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += HomeT_HomeC_idl_gen
-  custom_only = 1
-
-  idlflags  +=  -Wb,export_macro=HOMET_HOMEC_LEM_STUB_Export \
-                -Wb,export_include=HomeT_HomeC_lem_stub_export.h \
-                -SS -Gxhst \
-                -I $CIAO_ROOT/connectors -I..
-
-  IDL_Files {
-    HomeT_HomeCE.idl
-  }
-}
-project(HomeT_HomeC_lem_stub) : ccm_svnt, dds4ccm_base {
-  after  += HomeT_HomeC_lem_gen HomeT_HomeC_stub HomeT_Base_stub \
-            HomeT_Connector_stub
-  libs   += HomeT_Base_stub HomeT_HomeC_stub HomeT_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = HomeT_HomeC_lem_stub
-  dynamicflags += HOMET_HOMEC_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    HomeT_HomeCEC.cpp
-  }
-
-  Header_Files {
-    HomeT_HomeCEC.h
-    HomeT_HomeC_lem_stub_export.h
-  }
-
-  Inline_Files {
-    HomeT_HomeCEC.inl
-  }
-}
-project(HomeT_HomeC_stub): ccm_stub,  dds4ccm_base {
- after += HomeT_Base_stub HomeT_HomeC_idl_gen HomeT_Connector_stub
-  sharedname = HomeT_HomeC_stub
-  libs   += HomeT_Base_stub HomeT_Connector_stub
-  includes += ..
-  libpaths += ..
-  libout = ../lib
-  libpaths += ../lib
-  dynamicflags += HOMET_HOMEC_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Header_Files {
-    HomeT_HomeCC.h
-    HomeT_HomeC_stub_export.h
-  }
-
-  Source_Files {
-    HomeT_HomeCC.cpp
-  }
-
-  Inline_Files {
-  }
-}
-
-project(HomeT_HomeC_exec) : ciao_executor, dds4ccm_lem_stub, dds4ccm_impl {
-  after      += HomeT_HomeC_lem_stub HomeT_HomeC_stub HomeT_Connector_lem_stub \
-                HomeT_Connector_stub HomeT_Connector_exec
-  sharedname = HomeT_HomeC_exec
-  libs       += HomeT_HomeC_stub \
-                HomeT_HomeC_lem_stub \
-                HomeT_Base_stub \
-                HomeT_Connector_lem_stub \
-                HomeT_Connector_stub \
-                HomeT_Connector_exec
-  includes += . ..
-  libout = ../lib
-  libpaths += ../lib
-
-  dynamicflags += HOMET_HOMEC_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Header_Files {
-    HomeT_HomeC_exec.h
-    HomeT_HomeC_exec_export.h
-  }
-
-  Source_Files {
-    HomeT_HomeC_exec.cpp
-  }
-
-  Inline_Files {
-  }
-}
- 
-project(HomeT_HomeC_svnt) : ciao_servant, dds4ccm_base {
-  after += HomeT_Base_svnt HomeT_HomeC_exec HomeT_Connector_svnt
-  includes += ..
-  sharedname = HomeT_HomeC_svnt
-
-  libs    += HomeT_HomeC_stub HomeT_HomeC_lem_stub HomeT_HomeC_exec
-  libs    += HomeT_Base_stub \
-             HomeT_Connector_stub \
-             HomeT_Connector_exec \
-             HomeT_Connector_svnt \
-             HomeT_Connector_lem_stub
-  
-  dynamicflags += HOMET_HOMEC_SVNT_BUILD_DLL
-  libout = ../lib
-  libpaths += ../lib
-
-  IDL_Files {
-  }
-
-  Header_Files {
-   HomeT_HomeCS.h
-   HomeT_HomeC_svnt.h
-   HomeT_HomeC_svnt_export.h
-  }
-
-  Source_Files {
-    HomeT_HomeCS.cpp
-    HomeT_HomeC_svnt.cpp
-  }
-}
-
-project (HomeT_HomeC_control) : ccm_stub, dds4ccm_base{
- after += HomeT_HomeC_svnt
-  exename = controller
-  libs += HomeT_HomeC_stub HomeT_Base_stub HomeT_Connector_stub
-  includes += ..
-  libout = ../lib
-  libpaths += ../lib
-
-  IDL_Files {
-  }
-
-  Header_Files {
-  }
-
-  Source_Files {
-    controller.cpp
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC.idl b/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC.idl
deleted file mode 100644
index d67b61385cd..00000000000
--- a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @file HomeT_HomeC.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef HOMET_HOMEC_IDL_
-#define HOMET_HOMEC_IDL_
-
-#include <Components.idl>
-#include "Connector/HomeT_Connector.idl"
-
-home ConnHome manages ConnComp::DDS_Event
-{
-  factory new_ConnComp ();
-};
-
-#endif /* HOMET_HOMEC_IDL_ */
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.cpp b/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.cpp
deleted file mode 100644
index b9026cd86b6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.6
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "HomeT_HomeC_exec.h"
-#include "../Connector/HomeT_Connector_conn.h"
-
-namespace CIAO_ConnComp_DDS_Event_Impl
-{
-  /**
-   * Home Executor Implementation Class: ConnHome_exec_i
-   */
-
-  ConnHome_exec_i::ConnHome_exec_i (void)
-  {
-  }
-
-  ConnHome_exec_i::~ConnHome_exec_i (void)
-  {
-  }
-
-  ::Components::EnterpriseComponent_ptr
-  ConnHome_exec_i::new_ConnComp (void)
-  {
-    /* Your code here. */
-    ACE_DEBUG ((LM_DEBUG, "ConnHome_exec_i::new_ConnComp: create connector.\n"));
-
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_THROW_EX (
-      retval,
-      CIAO_ConnComp_DDS_Event_Impl::DDS_Event_exec_i,
-      ::CORBA::NO_MEMORY ());
-
-    return retval;
-  }
-
-  // Implicit operations.
-
-  ::Components::EnterpriseComponent_ptr
-  ConnHome_exec_i::create (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_THROW_EX (
-      retval,
-      CIAO_ConnComp_DDS_Event_Impl::DDS_Event_exec_i,
-      ::CORBA::NO_MEMORY ());
-
-    return retval;
-  }
-
-  extern "C" HOMET_HOMEC_EXEC_Export ::Components::HomeExecutorBase_ptr
-  create_ConnHome_Impl (void)
-  {
-    ::Components::HomeExecutorBase_ptr retval =
-      ::Components::HomeExecutorBase::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      ConnHome_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.h b/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.h
deleted file mode 100644
index 1a2c2fb5ec7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.6
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_HOMET_HOMEC_EXEC_P2A1KH_H_
-#define CIAO_HOMET_HOMEC_EXEC_P2A1KH_H_
-
-#include /**/ "ace/pre.h"
-
-#include "HomeT_HomeCEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "HomeT_HomeC_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_ConnComp_DDS_Event_Impl
-{
-  class HOMET_HOMEC_EXEC_Export ConnHome_exec_i
-    : public virtual ConnHome_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnHome_exec_i (void);
-
-    virtual ~ConnHome_exec_i (void);
-
-    virtual ::Components::EnterpriseComponent_ptr
-    new_ConnComp (void);
-
-    // Implicit operations.
-
-    virtual ::Components::EnterpriseComponent_ptr
-    create (void);
-  };
-
-  extern "C" HOMET_HOMEC_EXEC_Export ::Components::HomeExecutorBase_ptr
-  create_ConnHome_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/controller.cpp b/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/controller.cpp
deleted file mode 100644
index 3ca362ae9b3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/controller.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-//==============================================================
-/**
- * @file controller.cpp
- *
- * This is a controller that interact with the Home-component implementation.
- * This test uses the explicit factory
- * operation in the home interface to create a connector component
- * instance, run it for a while, and destroy the component instance.
- */
-//==============================================================
-
-#include "HomeT_HomeCC.h"
-#include "Connector/HomeT_ConnectorEC.h"
-#include "ace/streams.h"
-#include "ace/OS_NS_unistd.h"
-#include "ace/Get_Opt.h"
-
-const ACE_TCHAR *home_comp_ior_ = 0;
-
-int
-parse_args (int argc, ACE_TCHAR *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:of"));
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    {
-      switch (c)
-        {
-        case 'o':
-           break;
-        case 'f':
-           break;
-        case 'k':
-         home_comp_ior_ = get_opts.opt_arg ();
-          break;
-        case '?':  // display help for use of the server.
-        default:
-          ACE_ERROR_RETURN ((LM_ERROR,
-                            "usage:  %s\n"
-                             "-k <HomeComponent IOR> (default is file://HomeC.ior)\n"
-                             "\n",
-                            argv [0]),
-                            -1);
-          break;
-        }
-    }
-
-  if (home_comp_ior_ == 0)
-    {
-      home_comp_ior_ = ACE_TEXT("file://HomeC.ior");
-    }
-
-  return 0;
-}
-
-
-int
-ACE_TMAIN (int argc, ACE_TCHAR *argv[])
-{
-  try
-    {
-      // Initialize orb
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
-
-      if (parse_args (argc, argv) != 0)
-         {
-           return -1;
-         }
-
-      // Resolve Home interface
-      CORBA::Object_var obj
-        = orb->string_to_object (home_comp_ior_);
-
-      ConnHome_var home_comp
-        = ConnHome::_narrow (obj.in ());
-      if (CORBA::is_nil (home_comp.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR, "Unable to acquire ConnHome objref\n"), -1);
-
-      // starting Connector component
-      ACE_DEBUG ((LM_DEBUG, "Controller: Start create Connector component\n"));
-
-      CORBA::Object_var tmp  = home_comp->new_ConnComp ();
-      ConnComp::DDS_Event_var ce = ConnComp::DDS_Event::_narrow (tmp.in ());
-
-      if (CORBA::is_nil (ce.in ()))
-        ACE_ERROR((LM_ERROR, "Unable to start create Connector component\n"));
-
-      ACE_DEBUG ((LM_DEBUG, "Controller: Started Connector component\n"));
-
-      // Place to plug in some connector settings
-      ce->topic_name ("Shapes");
-      ce->configuration_complete();
-      // activate not possible
-      //ce->ccm_activate ();
-
-      ACE_OS::sleep (5);
-
-      ce->remove ();
-
-      ACE_DEBUG ((LM_DEBUG, "Controller: removed Connector component\n"));
-
-      orb->destroy ();
-    }
-  catch (const CORBA::Exception& ex)
-    {
-      ex._tao_print_exception ("Exception\n");
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "Uncaught CORBA exception\n"),
-                        1);
-    }
-
-  return 0;
-}
diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/descriptors/DeploymentPlanConnOnly.cdp b/CIAO/connectors/dds4ccm/tests/HomeTest/descriptors/DeploymentPlanConnOnly.cdp
deleted file mode 100644
index d3bfa3fced4..00000000000
--- a/CIAO/connectors/dds4ccm/tests/HomeTest/descriptors/DeploymentPlanConnOnly.cdp
+++ /dev/null
@@ -1,110 +0,0 @@
-<!--  -->
-<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>Hello_Depl_1</label>
-  <UUID>Hello_Depl_1</UUID>
-
-  <implementation xmi:id="HomeTest_HomeImplementation">
-    <name>HomeTest_HomeImplementation</name>
-    <source/>
-    <artifact xmi:idref="HomeTest_Home_ExecArtifact" />
-    <artifact xmi:idref="HomeTest_Home_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>home factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_ConnHome_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_ConnHome_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>HomeT_HomeC_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>HomeT_HomeC_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
- <instance xmi:id="HomeTest_HomeInstance">
-    <name>HomeTest_HomeInstance</name>
-    <node>ReceiverNode</node>
-    <source/>
-    <implementation xmi:idref="HomeTest_HomeImplementation" />
-   <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>HomeC.ior</string>
-        </value>
-      </value>
-    </configProperty>
-     <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>HomeC</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-   <artifact xmi:id="HomeTest_Home_ExecArtifact">
-    <name>HomeT_HomeC_exec</name>
-    <source/>
-    <node/>
-    <location>HomeT_HomeC_exec</location>
-  </artifact>
-  <artifact xmi:id="HomeTest_Home_SvntArtifact">
-    <name>HomeT_HomeC_svnt</name>
-    <source/>
-    <node/>
-    <location>HomeT_HomeC_svnt</location>
-  </artifact>
-    <artifact xmi:id="HomeTest_Home_StubArtifact">
-    <name>HomeT_HomeC_stub</name>
-    <source/>
-    <node/>
-    <location>HomeT_HomeC_stub</location>
-  </artifact>
-
- </Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/HomeTest/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index 231c89482ad..00000000000
--- a/CIAO/connectors/dds4ccm/tests/HomeTest/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-Description
-XML QoS Profile
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="HelloTest_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="HelloProfile" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-       </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-
-    </qos_profile>
-  </qos_library>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/HomeTest/descriptors/run_test.pl
deleted file mode 100755
index 7efe33a5316..00000000000
--- a/CIAO/connectors/dds4ccm/tests/HomeTest/descriptors/run_test.pl
+++ /dev/null
@@ -1,267 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-$DDS4CCM_TRACE_ENABLE = "$ENV{'DDS4CCM_TRACE_ENABLE'}";
-
-
-$ENV{'DANCE_LOG_LEVEL'}=0;
-$ENV{'CIAO_LOG_LEVEL'}=0;
-$ENV{'DANCE_TRACE_ENABLE'}=0;
-$ENV{'CIAO_TRACE_ENABLE'}=0;
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 1;
-@ports = ( 60001 );
-@iorbases = ( "HomeC.ior" );
-@iorfiles = 0;
-@nodenames = ("ReceiverNode");
-
-$controller_exec = "$CIAO_ROOT/connectors/dds4ccm/tests/HomeTest/HomeComp/controller";
-
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "DeploymentPlanConnOnly.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 5 seconds to allow task to complete\n";
-sleep (5);
-print "Invoking the controller\n";
-$controller = $tg_executor->CreateProcess ("$controller_exec", "-k file://HomeC.ior -o");
-$result = $controller->SpawnWaitKill ($tg_executor->ProcessStopWaitInterval ());
-if ($result != 0) {
-    print STDERR "ERROR: The controller returned $result\n";
-    $status = 1;
-}
-
-# put some delay here.
-print "Sleeping 10 seconds to allow task to complete\n";
-sleep (5);
-
-
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.idl
deleted file mode 100644
index 4fbc838ea63..00000000000
--- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file IDL_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef IDL_TEST_BASE_IDL
-#define IDL_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/IDL_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/IDL_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "IDL_Test"
-#pragma DCPS_DATA_KEY "IDL_Test key"
-
-struct IDL_Test {
-  string key; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<IDL_Test> IDL_TestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.mpc
deleted file mode 100644
index fcc12c2898c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (IDL_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = IDL_Test_Base_stub
-  dynamicflags += IDL_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=IDL_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=IDL_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    IDL_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=IDL_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    IDL_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.idl b/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.idl
deleted file mode 100644
index c8806788e3e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.idl
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef IDL_TEST_INTERFACES_IDL
-#define IDL_TEST_INTERFACES_IDL
-
-#pragma ciao lem "Base/IDL_Test_InterfacesE.idl"
-
-interface idl_test_base_interface {
-  void do_something_base ();
-  readonly attribute string base_string_attr;
-};
-
-interface idl_test_derived_interface : idl_test_base_interface {
-  void do_something_derived ();
-  attribute string derived_string_attr;
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.mpc b/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.mpc
deleted file mode 100644
index 30886127db2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.mpc
+++ /dev/null
@@ -1,105 +0,0 @@
-// This file is generated with "generate_component_mpc.pl IDL_Test_Interfaces"
-
-project(IDL_Test_Interfaces_idl_gen) : componentidldefaults {
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=IDL_TEST_INTERFACES_STUB_Export \
-              -Wb,stub_export_include=IDL_Test_Interfaces_stub_export.h \
-              -Wb,skel_export_macro=IDL_TEST_INTERFACES_SVNT_Export \
-              -Wb,skel_export_include=IDL_Test_Interfaces_svnt_export.h \
-              -Wb,exec_export_macro=IDL_TEST_INTERFACES_EXEC_Export \
-              -Wb,exec_export_include=IDL_Test_Interfaces_exec_export.h
-
-  IDL_Files {
-    IDL_Test_Interfaces.idl
-  }
-}
-
-project(IDL_Test_Interfaces_lem_gen) : ciaoidldefaults {
-  after += IDL_Test_Interfaces_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=IDL_TEST_INTERFACES_LEM_STUB_Export \
-              -Wb,stub_export_include=IDL_Test_Interfaces_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    IDL_Test_InterfacesE.idl
-  }
-}
-
-project(IDL_Test_Interfaces_lem_stub) : ccm_svnt   {
-  after +=  IDL_Test_Interfaces_lem_gen \
-            IDL_Test_Interfaces_stub
-  libs  +=  IDL_Test_Interfaces_stub
-  libout = ../lib
-  libpaths += ../lib
-
-  sharedname = IDL_Test_Interfaces_lem_stub
-  dynamicflags += IDL_TEST_INTERFACES_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    IDL_Test_InterfacesEC.cpp
-  }
-
-  Header_Files {
-    IDL_Test_InterfacesEC.h
-    IDL_Test_Interfaces_lem_stub_export.h
-  }
-
-  Inline_Files {
-    IDL_Test_InterfacesEC.inl
-  }
-}
-
-project(IDL_Test_Interfaces_stub) : ccm_stub   {
-  after += IDL_Test_Interfaces_idl_gen
-  libs  +=
-  libout = ../lib
-  libpaths += ../lib
-
-  sharedname = IDL_Test_Interfaces_stub
-  dynamicflags += IDL_TEST_INTERFACES_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    IDL_Test_InterfacesC.cpp
-  }
-
-  Header_Files {
-    IDL_Test_InterfacesC.h
-    IDL_Test_Interfaces_stub_export.h
-  }
-
-  Inline_Files {
-    IDL_Test_InterfacesC.inl
-  }
-}
-
-project(IDL_Test_Interfaces_svnt) : ccm_svnt {
-  after += IDL_Test_Interfaces_idl_gen IDL_Test_Interfaces_stub
-  libs  += IDL_Test_Interfaces_stub
-  libout = ../lib
-  libpaths += ../lib
-
-  sharedname = IDL_Test_Interfaces_svnt
-  dynamicflags += IDL_TEST_INTERFACES_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    IDL_Test_InterfacesS.cpp
-  }
-
-  Header_Files {
-    IDL_Test_InterfacesS.h
-    IDL_Test_Interfaces_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.idl b/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.idl
deleted file mode 100644
index fe8ba84ad89..00000000000
--- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.idl
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef BASE_COMPONENT_IDL
-#define BASE_COMPONENT_IDL
-
-#include "Connector/IDL_Test_Connector.idl"
-#include "Base/IDL_Test_Interfaces.idl"
-
-#pragma ciao lem "IDL_Test_Base_ComponentE.idl"
-// #pragma ciao lem "Base/IDL_Test_BaseE.idl"
-
-component IDL_Test_Base_Component
-{
-  port IDL_Connector::DDS_Update  info_base_update;
-  port IDL_Connector::DDS_Read    info_base_read;
-  port IDL_Connector::DDS_Get     info_base_get;
-  port IDL_Connector::DDS_Listen  info_base_listen;
-  port IDL_Connector::DDS_StateListen info_base_state_listen;
-  port IDL_Connector::DDS_Write   info_base_write;
-
-  provides CCM_DDS::ConnectorStatusListener base_status_listener;
-
-  attribute long base_attr;
-
-  uses idl_test_derived_interface uses_derived_interface;
-  provides idl_test_base_interface prov_base_interface;
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.mpc b/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.mpc
deleted file mode 100644
index 60f17b07315..00000000000
--- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.mpc
+++ /dev/null
@@ -1,175 +0,0 @@
-project(IDL_Test_Base_Component_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += IDL_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=BASE_COMPONENT_STUB_Export \
-              -Wb,stub_export_include=Base_Component_stub_export.h \
-              -Wb,skel_export_macro=BASE_COMPONENT_SVNT_Export \
-              -Wb,skel_export_include=Base_Component_svnt_export.h \
-              -Wb,svnt_export_macro=BASE_COMPONENT_SVNT_Export \
-              -Wb,svnt_export_include=Base_Component_svnt_export.h \
-              -Wb,exec_export_macro=BASE_COMPONENT_EXEC_Export \
-              -Wb,exec_export_include=Base_Component_exec_export.h \
-              -I.. -Gex
-
-  IDL_Files {
-    IDL_Test_Base_Component.idl
-  }
-}
-
-project(IDL_Test_Base_Component_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += IDL_Test_Base_Component_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=BASE_COMPONENT_LEM_STUB_Export \
-              -Wb,stub_export_include=Base_Component_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    IDL_Test_Base_ComponentE.idl
-  }
-}
-
-project(IDL_Test_Base_Component_lem_stub) : ccm_svnt, dds4ccm_base {
-  after +=  IDL_Test_Base_Component_lem_gen \
-            IDL_Test_Base_Component_stub  \
-            IDL_Test_Connector_stub \
-            IDL_Test_Interfaces_stub \
-            IDL_Test_Interfaces_lem_stub
-  libs  +=  Base_Component_stub \
-            IDL_Test_Connector_stub \
-            IDL_Test_Interfaces_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Base_Component_lem_stub
-  dynamicflags += BASE_COMPONENT_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    IDL_Test_Base_ComponentEC.cpp
-  }
-
-  Header_Files {
-    IDL_Test_Base_ComponentEC.h
-    Base_Component_lem_stub_export.h
-  }
-
-  Inline_Files {
-    IDL_Test_Base_ComponentEC.inl
-  }
-}
-
-project(IDL_Test_Base_Component_stub) : ccm_stub, dds4ccm_base {
-  after +=  IDL_Test_Base_Component_idl_gen  \
-            IDL_Test_Connector_stub \
-            IDL_Test_Base_stub \
-            IDL_Test_Connector_lem_gen
-  libs  +=  IDL_Test_Connector_stub \
-            IDL_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Base_Component_stub
-  dynamicflags += BASE_COMPONENT_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    IDL_Test_Base_ComponentC.cpp
-  }
-
-  Header_Files {
-    IDL_Test_Base_ComponentC.h
-    Base_Component_stub_export.h
-  }
-
-  Inline_Files {
-    IDL_Test_Base_ComponentC.inl
-  }
-}
-
-project(IDL_Test_Base_Component_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   +=  IDL_Test_Base_Component_lem_stub \
-              IDL_Test_Base_Component_stub \
-              IDL_Test_Base_stub \
-              IDL_Test_Connector_stub \
-              IDL_Test_Connector_lem_stub \
-              IDL_Test_Interfaces_stub \
-              IDL_Test_Interfaces_lem_stub
-  sharedname = Base_Component_exec
-  libs +=   Base_Component_stub \
-            Base_Component_lem_stub \
-            IDL_Test_Base_stub \
-            IDL_Test_Connector_stub \
-            IDL_Test_Connector_lem_stub \
-            IDL_Test_Interfaces_stub \
-            IDL_Test_Interfaces_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += BASE_COMPONENT_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    IDL_Test_Base_Component_exec.cpp
-  }
-
-  Header_Files {
-    IDL_Test_Base_Component_exec.h
-    Base_Component_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(IDL_Test_Base_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after +=  IDL_Test_Base_Component_lem_stub \
-            IDL_Test_Base_stub \
-            IDL_Test_Connector_stub \
-            IDL_Test_Connector_svnt \
-            IDL_Test_Base_Component_exec \
-            IDL_Test_Connector_lem_stub \
-            IDL_Test_Interfaces_svnt \
-            IDL_Test_Interfaces_lem_stub \
-            IDL_Test_Interfaces_stub
-  sharedname = Base_Component_svnt
-  libs +=   Base_Component_stub \
-            Base_Component_lem_stub \
-            IDL_Test_Base_stub \
-            IDL_Test_Connector_stub \
-            IDL_Test_Connector_svnt \
-            Base_Component_exec \
-            IDL_Test_Connector_lem_stub \
-            IDL_Test_Interfaces_svnt \
-            IDL_Test_Interfaces_lem_stub \
-            IDL_Test_Interfaces_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += BASE_COMPONENT_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    IDL_Test_Base_ComponentS.cpp
-    IDL_Test_Base_Component_svnt.cpp
-  }
-
-  Header_Files {
-    IDL_Test_Base_ComponentS.h
-    IDL_Test_Base_Component_svnt.h
-    Base_Component_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.idl b/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.idl
deleted file mode 100644
index b3d92882fb9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.idl
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DERIVED_COMPONENT_IDL
-#define DERIVED_COMPONENT_IDL
-
-#include "IDL_Test_Base_Component.idl"
-
-#pragma ciao lem "IDL_Test_Derived_ComponentE.idl"
-// #pragma ciao lem "Base/IDL_Test_BaseE.idl"
-
-component IDL_Test_Derived_Component : IDL_Test_Base_Component
-{
-  port IDL_Connector::DDS_Update  info_derived_update;
-  port IDL_Connector::DDS_Read    info_derived_read;
-  port IDL_Connector::DDS_Get     info_derived_get;
-  port IDL_Connector::DDS_Listen  info_derived_listen;
-  port IDL_Connector::DDS_StateListen info_derived_state_listen;
-  port IDL_Connector::DDS_Write   info_derived_write;
-
-  provides CCM_DDS::ConnectorStatusListener derived_status_listener;
-
-  attribute long derived_attr;
-
-  provides idl_test_derived_interface prov_derived_interface;
-  uses idl_test_base_interface uses_base_interface;
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.mpc b/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.mpc
deleted file mode 100644
index 8ed2357e068..00000000000
--- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.mpc
+++ /dev/null
@@ -1,194 +0,0 @@
-project(IDL_Test_Derived_Component_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += IDL_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=DERIVED_COMPONENT_STUB_Export \
-              -Wb,stub_export_include=Derived_Component_stub_export.h \
-              -Wb,skel_export_macro=DERIVED_COMPONENT_SVNT_Export \
-              -Wb,skel_export_include=Derived_Component_svnt_export.h \
-              -Wb,svnt_export_macro=DERIVED_COMPONENT_SVNT_Export \
-              -Wb,svnt_export_include=Derived_Component_svnt_export.h \
-              -Wb,exec_export_macro=DERIVED_COMPONENT_EXEC_Export \
-              -Wb,exec_export_include=Derived_Component_exec_export.h \
-              -I.. -Gex
-
-  IDL_Files {
-    IDL_Test_Derived_Component.idl
-  }
-}
-
-project(IDL_Test_Derived_Component_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += IDL_Test_Derived_Component_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=DERIVED_COMPONENT_LEM_STUB_Export \
-              -Wb,stub_export_include=Derived_Component_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    IDL_Test_Derived_ComponentE.idl
-  }
-}
-
-project(IDL_Test_Derived_Component_lem_stub) : ccm_svnt, dds4ccm_base {
-  after +=  IDL_Test_Derived_Component_lem_gen \
-            IDL_Test_Derived_Component_stub \
-            IDL_Test_Connector_stub \
-            IDL_Test_Base_stub \
-            IDL_Test_Interfaces_stub \
-            IDL_Test_Interfaces_lem_stub \
-            IDL_Test_Base_Component_lem_stub
-  libs  +=  Derived_Component_stub \
-            IDL_Test_Connector_stub \
-            IDL_Test_Base_stub \
-            IDL_Test_Interfaces_stub \
-            Base_Component_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Derived_Component_lem_stub
-  dynamicflags += DERIVED_COMPONENT_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    IDL_Test_Derived_ComponentEC.cpp
-  }
-
-  Header_Files {
-    IDL_Test_Derived_ComponentEC.h
-    Derived_Component_lem_stub_export.h
-  }
-
-  Inline_Files {
-    IDL_Test_Derived_ComponentEC.inl
-  }
-}
-
-project(IDL_Test_Derived_Component_stub) : ccm_stub, dds4ccm_base {
-  after +=  IDL_Test_Derived_Component_idl_gen \
-            IDL_Test_Connector_stub \
-            IDL_Test_Base_stub \
-            IDL_Test_Connector_lem_gen \
-            IDL_Test_Base_Component_stub \
-            IDL_Test_Base_Component_lem_stub
-  libs  +=  IDL_Test_Connector_stub \
-            IDL_Test_Base_stub \
-            Base_Component_stub \
-            Base_Component_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Derived_Component_stub
-  dynamicflags += DERIVED_COMPONENT_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    IDL_Test_Derived_ComponentC.cpp
-  }
-
-  Header_Files {
-    IDL_Test_Derived_ComponentC.h
-    Derived_Component_stub_export.h
-  }
-
-  Inline_Files {
-    IDL_Test_Derived_ComponentC.inl
-  }
-}
-
-project(IDL_Test_Derived_Component_exec) : ciao_executor, dds4ccm_lem_stub {
-  after +=  IDL_Test_Derived_Component_lem_stub \
-            IDL_Test_Derived_Component_stub \
-            IDL_Test_Base_stub \
-            IDL_Test_Connector_stub \
-            IDL_Test_Connector_lem_stub \
-            IDL_Test_Base_Component_exec \
-            IDL_Test_Base_Component_lem_stub \
-            IDL_Test_Interfaces_lem_stub \
-            IDL_Test_Interfaces_lem
-  sharedname = Derived_Component_exec
-  libs +=   Derived_Component_stub \
-            Derived_Component_lem_stub \
-            IDL_Test_Base_stub \
-            IDL_Test_Connector_stub \
-            IDL_Test_Connector_lem_stub \
-            Base_Component_exec \
-            Base_Component_lem_stub \
-            IDL_Test_Interfaces_lem_stub \
-            IDL_Test_Interfaces_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += DERIVED_COMPONENT_EXEC_BUILD_DLL BASE_COMPONENT_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    IDL_Test_Derived_Component_exec.cpp
-  }
-
-  Header_Files {
-    IDL_Test_Derived_Component_exec.h
-    Derived_Component_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(IDL_Test_Derived_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after +=  IDL_Test_Derived_Component_lem_stub \
-            IDL_Test_Base_stub \
-            IDL_Test_Connector_stub \
-            IDL_Test_Connector_svnt \
-            IDL_Test_Derived_Component_exec \
-            IDL_Test_Connector_lem_stub \
-            IDL_Test_Interfaces_stub \
-            IDL_Test_Interfaces_lem_stub \
-            IDL_Test_Interfaces_svnt \
-            IDL_Test_Base_Component_svnt \
-            IDL_Test_Base_Component_lem_stub \
-            IDL_Test_Base_Component_stub
-  sharedname = Derived_Component_svnt
-  libs  +=  Derived_Component_stub \
-            Derived_Component_lem_stub \
-            IDL_Test_Base_stub \
-            IDL_Test_Connector_stub \
-            IDL_Test_Connector_svnt \
-            Derived_Component_exec \
-            IDL_Test_Connector_lem_stub \
-            IDL_Test_Interfaces_stub \
-            IDL_Test_Interfaces_lem_stub \
-            IDL_Test_Interfaces_svnt \
-            Base_Component_svnt \
-            Base_Component_lem_stub \
-            Base_Component_stub
-
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += DERIVED_COMPONENT_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    IDL_Test_Derived_ComponentS.cpp
-    IDL_Test_Derived_Component_svnt.cpp
-  }
-
-  Header_Files {
-    IDL_Test_Derived_ComponentS.h
-    IDL_Test_Derived_Component_svnt.h
-    Derived_Component_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.idl
deleted file mode 100644
index 68b04ad6255..00000000000
--- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file IDL_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef IDL_TEST_CONNECTOR_IDL_
-#define IDL_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/IDL_Test_Base.idl"
-
-#pragma ciao lem "Connector/IDL_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/IDL_Test_BaseTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::IDL_Test, ::IDL_TestSeq> IDL_Connector;
-
-#endif /* IDL_Test_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.mpc
deleted file mode 100644
index fe9c859e55f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p IDL_Test_Base -l .. -o ../lib -u DDS IDL_Test_Connector"
-
-project(IDL_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen IDL_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=EVENT_MEMLEAKDETECTION_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=IDL_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=EVENT_MEMLEAKDETECTION_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=IDL_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=EVENT_MEMLEAKDETECTION_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=IDL_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=EVENT_MEMLEAKDETECTION_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=IDL_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    IDL_Test_Connector.idl
-  }
-}
-
-project(IDL_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += IDL_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=EVENT_MEMLEAKDETECTION_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=IDL_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    IDL_Test_ConnectorE.idl
-  }
-}
-
-project(IDL_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += IDL_Test_Connector_lem_gen IDL_Test_Connector_stub IDL_Test_Base_stub
-  libs  += IDL_Test_Base_stub IDL_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = IDL_Test_Connector_lem_stub
-  dynamicflags += EVENT_MEMLEAKDETECTION_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    IDL_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    IDL_Test_ConnectorEC.h
-    IDL_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    IDL_Test_ConnectorEC.inl
-  }
-}
-
-project(IDL_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += IDL_Test_Connector_idl_gen IDL_Test_Base_stub
-  libs  += IDL_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = IDL_Test_Connector_stub
-  dynamicflags += EVENT_MEMLEAKDETECTION_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    IDL_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    IDL_Test_ConnectorC.h
-    IDL_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    IDL_Test_ConnectorC.inl
-  }
-}
-
-project(IDL_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += IDL_Test_Connector_lem_stub IDL_Test_Connector_stub
-  sharedname = IDL_Test_Connector_exec
-  libs += IDL_Test_Connector_stub IDL_Test_Connector_lem_stub IDL_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += EVENT_MEMLEAKDETECTION_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    IDL_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    IDL_Test_Connector_conn.h
-    IDL_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(IDL_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += IDL_Test_Connector_lem_stub IDL_Test_Connector_exec IDL_Test_Connector_stub
-  sharedname  = IDL_Test_Connector_svnt
-  libs       += IDL_Test_Connector_stub \
-                IDL_Test_Connector_lem_stub  \
-                IDL_Test_Base_stub \
-                IDL_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += EVENT_MEMLEAKDETECTION_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    IDL_Test_ConnectorS.cpp
-    IDL_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    IDL_Test_ConnectorS.h
-    IDL_Test_Connector_svnt.h
-    IDL_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/.gitignore b/CIAO/connectors/dds4ccm/tests/InstanceHandle/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/.gitignore
deleted file mode 100644
index e2af81adef2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/Writer_Base.cxx
-/Writer_Base.h
-/Writer_BasePlugin.cxx
-/Writer_BasePlugin.h
-/Writer_BaseSupport.cxx
-/Writer_BaseSupport.h
-/Writer_Base_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl
deleted file mode 100644
index 40b51ede68e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file Writer_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef WRITER_BASE_IDL
-#define WRITER_BASE_IDL
-
-#pragma ndds typesupport "Base/Writer_BaseSupport.h"
-#pragma opendds typesupport "Base/Writer_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "WriterTest"
-#pragma DCPS_DATA_KEY "WriterTest key"
-
-struct WriterTest {
-  string key; //@key
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<WriterTest> WriterTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc
deleted file mode 100644
index 352e236cdbc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_DDSInstanceHandleBase_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_DDSInstanceHandleBase_stub
-  dynamicflags += WRITER_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=WRITER_BASE_STUB_Export \
-              -Wb,stub_export_include=Writer_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    Writer_Base.idl
-  }
-
-  opendds_ts_flags += --export=WRITER_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    Writer_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/.gitignore
deleted file mode 100644
index e8f96f6e9cb..00000000000
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/Writer_ConnectorE.idl
-/Writer_Connector_conn.cpp
-/Writer_Connector_conn.h
-/Writer_Connector_conn_export.h
-/Writer_Connector_lem_stub_export.h
-/Writer_Connector_stub_export.h
-/Writer_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.idl b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.idl
deleted file mode 100644
index 421f8585ccd..00000000000
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file Writer_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef WRITER_CONNECTOR_IDL_
-#define WRITER_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Writer_Base.idl"
-
-#pragma ciao lem "Connector/Writer_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/Writer_BaseTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::WriterTest, ::WriterTestSeq> WriterTestConnector;
-
-#endif /* Writer_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc
deleted file mode 100644
index 5358384a9ed..00000000000
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_DDSInstanceHandleBase -l .. -o ../lib -u DDS Writer_Connector"
-
-project(DDS_InstanceHandleConnector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_DDSInstanceHandleBase_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=WRITER_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=Writer_Connector_stub_export.h \
-              -Wb,skel_export_macro=WRITER_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=Writer_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=WRITER_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=Writer_Connector_svnt_export.h \
-              -Wb,conn_export_macro=WRITER_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Writer_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Writer_Connector.idl
-  }
-}
-
-project(DDS_InstanceHandleConnector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_InstanceHandleConnector_idl_gen
-  idlflags += -Wb,stub_export_macro=WRITER_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=Writer_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    Writer_ConnectorE.idl
-  }
-}
-
-project(DDS_InstanceHandleConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_InstanceHandleConnector_lem_gen DDS_InstanceHandleConnector_stub DDS_DDSInstanceHandleBase_stub
-  libs  += DDS_DDSInstanceHandleBase_stub DDS_InstanceHandleConnector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_InstanceHandleConnector_lem_stub
-  dynamicflags += WRITER_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    Writer_ConnectorEC.h
-    Writer_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Writer_ConnectorEC.inl
-  }
-}
-
-project(DDS_InstanceHandleConnector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_InstanceHandleConnector_idl_gen DDS_DDSInstanceHandleBase_stub
-  libs  += DDS_DDSInstanceHandleBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_InstanceHandleConnector_stub
-  dynamicflags += WRITER_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_ConnectorC.cpp
-  }
-
-  Header_Files {
-    Writer_ConnectorC.h
-    Writer_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    Writer_ConnectorC.inl
-  }
-}
-
-project(DDS_InstanceHandleConnector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_InstanceHandleConnector_lem_stub DDS_InstanceHandleConnector_stub DDS_DDSInstanceHandleBase_stub
-  sharedname = DDS_InstanceHandleConnector_exec
-  libs += DDS_InstanceHandleConnector_stub DDS_InstanceHandleConnector_lem_stub DDS_DDSInstanceHandleBase_stub DDS_DDSInstanceHandleBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += WRITER_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_Connector_conn.cpp
-  }
-
-  Header_Files {
-    Writer_Connector_conn.h
-    Writer_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_InstanceHandleConnector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_InstanceHandleConnector_lem_stub DDS_InstanceHandleConnector_exec DDS_InstanceHandleConnector_stub
-  sharedname  = DDS_InstanceHandleConnector_svnt
-  libs       += DDS_InstanceHandleConnector_stub \
-                DDS_InstanceHandleConnector_lem_stub  \
-                DDS_DDSInstanceHandleBase_stub \
-                DDS_InstanceHandleConnector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += WRITER_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_ConnectorS.cpp
-    Writer_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    Writer_ConnectorS.h
-    Writer_Connector_svnt.h
-    Writer_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/README b/CIAO/connectors/dds4ccm/tests/InstanceHandle/README
deleted file mode 100644
index b53b09d7a3c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/README
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-Test which shows how to use the DDSDataWriter directly.
-
-We use the Datawriter from the DDS4CCM library. After typecasting
-it can be used to perform operations on DDS directly.
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/.gitignore b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/.gitignore
deleted file mode 100644
index 809d63704bc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/Sender_exec_export.h
-/Sender_lem_stub_export.h
-/Sender_stub_export.h
-/Sender_svnt_export.h
-/Writer_SenderE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.idl b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.idl
deleted file mode 100644
index 7f022778f2e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_WRITER_ENTITY_SENDER_IDL
-#define DDS_WRITER_ENTITY_SENDER_IDL
-
-#include "Connector/Writer_Connector.idl"
-
-module Writer
-{
-  component Sender
-  {
-    port WriterTestConnector::DDS_Write info_write;
-    attribute unsigned short keys;
-  };
-};
-
-#endif /* DDS_WRITER_ENTITY_SENDER_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc
deleted file mode 100644
index a3867be6e49..00000000000
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_DDSInstanceHandleBase -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_DDSInstanceHandleSender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_InstanceHandleConnector_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I..
-
-  IDL_Files {
-    Writer_Sender.idl
-  }
-}
-
-project(DDS_DDSInstanceHandleSender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_DDSInstanceHandleSender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    Writer_SenderE.idl
-  }
-}
-
-project(DDS_DDSInstanceHandleSender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_DDSInstanceHandleSender_lem_gen DDS_DDSInstanceHandleSender_stub \
-           DDS_DDSInstanceHandleBase_stub
-  libs  += DDS_DDSInstanceHandleBase_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_SenderEC.cpp
-  }
-
-  Header_Files {
-    Writer_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Writer_SenderEC.inl
-  }
-}
-
-project(DDS_DDSInstanceHandleSender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_DDSInstanceHandleSender_idl_gen DDS_DDSInstanceHandleBase_stub \
-           DDS_InstanceHandleConnector_stub
-  libs  += DDS_DDSInstanceHandleBase_stub DDS_InstanceHandleConnector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_SenderC.cpp
-  }
-
-  Header_Files {
-    Writer_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    Writer_SenderC.inl
-  }
-}
-
-project(DDS_DDSInstanceHandleSender_exec) : ciao_executor, dds4ccm_impl {
-  after += DDS_DDSInstanceHandleSender_lem_stub DDS_DDSInstanceHandleSender_stub \
-           DDS_InstanceHandleConnector_lem_stub DDS_InstanceHandleConnector_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub DDS_DDSInstanceHandleBase_stub \
-          DDS_InstanceHandleConnector_lem_stub DDS_InstanceHandleConnector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_Sender_exec.cpp
-  }
-
-  Header_Files {
-    Writer_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_DDSInstanceHandleSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after += DDS_DDSInstanceHandleBase_stub DDS_DDSInstanceHandleSender_lem_stub \
-           DDS_InstanceHandleConnector_stub \
-           DDS_InstanceHandleConnector_svnt DDS_InstanceHandleConnector_lem_stub
-  sharedname = Sender_svnt
-  libs += Sender_stub Sender_lem_stub DDS_DDSInstanceHandleBase_stub \
-          DDS_InstanceHandleConnector_stub DDS_InstanceHandleConnector_svnt \
-          DDS_InstanceHandleConnector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_SenderS.cpp
-    Writer_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    Writer_SenderS.h
-    Writer_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp
deleted file mode 100644
index 1016da9ffcf..00000000000
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp
+++ /dev/null
@@ -1,368 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "Writer_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-#include "Connector/Writer_Connector_conn.h"
-#include "dds4ccm/impl/Utils.h"
-#if (CIAO_DDS4CCM_NDDS == 1)
-# include "dds4ccm/impl/ndds/DataWriter_T.h"
-#endif
-
-namespace CIAO_Writer_Sender_Impl
-{
-  /**
-   * Starter
-   */
-
-  StartHandler::StartHandler(Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  StartHandler::handle_exception (ACE_HANDLE)
-  {
-    this->callback_.run ();
-    return 0;
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : keys_ (5),
-      dds_writer_ (0)
-  {
-    ACE_NEW_THROW_EX (this->rh_,
-                      StartHandler (*this),
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->rh_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Sender_exec_i::unregister_handles ()
-  {
-    ::WriterTestConnector::Writer_var ccm_writer =
-      this->ciao_context_->get_connection_info_write_data ();
-
-    for (Writer_Table::iterator i = this->ktests_.begin ();
-         i != this->ktests_.end ();
-         ++i)
-      {
-        try
-          {
-            ::DDS::InstanceHandle_t const hnd = this->handles_[i->first.c_str ()];
-            ccm_writer->unregister_instance (i->second, hnd);
-            ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("Unregistered <%C> - valid ")
-                        DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER ACE_TEXT ("\n"),
-                        i->first.c_str (),
-                        DDS_INSTANCE_HANDLE_LOG(hnd)));
-          }
-        catch (...)
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: ")
-                    ACE_TEXT ("unknown exception caught during unregister_instance.\n")));
-          }
-      }
-  }
-
-  void
-  Sender_exec_i::register_handles ()
-  {
-    ::WriterTestConnector::Writer_var ccm_writer =
-      this->ciao_context_->get_connection_info_write_data ();
-    Writer_Table::iterator i = this->ktests_.begin ();
-    for (i = this->ktests_.begin(); i != this->ktests_.end(); ++i)
-      {
-        DDS::InstanceHandle_t const hnd =
-          ccm_writer->register_instance (i->second);
-        if (hnd == ::DDS::HANDLE_NIL)
-          {
-            ACE_ERROR ((LM_ERROR,
-                        ACE_TEXT ("ERROR: Unable to register handle for <%C>\n"),
-                        i->first.c_str ()));
-          }
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Registering instance for <%C>\n"),
-                    i->second->key.in ()));
-        this->handles_[i->first.c_str ()] = hnd;
-     }
-  }
-
-  void
-  Sender_exec_i::test_equality ()
-  {
-#if (CIAO_DDS4CCM_NDDS == 1)
-    Writer_Table::iterator i = this->ktests_.begin ();
-    for (i = this->ktests_.begin(); i != this->ktests_.end(); ++i)
-      {
-        ::DDS::InstanceHandle_t ccm_hnd = this->handles_[i->first.c_str ()];
-
-        DDS_InstanceHandle_t dds_hnd =
-          this->dds_writer_->lookup_instance (i->second);
-        ::DDS::InstanceHandle_t ccm_dds_hnd;
-        ccm_dds_hnd <<= dds_hnd;
-        if (ccm_hnd == ccm_dds_hnd)
-          {
-            ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::test_equality - "
-                          "== operator seems to work for CCM handles "
-                          "for key <%C>\n",
-                          i->first.c_str ()));
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::test_equality - "
-                          "== operator doesn't seem to work for CCM "
-                          "handles for key <%C>\n",
-                          i->first.c_str ()));
-          }
-      }
-#endif
-  }
-
-  void
-  Sender_exec_i::test_non_equality ()
-  {
-#if (CIAO_DDS4CCM_NDDS == 1)
-    Writer_Table::iterator i = this->ktests_.begin ();
-    for (i = this->ktests_.begin(); i != this->ktests_.end(); ++i)
-      {
-        ::DDS::InstanceHandle_t ccm_hnd = this->handles_[i->first.c_str ()];
-
-        Writer_Table::iterator unequal = i;
-        ++unequal;
-        if (unequal == this->ktests_.end ())
-          {
-            unequal = this->ktests_.begin ();
-          }
-
-        DDS_InstanceHandle_t const dds_hnd =
-          this->dds_writer_->lookup_instance (unequal->second);
-        DDS::InstanceHandle_t ccm_dds_hnd;
-        ccm_dds_hnd <<= dds_hnd;
-        if (ccm_dds_hnd != ccm_hnd)
-          {
-            ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::test_equality - "
-                          "!= operator seems to work for CCM "
-                          "handles for key <%C>\n",
-                          i->first.c_str ()));
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::test_equality - "
-                          "!= operator doesn't seem to work for CCM "
-                          "handles for key <%C>\n",
-                          i->first.c_str ()));
-          }
-      }
-    unregister_handles ();
-#endif
-  }
-
-  void
-  Sender_exec_i::run ()
-  {
-    test_equality ();
-    test_non_equality ();
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    this->reactor ()->notify (this->rh_);
-  }
-
-  // Component attributes and port operations.
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Writer::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-#if (CIAO_DDS4CCM_NDDS == 1)
-    typedef ::CIAO::NDDS::DDS_DataWriter_Base DataWriter_type;
-
-    ::DDS::DataWriter_var dds_dw =
-      this->ciao_context_->get_connection_info_write_dds_entity ();
-
-    ::CIAO::DDS4CCM::CCM_DataWriter * ccm_dw =
-      dynamic_cast < ::CIAO::DDS4CCM::CCM_DataWriter * > (dds_dw.in ());
-
-    if (ccm_dw)
-      {
-
-        ::DDS::DataWriter_var tmp = ccm_dw->get_dds_entity ();
-        if (! ::CORBA::is_nil (tmp.in ()))
-          {
-            DataWriter_type * typed_ccm_dw = dynamic_cast <DataWriter_type *> (tmp.in ());
-            if (typed_ccm_dw)
-              {
-                DDSDataWriter* dds_datawriter = typed_ccm_dw->get_rti_entity ();
-                if (dds_datawriter)
-                  {
-                    this->dds_writer_ =
-                      ::CIAO_WriterTestConnector_DDS_Event_Impl::WriterTest_DDS_Traits::datawriter_type::narrow (dds_datawriter);
-                    if (!this->dds_writer_)
-                      {
-                        ACE_ERROR ((LM_ERROR, "ERROR : Sender_exec_i::ccm_activate - "
-                                    "Error narrowing to a typed "
-                                    "DDS DataWriter.\n"));
-                        throw ::CORBA::INTERNAL ();
-                      }
-                  }
-                else
-                  {
-                    ACE_ERROR ((LM_ERROR, "ERROR : Sender_exec_i::ccm_activate - "
-                                "Error getting DDS DataWriter.\n"));
-                    throw ::CORBA::INTERNAL ();
-                  }
-              }
-            else
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR : Sender_exec_i::ccm_activate - "
-                            "Error casting DataWriter to typed DataWriter\n"));
-                throw ::CORBA::INTERNAL ();
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR : Sender_exec_i::ccm_activate - "
-                    "::DDS::DataWriter of CCM DataWriter seems nil\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR : Sender_exec_i::configuration_complete - "
-                    "Error casting DataWriter to CCM DataWriter\n"));
-        throw ::CORBA::INTERNAL ();
-      }
-#endif
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-    this->start ();
-
-    ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard,
-                        this->mutex_, CORBA::INTERNAL ());
-
-    for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i)
-      {
-        char key[7];
-        WriterTest *new_key = 0;
-        ACE_NEW_THROW_EX (new_key,
-                          WriterTest,
-                          ::CORBA::NO_MEMORY ());
-        ACE_OS::sprintf (key, "KEY_%d", i);
-        new_key->key = CORBA::string_dup(key);
-
-        this->ktests_[key] = new_key;
-      }
-    register_handles ();
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Writer_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.h
deleted file mode 100644
index e58efe30434..00000000000
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.h
+++ /dev/null
@@ -1,145 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_WRITER_SENDER_EXEC_TJDDGS_H_
-#define CIAO_WRITER_SENDER_EXEC_TJDDGS_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Writer_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-#include <map>
-
-class WriterTestDataWriter;
-
-namespace CIAO_Writer_Sender_Impl
-{
-  class Sender_exec_i;
-
-  /**
-   * Starter
-   */
-
-  class StartHandler :
-    public ACE_Event_Handler
-  {
-  public:
-    StartHandler (Sender_exec_i &callback);
-    virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void run (void);
-
-    //@}
-
-  private:
-    ::Writer::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-
-    ::CORBA::UShort keys_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    StartHandler *rh_;
-    WriterTestDataWriter *dds_writer_;
-
-    TAO_SYNCH_MUTEX mutex_;
-    typedef std::map<ACE_CString, WriterTest_var> Writer_Table;
-    Writer_Table ktests_;
-
-    typedef std::map<ACE_CString, ::DDS::InstanceHandle_t> CCM_Handles;
-    CCM_Handles handles_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void start (void);
-
-    void register_handles (void);
-    void unregister_handles (void);
-    void test_equality (void);
-    void test_non_equality (void);
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Writer_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/InstanceHandle/descriptors/Plan.cdp
deleted file mode 100644
index 667af39b5f4..00000000000
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/descriptors/Plan.cdp
+++ /dev/null
@@ -1,225 +0,0 @@
-<!--  -->
-<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>DDSWriterEntity_Depl_1</label>
-  <UUID>DDSWriterEntity_Depl_1</UUID>
-
-  <implementation xmi:id="Writer_ConnectorComponentImplementation">
-    <name>Writer_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Writer_Connector_ExecArtifact" />
-    <artifact xmi:idref="Writer_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_WriterTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_WriterTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Writer_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Writer_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Writer_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Writer_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="Writer_ConnectorComponentInstance">
-    <name>Writer_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Writer_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DDSWriterEntity</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>dds_writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Writer_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>ccm_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Writer_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="Writer_Connector_ExecArtifact">
-    <name>Writer_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_InstanceHandleConnector_exec</location>
-  </artifact>
-  <artifact xmi:id="Writer_Connector_SvntArtifact">
-    <name>Writer_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_InstanceHandleConnector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Writer_Connector_StubArtifact">
-    <name>Writer_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_InstanceHandleConnector_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/InstanceHandle/descriptors/run_test.pl
deleted file mode 100755
index b4aa8bc1187..00000000000
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 5 seconds to allow task to complete\n";
-sleep (5);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -s\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/.gitignore b/CIAO/connectors/dds4ccm/tests/KeyedSamples/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/.gitignore
deleted file mode 100644
index 81427ef4af0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/Keyed_Test_Base.cxx
-/Keyed_Test_Base.h
-/Keyed_Test_BasePlugin.cxx
-/Keyed_Test_BasePlugin.h
-/Keyed_Test_BaseSupport.cxx
-/Keyed_Test_BaseSupport.h
-/Keyed_Test_Base_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl
deleted file mode 100644
index 8e4b306067e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file Keyed_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef KEYED_TEST_BASE_IDL
-#define KEYED_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/Keyed_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/Keyed_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "KeyedTest"
-#pragma DCPS_DATA_KEY "KeyedTest key"
-
-struct KeyedTest {
-  string key; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<KeyedTest> KeyedTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc
deleted file mode 100644
index 078218a4403..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_Keyed_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_Keyed_Test_Base_stub
-  dynamicflags += KEYED_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=KEYED_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=Keyed_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    Keyed_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=KEYED_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    Keyed_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/.gitignore
deleted file mode 100644
index 45abed70a3b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/Keyed_Test_ConnectorE.idl
-/Keyed_Test_Connector_conn.cpp
-/Keyed_Test_Connector_conn.h
-/Keyed_Test_Connector_conn_export.h
-/Keyed_Test_Connector_lem_stub_export.h
-/Keyed_Test_Connector_stub_export.h
-/Keyed_Test_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.idl
deleted file mode 100644
index ec6bf377372..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file Keyed_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef KEYED_TEST_CONNECTOR_IDL_
-#define KEYED_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Keyed_Test_Base.idl"
-
-#pragma ciao lem "Connector/Keyed_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/Keyed_Test_BaseTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::KeyedTest, ::KeyedTestSeq> KeyedTestConnector;
-
-#endif /* KEYED_TEST_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc
deleted file mode 100644
index d2561449876..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_Keyed_Test_Base -l .. -o ../lib -u DDS Keyed_Test_Connector"
-
-project(DDS_Keyed_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_Keyed_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=KEYED_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=Keyed_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=KEYED_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=Keyed_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=KEYED_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=Keyed_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=KEYED_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Keyed_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Keyed_Test_Connector.idl
-  }
-}
-
-project(DDS_Keyed_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_Keyed_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=KEYED_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=Keyed_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    Keyed_Test_ConnectorE.idl
-  }
-}
-
-project(DDS_Keyed_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_Keyed_Test_Connector_lem_gen DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Base_stub
-  libs  += DDS_Keyed_Test_Base_stub DDS_Keyed_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Keyed_Test_Connector_lem_stub
-  dynamicflags += KEYED_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Keyed_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    Keyed_Test_ConnectorEC.h
-    Keyed_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Keyed_Test_ConnectorEC.inl
-  }
-}
-
-project(DDS_Keyed_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_Keyed_Test_Connector_idl_gen DDS_Keyed_Test_Base_stub
-  libs  += DDS_Keyed_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Keyed_Test_Connector_stub
-  dynamicflags += KEYED_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Keyed_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    Keyed_Test_ConnectorC.h
-    Keyed_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    Keyed_Test_ConnectorC.inl
-  }
-}
-
-project(DDS_Keyed_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_Keyed_Test_Connector_lem_stub DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Base_stub
-  sharedname = DDS_Keyed_Test_Connector_exec
-  libs += DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Connector_lem_stub DDS_Keyed_Test_Base_stub DDS_Keyed_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += KEYED_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Keyed_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    Keyed_Test_Connector_conn.h
-    Keyed_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_Keyed_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_Keyed_Test_Connector_lem_stub DDS_Keyed_Test_Connector_exec DDS_Keyed_Test_Connector_stub
-  sharedname  = DDS_Keyed_Test_Connector_svnt
-  libs       += DDS_Keyed_Test_Connector_stub \
-                DDS_Keyed_Test_Connector_lem_stub  \
-                DDS_Keyed_Test_Base_stub \
-                DDS_Keyed_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += KEYED_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Keyed_Test_ConnectorS.cpp
-    Keyed_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    Keyed_Test_ConnectorS.h
-    Keyed_Test_Connector_svnt.h
-    Keyed_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/README b/CIAO/connectors/dds4ccm/tests/KeyedSamples/README
deleted file mode 100644
index 815c984d9f9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/README
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-This test creates instances in DDS by using the
-updater port. After that, every instance is updated.
-The number of instances (keys) and the number of
-updates (iterations) per key can be defined in
-the deployment plan.
-
-The Receiver checks whether the keys were updated
-correctly by using the read_one method on the reader.
-The Receiver should know the number of instances (keys) and
-the number of iterations per key. These should be configured
-in the deployment plan.
-
-An error is reported when the receiver did not receive
-the correct number of samples.
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/.gitignore b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/.gitignore
deleted file mode 100644
index b91d247a16e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/Keyed_Test_ReceiverE.idl
-/Receiver_exec_export.h
-/Receiver_lem_stub_export.h
-/Receiver_stub_export.h
-/Receiver_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.idl
deleted file mode 100644
index 3625c4df97a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/Keyed_Test_Connector.idl"
-
-module Keyed_Test
-{
-  component Receiver
-  {
-    port KeyedTestConnector::DDS_Get info_out;
-    attribute unsigned long rate;
-    attribute unsigned short iterations;
-    attribute unsigned short keys;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc
deleted file mode 100644
index 2e5f6338f89..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc
+++ /dev/null
@@ -1,136 +0,0 @@
-project(DDS_Keyed_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_Keyed_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h \
-              -I..
-
-  IDL_Files {
-    Keyed_Test_Receiver.idl
-  }
-}
-
-project(DDS_Keyed_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_Keyed_Test_Receiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    Keyed_Test_ReceiverE.idl
-  }
-}
-
-project(DDS_Keyed_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_Keyed_Test_Receiver_lem_gen DDS_Keyed_Test_Receiver_stub  DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Base_stub
-  libs  +=  Receiver_stub DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Keyed_Test_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    Keyed_Test_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Keyed_Test_ReceiverEC.inl
-  }
-}
-
-project(DDS_Keyed_Test_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_Keyed_Test_Receiver_idl_gen  DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Base_stub DDS_Keyed_Test_Connector_lem_gen
-  libs  += DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Keyed_Test_ReceiverC.cpp
-  }
-
-  Header_Files {
-    Keyed_Test_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    Keyed_Test_ReceiverC.inl
-  }
-}
-
-project(DDS_Keyed_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_Keyed_Test_Receiver_lem_stub DDS_Keyed_Test_Receiver_stub DDS_Keyed_Test_Base_stub DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Connector_lem_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_Keyed_Test_Base_stub DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Keyed_Test_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    Keyed_Test_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_Keyed_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_Keyed_Test_Receiver_lem_stub DDS_Keyed_Test_Base_stub DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Connector_svnt DDS_Keyed_Test_Receiver_exec DDS_Keyed_Test_Connector_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_Keyed_Test_Base_stub DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Connector_svnt Receiver_exec DDS_Keyed_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Keyed_Test_ReceiverS.cpp
-    Keyed_Test_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    Keyed_Test_ReceiverS.h
-    Keyed_Test_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp
deleted file mode 100644
index 3efe7830874..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp
+++ /dev/null
@@ -1,336 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "Keyed_Test_Receiver_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-#include "ace/OS_NS_time.h"
-#include "dds4ccm/impl/TimeUtilities.h"
-#include "dds4ccm/impl/Utils.h"
-
-namespace CIAO_Keyed_Test_Receiver_Impl
-{
-  /**
-   * Read action generator
-   */
-
-  read_action_Generator::read_action_Generator (Receiver_exec_i &callback)
-    : pulse_callback_ (callback)
-  {
-  }
-
-  read_action_Generator::~read_action_Generator ()
-  {
-  }
-
-  int
-  read_action_Generator::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    this->pulse_callback_.read ();
-    return 0;
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_status_exec_i
-   */
-
-  info_out_status_exec_i::info_out_status_exec_i (
-        ::Keyed_Test::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::Keyed_Test::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_status_exec_i::~info_out_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : rate_ (1)
-      , iterations_ (10)
-      , keys_ (5)
-      , expected_ (50)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      read_action_Generator (*this),
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Receiver_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Receiver_exec_i::check_received_samples ()
-  {
-    bool all_received = true;
-    for (Last_Iteration_Table::iterator iter = this->last_iters_.begin ();
-         iter != this->last_iters_.end () && all_received;
-         ++iter)
-      {
-        all_received = iter->second == this->iterations_;
-        if (iter->second > this->iterations_)
-          {
-            all_received = true;
-            ACE_ERROR ((LM_ERROR, "Receiver_exec_i::check_received_samples - "
-                       "ERROR: Unexpected iteration received-> Bailing out\n"));
-          }
-      }
-    if (all_received)
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("All samples received. Stop the timer\n")));
-        this->reactor ()->cancel_timer (this->ticker_);
-      }
-  }
-
-  void
-  Receiver_exec_i::read (void)
-  {
-    ::KeyedTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_info_out_data();
-
-    if (::CORBA::is_nil (reader.in ()))
-      {
-        return;
-      }
-    try
-      {
-        for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i)
-          {
-            KeyedTest keyedtest_info;
-            char key[10];
-            ACE_OS::sprintf (key, "KEY_%d", i);
-            keyedtest_info.key = CORBA::string_dup (key);
-            ::CCM_DDS::ReadInfo readinfo;
-            reader->read_one_last (keyedtest_info, readinfo, ::DDS::HANDLE_NIL);
-
-            ACE_Time_Value tv;
-            tv <<= readinfo.source_timestamp;
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ONE Read_Info ")
-                                  ACE_TEXT (" -> date =%#T\n"),
-                                  &tv));
-
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ ONE keyed test info : ")
-                ACE_TEXT ("received keyedtest_info for <%C> at %u\n"),
-                keyedtest_info.key.in (),
-                keyedtest_info.iteration));
-            this->last_iters_[key] = keyedtest_info.iteration;
-            check_received_samples ();
-          }
-      }
-    catch(const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: KeyedTest_Read: ")
-                  ACE_TEXT ("Unexpected InternalError exception received <%C>\n"),
-                  ::CIAO::DDS4CCM::translate_retcode (ex.error_code)));
-      }
-    catch(const CCM_DDS::NonExistent& )
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("KeyedTest_Read: ")
-                  ACE_TEXT ("Expected NonExistent received\n")));
-      }
-  }
-
-  // Component attributes and port operations.
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ()))
-      {
-        info_out_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_out_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_out_status_.in ());
-  }
-
-  ::CORBA::ULong
-  Receiver_exec_i::rate (void)
-  {
-    return this->rate_;
-  }
-
-  void
-  Receiver_exec_i::rate (
-    const ::CORBA::ULong rate)
-  {
-    this->rate_ = rate;
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Receiver_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-    this->expected_ = this->iterations_ * this->keys_;
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Receiver_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-    this->expected_ = this->iterations_ * this->keys_;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Keyed_Test::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    long const usec = 1000000 / this->rate_;
-    if (this->reactor ()->schedule_timer (this->ticker_,
-                                          0,
-                                          ACE_Time_Value(0, usec),
-                                          ACE_Time_Value(0, usec)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, "Unable to schedule Timer\n"));
-      }
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    this->reactor ()->cancel_timer (this->ticker_);
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    CORBA::UShort received_ = 0;
-    for (Last_Iteration_Table::iterator iter = this->last_iters_.begin ();
-         iter != this->last_iters_.end ();
-         ++iter)
-      {
-        ACE_DEBUG ((LM_INFO, "Receiver_exec_i summary for <%C>: last sample <%u> - expected <%u>\n",
-                      iter->first.c_str(),
-                      iter->second,
-                      this->iterations_));
-        received_ += iter->second;
-      }
-
-    if (received_ < this->expected_)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR : Expected to receive %u samples, actually got %u\n",
-            this->expected_, received_));
-      }
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Keyed_Test_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h
deleted file mode 100644
index 5007c45e48e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h
+++ /dev/null
@@ -1,185 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_KEYED_TEST_RECEIVER_EXEC_YGE5UB_H_
-#define CIAO_KEYED_TEST_RECEIVER_EXEC_YGE5UB_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Keyed_Test_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-#include <map>
-
-namespace CIAO_Keyed_Test_Receiver_Impl
-{
-  class Receiver_exec_i;
-
-  /**
-   * Read action Generator
-   */
-
-  class read_action_Generator
-    : public ACE_Event_Handler
-  {
-  public:
-    read_action_Generator (Receiver_exec_i &callback);
-
-    ~read_action_Generator ();
-
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    Receiver_exec_i &pulse_callback_;
-
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_status_exec_i
-   */
-
-  class info_out_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_status_exec_i (
-      ::Keyed_Test::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::Keyed_Test::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_status (void);
-
-    virtual ::CORBA::ULong rate (void);
-
-    virtual void rate (::CORBA::ULong rate);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void read (void);
-
-    //@}
-
-  private:
-    ::Keyed_Test::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_;
-
-    ::CORBA::ULong rate_;
-
-    ::CORBA::UShort iterations_;
-
-    ::CORBA::UShort keys_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    CORBA::ULong expected_;
-
-    read_action_Generator * ticker_;
-
-    typedef std::map<ACE_CString, CORBA::UShort> Last_Iteration_Table;
-    Last_Iteration_Table last_iters_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void check_received_samples (void);
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Keyed_Test_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/.gitignore b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/.gitignore
deleted file mode 100644
index c1b2aa59427..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/Keyed_Test_SenderE.idl
-/Sender_exec_export.h
-/Sender_lem_stub_export.h
-/Sender_stub_export.h
-/Sender_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.idl
deleted file mode 100644
index 53d1d773a02..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_KEYED_TEST_SENDER_IDL
-#define DDS_KEYED_TEST_SENDER_IDL
-
-#include "Connector/Keyed_Test_Connector.idl"
-
-module Keyed_Test
-{
-  component Sender
-  {
-    port KeyedTestConnector::DDS_Write info_write;
-    provides CCM_DDS::ConnectorStatusListener connector_status;
-
-    attribute unsigned long rate;
-    attribute unsigned short keys;
-    attribute unsigned short iterations;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc
deleted file mode 100644
index 08b009018c2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc
+++ /dev/null
@@ -1,138 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_Keyed_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_Keyed_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_Keyed_Test_Connector_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I..
-
-  IDL_Files {
-    Keyed_Test_Sender.idl
-  }
-}
-
-project(DDS_Keyed_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_Keyed_Test_Sender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    Keyed_Test_SenderE.idl
-  }
-}
-
-project(DDS_Keyed_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_Keyed_Test_Sender_lem_gen DDS_Keyed_Test_Sender_stub DDS_Keyed_Test_Base_stub
-  libs  += DDS_Keyed_Test_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Keyed_Test_SenderEC.cpp
-  }
-
-  Header_Files {
-    Keyed_Test_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Keyed_Test_SenderEC.inl
-  }
-}
-
-project(DDS_Keyed_Test_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_Keyed_Test_Sender_idl_gen DDS_Keyed_Test_Base_stub DDS_Keyed_Test_Connector_stub
-  libs  += DDS_Keyed_Test_Base_stub DDS_Keyed_Test_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Keyed_Test_SenderC.cpp
-  }
-
-  Header_Files {
-    Keyed_Test_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    Keyed_Test_SenderC.inl
-  }
-}
-
-project(DDS_Keyed_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_Keyed_Test_Sender_lem_stub DDS_Keyed_Test_Sender_stub DDS_Keyed_Test_Connector_lem_stub DDS_Keyed_Test_Connector_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub DDS_Keyed_Test_Base_stub DDS_Keyed_Test_Connector_lem_stub DDS_Keyed_Test_Connector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Keyed_Test_Sender_exec.cpp
-  }
-
-  Header_Files {
-    Keyed_Test_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_Keyed_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_Keyed_Test_Base_stub  DDS_Keyed_Test_Sender_lem_stub DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Connector_svnt  DDS_Keyed_Test_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                DDS_Keyed_Test_Base_stub DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Connector_svnt DDS_Keyed_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Keyed_Test_SenderS.cpp
-    Keyed_Test_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    Keyed_Test_SenderS.h
-    Keyed_Test_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp
deleted file mode 100644
index 27a0fadf166..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp
+++ /dev/null
@@ -1,309 +0,0 @@
-// -*- C++ -*-
-#include "Keyed_Test_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_Keyed_Test_Sender_Impl
-{
-
-  /**
-   * ConnectorStatusListener_exec_i
-   */
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (
-    Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic (
-    ::DDS::Topic_ptr /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status(
-    ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind status_kind)
-  {
-    if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS)
-      {
-        ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_unexpected_status - "
-          "Publication matched received: starting the test\n"));
-
-        this->callback_.get_started ();
-      }
-  }
-
-  /**
-   * Write action generator
-   */
-
-  pulse_Generator::pulse_Generator (Sender_exec_i &callback)
-    : pulse_callback_ (callback)
-  {
-  }
-
-  int
-  pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    this->pulse_callback_.tick ();
-    return 0;
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : rate_ (1)
-      , keys_ (5)
-      , iterations_ (10)
-      , ready_to_start_ (false)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      pulse_Generator (*this),
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Sender_exec_i::tick (void)
-  {
-    if (this->last_key_ != this->ktests_.end ())
-      {
-        try
-          {
-            KeyedTestConnector::Writer_var writer =
-              this->ciao_context_->get_connection_info_write_data ();
-            ++this->last_key_->second->iteration;
-            writer->write_one (this->last_key_->second, ::DDS::HANDLE_NIL);
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Written key <%C> with <%d>\n"),
-                    this->last_key_->first.c_str (),
-                    this->last_key_->second->iteration));
-          }
-        catch (const CCM_DDS::InternalError& )
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Internal Error while writing KeyedTest info for <%C>.\n",
-                        this->last_key_->first.c_str ()));
-          }
-        ++this->last_key_;
-      }
-    else
-      {
-        // Onto the next iteration
-        this->last_key_ = this->ktests_.begin ();
-        while (this->last_key_ != this->ktests_.end ())
-          {
-            if (this->last_key_->second->iteration == this->iterations_)
-              {
-                ++this->last_key_;
-              }
-            else
-              {
-                break;
-              }
-          }
-      }
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    long const usec = 1000000 / this->rate_;
-    if (this->reactor ()->schedule_timer (
-                this->ticker_,
-                0,
-                ACE_Time_Value (0, usec),
-                ACE_Time_Value (0, usec)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                              ACE_TEXT ("Error scheduling timer")));
-      }
-  }
-
-  void
-  Sender_exec_i::get_started (void)
-  {
-    this->ready_to_start_ = true;
-    this->start ();
-
-    ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard,
-                        this->mutex_, CORBA::INTERNAL ());
-
-    for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i)
-      {
-        char key[7];
-        KeyedTest *new_key = new KeyedTest;
-        ACE_OS::sprintf (key, "KEY_%d", i);
-        new_key->key = CORBA::string_dup(key);
-        new_key->iteration = 0;
-
-        this->ktests_[key] = new_key;
-      }
-     this->last_key_ = this->ktests_.begin ();
-}
-
-  void
-  Sender_exec_i::stop (void)
-  {
-    this->reactor ()->cancel_timer (this->ticker_);
-
-    if (!this->ready_to_start_.value())
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::stop - ")
-                              ACE_TEXT ("ERROR Sender never got ready to start\n")));
-      }
-  }
-
-  // Component attributes and port operations.
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i  (*this);
-  }
-
-  ::CORBA::ULong
-  Sender_exec_i::rate (void)
-  {
-    return this->rate_;
-  }
-
-  void
-  Sender_exec_i::rate (
-    const ::CORBA::ULong rate)
-  {
-    this->rate_ = rate;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Keyed_Test::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    this->stop ();
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Keyed_Test_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.h
deleted file mode 100644
index d4fe9f73c97..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.h
+++ /dev/null
@@ -1,166 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_KEYED_TEST_SENDER_EXEC_LVAFIH_H_
-#define CIAO_KEYED_TEST_SENDER_EXEC_LVAFIH_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Keyed_Test_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-#include <map>
-
-namespace CIAO_Keyed_Test_Sender_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
-  class Sender_exec_i;
-
-  /**
-   * ConnectorStatusListener_exec_i
-   */
-  class SENDER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Sender_exec_i &callback);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-      void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                                 ::DDS::StatusKind status_kind);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Write generator
-   */
-
-  class pulse_Generator :
-    public ACE_Event_Handler
-  {
-  public:
-    pulse_Generator (Sender_exec_i &callback);
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    Sender_exec_i &pulse_callback_;
-  };
-
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_connector_status (void);
-
-    virtual ::CORBA::ULong rate (void);
-
-    virtual void rate (::CORBA::ULong rate);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void get_started (void);
-    void tick (void);
-
-    //@}
-
-  private:
-    ::Keyed_Test::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-
-    ::CORBA::ULong rate_;
-
-    ::CORBA::UShort keys_;
-
-    ::CORBA::UShort iterations_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    void start (void);
-    void stop (void);
-
-    pulse_Generator * ticker_;
-
-    TAO_SYNCH_MUTEX mutex_;
-    typedef std::map<ACE_CString, KeyedTest_var> Keyed_Test_Table;
-
-    Keyed_Test_Table ktests_;
-    Keyed_Test_Table::iterator last_key_;
-    Atomic_Boolean ready_to_start_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Keyed_Test_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/KeyedSamples/descriptors/Plan.cdp
deleted file mode 100644
index 42100b2f165..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/descriptors/Plan.cdp
+++ /dev/null
@@ -1,414 +0,0 @@
-<!--  -->
-<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>Keyed_Test_Depl_1</label>
-  <UUID>Keyed_Test_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Keyed_Test_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Keyed_Test_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Keyed_Test_ConnectorComponentImplementation">
-    <name>Keyed_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Keyed_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="Keyed_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_KeyedTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_KeyedTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Keyed_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Keyed_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Keyed_Test_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Keyed_Test_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>1</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>9</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="Keyed_Test_ConnectorComponentInstance">
-    <name>Keyed_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Keyed_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Keyed_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="Keyed_Test_ConnectorComponentInstance2">
-    <name>Keyed_Test_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Keyed_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Keyed_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>1</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>9</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>_portstatuslistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Keyed_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>info_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Keyed_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Keyed_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Keyed_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="Keyed_Test_Connector_ExecArtifact">
-    <name>Keyed_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Keyed_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Keyed_Test_Connector_SvntArtifact">
-    <name>Keyed_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Keyed_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Keyed_Test_Connector_StubArtifact">
-    <name>Keyed_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Keyed_Test_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl
deleted file mode 100755
index 87984594507..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 60 seconds to allow task to complete\n";
-sleep (60);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/.gitignore b/CIAO/connectors/dds4ccm/tests/KeyedWriter/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/.gitignore
deleted file mode 100644
index e2af81adef2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/Writer_Base.cxx
-/Writer_Base.h
-/Writer_BasePlugin.cxx
-/Writer_BasePlugin.h
-/Writer_BaseSupport.cxx
-/Writer_BaseSupport.h
-/Writer_Base_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl
deleted file mode 100644
index 525042673a8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file Writer_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef WRITER_BASE_IDL
-#define WRITER_BASE_IDL
-
-#pragma ndds typesupport "Base/Writer_BaseSupport.h"
-#pragma opendds typesupport "Base/Writer_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "WriterTest"
-#pragma DCPS_DATA_KEY "WriterTest key"
-
-struct WriterTest {
-  string key; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<WriterTest> WriterTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc
deleted file mode 100644
index 3bd9e122988..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_KeyedWriterBase_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_KeyedWriterBase_stub
-  dynamicflags += WRITER_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=WRITER_BASE_STUB_Export \
-              -Wb,stub_export_include=Writer_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    Writer_Base.idl
-  }
-
-  opendds_ts_flags += --export=WRITER_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    Writer_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/.gitignore
deleted file mode 100644
index 6f350aec5b1..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/Writer_ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.idl b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.idl
deleted file mode 100644
index 421f8585ccd..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file Writer_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef WRITER_CONNECTOR_IDL_
-#define WRITER_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Writer_Base.idl"
-
-#pragma ciao lem "Connector/Writer_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/Writer_BaseTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::WriterTest, ::WriterTestSeq> WriterTestConnector;
-
-#endif /* Writer_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc
deleted file mode 100644
index 740baf34850..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_KeyedWriterBase -l .. -o ../lib -u DDS Writer_Connector"
-
-project(DDS_KeyedWriterConnector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_KeyedWriterBase_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=WRITER_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=Writer_Connector_stub_export.h \
-              -Wb,skel_export_macro=WRITER_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=Writer_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=WRITER_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=Writer_Connector_svnt_export.h \
-              -Wb,conn_export_macro=WRITER_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Writer_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Writer_Connector.idl
-  }
-}
-
-project(DDS_KeyedWriterConnector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_KeyedWriterConnector_idl_gen
-  idlflags += -Wb,stub_export_macro=WRITER_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=Writer_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    Writer_ConnectorE.idl
-  }
-}
-
-project(DDS_KeyedWriterConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_KeyedWriterConnector_lem_gen DDS_KeyedWriterConnector_stub DDS_KeyedWriterBase_stub
-  libs  += DDS_KeyedWriterBase_stub DDS_KeyedWriterConnector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_KeyedWriterConnector_lem_stub
-  dynamicflags += WRITER_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    Writer_ConnectorEC.h
-    Writer_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Writer_ConnectorEC.inl
-  }
-}
-
-project(DDS_KeyedWriterConnector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_KeyedWriterConnector_idl_gen DDS_KeyedWriterBase_stub
-  libs  += DDS_KeyedWriterBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_KeyedWriterConnector_stub
-  dynamicflags += WRITER_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_ConnectorC.cpp
-  }
-
-  Header_Files {
-    Writer_ConnectorC.h
-    Writer_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    Writer_ConnectorC.inl
-  }
-}
-
-project(DDS_KeyedWriterConnector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_KeyedWriterConnector_lem_stub DDS_KeyedWriterConnector_stub DDS_KeyedWriterBase_stub
-  sharedname = DDS_KeyedWriterConnector_exec
-  libs += DDS_KeyedWriterConnector_stub DDS_KeyedWriterConnector_lem_stub DDS_KeyedWriterBase_stub DDS_KeyedWriterBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += WRITER_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_Connector_conn.cpp
-  }
-
-  Header_Files {
-    Writer_Connector_conn.h
-    Writer_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_KeyedWriterConnector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_KeyedWriterConnector_lem_stub DDS_KeyedWriterConnector_exec DDS_KeyedWriterConnector_stub
-  sharedname  = DDS_KeyedWriterConnector_svnt
-  libs       += DDS_KeyedWriterConnector_stub \
-                DDS_KeyedWriterConnector_lem_stub  \
-                DDS_KeyedWriterBase_stub \
-                DDS_KeyedWriterConnector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += WRITER_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_ConnectorS.cpp
-    Writer_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    Writer_ConnectorS.h
-    Writer_Connector_svnt.h
-    Writer_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/README b/CIAO/connectors/dds4ccm/tests/KeyedWriter/README
deleted file mode 100644
index 1f985b8a361..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/README
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-KeyedWriter tests the DDS_Writer. It tests write_one
-and write_many, in combination with register_instance.
-
-In descriptors/USER_QOS_PROFILE.xml, max_instances is
-set to one. An exception should be thrown when the second
-instance is registered. Every subsequent write of
-unregistered keys, should result in an error.
-
-When invoking write_many, writing the first sample should succeed.
-Writing every subsequent sample should fail.
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/.gitignore b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/.gitignore
deleted file mode 100644
index f2f7d84b894..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/Receiver_exec_export.h
-/Receiver_lem_stub_export.h
-/Receiver_stub_export.h
-/Receiver_svnt_export.h
-/Writer_ReceiverE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.idl b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.idl
deleted file mode 100644
index 2d720fba655..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.idl
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/Writer_Connector.idl"
-
-module Writer
-{
-  component Receiver
-  {
-    port WriterTestConnector::DDS_Listen info_out;
-    attribute unsigned short iterations;
-    attribute unsigned short keys;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc
deleted file mode 100644
index 97e9a371bc2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc
+++ /dev/null
@@ -1,136 +0,0 @@
-project(DDS_KeyedWriterReceiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_KeyedWriterConnector_idl_gen
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h \
-              -I..
-
-  IDL_Files {
-    Writer_Receiver.idl
-  }
-}
-
-project(DDS_KeyedWriterReceiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_KeyedWriterReceiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    Writer_ReceiverE.idl
-  }
-}
-
-project(DDS_KeyedWriterReceiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_KeyedWriterReceiver_lem_gen DDS_KeyedWriterReceiver_stub  DDS_KeyedWriterConnector_stub DDS_KeyedWriterBase_stub
-  libs  +=  Receiver_stub DDS_KeyedWriterConnector_stub DDS_KeyedWriterBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    Writer_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Writer_ReceiverEC.inl
-  }
-}
-
-project(DDS_KeyedWriterReceiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_KeyedWriterReceiver_idl_gen  DDS_KeyedWriterConnector_stub DDS_KeyedWriterBase_stub DDS_KeyedWriterConnector_lem_gen
-  libs  += DDS_KeyedWriterConnector_stub DDS_KeyedWriterBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_ReceiverC.cpp
-  }
-
-  Header_Files {
-    Writer_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    Writer_ReceiverC.inl
-  }
-}
-
-project(DDS_KeyedWriterReceiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_KeyedWriterReceiver_lem_stub DDS_KeyedWriterReceiver_stub DDS_KeyedWriterBase_stub DDS_KeyedWriterConnector_stub DDS_KeyedWriterConnector_lem_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_KeyedWriterBase_stub DDS_KeyedWriterConnector_stub DDS_KeyedWriterConnector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    Writer_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_KeyedWriterReceiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_KeyedWriterReceiver_lem_stub DDS_KeyedWriterBase_stub DDS_KeyedWriterConnector_stub DDS_KeyedWriterConnector_svnt DDS_KeyedWriterReceiver_exec DDS_KeyedWriterConnector_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_KeyedWriterBase_stub DDS_KeyedWriterConnector_stub DDS_KeyedWriterConnector_svnt Receiver_exec DDS_KeyedWriterConnector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_ReceiverS.cpp
-    Writer_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    Writer_ReceiverS.h
-    Writer_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp
deleted file mode 100644
index 61de3516863..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp
+++ /dev/null
@@ -1,278 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "Writer_Receiver_exec.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-namespace CIAO_Writer_Receiver_Impl
-{
-
-  /**
-   * Facet Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  info_out_data_listener_exec_i::info_out_data_listener_exec_i (
-        ::Writer::CCM_Receiver_Context_ptr ctx,
-        const ::CORBA::UShort iterations,
-        Atomic_ULong &samples_received)
-    : ciao_context_ (
-        ::Writer::CCM_Receiver_Context::_duplicate (ctx))
-      , iterations_ (iterations)
-      , samples_received_ (samples_received)
-  {
-  }
-
-  info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::WriterTestConnector::Listener
-
-  void
-  info_out_data_listener_exec_i::on_one_data (const ::WriterTest & datum,
-  const ::CCM_DDS::ReadInfo & info)
-  {
-    ++samples_received_;
-    ACE_DEBUG ((LM_DEBUG, "WriterTest_Listener: "
-            "received writer info for <%C> at <%u> handle "
-            DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER
-            "\n",
-            datum.key.in (),
-            datum.iteration,
-            DDS_INSTANCE_HANDLE_LOG(info.instance_handle)));
-    if (datum.iteration > this->iterations_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: received iteration ")
-                        ACE_TEXT ("greater than expected : ")
-                        ACE_TEXT ("expected <%u> - received <%u>\n"),
-                        this->iterations_, datum.iteration));
-      }
-    if (datum.iteration == 0)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: received iteration ")
-                        ACE_TEXT ("is zero\n")));
-      }
-  }
-
-  void
-  info_out_data_listener_exec_i::on_many_data (const ::WriterTestSeq & /*data*/,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("WriterTest_Listener: ")
-            ACE_TEXT ("on_many_data has been called.\n")));
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_status_exec_i
-   */
-
-  info_out_status_exec_i::info_out_status_exec_i (
-        ::Writer::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::Writer::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_status_exec_i::~info_out_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : iterations_ (10)
-    , keys_ (0)
-    , samples_received_ (0)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-
-  // Component attributes and port operations.
-
-  ::WriterTestConnector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_out_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ()))
-      {
-        info_out_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_data_listener_exec_i (
-            this->ciao_context_.in (),
-            this->iterations_ * this->iterations_,
-            this->samples_received_),
-            ::WriterTestConnector::CCM_Listener::_nil ());
-
-          this->ciao_info_out_data_listener_ = tmp;
-      }
-
-    return
-      ::WriterTestConnector::CCM_Listener::_duplicate (
-        this->ciao_info_out_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ()))
-      {
-        info_out_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_out_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_out_status_.in ());
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Receiver_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Receiver_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Writer::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    ::CCM_DDS::DataListenerControl_var lc =
-      this->ciao_context_->get_connection_info_out_data_control ();
-
-    if (::CORBA::is_nil (lc.in ()))
-      {
-        ACE_ERROR ((LM_INFO, ACE_TEXT ("Error:  Listener control receptacle is null!\n")));
-        throw ::CORBA::INTERNAL ();
-      }
-    lc->mode (::CCM_DDS::ONE_BY_ONE);
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    if (this->samples_received_.value () !=
-        (::CORBA::ULong)this->iterations () * this->keys ())
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::ccm_remove - "
-                  "ERROR: did not receive the expected number "
-                  "of samples. expected <%u> - received <%u>\n",
-                  this->iterations() * this->keys (),
-                  this->samples_received_.value ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_remove - "
-                  "OK: received the expected number of samples <%u>\n",
-                  this->iterations() * this->keys ()));
-      }
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Writer_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.h
deleted file mode 100644
index 5cb2cf2a135..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.h
+++ /dev/null
@@ -1,185 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_WRITER_RECEIVER_EXEC_X2WLXX_H_
-#define CIAO_WRITER_RECEIVER_EXEC_X2WLXX_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Writer_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_Writer_Receiver_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::ULong> Atomic_ULong;
-
-  /**
-   * Provider Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  class info_out_data_listener_exec_i
-    : public virtual ::WriterTestConnector::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_data_listener_exec_i (
-      ::Writer::CCM_Receiver_Context_ptr ctx,
-      const ::CORBA::UShort iterations,
-      Atomic_ULong &samples_received);
-    virtual ~info_out_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from WriterTestConnector::Listener. */
-
-    virtual
-    void on_one_data (const ::WriterTest & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (const ::WriterTestSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    ::Writer::CCM_Receiver_Context_var ciao_context_;
-    ::CORBA::UShort iterations_;
-    Atomic_ULong &samples_received_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_status_exec_i
-   */
-
-  class info_out_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_status_exec_i (
-      ::Writer::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::Writer::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::WriterTestConnector::CCM_Listener_ptr
-    get_info_out_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_status (void);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-
-    //@}
-
-  private:
-    ::Writer::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::WriterTestConnector::CCM_Listener_var ciao_info_out_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_;
-
-    ::CORBA::UShort iterations_;
-
-    ::CORBA::UShort keys_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    Atomic_ULong samples_received_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Writer_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/.gitignore b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/.gitignore
deleted file mode 100644
index 809d63704bc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/Sender_exec_export.h
-/Sender_lem_stub_export.h
-/Sender_stub_export.h
-/Sender_svnt_export.h
-/Writer_SenderE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.idl b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.idl
deleted file mode 100644
index 64984e084f9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_KEYED_TEST_SENDER_IDL
-#define DDS_KEYED_TEST_SENDER_IDL
-
-#include "Connector/Writer_Connector.idl"
-
-module Writer
-{
-  component Sender
-  {
-    port WriterTestConnector::DDS_Write info_write;
-    provides CCM_DDS::ConnectorStatusListener connector_status;
-
-    attribute unsigned short rate;
-    attribute unsigned short iterations;
-    attribute unsigned short keys;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc
deleted file mode 100644
index ae3e8824de0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc
+++ /dev/null
@@ -1,138 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_KeyedWriterBase -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_KeyedWriterSender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_KeyedWriterConnector_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I ..
-
-  IDL_Files {
-    Writer_Sender.idl
-  }
-}
-
-project(DDS_KeyedWriterSender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_KeyedWriterSender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    Writer_SenderE.idl
-  }
-}
-
-project(DDS_KeyedWriterSender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_KeyedWriterSender_lem_gen DDS_KeyedWriterSender_stub DDS_KeyedWriterBase_stub
-  libs  += DDS_KeyedWriterBase_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_SenderEC.cpp
-  }
-
-  Header_Files {
-    Writer_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Writer_SenderEC.inl
-  }
-}
-
-project(DDS_KeyedWriterSender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_KeyedWriterSender_idl_gen DDS_KeyedWriterBase_stub DDS_KeyedWriterConnector_stub
-  libs  += DDS_KeyedWriterBase_stub DDS_KeyedWriterConnector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_SenderC.cpp
-  }
-
-  Header_Files {
-    Writer_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    Writer_SenderC.inl
-  }
-}
-
-project(DDS_KeyedWriterSender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_KeyedWriterSender_lem_stub DDS_KeyedWriterSender_stub DDS_KeyedWriterConnector_lem_stub DDS_KeyedWriterConnector_stub 
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub DDS_KeyedWriterBase_stub DDS_KeyedWriterConnector_lem_stub DDS_KeyedWriterConnector_stub 
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_Sender_exec.cpp
-  }
-
-  Header_Files {
-    Writer_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_KeyedWriterSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_KeyedWriterBase_stub  DDS_KeyedWriterSender_lem_stub DDS_KeyedWriterConnector_stub DDS_KeyedWriterConnector_svnt  DDS_KeyedWriterConnector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                DDS_KeyedWriterBase_stub DDS_KeyedWriterConnector_stub DDS_KeyedWriterConnector_svnt DDS_KeyedWriterConnector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_SenderS.cpp
-    Writer_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    Writer_SenderS.h
-    Writer_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp
deleted file mode 100644
index e379640308a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp
+++ /dev/null
@@ -1,482 +0,0 @@
-// -*- C++ -*-
-#include "Writer_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Guard_T.h"
-#include "ace/Log_Msg.h"
-#include "ace/Reactor.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-namespace CIAO_Writer_Sender_Impl
-{
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (
-    Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic (
-    ::DDS::Topic_ptr /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status(
-    ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind status_kind)
-  {
-    if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS)
-      {
-        ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_unexpected_status - "
-          "Publication matched received: starting the test\n"));
-
-        this->callback_.get_started ();
-      }
-  }
-
-  //============================================================
-  // pulse_Generator
-  //============================================================
-  pulse_Generator::pulse_Generator (Sender_exec_i &callback)
-    : pulse_callback_ (callback)
-  {
-  }
-
-  int
-  pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    // Notify the subscribers
-    this->pulse_callback_.tick ();
-    return 0;
-  }
-
-  //============================================================
-  // Component Executor Implementation Class: Sender_exec_i
-  //============================================================
-
-  Sender_exec_i::Sender_exec_i (void)
-    : rate_ (1)
-      , iterations_ (10)
-      , keys_ (5)
-      , assignment_ (WRITE_KEYED)
-      , last_iteration_ (0)
-  {
-    this->ticker_ = new pulse_Generator (*this);
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  // Component attributes and port operations.
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i  (*this);
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::rate (void)
-  {
-    return
-      this->rate_;
-  }
-
-  void
-  Sender_exec_i::rate (
-    const ::CORBA::UShort rate)
-  {
-    this->rate_ =
-      rate;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::iterations (void)
-  {
-    return
-      this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations + 2; //for extra tests.
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return
-      this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys + 1; //for extra tests.
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Writer::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    this->stop ();
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-  }
-
-  void
-  Sender_exec_i::reset_iterations ()
-  {
-    for (Writer_Table::iterator i = this->ktests_.begin ();
-         i != this->ktests_.end ();
-         ++i)
-      {
-        i->second->iteration = 0;
-      }
-  }
-
-  void
-  Sender_exec_i::unregister_handles ()
-  {
-    for (Writer_Table::iterator i = this->ktests_.begin ();
-         i != this->ktests_.end ();
-         ++i)
-      {
-        try
-          {
-            ::DDS::InstanceHandle_t const hnd = this->handles_[i->first.c_str ()];
-            WriterTestConnector::Writer_var writer =
-              this->ciao_context_->get_connection_info_write_data ();
-            writer->unregister_instance (i->second, hnd);
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Unregistered <%C> - iteration <%d> - ")
-                      DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER ACE_TEXT("\n"),
-                      i->first.c_str (),
-                      i->second->iteration,
-                      DDS_INSTANCE_HANDLE_LOG(hnd)));
-          }
-        catch (...)
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: ")
-                    ACE_TEXT ("unknown exception caught during unregister_instance.\n")));
-          }
-      }
-  }
-
-  void
-  Sender_exec_i::register_handles()
-  {
-    WriterTestConnector::Writer_var writer =
-      this->ciao_context_->get_connection_info_write_data ();
-
-    Writer_Table::iterator i = this->ktests_.begin ();
-    ::DDS::InstanceHandle_t hnd = writer->register_instance (i->second);
-    if (hnd == ::DDS::HANDLE_NIL)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Unable to register handle for <%C> - iteration <%d>\n"),
-          i->first.c_str (), i->second->iteration));
-      }
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Registering instance with <%C> - iteration <%d> - ")
-                DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER ACE_TEXT("\n"),
-                i->second->key.in (),
-                i->second->iteration,
-                DDS_INSTANCE_HANDLE_LOG(hnd)));
-    this->handles_[i->first.c_str ()] = hnd;
-    ++i;
-    // Test exception. In Qos, max_instances is set to 1
-    // so only one instance may be registered.
-    hnd = writer->register_instance (i->second);
-    if (hnd != ::DDS::HANDLE_NIL)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Shouldn't be able to register instance for <%C> - iteration <%d>\n"),
-          i->first.c_str (), i->second->iteration));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Expected : Registering second key not succeeded.\n"),
-          i->first.c_str (), i->second->iteration));
-      }
-  }
-
-  void
-  Sender_exec_i::start_new_assignment (WRITER_ASSIGNMENT assignment)
-  {
-    this->last_key_ = this->ktests_.begin ();
-    this->assignment_ = assignment;
-    reset_iterations ();
-  }
-
-  void
-  Sender_exec_i::write_keyed ()
-  {
-    WriterTestConnector::Writer_var writer =
-      this->ciao_context_->get_connection_info_write_data ();
-
-    if (this->last_key_ != this->ktests_.end ())
-      {
-        bool exception_caught = false;
-        try
-          {
-            ++this->last_key_->second->iteration;
-            ::DDS::InstanceHandle_t const hnd =
-              this->handles_[this->last_key_->first.c_str ()];
-            writer->write_one (this->last_key_->second, hnd);
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Written keyed <%C> - iteration <%d> - handle ")
-                    DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER ACE_TEXT ("\n"),
-                    this->last_key_->first.c_str (),
-                    this->last_key_->second->iteration,
-                    DDS_INSTANCE_HANDLE_LOG(hnd)));
-          }
-        catch (const CCM_DDS::InternalError& )
-          {
-            exception_caught = true;
-            if (this->last_key_ == this->ktests_.begin ())
-              {
-                // The first key should throw this exception; all others
-                // shouldn't
-                ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                            ACE_TEXT ("while updating writer info for <%C>.\n"),
-                              this->last_key_->first.c_str ()));
-              }
-          }
-        // Only the first iterations are registered.
-        if (this->last_key_ != this->ktests_.begin () && !exception_caught)
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: No exception caught ")
-                    ACE_TEXT ("while writing unregistered data\n")));
-          }
-        ++this->last_key_;
-      }
-    else
-      {
-        // Onto the next iteration
-        this->last_key_ = this->ktests_.begin ();
-        while (this->last_key_ != this->ktests_.end ())
-          {
-            if (this->last_key_->second->iteration == this->iterations_)
-              {
-                //next key
-                ++this->last_key_;
-              }
-            else
-              {
-                break;
-              }
-          }
-        if (this->last_key_ == this->ktests_.end ())
-          {
-            unregister_handles ();
-            start_new_assignment (WRITE_MULTI);
-          }
-      }
-  }
-
-  void
-  Sender_exec_i::write_many ()
-  {
-    bool expected_exception_thrown = false;
-    WriterTestConnector::Writer_var writer =
-      this->ciao_context_->get_connection_info_write_data ();
-
-    WriterTestSeq write_many_seq;
-    write_many_seq.length (this->keys_ * this->iterations_);
-    ::CORBA::ULong iter_key = 0;
-    for (Writer_Table::iterator iter = this->ktests_.begin ();
-         iter != this->ktests_.end ();
-         ++iter)
-      {
-        ++iter_key;
-        for (int i = 1; i < this->iterations_ + 1; ++i)
-          {
-            char key[7];
-            WriterTest new_key;
-            ACE_OS::sprintf (key, "KEY_%d", iter_key);
-            new_key.key = CORBA::string_dup(key);
-            new_key.iteration = i;
-            write_many_seq[iter_key + i - 2] = new_key;
-          }
-      }
-    try
-      {
-        writer->write_many (write_many_seq);
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        if (ex.index == 0)
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal excep ")
-                        ACE_TEXT ("while write many for first instance : index <%d> - retval <%d>\n"),
-                          ex.index, ex.error_code));
-          }
-        else
-          {
-            expected_exception_thrown = true;
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Expected Internal excep ")
-                    ACE_TEXT ("while write many writer info: index <%d> - retval <%d>\n"),
-                      ex.index, ex.error_code));
-          }
-      }
-    if (!expected_exception_thrown)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR : Expected Internal excep ")
-                ACE_TEXT ("was not thrown\n")));
-      }
-
-    this->assignment_ = WRITE_NONE;
-  }
-
-  void
-  Sender_exec_i::tick ()
-  {
-    switch (this->assignment_)
-      {
-        case WRITE_KEYED:
-          write_keyed ();
-          break;
-        case WRITE_MULTI:
-          write_many ();
-        default:
-          break;
-      }
-  }
-
-  void
-  Sender_exec_i::get_started (void)
-  {
-    this->start ();
-
-    ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard,
-                        this->mutex_, CORBA::INTERNAL ());
-
-    for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i)
-      {
-        char key[7];
-        WriterTest *new_key = new WriterTest;
-        ACE_OS::sprintf (key, "KEY_%d", i);
-        new_key->key = CORBA::string_dup(key);
-        new_key->iteration = 1;
-
-        this->ktests_[key] = new_key;
-      }
-    this->last_key_ = this->ktests_.begin ();
-    register_handles ();
-    reset_iterations ();
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    long const usec = 1000000 / this->rate_;
-    if (this->reactor ()->schedule_timer (
-                this->ticker_,
-                0,
-                ACE_Time_Value (0, usec),
-                ACE_Time_Value (0, usec)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                              ACE_TEXT ("Error scheduling timer")));
-      }
-  }
-
-  void
-  Sender_exec_i::stop (void)
-  {
-    this->reactor ()->cancel_timer (this->ticker_);
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n")));
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Writer_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.h
deleted file mode 100644
index 38e2567c28c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.h
+++ /dev/null
@@ -1,173 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_WRITER_SENDER_EXEC_AJ8QK5_H_
-#define CIAO_WRITER_SENDER_EXEC_AJ8QK5_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Writer_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-#include <map>
-
-namespace CIAO_Writer_Sender_Impl
-{
-  class Sender_exec_i;
-
-  enum WRITER_ASSIGNMENT {
-    WRITE_NONE,
-    WRITE_KEYED,
-    WRITE_MULTI
-  };
-
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  class SENDER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Sender_exec_i &callback);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-      void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                                 ::DDS::StatusKind status_kind);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  //============================================================
-  // pulse_Generator
-  //============================================================
-  class pulse_Generator :
-    public ACE_Event_Handler
-  {
-  public:
-    pulse_Generator (Sender_exec_i &callback);
-    /// Handle the timeout.
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    /// Maintains a handle that actually process the event
-    Sender_exec_i &pulse_callback_;
-  };
-
-  class SENDER_EXEC_Export Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_connector_status (void);
-
-    virtual ::CORBA::UShort
-    rate (void);
-
-    virtual void
-    rate (
-      ::CORBA::UShort rate);
-
-    virtual ::CORBA::UShort
-    iterations (void);
-
-    virtual void
-    iterations (
-      ::CORBA::UShort iterations);
-
-    virtual ::CORBA::UShort
-    keys (void);
-
-    virtual void
-    keys (
-      ::CORBA::UShort keys);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete (void);
-
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    void tick ();
-    void get_started (void);
-
-  private:
-    void start (void);
-    void stop (void);
-
-    pulse_Generator * ticker_;
-    ::Writer::CCM_Sender_Context_var ciao_context_;
-
-    ::CORBA::UShort rate_;
-
-    ::CORBA::UShort iterations_;
-
-    ::CORBA::UShort keys_;
-    WRITER_ASSIGNMENT assignment_;
-    CORBA::Long last_iteration_;
-
-    void reset_iterations ();
-    void register_handles ();
-    void unregister_handles ();
-    void start_new_assignment (
-        WRITER_ASSIGNMENT assignment);
-    void write_keyed ();
-    void write_many ();
-
-    TAO_SYNCH_MUTEX mutex_;
-    typedef std::map<ACE_CString, WriterTest_var> Writer_Table;
-    Writer_Table ktests_;
-
-    typedef std::map<ACE_CString, ::DDS::InstanceHandle_t> Writer_Table_Handles;
-    Writer_Table_Handles handles_;
-
-    Writer_Table::iterator last_key_;
-
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Writer_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/KeyedWriter_Library.xml b/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/KeyedWriter_Library.xml
deleted file mode 100644
index 9a0058b545a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/KeyedWriter_Library.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-
-  <qos_profile name="KeyedWriterProfile">
-    <!-- QoS used to configure the data writer created in the example code -->
-    <datawriter_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-        <max_blocking_time>
-          <sec>10</sec>
-          <nanosec>0</nanosec>
-        </max_blocking_time>
-      </reliability>
-      <durability>
-        <kind>TRANSIENT_DURABILITY_QOS</kind>
-      </durability>
-      <history>
-        <kind>KEEP_LAST_HISTORY_QOS</kind>
-        <depth>20</depth>
-      </history>
-      <resource_limits>
-        <max_instances>1</max_instances>
-        <initial_instances>1</initial_instances>
-      </resource_limits>
-    </datawriter_qos>
-    <!-- QoS used to configure the data reader created in the example code -->
-    <datareader_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-      </reliability>
-      <history>
-        <kind>KEEP_LAST_HISTORY_QOS</kind>
-        <depth>20</depth>
-      </history>
-      <durability>
-        <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-      </durability>
-    </datareader_qos>
-  </qos_profile>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/Plan.cdp
deleted file mode 100644
index bee6cd9054f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/Plan.cdp
+++ /dev/null
@@ -1,427 +0,0 @@
-<!--  -->
-<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>KeyedWriter_Depl_1</label>
-  <UUID>KeyedWriter_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Writer_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Writer_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Writer_ConnectorComponentImplementation">
-    <name>Writer_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Writer_Connector_ExecArtifact" />
-    <artifact xmi:idref="Writer_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_WriterTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_WriterTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Writer_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Writer_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Writer_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Writer_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>3</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>2</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="Writer_ConnectorComponentInstance">
-    <name>Writer_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Writer_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>KeyedWriter</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>KeyedWriter_Library#KeyedWriterProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="Writer_ConnectorComponentInstance2">
-    <name>Writer_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Writer_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>KeyedWriter</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>KeyedWriter_Library#KeyedWriterProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>1</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>3</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>2</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Writer_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>_datacontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Writer_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Writer_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Writer_ConnectorComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="Writer_Connector_ExecArtifact">
-    <name>Writer_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_KeyedWriterConnector_exec</location>
-  </artifact>
-  <artifact xmi:id="Writer_Connector_SvntArtifact">
-    <name>Writer_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_KeyedWriterConnector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Writer_Connector_StubArtifact">
-    <name>Writer_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_KeyedWriterConnector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index 4a2347f0029..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-Description
-XML QoS Profile
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="KeyedWriter_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="KeyedWriterProfile" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>10</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_LAST_HISTORY_QOS</kind>
-          <depth>20</depth>
-        </history>
-        <resource_limits>
-          <max_instances>1</max_instances>
-          <initial_instances>1</initial_instances>
-        </resource_limits>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_LAST_HISTORY_QOS</kind>
-          <depth>20</depth>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl
deleted file mode 100755
index 87984594507..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 60 seconds to allow task to complete\n";
-sleep (60);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/README b/CIAO/connectors/dds4ccm/tests/LateBinding/README
deleted file mode 100644
index 91cd5ff4d98..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/README
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-Normally when a DDS4CCM connector starts, it prepares DDS by creating
-several DDS entities, like a domain participant and topic.
-LateBinding means that a DDS4CCM connector is started but doesn't prepare
-DDS (apart from a domain participant). The only thing the user has to do
-is leave the topic_name in the deployment plan blank.
-When a topic name is provided later on, the DDS4CCM connector will start
-to prepare DDS.
-
-There're two test created:
-1. ReadGet
-In this test, the topic name for the sender DDS4CCM connector is provided by
-the deployment plan. Therefor the sender is allowed to write samples a
-little while after the component is activated. After the sender has written
-its samples, it informs the receiver about this via the ReaderStarter interface
-(see Base/ReaderStarter.idl). ReaderStarter is a 'normal' interface (no DDS4CCM
-connector). The connection is listed in the deployment plan.
-
-The deployment plan doens't provide a topic name for the DDS4CCM connector
-on the receiver side. This means that the receiver need to set the topic name
-programmatically.
-When the receiver is signaled by the sender that is allowed to read the samples, it
-first tests whether an BAD_INV exception is thrown when a component starts reading
-without having set the topic name.
-After that the topic name is set programmatically (see RG_LateBinding_Receiver_impl.cpp,
-set_topic_name_reader ()).
-After that, the receiver starts to check whether the latest expected sample is
-available in DDS. If so, the receiver starts to read the data.
-The receiver also checks whether a NonChangeable exception is thrown when the topic
-name is set a second time.
-
-In this test, the executor code on the receiver side (RG_LateBinding_Receiver_exec.cpp)
-works as a proxy between CIAO and the actual implementation (RG_LateBinding_Receiver_impl.cpp).
-This is the best way since the executor code is separeted from the business logic.
-
-2. WriteUpdate
-
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.idl b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.idl
deleted file mode 100644
index b5c6b38d89a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file RG_LateBinding_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RG_LATEBINDING_BASE_IDL
-#define RG_LATEBINDING_BASE_IDL
-
-#pragma ndds typesupport "Base/RG_LateBinding_BaseSupport.h"
-#pragma opendds typesupport "Base/RG_LateBinding_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "RG_LateBindingTest"
-#pragma DCPS_DATA_KEY "RG_LateBindingTest key"
-
-struct RG_LateBindingTest {
-  string key; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<RG_LateBindingTest> RG_LateBindingTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.mpc b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.mpc
deleted file mode 100644
index d5836d47455..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (RG_LateBindingBase_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = RG_LateBindingBase_stub
-  dynamicflags += RG_LATEBINDING_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=RG_LATEBINDING_BASE_STUB_Export \
-              -Wb,stub_export_include=LateBinding_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    RG_LateBinding_Base.idl
-  }
-
-  opendds_ts_flags += --export=RG_LATEBINDING_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    RG_LateBinding_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/Reader_Starter.idl b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/Reader_Starter.idl
deleted file mode 100644
index 9fc6196148d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/Reader_Starter.idl
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * @file Reader_Starter.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef READER_STARTER_IDL
-#define READER_STARTER_IDL
-
-#pragma ciao lem "Base/Reader_StarterE.idl"
-
-interface ReaderStarter
-{
-  void start_read ();
-  void set_reader_properties (in unsigned short nr_keys,
-                              in unsigned short nr_iterations);
-};
-
-#endif /* READER_STARTER_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/Reader_Starter.mpc b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/Reader_Starter.mpc
deleted file mode 100644
index 5d746aae933..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/Reader_Starter.mpc
+++ /dev/null
@@ -1,110 +0,0 @@
-project(Reader_Starter_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after +=
-  idlflags += -Wb,stub_export_macro=READER_STARTER_STUB_Export \
-              -Wb,stub_export_include=Reader_Starter_stub_export.h \
-              -Wb,skel_export_macro=READER_STARTER_SVNT_Export \
-              -Wb,skel_export_include=Reader_Starter_svnt_export.h \
-              -Wb,svnt_export_macro=READER_STARTER_SVNT_Export \
-              -Wb,svnt_export_include=Reader_Starter_svnt_export.h \
-              -Wb,exec_export_macro=READER_STARTER_EXEC_Export \
-              -Wb,exec_export_include=Reader_Starter_exec_export.h -I..
-
-  IDL_Files {
-    Reader_Starter.idl
-  }
-}
-
-project(Reader_Starter_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += Reader_Starter_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=READER_STARTER_LEM_STUB_Export \
-              -Wb,stub_export_include=Reader_Starter_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    Reader_StarterE.idl
-  }
-}
-
-project(Reader_Starter_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += Reader_Starter_lem_gen Reader_Starter_stub
-  libs  += Reader_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Reader_Starter_lem_stub
-  dynamicflags += READER_STARTER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_StarterEC.cpp
-  }
-
-  Header_Files {
-    Reader_StarterEC.h
-    Reader_Starter_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Reader_StarterEC.inl
-  }
-}
-
-project(Reader_Starter_stub) : ccm_stub, dds4ccm_base {
-  after += Reader_Starter_idl_gen
-  libs  +=
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Reader_Starter_stub
-  dynamicflags += READER_STARTER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_StarterC.cpp
-  }
-
-  Header_Files {
-    Reader_StarterC.h
-    Reader_Starter_stub_export.h
-  }
-
-  Inline_Files {
-    Reader_StarterC.inl
-  }
-}
-
-
-project(Reader_Starter_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   Reader_Starter_lem_stub Reader_Starter_stub
-  sharedname  = Reader_Starter_svnt
-  libs       += Reader_Starter_stub Reader_Starter_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += READER_STARTER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_StarterS.cpp
-    Reader_Starter_svnt.cpp
-  }
-
-  Header_Files {
-    Reader_StarterS.h
-    Reader_Starter_svnt.h
-    Reader_Starter_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.idl b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.idl
deleted file mode 100644
index bed24d9fcac..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file RG_LateBinding_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RG_LATEBINDING_CONNECTOR_IDL_
-#define RG_LATEBINDING_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/RG_LateBinding_Base.idl"
-
-#pragma ciao lem "Connector/RG_LateBinding_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/RG_LateBinding_BaseTypeSupport.idl"
-#endif
-
-module RG_LateBinding
-{
-  module ::CCM_DDS::Typed < ::RG_LateBindingTest, ::RG_LateBindingTestSeq> RG_LateBindingTestConnector;
-};
-
-#endif /* RG_LateBinding_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.mpc b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.mpc
deleted file mode 100644
index 36c96d27d93..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.mpc
+++ /dev/null
@@ -1,146 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p RG_LateBindingBase -l .. -o ../lib -u DDS RG_LateBinding_Connector"
-
-project (RG_LateBindingConnector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen RG_LateBindingBase_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RG_LATEBINDING_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=LateBinding_Connector_stub_export.h \
-              -Wb,skel_export_macro=RG_LATEBINDING_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=LateBinding_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=RG_LATEBINDING_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=LateBinding_Connector_svnt_export.h \
-              -Wb,conn_export_macro=RG_LATEBINDING_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=LateBinding_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    RG_LateBinding_Connector.idl
-  }
-}
-
-project (RG_LateBindingConnector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += RG_LateBindingConnector_idl_gen
-  idlflags += -Wb,stub_export_macro=RG_LATEBINDING_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=RG_LateBinding_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    RG_LateBinding_ConnectorE.idl
-  }
-}
-
-project (RG_LateBindingConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += RG_LateBindingConnector_lem_gen RG_LateBindingConnector_stub \
-           RG_LateBindingBase_stub
-  libs  += RG_LateBindingBase_stub RG_LateBindingConnector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = RG_LateBindingConnector_lem_stub
-  dynamicflags += RG_LATEBINDING_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    RG_LateBinding_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    RG_LateBinding_ConnectorEC.h
-    RG_LateBinding_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    RG_LateBinding_ConnectorEC.inl
-  }
-}
-
-project (RG_LateBindingConnector_stub) : ccm_stub, dds4ccm_base {
-  after += RG_LateBindingConnector_idl_gen RG_LateBindingBase_stub
-  libs  += RG_LateBindingBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = RG_LateBindingConnector_stub
-  dynamicflags += RG_LATEBINDING_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    RG_LateBinding_ConnectorC.cpp
-  }
-
-  Header_Files {
-    RG_LateBinding_ConnectorC.h
-    RG_LateBinding_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    RG_LateBinding_ConnectorC.inl
-  }
-}
-
-project (RG_LateBindingConnector_exec) : ciao_executor, dds4ccm_impl {
-  after   += RG_LateBindingConnector_lem_stub RG_LateBindingConnector_stub \
-             RG_LateBindingBase_stub
-  sharedname = RG_LateBindingConnector_exec
-  libs += RG_LateBindingConnector_stub RG_LateBindingConnector_lem_stub \
-          RG_LateBindingBase_stub RG_LateBindingBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RG_LATEBINDING_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    RG_LateBinding_Connector_conn.cpp
-  }
-
-  Header_Files {
-    RG_LateBinding_Connector_conn.h
-    RG_LateBinding_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project (RG_LateBindingConnector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += RG_LateBindingConnector_lem_stub RG_LateBindingConnector_exec \
-                RG_LateBindingConnector_stub
-  sharedname  = RG_LateBindingConnector_svnt
-  libs       += RG_LateBindingConnector_stub \
-                RG_LateBindingConnector_lem_stub  \
-                RG_LateBindingBase_stub \
-                RG_LateBindingConnector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RG_LATEBINDING_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    RG_LateBinding_ConnectorS.cpp
-    RG_LateBinding_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    RG_LateBinding_ConnectorS.h
-    RG_LateBinding_Connector_svnt.h
-    RG_LateBinding_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver.idl b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver.idl
deleted file mode 100644
index 1200b3f78b6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/RG_LateBinding_Connector.idl"
-#include "Base/Reader_Starter.idl"
-
-module RG_LateBinding
-{
-  component Receiver
-  {
-    port RG_LateBindingTestConnector::DDS_Get info_get;
-    port RG_LateBindingTestConnector::DDS_Read info_read;
-
-    provides ReaderStarter start_reading;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver.mpc
deleted file mode 100644
index 7332a7f6d2a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver.mpc
+++ /dev/null
@@ -1,155 +0,0 @@
-project (RG_LateBindingReceiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += RG_LateBindingConnector_idl_gen
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h \
-              -I..
-  IDL_Files {
-    RG_LateBinding_Receiver.idl
-  }
-}
-
-project (RG_LateBindingReceiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += RG_LateBindingReceiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    RG_LateBinding_ReceiverE.idl
-  }
-}
-
-project (RG_LateBindingReceiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after +=  RG_LateBindingReceiver_lem_gen RG_LateBindingReceiver_stub  RG_LateBindingConnector_stub \
-            RG_LateBindingBase_stub Reader_Starter_stub
-  libs  +=  Receiver_stub RG_LateBindingConnector_stub RG_LateBindingBase_stub \
-            Reader_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    RG_LateBinding_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    RG_LateBinding_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    RG_LateBinding_ReceiverEC.inl
-  }
-}
-
-project (RG_LateBindingReceiver_stub) : ccm_stub, dds4ccm_base {
-  after +=  RG_LateBindingReceiver_idl_gen  RG_LateBindingConnector_stub \
-            RG_LateBindingBase_stub RG_LateBindingConnector_lem_gen \
-            Reader_Starter_stub Reader_Starter_lem_stub
-  libs  +=  RG_LateBindingConnector_stub RG_LateBindingBase_stub \
-            Reader_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    RG_LateBinding_ReceiverC.cpp
-  }
-
-  Header_Files {
-    RG_LateBinding_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    RG_LateBinding_ReceiverC.inl
-  }
-}
-
-project (RG_LateBindingReceiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += RG_LateBindingReceiver_lem_stub RG_LateBindingReceiver_stub \
-             RG_LateBindingBase_stub RG_LateBindingConnector_stub \
-             RG_LateBindingConnector_lem_stub \
-             Reader_Starter_lem_stub Reader_Starter_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub RG_LateBindingBase_stub \
-          RG_LateBindingConnector_stub RG_LateBindingConnector_lem_stub \
-          Reader_Starter_lem_stub Reader_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    RG_LateBinding_Receiver_exec.cpp
-    RG_LateBinding_Receiver_impl.cpp
-  }
-
-  Header_Files {
-    RG_LateBinding_Receiver_exec.h
-    RG_LateBinding_Receiver_impl.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project (RG_LateBindingReceiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   RG_LateBindingReceiver_lem_stub RG_LateBindingBase_stub \
-                  RG_LateBindingConnector_stub RG_LateBindingConnector_svnt \
-                  RG_LateBindingReceiver_exec RG_LateBindingConnector_lem_stub \
-                  Reader_Starter_stub \
-                  Reader_Starter_svnt Reader_Starter_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub RG_LateBindingBase_stub \
-                RG_LateBindingConnector_stub RG_LateBindingConnector_svnt \
-                Receiver_exec RG_LateBindingConnector_lem_stub \
-                Reader_Starter_stub Reader_Starter_svnt \
-                Reader_Starter_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    RG_LateBinding_ReceiverS.cpp
-    RG_LateBinding_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    RG_LateBinding_ReceiverS.h
-    RG_LateBinding_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.cpp
deleted file mode 100644
index b3aecb9d732..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.cpp
+++ /dev/null
@@ -1,284 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "RG_LateBinding_Receiver_exec.h"
-#include "RG_LateBinding_Receiver_impl.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_RG_LateBinding_Receiver_Impl
-{
-
-  /**
-   * Facet Executor Implementation Class: info_get_status_exec_i
-   */
-
-  info_get_status_exec_i::info_get_status_exec_i (
-        ::RG_LateBinding::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::RG_LateBinding::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_get_status_exec_i::~info_get_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_get_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_get_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_read_status_exec_i
-   */
-
-  info_read_status_exec_i::info_read_status_exec_i (
-        ::RG_LateBinding::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::RG_LateBinding::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_read_status_exec_i::~info_read_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_read_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_read_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: reader_start_exec_i
-   */
-
-  reader_start_exec_i::reader_start_exec_i (
-        ::RG_LateBinding::CCM_Receiver_Context_ptr ctx,
-        Receiver_exec_i &callback)
-    : ciao_context_ (
-        ::RG_LateBinding::CCM_Receiver_Context::_duplicate (ctx))
-      , callback_ (callback)
-  {
-  }
-
-  reader_start_exec_i::~reader_start_exec_i (void)
-  {
-  }
-
-  // Operations from ::ReaderStarter
-
-  void
-  reader_start_exec_i::start_read (void)
-  {
-    this->callback_.start_read ();
-  }
-
-  void
-  reader_start_exec_i::set_reader_properties (::CORBA::UShort nr_keys,
-  ::CORBA::UShort nr_iterations)
-  {
-    this->callback_.keys (nr_keys);
-    this->callback_.iterations (nr_iterations);
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : impl_ (0)
-      , keys_ (5)
-      , iterations_ (0)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-    delete this->impl_;
-  }
-
-  // Supported operations and attributes.
-
-  void
-  Receiver_exec_i::start_read (void)
-  {
-    ACE_NEW_THROW_EX (this->impl_,
-                      RG_LateBinding_Receiver_impl (
-                        this->ciao_context_.in (),
-                        this->iterations_,
-                        this->keys_),
-                      ::CORBA::INTERNAL ());
-    this->impl_->start ();
-  }
-
-  void
-  Receiver_exec_i::keys (::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  void
-  Receiver_exec_i::iterations (::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-  // Component attributes and port operations.
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_get_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_get_status_.in ()))
-      {
-        info_get_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_get_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_get_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_get_status_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_read_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_read_status_.in ()))
-      {
-        info_read_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_read_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_read_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_read_status_.in ());
-  }
-
-  ::CCM_ReaderStarter_ptr
-  Receiver_exec_i::get_start_reading (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_reader_start_.in ()))
-      {
-        reader_start_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          reader_start_exec_i (
-            this->ciao_context_.in (),
-            *this),
-            ::CCM_ReaderStarter::_nil ());
-
-          this->ciao_reader_start_ = tmp;
-      }
-
-    return
-      ::CCM_ReaderStarter::_duplicate (
-        this->ciao_reader_start_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::RG_LateBinding::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_RG_LateBinding_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.h
deleted file mode 100644
index 60016c8a865..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.h
+++ /dev/null
@@ -1,214 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_RG_LATEBINDING_RECEIVER_EXEC_QLDZYF_H_
-#define CIAO_RG_LATEBINDING_RECEIVER_EXEC_QLDZYF_H_
-
-#include /**/ "ace/pre.h"
-
-#include "RG_LateBinding_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_RG_LateBinding_Receiver_Impl
-{
-  class RG_LateBinding_Receiver_impl;
-  class Receiver_exec_i;
-
-  /**
-   * Provider Executor Implementation Class: info_get_status_exec_i
-   */
-
-  class info_get_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_get_status_exec_i (
-      ::RG_LateBinding::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_get_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::RG_LateBinding::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_read_status_exec_i
-   */
-
-  class info_read_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_read_status_exec_i (
-      ::RG_LateBinding::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_read_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::RG_LateBinding::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: reader_start_exec_i
-   */
-
-  class reader_start_exec_i
-    : public virtual ::CCM_ReaderStarter,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    reader_start_exec_i (
-      ::RG_LateBinding::CCM_Receiver_Context_ptr ctx,
-      Receiver_exec_i &callback);
-    virtual ~reader_start_exec_i (void);
-
-    //@{
-    /** Operations and attributes from ReaderStarter. */
-
-    virtual
-    void start_read (void);
-
-    virtual
-    void set_reader_properties (::CORBA::UShort nr_keys,
-    ::CORBA::UShort nr_iterations);
-    //@}
-
-  private:
-    ::RG_LateBinding::CCM_Receiver_Context_var ciao_context_;
-    Receiver_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_get_status (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_read_status (void);
-
-    virtual ::CCM_ReaderStarter_ptr
-    get_start_reading (void);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void keys (::CORBA::UShort keys);
-    void iterations (::CORBA::UShort iterations);
-
-    void start_read (void);
-    //@}
-
-  private:
-    ::RG_LateBinding::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_get_status_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_read_status_;
-    ::CCM_ReaderStarter_var ciao_reader_start_;
-
-    RG_LateBinding_Receiver_impl *impl_;
-
-    //@}
-
-    //@{
-    /** User defined members. */
-    ::CORBA::UShort keys_;
-    ::CORBA::UShort iterations_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_RG_LateBinding_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.cpp b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.cpp
deleted file mode 100644
index d41f01ef4f2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.cpp
+++ /dev/null
@@ -1,373 +0,0 @@
-#include "RG_LateBinding_Receiver_impl.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_RG_LateBinding_Receiver_Impl
-{
-
-  /**
-   * Check last
-   */
-  LastSampleChecker::LastSampleChecker (RG_LateBinding_Receiver_impl &callback,
-                                        const ::CORBA::UShort &iterations)
-    : callback_ (callback)
-      , iterations_ (iterations)
-  {
-  }
-
-  LastSampleChecker::~LastSampleChecker ()
-  {
-  }
-
-  int
-  LastSampleChecker::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Checking if last sample "
-                          "is available in DDS...\n"));
-    if (this->callback_.check_last ())
-      {
-        this->callback_.start_read ();
-      }
-    return 0;
-  }
-
-  /**
-   * RG_LateBinding_Receiver_impl
-   */
-  RG_LateBinding_Receiver_impl::RG_LateBinding_Receiver_impl (
-      ::RG_LateBinding::CCM_Receiver_Context_ptr ctx,
-      const ::CORBA::UShort & iterations,
-      const ::CORBA::UShort & keys)
-    : ciao_context_ (
-        ::RG_LateBinding::CCM_Receiver_Context::_duplicate (ctx))
-    , iterations_ (iterations)
-    , keys_ (keys)
-    , checker_ (0)
-  {
-  }
-
-  RG_LateBinding_Receiver_impl::~RG_LateBinding_Receiver_impl ()
-  {
-    delete this->checker_;
-  }
-
-  ACE_Reactor*
-  RG_LateBinding_Receiver_impl::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  bool
-  RG_LateBinding_Receiver_impl::check_last (void)
-  {
-    ::RG_LateBinding::RG_LateBindingTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_info_read_data ();
-    try
-      {
-        RG_LateBindingTest datum;
-        ::CCM_DDS::ReadInfo readinfo;
-        char key[10];
-        ACE_OS::sprintf (key, "KEY_%d", this->keys_);
-        datum.key = CORBA::string_dup (key);
-        reader->read_one_last (
-                datum,
-                readinfo,
-                ::DDS::HANDLE_NIL);
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_last - "
-                              "last iteration <%02d> - <%02d>\n",
-                               datum.iteration,
-                               this->iterations_));
-        return datum.iteration >= this->iterations_;
-      }
-    catch (const ::CCM_DDS::InternalError &)
-      {
-      }
-    catch (const ::CCM_DDS::NonExistent &)
-      {
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::check_last: "
-                              "ERROR: Unexpected exception caught\n"));
-      }
-    return false;
-  }
-
-  void
-  RG_LateBinding_Receiver_impl::start (void)
-  {
-    this->test_exception ();
-    this->set_topic_name_reader ();
-
-    ACE_NEW_THROW_EX (this->checker_,
-                      LastSampleChecker (*this,
-                                         this->iterations_),
-                      ::CORBA::NO_MEMORY ());
-    if (this->reactor ()->schedule_timer (this->checker_,
-                                          0,
-                                          ACE_Time_Value (1, 0),
-                                          ACE_Time_Value (1, 0)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::schedule_timer - "
-                  "ERROR: Error while starting LastSampleChecker\n"));
-      }
-  }
-
-  void
-  RG_LateBinding_Receiver_impl::start_read ()
-  {
-    if (this->checker_)
-      {
-        this->reactor ()->cancel_timer (this->checker_);
-      }
-    this->start_reading ();
-    this->set_topic_name_getter ();
-    this->start_getting ();
-    this->set_topic_name_reader ();
-    this->set_topic_name_getter ();
-  }
-
-  void
-  RG_LateBinding_Receiver_impl::check_samples (
-    const char * test,
-    const RG_LateBindingTestSeq& samples,
-    const ::CORBA::UShort& expected)
-  {
-    bool error = samples.length () != expected;
-    if (ACE_OS::strcmp (test, "get") == 0)
-      {
-        error = !(samples.length () > 0);
-      }
-    if (error)
-      {
-        ACE_ERROR ((LM_ERROR, "RG_LateBinding_Receiver_impl::check_samples - "
-                    "ERROR: Unexpected number of %C samples received: "
-                    "expected <%d> - received <%u>\n",
-                    test,
-                    expected,
-                    samples.length ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "RG_LateBinding_Receiver_impl::check_samples - "
-                    "%C Samples found: <%u>\n",
-                    test,
-                    samples.length ()));
-      }
-    for (::CORBA::ULong i = 0;
-         i < samples.length ();
-         ++i)
-      {
-        ACE_DEBUG ((LM_DEBUG, "RG_LateBinding_Receiver_impl::check_samples - "
-                    "Sample %C: sample <%d> - key <%C> - iteration <%d>\n",
-                    test,
-                    i,
-                    samples[i].key.in (),
-                    samples[i].iteration));
-      }
-  }
-
-  void
-  RG_LateBinding_Receiver_impl::test_exception (void)
-  {
-    try
-      {
-        if (! ::CORBA::is_nil (this->ciao_context_.in ()))
-          {
-            ::RG_LateBinding::RG_LateBindingTestConnector::Reader_var reader =
-              this->ciao_context_->get_connection_info_read_data ();
-            if (::CORBA::is_nil (reader.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, "RG_LateBinding_Receiver_impl::test_exception - "
-                            "ERROR: Unable to get writer interface from the "
-                            "CIAO context\n"));
-                return;
-              }
-
-            RG_LateBindingTest sample;
-            ::CCM_DDS::ReadInfo readinfo;
-            sample.key = CORBA::string_dup ("KEY_1");
-            reader->read_one_last (sample,
-                                   readinfo,
-                                   ::DDS::HANDLE_NIL);
-            ACE_ERROR ((LM_ERROR, "RG_LateBinding_Receiver_impl::test_exception - "
-                        "ERROR: No exception caught before topic name has been set\n"));
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "RG_LateBinding_Receiver_impl::test_exception - "
-                        "ERROR: CIAO context seems to be NIL\n"));
-          }
-      }
-    catch (const ::CORBA::BAD_INV_ORDER &)
-      {
-        ACE_DEBUG ((LM_DEBUG, "RG_LateBinding_Receiver_impl::test_exception - "
-                    "Expected BAD_INV_ORDER thrown.\n"));
-      }
-    catch (const CORBA::Exception &e)
-      {
-        e._tao_print_exception("RG_LateBinding_Receiver_impl::test_exception - "
-                               "ERROR: Unexpected exception");
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "RG_LateBinding_Receiver_impl::test_exception - "
-                    "ERROR: expected and unknown exception caught\n"));
-      }
-  }
-
-  void
-  RG_LateBinding_Receiver_impl::start_reading (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "RG_LateBinding_Receiver_impl::start_reading - "
-                "Start reading\n"));
-    ::RG_LateBinding::RG_LateBindingTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_info_read_data ();
-    try
-      {
-        RG_LateBindingTestSeq samples;
-        ::CCM_DDS::ReadInfoSeq readinfo_seq;
-        reader->read_all (samples, readinfo_seq);
-        this->check_samples ("read", samples, this->iterations_ * this->keys_);
-      }
-    catch (const CORBA::Exception &e)
-      {
-        e._tao_print_exception("RG_LateBinding_Receiver_impl::start_reading - "
-                               "ERROR: Unexpected exception");
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "RG_LateBinding_Receiver_impl::start_reading - "
-                    "ERROR: Caught unknow exception\n"));
-      }
-  }
-
-  void
-  RG_LateBinding_Receiver_impl::start_getting (void)
-  {
-    try
-      {
-        ::RG_LateBinding::RG_LateBindingTestConnector::Getter_var getter =
-          this->ciao_context_->get_connection_info_get_fresh_data ();
-        if (::CORBA::is_nil (getter.in ()))
-          {
-            ACE_DEBUG ((LM_DEBUG, "RG_LateBinding_Receiver_impl::start_getting - "
-                        "ERROR: Unable to get writer interface from the "
-                        "CIAO context\n"));
-            return;
-          }
-        DDS::Duration_t to;
-        to.sec = 1;
-        to.nanosec = 0;
-        getter->time_out (to);
-
-        RG_LateBindingTestSeq samples;
-        ::CCM_DDS::ReadInfoSeq readinfos;
-        getter->get_many (samples, readinfos);
-        this->check_samples ("get", samples);
-      }
-    catch (const CORBA::Exception &e)
-      {
-        e._tao_print_exception("RG_LateBinding_Receiver_impl::start_getting - "
-                               "ERROR: Unexpected exception");
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "RG_LateBinding_Receiver_impl::start_getting - "
-                    "ERROR: expected and unknown exception caught\n"));
-      }
-  }
-
-  void
-  RG_LateBinding_Receiver_impl::set_topic_name_reader (void)
-  {
-    try
-      {
-        ACE_DEBUG ((LM_DEBUG, "RG_LateBinding_Receiver_impl::set_topic_name_reader - "
-                    "Setting topic name\n"));
-        ::RG_LateBinding::RG_LateBindingTestConnector::Reader_var reader =
-          this->ciao_context_->get_connection_info_read_data ();
-        if (::CORBA::is_nil (reader.in ()))
-            {
-              ACE_ERROR ((LM_ERROR, "ERROR: RG_LateBinding_Receiver_impl::set_topic_name_reader - "
-                                    "Unable to get reader interface\n"));
-              throw ::CORBA::INTERNAL ();
-            }
-        ::CORBA::Object_var cmp = reader->_get_component ();
-        if (::CORBA::is_nil (cmp.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: RG_LateBinding_Receiver_impl::set_topic_name_reader - "
-                                  "Unable to get component interface\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-        ::RG_LateBinding::RG_LateBindingTestConnector::CCM_DDS_State_var conn =
-          ::RG_LateBinding::RG_LateBindingTestConnector::CCM_DDS_State::_narrow (cmp.in ());
-        if (::CORBA::is_nil (conn.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: RG_LateBinding_Receiver_impl::set_topic_name_reader - "
-                                  "Unable to narrow connector interface\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-        conn->topic_name ("LateBindingTopic");
-      }
-    catch (const ::CCM_DDS::NonChangeable &)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: RG_LateBinding_Receiver_impl::set_topic_name_reader - "
-                    "Caught NonChangeable exception.\n"));
-      }
-  }
-
-  void
-  RG_LateBinding_Receiver_impl::set_topic_name_getter (void)
-  {
-    try
-      {
-        ACE_DEBUG ((LM_DEBUG, "RG_LateBinding_Receiver_impl::set_topic_name_getter - "
-                    "Setting topic name\n"));
-        ::RG_LateBinding::RG_LateBindingTestConnector::Getter_var getter =
-          this->ciao_context_->get_connection_info_get_fresh_data ();
-        if (::CORBA::is_nil (getter.in ()))
-            {
-              ACE_ERROR ((LM_ERROR, "ERROR: RG_LateBinding_Receiver_impl::set_topic_name_getter - "
-                                    "Unable to get getter interface\n"));
-              throw ::CORBA::INTERNAL ();
-            }
-          ::CORBA::Object_var cmp = getter->_get_component ();
-          if (::CORBA::is_nil (cmp.in ()))
-            {
-              ACE_ERROR ((LM_ERROR, "ERROR: RG_LateBinding_Receiver_impl::set_topic_name_getter - "
-                                    "Unable to get component interface\n"));
-              throw ::CORBA::INTERNAL ();
-            }
-        ::RG_LateBinding::RG_LateBindingTestConnector::CCM_DDS_Event_var conn =
-          ::RG_LateBinding::RG_LateBindingTestConnector::CCM_DDS_Event::_narrow (cmp.in ());
-        if (::CORBA::is_nil (conn.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: RG_LateBinding_Receiver_impl::set_topic_name_getter - "
-                                  "Unable to narrow connector interface\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-        conn->topic_name ("LateBindingTopic");
-      }
-    catch (const ::CCM_DDS::NonChangeable &)
-      {
-        ACE_ERROR ((LM_ERROR, "RG_LateBinding_Receiver_impl::set_topic_name_getter - "
-                    "ERROR: Caught NonChangeable exception.\n"));
-      }
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.h b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.h
deleted file mode 100644
index 4a721f26dc5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.h
+++ /dev/null
@@ -1,69 +0,0 @@
-#ifndef RG_LATEBINDING_RECEIVER_IMPL_H_
-#define RG_LATEBINDING_RECEIVER_IMPL_H_
-
-#include "RG_LateBinding_ReceiverEC.h"
-
-namespace CIAO_RG_LateBinding_Receiver_Impl
-{
-  class RG_LateBinding_Receiver_impl;
-
-  /**
-   * LastSampleChecker
-   */
-  class LastSampleChecker
-    : public ACE_Event_Handler
-  {
-  public:
-    LastSampleChecker (RG_LateBinding_Receiver_impl &callback,
-                       const ::CORBA::UShort &iterations);
-
-    virtual ~LastSampleChecker (void);
-
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    RG_LateBinding_Receiver_impl &callback_;
-    const ::CORBA::UShort iterations_;
-
-  };
-
-  /**
-   * RG_LateBinding_Receiver_impl
-   */
-  class RG_LateBinding_Receiver_impl
-  {
-  public:
-    RG_LateBinding_Receiver_impl (
-      ::RG_LateBinding::CCM_Receiver_Context_ptr ctx,
-      const ::CORBA::UShort & iterations,
-      const ::CORBA::UShort & keys);
-    ~RG_LateBinding_Receiver_impl (void);
-
-    void start (void);
-    bool check_last (void);
-    void start_read (void);
-
-  private:
-    ::RG_LateBinding::CCM_Receiver_Context_var ciao_context_;
-    ::CORBA::UShort iterations_;
-    ::CORBA::UShort keys_;
-
-    LastSampleChecker * checker_;
-
-    void set_topic_name_reader ();
-    void set_topic_name_getter ();
-
-    void start_reading (void);
-    void start_getting (void);
-    void test_exception (void);
-
-    void check_samples (
-      const char * test,
-      const RG_LateBindingTestSeq& samples,
-      const ::CORBA::UShort& expected=0);
-
-    ACE_Reactor* reactor (void);
-  };
-};
-
-#endif /* RG_LATEBINDING_RECEIVER_IMPL_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender.idl b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender.idl
deleted file mode 100644
index 729bd69b7ff..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RG_LATEBINDING_SENDER_IDL
-#define RG_LATEBINDING_SENDER_IDL
-
-#include "Connector/RG_LateBinding_Connector.idl"
-#include "Base/Reader_Starter.idl"
-
-module RG_LateBinding
-{
-  component Sender
-  {
-    port RG_LateBindingTestConnector::DDS_Write  info_write;
-
-    attribute unsigned short iterations;
-    attribute unsigned short keys;
-
-    uses ReaderStarter reader_start;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender.mpc b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender.mpc
deleted file mode 100644
index 78eed5dedfb..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender.mpc
+++ /dev/null
@@ -1,150 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p RG_LateBindingBase -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project (RG_LateBindingSender_idl_gen) : componentidldefaults, dds4ccm {
-  after += RG_LateBindingConnector_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I ..
-
-  IDL_Files {
-    RG_LateBinding_Sender.idl
-  }
-}
-
-project (RG_LateBindingSender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += RG_LateBindingSender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    RG_LateBinding_SenderE.idl
-  }
-}
-
-project (RG_LateBindingSender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += RG_LateBindingSender_lem_gen RG_LateBindingSender_stub \
-           RG_LateBindingBase_stub Reader_Starter_stub
-  libs  += RG_LateBindingBase_stub Sender_stub Reader_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    RG_LateBinding_SenderEC.cpp
-  }
-
-  Header_Files {
-    RG_LateBinding_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    RG_LateBinding_SenderEC.inl
-  }
-}
-
-project (RG_LateBindingSender_stub) : ccm_stub, dds4ccm_base {
-  after += RG_LateBindingSender_idl_gen RG_LateBindingBase_stub \
-           RG_LateBindingConnector_stub Reader_Starter_stub \
-           Reader_Starter_lem_stub
-  libs  += RG_LateBindingBase_stub RG_LateBindingConnector_stub \
-           Reader_Starter_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    RG_LateBinding_SenderC.cpp
-  }
-
-  Header_Files {
-    RG_LateBinding_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    RG_LateBinding_SenderC.inl
-  }
-}
-
-project (RG_LateBindingSender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += RG_LateBindingSender_lem_stub RG_LateBindingSender_stub \
-             RG_LateBindingConnector_lem_stub RG_LateBindingConnector_stub \
-             Reader_Starter_svnt Reader_Starter_lem_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub RG_LateBindingBase_stub \
-          RG_LateBindingConnector_lem_stub RG_LateBindingConnector_stub \
-          Reader_Starter_stub Reader_Starter_svnt Reader_Starter_lem_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    RG_LateBinding_Sender_exec.cpp
-  }
-
-  Header_Files {
-    RG_LateBinding_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project (RG_LateBindingSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += RG_LateBindingBase_stub  RG_LateBindingSender_lem_stub RG_LateBindingConnector_stub \
-                RG_LateBindingConnector_svnt RG_LateBindingConnector_lem_stub \
-                Reader_Starter_stub Reader_Starter_lem_stub Reader_Starter_svnt
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                RG_LateBindingBase_stub RG_LateBindingConnector_stub RG_LateBindingConnector_svnt \
-                RG_LateBindingConnector_lem_stub Reader_Starter_stub \
-                Reader_Starter_lem_stub Reader_Starter_svnt
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    RG_LateBinding_SenderS.cpp
-    RG_LateBinding_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    RG_LateBinding_SenderS.h
-    RG_LateBinding_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.cpp
deleted file mode 100644
index c09bc0d4593..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.cpp
+++ /dev/null
@@ -1,229 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "RG_LateBinding_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_RG_LateBinding_Sender_Impl
-{
-
-  /**
-   * Timeout_Handler
-   */
-
-  Timeout_Handler::Timeout_Handler (Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  Timeout_Handler::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    this->callback_.start_write ();
-    return 0;
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : iterations_ (0)
-      , keys_ (0)
-      , to_handler_ (0)
-  {
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Sender_exec_i::start_write (void)
-  {
-    try
-      {
-        ::RG_LateBinding::RG_LateBindingTestConnector:: Writer_var writer =
-          this->ciao_context_->get_connection_info_write_data ();
-        for (::CORBA::UShort key = 1; key < this->keys_ + 1; ++key)
-          {
-            RG_LateBindingTest sample;
-            char tmp[7];
-            ACE_OS::sprintf (tmp, "KEY_%d", key);
-            sample.key = CORBA::string_dup(tmp);
-
-            for (::CORBA::UShort iter = 1; iter < this->iterations_ + 1; ++iter)
-              {
-                sample.iteration = iter;
-                writer->write_one (sample, ::DDS::HANDLE_NIL);
-                ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - "
-                            "Sample written : key <%C> - iteration <%d>\n",
-                            tmp, iter));
-              }
-          }
-        ACE_Time_Value tv (2, 0);
-        ACE_OS::sleep (tv);
-        ReaderStarter_var starter =
-          this->ciao_context_->get_connection_reader_start ();
-        if (!::CORBA::is_nil (starter.in ()))
-          {
-            ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - "
-                      "Inform the receiver that all samples were written\n"));
-            starter->set_reader_properties (this->keys (), this->iterations ());
-            starter->start_read ();
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "Sender_exec_i::start_event_test - "
-                      "ERROR: unable to get connection to the ReaderStarter\n"));
-          }
-      }
-    catch (const ::CCM_DDS::NonChangeable &)
-      {
-        ACE_ERROR ((LM_ERROR, "Sender_exec_i::start_event_test - "
-                              "ERROR: Caught NonChangeable exception.\n"));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "Sender_exec_i::start_event_test - "
-                    "ERROR: Unexpected and unknown exception caught.\n"));
-      }
-  }
-
-
-  // Component attributes and port operations.
-
-  ::CORBA::UShort
-  Sender_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::RG_LateBinding::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-     ACE_NEW_THROW_EX (this->to_handler_,
-                       Timeout_Handler (*this),
-                       ::CORBA::INTERNAL ());
-     if (this->reactor ()->schedule_timer (
-                 this->to_handler_,
-                 0,
-                 ACE_Time_Value (1, 0)) == -1)
-       {
-         ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                               ACE_TEXT ("Error scheduling timer")));
-       }
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    delete this->to_handler_;
-    this->to_handler_ = 0;
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_RG_LateBinding_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.h
deleted file mode 100644
index 8d50a38a418..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.h
+++ /dev/null
@@ -1,133 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_RG_LATEBINDING_SENDER_EXEC_YSJ9S8_H_
-#define CIAO_RG_LATEBINDING_SENDER_EXEC_YSJ9S8_H_
-
-#include /**/ "ace/pre.h"
-
-#include "RG_LateBinding_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_RG_LateBinding_Sender_Impl
-{
-  class Sender_exec_i;
-
-  /**
-   * Timeout_Handler
-   */
-  class Timeout_Handler :
-    public ACE_Event_Handler
-  {
-  public:
-    Timeout_Handler (Sender_exec_i &callback);
-    /// Handle the timeout.
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    /// Maintains a handle that actually process the event
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void start_write (void);
-    //@}
-
-  private:
-    ::RG_LateBinding::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-
-    ::CORBA::UShort iterations_;
-
-    ::CORBA::UShort keys_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    Timeout_Handler *to_handler_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_RG_LateBinding_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/LateBinding_Library.xml b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/LateBinding_Library.xml
deleted file mode 100644
index 5e798c88e8a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/LateBinding_Library.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-
-  <qos_profile name="LateBindingProfile">
-    <datawriter_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-        <max_blocking_time>
-          <sec>10</sec>
-          <nanosec>0</nanosec>
-        </max_blocking_time>
-      </reliability>
-      <durability>
-        <kind>TRANSIENT_DURABILITY_QOS</kind>
-      </durability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-    </datawriter_qos>
-    <datareader_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-      </reliability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-      <durability>
-        <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-      </durability>
-    </datareader_qos>
-  </qos_profile>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/Plan.cdp
deleted file mode 100644
index 5840362a6d3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/Plan.cdp
+++ /dev/null
@@ -1,461 +0,0 @@
-<!--  -->
-<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>LateBinding_Depl_1</label>
-  <UUID>LateBinding_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_RG_LateBinding_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_RG_LateBinding_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="LateBinding_EventConnectorImplementation">
-    <name>LateBinding_EventConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="LateBinding_Connector_ExecArtifact" />
-    <artifact xmi:idref="LateBinding_Connector_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_RG_LateBinding_RG_LateBindingTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_RG_LateBinding_RG_LateBindingTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>RG_LateBinding_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>RG_LateBinding_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="LateBinding_StateConnectorImplementation">
-    <name>LateBinding_StateConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="LateBinding_Connector_ExecArtifact" />
-    <artifact xmi:idref="LateBinding_Connector_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_RG_LateBinding_RG_LateBindingTestConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_RG_LateBinding_RG_LateBindingTestConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>RG_LateBinding_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>RG_LateBinding_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_RG_LateBinding_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_RG_LateBinding_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-  </instance>
-
-  <instance xmi:id="LateBinding_SenderEventConnectorInstance">
-    <name>LateBinding_SenderEventConnectorInstance</name>
-    <node>SenderNode</node>
-    <source/>
-    <implementation xmi:idref="LateBinding_EventConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>LateBindingTopic</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>LateBinding_Library#LateBindingProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="LateBinding_ReceiverEventConnectorInstance">
-    <name>LateBinding_ReceiverEventConnectorInstance</name>
-    <node>ReceiverNode</node>
-    <source/>
-    <implementation xmi:idref="LateBinding_EventConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string></string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>LateBinding_Library#LateBindingProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="LateBinding_ReceiverStateConnectorInstance">
-    <name>LateBinding_ReceiverStateConnectorInstance</name>
-    <node>ReceiverNode</node>
-    <source/>
-    <implementation xmi:idref="LateBinding_StateConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string></string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>LateBinding_Library#LateBindingProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>reader_starter</name>
-    <internalEndpoint>
-      <portName>reader_start</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>start_reading</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>reader_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_read_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>passive_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="LateBinding_ReceiverStateConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>getter_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_fresh_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_fresh_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="LateBinding_ReceiverEventConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="LateBinding_SenderEventConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="LateBinding_Connector_ExecArtifact">
-    <name>RG_LateBinding_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>RG_LateBindingConnector_exec</location>
-  </artifact>
-  <artifact xmi:id="LateBinding_Connector_SvntArtifact">
-    <name>RG_LateBinding_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>RG_LateBindingConnector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index 84fcb573f76..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <qos_library name="LateBinding_Library">
-    <qos_profile name="LateBindingProfile" is_default_qos="false">
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>10</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/run_test.pl
deleted file mode 100755
index 87984594507..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 60 seconds to allow task to complete\n";
-sleep (60);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.idl b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.idl
deleted file mode 100644
index 426f463bad1..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file WU_LateBinding_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef WU_LATEBINDING_BASE_IDL
-#define WU_LATEBINDING_BASE_IDL
-
-#pragma ndds typesupport "Base/WU_LateBinding_BaseSupport.h"
-#pragma opendds typesupport "Base/WU_LateBinding_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "WU_LateBindingTest"
-#pragma DCPS_DATA_KEY "WU_LateBindingTest key"
-
-struct WU_LateBindingTest {
-  string key; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<WU_LateBindingTest> WU_LateBindingTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.mpc b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.mpc
deleted file mode 100644
index 335ea30e1fd..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (WU_LateBindingBase_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = WU_LateBindingBase_stub
-  dynamicflags += WU_LATEBINDING_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=WU_LATEBINDING_BASE_STUB_Export \
-              -Wb,stub_export_include=LateBinding_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    WU_LateBinding_Base.idl
-  }
-
-  opendds_ts_flags += --export=WU_LATEBINDING_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    WU_LateBinding_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.idl b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.idl
deleted file mode 100644
index e8842df52d2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file WU_LateBinding_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef WU_LATEBINDING_CONNECTOR_IDL_
-#define WU_LATEBINDING_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/WU_LateBinding_Base.idl"
-
-#pragma ciao lem "Connector/WU_LateBinding_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/WU_LateBinding_BaseTypeSupport.idl"
-#endif
-
-module WU_LateBinding
-{
-  module ::CCM_DDS::Typed < ::WU_LateBindingTest, ::WU_LateBindingTestSeq> WU_LateBindingTestConnector;
-};
-
-#endif /* WU_LateBinding_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.mpc b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.mpc
deleted file mode 100644
index b79dd250fa6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.mpc
+++ /dev/null
@@ -1,146 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p WU_LateBindingBase -l .. -o ../lib -u DDS WU_LateBinding_Connector"
-
-project (WU_LateBindingConnector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen WU_LateBindingBase_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=WU_LATEBINDING_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=LateBinding_Connector_stub_export.h \
-              -Wb,skel_export_macro=WU_LATEBINDING_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=LateBinding_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=WU_LATEBINDING_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=LateBinding_Connector_svnt_export.h \
-              -Wb,conn_export_macro=WU_LATEBINDING_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=LateBinding_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    WU_LateBinding_Connector.idl
-  }
-}
-
-project (WU_LateBindingConnector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += WU_LateBindingConnector_idl_gen
-  idlflags += -Wb,stub_export_macro=WU_LATEBINDING_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=WU_LateBinding_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    WU_LateBinding_ConnectorE.idl
-  }
-}
-
-project (WU_LateBindingConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += WU_LateBindingConnector_lem_gen WU_LateBindingConnector_stub \
-           WU_LateBindingBase_stub
-  libs  += WU_LateBindingBase_stub WU_LateBindingConnector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = WU_LateBindingConnector_lem_stub
-  dynamicflags += WU_LATEBINDING_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    WU_LateBinding_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    WU_LateBinding_ConnectorEC.h
-    WU_LateBinding_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    WU_LateBinding_ConnectorEC.inl
-  }
-}
-
-project (WU_LateBindingConnector_stub) : ccm_stub, dds4ccm_base {
-  after += WU_LateBindingConnector_idl_gen WU_LateBindingBase_stub
-  libs  += WU_LateBindingBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = WU_LateBindingConnector_stub
-  dynamicflags += WU_LATEBINDING_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    WU_LateBinding_ConnectorC.cpp
-  }
-
-  Header_Files {
-    WU_LateBinding_ConnectorC.h
-    WU_LateBinding_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    WU_LateBinding_ConnectorC.inl
-  }
-}
-
-project (WU_LateBindingConnector_exec) : ciao_executor, dds4ccm_impl {
-  after   += WU_LateBindingConnector_lem_stub WU_LateBindingConnector_stub \
-             WU_LateBindingBase_stub
-  sharedname = WU_LateBindingConnector_exec
-  libs += WU_LateBindingConnector_stub WU_LateBindingConnector_lem_stub \
-          WU_LateBindingBase_stub WU_LateBindingBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += WU_LATEBINDING_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    WU_LateBinding_Connector_conn.cpp
-  }
-
-  Header_Files {
-    WU_LateBinding_Connector_conn.h
-    WU_LateBinding_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project (WU_LateBindingConnector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += WU_LateBindingConnector_lem_stub WU_LateBindingConnector_exec \
-                WU_LateBindingConnector_stub
-  sharedname  = WU_LateBindingConnector_svnt
-  libs       += WU_LateBindingConnector_stub \
-                WU_LateBindingConnector_lem_stub  \
-                WU_LateBindingBase_stub \
-                WU_LateBindingConnector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += WU_LATEBINDING_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    WU_LateBinding_ConnectorS.cpp
-    WU_LateBinding_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    WU_LateBinding_ConnectorS.h
-    WU_LateBinding_Connector_svnt.h
-    WU_LateBinding_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver.idl b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver.idl
deleted file mode 100644
index 23006b60fa6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/WU_LateBinding_Connector.idl"
-
-module WU_LateBinding
-{
-  component Receiver
-  {
-    port WU_LateBindingTestConnector::DDS_Listen info_out_event;
-    port WU_LateBindingTestConnector::DDS_StateListen info_out_state;
-
-    attribute unsigned short iterations;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver.mpc
deleted file mode 100644
index 768ee30fdb4..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver.mpc
+++ /dev/null
@@ -1,140 +0,0 @@
-project (WU_LateBindingReceiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += WU_LateBindingConnector_idl_gen
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h \
-              -I..
-  IDL_Files {
-    WU_LateBinding_Receiver.idl
-  }
-}
-
-project (WU_LateBindingReceiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += WU_LateBindingReceiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    WU_LateBinding_ReceiverE.idl
-  }
-}
-
-project (WU_LateBindingReceiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += WU_LateBindingReceiver_lem_gen WU_LateBindingReceiver_stub  WU_LateBindingConnector_stub WU_LateBindingBase_stub
-  libs  +=  Receiver_stub WU_LateBindingConnector_stub WU_LateBindingBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    WU_LateBinding_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    WU_LateBinding_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    WU_LateBinding_ReceiverEC.inl
-  }
-}
-
-project (WU_LateBindingReceiver_stub) : ccm_stub, dds4ccm_base {
-  after += WU_LateBindingReceiver_idl_gen  WU_LateBindingConnector_stub WU_LateBindingBase_stub WU_LateBindingConnector_lem_gen
-  libs  += WU_LateBindingConnector_stub WU_LateBindingBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    WU_LateBinding_ReceiverC.cpp
-  }
-
-  Header_Files {
-    WU_LateBinding_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    WU_LateBinding_ReceiverC.inl
-  }
-}
-
-project (WU_LateBindingReceiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += WU_LateBindingReceiver_lem_stub WU_LateBindingReceiver_stub \
-             WU_LateBindingBase_stub WU_LateBindingConnector_stub \
-             WU_LateBindingConnector_lem_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub WU_LateBindingBase_stub \
-          WU_LateBindingConnector_stub WU_LateBindingConnector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    WU_LateBinding_Receiver_exec.cpp
-    WU_LateBinding_Receiver_impl.cpp
-  }
-
-  Header_Files {
-    WU_LateBinding_Receiver_exec.h
-    WU_LateBinding_Receiver_impl.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project (WU_LateBindingReceiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   WU_LateBindingReceiver_lem_stub WU_LateBindingBase_stub WU_LateBindingConnector_stub WU_LateBindingConnector_svnt WU_LateBindingReceiver_exec WU_LateBindingConnector_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub WU_LateBindingBase_stub WU_LateBindingConnector_stub WU_LateBindingConnector_svnt Receiver_exec WU_LateBindingConnector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    WU_LateBinding_ReceiverS.cpp
-    WU_LateBinding_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    WU_LateBinding_ReceiverS.h
-    WU_LateBinding_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_exec.cpp
deleted file mode 100644
index 5f78d422ccb..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_exec.cpp
+++ /dev/null
@@ -1,332 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "WU_LateBinding_Receiver_exec.h"
-#include "WU_LateBinding_Receiver_impl.h"
-
-namespace CIAO_WU_LateBinding_Receiver_Impl
-{
-
-  /**
-   * Facet Executor Implementation Class: info_out_event_data_listener_exec_i
-   */
-
-  info_out_event_data_listener_exec_i::info_out_event_data_listener_exec_i (
-        ::WU_LateBinding::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::WU_LateBinding::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_event_data_listener_exec_i::~info_out_event_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::WU_LateBinding::WU_LateBindingTestConnector::Listener
-
-  void
-  info_out_event_data_listener_exec_i::on_one_data (const ::WU_LateBindingTest & datum,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    WU_LateBinding_Receiver_impl::on_one_data(datum);
-  }
-
-  void
-  info_out_event_data_listener_exec_i::on_many_data (const ::WU_LateBindingTestSeq & /* data */,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    WU_LateBinding_Receiver_impl::on_many_data();
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_event_status_exec_i
-   */
-
-  info_out_event_status_exec_i::info_out_event_status_exec_i (
-        ::WU_LateBinding::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::WU_LateBinding::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_event_status_exec_i::~info_out_event_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_out_event_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_event_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_state_data_listener_exec_i
-   */
-
-  info_out_state_data_listener_exec_i::info_out_state_data_listener_exec_i (
-        ::WU_LateBinding::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::WU_LateBinding::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_state_data_listener_exec_i::~info_out_state_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::WU_LateBinding::WU_LateBindingTestConnector::StateListener
-
-  void
-  info_out_state_data_listener_exec_i::on_creation (const ::WU_LateBindingTest & datum,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    WU_LateBinding_Receiver_impl::on_creation(datum);
-  }
-
-  void
-  info_out_state_data_listener_exec_i::on_one_update (const ::WU_LateBindingTest & datum,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    WU_LateBinding_Receiver_impl::on_one_update(datum);
-  }
-
-  void
-  info_out_state_data_listener_exec_i::on_many_updates (const ::WU_LateBindingTestSeq & /* data */,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_state_data_listener_exec_i::on_deletion (const ::WU_LateBindingTest & /* datum */,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_state_status_exec_i
-   */
-
-  info_out_state_status_exec_i::info_out_state_status_exec_i (
-        ::WU_LateBinding::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::WU_LateBinding::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_state_status_exec_i::~info_out_state_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_out_state_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_state_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : iterations_ (0)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-
-  // Component attributes and port operations.
-
-  ::WU_LateBinding::WU_LateBindingTestConnector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_out_event_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_event_data_listener_.in ()))
-      {
-        info_out_event_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_event_data_listener_exec_i (
-            this->ciao_context_.in ()),
-            ::WU_LateBinding::WU_LateBindingTestConnector::CCM_Listener::_nil ());
-
-          this->ciao_info_out_event_data_listener_ = tmp;
-      }
-
-    return
-      ::WU_LateBinding::WU_LateBindingTestConnector::CCM_Listener::_duplicate (
-        this->ciao_info_out_event_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_event_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_event_status_.in ()))
-      {
-        info_out_event_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_event_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_out_event_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_out_event_status_.in ());
-  }
-
-  ::WU_LateBinding::WU_LateBindingTestConnector::CCM_StateListener_ptr
-  Receiver_exec_i::get_info_out_state_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_state_data_listener_.in ()))
-      {
-        info_out_state_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_state_data_listener_exec_i (
-            this->ciao_context_.in ()),
-            ::WU_LateBinding::WU_LateBindingTestConnector::CCM_StateListener::_nil ());
-
-          this->ciao_info_out_state_data_listener_ = tmp;
-      }
-
-    return
-      ::WU_LateBinding::WU_LateBindingTestConnector::CCM_StateListener::_duplicate (
-        this->ciao_info_out_state_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_state_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_state_status_.in ()))
-      {
-        info_out_state_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_state_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_out_state_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_out_state_status_.in ());
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Receiver_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::WU_LateBinding::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    WU_LateBinding_Receiver_impl::start(
-      this->ciao_context_.in ());
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_WU_LateBinding_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_exec.h
deleted file mode 100644
index af9db76cc06..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_exec.h
+++ /dev/null
@@ -1,247 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_WU_LATEBINDING_RECEIVER_EXEC_KKU0OW_H_
-#define CIAO_WU_LATEBINDING_RECEIVER_EXEC_KKU0OW_H_
-
-#include /**/ "ace/pre.h"
-
-#include "WU_LateBinding_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_WU_LateBinding_Receiver_Impl
-{
-
-  /**
-   * Provider Executor Implementation Class: info_out_event_data_listener_exec_i
-   */
-
-  class info_out_event_data_listener_exec_i
-    : public virtual ::WU_LateBinding::WU_LateBindingTestConnector::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_event_data_listener_exec_i (
-      ::WU_LateBinding::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_event_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from WU_LateBinding::WU_LateBindingTestConnector::Listener. */
-
-    virtual
-    void on_one_data (const ::WU_LateBindingTest & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (const ::WU_LateBindingTestSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    ::WU_LateBinding::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_event_status_exec_i
-   */
-
-  class info_out_event_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_event_status_exec_i (
-      ::WU_LateBinding::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_event_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::WU_LateBinding::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_state_data_listener_exec_i
-   */
-
-  class info_out_state_data_listener_exec_i
-    : public virtual ::WU_LateBinding::WU_LateBindingTestConnector::CCM_StateListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_state_data_listener_exec_i (
-      ::WU_LateBinding::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_state_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from WU_LateBinding::WU_LateBindingTestConnector::StateListener. */
-
-    virtual
-    void on_creation (const ::WU_LateBindingTest & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_one_update (const ::WU_LateBindingTest & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_updates (const ::WU_LateBindingTestSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-
-    virtual
-    void on_deletion (const ::WU_LateBindingTest & datum,
-    const ::CCM_DDS::ReadInfo & info);
-    //@}
-
-  private:
-    ::WU_LateBinding::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_state_status_exec_i
-   */
-
-  class info_out_state_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_state_status_exec_i (
-      ::WU_LateBinding::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_state_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::WU_LateBinding::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::WU_LateBinding::WU_LateBindingTestConnector::CCM_Listener_ptr
-    get_info_out_event_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_event_status (void);
-
-    virtual ::WU_LateBinding::WU_LateBindingTestConnector::CCM_StateListener_ptr
-    get_info_out_state_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_state_status (void);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-
-    //@}
-
-  private:
-    ::WU_LateBinding::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::WU_LateBinding::WU_LateBindingTestConnector::CCM_Listener_var ciao_info_out_event_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_event_status_;
-    ::WU_LateBinding::WU_LateBindingTestConnector::CCM_StateListener_var ciao_info_out_state_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_state_status_;
-
-    ::CORBA::UShort iterations_;
-    //@}
-
-    //@{
-    /** User defined members. */
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_WU_LateBinding_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_impl.cpp b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_impl.cpp
deleted file mode 100644
index 849eaf56162..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_impl.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-#include "WU_LateBinding_Receiver_impl.h"
-
-WU_LateBinding_Receiver_impl::WU_LateBinding_Receiver_impl ()
-{
-}
-
-WU_LateBinding_Receiver_impl::~WU_LateBinding_Receiver_impl ()
-{
-}
-
-void
-WU_LateBinding_Receiver_impl::start (
-  ::WU_LateBinding::CCM_Receiver_Context_ptr ctx)
-{
-  ::CCM_DDS::DataListenerControl_var dlc =
-    ctx->get_connection_info_out_event_data_control ();
-  dlc->mode (::CCM_DDS::ONE_BY_ONE);
-
-  dlc = ctx->get_connection_info_out_state_data_control ();
-  dlc->mode (::CCM_DDS::ONE_BY_ONE);
-}
-
-void
-WU_LateBinding_Receiver_impl::on_one_data (const ::WU_LateBindingTest & datum)
-{
-  ACE_DEBUG ((LM_ERROR, ACE_TEXT ("WU_LateBinding_Receiver_impl::on_one_data - ")
-          ACE_TEXT ("received data for <%C> at %u\n"),
-          datum.key.in (),
-          datum.iteration));
-}
-
-void
-WU_LateBinding_Receiver_impl::on_many_data (void)
-{
-    ACE_ERROR ((LM_ERROR, "WU_LateBinding_Receiver_impl::on_many_data : "
-                          "Error: No callback to this method expected.\n"));
-}
-
-void
-WU_LateBinding_Receiver_impl::on_creation (const ::WU_LateBindingTest & datum)
-{
-  ACE_DEBUG ((LM_ERROR, ACE_TEXT ("WU_LateBinding_Receiver_impl::on_creation - ")
-          ACE_TEXT ("Data created for <%C> at %u\n"),
-          datum.key.in (),
-          datum.iteration));
-}
-
-void
-WU_LateBinding_Receiver_impl::on_one_update (const ::WU_LateBindingTest & datum)
-{
-  ACE_DEBUG ((LM_ERROR, ACE_TEXT ("WU_LateBinding_Receiver_impl::on_one_update - ")
-          ACE_TEXT ("received updated data for <%C> at %u\n"),
-          datum.key.in (),
-          datum.iteration));
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_impl.h b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_impl.h
deleted file mode 100644
index bd13e00c19c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_impl.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef WU_LATEBINDING_RECEIVER_IMPL_H_
-#define WU_LATEBINDING_RECEIVER_IMPL_H_
-
-#include "WU_LateBinding_ReceiverEC.h"
-
-class WU_LateBinding_Receiver_impl
-{
-public:
-  WU_LateBinding_Receiver_impl (void);
-  ~WU_LateBinding_Receiver_impl (void);
-
-  static void start (
-    ::WU_LateBinding::CCM_Receiver_Context_ptr ctx);
-
-  static void on_one_data (const ::WU_LateBindingTest & datum);
-  static void on_many_data (void);
-
-  static void on_creation (const ::WU_LateBindingTest & datum);
-  static void on_one_update (const ::WU_LateBindingTest & datum);
-};
-
-#endif /* WU_LATEBINDING_RECEIVER_IMPL_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender.idl b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender.idl
deleted file mode 100644
index 8a2169dd68b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef WU_LATEBINDING_SENDER_IDL
-#define WU_LATEBINDING_SENDER_IDL
-
-#include "Connector/WU_LateBinding_Connector.idl"
-
-module WU_LateBinding
-{
-  component Sender
-  {
-    port WU_LateBindingTestConnector::DDS_Write  info_write;
-    port WU_LateBindingTestConnector::DDS_Update info_update;
-
-    attribute unsigned short iterations;
-    attribute unsigned short keys;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender.mpc b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender.mpc
deleted file mode 100644
index e14ce1c88a2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender.mpc
+++ /dev/null
@@ -1,141 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p WU_LateBindingBase -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project (WU_LateBindingSender_idl_gen) : componentidldefaults, dds4ccm {
-  after += WU_LateBindingConnector_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I ..
-
-  IDL_Files {
-    WU_LateBinding_Sender.idl
-  }
-}
-
-project (WU_LateBindingSender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += WU_LateBindingSender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    WU_LateBinding_SenderE.idl
-  }
-}
-
-project (WU_LateBindingSender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += WU_LateBindingSender_lem_gen WU_LateBindingSender_stub WU_LateBindingBase_stub
-  libs  += WU_LateBindingBase_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    WU_LateBinding_SenderEC.cpp
-  }
-
-  Header_Files {
-    WU_LateBinding_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    WU_LateBinding_SenderEC.inl
-  }
-}
-
-project (WU_LateBindingSender_stub) : ccm_stub, dds4ccm_base {
-  after += WU_LateBindingSender_idl_gen WU_LateBindingBase_stub WU_LateBindingConnector_stub
-  libs  += WU_LateBindingBase_stub WU_LateBindingConnector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    WU_LateBinding_SenderC.cpp
-  }
-
-  Header_Files {
-    WU_LateBinding_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    WU_LateBinding_SenderC.inl
-  }
-}
-
-project (WU_LateBindingSender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += WU_LateBindingSender_lem_stub WU_LateBindingSender_stub \
-             WU_LateBindingConnector_lem_stub WU_LateBindingConnector_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub WU_LateBindingBase_stub \
-          WU_LateBindingConnector_lem_stub WU_LateBindingConnector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    WU_LateBinding_Sender_exec.cpp
-  }
-
-  Header_Files {
-    WU_LateBinding_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project (WU_LateBindingSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += WU_LateBindingBase_stub  WU_LateBindingSender_lem_stub WU_LateBindingConnector_stub \
-                WU_LateBindingConnector_svnt WU_LateBindingConnector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                WU_LateBindingBase_stub WU_LateBindingConnector_stub WU_LateBindingConnector_svnt WU_LateBindingConnector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    WU_LateBinding_SenderS.cpp
-    WU_LateBinding_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    WU_LateBinding_SenderS.h
-    WU_LateBinding_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.cpp
deleted file mode 100644
index 90932adb836..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.cpp
+++ /dev/null
@@ -1,400 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "WU_LateBinding_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_WU_LateBinding_Sender_Impl
-{
-
-  /**
-   * Timeout_Handler
-   */
-
-  Timeout_Handler::Timeout_Handler (Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  Timeout_Handler::handle_timeout (const ACE_Time_Value &, const void *arg)
-  {
-    // Notify the subscribers
-    unsigned long assingment = reinterpret_cast<unsigned long> (arg);
-    if (assingment == 0)
-      {
-        this->callback_.start_event_test ();
-      }
-    else if (assingment == 1)
-      {
-        this->callback_.start_state_test ();
-        this->callback_.set_topic_name_writer ();
-        this->callback_.set_topic_name_updater ();
-      }
-    return 0;
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : iterations_ (0)
-      , keys_ (0)
-      , to_handler_ (0)
-  {
-     ACE_NEW_THROW_EX (this->to_handler_,
-                       Timeout_Handler (*this),
-                       ::CORBA::INTERNAL ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->to_handler_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Sender_exec_i::test_exception (void)
-  {
-    try
-      {
-        ::WU_LateBinding::WU_LateBindingTestConnector::Writer_var writer =
-          this->ciao_context_->get_connection_info_write_data ();
-        if (::CORBA::is_nil (writer.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "Sender_exec_i::test_exception - "
-                        "ERROR: Unable to get writer interface from the "
-                        "CIAO context\n"));
-            return;
-          }
-        WU_LateBindingTest sample;
-        sample.key = ::CORBA::string_dup ("KEY_1");
-        sample.iteration = 1;
-        writer->write_one (sample, ::DDS::HANDLE_NIL);
-        ACE_ERROR ((LM_ERROR, "Sender_exec_i::test_exception - "
-                    "ERROR: No exception thrown while calling write_one "
-                    "on a late binded connector (port).\n"));
-      }
-    catch (const ::CORBA::BAD_INV_ORDER &)
-      {
-        ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::test_exception - "
-                    "Expected BAD_INV_ORDER thrown.\n"));
-      }
-    catch (const CORBA::Exception &e)
-      {
-        e._tao_print_exception("ERROR: Unexpected exception");
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "Sender_exec_i::test_exception - "
-                    "ERROR: expected and unknown exception caught\n"));
-      }
-  }
-
-  void
-  Sender_exec_i::set_topic_name_writer (void)
-  {
-    try
-      {
-        ::WU_LateBinding::WU_LateBindingTestConnector:: Writer_var writer =
-          this->ciao_context_->get_connection_info_write_data ();
-        if (::CORBA::is_nil (writer.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - "
-                                  "Unable to get writer interface\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-        ::CORBA::Object_var cmp = writer->_get_component ();
-        if (::CORBA::is_nil (cmp.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - "
-                                  "Unable to get component interface\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-        ::WU_LateBinding::WU_LateBindingTestConnector::CCM_DDS_Event_var conn =
-          ::WU_LateBinding::WU_LateBindingTestConnector::CCM_DDS_Event::_narrow (cmp.in ());
-        if (::CORBA::is_nil (conn.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - "
-                                  "Unable to narrow connector interface\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-        conn->topic_name ("LateBindingTopic");
-      }
-    catch (const ::CCM_DDS::NonChangeable &)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - "
-                    "Caught NonChangeable exception.\n"));
-      }
-    catch (const ::CORBA::Exception &ex)
-      {
-        ex._tao_print_exception("ERROR: Sender_exec_i::set_topic_name_writer - ");
-      }
-  }
-
-  void
-  Sender_exec_i::start_event_test (void)
-  {
-    // Set the topic name on the connector first. Therefor we need to
-    // get to the connector first.
-    ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - "
-                "Set topic name.\n"));
-    try
-      {
-        this->set_topic_name_writer ();
-        ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - "
-                    "Topic name set, start writing.\n"));
-
-        ::WU_LateBinding::WU_LateBindingTestConnector:: Writer_var writer =
-          this->ciao_context_->get_connection_info_write_data ();
-        for (::CORBA::UShort key = 1; key < this->keys_ + 1; ++key)
-          {
-            WU_LateBindingTest sample;
-            char tmp[7];
-            ACE_OS::sprintf (tmp, "KEY_%d", key);
-            sample.key = CORBA::string_dup(tmp);
-
-            for (::CORBA::UShort iter = 1; iter < this->iterations_ + 1; ++iter)
-              {
-                sample.iteration = iter;
-                writer->write_one (sample, ::DDS::HANDLE_NIL);
-                ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - "
-                            "Sample written : key <%C> - iteration <%d>\n",
-                            tmp, iter));
-                ACE_Time_Value tv (0, 50000);
-                ACE_OS::sleep (tv);
-              }
-          }
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "Sender_exec_i::start_event_test - "
-                    "ERROR: Unexpected and unknown exception caught.\n"));
-      }
-  }
-
-  void
-  Sender_exec_i::set_topic_name_updater(void)
-  {
-    try
-      {
-        ::WU_LateBinding::WU_LateBindingTestConnector:: Updater_var updater =
-          this->ciao_context_->get_connection_info_update_data ();
-        if (::CORBA::is_nil (updater.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - "
-                                  "Unable to get updater interface\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-        ::CORBA::Object_var cmp = updater->_get_component ();
-        if (::CORBA::is_nil (cmp.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - "
-                                  "Unable to get component interface\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-        ::WU_LateBinding::WU_LateBindingTestConnector::CCM_DDS_State_var conn =
-          ::WU_LateBinding::WU_LateBindingTestConnector::CCM_DDS_State::_narrow (cmp.in ());
-        if (::CORBA::is_nil (conn.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - "
-                                  "Unable to narrow connector interface\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-        conn->topic_name ("LateBindingTopic");
-      }
-    catch (const ::CCM_DDS::NonChangeable &)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - "
-                    "Caught NonChangeable exception.\n"));
-      }
-    catch (const ::CORBA::Exception &ex)
-      {
-        ex._tao_print_exception("ERROR: Sender_exec_i::set_topic_name_writer - ");
-      }
-  }
-
-  void
-  Sender_exec_i::start_state_test (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_state_test - "
-                          "Start\n"));
-    try
-      {
-        this->set_topic_name_updater ();
-        ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_state_test - "
-                    "Topic name set, start updating.\n"));
-        ::WU_LateBinding::WU_LateBindingTestConnector:: Updater_var updater =
-          this->ciao_context_->get_connection_info_update_data ();
-        for (::CORBA::UShort key = this->keys_ + 1;
-             key < (2 * this->keys_) + 1;
-             ++key)
-          {
-            WU_LateBindingTest sample;
-            char tmp[7];
-            ACE_OS::sprintf (tmp, "KEY_%d", key);
-            sample.key = CORBA::string_dup(tmp);
-            sample.iteration = 0;
-            updater->create_one (sample);
-
-            for (::CORBA::UShort iter = this->iterations_ + 1;
-                 iter < (2 * this->iterations_) + 1;
-                 ++iter)
-              {
-                sample.iteration = iter;
-                updater->update_one (sample, ::DDS::HANDLE_NIL);
-                ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_state_test - "
-                            "Sample updated : key <%C> - iteration <%d>\n",
-                            tmp, iter));
-                ACE_Time_Value tv (0, 50000);
-                ACE_OS::sleep (tv);
-              }
-          }
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "Sender_exec_i::start_state_test - "
-                    "ERROR: Unexpected and unknown exception caught.\n"));
-      }
-  }
-
-  // Component attributes and port operations.
-
-  ::CORBA::UShort
-  Sender_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::WU_LateBinding::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-     this->test_exception ();
-     if (this->reactor ()->schedule_timer (
-                 this->to_handler_,
-                 reinterpret_cast<const void *> (0),
-                 ACE_Time_Value (5, 0)) == -1)
-       {
-         ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                               ACE_TEXT ("Error scheduling timer")));
-       }
-     if (this->reactor ()->schedule_timer (
-                 this->to_handler_,
-                 reinterpret_cast<const void *> (1),
-                 ACE_Time_Value (10, 0)) == -1)
-       {
-         ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                               ACE_TEXT ("Error scheduling timer")));
-       }
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_WU_LateBinding_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.h
deleted file mode 100644
index 769eaa04ea9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.h
+++ /dev/null
@@ -1,137 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_WU_LATEBINDING_SENDER_EXEC_YSJ9S8_H_
-#define CIAO_WU_LATEBINDING_SENDER_EXEC_YSJ9S8_H_
-
-#include /**/ "ace/pre.h"
-
-#include "WU_LateBinding_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_WU_LateBinding_Sender_Impl
-{
-  class Sender_exec_i;
-
-  /**
-   * Timeout_Handler
-   */
-  class Timeout_Handler :
-    public ACE_Event_Handler
-  {
-  public:
-    Timeout_Handler (Sender_exec_i &callback);
-    /// Handle the timeout.
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    /// Maintains a handle that actually process the event
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void set_topic_name_writer (void);
-    void set_topic_name_updater (void);
-    void start_event_test (void);
-    void start_state_test (void);
-    //@}
-
-  private:
-    ::WU_LateBinding::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-
-    ::CORBA::UShort iterations_;
-
-    ::CORBA::UShort keys_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    Timeout_Handler *to_handler_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void
-    test_exception (void);
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_WU_LateBinding_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/descriptors/Plan.cdp
deleted file mode 100644
index ee83b8b148b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/descriptors/Plan.cdp
+++ /dev/null
@@ -1,512 +0,0 @@
-<!--  -->
-<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>LateBinding_Depl_1</label>
-  <UUID>LateBinding_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_WU_LateBinding_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_WU_LateBinding_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="LateBinding_EventConnectorImplementation">
-    <name>LateBinding_EventConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="LateBinding_Connector_ExecArtifact" />
-    <artifact xmi:idref="LateBinding_Connector_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_WU_LateBinding_WU_LateBindingTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_WU_LateBinding_WU_LateBindingTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>WU_LateBinding_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>WU_LateBinding_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="LateBinding_StateConnectorImplementation">
-    <name>LateBinding_StateConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="LateBinding_Connector_ExecArtifact" />
-    <artifact xmi:idref="LateBinding_Connector_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_WU_LateBinding_WU_LateBindingTestConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_WU_LateBinding_WU_LateBindingTestConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>WU_LateBinding_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>WU_LateBinding_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_WU_LateBinding_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_WU_LateBinding_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="LateBinding_SenderEventConnectorInstance">
-    <name>LateBinding_SenderEventConnectorInstance</name>
-    <node>SenderNode</node>
-    <source/>
-    <implementation xmi:idref="LateBinding_EventConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string></string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="LateBinding_SenderStateConnectorInstance">
-    <name>LateBinding_SenderStateConnectorInstance</name>
-    <node>SenderNode</node>
-    <source/>
-    <implementation xmi:idref="LateBinding_StateConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string></string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="LateBinding_ReceiverEventConnectorInstance">
-    <name>LateBinding_ReceiverEventConnectorInstance</name>
-    <node>ReceiverNode</node>
-    <source/>
-    <implementation xmi:idref="LateBinding_EventConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>LateBindingTopic</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="LateBinding_ReceiverStateConnectorInstance">
-    <name>LateBinding_ReceiverStateConnectorInstance</name>
-    <node>ReceiverNode</node>
-    <source/>
-    <implementation xmi:idref="LateBinding_StateConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>LateBindingTopic</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>15</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>event_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_event_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="LateBinding_ReceiverEventConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>event_datacontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_event_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="LateBinding_ReceiverEventConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>state_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_state_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="LateBinding_ReceiverStateConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>state_datacontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_state_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="LateBinding_ReceiverStateConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="LateBinding_SenderEventConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>updater_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_update_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>observable_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="LateBinding_SenderStateConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="LateBinding_Connector_ExecArtifact">
-    <name>WU_LateBinding_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>WU_LateBindingConnector_exec</location>
-  </artifact>
-  <artifact xmi:id="LateBinding_Connector_SvntArtifact">
-    <name>WU_LateBinding_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>WU_LateBindingConnector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/descriptors/run_test.pl
deleted file mode 100755
index d8b4eca445d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 30 seconds to allow task to complete\n";
-sleep (30);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/.gitignore b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/.gitignore
deleted file mode 100644
index f7983c1daad..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/LMBM_Test_Base.cxx
-/LMBM_Test_Base.h
-/LMBM_Test_BasePlugin.cxx
-/LMBM_Test_BasePlugin.h
-/LMBM_Test_BaseSupport.cxx
-/LMBM_Test_BaseSupport.h
-/LMBM_Test_Base_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl
deleted file mode 100644
index 6bf85749d83..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file LMBM_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef LISTEN_MANY_BY_MANY_TEST_BASE_IDL
-#define LISTEN_MANY_BY_MANY_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/LMBM_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/LMBM_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "ListenManyByManyTest"
-#pragma DCPS_DATA_KEY "ListenManyByManyTest key"
-
-struct ListenManyByManyTest {
-  string key; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<ListenManyByManyTest> ListenManyByManyTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc
deleted file mode 100644
index d1c40e1a642..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_LMBM_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_LMBM_Test_Base_stub
-  dynamicflags += LISTEN_MANY_BY_MANY_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=LISTEN_MANY_BY_MANY_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=LMBM_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    LMBM_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=LISTEN_MANY_BY_MANY_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    LMBM_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/.gitignore
deleted file mode 100644
index f2ddf77157f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/LMBM_Test_ConnectorE.idl
-/LMBM_Test_Connector_conn.cpp
-/LMBM_Test_Connector_conn.h
-/LMBM_Test_Connector_conn_export.h
-/LMBM_Test_Connector_lem_stub_export.h
-/LMBM_Test_Connector_stub_export.h
-/LMBM_Test_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.idl
deleted file mode 100644
index e0a84abc65d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * @file LMBM_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef LISTEN_MANY_BY_MANY_TEST_CONNECTOR_IDL_
-#define LISTEN_MANY_BY_MANY_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/LMBM_Test_Base.idl"
-
-#pragma ciao lem "Connector/LMBM_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/LMBM_Test_BaseTypeSupport.idl"
-#endif
-
-module LMBM_Test
-{
-  module ::CCM_DDS::Typed
-    < ::ListenManyByManyTest, ::ListenManyByManyTestSeq>
-    ListenManyByManyTestConnector;
-};
-
-#endif /* LMBM_Test_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc
deleted file mode 100644
index e7d1335755f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_LMBM_Test_Base -l .. -o ../lib -u DDS LMBM_Test_Connector"
-
-project(DDS_LMBM_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_LMBM_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=LISTEN_MANY_BY_MANY_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=LMBM_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=LISTEN_MANY_BY_MANY_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=LMBM_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=LISTEN_MANY_BY_MANY_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=LMBM_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=LISTEN_MANY_BY_MANY_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=LMBM_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    LMBM_Test_Connector.idl
-  }
-}
-
-project(DDS_LMBM_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_LMBM_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=LISTEN_MANY_BY_MANY_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=LMBM_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    LMBM_Test_ConnectorE.idl
-  }
-}
-
-project(DDS_LMBM_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_LMBM_Test_Connector_lem_gen DDS_LMBM_Test_Connector_stub DDS_LMBM_Test_Base_stub
-  libs  += DDS_LMBM_Test_Base_stub DDS_LMBM_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_LMBM_Test_Connector_lem_stub
-  dynamicflags += LISTEN_MANY_BY_MANY_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LMBM_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    LMBM_Test_ConnectorEC.h
-    LMBM_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    LMBM_Test_ConnectorEC.inl
-  }
-}
-
-project(DDS_LMBM_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_LMBM_Test_Connector_idl_gen DDS_LMBM_Test_Base_stub
-  libs  += DDS_LMBM_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_LMBM_Test_Connector_stub
-  dynamicflags += LISTEN_MANY_BY_MANY_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LMBM_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    LMBM_Test_ConnectorC.h
-    LMBM_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    LMBM_Test_ConnectorC.inl
-  }
-}
-
-project(DDS_LMBM_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_LMBM_Test_Connector_lem_stub DDS_LMBM_Test_Connector_stub DDS_LMBM_Test_Base_stub
-  sharedname = DDS_LMBM_Test_Connector_exec
-  libs += DDS_LMBM_Test_Connector_stub DDS_LMBM_Test_Connector_lem_stub DDS_LMBM_Test_Base_stub DDS_LMBM_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += LISTEN_MANY_BY_MANY_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LMBM_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    LMBM_Test_Connector_conn.h
-    LMBM_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_LMBM_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_LMBM_Test_Connector_lem_stub DDS_LMBM_Test_Connector_exec DDS_LMBM_Test_Connector_stub
-  sharedname  = DDS_LMBM_Test_Connector_svnt
-  libs       += DDS_LMBM_Test_Connector_stub \
-                DDS_LMBM_Test_Connector_lem_stub  \
-                DDS_LMBM_Test_Base_stub \
-                DDS_LMBM_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += LISTEN_MANY_BY_MANY_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LMBM_Test_ConnectorS.cpp
-    LMBM_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    LMBM_Test_ConnectorS.h
-    LMBM_Test_Connector_svnt.h
-    LMBM_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/README b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/README
deleted file mode 100644
index ee5fd301c5e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/README
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-This test tests the listener.
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/.gitignore b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/.gitignore
deleted file mode 100644
index 5ee54e35bee..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/LMBM_Test_ReceiverE.idl
-/Receiver_exec_export.h
-/Receiver_lem_stub_export.h
-/Receiver_stub_export.h
-/Receiver_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.idl
deleted file mode 100644
index 9e3766eaf6d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/LMBM_Test_Connector.idl"
-
-module LMBM_Test
-{
-  component Receiver
-  {
-    port ListenManyByManyTestConnector::DDS_Listen info_listen;
-
-    attribute unsigned short keys;
-    attribute unsigned short iterations;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.mpc
deleted file mode 100644
index 2755f25ef87..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-project(DDS_LMBM_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_LMBM_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h -I..
-
-  IDL_Files {
-    LMBM_Test_Receiver.idl
-  }
-}
-
-project(DDS_LMBM_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_LMBM_Test_Receiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    LMBM_Test_ReceiverE.idl
-  }
-}
-
-project(DDS_LMBM_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_LMBM_Test_Receiver_lem_gen DDS_LMBM_Test_Receiver_stub  \
-           DDS_LMBM_Test_Connector_stub DDS_LMBM_Test_Base_stub
-  libs  +=  Receiver_stub DDS_LMBM_Test_Connector_stub \
-            DDS_LMBM_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LMBM_Test_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    LMBM_Test_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    LMBM_Test_ReceiverEC.inl
-  }
-}
-
-project(DDS_LMBM_Test_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_LMBM_Test_Receiver_idl_gen  DDS_LMBM_Test_Connector_stub \
-           DDS_LMBM_Test_Base_stub DDS_LMBM_Test_Connector_lem_gen
-  libs  += DDS_LMBM_Test_Connector_stub DDS_LMBM_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LMBM_Test_ReceiverC.cpp
-  }
-
-  Header_Files {
-    LMBM_Test_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    LMBM_Test_ReceiverC.inl
-  }
-}
-
-project(DDS_LMBM_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_LMBM_Test_Receiver_lem_stub DDS_LMBM_Test_Receiver_stub \
-             DDS_LMBM_Test_Base_stub DDS_LMBM_Test_Connector_stub \
-             DDS_LMBM_Test_Connector_lem_stub 
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_LMBM_Test_Base_stub \
-          DDS_LMBM_Test_Connector_stub DDS_LMBM_Test_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LMBM_Test_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    LMBM_Test_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_LMBM_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_LMBM_Test_Receiver_lem_stub DDS_LMBM_Test_Base_stub \
-                  DDS_LMBM_Test_Connector_stub DDS_LMBM_Test_Connector_svnt \
-                  DDS_LMBM_Test_Receiver_exec DDS_LMBM_Test_Connector_lem_stub 
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_LMBM_Test_Base_stub \
-                DDS_LMBM_Test_Connector_stub DDS_LMBM_Test_Connector_svnt \
-                Receiver_exec DDS_LMBM_Test_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LMBM_Test_ReceiverS.cpp
-    LMBM_Test_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    LMBM_Test_ReceiverS.h
-    LMBM_Test_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp
deleted file mode 100644
index 5d44bb9e6e7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp
+++ /dev/null
@@ -1,259 +0,0 @@
-// -*- C++ -*-
-#include "LMBM_Test_Receiver_exec.h"
-#include "ace/Log_Msg.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-namespace CIAO_LMBM_Test_Receiver_Impl
-{
-  //============================================================
-  // ListenManyByManyTest_Listener_exec_i
-  //============================================================
-  ListenManyByManyTest_Listener_exec_i::ListenManyByManyTest_Listener_exec_i (
-    ::LMBM_Test::CCM_Receiver_Context_ptr context,
-    Atomic_ULong &received_one_by_one,
-    Atomic_ULong &received_many_by_many,
-    Atomic_ULong &samples_read)
-    : context_ (::LMBM_Test::CCM_Receiver_Context::_duplicate (context)),
-      received_one_by_one_ (received_one_by_one),
-      received_many_by_many_ (received_many_by_many),
-      samples_read_ (samples_read)
-  {
-  }
-
-  ListenManyByManyTest_Listener_exec_i::~ListenManyByManyTest_Listener_exec_i (void)
-  {
-  }
-
-  void
-  ListenManyByManyTest_Listener_exec_i::on_one_data (
-                                  const ListenManyByManyTest & /*an_instance*/,
-                                  const ::CCM_DDS::ReadInfo & /*info*/)
-  {
-    // Just count; this value is checked on ccm_remove.
-    ++this->received_one_by_one_;
-  }
-
-  void
-  ListenManyByManyTest_Listener_exec_i::on_many_data (
-                                  const ListenManyByManyTestSeq & an_instance,
-                                  const ::CCM_DDS::ReadInfoSeq & info)
-  {
-    if (an_instance.length () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: ListenManyByManyTest_Listener_exec_i::on_many_data: "
-                              "instance sequence length is nil\n"));
-        return;
-      }
-    for (CORBA::ULong i = 0 ; i < info.length(); ++i)
-      {
-        ACE_DEBUG ((LM_DEBUG, "ListenManyByManyTest_Listener_exec_i::on_many_data: "
-                               "key <%C> - iteration <%d>\n",
-                               an_instance[i].key.in (),
-                               an_instance[i].iteration));
-        if (info[i].instance_handle == ::DDS::HANDLE_NIL)
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: ListenManyByManyTest_Listener_exec_i::on_many_data: "
-                                "instance handle %d seems to be nil"
-                                "key <%C> - iteration <%d>\n",
-                                 i,
-                                 an_instance[i].key.in (),
-                                 an_instance[i].iteration));
-          }
-        if (info[i].source_timestamp.sec == 0 &&
-            info[i].source_timestamp.nanosec == 0)
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: ListenManyByManyTest_Listener_exec_i::on_many_data: "
-                                "source timestamp seems to be invalid (nil) "
-                                "key <%C> - iteration <%d>\n",
-                                an_instance[i].key.in (),
-                                an_instance[i].iteration));
-          }
-      }
-    this->received_many_by_many_ += an_instance.length ();
-    try
-      {
-        ::LMBM_Test::ListenManyByManyTestConnector::Reader_var reader =
-          this->context_->get_connection_info_listen_data ();
-        if (::CORBA::is_nil (reader.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ListenManyByManyTest_Listener_exec_i::on_many_data - "
-                      "ERROR: Reader seems nil\n"));
-          }
-        ::ListenManyByManyTestSeq seq;
-        ::CCM_DDS::ReadInfoSeq infos;
-        reader->read_all (seq, infos);
-        this->samples_read_ += seq.length ();
-
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ListenManyByManyTest_Listener_exec_i::on_many_data - ")
-                              ACE_TEXT ("Read <%u> samples\n"),
-                              seq.length ()));
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                     ACE_TEXT ("when using reader->read_all: index <%d> - retval <%d>\n"),
-                     ex.index, ex.error_code));
-      }
-  }
-
-  //============================================================
-  // Receiver_exec_i
-  //============================================================
-  Receiver_exec_i::Receiver_exec_i (void)
-    : received_one_by_one_ (0),
-      received_many_by_many_ (0),
-      samples_read_ (0),
-      iterations_ (10),
-      keys_ (5)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::start ()
-  {
-    ::CCM_DDS::DataListenerControl_var dlc =
-        this->context_->get_connection_info_listen_data_control ();
-    dlc->mode (::CCM_DDS::MANY_BY_MANY);
-  }
-
-  ::LMBM_Test::ListenManyByManyTestConnector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_listen_data_listener (void)
-  {
-    return new ListenManyByManyTest_Listener_exec_i (
-      this->context_.in (),
-      this->received_one_by_one_,
-      this->received_many_by_many_,
-      this->samples_read_);
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_listen_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Receiver_exec_i::get_info_listen_connector_status (void)
-  {
-    return::CCM_DDS::CCM_ConnectorStatusListener::_nil ();
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Receiver_exec_i::iterations (::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Receiver_exec_i::keys (::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::LMBM_Test::CCM_Receiver_Context::_narrow (ctx);
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    start ();
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    CORBA::ULong const expected = this->keys_ * this->iterations_;
-    if (this->received_many_by_many_.value () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: MANY_BY_MANY: "
-                               "Didn't receive samples on many_by_many "
-                               "callback while mode is MANY_BY_MANY "
-                               "expected <%u> - received <%u>\n",
-                               expected,
-                               this->received_many_by_many_.value ()));
-      }
-    else if (expected != this->received_many_by_many_.value ())
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: MANY_BY_MANY: "
-                               "Didn't receive the expected "
-                               "number of samples on many_by_many "
-                               "callback while mode is MANY_BY_MANY "
-                               "expected <%u> - received <%u>\n",
-                               expected,
-                               this->received_many_by_many_.value ()));
-      }
-    if (this->received_one_by_one_.value () > 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: MANY_BY_MANY: "
-                               "Received samples on one_by_one "
-                               "callback while mode is MANY_BY_MANY "
-                               "expected <0> - received <%u>\n",
-                               this->received_one_by_one_.value ()));
-      }
-    if (this->received_one_by_one_.value () == 0   &&
-        this->received_many_by_many_.value () > 0)
-      {
-        ACE_DEBUG ((LM_DEBUG, "MANY_BY_MANY: "
-                                "Received only data on "
-                                "many_by_many callback. "
-                                "Test passed!\n"));
-      }
-    if (this->samples_read_.value () == 0)
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: read no samples\n")));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: read <%u> samples\n"),
-                this->samples_read_.value ()));
-      }
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_LMBM_Test_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.h
deleted file mode 100644
index 5ed192bd716..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.h
+++ /dev/null
@@ -1,107 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_RECEIVER_EXEC_H_
-#define CIAO_RECEIVER_EXEC_H_
-
-#include "LMBM_Test_ReceiverEC.h"
-
-#include /**/ "Receiver_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-namespace CIAO_LMBM_Test_Receiver_Impl
-{
-  class Receiver_exec_i;
-
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::ULong> Atomic_ULong;
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, bool> Atomic_Bool;
-
-  //============================================================
-  // ListenManyByManyTest_Listener_exec_i
-  //============================================================
-  class RECEIVER_EXEC_Export ListenManyByManyTest_Listener_exec_i
-    : public virtual ::LMBM_Test::ListenManyByManyTestConnector::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ListenManyByManyTest_Listener_exec_i (
-      ::LMBM_Test::CCM_Receiver_Context_ptr context,
-      Atomic_ULong &received_one_by_one,
-      Atomic_ULong &received_many_by_many,
-      Atomic_ULong &samples_read_);
-    virtual ~ListenManyByManyTest_Listener_exec_i (void);
-
-    virtual void
-    on_one_data (
-      const ListenManyByManyTest & an_instance,
-      const ::CCM_DDS::ReadInfo & info);
-    virtual void
-    on_many_data (
-      const ListenManyByManyTestSeq & an_instance,
-      const ::CCM_DDS::ReadInfoSeq & info);
-  private:
-    ::LMBM_Test::CCM_Receiver_Context_var context_;
-    Atomic_ULong &received_one_by_one_;
-    Atomic_ULong &received_many_by_many_;
-    Atomic_ULong &samples_read_;
-  };
-
-  //============================================================
-  // Receiver_exec_i
-  //============================================================
-  class RECEIVER_EXEC_Export Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    void start ();
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-
-    virtual ::LMBM_Test::ListenManyByManyTestConnector::CCM_Listener_ptr
-    get_info_listen_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_listen_status (void);
-
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_info_listen_connector_status (void);
-
-    virtual void
-    set_session_context (
-      ::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete (void);
-
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-
-  private:
-    ::LMBM_Test::CCM_Receiver_Context_var context_;
-
-    Atomic_ULong received_one_by_one_;
-    Atomic_ULong received_many_by_many_;
-    Atomic_ULong samples_read_;
-
-    CORBA::UShort iterations_;
-    CORBA::UShort keys_;
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_LMBM_Test_Receiver_Impl (void);
-}
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/.gitignore b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/.gitignore
deleted file mode 100644
index 67fbbeecce3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/LMBM_Test_SenderE.idl
-/Sender_exec_export.h
-/Sender_lem_stub_export.h
-/Sender_stub_export.h
-/Sender_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.idl
deleted file mode 100644
index 212523aedbd..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_LISTEN_MANY_BY_MANY_TEST_SENDER_IDL
-#define DDS_LISTEN_MANY_BY_MANY_TEST_SENDER_IDL
-
-#include "Connector/LMBM_Test_Connector.idl"
-
-module LMBM_Test
-{
-  component Sender
-  {
-    port ListenManyByManyTestConnector::DDS_Write info_write;
-    provides CCM_DDS::ConnectorStatusListener info_write_connector_status;
-
-    attribute unsigned short keys;
-    attribute unsigned short iterations;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc
deleted file mode 100644
index 38d973b980a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_LMBM_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_LMBM_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_LMBM_Test_Connector_idl_gen DDS_Starter_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I ..
-
-  IDL_Files {
-    LMBM_Test_Sender.idl
-  }
-}
-
-project(DDS_LMBM_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_LMBM_Test_Sender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    LMBM_Test_SenderE.idl
-  }
-}
-
-project(DDS_LMBM_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_LMBM_Test_Sender_lem_gen DDS_LMBM_Test_Sender_stub \
-           DDS_LMBM_Test_Base_stub
-  libs  += DDS_LMBM_Test_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LMBM_Test_SenderEC.cpp
-  }
-
-  Header_Files {
-    LMBM_Test_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    LMBM_Test_SenderEC.inl
-  }
-}
-
-project(DDS_LMBM_Test_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_LMBM_Test_Sender_idl_gen DDS_LMBM_Test_Base_stub \
-           DDS_LMBM_Test_Connector_stub
-  libs  += DDS_LMBM_Test_Base_stub DDS_LMBM_Test_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LMBM_Test_SenderC.cpp
-  }
-
-  Header_Files {
-    LMBM_Test_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    LMBM_Test_SenderC.inl
-  }
-}
-
-project(DDS_LMBM_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_LMBM_Test_Sender_lem_stub DDS_LMBM_Test_Sender_stub \
-             DDS_LMBM_Test_Connector_lem_stub DDS_LMBM_Test_Connector_stub 
-  sharedname = Sender_exec
-  libs    += Sender_stub Sender_lem_stub DDS_LMBM_Test_Base_stub \
-             DDS_LMBM_Test_Connector_lem_stub DDS_LMBM_Test_Connector_stub 
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LMBM_Test_Sender_exec.cpp
-  }
-
-  Header_Files {
-    LMBM_Test_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_LMBM_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_LMBM_Test_Base_stub  DDS_LMBM_Test_Sender_lem_stub \
-                DDS_LMBM_Test_Connector_stub \
-                DDS_LMBM_Test_Connector_svnt DDS_LMBM_Test_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub DDS_LMBM_Test_Base_stub \
-                DDS_LMBM_Test_Connector_stub DDS_LMBM_Test_Connector_svnt \
-                DDS_LMBM_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LMBM_Test_SenderS.cpp
-    LMBM_Test_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    LMBM_Test_SenderS.h
-    LMBM_Test_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.cpp
deleted file mode 100644
index 7651884518b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.cpp
+++ /dev/null
@@ -1,317 +0,0 @@
-// -*- C++ -*-
-#include "LMBM_Test_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-#include "ace/Guard_T.h"
-#include "ace/Log_Msg.h"
-#include "ace/Date_Time.h"
-
-namespace CIAO_LMBM_Test_Sender_Impl
-{
-  //============================================================
-  // WriteTicker
-  //============================================================
-  WriteTicker::WriteTicker (Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  WriteTicker::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    // Notify the subscribers
-    this->callback_.write_one ();
-    return 0;
-  }
-
-  //============================================================
-  // WriteManyHandler
-  //============================================================
-  WriteManyHandler::WriteManyHandler (Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  WriteManyHandler::handle_exception (ACE_HANDLE)
-  {
-    this->callback_.write_one ();
-    return 0;
-  }
-
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (
-    Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic (
-    ::DDS::Topic_ptr /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status(
-    ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind status_kind)
-  {
-    if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS)
-      {
-        this->callback_.get_started ();
-      }
-  }
-
-  //============================================================
-  // Component Executor Implementation Class: Sender_exec_i
-  //============================================================
-  Sender_exec_i::Sender_exec_i (void)
-    : keys_ (5)
-    , iterations_ (10)
-    , started_ (false)
-  {
-    this->ticker_ = new WriteTicker (*this);
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  void
-  Sender_exec_i::write_one (void)
-  {
-    ::LMBM_Test::ListenManyByManyTestConnector::Writer_var writer =
-      this->ciao_context_->get_connection_info_write_data ();
-    if (this->last_key_ != this->samples_.end ())
-      {
-        try
-          {
-            ++this->last_key_->second->iteration;
-            writer->write_one (this->last_key_->second, ::DDS::HANDLE_NIL);
-            ACE_DEBUG ((LM_DEBUG, "Written key <%C> - <%u>\n",
-                          this->last_key_->first.c_str (),
-                          this->last_key_->second->iteration));
-          }
-        catch (const CCM_DDS::InternalError& )
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                        ACE_TEXT ("while updating writer info for <%C>.\n"),
-                          this->last_key_->first.c_str ()));
-          }
-        ++this->last_key_;
-      }
-    else
-      {
-        // Onto the next iteration
-        this->last_key_ = this->samples_.begin ();
-        while (this->last_key_ != this->samples_.end ())
-          {
-            if (this->last_key_->second->iteration == this->iterations_)
-              {
-                // Next key
-                ++this->last_key_;
-              }
-            else
-              {
-                break;
-              }
-          }
-        if (this->last_key_ == this->samples_.end ())
-          {
-            this->reactor ()->cancel_timer (this->ticker_);
-          }
-      }
-  }
-
-  void
-  Sender_exec_i::get_started (void)
-  {
-    this->started_ = true;
-    try
-      {
-        this->start ();
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("Exception caught:");
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Sender_exec_i::get_started: Exception caught\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Sender_exec_i::get_started: Unknown exception caught\n")));
-      }
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard,
-                        this->mutex_, CORBA::INTERNAL ());
-
-    for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i)
-      {
-        char key[7];
-        ListenManyByManyTest *new_key = new ListenManyByManyTest;
-        ACE_OS::sprintf (key, "KEY_%d", i);
-        new_key->key = CORBA::string_dup(key);
-        new_key->iteration = 0;
-
-        this->samples_[key] = new_key;
-      }
-   this->last_key_ = this->samples_.begin ();
-   if (this->reactor ()->schedule_timer (
-                this->ticker_,
-                0,
-                ACE_Time_Value (5, 50000),
-                ACE_Time_Value (0, 50000)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                              ACE_TEXT ("Error scheduling timer")));
-      }
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  // Component attributes and port operations.
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_info_write_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i (*this);
-  }
-
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::LMBM_Test::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    if (!this->started_)
-      {
-        ACE_ERROR ((LM_ERROR,
-          "Sender_exec_i::ccm_passivate - "
-          "ERROR: No publication matched received. "
-          "Test didn't run\n"));
-      }
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_LMBM_Test_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.h
deleted file mode 100644
index 83efbc805d0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.h
+++ /dev/null
@@ -1,164 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_LMBM_TEST_SENDER_EXEC_HRZ3NN_H_
-#define CIAO_LMBM_TEST_SENDER_EXEC_HRZ3NN_H_
-
-#include /**/ "ace/pre.h"
-
-#include "LMBM_Test_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-#include <map>
-
-namespace CIAO_LMBM_Test_Sender_Impl
-{
-  class Sender_exec_i;
-
-  //============================================================
-  // WriteTicker
-  //============================================================
-  class WriteTicker :
-    public ACE_Event_Handler
-  {
-  public:
-    WriteTicker (Sender_exec_i &callback);
-    int handle_timeout (const ACE_Time_Value &, const void *);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  //============================================================
-  // WriteManyHandler
-  //============================================================
-  class WriteManyHandler :
-    public ACE_Event_Handler
-  {
-  public:
-    WriteManyHandler (Sender_exec_i &callback);
-    virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  class SENDER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Sender_exec_i &callback);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-      void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                                 ::DDS::StatusKind status_kind);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  //============================================================
-  // Component Executor Implementation Class: Sender_exec_i
-  //============================================================
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_info_write_connector_status(void);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void get_started (void);
-    void write_one (void);
-    //@}
-
-  private:
-    ::LMBM_Test::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes and port operations. */
-
-    ::CORBA::UShort keys_;
-
-    ::CORBA::UShort iterations_;
-
-    bool started_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    WriteTicker *ticker_;
-    TAO_SYNCH_MUTEX mutex_;
-    typedef std::map<ACE_CString, ListenManyByManyTest_var> Writer_Table;
-    Writer_Table samples_;
-    Writer_Table::iterator last_key_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void start (void);
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_LMBM_Test_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/ListenManyByMany_Library.xml b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/ListenManyByMany_Library.xml
deleted file mode 100644
index 7dc9f195e6c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/ListenManyByMany_Library.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-
-  <qos_profile name="ListenManyByManyProfile">
-    <!-- QoS used to configure the data writer created in the example code -->
-    <datawriter_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-        <max_blocking_time>
-          <sec>10</sec>
-          <nanosec>0</nanosec>
-        </max_blocking_time>
-      </reliability>
-      <durability>
-        <kind>TRANSIENT_DURABILITY_QOS</kind>
-      </durability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-    </datawriter_qos>
-    <!-- QoS used to configure the data reader created in the example code -->
-    <datareader_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-      </reliability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-      <durability>
-        <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-      </durability>
-    </datareader_qos>
-  </qos_profile>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/Plan.cdp
deleted file mode 100644
index e01b4fb8d8c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/Plan.cdp
+++ /dev/null
@@ -1,434 +0,0 @@
-<!--  -->
-<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>LMBM_Test_Depl_1</label>
-  <UUID>LMBM_Test_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_LMBM_Test_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_LMBM_Test_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="LMBM_Test_ConnectorComponentImplementation">
-    <name>LMBM_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="LMBM_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="LMBM_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_LMBM_Test_ListenManyByManyTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_LMBM_Test_ListenManyByManyTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>LMBM_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>LMBM_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_LMBM_Test_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_LMBM_Test_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="LMBM_Test_ConnectorComponentInstance">
-    <name>LMBM_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="LMBM_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ListenManyByMany_Library#ListenManyByManyProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>LMBM_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="LMBM_Test_ConnectorComponentInstance2">
-    <name>LMBM_Test_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="LMBM_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ListenManyByMany_Library#ListenManyByManyProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>LMBM_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>info_listen_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="LMBM_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_listen_data_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="LMBM_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_listen_data_control</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="LMBM_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="LMBM_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>info_write_connector_status_sender</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="LMBM_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="LMBM_Test_Connector_ExecArtifact">
-    <name>LMBM_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_LMBM_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="LMBM_Test_Connector_SvntArtifact">
-    <name>LMBM_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_LMBM_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="LMBM_Test_Connector_StubArtifact">
-    <name>LMBM_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_LMBM_Test_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index 556d5caa0a6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-Description
-XML QoS Profile
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="ListenManyByMany_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="ListenManyByManyProfile" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>10</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl
deleted file mode 100755
index d8b4eca445d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 30 seconds to allow task to complete\n";
-sleep (30);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/.gitignore b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/.gitignore
deleted file mode 100644
index 114e9b43a72..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/LNE_Test_Base.cxx
-/LNE_Test_Base.h
-/LNE_Test_BasePlugin.cxx
-/LNE_Test_BasePlugin.h
-/LNE_Test_BaseSupport.cxx
-/LNE_Test_BaseSupport.h
-/LNE_Test_Base_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl
deleted file mode 100644
index 5a602952dfc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file LNE_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef LISTEN_NOT_ENABLED_TEST_BASE_IDL
-#define LISTEN_NOT_ENABLED_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/LNE_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/LNE_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "ListenNotEnabledTest"
-#pragma DCPS_DATA_KEY "ListenNotEnabledTest key"
-
-struct ListenNotEnabledTest {
-  string key; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<ListenNotEnabledTest> ListenNotEnabledTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc
deleted file mode 100644
index b5df76f5087..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_LNE_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_LNE_Test_Base_stub
-  dynamicflags += LISTEN_NOT_ENABLED_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=LISTEN_NOT_ENABLED_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=LNE_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    LNE_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=LISTEN_NOT_ENABLED_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    LNE_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/.gitignore
deleted file mode 100644
index f6572cdd875..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/LNE_Test_ConnectorE.idl
-/LNE_Test_Connector_conn.cpp
-/LNE_Test_Connector_conn.h
-/LNE_Test_Connector_conn_export.h
-/LNE_Test_Connector_lem_stub_export.h
-/LNE_Test_Connector_stub_export.h
-/LNE_Test_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.idl
deleted file mode 100644
index 6a2a85a04eb..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file LNE_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef LISTEN_NOT_ENABLED_TEST_CONNECTOR_IDL_
-#define LISTEN_NOT_ENABLED_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/LNE_Test_Base.idl"
-
-#pragma ciao lem "Connector/LNE_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/LNE_Test_BaseTypeSupport.idl"
-#endif
-
-module LNE_Test
-{
-  module ::CCM_DDS::Typed < ::ListenNotEnabledTest, ::ListenNotEnabledTestSeq> ListenNotEnabledTestConnector;
-};
-
-#endif /* LNE_Test_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc
deleted file mode 100644
index f22272b8265..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_LNE_Test_Base -l .. -o ../lib -u DDS LNE_Test_Connector"
-
-project(DDS_LNE_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_LNE_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=LISTEN_NOT_ENABLED_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=LNE_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=LISTEN_NOT_ENABLED_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=LNE_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=LISTEN_NOT_ENABLED_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=LNE_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=LISTEN_NOT_ENABLED_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=LNE_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    LNE_Test_Connector.idl
-  }
-}
-
-project(DDS_LNE_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_LNE_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=LISTEN_NOT_ENABLED_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=LNE_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    LNE_Test_ConnectorE.idl
-  }
-}
-
-project(DDS_LNE_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_LNE_Test_Connector_lem_gen DDS_LNE_Test_Connector_stub DDS_LNE_Test_Base_stub
-  libs  += DDS_LNE_Test_Base_stub DDS_LNE_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_LNE_Test_Connector_lem_stub
-  dynamicflags += LISTEN_NOT_ENABLED_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LNE_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    LNE_Test_ConnectorEC.h
-    LNE_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    LNE_Test_ConnectorEC.inl
-  }
-}
-
-project(DDS_LNE_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_LNE_Test_Connector_idl_gen DDS_LNE_Test_Base_stub
-  libs  += DDS_LNE_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_LNE_Test_Connector_stub
-  dynamicflags += LISTEN_NOT_ENABLED_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LNE_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    LNE_Test_ConnectorC.h
-    LNE_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    LNE_Test_ConnectorC.inl
-  }
-}
-
-project(DDS_LNE_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_LNE_Test_Connector_lem_stub DDS_LNE_Test_Connector_stub DDS_LNE_Test_Base_stub
-  sharedname = DDS_LNE_Test_Connector_exec
-  libs += DDS_LNE_Test_Connector_stub DDS_LNE_Test_Connector_lem_stub DDS_LNE_Test_Base_stub DDS_LNE_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += LISTEN_NOT_ENABLED_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LNE_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    LNE_Test_Connector_conn.h
-    LNE_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_LNE_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_LNE_Test_Connector_lem_stub DDS_LNE_Test_Connector_exec DDS_LNE_Test_Connector_stub
-  sharedname  = DDS_LNE_Test_Connector_svnt
-  libs       += DDS_LNE_Test_Connector_stub \
-                DDS_LNE_Test_Connector_lem_stub  \
-                DDS_LNE_Test_Base_stub \
-                DDS_LNE_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += LISTEN_NOT_ENABLED_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LNE_Test_ConnectorS.cpp
-    LNE_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    LNE_Test_ConnectorS.h
-    LNE_Test_Connector_svnt.h
-    LNE_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/README b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/README
deleted file mode 100644
index ee5fd301c5e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/README
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-This test tests the listener.
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/.gitignore b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/.gitignore
deleted file mode 100644
index 7b8c7f24fa3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/LNE_Test_ReceiverE.idl
-/Receiver_exec_export.h
-/Receiver_lem_stub_export.h
-/Receiver_stub_export.h
-/Receiver_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.idl
deleted file mode 100644
index 007ec0ba135..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/LNE_Test_Connector.idl"
-
-module LNE_Test
-{
-  component Receiver
-  {
-    port ListenNotEnabledTestConnector::DDS_Listen info_listen;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc
deleted file mode 100644
index 1e0ddcdb130..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc
+++ /dev/null
@@ -1,146 +0,0 @@
-project(DDS_LNE_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_LNE_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h \
-              -I..
-
-  IDL_Files {
-    LNE_Test_Receiver.idl
-  }
-}
-
-project(DDS_LNE_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_LNE_Test_Receiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    LNE_Test_ReceiverE.idl
-  }
-}
-
-project(DDS_LNE_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_LNE_Test_Receiver_lem_gen DDS_LNE_Test_Receiver_stub  \
-           DDS_LNE_Test_Connector_stub DDS_LNE_Test_Base_stub
-  libs  +=  Receiver_stub DDS_LNE_Test_Connector_stub \
-            DDS_LNE_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LNE_Test_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    LNE_Test_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    LNE_Test_ReceiverEC.inl
-  }
-}
-
-project(DDS_LNE_Test_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_LNE_Test_Receiver_idl_gen  DDS_LNE_Test_Connector_stub \
-           DDS_LNE_Test_Base_stub DDS_LNE_Test_Connector_lem_gen
-  libs  += DDS_LNE_Test_Connector_stub DDS_LNE_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LNE_Test_ReceiverC.cpp
-  }
-
-  Header_Files {
-    LNE_Test_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    LNE_Test_ReceiverC.inl
-  }
-}
-
-project(DDS_LNE_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_LNE_Test_Receiver_lem_stub DDS_LNE_Test_Receiver_stub \
-             DDS_LNE_Test_Base_stub DDS_LNE_Test_Connector_stub \
-             DDS_LNE_Test_Connector_lem_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_LNE_Test_Base_stub \
-          DDS_LNE_Test_Connector_stub DDS_LNE_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LNE_Test_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    LNE_Test_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_LNE_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_LNE_Test_Receiver_lem_stub DDS_LNE_Test_Base_stub \
-                  DDS_LNE_Test_Connector_stub DDS_LNE_Test_Connector_svnt \
-                  DDS_LNE_Test_Receiver_exec DDS_LNE_Test_Connector_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_LNE_Test_Base_stub \
-                DDS_LNE_Test_Connector_stub DDS_LNE_Test_Connector_svnt \
-                Receiver_exec DDS_LNE_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LNE_Test_ReceiverS.cpp
-    LNE_Test_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    LNE_Test_ReceiverS.h
-    LNE_Test_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.cpp
deleted file mode 100644
index d03b5ce15ce..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.cpp
+++ /dev/null
@@ -1,234 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "LNE_Test_Receiver_exec.h"
-
-namespace CIAO_LNE_Test_Receiver_Impl
-{
-
-  /**
-   * Facet Executor Implementation Class: info_listen_data_listener_exec_i
-   */
-
-  info_listen_data_listener_exec_i::info_listen_data_listener_exec_i (
-        ::LNE_Test::CCM_Receiver_Context_ptr ctx,
-        Atomic_ULong &received_one_by_one,
-        Atomic_ULong &received_many_by_many)
-    : ciao_context_ (
-        ::LNE_Test::CCM_Receiver_Context::_duplicate (ctx))
-      , received_one_by_one_ (received_one_by_one)
-      , received_many_by_many_ (received_many_by_many)
-  {
-  }
-
-  info_listen_data_listener_exec_i::~info_listen_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::LNE_Test::ListenNotEnabledTestConnector::Listener
-
-  void
-  info_listen_data_listener_exec_i::on_one_data (const ::ListenNotEnabledTest & /* datum */,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    // Just count; this value is checked on ccm_remove.
-    ++this->received_one_by_one_;
-  }
-
-  void
-  info_listen_data_listener_exec_i::on_many_data (const ::ListenNotEnabledTestSeq & /* data */,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    // Just count; this value is checked on ccm_remove.
-    ++this->received_many_by_many_;
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_listen_status_exec_i
-   */
-
-  info_listen_status_exec_i::info_listen_status_exec_i (
-        ::LNE_Test::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::LNE_Test::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_listen_status_exec_i::~info_listen_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_listen_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_listen_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : received_one_by_one_ (0)
-      , received_many_by_many_ (0)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-
-  // Component attributes and port operations.
-
-  ::LNE_Test::ListenNotEnabledTestConnector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_listen_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_listen_data_listener_.in ()))
-      {
-        info_listen_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_listen_data_listener_exec_i (
-            this->ciao_context_.in (),
-            this->received_one_by_one_,
-            this->received_many_by_many_),
-            ::LNE_Test::ListenNotEnabledTestConnector::CCM_Listener::_nil ());
-
-          this->ciao_info_listen_data_listener_ = tmp;
-      }
-
-    return
-      ::LNE_Test::ListenNotEnabledTestConnector::CCM_Listener::_duplicate (
-        this->ciao_info_listen_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_listen_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_listen_status_.in ()))
-      {
-        info_listen_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_listen_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_listen_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_listen_status_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::LNE_Test::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    ::CCM_DDS::DataListenerControl_var dlc =
-        this->ciao_context_->get_connection_info_listen_data_control ();
-    dlc->mode (::CCM_DDS::NOT_ENABLED);
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    if (this->received_one_by_one_.value () > 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: NOT ENABLED: "
-                               "Received samples on one_by_one "
-                               "callback while mode is NOT_ENABLED "
-                               "expected <0> - received <%u>\n",
-                               this->received_one_by_one_.value ()));
-      }
-    if (this->received_many_by_many_.value () > 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: NOT ENABLED: "
-                               "Received samples on many_by_many "
-                               "callback while mode is NOT_ENABLED "
-                               "expected <0> - received <%u>\n",
-                               this->received_many_by_many_.value ()));
-      }
-    if (this->received_one_by_one_.value () == 0   &&
-        this->received_many_by_many_.value () == 0)
-      {
-        ACE_DEBUG ((LM_DEBUG, "NOT ENABLED: "
-                               "Received no data at all."
-                               "Test passed!\n"));
-      }
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_LNE_Test_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.h
deleted file mode 100644
index 18929491328..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.h
+++ /dev/null
@@ -1,174 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_LNE_TEST_RECEIVER_EXEC_KLQOYU_H_
-#define CIAO_LNE_TEST_RECEIVER_EXEC_KLQOYU_H_
-
-#include /**/ "ace/pre.h"
-
-#include "LNE_Test_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_LNE_Test_Receiver_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::ULong> Atomic_ULong;
-
-  /**
-   * Provider Executor Implementation Class: info_listen_data_listener_exec_i
-   */
-
-  class info_listen_data_listener_exec_i
-    : public virtual ::LNE_Test::ListenNotEnabledTestConnector::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_listen_data_listener_exec_i (
-      ::LNE_Test::CCM_Receiver_Context_ptr ctx,
-      Atomic_ULong &received_one_by_one,
-      Atomic_ULong &received_many_by_many);
-    virtual ~info_listen_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from LNE_Test::ListenNotEnabledTestConnector::Listener. */
-
-    virtual
-    void on_one_data (const ::ListenNotEnabledTest & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (const ::ListenNotEnabledTestSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    ::LNE_Test::CCM_Receiver_Context_var ciao_context_;
-    Atomic_ULong &received_one_by_one_;
-    Atomic_ULong &received_many_by_many_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_listen_status_exec_i
-   */
-
-  class info_listen_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_listen_status_exec_i (
-      ::LNE_Test::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_listen_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::LNE_Test::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::LNE_Test::ListenNotEnabledTestConnector::CCM_Listener_ptr
-    get_info_listen_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_listen_status (void);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-
-    //@}
-
-  private:
-    ::LNE_Test::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::LNE_Test::ListenNotEnabledTestConnector::CCM_Listener_var ciao_info_listen_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_listen_status_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    Atomic_ULong received_one_by_one_;
-    Atomic_ULong received_many_by_many_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_LNE_Test_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/.gitignore b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/.gitignore
deleted file mode 100644
index 0b9e96eacf9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/LNE_Test_SenderE.idl
-/Sender_exec_export.h
-/Sender_lem_stub_export.h
-/Sender_stub_export.h
-/Sender_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.idl
deleted file mode 100644
index 0c09fb7fdde..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_LISTEN_NOT_ENABLED_TEST_SENDER_IDL
-#define DDS_LISTEN_NOT_ENABLED_TEST_SENDER_IDL
-
-#include "Connector/LNE_Test_Connector.idl"
-
-module LNE_Test
-{
-  component Sender
-  {
-    port ListenNotEnabledTestConnector::DDS_Write info_write;
-    provides CCM_DDS::ConnectorStatusListener connector_status;
-
-    attribute unsigned short keys;
-    attribute unsigned short iterations;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc
deleted file mode 100644
index 0511fba5491..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_LNE_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_LNE_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_LNE_Test_Connector_idl_gen DDS_Starter_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I ..
-
-  IDL_Files {
-    LNE_Test_Sender.idl
-  }
-}
-
-project(DDS_LNE_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_LNE_Test_Sender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    LNE_Test_SenderE.idl
-  }
-}
-
-project(DDS_LNE_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_LNE_Test_Sender_lem_gen DDS_LNE_Test_Sender_stub \
-           DDS_LNE_Test_Base_stub
-  libs  += DDS_LNE_Test_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LNE_Test_SenderEC.cpp
-  }
-
-  Header_Files {
-    LNE_Test_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    LNE_Test_SenderEC.inl
-  }
-}
-
-project(DDS_LNE_Test_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_LNE_Test_Sender_idl_gen DDS_LNE_Test_Base_stub \
-           DDS_LNE_Test_Connector_stub
-  libs  += DDS_LNE_Test_Base_stub DDS_LNE_Test_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LNE_Test_SenderC.cpp
-  }
-
-  Header_Files {
-    LNE_Test_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    LNE_Test_SenderC.inl
-  }
-}
-
-project(DDS_LNE_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_LNE_Test_Sender_lem_stub DDS_LNE_Test_Sender_stub \
-             DDS_LNE_Test_Connector_lem_stub DDS_LNE_Test_Connector_stub
-  sharedname = Sender_exec
-  libs    += Sender_stub Sender_lem_stub DDS_LNE_Test_Base_stub \
-             DDS_LNE_Test_Connector_lem_stub DDS_LNE_Test_Connector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LNE_Test_Sender_exec.cpp
-  }
-
-  Header_Files {
-    LNE_Test_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_LNE_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_LNE_Test_Base_stub  DDS_LNE_Test_Sender_lem_stub \
-                DDS_LNE_Test_Connector_stub \
-                DDS_LNE_Test_Connector_svnt DDS_LNE_Test_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub DDS_LNE_Test_Base_stub \
-                DDS_LNE_Test_Connector_stub DDS_LNE_Test_Connector_svnt \
-                DDS_LNE_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LNE_Test_SenderS.cpp
-    LNE_Test_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    LNE_Test_SenderS.h
-    LNE_Test_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.cpp
deleted file mode 100644
index 1d2bf03e4fd..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.cpp
+++ /dev/null
@@ -1,293 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "LNE_Test_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_LNE_Test_Sender_Impl
-{
-  /**
-   * ConnectorStatusListener_exec_i
-   */
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (
-    Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic (
-    ::DDS::Topic_ptr /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status(
-    ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind status_kind)
-  {
-    if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS)
-      {
-        ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_unexpected_status - "
-          "Publication matched received: starting the test\n"));
-
-        this->callback_.get_started ();
-      }
-  }
-
-  /**
-   * WriteHandler
-   */
-
-  WriteManyHandler::WriteManyHandler (Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  WriteManyHandler::handle_exception (ACE_HANDLE)
-  {
-    this->callback_.write_many ();
-    return 0;
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : keys_ (5)
-      , iterations_ (10)
-  {
-    ACE_NEW_THROW_EX (this->rh_,
-                      WriteManyHandler (*this),
-                      ::CORBA::NO_MEMORY ());
-
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->rh_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i  (*this);
-  }
-
-  void
-  Sender_exec_i::write_many (void)
-  {
-    ListenNotEnabledTestSeq write_many;
-    write_many.length (this->keys_ * this->iterations_);
-    for (CORBA::UShort key = 1; key < this->keys_ + 1; ++key)
-      {
-        ListenNotEnabledTest new_key;
-        char tmp[7];
-        ACE_OS::sprintf (tmp, "KEY_%d", key);
-        new_key.key = CORBA::string_dup(tmp);
-        for (CORBA::UShort iter = 1; iter < this->iterations_ + 1; ++iter)
-          {
-            new_key.iteration = iter;
-            write_many[key + iter - 2] = new_key;
-          }
-      }
-
-    ::LNE_Test::ListenNotEnabledTestConnector::Writer_var writer =
-      this->ciao_context_->get_connection_info_write_data ();
-
-    try
-      {
-        ACE_Time_Value tv (1, 0);
-        ACE_OS::sleep (tv);
-        writer->write_many (write_many);
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("write_many : written <%u> samples\n"),
-              write_many.length ()));
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                    ACE_TEXT ("while write many writer info: index <%d> - retval <%d>\n"),
-                      ex.index, ex.error_code));
-      }
-  }
-
-  void
-  Sender_exec_i::get_started (void)
-  {
-    try
-      {
-        this->start ();
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("Exception caught:");
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Sender_exec_i::ccm_activate: Exception caught\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Sender_exec_i::ccm_activate: Unknown exception caught\n")));
-      }
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    this->reactor ()->notify (this->rh_);
-  }
-
-  // Component attributes and port operations.
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::LNE_Test::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_LNE_Test_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.h
deleted file mode 100644
index c734f167b6f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.h
+++ /dev/null
@@ -1,168 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_LNE_TEST_SENDER_EXEC_QXP6HQ_H_
-#define CIAO_LNE_TEST_SENDER_EXEC_QXP6HQ_H_
-
-#include /**/ "ace/pre.h"
-
-#include "LNE_Test_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_LNE_Test_Sender_Impl
-{
-  class Sender_exec_i;
-
-  /**
-   * ConnectorStatusListener_exec_i
-   */
-  class SENDER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Sender_exec_i &callback);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-      void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                                 ::DDS::StatusKind status_kind);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * WriteHandler
-   */
-
-  class WriteManyHandler :
-    public ACE_Event_Handler
-  {
-  public:
-    WriteManyHandler (Sender_exec_i &callback);
-    virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_connector_status (void);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void get_started (void);
-    void write_many (void);
-
-    //@}
-
-  private:
-    ::LNE_Test::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-
-    ::CORBA::UShort keys_;
-
-    ::CORBA::UShort iterations_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    WriteManyHandler *rh_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void start (void);
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_LNE_Test_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/Plan.cdp
deleted file mode 100644
index 4a83501042c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/Plan.cdp
+++ /dev/null
@@ -1,371 +0,0 @@
-<!--  -->
-<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>LNE_Test_Depl_1</label>
-  <UUID>LNE_Test_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_LNE_Test_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_LNE_Test_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="LNE_Test_ConnectorComponentImplementation">
-    <name>LNE_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="LNE_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="LNE_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_LNE_Test_ListenNotEnabledTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_LNE_Test_ListenNotEnabledTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>LNE_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>LNE_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_LNE_Test_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_LNE_Test_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-  </instance>
-  <instance xmi:id="LNE_Test_ConnectorComponentInstance">
-    <name>LNE_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="LNE_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>LNE_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="LNE_Test_ConnectorComponentInstance2">
-    <name>LNE_Test_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="LNE_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>LNE_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>info_listen_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="LNE_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_listen_data_control</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="LNE_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="LNE_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="LNE_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="LNE_Test_Connector_ExecArtifact">
-    <name>LNE_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_LNE_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="LNE_Test_Connector_SvntArtifact">
-    <name>LNE_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_LNE_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="LNE_Test_Connector_StubArtifact">
-    <name>LNE_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_LNE_Test_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl
deleted file mode 100755
index c6321471979..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 10 seconds to allow task to complete\n";
-sleep (10);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/.gitignore b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/.gitignore
deleted file mode 100644
index e34f295b1bb..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/LOBO_Test_Base.cxx
-/LOBO_Test_Base.h
-/LOBO_Test_BasePlugin.cxx
-/LOBO_Test_BasePlugin.h
-/LOBO_Test_BaseSupport.cxx
-/LOBO_Test_BaseSupport.h
-/LOBO_Test_Base_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl
deleted file mode 100644
index 565b7e98142..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file LOBO_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef LISTEN_ONE_BY_ONE_TEST_BASE_IDL
-#define LISTEN_ONE_BY_ONE_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/LOBO_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/LOBO_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "ListenOneByOneTest"
-#pragma DCPS_DATA_KEY "ListenOneByOneTest key"
-
-struct ListenOneByOneTest {
-  string key; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<ListenOneByOneTest> ListenOneByOneTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc
deleted file mode 100644
index 8b3b8acbf22..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_LOBO_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_LOBO_Test_Base_stub
-  dynamicflags += LISTEN_ONE_BY_ONE_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=LISTEN_ONE_BY_ONE_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=LOBO_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    LOBO_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=LISTEN_ONE_BY_ONE_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    LOBO_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/.gitignore
deleted file mode 100644
index 406ee55c6bd..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/LOBO_Test_ConnectorE.idl
-/LOBO_Test_Connector_conn.cpp
-/LOBO_Test_Connector_conn.h
-/LOBO_Test_Connector_conn_export.h
-/LOBO_Test_Connector_lem_stub_export.h
-/LOBO_Test_Connector_stub_export.h
-/LOBO_Test_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.idl
deleted file mode 100644
index 9f1928117a3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * @file LOBO_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef LISTEN_ONE_BY_ONE_TEST_CONNECTOR_IDL_
-#define LISTEN_ONE_BY_ONE_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/LOBO_Test_Base.idl"
-
-#pragma ciao lem "Connector/LOBO_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/LOBO_Test_BaseTypeSupport.idl"
-#endif
-
-module LOBO_Test
-{
-  module ::CCM_DDS::Typed
-    < ::ListenOneByOneTest, ::ListenOneByOneTestSeq>
-    ListenOneByOneTestConnector;
-};
-
-#endif /* LOBO_Test_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc
deleted file mode 100644
index 0bc3d164d54..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_LOBO_Test_Base -l .. -o ../lib -u DDS LOBO_Test_Connector"
-
-project(DDS_LOBO_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_LOBO_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=LISTEN_ONE_BY_ONE_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=LOBO_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=LISTEN_ONE_BY_ONE_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=LOBO_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=LISTEN_ONE_BY_ONE_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=LOBO_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=LISTEN_ONE_BY_ONE_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=LOBO_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    LOBO_Test_Connector.idl
-  }
-}
-
-project(DDS_LOBO_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_LOBO_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=LISTEN_ONE_BY_ONE_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=LOBO_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    LOBO_Test_ConnectorE.idl
-  }
-}
-
-project(DDS_LOBO_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_LOBO_Test_Connector_lem_gen DDS_LOBO_Test_Connector_stub DDS_LOBO_Test_Base_stub
-  libs  += DDS_LOBO_Test_Base_stub DDS_LOBO_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_LOBO_Test_Connector_lem_stub
-  dynamicflags += LISTEN_ONE_BY_ONE_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LOBO_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    LOBO_Test_ConnectorEC.h
-    LOBO_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    LOBO_Test_ConnectorEC.inl
-  }
-}
-
-project(DDS_LOBO_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_LOBO_Test_Connector_idl_gen DDS_LOBO_Test_Base_stub
-  libs  += DDS_LOBO_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_LOBO_Test_Connector_stub
-  dynamicflags += LISTEN_ONE_BY_ONE_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LOBO_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    LOBO_Test_ConnectorC.h
-    LOBO_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    LOBO_Test_ConnectorC.inl
-  }
-}
-
-project(DDS_LOBO_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_LOBO_Test_Connector_lem_stub DDS_LOBO_Test_Connector_stub DDS_LOBO_Test_Base_stub
-  sharedname = DDS_LOBO_Test_Connector_exec
-  libs += DDS_LOBO_Test_Connector_stub DDS_LOBO_Test_Connector_lem_stub DDS_LOBO_Test_Base_stub DDS_LOBO_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += LISTEN_ONE_BY_ONE_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LOBO_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    LOBO_Test_Connector_conn.h
-    LOBO_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_LOBO_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_LOBO_Test_Connector_lem_stub DDS_LOBO_Test_Connector_exec DDS_LOBO_Test_Connector_stub
-  sharedname  = DDS_LOBO_Test_Connector_svnt
-  libs       += DDS_LOBO_Test_Connector_stub \
-                DDS_LOBO_Test_Connector_lem_stub  \
-                DDS_LOBO_Test_Base_stub \
-                DDS_LOBO_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += LISTEN_ONE_BY_ONE_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LOBO_Test_ConnectorS.cpp
-    LOBO_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    LOBO_Test_ConnectorS.h
-    LOBO_Test_Connector_svnt.h
-    LOBO_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/README b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/README
deleted file mode 100644
index ee5fd301c5e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/README
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-This test tests the listener.
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/.gitignore b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/.gitignore
deleted file mode 100644
index 20dd17a46af..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/LOBO_Test_ReceiverE.idl
-/Receiver_exec_export.h
-/Receiver_lem_stub_export.h
-/Receiver_stub_export.h
-/Receiver_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.idl
deleted file mode 100644
index 2944d3b6c0c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/LOBO_Test_Connector.idl"
-
-module LOBO_Test
-{
-  component Receiver
-  {
-    port ListenOneByOneTestConnector::DDS_Listen info_listen;
-
-    attribute unsigned short keys;
-    attribute unsigned short iterations;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc
deleted file mode 100644
index d1d0bb8fc63..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-project(DDS_LOBO_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_LOBO_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h -I..
-
-  IDL_Files {
-    LOBO_Test_Receiver.idl
-  }
-}
-
-project(DDS_LOBO_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_LOBO_Test_Receiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    LOBO_Test_ReceiverE.idl
-  }
-}
-
-project(DDS_LOBO_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_LOBO_Test_Receiver_lem_gen DDS_LOBO_Test_Receiver_stub  \
-           DDS_LOBO_Test_Connector_stub DDS_LOBO_Test_Base_stub
-  libs  +=  Receiver_stub DDS_LOBO_Test_Connector_stub \
-            DDS_LOBO_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LOBO_Test_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    LOBO_Test_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    LOBO_Test_ReceiverEC.inl
-  }
-}
-
-project(DDS_LOBO_Test_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_LOBO_Test_Receiver_idl_gen  DDS_LOBO_Test_Connector_stub \
-           DDS_LOBO_Test_Base_stub DDS_LOBO_Test_Connector_lem_gen
-  libs  += DDS_LOBO_Test_Connector_stub DDS_LOBO_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LOBO_Test_ReceiverC.cpp
-  }
-
-  Header_Files {
-    LOBO_Test_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    LOBO_Test_ReceiverC.inl
-  }
-}
-
-project(DDS_LOBO_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_LOBO_Test_Receiver_lem_stub DDS_LOBO_Test_Receiver_stub \
-             DDS_LOBO_Test_Base_stub DDS_LOBO_Test_Connector_stub \
-             DDS_LOBO_Test_Connector_lem_stub 
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_LOBO_Test_Base_stub \
-          DDS_LOBO_Test_Connector_stub DDS_LOBO_Test_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LOBO_Test_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    LOBO_Test_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_LOBO_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_LOBO_Test_Receiver_lem_stub DDS_LOBO_Test_Base_stub \
-                  DDS_LOBO_Test_Connector_stub DDS_LOBO_Test_Connector_svnt \
-                  DDS_LOBO_Test_Receiver_exec DDS_LOBO_Test_Connector_lem_stub 
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_LOBO_Test_Base_stub \
-                DDS_LOBO_Test_Connector_stub DDS_LOBO_Test_Connector_svnt \
-                Receiver_exec DDS_LOBO_Test_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LOBO_Test_ReceiverS.cpp
-    LOBO_Test_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    LOBO_Test_ReceiverS.h
-    LOBO_Test_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp
deleted file mode 100644
index ac725d4923d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp
+++ /dev/null
@@ -1,266 +0,0 @@
-// -*- C++ -*-
-#include "LOBO_Test_Receiver_exec.h"
-#include "ace/Log_Msg.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-namespace CIAO_LOBO_Test_Receiver_Impl
-{
-  //============================================================
-  // ListenOneByOneTest_Listener_exec_i
-  //============================================================
-  ListenOneByOneTest_Listener_exec_i::ListenOneByOneTest_Listener_exec_i (
-                                              Atomic_ULong &received_one_by_one,
-                                              Atomic_ULong &received_many_by_many,
-                                              ACE_Thread_ID &thread_id)
-    : received_one_by_one_ (received_one_by_one),
-      received_many_by_many_ (received_many_by_many),
-      thread_id_ (thread_id)
-  {
-  }
-
-  ListenOneByOneTest_Listener_exec_i::~ListenOneByOneTest_Listener_exec_i (void)
-  {
-  }
-
-  void
-  ListenOneByOneTest_Listener_exec_i::on_one_data (
-                                  const ListenOneByOneTest & an_instance,
-                                  const ::CCM_DDS::ReadInfo & info)
-  {
-    ACE_Thread_ID t_id;
-    this->thread_id_ = t_id;
-
-    ACE_DEBUG ((LM_DEBUG, "ListenOneByOneTest_Listener_exec_i::on_one_data: "
-                            "key <%C> - iteration <%d>\n",
-                            an_instance.key.in (),
-                            an_instance.iteration));
-    if (info.instance_handle == ::DDS::HANDLE_NIL)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: ListenOneByOneTest_Listener_exec_i::on_one_data: "
-                            "instance handle seems to be nil "
-                            "key <%C> - iteration <%d>\n",
-                            an_instance.key.in (),
-                            an_instance.iteration));
-      }
-    if (info.source_timestamp.sec == 0 &&
-        info.source_timestamp.nanosec == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: ListenOneByOneTest_Listener_exec_i::on_one_data: "
-                            "source timestamp seems to be nil (nil) "
-                            "key <%C> - iteration <%d>\n",
-                            an_instance.key.in (),
-                            an_instance.iteration));
-      }
-    ++this->received_one_by_one_;
-  }
-
-  void
-  ListenOneByOneTest_Listener_exec_i::on_many_data (
-                                  const ListenOneByOneTestSeq & an_instance,
-                                  const ::CCM_DDS::ReadInfoSeq & /*info*/)
-  {
-    // Just count. Is checked on ccm_remove.
-    this->received_many_by_many_ += an_instance.length ();
-  }
-
-  //============================================================
-  // Receiver_exec_i
-  //============================================================
-  Receiver_exec_i::Receiver_exec_i (void)
-    : received_one_by_one_ (0),
-      received_many_by_many_ (0),
-      thread_id_listener_ (0, 0),
-      iterations_ (10),
-      keys_ (5)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::start ()
-  {
-    ::CCM_DDS::DataListenerControl_var dlc =
-        this->context_->get_connection_info_listen_data_control ();
-    dlc->mode (::CCM_DDS::ONE_BY_ONE);
-  }
-
-  ::LOBO_Test::ListenOneByOneTestConnector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_listen_data_listener (void)
-  {
-    return new ListenOneByOneTest_Listener_exec_i (
-                this->received_one_by_one_,
-                this->received_many_by_many_,
-                this->thread_id_listener_);
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_listen_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Receiver_exec_i::get_info_listen_connector_status (void)
-  {
-    return ::CCM_DDS::CCM_ConnectorStatusListener::_nil ();
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Receiver_exec_i::iterations (::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Receiver_exec_i::keys (::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::LOBO_Test::CCM_Receiver_Context::_narrow (ctx);
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    start ();
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    CORBA::ULong expected = this->keys_ * this->iterations_;
-    if (this->received_one_by_one_.value () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: ONE_BY_ONE: "
-                               "Didn't receive samples on one_by_one "
-                               "callback while mode is ONE_BY_ONE "
-                               "expected <%u> - received <%u>\n",
-                               expected,
-                               this->received_one_by_one_.value ()));
-      }
-    else if (expected != this->received_one_by_one_.value ())
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: ONE_BY_ONE: "
-                               "Didn't receive the expected "
-                               "number of samples on one_by_one "
-                               "callback while mode is ONE_BY_ONE "
-                               "expected <%u> - received <%u>\n",
-                               expected,
-                               this->received_one_by_one_.value ()));
-      }
-    if (this->received_many_by_many_.value () > 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: ONE_BY_ONE: "
-                               "Received samples on many_by_many "
-                               "callback while mode is ONE_BY_ONE "
-                               "expected <0> - received <%u>\n",
-                               this->received_many_by_many_.value ()));
-      }
-    if (this->received_one_by_one_.value () > 0   &&
-        this->received_many_by_many_.value () == 0)
-      {
-        ACE_DEBUG ((LM_DEBUG, "ONE_BY_ONE: "
-                               "Received only data on "
-                               "one_by_one callback. "
-                               "Test passed!\n"));
-      }
-    //get current thread
-    char ccm_buf [65];
-    ACE_Thread_ID ccm_thread_id;
-    ccm_thread_id.to_string (ccm_buf);
-
-    char list_buf [65];
-    this->thread_id_listener_.to_string (list_buf);
-
-    if (this->thread_id_listener_.id () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
-                              "Thread ID for ReaderListener not set!\n"));
-      }
-    #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (this->thread_id_listener_ == ccm_thread_id)
-      {
-        ACE_DEBUG ((LM_DEBUG, "ONE_BY_ONE: "
-                              "Thread switch for ReaderListener seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                               "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-    }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: ONE_BY_ONE: "
-                              "Thread switch for ReaderListener "
-                              "doesn't seem to work! "
-                               "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-    }
-    #else
-    else if (this->thread_id_listener_ == ccm_thread_id)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: ONE_BY_ONE: ReaderListener: "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "ONE_BY_ONE: ReaderListener: "
-                              "DDS seems to use its own thread for its callback: "
-                               "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-    }
-    #endif
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_LOBO_Test_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h
deleted file mode 100644
index e171b512da7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h
+++ /dev/null
@@ -1,107 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_RECEIVER_EXEC_H_
-#define CIAO_RECEIVER_EXEC_H_
-
-#include "LOBO_Test_ReceiverEC.h"
-
-#include /**/ "Receiver_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-#include "ace/OS_NS_Thread.h"
-
-
-
-#include <map>
-
-namespace CIAO_LOBO_Test_Receiver_Impl
-{
-  class Receiver_exec_i;
-
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::ULong> Atomic_ULong;
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, bool> Atomic_Bool;
-
-  //============================================================
-  // ListenOneByOneTest_Listener_exec_i
-  //============================================================
-  class RECEIVER_EXEC_Export ListenOneByOneTest_Listener_exec_i
-    : public virtual ::LOBO_Test::ListenOneByOneTestConnector::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ListenOneByOneTest_Listener_exec_i (
-                            Atomic_ULong &received_one_by_one,
-                            Atomic_ULong &received_many_by_many,
-                            ACE_Thread_ID &thread_id);
-    virtual ~ListenOneByOneTest_Listener_exec_i (void);
-
-    virtual void
-    on_one_data (
-      const ListenOneByOneTest & an_instance,
-      const ::CCM_DDS::ReadInfo & info);
-    virtual void
-    on_many_data (
-      const ListenOneByOneTestSeq & an_instance,
-      const ::CCM_DDS::ReadInfoSeq & info);
-  private:
-    Atomic_ULong &received_one_by_one_;
-    Atomic_ULong &received_many_by_many_;
-    ACE_Thread_ID &thread_id_;
-  };
-
-  //============================================================
-  // Receiver_exec_i
-  //============================================================
-  class RECEIVER_EXEC_Export Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    void start ();
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-
-    virtual ::LOBO_Test::ListenOneByOneTestConnector::CCM_Listener_ptr
-    get_info_listen_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr get_info_listen_status (void);
-
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_info_listen_connector_status (void);
-
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete (void);
-
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-
-  private:
-    ::LOBO_Test::CCM_Receiver_Context_var context_;
-
-    Atomic_ULong    received_one_by_one_;
-    Atomic_ULong    received_many_by_many_;
-    ACE_Thread_ID thread_id_listener_;
-
-    CORBA::UShort iterations_;
-    CORBA::UShort keys_;
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_LOBO_Test_Receiver_Impl (void);
-}
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/.gitignore b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/.gitignore
deleted file mode 100644
index 630065578bc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/LOBO_Test_SenderE.idl
-/Sender_exec_export.h
-/Sender_lem_stub_export.h
-/Sender_stub_export.h
-/Sender_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.idl
deleted file mode 100644
index d399d7cc53b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_LISTEN_ONE_BY_ONE_TEST_SENDER_IDL
-#define DDS_LISTEN_ONE_BY_ONE_TEST_SENDER_IDL
-
-#include "Connector/LOBO_Test_Connector.idl"
-
-module LOBO_Test
-{
-  component Sender
-  {
-    port ListenOneByOneTestConnector::DDS_Write info_write;
-    provides CCM_DDS::ConnectorStatusListener connector_status;
-
-    attribute unsigned short keys;
-    attribute unsigned short iterations;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc
deleted file mode 100644
index 7fee73abf3b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_LOBO_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_LOBO_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_LOBO_Test_Connector_idl_gen DDS_Starter_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I ..
-
-  IDL_Files {
-    LOBO_Test_Sender.idl
-  }
-}
-
-project(DDS_LOBO_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_LOBO_Test_Sender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    LOBO_Test_SenderE.idl
-  }
-}
-
-project(DDS_LOBO_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_LOBO_Test_Sender_lem_gen DDS_LOBO_Test_Sender_stub \
-           DDS_LOBO_Test_Base_stub
-  libs  += DDS_LOBO_Test_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LOBO_Test_SenderEC.cpp
-  }
-
-  Header_Files {
-    LOBO_Test_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    LOBO_Test_SenderEC.inl
-  }
-}
-
-project(DDS_LOBO_Test_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_LOBO_Test_Sender_idl_gen DDS_LOBO_Test_Base_stub \
-           DDS_LOBO_Test_Connector_stub
-  libs  += DDS_LOBO_Test_Base_stub DDS_LOBO_Test_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LOBO_Test_SenderC.cpp
-  }
-
-  Header_Files {
-    LOBO_Test_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    LOBO_Test_SenderC.inl
-  }
-}
-
-project(DDS_LOBO_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_LOBO_Test_Sender_lem_stub DDS_LOBO_Test_Sender_stub \
-             DDS_LOBO_Test_Connector_lem_stub DDS_LOBO_Test_Connector_stub 
-  sharedname = Sender_exec
-  libs    += Sender_stub Sender_lem_stub DDS_LOBO_Test_Base_stub \
-             DDS_LOBO_Test_Connector_lem_stub DDS_LOBO_Test_Connector_stub 
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LOBO_Test_Sender_exec.cpp
-  }
-
-  Header_Files {
-    LOBO_Test_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_LOBO_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_LOBO_Test_Base_stub  DDS_LOBO_Test_Sender_lem_stub \
-                DDS_LOBO_Test_Connector_stub \
-                DDS_LOBO_Test_Connector_svnt DDS_LOBO_Test_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub DDS_LOBO_Test_Base_stub \
-                DDS_LOBO_Test_Connector_stub DDS_LOBO_Test_Connector_svnt \
-                DDS_LOBO_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LOBO_Test_SenderS.cpp
-    LOBO_Test_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    LOBO_Test_SenderS.h
-    LOBO_Test_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.cpp
deleted file mode 100644
index 63aee1fa2c2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.cpp
+++ /dev/null
@@ -1,297 +0,0 @@
-// -*- C++ -*-
-#include "LOBO_Test_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-#include "ace/Guard_T.h"
-#include "ace/Log_Msg.h"
-#include "ace/Date_Time.h"
-
-namespace CIAO_LOBO_Test_Sender_Impl
-{
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (
-    Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic (
-    ::DDS::Topic_ptr /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status(
-    ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind status_kind)
-  {
-    if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS)
-      {
-        ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_unexpected_status - "
-          "Publication matched received: starting the test\n"));
-
-        this->callback_.get_started ();
-      }
-  }
-
-  //============================================================
-  // WriteManyHandler
-  //============================================================
-  WriteTicker::WriteTicker (Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  WriteTicker::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    // Notify the subscribers
-    this->callback_.write_one ();
-    return 0;
-  }
-
-  //============================================================
-  // Component Executor Implementation Class: Sender_exec_i
-  //============================================================
-
-  Sender_exec_i::Sender_exec_i (void)
-    : keys_ (5)
-      , iterations_ (10)
-  {
-    this->ticker_ = new WriteTicker (*this);
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  void
-  Sender_exec_i::write_one (void)
-  {
-    if (this->last_key_ != this->samples_.end ())
-      {
-        try
-          {
-            ++this->last_key_->second->iteration;
-            ::LOBO_Test::ListenOneByOneTestConnector::Writer_var writer =
-              this->ciao_context_->get_connection_info_write_data ();
-            writer->write_one (this->last_key_->second, ::DDS::HANDLE_NIL);
-            ACE_DEBUG ((LM_DEBUG, "Written key <%C> - <%u>\n",
-                          this->last_key_->first.c_str (),
-                          this->last_key_->second->iteration));
-          }
-        catch (const CCM_DDS::InternalError& )
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                        ACE_TEXT ("while updating writer info for <%C>.\n"),
-                          this->last_key_->first.c_str ()));
-          }
-        ++this->last_key_;
-      }
-    else
-      {
-        // Onto the next iteration
-        this->last_key_ = this->samples_.begin ();
-        while (this->last_key_ != this->samples_.end ())
-          {
-            if (this->last_key_->second->iteration == this->iterations_)
-              {
-                // Next key
-                ++this->last_key_;
-              }
-            else
-              {
-                break;
-              }
-          }
-        if (this->last_key_ == this->samples_.end ())
-          {
-            this->reactor ()->cancel_timer (this->ticker_);
-          }
-      }
-  }
-
-  void
-  Sender_exec_i::get_started (void)
-  {
-    try
-      {
-        start ();
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("Exception caught:");
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Sender_exec_i::get_started: Exception caught\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Sender_exec_i::get_started: Unknown exception caught\n")));
-      }
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard,
-                        this->mutex_, CORBA::INTERNAL ());
-
-    for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i)
-      {
-        char key[7];
-        ListenOneByOneTest *new_key = new ListenOneByOneTest;
-        ACE_OS::sprintf (key, "KEY_%d", i);
-        new_key->key = CORBA::string_dup(key);
-        new_key->iteration = 0;
-        this->samples_[key] = new_key;
-      }
-   this->last_key_ = this->samples_.begin ();
-   if (this->reactor ()->schedule_timer (
-                this->ticker_,
-                0,
-                ACE_Time_Value (5, 50000),
-                ACE_Time_Value (0, 50000)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                              ACE_TEXT ("Error scheduling timer")));
-      }
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  // Component attributes and port operations.
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i  (*this);
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::LOBO_Test::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_LOBO_Test_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.h
deleted file mode 100644
index 310030d1ff8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.h
+++ /dev/null
@@ -1,141 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_LOBO_TEST_SENDER_EXEC_QGSN5C_H_
-#define CIAO_LOBO_TEST_SENDER_EXEC_QGSN5C_H_
-
-#include /**/ "ace/pre.h"
-
-#include "LOBO_Test_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-#include <map>
-
-namespace CIAO_LOBO_Test_Sender_Impl
-{
-  class Sender_exec_i;
-
-  //============================================================
-  // WriteTicker
-  //============================================================
-  class WriteTicker :
-    public ACE_Event_Handler
-  {
-  public:
-    WriteTicker (Sender_exec_i &callback);
-    int handle_timeout (const ACE_Time_Value &, const void *);
-  private:
-    /// Maintains a handle that actually process the event
-    Sender_exec_i &callback_;
-  };
-
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  class SENDER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Sender_exec_i &callback);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-      void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                                 ::DDS::StatusKind status_kind);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-
-  //============================================================
-  // Component Executor Implementation Class: Sender_exec_i
-  //============================================================
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_connector_status (void);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);//@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete (void);
-
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined operations */
-    void get_started (void);
-    void write_one (void);
-    //@}
-
-  private:
-    ::LOBO_Test::CCM_Sender_Context_var ciao_context_;
-
-    ::CORBA::UShort keys_;
-
-    ::CORBA::UShort iterations_;
-
-    ACE_Reactor* reactor (void);
-    void start (void);
-
-    WriteTicker *ticker_;
-    TAO_SYNCH_MUTEX mutex_;
-    typedef std::map<ACE_CString, ListenOneByOneTest_var> Writer_Table;
-    Writer_Table samples_;
-    Writer_Table::iterator last_key_;
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_LOBO_Test_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/Plan.cdp
deleted file mode 100644
index 0273c9d561a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/Plan.cdp
+++ /dev/null
@@ -1,393 +0,0 @@
-<!--  -->
-<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>LOBO_Test_Depl_1</label>
-  <UUID>LOBO_Test_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_LOBO_Test_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_LOBO_Test_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="LOBO_Test_ConnectorComponentImplementation">
-    <name>LOBO_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="LOBO_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="LOBO_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_LOBO_Test_ListenOneByOneTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_LOBO_Test_ListenOneByOneTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>LOBO_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>LOBO_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_LOBO_Test_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_LOBO_Test_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="LOBO_Test_ConnectorComponentInstance">
-    <name>LOBO_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="LOBO_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>LOBO_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="LOBO_Test_ConnectorComponentInstance2">
-    <name>LOBO_Test_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="LOBO_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>LOBO_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>info_listen_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="LOBO_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_listen_data_control</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="LOBO_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="LOBO_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="LOBO_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="LOBO_Test_Connector_ExecArtifact">
-    <name>LOBO_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_LOBO_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="LOBO_Test_Connector_SvntArtifact">
-    <name>LOBO_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_LOBO_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="LOBO_Test_Connector_StubArtifact">
-    <name>LOBO_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_LOBO_Test_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl
deleted file mode 100755
index d8b4eca445d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 30 seconds to allow task to complete\n";
-sleep (30);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.idl
deleted file mode 100644
index ad271593b5c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file Event_MemLeakDetection_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef EVENT_MEMLEAKDETECTION_TEST_BASE_IDL
-#define EVENT_MEMLEAKDETECTION_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/Event_MemLeakDetection_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/Event_MemLeakDetection_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "Event_MemLeakDetectionTest"
-#pragma DCPS_DATA_KEY "Event_MemLeakDetectionTest key"
-
-struct Event_MemLeakDetectionTest {
-  string key; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<Event_MemLeakDetectionTest> Event_MemLeakDetectionTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.mpc
deleted file mode 100644
index e3ec1e97771..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_EMLDT_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_EMLDT_Base_stub
-  dynamicflags += EVENT_MEMLEAKDETECTION_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=EVENT_MEMLEAKDETECTION_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=Event_MemLeakDetection_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    Event_MemLeakDetection_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=EVENT_MEMLEAKDETECTION_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    Event_MemLeakDetection_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.idl
deleted file mode 100644
index c9e204f356b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file Event_MemLeakDetection_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef KEYED_TEST_CONNECTOR_IDL_
-#define KEYED_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Event_MemLeakDetection_Test_Base.idl"
-
-#pragma ciao lem "Connector/Event_MemLeakDetection_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/Event_MemLeakDetection_Test_BaseTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::Event_MemLeakDetectionTest, ::Event_MemLeakDetectionTestSeq> Event_MemLeakDetectionConnector;
-
-#endif /* Event_MemLeakDetection_Test_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.mpc
deleted file mode 100644
index c3663a91361..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_EMLDT_Base -l .. -o ../lib -u DDS Event_MemLeakDetection_Test_Connector"
-
-project(DDS_EMLDT_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_EMLDT_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=EVENT_MEMLEAKDETECTION_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=Event_MemLeakDetection_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=EVENT_MEMLEAKDETECTION_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=Event_MemLeakDetection_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=EVENT_MEMLEAKDETECTION_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=Event_MemLeakDetection_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=EVENT_MEMLEAKDETECTION_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Event_MemLeakDetection_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Event_MemLeakDetection_Test_Connector.idl
-  }
-}
-
-project(DDS_EMLDT_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_EMLDT_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=EVENT_MEMLEAKDETECTION_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=Event_MemLeakDetection_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    Event_MemLeakDetection_Test_ConnectorE.idl
-  }
-}
-
-project(DDS_EMLDT_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_EMLDT_Connector_lem_gen DDS_EMLDT_Connector_stub DDS_EMLDT_Base_stub
-  libs  += DDS_EMLDT_Base_stub DDS_EMLDT_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_EMLDT_Connector_lem_stub
-  dynamicflags += EVENT_MEMLEAKDETECTION_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Event_MemLeakDetection_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    Event_MemLeakDetection_Test_ConnectorEC.h
-    Event_MemLeakDetection_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Event_MemLeakDetection_Test_ConnectorEC.inl
-  }
-}
-
-project(DDS_EMLDT_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_EMLDT_Connector_idl_gen DDS_EMLDT_Base_stub
-  libs  += DDS_EMLDT_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_EMLDT_Connector_stub
-  dynamicflags += EVENT_MEMLEAKDETECTION_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Event_MemLeakDetection_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    Event_MemLeakDetection_Test_ConnectorC.h
-    Event_MemLeakDetection_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    Event_MemLeakDetection_Test_ConnectorC.inl
-  }
-}
-
-project(DDS_EMLDT_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_EMLDT_Connector_lem_stub DDS_EMLDT_Connector_stub
-  sharedname = DDS_EMLDT_Connector_exec
-  libs += DDS_EMLDT_Connector_stub DDS_EMLDT_Connector_lem_stub DDS_EMLDT_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += EVENT_MEMLEAKDETECTION_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Event_MemLeakDetection_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    Event_MemLeakDetection_Test_Connector_conn.h
-    Event_MemLeakDetection_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_EMLDT_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_EMLDT_Connector_lem_stub DDS_EMLDT_Connector_exec DDS_EMLDT_Connector_stub
-  sharedname  = DDS_EMLDT_Connector_svnt
-  libs       += DDS_EMLDT_Connector_stub \
-                DDS_EMLDT_Connector_lem_stub  \
-                DDS_EMLDT_Base_stub \
-                DDS_EMLDT_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += EVENT_MEMLEAKDETECTION_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Event_MemLeakDetection_Test_ConnectorS.cpp
-    Event_MemLeakDetection_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    Event_MemLeakDetection_Test_ConnectorS.h
-    Event_MemLeakDetection_Test_Connector_svnt.h
-    Event_MemLeakDetection_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Receiver/Event_MemLeakDetection_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Receiver/Event_MemLeakDetection_Test_Receiver.idl
deleted file mode 100644
index 452db0b4622..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Receiver/Event_MemLeakDetection_Test_Receiver.idl
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/Event_MemLeakDetection_Test_Connector.idl"
-
-module Event_MemLeakDetection_Test
-{
-  component Receiver
-  {
-    port Event_MemLeakDetectionConnector::DDS_Listen  info_listen;
-    port Event_MemLeakDetectionConnector::DDS_Get     info_get;
-    provides CCM_DDS::ConnectorStatusListener status_listener;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Receiver/Event_MemLeakDetection_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Receiver/Event_MemLeakDetection_Test_Receiver.mpc
deleted file mode 100644
index 3cc1aa2ad3a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Receiver/Event_MemLeakDetection_Test_Receiver.mpc
+++ /dev/null
@@ -1,136 +0,0 @@
-project(DDS_EMLDT_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_EMLDT_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h \
-              -I.. -Gex
-
-  IDL_Files {
-    Event_MemLeakDetection_Test_Receiver.idl
-  }
-}
-
-project(DDS_EMLDT_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_EMLDT_Receiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    Event_MemLeakDetection_Test_ReceiverE.idl
-  }
-}
-
-project(DDS_EMLDT_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_EMLDT_Receiver_lem_gen DDS_EMLDT_Receiver_stub  DDS_EMLDT_Connector_stub DDS_EMLDT_Base_stub
-  libs  +=  Receiver_stub DDS_EMLDT_Connector_stub DDS_EMLDT_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Event_MemLeakDetection_Test_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    Event_MemLeakDetection_Test_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Event_MemLeakDetection_Test_ReceiverEC.inl
-  }
-}
-
-project(DDS_EMLDT_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_EMLDT_Receiver_idl_gen  DDS_EMLDT_Connector_stub DDS_EMLDT_Base_stub DDS_EMLDT_Connector_lem_gen
-  libs  += DDS_EMLDT_Connector_stub DDS_EMLDT_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Event_MemLeakDetection_Test_ReceiverC.cpp
-  }
-
-  Header_Files {
-    Event_MemLeakDetection_Test_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    Event_MemLeakDetection_Test_ReceiverC.inl
-  }
-}
-
-project(DDS_EMLDT_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_EMLDT_Receiver_lem_stub DDS_EMLDT_Receiver_stub DDS_EMLDT_Base_stub DDS_EMLDT_Connector_stub DDS_EMLDT_Connector_lem_stub 
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_EMLDT_Base_stub DDS_EMLDT_Connector_stub DDS_EMLDT_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Event_MemLeakDetection_Test_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    Event_MemLeakDetection_Test_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_EMLDT_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_EMLDT_Receiver_lem_stub DDS_EMLDT_Base_stub DDS_EMLDT_Connector_stub DDS_EMLDT_Connector_svnt DDS_EMLDT_Receiver_exec DDS_EMLDT_Connector_lem_stub 
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_EMLDT_Base_stub DDS_EMLDT_Connector_stub DDS_EMLDT_Connector_svnt Receiver_exec DDS_EMLDT_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Event_MemLeakDetection_Test_ReceiverS.cpp
-    Event_MemLeakDetection_Test_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    Event_MemLeakDetection_Test_ReceiverS.h
-    Event_MemLeakDetection_Test_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Sender/Event_MemLeakDetection_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Sender/Event_MemLeakDetection_Test_Sender.idl
deleted file mode 100644
index 1c63ca8799c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Sender/Event_MemLeakDetection_Test_Sender.idl
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_EVENT_MEMLEAKDETECTION_TEST_SENDER_IDL
-#define DDS_EVENT_MEMLEAKDETECTION_TEST_SENDER_IDL
-
-#include "Connector/Event_MemLeakDetection_Test_Connector.idl"
-
-module Event_MemLeakDetection_Test
-{
-  component Sender
-  {
-    port Event_MemLeakDetectionConnector::DDS_Write info_write;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Sender/Event_MemLeakDetection_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Sender/Event_MemLeakDetection_Test_Sender.mpc
deleted file mode 100644
index b3a68ef7736..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Sender/Event_MemLeakDetection_Test_Sender.mpc
+++ /dev/null
@@ -1,138 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_EMLDT_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_EMLDT_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_EMLDT_Connector_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I .. -Gex
-
-  IDL_Files {
-    Event_MemLeakDetection_Test_Sender.idl
-  }
-}
-
-project(DDS_EMLDT_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_EMLDT_Sender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    Event_MemLeakDetection_Test_SenderE.idl
-  }
-}
-
-project(DDS_EMLDT_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_EMLDT_Sender_lem_gen DDS_EMLDT_Sender_stub DDS_EMLDT_Base_stub
-  libs  += DDS_EMLDT_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Event_MemLeakDetection_Test_SenderEC.cpp
-  }
-
-  Header_Files {
-    Event_MemLeakDetection_Test_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Event_MemLeakDetection_Test_SenderEC.inl
-  }
-}
-
-project(DDS_EMLDT_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_EMLDT_Sender_idl_gen DDS_EMLDT_Base_stub DDS_EMLDT_Connector_stub
-  libs  += DDS_EMLDT_Base_stub DDS_EMLDT_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Event_MemLeakDetection_Test_SenderC.cpp
-  }
-
-  Header_Files {
-    Event_MemLeakDetection_Test_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    Event_MemLeakDetection_Test_SenderC.inl
-  }
-}
-
-project(DDS_EMLDT_Sender_exec) : ciao_executor, dds4ccm_base {
-  after   += DDS_EMLDT_Sender_lem_stub DDS_EMLDT_Sender_stub DDS_EMLDT_Connector_lem_stub DDS_EMLDT_Connector_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub DDS_EMLDT_Base_stub DDS_EMLDT_Connector_lem_stub DDS_EMLDT_Connector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Event_MemLeakDetection_Test_Sender_exec.cpp
-  }
-
-  Header_Files {
-    Event_MemLeakDetection_Test_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_EMLDT_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_EMLDT_Base_stub  DDS_EMLDT_Sender_lem_stub DDS_EMLDT_Connector_stub DDS_EMLDT_Connector_svnt  DDS_EMLDT_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                DDS_EMLDT_Base_stub DDS_EMLDT_Connector_stub DDS_EMLDT_Connector_svnt DDS_EMLDT_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Event_MemLeakDetection_Test_SenderS.cpp
-    Event_MemLeakDetection_Test_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    Event_MemLeakDetection_Test_SenderS.h
-    Event_MemLeakDetection_Test_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/All.cdp b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/All.cdp
deleted file mode 100644
index e9cd40feb02..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/All.cdp
+++ /dev/null
@@ -1,549 +0,0 @@
-<!--  -->
-<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>Event_MemLeakDetection_Test_Depl_1</label>
-  <UUID>Event_MemLeakDetection_Test_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Event_MemLeakDetection_Test_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Event_MemLeakDetection_Test_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Event_MemLeakDetection_Test_ConnectorComponentImplementation">
-    <name>Event_MemLeakDetection_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Event_MemLeakDetection_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="Event_MemLeakDetection_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Event_MemLeakDetectionConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Event_MemLeakDetectionConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Event_MemLeakDetection_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Event_MemLeakDetection_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Event_MemLeakDetection_Test_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Event_MemLeakDetection_Test_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-  </instance>
-  <instance xmi:id="Event_MemLeakDetection_Test_ConnectorComponentInstance">
-    <name>Event_MemLeakDetection_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Event_MemLeakDetection_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Event_MemLeakDetection_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="Event_MemLeakDetection_Test_ConnectorComponentInstance2">
-    <name>Event_MemLeakDetection_Test_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Event_MemLeakDetection_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Event_MemLeakDetection_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-  </instance>
-
-  <connection>
-    <name>listen_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Event_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>listen_portstatuslistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Event_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>listen_rawlistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Event_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>listen_datacontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Event_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>listen_dds_reader</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Event_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>listen_filter_config</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_filter_config</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_filter_config</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Event_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>getter_portstatuslistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Event_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>getter_fresh_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_fresh_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_fresh_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Event_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>getter_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Event_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>getter_dds_reader</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Event_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>getter_filter_config</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_filter_config</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_filter_config</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Event_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>status_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-     <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Event_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Event_MemLeakDetection_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_dds_writer</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Event_MemLeakDetection_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="Event_MemLeakDetection_Test_Connector_ExecArtifact">
-    <name>Event_MemLeakDetection_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_EMLDT_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Event_MemLeakDetection_Test_Connector_SvntArtifact">
-    <name>Event_MemLeakDetection_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_EMLDT_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Event_MemLeakDetection_Test_Connector_StubArtifact">
-    <name>Event_MemLeakDetection_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_EMLDT_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/Connector_only.cdp b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/Connector_only.cdp
deleted file mode 100644
index 4256b05cf8e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/Connector_only.cdp
+++ /dev/null
@@ -1,98 +0,0 @@
-<!--  -->
-<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>Event_MemLeakDetection_Test_Depl_1</label>
-  <UUID>Event_MemLeakDetection_Test_Depl_1</UUID>
-
-  <implementation xmi:id="Event_MemLeakDetection_Test_ConnectorComponentImplementation">
-    <name>Event_MemLeakDetection_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Event_MemLeakDetection_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="Event_MemLeakDetection_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Event_MemLeakDetectionConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Event_MemLeakDetectionConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Event_MemLeakDetection_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Event_MemLeakDetection_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="Event_MemLeakDetection_Test_ConnectorComponentInstance">
-    <name>Event_MemLeakDetection_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Event_MemLeakDetection_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Event_MemLeakDetection_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <artifact xmi:id="Event_MemLeakDetection_Test_Connector_ExecArtifact">
-    <name>Event_MemLeakDetection_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_EMLDT_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Event_MemLeakDetection_Test_Connector_SvntArtifact">
-    <name>Event_MemLeakDetection_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_EMLDT_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Event_MemLeakDetection_Test_Connector_StubArtifact">
-    <name>Event_MemLeakDetection_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_EMLDT_Connector_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/Listen.cdp b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/Listen.cdp
deleted file mode 100644
index 5b21c73b194..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/Listen.cdp
+++ /dev/null
@@ -1,196 +0,0 @@
-<!--  -->
-<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>Event_MemLeakDetection_Test_Depl_1</label>
-  <UUID>Event_MemLeakDetection_Test_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Event_MemLeakDetection_Test_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Event_MemLeakDetection_Test_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Event_MemLeakDetection_Test_ConnectorComponentImplementation">
-    <name>Event_MemLeakDetection_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Event_MemLeakDetection_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="Event_MemLeakDetection_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Event_MemLeakDetectionConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Event_MemLeakDetectionConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Event_MemLeakDetection_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Event_MemLeakDetection_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-  </instance>
-  <instance xmi:id="Event_MemLeakDetection_Test_ConnectorComponentInstance">
-    <name>Event_MemLeakDetection_Test_ConnectorComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Event_MemLeakDetection_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Event_MemLeakDetection_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>listen_data_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Event_MemLeakDetection_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Event_MemLeakDetection_Test_Connector_ExecArtifact">
-    <name>Event_MemLeakDetection_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_EMLDT_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Event_MemLeakDetection_Test_Connector_SvntArtifact">
-    <name>Event_MemLeakDetection_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_EMLDT_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Event_MemLeakDetection_Test_Connector_StubArtifact">
-    <name>Event_MemLeakDetection_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_EMLDT_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/One_Connection.cdp b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/One_Connection.cdp
deleted file mode 100644
index 02076f6c94b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/One_Connection.cdp
+++ /dev/null
@@ -1,194 +0,0 @@
-<!--  -->
-<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>Event_MemLeakDetection_Test_Depl_1</label>
-  <UUID>Event_MemLeakDetection_Test_Depl_1</UUID>
-
-  <implementation xmi:id="Event_MemLeakDetection_Test_ConnectorComponentImplementation">
-    <name>Event_MemLeakDetection_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Event_MemLeakDetection_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="Event_MemLeakDetection_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Event_MemLeakDetectionConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Event_MemLeakDetectionConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Event_MemLeakDetection_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Event_MemLeakDetection_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Event_MemLeakDetection_Test_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Event_MemLeakDetection_Test_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="Event_MemLeakDetection_Test_ConnectorComponentInstance">
-    <name>Event_MemLeakDetection_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Event_MemLeakDetection_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Event_MemLeakDetection_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-  </instance>
-
-  <connection>
-    <name>writer_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Event_MemLeakDetection_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="Event_MemLeakDetection_Test_Connector_ExecArtifact">
-    <name>Event_MemLeakDetection_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_EMLDT_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Event_MemLeakDetection_Test_Connector_SvntArtifact">
-    <name>Event_MemLeakDetection_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_EMLDT_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Event_MemLeakDetection_Test_Connector_StubArtifact">
-    <name>Event_MemLeakDetection_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_EMLDT_Connector_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/Receiver_only.cdp b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/Receiver_only.cdp
deleted file mode 100644
index b6b83f64b6f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/Receiver_only.cdp
+++ /dev/null
@@ -1,88 +0,0 @@
-<!--  -->
-<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>Event_MemLeakDetection_Test_Depl_1</label>
-  <UUID>Event_MemLeakDetection_Test_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Event_MemLeakDetection_Test_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Event_MemLeakDetection_Test_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-  </instance>
-
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/Sender_only.cdp b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/Sender_only.cdp
deleted file mode 100644
index 5989ffb91a7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/Sender_only.cdp
+++ /dev/null
@@ -1,87 +0,0 @@
-<!--  -->
-<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>Event_MemLeakDetection_Test_Depl_1</label>
-  <UUID>Event_MemLeakDetection_Test_Depl_1</UUID>
-
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Event_MemLeakDetection_Test_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Event_MemLeakDetection_Test_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-  </instance>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/run_test.pl
deleted file mode 100755
index 41c8906cbb8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/run_test.pl
+++ /dev/null
@@ -1,216 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for deamon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run node daemon\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        2 * $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-              "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-if ($#ARGV == -1) {
-    opendir(DIR, ".");
-    @files = grep(/\.cdp$/,readdir(DIR));
-    closedir(DIR);
-}
-else {
-    @files = @ARGV;
-}
-
-create_targets ();
-init_ior_files ();
-
-foreach $file (@files) {
-    print "*********** Starting test for deployment $file ***********\n";
-
-    print STDERR "Starting Naming Service\n";
-
-    $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-    $NS->Spawn ();
-
-    if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                      2 * $tg_naming->ProcessStartWaitInterval ()) == -1) {
-        print STDERR "ERROR: cannot find naming service IOR file\n";
-        $NS->Kill (); $NS->TimedWait (1);
-        exit 1;
-    }
-
-    $ns_running = 1;
-    # Set up NamingService environment
-    $ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-    # Invoke node daemon.
-    print "Invoking node daemon\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 = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-    $EM->Spawn ();
-
-    if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                    2 * $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-    $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                                      "-x $file -k file://$ior_emfile");
-    $E->SpawnWaitKill (5 * $tg_executor->ProcessStartWaitInterval ());
-
-    print "Sleeping 5 seconds to allow task to complete\n";
-    sleep (5);
-
-    print "Teardown the application\n";
-    $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                                      "-k file://$ior_emfile -x $file -s");
-    $E->SpawnWaitKill (5 * $tg_executor->ProcessStartWaitInterval ());
-    print "Executor finished.\n";
-
-    delete_ior_files ();
-    kill_open_processes ();
-}
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Base/State_MemLeakDetection_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Base/State_MemLeakDetection_Test_Base.idl
deleted file mode 100644
index eee91874471..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Base/State_MemLeakDetection_Test_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file State_MemLeakDetection_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef STATE_MEMLEAKDETECTION_TEST_BASE_IDL
-#define STATE_MEMLEAKDETECTION_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/State_MemLeakDetection_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/State_MemLeakDetection_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "State_MemLeakDetectionTest"
-#pragma DCPS_DATA_KEY "State_MemLeakDetectionTest key"
-
-struct State_MemLeakDetectionTest {
-  string key; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<State_MemLeakDetectionTest> State_MemLeakDetectionTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Base/State_MemLeakDetection_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Base/State_MemLeakDetection_Test_Base.mpc
deleted file mode 100644
index 860e3832f7d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Base/State_MemLeakDetection_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_SMLDT_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_SMLDT_Base_stub
-  dynamicflags += STATE_MEMLEAKDETECTION_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=STATE_MEMLEAKDETECTION_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=State_MemLeakDetection_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    State_MemLeakDetection_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=STATE_MEMLEAKDETECTION_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    State_MemLeakDetection_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.idl
deleted file mode 100644
index 81046dbecf5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file State_MemLeakDetection_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef KEYED_TEST_CONNECTOR_IDL_
-#define KEYED_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/State_MemLeakDetection_Test_Base.idl"
-
-#pragma ciao lem "Connector/State_MemLeakDetection_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/State_MemLeakDetection_Test_BaseTypeSupport.idl"
-#endif
-
-module State_MemLeakDetection_Test
-{
-  module ::CCM_DDS::Typed < ::State_MemLeakDetectionTest, ::State_MemLeakDetectionTestSeq> State_MemLeakDetectionTestConnector;
-};
-
-#endif /* STATE_MEMLEAKDETECTION_TEST_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.mpc
deleted file mode 100644
index 982b2e13c0a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_SMLDT_Base -l .. -o ../lib -u DDS State_MemLeakDetection_Test_Connector"
-
-project(DDS_SMLDT_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_SMLDT_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=STATE_MEMLEAKDETECTION_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=State_MemLeakDetection_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=STATE_MEMLEAKDETECTION_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=State_MemLeakDetection_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=STATE_MEMLEAKDETECTION_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=State_MemLeakDetection_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=STATE_MEMLEAKDETECTION_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=State_MemLeakDetection_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    State_MemLeakDetection_Test_Connector.idl
-  }
-}
-
-project(DDS_SMLDT_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_SMLDT_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=STATE_MEMLEAKDETECTION_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=State_MemLeakDetection_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    State_MemLeakDetection_Test_ConnectorE.idl
-  }
-}
-
-project(DDS_SMLDT_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_SMLDT_Connector_lem_gen DDS_SMLDT_Connector_stub DDS_SMLDT_Base_stub
-  libs  += DDS_SMLDT_Base_stub DDS_SMLDT_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_SMLDT_Connector_lem_stub
-  dynamicflags += STATE_MEMLEAKDETECTION_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    State_MemLeakDetection_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    State_MemLeakDetection_Test_ConnectorEC.h
-    State_MemLeakDetection_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    State_MemLeakDetection_Test_ConnectorEC.inl
-  }
-}
-
-project(DDS_SMLDT_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_SMLDT_Connector_idl_gen DDS_SMLDT_Base_stub
-  libs  += DDS_SMLDT_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_SMLDT_Connector_stub
-  dynamicflags += STATE_MEMLEAKDETECTION_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    State_MemLeakDetection_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    State_MemLeakDetection_Test_ConnectorC.h
-    State_MemLeakDetection_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    State_MemLeakDetection_Test_ConnectorC.inl
-  }
-}
-
-project(DDS_SMLDT_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_SMLDT_Connector_lem_stub DDS_SMLDT_Connector_stub DDS_SMLDT_Base_stub
-  sharedname = DDS_SMLDT_Connector_exec
-  libs += DDS_SMLDT_Connector_stub DDS_SMLDT_Connector_lem_stub DDS_SMLDT_Base_stub DDS_SMLDT_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += STATE_MEMLEAKDETECTION_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    State_MemLeakDetection_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    State_MemLeakDetection_Test_Connector_conn.h
-    State_MemLeakDetection_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_SMLDT_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_SMLDT_Connector_lem_stub DDS_SMLDT_Connector_exec DDS_SMLDT_Connector_stub
-  sharedname  = DDS_SMLDT_Connector_svnt
-  libs       += DDS_SMLDT_Connector_stub \
-                DDS_SMLDT_Connector_lem_stub  \
-                DDS_SMLDT_Base_stub \
-                DDS_SMLDT_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += STATE_MEMLEAKDETECTION_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    State_MemLeakDetection_Test_ConnectorS.cpp
-    State_MemLeakDetection_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    State_MemLeakDetection_Test_ConnectorS.h
-    State_MemLeakDetection_Test_Connector_svnt.h
-    State_MemLeakDetection_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Receiver/State_MemLeakDetection_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Receiver/State_MemLeakDetection_Test_Receiver.idl
deleted file mode 100644
index 21d432741b9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Receiver/State_MemLeakDetection_Test_Receiver.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/State_MemLeakDetection_Test_Connector.idl"
-
-module State_MemLeakDetection_Test
-{
-  component Receiver
-  {
-    port State_MemLeakDetectionTestConnector::DDS_Read info_read;
-    port State_MemLeakDetectionTestConnector::DDS_Get info_get;
-    port State_MemLeakDetectionTestConnector::DDS_Listen info_listen;
-    port State_MemLeakDetectionTestConnector::DDS_StateListen info_statelisten;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Receiver/State_MemLeakDetection_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Receiver/State_MemLeakDetection_Test_Receiver.mpc
deleted file mode 100644
index e1c826c54f7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Receiver/State_MemLeakDetection_Test_Receiver.mpc
+++ /dev/null
@@ -1,136 +0,0 @@
-project(DDS_SMLDT_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_SMLDT_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h \
-              -I.. -Gex
-
-  IDL_Files {
-    State_MemLeakDetection_Test_Receiver.idl
-  }
-}
-
-project(DDS_SMLDT_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_SMLDT_Receiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    State_MemLeakDetection_Test_ReceiverE.idl
-  }
-}
-
-project(DDS_SMLDT_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_SMLDT_Receiver_lem_gen DDS_SMLDT_Receiver_stub  DDS_SMLDT_Connector_stub DDS_SMLDT_Base_stub
-  libs  +=  Receiver_stub DDS_SMLDT_Connector_stub DDS_SMLDT_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    State_MemLeakDetection_Test_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    State_MemLeakDetection_Test_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    State_MemLeakDetection_Test_ReceiverEC.inl
-  }
-}
-
-project(DDS_SMLDT_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_SMLDT_Receiver_idl_gen  DDS_SMLDT_Connector_stub DDS_SMLDT_Base_stub DDS_SMLDT_Connector_lem_gen
-  libs  += DDS_SMLDT_Connector_stub DDS_SMLDT_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    State_MemLeakDetection_Test_ReceiverC.cpp
-  }
-
-  Header_Files {
-    State_MemLeakDetection_Test_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    State_MemLeakDetection_Test_ReceiverC.inl
-  }
-}
-
-project(DDS_SMLDT_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_SMLDT_Receiver_lem_stub DDS_SMLDT_Receiver_stub DDS_SMLDT_Base_stub DDS_SMLDT_Connector_stub DDS_SMLDT_Connector_lem_stub 
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_SMLDT_Base_stub DDS_SMLDT_Connector_stub DDS_SMLDT_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    State_MemLeakDetection_Test_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    State_MemLeakDetection_Test_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_SMLDT_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_SMLDT_Receiver_lem_stub DDS_SMLDT_Base_stub DDS_SMLDT_Connector_stub DDS_SMLDT_Connector_svnt DDS_SMLDT_Receiver_exec DDS_SMLDT_Connector_lem_stub 
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_SMLDT_Base_stub DDS_SMLDT_Connector_stub DDS_SMLDT_Connector_svnt Receiver_exec DDS_SMLDT_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    State_MemLeakDetection_Test_ReceiverS.cpp
-    State_MemLeakDetection_Test_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    State_MemLeakDetection_Test_ReceiverS.h
-    State_MemLeakDetection_Test_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Sender/State_MemLeakDetection_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Sender/State_MemLeakDetection_Test_Sender.idl
deleted file mode 100644
index b0da02cc828..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Sender/State_MemLeakDetection_Test_Sender.idl
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_STATE_MEMLEAKDETECTION_TEST_SENDER_IDL
-#define DDS_STATE_MEMLEAKDETECTION_TEST_SENDER_IDL
-
-#include "Connector/State_MemLeakDetection_Test_Connector.idl"
-
-module State_MemLeakDetection_Test
-{
-  component Sender
-  {
-    port State_MemLeakDetectionTestConnector::DDS_Update info_update;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Sender/State_MemLeakDetection_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Sender/State_MemLeakDetection_Test_Sender.mpc
deleted file mode 100644
index 5dfdcfd1e7b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Sender/State_MemLeakDetection_Test_Sender.mpc
+++ /dev/null
@@ -1,138 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_SMLDT_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_SMLDT_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_SMLDT_Connector_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I .. -Gex
-
-  IDL_Files {
-    State_MemLeakDetection_Test_Sender.idl
-  }
-}
-
-project(DDS_SMLDT_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_SMLDT_Sender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    State_MemLeakDetection_Test_SenderE.idl
-  }
-}
-
-project(DDS_SMLDT_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_SMLDT_Sender_lem_gen DDS_SMLDT_Sender_stub DDS_SMLDT_Base_stub
-  libs  += DDS_SMLDT_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    State_MemLeakDetection_Test_SenderEC.cpp
-  }
-
-  Header_Files {
-    State_MemLeakDetection_Test_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    State_MemLeakDetection_Test_SenderEC.inl
-  }
-}
-
-project(DDS_SMLDT_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_SMLDT_Sender_idl_gen DDS_SMLDT_Base_stub DDS_SMLDT_Connector_stub
-  libs  += DDS_SMLDT_Base_stub DDS_SMLDT_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    State_MemLeakDetection_Test_SenderC.cpp
-  }
-
-  Header_Files {
-    State_MemLeakDetection_Test_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    State_MemLeakDetection_Test_SenderC.inl
-  }
-}
-
-project(DDS_SMLDT_Sender_exec) : ciao_executor, dds4ccm_base {
-  after   += DDS_SMLDT_Sender_lem_stub DDS_SMLDT_Sender_stub DDS_SMLDT_Connector_lem_stub DDS_SMLDT_Connector_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub DDS_SMLDT_Base_stub DDS_SMLDT_Connector_lem_stub DDS_SMLDT_Connector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    State_MemLeakDetection_Test_Sender_exec.cpp
-  }
-
-  Header_Files {
-    State_MemLeakDetection_Test_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_SMLDT_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_SMLDT_Base_stub  DDS_SMLDT_Sender_lem_stub DDS_SMLDT_Connector_stub DDS_SMLDT_Connector_svnt  DDS_SMLDT_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                DDS_SMLDT_Base_stub DDS_SMLDT_Connector_stub DDS_SMLDT_Connector_svnt DDS_SMLDT_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    State_MemLeakDetection_Test_SenderS.cpp
-    State_MemLeakDetection_Test_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    State_MemLeakDetection_Test_SenderS.h
-    State_MemLeakDetection_Test_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/All.cdp b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/All.cdp
deleted file mode 100644
index d30bbd86d82..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/All.cdp
+++ /dev/null
@@ -1,721 +0,0 @@
-<!--  -->
-<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>State_MemLeakDetection_Test_Depl_1</label>
-  <UUID>State_MemLeakDetection_Test_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_State_MemLeakDetection_Test_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_State_MemLeakDetection_Test_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="State_MemLeakDetection_Test_ConnectorComponentImplementation">
-    <name>State_MemLeakDetection_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="State_MemLeakDetection_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="State_MemLeakDetection_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_State_MemLeakDetection_Test_State_MemLeakDetectionTestConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_State_MemLeakDetection_Test_State_MemLeakDetectionTestConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>State_MemLeakDetection_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>State_MemLeakDetection_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_State_MemLeakDetection_Test_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_State_MemLeakDetection_Test_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-  </instance>
-  <instance xmi:id="State_MemLeakDetection_Test_ConnectorComponentInstance">
-    <name>State_MemLeakDetection_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="State_MemLeakDetection_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>State_MemLeakDetection_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="State_MemLeakDetection_Test_ConnectorComponentInstance2">
-    <name>State_MemLeakDetection_Test_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="State_MemLeakDetection_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>State_MemLeakDetection_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-  </instance>
-
-  <!-- SENDER COMPONENT CONNECTIONS -->
-  <connection>
-    <name>update_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_update_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>observable_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_MemLeakDetection_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>update_dds_entity</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_update_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>observable_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_MemLeakDetection_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <!-- RECEIVER COMPONENT CONNECTIONS -->
-  <!--   DDS_Get port -->
-  <connection>
-    <name>get_data_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>get_fresh_data_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_fresh_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_observer_fresh_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>get_dds_entity_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_observer_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>get_filter_config_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_filter_config</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_observer_filter_config</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <!--   DDS_Get mirrorport -->
-  <connection>
-    <name>get_status_mirrorport</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_observer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="State_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <!--   DDS_Read port -->
-  <connection>
-    <name>read_data_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_read_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>passive_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>read_dds_entity_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_read_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>passive_observer_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>read_filter_config_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_read_filter_config</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>passive_observer_filter_config</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <!--   DDS_Read mirrorport -->
-  <connection>
-    <name>read_status_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_read_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>passive_observer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="State_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <!--   DDS_Listen port -->
-  <connection>
-    <name>listen_data_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>listen_data_control_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_observer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>listen_dds_entity_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_observer_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>listen_filter_config_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_filter_config</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_observer_filter_config</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <!--   DDS_Listen mirrorport -->
-  <connection>
-    <name>listen_data_listener_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_observer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="State_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>listen_status_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_observer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="State_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <!--   DDS_StateListen port -->
-  <connection>
-    <name>statelisten_data_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_statelisten_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>statelisten_data_control_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_statelisten_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>statelisten_dds_entity_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_statelisten_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>statelisten_filter_config_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_statelisten_filter_config</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_filter_config</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <!--   DDS_Listen mirrorport -->
-  <connection>
-    <name>statelisten_data_listener_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_statelisten_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="State_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>statelisten_status_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_statelisten_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="State_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="State_MemLeakDetection_Test_Connector_ExecArtifact">
-    <name>State_MemLeakDetection_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_SMLDT_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="State_MemLeakDetection_Test_Connector_SvntArtifact">
-    <name>State_MemLeakDetection_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_SMLDT_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="State_MemLeakDetection_Test_Connector_StubArtifact">
-    <name>State_MemLeakDetection_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_SMLDT_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/Connector_only.cdp b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/Connector_only.cdp
deleted file mode 100644
index 8229bbea42c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/Connector_only.cdp
+++ /dev/null
@@ -1,98 +0,0 @@
-<!--  -->
-<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>State_MemLeakDetection_Test_Depl_1</label>
-  <UUID>State_MemLeakDetection_Test_Depl_1</UUID>
-
-  <implementation xmi:id="State_MemLeakDetection_Test_ConnectorComponentImplementation">
-    <name>State_MemLeakDetection_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="State_MemLeakDetection_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="State_MemLeakDetection_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_State_MemLeakDetection_Test_State_MemLeakDetectionTestConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_State_MemLeakDetection_Test_State_MemLeakDetectionTestConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>State_MemLeakDetection_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>State_MemLeakDetection_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="State_MemLeakDetection_Test_ConnectorComponentInstance">
-    <name>State_MemLeakDetection_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="State_MemLeakDetection_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>State_MemLeakDetection_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <artifact xmi:id="State_MemLeakDetection_Test_Connector_ExecArtifact">
-    <name>State_MemLeakDetection_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_SMLDT_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="State_MemLeakDetection_Test_Connector_SvntArtifact">
-    <name>State_MemLeakDetection_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_SMLDT_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="State_MemLeakDetection_Test_Connector_StubArtifact">
-    <name>State_MemLeakDetection_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_SMLDT_Connector_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/Listen.cdp b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/Listen.cdp
deleted file mode 100644
index 4730cdeebc2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/Listen.cdp
+++ /dev/null
@@ -1,197 +0,0 @@
-<!--  -->
-<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>State_MemLeakDetection_Test_Depl_1</label>
-  <UUID>State_MemLeakDetection_Test_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_State_MemLeakDetection_Test_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_State_MemLeakDetection_Test_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="State_MemLeakDetection_Test_ConnectorComponentImplementation">
-    <name>State_MemLeakDetection_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="State_MemLeakDetection_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="State_MemLeakDetection_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_State_MemLeakDetection_Test_State_MemLeakDetectionTestConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_State_MemLeakDetection_Test_State_MemLeakDetectionTestConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>State_MemLeakDetection_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>State_MemLeakDetection_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-  </instance>
-  <instance xmi:id="State_MemLeakDetection_Test_ConnectorComponentInstance">
-    <name>State_MemLeakDetection_Test_ConnectorComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="State_MemLeakDetection_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>State_MemLeakDetection_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <!-- RECEIVER COMPONENT CONNECTIONS -->
-  <!--   DDS_Listen port -->
-  <connection>
-    <name>listen_data_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_MemLeakDetection_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="State_MemLeakDetection_Test_Connector_ExecArtifact">
-    <name>State_MemLeakDetection_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_SMLDT_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="State_MemLeakDetection_Test_Connector_SvntArtifact">
-    <name>State_MemLeakDetection_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_SMLDT_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="State_MemLeakDetection_Test_Connector_StubArtifact">
-    <name>State_MemLeakDetection_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_SMLDT_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/One_Connection.cdp b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/One_Connection.cdp
deleted file mode 100644
index b59e4f83a58..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/One_Connection.cdp
+++ /dev/null
@@ -1,196 +0,0 @@
-<!--  -->
-<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>State_MemLeakDetection_Test_Depl_1</label>
-  <UUID>State_MemLeakDetection_Test_Depl_1</UUID>
-
-  <implementation xmi:id="State_MemLeakDetection_Test_ConnectorComponentImplementation">
-    <name>State_MemLeakDetection_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="State_MemLeakDetection_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="State_MemLeakDetection_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_State_MemLeakDetection_Test_State_MemLeakDetectionTestConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_State_MemLeakDetection_Test_State_MemLeakDetectionTestConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>State_MemLeakDetection_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>State_MemLeakDetection_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_State_MemLeakDetection_Test_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_State_MemLeakDetection_Test_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="State_MemLeakDetection_Test_ConnectorComponentInstance">
-    <name>State_MemLeakDetection_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="State_MemLeakDetection_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>State_MemLeakDetection_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-  </instance>
-
-  <!-- SENDER COMPONENT CONNECTIONS -->
-  <connection>
-    <name>update_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_update_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>observable_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_MemLeakDetection_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="State_MemLeakDetection_Test_Connector_ExecArtifact">
-    <name>State_MemLeakDetection_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_SMLDT_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="State_MemLeakDetection_Test_Connector_SvntArtifact">
-    <name>State_MemLeakDetection_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_SMLDT_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="State_MemLeakDetection_Test_Connector_StubArtifact">
-    <name>State_MemLeakDetection_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_SMLDT_Connector_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/Receiver_only.cdp b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/Receiver_only.cdp
deleted file mode 100644
index 68a2babe7ad..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/Receiver_only.cdp
+++ /dev/null
@@ -1,88 +0,0 @@
-<!--  -->
-<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>State_MemLeakDetection_Test_Depl_1</label>
-  <UUID>State_MemLeakDetection_Test_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_State_MemLeakDetection_Test_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_State_MemLeakDetection_Test_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-  </instance>
-
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/Sender_only.cdp b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/Sender_only.cdp
deleted file mode 100644
index ddbadbb155c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/Sender_only.cdp
+++ /dev/null
@@ -1,87 +0,0 @@
-<!--  -->
-<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>State_MemLeakDetection_Test_Depl_1</label>
-  <UUID>State_MemLeakDetection_Test_Depl_1</UUID>
-
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_State_MemLeakDetection_Test_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_State_MemLeakDetection_Test_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-  </instance>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/run_test.pl
deleted file mode 100755
index 41c8906cbb8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/run_test.pl
+++ /dev/null
@@ -1,216 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for deamon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run node daemon\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        2 * $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-              "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-if ($#ARGV == -1) {
-    opendir(DIR, ".");
-    @files = grep(/\.cdp$/,readdir(DIR));
-    closedir(DIR);
-}
-else {
-    @files = @ARGV;
-}
-
-create_targets ();
-init_ior_files ();
-
-foreach $file (@files) {
-    print "*********** Starting test for deployment $file ***********\n";
-
-    print STDERR "Starting Naming Service\n";
-
-    $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-    $NS->Spawn ();
-
-    if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                      2 * $tg_naming->ProcessStartWaitInterval ()) == -1) {
-        print STDERR "ERROR: cannot find naming service IOR file\n";
-        $NS->Kill (); $NS->TimedWait (1);
-        exit 1;
-    }
-
-    $ns_running = 1;
-    # Set up NamingService environment
-    $ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-    # Invoke node daemon.
-    print "Invoking node daemon\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 = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-    $EM->Spawn ();
-
-    if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                    2 * $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-    $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                                      "-x $file -k file://$ior_emfile");
-    $E->SpawnWaitKill (5 * $tg_executor->ProcessStartWaitInterval ());
-
-    print "Sleeping 5 seconds to allow task to complete\n";
-    sleep (5);
-
-    print "Teardown the application\n";
-    $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                                      "-k file://$ior_emfile -x $file -s");
-    $E->SpawnWaitKill (5 * $tg_executor->ProcessStartWaitInterval ());
-    print "Executor finished.\n";
-
-    delete_ior_files ();
-    kill_open_processes ();
-}
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.idl
deleted file mode 100644
index de5a9830077..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file TypeRegistration_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef MLD_TYPE_REGISTRATION_TEST_BASE_IDL
-#define MLD_TYPE_REGISTRATION_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/TypeRegistration_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/TypeRegistration_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "MLDTypeRegistrationTest"
-#pragma DCPS_DATA_KEY "MLDTypeRegistrationTest key"
-
-struct MLDTypeRegistrationTest {
-  unsigned long key;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<MLDTypeRegistrationTest> MLDTypeRegistrationTestSeq;
-#endif
-
-#endif /* MLD_TYPE_REGISTRATION_TEST_BASE_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.mpc
deleted file mode 100644
index 745f93aafcf..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (TypeRegistration_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = TypeRegistration_Base_stub
-  dynamicflags += MLD_TYPE_REGISTRATION_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=MLD_TYPE_REGISTRATION_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=TypeRegistration_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    TypeRegistration_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=MLD_TYPE_REGISTRATION_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    TypeRegistration_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.idl
deleted file mode 100644
index 7bcc7fc0fb0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef COMPONENT_IDL
-#define COMPONENT_IDL
-
-#include "Connector/TypeRegistration_Test_Connector.idl"
-
-module MLD_TypeRegistration_Test
-{
-  component CFTTestComponent
-  {
-    port MLDTypeRegistrationTestConn::DDS_Write   writer;
-    port MLDTypeRegistrationTestConn::DDS_Listen  listener;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.mpc
deleted file mode 100644
index eb49c7a53e6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-project(TypeRegistration_Component_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += TypeRegistration_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=COMPONENT_STUB_Export \
-              -Wb,stub_export_include=Component_stub_export.h \
-              -Wb,skel_export_macro=COMPONENT_SVNT_Export \
-              -Wb,skel_export_include=Component_svnt_export.h \
-              -Wb,svnt_export_macro=COMPONENT_SVNT_Export \
-              -Wb,svnt_export_include=Component_svnt_export.h \
-              -Wb,exec_export_macro=COMPONENT_EXEC_Export \
-              -Wb,exec_export_include=Component_exec_export.h -I..
-
-  IDL_Files {
-    TypeRegistration_Test_Component.idl
-  }
-}
-
-project(TypeRegistration_Component_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += TypeRegistration_Component_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=COMPONENT_LEM_STUB_Export \
-              -Wb,stub_export_include=Component_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    TypeRegistration_Test_ComponentE.idl
-  }
-}
-
-project(TypeRegistration_Component_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += TypeRegistration_Component_lem_gen TypeRegistration_Component_stub  \
-           TypeRegistration_Connector_stub TypeRegistration_Base_stub
-  libs  +=  Component_stub TypeRegistration_Connector_stub \
-            TypeRegistration_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Component_lem_stub
-  dynamicflags += COMPONENT_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TypeRegistration_Test_ComponentEC.cpp
-  }
-
-  Header_Files {
-    TypeRegistration_Test_ComponentEC.h
-    Component_lem_stub_export.h
-  }
-
-  Inline_Files {
-    TypeRegistration_Test_ComponentEC.inl
-  }
-}
-
-project(TypeRegistration_Component_stub) : ccm_stub, dds4ccm_base {
-  after += TypeRegistration_Component_idl_gen  TypeRegistration_Connector_stub \
-           TypeRegistration_Base_stub TypeRegistration_Connector_lem_gen
-  libs  += TypeRegistration_Connector_stub TypeRegistration_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Component_stub
-  dynamicflags += COMPONENT_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TypeRegistration_Test_ComponentC.cpp
-  }
-
-  Header_Files {
-    TypeRegistration_Test_ComponentC.h
-    Component_stub_export.h
-  }
-
-  Inline_Files {
-    TypeRegistration_Test_ComponentC.inl
-  }
-}
-
-project(TypeRegistration_Component_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += TypeRegistration_Component_lem_stub TypeRegistration_Component_stub \
-             TypeRegistration_Base_stub TypeRegistration_Connector_stub \
-             TypeRegistration_Connector_lem_stub
-  sharedname = Component_exec
-  libs += Component_stub Component_lem_stub TypeRegistration_Base_stub \
-          TypeRegistration_Connector_stub TypeRegistration_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COMPONENT_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TypeRegistration_Test_Component_exec.cpp
-  }
-
-  Header_Files {
-    TypeRegistration_Test_Component_exec.h
-    Component_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(TypeRegistration_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   TypeRegistration_Component_lem_stub TypeRegistration_Base_stub \
-                  TypeRegistration_Connector_stub TypeRegistration_Connector_svnt \
-                  TypeRegistration_Component_exec TypeRegistration_Connector_lem_stub
-  sharedname  = Component_svnt
-  libs       += Component_stub Component_lem_stub TypeRegistration_Base_stub \
-                TypeRegistration_Connector_stub TypeRegistration_Connector_svnt \
-                Component_exec TypeRegistration_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COMPONENT_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TypeRegistration_Test_ComponentS.cpp
-    TypeRegistration_Test_Component_svnt.cpp
-  }
-
-  Header_Files {
-    TypeRegistration_Test_ComponentS.h
-    TypeRegistration_Test_Component_svnt.h
-    Component_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component_exec.cpp
deleted file mode 100644
index 0e58496fb5f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component_exec.cpp
+++ /dev/null
@@ -1,289 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.2
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "TypeRegistration_Test_Component_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_MLD_TypeRegistration_Test_CFTTestComponent_Impl
-{
-  /**
-   * WriteTicker
-   */
-  WriteTicker::WriteTicker (CFTTestComponent_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  WriteTicker::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    // Notify the subscribers
-    this->callback_.write_one ();
-    return 0;
-  }
-
-  /**
-   * Facet Executor Implementation Class: listener_data_listener_exec_i
-   */
-
-  listener_data_listener_exec_i::listener_data_listener_exec_i (
-        ::MLD_TypeRegistration_Test::CCM_CFTTestComponent_Context_ptr ctx)
-    : ciao_context_ (
-        ::MLD_TypeRegistration_Test::CCM_CFTTestComponent_Context::_duplicate (ctx))
-  {
-  }
-
-  listener_data_listener_exec_i::~listener_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::MLDTypeRegistrationTestConn::Listener
-
-  void
-  listener_data_listener_exec_i::on_one_data (const ::MLDTypeRegistrationTest & datum,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    ACE_DEBUG ((LM_DEBUG, "listener_data_listener_exec_i::on_one_data: "
-                            "key <%u>\n",
-                            datum.key));
-  }
-
-  void
-  listener_data_listener_exec_i::on_many_data (const ::MLDTypeRegistrationTestSeq & /* data */,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: listener_status_exec_i
-   */
-
-  listener_status_exec_i::listener_status_exec_i (
-        ::MLD_TypeRegistration_Test::CCM_CFTTestComponent_Context_ptr ctx)
-    : ciao_context_ (
-        ::MLD_TypeRegistration_Test::CCM_CFTTestComponent_Context::_duplicate (ctx))
-  {
-  }
-
-  listener_status_exec_i::~listener_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  listener_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  listener_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Component Executor Implementation Class: CFTTestComponent_exec_i
-   */
-
-  CFTTestComponent_exec_i::CFTTestComponent_exec_i (void)
-    : ticker_(0)
-    , iterator(0)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      WriteTicker (*this),
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  CFTTestComponent_exec_i::~CFTTestComponent_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  CFTTestComponent_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  CFTTestComponent_exec_i::write_one (void)
-  {
-    MLDTypeRegistrationTest new_key;
-    new_key.key = ++this->iterator;
-
-    MLDTypeRegistrationTestConn::Writer_var writer =
-      this->ciao_context_->get_connection_writer_data ();
-    if (::CORBA::is_nil (writer.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, "CFTTestComponent_exec_i::write_one - "
-                    "ERROR: Writer seems to be nil\n"));
-        return;
-      }
-    try
-      {
-        writer->write_one (new_key, ::DDS::HANDLE_NIL);
-      }
-    catch (const CCM_DDS::InternalError& )
-      {
-        ACE_ERROR ((LM_ERROR, "CFTTestComponent_exec_i::write_one - "
-                    "ERROR: caught InternalError exception while writing <%d> to DDS.\n",
-                    this->iterator));
-      }
-    catch (const ::CORBA::Exception& )
-      {
-        ACE_ERROR ((LM_ERROR, "CFTTestComponent_exec_i::write_one - "
-                    "ERROR: caught CORBA exception while writing <%d> to DDS.\n",
-                    this->iterator));
-      }
-  }
-
-  // Component attributes and port operations.
-
-  ::MLDTypeRegistrationTestConn::CCM_Listener_ptr
-  CFTTestComponent_exec_i::get_listener_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_listener_data_listener_.in ()))
-      {
-        listener_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          listener_data_listener_exec_i (
-            this->ciao_context_.in ()),
-            ::MLDTypeRegistrationTestConn::CCM_Listener::_nil ());
-
-          this->ciao_listener_data_listener_ = tmp;
-      }
-
-    return
-      ::MLDTypeRegistrationTestConn::CCM_Listener::_duplicate (
-        this->ciao_listener_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  CFTTestComponent_exec_i::get_listener_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_listener_status_.in ()))
-      {
-        listener_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          listener_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_listener_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_listener_status_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  CFTTestComponent_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::MLD_TypeRegistration_Test::CCM_CFTTestComponent_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  CFTTestComponent_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  CFTTestComponent_exec_i::ccm_activate (void)
-  {
-    if (this->reactor ()->schedule_timer (
-            this->ticker_,
-            0,
-            ACE_Time_Value (5, 50000),
-            ACE_Time_Value (1, 0)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                              ACE_TEXT ("Error scheduling timer")));
-      }
-
-    ::CCM_DDS::DataListenerControl_var dlc =
-    this->ciao_context_->get_connection_listener_data_control();
-    dlc->mode (::CCM_DDS::ONE_BY_ONE);
-  }
-
-  void
-  CFTTestComponent_exec_i::ccm_passivate (void)
-  {
-    this->reactor ()->cancel_timer(this->ticker_);
-  }
-
-  void
-  CFTTestComponent_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_MLD_TypeRegistration_Test_CFTTestComponent_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      CFTTestComponent_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component_exec.h b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component_exec.h
deleted file mode 100644
index e4790cb99e3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component_exec.h
+++ /dev/null
@@ -1,186 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.2
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_TYPEREGISTRATION_TEST_COMPONENT_EXEC_0FYVIW_H_
-#define CIAO_TYPEREGISTRATION_TEST_COMPONENT_EXEC_0FYVIW_H_
-
-#include /**/ "ace/pre.h"
-
-#include "TypeRegistration_Test_ComponentEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Component_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_MLD_TypeRegistration_Test_CFTTestComponent_Impl
-{
-  class CFTTestComponent_exec_i;
-
-  /**
-   * WriteTicker
-   */
-  class WriteTicker :
-    public ACE_Event_Handler
-  {
-  public:
-    WriteTicker (CFTTestComponent_exec_i &callback);
-    int handle_timeout (const ACE_Time_Value &, const void *);
-  private:
-    /// Maintains a handle that actually process the event
-    CFTTestComponent_exec_i &callback_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: listener_data_listener_exec_i
-   */
-
-  class listener_data_listener_exec_i
-    : public virtual ::MLDTypeRegistrationTestConn::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    listener_data_listener_exec_i (
-      ::MLD_TypeRegistration_Test::CCM_CFTTestComponent_Context_ptr ctx);
-    virtual ~listener_data_listener_exec_i (void);
-
-    /** @name Operations and attributes from MLDTypeRegistrationTestConn::Listener */
-    //@{
-
-    virtual
-    void on_one_data (const ::MLDTypeRegistrationTest & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (const ::MLDTypeRegistrationTestSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    ::MLD_TypeRegistration_Test::CCM_CFTTestComponent_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: listener_status_exec_i
-   */
-
-  class listener_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    listener_status_exec_i (
-      ::MLD_TypeRegistration_Test::CCM_CFTTestComponent_Context_ptr ctx);
-    virtual ~listener_status_exec_i (void);
-
-    /** @name Operations and attributes from CCM_DDS::PortStatusListener */
-    //@{
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::MLD_TypeRegistration_Test::CCM_CFTTestComponent_Context_var ciao_context_;
-  };
-
-  /**
-   * Component Executor Implementation Class: CFTTestComponent_exec_i
-   */
-
-  class CFTTestComponent_exec_i
-    : public virtual CFTTestComponent_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    CFTTestComponent_exec_i (void);
-    virtual ~CFTTestComponent_exec_i (void);
-
-    /** @name Supported operations and attributes. */
-    //@{
-
-    //@}
-
-    /** @name Component attributes and port operations. */
-    //@{
-
-    virtual ::MLDTypeRegistrationTestConn::CCM_Listener_ptr
-    get_listener_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_listener_status (void);
-    //@}
-
-    /** @name Operations from Components::SessionComponent. */
-    //@{
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    /** @name User defined public operations. */
-    //@{
-    void write_one (void);
-    //@}
-
-  private:
-    ::MLD_TypeRegistration_Test::CCM_CFTTestComponent_Context_var ciao_context_;
-
-    /** @name Component attributes. */
-    //@{
-    ::MLDTypeRegistrationTestConn::CCM_Listener_var ciao_listener_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_listener_status_;
-    //@}
-
-    /** @name User defined members. */
-    //@{
-    WriteTicker     *ticker_;
-    ::CORBA::ULong  iterator;
-    //@}
-
-    /** @name User defined private operations. */
-    //@{
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_MLD_TypeRegistration_Test_CFTTestComponent_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.idl
deleted file mode 100644
index 6b6c822a884..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file TypeRegistration_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef MLD_TYPE_REGISTRATION_TEST_CONNECTOR_IDL_
-#define MLD_TYPE_REGISTRATION_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/TypeRegistration_Test_Base.idl"
-
-#pragma ciao lem "Connector/TypeRegistration_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/TypeRegistration_Test_BaseTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::MLDTypeRegistrationTest, ::MLDTypeRegistrationTestSeq> MLDTypeRegistrationTestConn;
-
-#endif /* MLD_TYPE_REGISTRATION_TEST_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.mpc
deleted file mode 100644
index ba4a82920d7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p TypeRegistration_Base -l .. -o ../lib -u DDS TypeRegistration_Connector"
-
-project(TypeRegistration_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen TypeRegistration_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=MLD_TYPE_REGISTRATION_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=TypeRegistration_Connector_stub_export.h \
-              -Wb,skel_export_macro=MLD_TYPE_REGISTRATION_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=TypeRegistration_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=MLD_TYPE_REGISTRATION_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=TypeRegistration_Connector_svnt_export.h \
-              -Wb,conn_export_macro=MLD_TYPE_REGISTRATION_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=TypeRegistration_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    TypeRegistration_Test_Connector.idl
-  }
-}
-
-project(TypeRegistration_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += TypeRegistration_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=MLD_TYPE_REGISTRATION_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=TypeRegistration_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    TypeRegistration_Test_ConnectorE.idl
-  }
-}
-
-project(TypeRegistration_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += TypeRegistration_Connector_lem_gen TypeRegistration_Connector_stub TypeRegistration_Base_stub
-  libs  += TypeRegistration_Base_stub TypeRegistration_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = TypeRegistration_Connector_lem_stub
-  dynamicflags += MLD_TYPE_REGISTRATION_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TypeRegistration_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    TypeRegistration_Test_ConnectorEC.h
-    TypeRegistration_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    TypeRegistration_Test_ConnectorEC.inl
-  }
-}
-
-project(TypeRegistration_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += TypeRegistration_Connector_idl_gen TypeRegistration_Base_stub
-  libs  += TypeRegistration_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = TypeRegistration_Connector_stub
-  dynamicflags += MLD_TYPE_REGISTRATION_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TypeRegistration_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    TypeRegistration_Test_ConnectorC.h
-    TypeRegistration_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    TypeRegistration_Test_ConnectorC.inl
-  }
-}
-
-project(TypeRegistration_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += TypeRegistration_Connector_lem_stub TypeRegistration_Connector_stub TypeRegistration_Base_stub
-  sharedname = TypeRegistration_Connector_exec
-  libs += TypeRegistration_Connector_stub TypeRegistration_Connector_lem_stub TypeRegistration_Base_stub TypeRegistration_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += MLD_TYPE_REGISTRATION_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TypeRegistration_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    TypeRegistration_Test_Connector_conn.h
-    TypeRegistration_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(TypeRegistration_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += TypeRegistration_Connector_lem_stub TypeRegistration_Connector_exec TypeRegistration_Connector_stub
-  sharedname  = TypeRegistration_Connector_svnt
-  libs       += TypeRegistration_Connector_stub \
-                TypeRegistration_Connector_lem_stub  \
-                TypeRegistration_Base_stub \
-                TypeRegistration_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += MLD_TYPE_REGISTRATION_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TypeRegistration_Test_ConnectorS.cpp
-    TypeRegistration_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    TypeRegistration_Test_ConnectorS.h
-    TypeRegistration_Test_Connector_svnt.h
-    TypeRegistration_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/descriptors/Plan.cdp
deleted file mode 100644
index 73f2782d197..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/descriptors/Plan.cdp
+++ /dev/null
@@ -1,253 +0,0 @@
-<!--  -->
-<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>MLDTest_Depl</label>
-  <UUID>MLDTest_Depl</UUID>
-
-  <implementation xmi:id="ComponentImplementation">
-    <name>ComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Component_ExecArtifact" />
-    <artifact xmi:idref="Component_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_MLD_TypeRegistration_Test_CFTTestComponent_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_MLD_TypeRegistration_Test_CFTTestComponent_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="MLD_TypeRegistration_Test_ConnectorImplementation">
-    <name>MLD_TypeRegistration_Test_ConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="MLD_TypeRegistration_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="MLD_TypeRegistration_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_MLDTypeRegistrationTestConn_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_MLDTypeRegistrationTestConn_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TypeRegistration_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TypeRegistration_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-
-  <instance xmi:id="ComponentInstance">
-    <name>Component</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ComponentImplementation" />
-  </instance>
-
-  <instance xmi:id="MLD_TypeRegistration_Test_ConnectorInstance_Writer">
-    <name>MLD_TypeRegistration_Test_Connector_Writer</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="MLD_TypeRegistration_Test_ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>MLDTypeRegistration_Writer</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="MLD_TypeRegistration_Test_ConnectorInstance_Listener">
-    <name>MLD_TypeRegistration_Test_Connector_Listener</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="MLD_TypeRegistration_Test_ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>MLDTypeRegistration_Listener</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>listener_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>listener_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="MLD_TypeRegistration_Test_ConnectorInstance_Listener" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>listener_data_control</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>listener_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="MLD_TypeRegistration_Test_ConnectorInstance_Listener" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>writer_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="MLD_TypeRegistration_Test_ConnectorInstance_Writer" />
-    </internalEndpoint>
-  </connection>
-
-
-  <artifact xmi:id="MLD_TypeRegistration_Test_Connector_ExecArtifact">
-    <name>TypeRegistration_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>TypeRegistration_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="MLD_TypeRegistration_Test_Connector_SvntArtifact">
-    <name>TypeRegistration_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>TypeRegistration_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="MLD_TypeRegistration_Test_Connector_StubArtifact">
-    <name>TypeRegistration_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>TypeRegistration_Connector_stub</location>
-  </artifact>
-
-  <artifact xmi:id="Component_ExecArtifact">
-    <name>Component_exec</name>
-    <source/>
-    <node/>
-    <location>Component_exec</location>
-  </artifact>
-  <artifact xmi:id="Component_SvntArtifact">
-    <name>Component_svnt</name>
-    <source/>
-    <node/>
-    <location>Component_svnt</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/descriptors/run_test.pl
deleted file mode 100755
index a7dfbd85bf6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 1;
-@ports = ( 60001 );
-@iorbases = ( "Component.ior" );
-@iorfiles = 0;
-@nodenames = ( "ComponentNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 20 seconds to allow task to complete\n";
-sleep (20);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.idl
deleted file mode 100644
index e88f8982ae7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.idl
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * @file MultiTopic_Base.idl
- * @author
- */
-
-#ifndef MULTITOPIC_IDL
-#define MULTITOPIC_IDL
-
-#pragma ndds typesupport "Base/MultiTopic_BaseSupport.h"
-#pragma opendds typesupport "Base/MultiTopic_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "ShapeType"
-#pragma DCPS_DATA_KEY "ShapeType color"
-
-struct ShapeType {
-  string color; //@key
-  long x;
-  long y;
-  long shapesize;
-};
-#pragma keylist ShapeType color
-
-#pragma DCPS_DATA_TYPE "Attributes"
-#pragma DCPS_DATA_KEY "Attributes shape"
-#pragma DCPS_DATA_KEY "Attributes color"
-
-struct Attributes {
-  string shape; //@key
-  string color; //@key
-  float speed;
-};
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<ShapeType> ShapeTypeSeq;
-#endif
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<Attributes> AttributesSeq;
-#endif
-
-#pragma keylist Attributes shape color
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.mpc b/CIAO/connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.mpc
deleted file mode 100644
index 8ad8c86b97c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_MultiTopic_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_MultiTopic_Base_stub
-  dynamicflags += MULTITOPIC_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=MULTITOPIC_BASE_STUB_Export \
-              -Wb,stub_export_include=MultiTopic_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    MultiTopic_Base.idl
-  }
-
-  opendds_ts_flags += --export=MULTITOPIC_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    MultiTopic_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.idl b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.idl
deleted file mode 100644
index 90493e79a63..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file MultiTopic_Connector.idl
- * @author
- */
-
-#ifndef MULTITOPIC_CONNECTOR_IDL_
-#define MULTITOPIC_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <Connector/ccm_dds_mt.idl>
-
-#include "Base/MultiTopic_Base.idl"
-
-#pragma ciao lem "Connector/MultiTopic_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/MultiTopic_BaseTypeSupport.idl"
-#endif
-
-module ::CCM_DDS_MT::Typed_MT < ::ShapeType, ::ShapeTypeSeq> Shapes;
-
-#endif /* MULTITOPIC_CONNECTOR_IDL_ */
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.mpc
deleted file mode 100644
index 1453e0e781c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.mpc
+++ /dev/null
@@ -1,156 +0,0 @@
-project (DDS_CCM_Example_MT_idl_gen) : taoidldefaults, anytypecode, dds4ccm {
-  custom_only = 1
-  after += DDS_MultiTopic_Base_stub
-  idlflags += -Wb,stub_export_macro=CCM_DDS_MT_STUB_Export \
-              -Wb,stub_export_include=ccm_dds_mt_stub_export.h \
-              -Wb,skel_export_macro=CCM_DDS_MT_SKEL_Export \
-              -Wb,skel_export_include=ccm_dds_mt_skel_export.h \
-              -SS -Scc -Sci -Gxhst \
-              -I $(CIAO_ROOT)/connectors/dds4ccm/idl
-
-  IDL_Files {
-    ccm_dds_mt.idl
-  }
-}
-
-project(DDS_MultiTopic_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_CCM_Example_MT_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=MULTITOPIC_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=MultiTopic_Connector_stub_export.h \
-              -Wb,skel_export_macro=MULTITOPIC_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=MultiTopic_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=MULTITOPIC_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=MultiTopic_Connector_svnt_export.h \
-              -Wb,conn_export_macro=MULTITOPIC_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=MultiTopic_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    MultiTopic_Connector.idl
-  }
-
-}
-
-project(DDS_MultiTopic_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_MultiTopic_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=MULTITOPIC_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=MultiTopic_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    MultiTopic_ConnectorE.idl
-  }
-}
-
-project(DDS_MultiTopic_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_MultiTopic_Connector_lem_gen DDS_MultiTopic_Connector_stub DDS_MultiTopic_Base_stub
-  libs  += DDS_MultiTopic_Base_stub DDS_MultiTopic_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_MultiTopic_Connector_lem_stub
-  dynamicflags += MULTITOPIC_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    MultiTopic_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    MultiTopic_ConnectorEC.h
-    MultiTopic_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    MultiTopic_ConnectorEC.inl
-  }
-}
-
-project(DDS_MultiTopic_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_MultiTopic_Connector_idl_gen DDS_MultiTopic_Base_stub
-  libs  += DDS_MultiTopic_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_MultiTopic_Connector_stub
-  dynamicflags += MULTITOPIC_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    MultiTopic_ConnectorC.cpp
-  }
-
-  Header_Files {
-    MultiTopic_ConnectorC.h
-    MultiTopic_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    MultiTopic_ConnectorC.inl
-  }
-}
-
-project(DDS_MultiTopic_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_MultiTopic_Connector_lem_stub DDS_MultiTopic_Connector_stub
-  sharedname = DDS_MultiTopic_Connector_exec
-  libs += DDS_MultiTopic_Connector_stub DDS_MultiTopic_Connector_lem_stub DDS_MultiTopic_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += MULTITOPIC_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    MultiTopic_Connector_conn.cpp
-  }
-
-  Header_Files {
-    MultiTopic_Connector_conn.h
-    MultiTopic_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_MultiTopic_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_MultiTopic_Connector_lem_stub DDS_MultiTopic_Connector_exec DDS_MultiTopic_Connector_stub
-  sharedname  = DDS_MultiTopic_Connector_svnt
-  libs       += DDS_MultiTopic_Connector_stub \
-                DDS_MultiTopic_Connector_lem_stub  \
-                DDS_MultiTopic_Base_stub \
-                DDS_MultiTopic_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += MULTITOPIC_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    MultiTopic_ConnectorS.cpp
-    MultiTopic_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    MultiTopic_ConnectorS.h
-    MultiTopic_Connector_svnt.h
-    MultiTopic_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp
deleted file mode 100644
index e62a9213235..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp
+++ /dev/null
@@ -1,653 +0,0 @@
-#include "connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h"
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::DDS_MT_Event_Connector_T (void)
-  : reactor_ (0)
-{
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::supplier_sq_traits::data_type::_ptr_type
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_supplier_sq_data (void)
-{
-  ACE_TRACE ("DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_supplier_sq_data");
-
-  typename CCM_TYPE::supplier_sq_traits::data_type::_var_type dw =
-    this->sq_supplier_.get_data ();
-  return CCM_TYPE::supplier_sq_traits::data_type::_duplicate (dw.in ());
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::supplier_sq_traits::dds_entity_type::_ptr_type
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_supplier_sq_dds_entity (void)
-{
-
-  return CCM_TYPE::supplier_sq_traits::dds_entity_type::_nil ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::pull_consumer_sq_traits::fresh_data_type::_ptr_type
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_sq_fresh_data (void)
-{
-  typename CCM_TYPE::pull_consumer_sq_traits::fresh_data_type::_var_type fresh_data =
-    this->pull_consumer_sq_.get_fresh_data ();
-  return CCM_TYPE::pull_consumer_sq_traits::fresh_data_type::_duplicate (
-                                                              fresh_data.in ());
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::pull_consumer_sq_traits::data_type::_ptr_type
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_sq_data (void)
-{
-
-  return CCM_TYPE::pull_consumer_sq_traits::data_type::_nil ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::pull_consumer_sq_traits::dds_entity_type::_ptr_type
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_sq_dds_entity (void)
-{
-
-  return CCM_TYPE::pull_consumer_sq_traits::dds_entity_type::_nil ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-::CCM_DDS::QueryFilter*
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::pull_consumer_sq_filter (void)
-{
-  return 0;
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::pull_consumer_sq_filter (const ::CCM_DDS::QueryFilter&)
-{
-
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-::CCM_DDS::CCM_ContentFilterSetting_ptr
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_sq_filter_config(void)
-{
-
-  return ::CCM_DDS::CCM_ContentFilterSetting::_nil ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-::CCM_DDS::CCM_ContentFilterSetting*
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_sq_filter_config(void)
-{
-  return ::CCM_DDS::CCM_ContentFilterSetting::_nil ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-::CCM_DDS::QueryFilter *
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_consumer_sq_filter (void)
-{
-  return 0;
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_consumer_sq_filter (const ::CCM_DDS::QueryFilter &)
-{
-
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::push_consumer_sq_traits::data_type::_ptr_type
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_sq_data (void)
-{
-
-  return CCM_TYPE::push_consumer_sq_traits::data_type::_nil ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::push_consumer_sq_traits::data_control_type::_ptr_type
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_sq_data_control (void)
-{
-
-  return CCM_TYPE::push_consumer_sq_traits::data_control_type::_nil ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::push_consumer_sq_traits::dds_entity_type::_ptr_type
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_sq_dds_entity (void)
-{
-
-  return CCM_TYPE::push_consumer_sq_traits::dds_entity_type::_nil ();
-}
-
-//TRIANGEL
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::supplier_tr_traits::data_type::_ptr_type
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_supplier_tr_data (void)
-{
-  ACE_TRACE ("DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_supplier_tr_data");
-
-  typename CCM_TYPE::supplier_sq_traits::data_type::_var_type dw =
-    this->tr_supplier_.get_data ();
-  return CCM_TYPE::supplier_sq_traits::data_type::_duplicate (dw.in ());
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::supplier_tr_traits::dds_entity_type::_ptr_type
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_supplier_tr_dds_entity (void)
-{
-
-  return CCM_TYPE::supplier_tr_traits::dds_entity_type::_nil ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::pull_consumer_tr_traits::fresh_data_type::_ptr_type
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_tr_fresh_data (void)
-{
-  typename CCM_TYPE::pull_consumer_tr_traits::fresh_data_type::_var_type fresh_data =
-    this->pull_consumer_tr_.get_fresh_data ();
-
-  return CCM_TYPE::pull_consumer_tr_traits::fresh_data_type::_duplicate (
-                                                              fresh_data.in ());
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::pull_consumer_tr_traits::data_type::_ptr_type
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_tr_data (void)
-{
-
-  return CCM_TYPE::pull_consumer_tr_traits::data_type::_nil ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::pull_consumer_tr_traits::dds_entity_type::_ptr_type
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_tr_dds_entity (void)
-{
-
-  return CCM_TYPE::pull_consumer_tr_traits::dds_entity_type::_nil ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-::CCM_DDS::QueryFilter*
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::pull_consumer_tr_filter (void)
-{
-
-  return 0;
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::pull_consumer_tr_filter (const ::CCM_DDS::QueryFilter&)
-{
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-::CCM_DDS::CCM_ContentFilterSetting*
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_tr_filter_config(void)
-{
-  return ::CCM_DDS::CCM_ContentFilterSetting::_nil ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-::CCM_DDS::CCM_ContentFilterSetting*
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_tr_filter_config(void)
-{
-  return ::CCM_DDS::CCM_ContentFilterSetting::_nil ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-::CCM_DDS::QueryFilter *
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_consumer_tr_filter (void)
-{
-  return 0;
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_consumer_tr_filter (
-  const ::CCM_DDS::QueryFilter &)
-{
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::push_consumer_tr_traits::data_type::_ptr_type
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_tr_data (void)
-{
-  return CCM_TYPE::push_consumer_tr_traits::data_type::_nil ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::push_consumer_tr_traits::data_control_type::_ptr_type
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_tr_data_control (void)
-{
-
-  return CCM_TYPE::push_consumer_tr_traits::data_control_type::_nil ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::push_consumer_tr_traits::dds_entity_type::_ptr_type
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_tr_dds_entity (void)
-{
-
-  return CCM_TYPE::push_consumer_tr_traits::dds_entity_type::_nil ();
-}
-
-//CIRCLE
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::supplier_cl_traits::data_type::_ptr_type
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_supplier_cl_data (void)
-{
-  ACE_TRACE ("DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_supplier_cl_data");
-  typename CCM_TYPE::supplier_sq_traits::data_type::_var_type dw =
-    this->cl_supplier_.get_data ();
-  return CCM_TYPE::supplier_sq_traits::data_type::_duplicate (dw.in ());
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::supplier_cl_traits::dds_entity_type::_ptr_type
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_supplier_cl_dds_entity (void)
-{
-
-  return CCM_TYPE::supplier_cl_traits::dds_entity_type::_nil ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::pull_consumer_cl_traits::fresh_data_type::_ptr_type
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_cl_fresh_data (void)
-{
-  return CCM_TYPE::pull_consumer_cl_traits::fresh_data_type::_nil ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::pull_consumer_cl_traits::data_type::_ptr_type
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_cl_data (void)
-{
-
-  return CCM_TYPE::pull_consumer_cl_traits::data_type::_nil ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::pull_consumer_cl_traits::dds_entity_type::_ptr_type
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_cl_dds_entity (void)
-{
-
-  return CCM_TYPE::pull_consumer_cl_traits::dds_entity_type::_nil ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-::CCM_DDS::QueryFilter*
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::pull_consumer_cl_filter (void)
-{
-
-  return 0;
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::pull_consumer_cl_filter (const ::CCM_DDS::QueryFilter&)
-{
-
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-::CCM_DDS::CCM_ContentFilterSetting*
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_cl_filter_config(void)
-{
-
-  return ::CCM_DDS::CCM_ContentFilterSetting::_nil ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-::CCM_DDS::CCM_ContentFilterSetting*
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_cl_filter_config(void)
-{
-
-  return ::CCM_DDS::CCM_ContentFilterSetting::_nil ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-::CCM_DDS::QueryFilter *
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_consumer_cl_filter (void)
-{
-  return 0;
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_consumer_cl_filter (const ::CCM_DDS::QueryFilter &)
-{
-
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::push_consumer_cl_traits::data_type::_ptr_type
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_cl_data (void)
-{
-  return CCM_TYPE::push_consumer_cl_traits::data_type::_nil ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::push_consumer_cl_traits::data_control_type::_ptr_type
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_cl_data_control (void)
-{
-  typename CCM_TYPE::push_consumer_cl_traits::data_control_type::_var_type dlc =
-    this->push_consumer_cl_.get_data_control ();
-  return CCM_TYPE::push_consumer_cl_traits::data_control_type::_duplicate (dlc.in ());
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::push_consumer_cl_traits::dds_entity_type::_ptr_type
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_cl_dds_entity (void)
-{
-  return CCM_TYPE::push_consumer_cl_traits::dds_entity_type::_nil ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-char *
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::topic_name_sq (void)
-{
-  return CORBA::string_dup (this->topic_name_sq_.in ());
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::topic_name_sq (
-  const char * topic_name_sq)
-{
-  this->topic_name_sq_ = topic_name_sq;
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-char *
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::topic_name_tr (void)
-{
-  return CORBA::string_dup (this->topic_name_tr_.in ());
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::topic_name_tr (
-  const char * topic_name_tr)
-{
-  this->topic_name_tr_ = topic_name_tr;
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-char *
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::topic_name_cl (void)
-{
-  return CORBA::string_dup (this->topic_name_cl_.in ());
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::topic_name_cl (
-  const char * topic_name_cl)
-{
-  this->topic_name_cl_ = topic_name_cl;
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::create_topics (
-  const char * typesupport_name)
-{
-   this->init_topic (this->domain_participant_.in (),
-                     this->topic_sq_.inout (),
-                     this->topic_name_sq_.in (),
-                     typesupport_name);
-   if (::CORBA::is_nil (this->topic_sq_.in ()))
-     {
-       ACE_ERROR ((LM_ERROR, "DDS_MT_Event_Connector_T::create_topics - "
-                  "Error creating topic for Square\n"));
-       throw ::CORBA::INTERNAL ();
-     }
-   this->init_topic (this->domain_participant_.in (),
-                     this->topic_tr_.inout (),
-                     this->topic_name_tr_.in (),
-                     typesupport_name);
-   if (::CORBA::is_nil (this->topic_tr_.in ()))
-     {
-       ACE_ERROR ((LM_ERROR, "DDS_MT_Event_Connector_T::create_topics - "
-                  "Error creating topic for Triangle\n"));
-       throw ::CORBA::INTERNAL ();
-     }
-   this->init_topic (this->domain_participant_.in (),
-                     this->topic_cl_.inout (),
-                     this->topic_name_cl_.in (),
-                     typesupport_name);
-   if (::CORBA::is_nil (this->topic_cl_.in ()))
-     {
-       ACE_ERROR ((LM_ERROR, "DDS_MT_Event_Connector_T::create_topics - "
-                  "Error creating topic for Circle\n"));
-       throw ::CORBA::INTERNAL ();
-     }
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::configuration_complete (void)
-{
-  // Init default domain (Base_Connector)
-  this->init_domain (this->domain_participant_.inout ());
-
-  // Init type (TopicBase_Connector)
-  ::CORBA::String_var typesupport_name;
-#if (CIAO_DDS4CCM_NDDS==1)
-  typesupport_name = ::CORBA::string_dup (DDS_TYPE::type_support::get_type_name ());
-#elif (CIAO_DDS4CCM_OPENDDS==1)
-  typename DDS_TYPE::type_support type;
-  typesupport_name = type.get_type_name ();
-#endif
-  this->register_type (this->domain_participant_.in (),
-                       typesupport_name.in ());
-
-  // Create the topics needed (this class)
-  this->create_topics (typesupport_name);
-
-  // Init the subscriber and publisher (TopicBase_Connector)
-  this->init_subscriber (this->domain_participant_.in (),
-                         this->subscriber_.inout ());
-  this->init_publisher (this->domain_participant_.in (),
-                        this->publisher_.inout ());
-
-  this->sq_supplier_.configuration_complete (
-                                      this->topic_sq_.in (),
-                                      this->publisher_.in (),
-                                      this->qos_profile_,
-                                      this->qos_xml_);
-  this->tr_supplier_.configuration_complete (
-                                      this->topic_tr_.in (),
-                                      this->publisher_.in (),
-                                      this->qos_profile_,
-                                      this->qos_xml_);
-  this->cl_supplier_.configuration_complete (
-                                      this->topic_cl_.in (),
-                                      this->publisher_.in (),
-                                      this->qos_profile_,
-                                      this->qos_xml_);
-  this->pull_consumer_sq_.configuration_complete (
-                                      this->topic_sq_.in (),
-                                      this->subscriber_.in (),
-                                      this->qos_profile_,
-                                      this->qos_xml_);
-  this->pull_consumer_tr_.configuration_complete (
-                                      this->topic_tr_.in (),
-                                      this->subscriber_.in (),
-                                      this->qos_profile_,
-                                      this->qos_xml_);
-  this->push_consumer_cl_.configuration_complete (
-                                      this->topic_cl_.in (),
-                                      this->subscriber_.in (),
-                                      this->qos_profile_,
-                                      this->qos_xml_);
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::activate_topics (void)
-{
-  this->activate_topic (this->reactor_,
-                        this->topic_sq_.in (),
-                        this->topiclistener_sq_.inout ());
-  this->activate_topic (this->reactor_,
-                        this->topic_tr_.in (),
-                        this->topiclistener_tr_.inout ());
-  this->activate_topic (this->reactor_,
-                        this->topic_cl_.in (),
-                        this->topiclistener_cl_.inout ());
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_activate (void)
-{
-  this->activate_topics ();
-  this->activate_subscriber (this->reactor_,
-                             this->subscriber_.in (),
-                             this->subscriber_listener_.inout ());
-  this->activate_publisher (this->reactor_,
-                            this->publisher_.in (),
-                            this->publisher_listener_.inout ());
-
-  this->sq_supplier_.activate ();
-  this->tr_supplier_.activate ();
-  this->cl_supplier_.activate ();
-
-  ::CCM_DDS::PortStatusListener_var pull_consumer_sq_psl =
-    this->context_->get_connection_pull_consumer_sq_status ();
-  this->pull_consumer_sq_.activate (pull_consumer_sq_psl.in (),
-                                    this->reactor_);
-
-  ::CCM_DDS::PortStatusListener_var pull_consumer_tr_psl =
-    this->context_->get_connection_pull_consumer_tr_status ();
-  this->pull_consumer_tr_.activate (pull_consumer_tr_psl.in (),
-                                    this->reactor_);
-
-  ::CCM_DDS::PortStatusListener_var push_consumer_cl_psl =
-    this->context_->get_connection_push_consumer_cl_status ();
-
-  this->dl_ = this->context_->get_connection_push_consumer_cl_data_listener ();
-  this->push_consumer_cl_.activate (this->dl_.in (),
-                                    push_consumer_cl_psl.in (),
-                                    this->reactor_);
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::passivate_topics (void)
-{
-  ::DDS::TopicListener_var topic_listener = this->topiclistener_sq_._retn ();
-  if (!::CORBA::is_nil (topic_listener.in ()))
-    {
-      this->passivate_topic (this->topic_sq_.in (),
-                             topic_listener.in ());
-    }
-  topic_listener = this->topiclistener_tr_._retn ();
-  if (!::CORBA::is_nil (topic_listener.in ()))
-    {
-      this->passivate_topic (this->topic_tr_.in (),
-                             topic_listener.in ());
-    }
-  topic_listener = this->topiclistener_cl_._retn ();
-  if (!::CORBA::is_nil (topic_listener.in ()))
-    {
-      this->passivate_topic (this->topic_cl_.in (),
-                             topic_listener.in ());
-    }
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_passivate (void)
-{
-  this->sq_supplier_.passivate ();
-  this->tr_supplier_.passivate ();
-  this->cl_supplier_.passivate ();
-
-  this->pull_consumer_sq_.passivate ();
-  this->pull_consumer_tr_.passivate ();
-
-  this->push_consumer_cl_.passivate ();
-
-  this->passivate_topics ();
-
-  ::DDS::SubscriberListener_var subscriber_listener =
-    this->subscriber_listener_._retn ();
-  if (!::CORBA::is_nil (subscriber_listener.in ()))
-    {
-      this->passivate_subscriber (this->subscriber_.in (),
-                                  subscriber_listener.in ());
-    }
-  ::DDS::PublisherListener_var publisher_listener =
-    this->publisher_listener_._retn ();
-  if (!::CORBA::is_nil (publisher_listener.in ()))
-    {
-      this->passivate_publisher (this->publisher_.in (),
-                                 publisher_listener.in ());
-    }
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::remove_topics (void)
-{
-  this->remove_topic (this->domain_participant_.in (),
-                      this->topic_sq_.inout ());
-  this->remove_topic (this->domain_participant_.in (),
-                      this->topic_tr_.inout ());
-  this->remove_topic (this->domain_participant_.in (),
-                      this->topic_cl_.inout ());
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_remove (void)
-{
-  this->sq_supplier_.remove (this->publisher_.in ());
-  this->tr_supplier_.remove (this->publisher_.in ());
-  this->cl_supplier_.remove (this->publisher_.in ());
-
-  this->pull_consumer_sq_.remove (this->subscriber_.in ());
-  this->pull_consumer_tr_.remove (this->subscriber_.in ());
-  this->push_consumer_cl_.remove (this->subscriber_.in ());
-
-  this->remove_topics ();
-
-  /**
-    *
-    * In order to close down in a thread safe and memory leak free manner, one
-    * should first declare a temporary _var variable and assign this one with the
-    * class member, using _retn (). This'll free all references to the class member
-    * so one's sure that the only one left is the temporary _var variable. This
-    * one should be used in calls to the 'remove_xxx' methods.
-  **/
-  ::DDS::Publisher_var publisher = this->publisher_._retn ();
-  if (!::CORBA::is_nil (publisher.in ()))
-    {
-      this->remove_publisher (this->domain_participant_.in (),
-                              publisher.in ());
-    }
-  ::DDS::Subscriber_var subscriber = this->subscriber_._retn ();
-  if (!::CORBA::is_nil (subscriber.in ()))
-    {
-      this->remove_subscriber (this->domain_participant_.in (),
-                               subscriber.in ());
-    }
-
-  ::CORBA::String_var typesupport_name;
-#if (CIAO_DDS4CCM_NDDS==1)
-  typesupport_name = ::CORBA::string_dup (DDS_TYPE::type_support::get_type_name ());
-#elif (CIAO_DDS4CCM_OPENDDS==1)
-  typename DDS_TYPE::type_support type;
-  typesupport_name = type.get_type_name ();
-#endif
-  this->unregister_type (this->domain_participant_.in (),
-                         typesupport_name.in ());
-
-  ::DDS::DomainParticipant_var dp = this->domain_participant_._retn ();
-  if (!::CORBA::is_nil (dp.in ()))
-    {
-      this->remove_domain (dp.in ());
-    }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.h b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.h
deleted file mode 100644
index 81486213f69..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.h
+++ /dev/null
@@ -1,287 +0,0 @@
-#ifndef DDS_MT_CONNECTOR_T_H_
-#define DDS_MT_CONNECTOR_T_H_
-
-#include "connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h"
-#include "connectors/dds4ccm/impl/DDS_Write_T.h"
-#include "connectors/dds4ccm/impl/DDS_Get_T.h"
-#include "connectors/dds4ccm/impl/DDS_Listen_T.h"
-#include "connectors/dds4ccm/impl/DataListenerControl_T.h"
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-class DDS_MT_Event_Connector_T
-  : public virtual DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE>
-{
-
-typedef DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE> TopicBaseConnector;
-
-public:
-  DDS_MT_Event_Connector_T (void);
-
-  /**
-    * Square connector
-    **/
-  virtual
-  typename CCM_TYPE::supplier_sq_traits::data_type::_ptr_type
-  get_supplier_sq_data (void);
-
-  virtual
-  typename CCM_TYPE::supplier_sq_traits::dds_entity_type::_ptr_type
-  get_supplier_sq_dds_entity (void);
-
-  virtual
-  typename CCM_TYPE::pull_consumer_sq_traits::fresh_data_type::_ptr_type
-  get_pull_consumer_sq_fresh_data (void);
-
-  virtual
-  typename CCM_TYPE::pull_consumer_sq_traits::data_type::_ptr_type
-  get_pull_consumer_sq_data (void);
-
-  virtual
-  typename CCM_TYPE::pull_consumer_sq_traits::dds_entity_type::_ptr_type
-  get_pull_consumer_sq_dds_entity (void);
-
-  virtual
-  CCM_DDS::QueryFilter*
-  pull_consumer_sq_filter (void);
-
-  virtual
-  void
-  pull_consumer_sq_filter (const CCM_DDS::QueryFilter&);
-
-  virtual
-  ::CCM_DDS::CCM_ContentFilterSetting_ptr
-  get_pull_consumer_sq_filter_config(void);
-
-  virtual
-  CCM_DDS::CCM_ContentFilterSetting*
-  get_push_consumer_sq_filter_config(void);
-
-  virtual
-  CCM_DDS::QueryFilter *
-  push_consumer_sq_filter (void);
-
-  virtual
-  void
-  push_consumer_sq_filter (const ::CCM_DDS::QueryFilter &);
-
-  virtual
-  typename CCM_TYPE::push_consumer_sq_traits::data_type::_ptr_type
-  get_push_consumer_sq_data (void);
-
-  virtual
-  typename CCM_TYPE::push_consumer_sq_traits::data_control_type::_ptr_type
-  get_push_consumer_sq_data_control (void);
-
-  virtual
-  typename CCM_TYPE::push_consumer_sq_traits::dds_entity_type::_ptr_type
-  get_push_consumer_sq_dds_entity (void);
-
-  /**
-    * Triangle connector
-    **/
-  virtual
-  typename CCM_TYPE::supplier_tr_traits::data_type::_ptr_type
-  get_supplier_tr_data (void);
-
-  virtual
-  typename CCM_TYPE::supplier_tr_traits::dds_entity_type::_ptr_type
-  get_supplier_tr_dds_entity (void);
-
-  virtual
-  typename CCM_TYPE::pull_consumer_tr_traits::fresh_data_type::_ptr_type
-  get_pull_consumer_tr_fresh_data (void);
-
-  virtual
-  typename CCM_TYPE::pull_consumer_tr_traits::data_type::_ptr_type
-  get_pull_consumer_tr_data (void);
-
-  virtual
-  typename CCM_TYPE::pull_consumer_tr_traits::dds_entity_type::_ptr_type
-  get_pull_consumer_tr_dds_entity (void);
-
-  virtual
-  CCM_DDS::QueryFilter*
-  pull_consumer_tr_filter (void);
-
-  virtual
-  void
-  pull_consumer_tr_filter (const CCM_DDS::QueryFilter&);
-
-  virtual
-  CCM_DDS::CCM_ContentFilterSetting*
-  get_pull_consumer_tr_filter_config(void);
-
-  virtual
-  CCM_DDS::CCM_ContentFilterSetting*
-  get_push_consumer_tr_filter_config(void);
-
-  virtual
-  CCM_DDS::QueryFilter *
-  push_consumer_tr_filter (void);
-
-  virtual
-  void
-  push_consumer_tr_filter (const ::CCM_DDS::QueryFilter &);
-
-  virtual
-  typename CCM_TYPE::push_consumer_tr_traits::data_type::_ptr_type
-  get_push_consumer_tr_data (void);
-
-  virtual
-  typename CCM_TYPE::push_consumer_tr_traits::data_control_type::_ptr_type
-  get_push_consumer_tr_data_control (void);
-
-  virtual
-  typename CCM_TYPE::push_consumer_tr_traits::dds_entity_type::_ptr_type
-  get_push_consumer_tr_dds_entity (void);
-
-  /**
-    * Circle connector
-    **/
-  virtual
-  typename CCM_TYPE::supplier_cl_traits::data_type::_ptr_type
-  get_supplier_cl_data (void);
-
-  virtual
-  typename CCM_TYPE::supplier_cl_traits::dds_entity_type::_ptr_type
-  get_supplier_cl_dds_entity (void);
-
-  virtual
-  typename CCM_TYPE::pull_consumer_cl_traits::fresh_data_type::_ptr_type
-  get_pull_consumer_cl_fresh_data (void);
-
-  virtual
-  typename CCM_TYPE::pull_consumer_cl_traits::data_type::_ptr_type
-  get_pull_consumer_cl_data (void);
-
-  virtual
-  typename CCM_TYPE::pull_consumer_cl_traits::dds_entity_type::_ptr_type
-  get_pull_consumer_cl_dds_entity (void);
-
-  virtual
-  CCM_DDS::QueryFilter*
-  pull_consumer_cl_filter (void);
-
-  virtual
-  void
-  pull_consumer_cl_filter (const CCM_DDS::QueryFilter&);
-
-  virtual
-  CCM_DDS::CCM_ContentFilterSetting*
-  get_pull_consumer_cl_filter_config(void);
-
-  virtual
-  CCM_DDS::CCM_ContentFilterSetting*
-  get_push_consumer_cl_filter_config(void);
-
-  virtual
-  CCM_DDS::QueryFilter *
-  push_consumer_cl_filter (void);
-
-  virtual
-  void
-  push_consumer_cl_filter (const ::CCM_DDS::QueryFilter &);
-
-  virtual
-  typename CCM_TYPE::push_consumer_cl_traits::data_type::_ptr_type
-  get_push_consumer_cl_data (void);
-
-  virtual
-  typename CCM_TYPE::push_consumer_cl_traits::data_control_type::_ptr_type
-  get_push_consumer_cl_data_control (void);
-
-  virtual
-  typename CCM_TYPE::push_consumer_cl_traits::dds_entity_type::_ptr_type
-  get_push_consumer_cl_dds_entity (void);
-
-  /**
-    * Topic names.
-    **/
-  virtual char * topic_name_sq (void);
-  virtual void topic_name_sq (const char * topic_name_sq);
-  virtual char * topic_name_tr (void);
-  virtual void topic_name_tr (const char * topic_name_tr);
-  virtual char * topic_name_cl (void);
-  virtual void topic_name_cl (const char * topic_name_cl);
-
-  /**
-    * Deployment methods.
-    **/
-  virtual void configuration_complete (void);
-  virtual void ccm_remove (void);
-  virtual void ccm_activate (void);
-  virtual void ccm_passivate (void);
-
-private:
-  DDS_Write_T <
-      typename CCM_TYPE::supplier_sq_traits,
-      typename DDS_TYPE::typed_writer_type,
-      typename DDS_TYPE::value_type,
-      SEQ_TYPE>
-    sq_supplier_;
-
-  DDS_Write_T <
-      typename CCM_TYPE::supplier_tr_traits,
-      typename DDS_TYPE::typed_writer_type,
-      typename DDS_TYPE::value_type,
-      SEQ_TYPE>
-    tr_supplier_;
-
-  DDS_Write_T <
-      typename CCM_TYPE::supplier_cl_traits,
-      typename DDS_TYPE::typed_writer_type,
-      typename DDS_TYPE::value_type,
-      SEQ_TYPE>
-    cl_supplier_;
-
-  DDS_Get_T <
-      typename CCM_TYPE::pull_consumer_sq_traits,
-      typename DDS_TYPE::typed_reader_type,
-      typename DDS_TYPE::value_type,
-      SEQ_TYPE,
-      FIXED>
-    pull_consumer_sq_;
-
-  DDS_Get_T <
-      typename CCM_TYPE::pull_consumer_tr_traits,
-      typename DDS_TYPE::typed_reader_type,
-      typename DDS_TYPE::value_type,
-      SEQ_TYPE,
-      FIXED>
-    pull_consumer_tr_;
-
-  DDS_Listen_T<
-      typename CCM_TYPE::push_consumer_cl_traits,
-      typename DDS_TYPE::typed_reader_type,
-      typename DDS_TYPE::value_type,
-      SEQ_TYPE,
-      CIAO::DDS4CCM::DDS4CCM_TAKE>
-    push_consumer_cl_;
-
-  /// Connection to the receiver implementation
-  typename CCM_TYPE::push_consumer_cl_traits::data_listener_type::_var_type dl_;
-
-  CORBA::String_var topic_name_sq_;
-  CORBA::String_var topic_name_tr_;
-  CORBA::String_var topic_name_cl_;
-
-  ::DDS::Topic_var topic_sq_;
-  ::DDS::Topic_var topic_tr_;
-  ::DDS::Topic_var topic_cl_;
-
-  ::DDS::TopicListener_var topiclistener_sq_;
-  ::DDS::TopicListener_var topiclistener_tr_;
-  ::DDS::TopicListener_var topiclistener_cl_;
-
-  ACE_Reactor * reactor_;
-
-  void create_topics (const char * typesupport_name);
-
-  void activate_topics (void);
-  void passivate_topics (void);
-  void remove_topics (void);
-};
-
-#include "MultiTopic_Connector_T.cpp"
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/ccm_dds_mt.idl b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/ccm_dds_mt.idl
deleted file mode 100644
index 321861eff88..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/ccm_dds_mt.idl
+++ /dev/null
@@ -1,51 +0,0 @@
-#ifndef CCM_DDS_MT_IDL
-#define CCM_DDS_MT_IDL
-
-#include <Components.idl>
-
-#include "connectors/dds4ccm/idl/dds4ccm_DataListenerControl.idl"
-#include "connectors/dds4ccm/idl/dds4ccm_StateListenerControl.idl"
-#include "connectors/dds4ccm/idl/dds4ccm_PortStatusListener.idl"
-#include "connectors/dds4ccm/idl/dds4ccm_ConnectorStatusListener.idl"
-
-#pragma dds4ccm impl "MultiTopic_Connector_T.h"
-
-#include <ccm_dds.idl>
-
-/**
- * @namespace CCM_DDS_MT
- *
- * Module containing all @ref MT related entities. Non-typed constructs are
- * directly defined in this module, while typed constructs are in a templated
- * sub-module.
- */
-module CCM_DDS_MT
-{
-  module Typed_MT<typename T, sequence<T> TSeq>
-    {
-      alias CCM_DDS::Typed<T, TSeq> DDS_Typed;
-      typedef DDS_Typed::DataReader DataReader;
-      typedef DDS_Typed::DataWriter DataWriter;
-
-      // DDS MT Connector
-      // ------------------
-      connector DDS_MT_Event : CCM_DDS::DDS_Base {
-        mirrorport DDS_Typed::DDS_Write  supplier_sq;
-        mirrorport DDS_Typed::DDS_Get    pull_consumer_sq;
-        mirrorport DDS_Typed::DDS_Listen push_consumer_sq;
-        mirrorport DDS_Typed::DDS_Write  supplier_tr;
-        mirrorport DDS_Typed::DDS_Get    pull_consumer_tr;
-        mirrorport DDS_Typed::DDS_Listen push_consumer_tr;
-        mirrorport DDS_Typed::DDS_Write  supplier_cl;
-        mirrorport DDS_Typed::DDS_Get    pull_consumer_cl;
-        mirrorport DDS_Typed::DDS_Listen push_consumer_cl;
-
-        attribute string topic_name_sq;
-        attribute string topic_name_tr;
-        attribute string topic_name_cl;
-      };
-   };
-};
-
-#endif // CCM_DDS_MT_IDL
-
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver.idl b/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver.idl
deleted file mode 100644
index 69c0b85ea58..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver.idl
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/MultiTopic_Connector.idl"
-
-module Shapes
-{
-  component Receiver
-  {
-    port DDS_Typed::DDS_Get info_get_sq;
-    port DDS_Typed::DDS_Get info_get_tr;
-    port DDS_Typed::DDS_Listen info_out_cl;
-
-    attribute unsigned long rate;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver.mpc
deleted file mode 100644
index 4119c175422..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver.mpc
+++ /dev/null
@@ -1,137 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -l ../lib -o ../lib -u DDS -b dds4ccm_base Receiver"
-
-project(DDS_MultiTopic_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_MultiTopic_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h -I..
-
-  IDL_Files {
-    MultiTopic_Receiver.idl
-  }
-}
-
-project(DDS_MultiTopic_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_MultiTopic_Receiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    MultiTopic_ReceiverE.idl
-  }
-}
-
-project(DDS_MultiTopic_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_MultiTopic_Receiver_lem_gen DDS_MultiTopic_Receiver_stub  DDS_MultiTopic_Connector_stub DDS_MultiTopic_Base_stub
-  libs  +=  Receiver_stub DDS_MultiTopic_Connector_stub DDS_MultiTopic_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    MultiTopic_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    MultiTopic_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    MultiTopic_ReceiverEC.inl
-  }
-}
-
-project(DDS_MultiTopic_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_MultiTopic_Receiver_idl_gen  DDS_MultiTopic_Connector_stub DDS_MultiTopic_Base_stub DDS_MultiTopic_Connector_lem_gen
-  libs  += DDS_MultiTopic_Connector_stub DDS_MultiTopic_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    MultiTopic_ReceiverC.cpp
-  }
-
-  Header_Files {
-    MultiTopic_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    MultiTopic_ReceiverC.inl
-  }
-}
-
-project(DDS_MultiTopic_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_MultiTopic_Receiver_lem_stub DDS_MultiTopic_Receiver_stub DDS_MultiTopic_Base_stub DDS_MultiTopic_Connector_stub DDS_MultiTopic_Connector_lem_stub 
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_MultiTopic_Base_stub DDS_MultiTopic_Connector_stub DDS_MultiTopic_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    MultiTopic_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    MultiTopic_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_MultiTopic_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_MultiTopic_Receiver_lem_stub DDS_MultiTopic_Base_stub DDS_MultiTopic_Connector_stub DDS_MultiTopic_Connector_svnt DDS_MultiTopic_Receiver_exec DDS_MultiTopic_Connector_lem_stub 
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_MultiTopic_Base_stub DDS_MultiTopic_Connector_stub DDS_MultiTopic_Connector_svnt Receiver_exec DDS_MultiTopic_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    MultiTopic_ReceiverS.cpp
-    MultiTopic_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    MultiTopic_ReceiverS.h
-    MultiTopic_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.cpp
deleted file mode 100644
index 57932fba639..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.cpp
+++ /dev/null
@@ -1,396 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "MultiTopic_Receiver_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/OS_NS_time.h"
-#include "ace/Reactor.h"
-#include "dds4ccm/impl/TimeUtilities.h"
-
-#define TIME_OUT_SEC 1
-
-namespace CIAO_Shapes_Receiver_Impl
-{
-
-  //============================================================
-  // read_action_Generator
-  //============================================================
-  read_action_Generator::read_action_Generator (Receiver_exec_i &callback)
-    : pulse_callback_ (callback)
-  {
-  }
-
-  read_action_Generator::~read_action_Generator ()
-  {
-  }
-
-  int
-  read_action_Generator::handle_timeout (const ACE_Time_Value &,
-                                         const void *)
-  {
-    this->pulse_callback_.get_one ();
-    return 0;
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_data_listener_exec_i
-  */
-  info_out_data_listener_exec_i::info_out_data_listener_exec_i (
-        ::Shapes::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::Shapes::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::Shapes::Listener
-
-  void
-  info_out_data_listener_exec_i::on_one_data (const ::ShapeType & datum,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("<CIRCLE Listener> : ")
-            ACE_TEXT ("received CIRCLE for <%C> at %u:%u:%u\n"),
-            datum.color.in (),
-            datum.x,
-            datum.y,
-            datum.shapesize));
-  }
-
-  void
-  info_out_data_listener_exec_i::on_many_data (const ::ShapeTypeSeq & /* data */,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : ticker_ (0),
-      rate_ (0)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      read_action_Generator (*this),
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-
-  void
-  Receiver_exec_i::get_one (void)
-  {
-    ShapeType_var shape_info;
-    ::CCM_DDS::ReadInfo_var readinfo;
-
-    try
-      {
-        ::Shapes::DDS_Typed::Getter_var getter_sq =
-          this-> ciao_context_->get_connection_info_get_sq_fresh_data ();
-        if (!::CORBA::is_nil (getter_sq.in ()))
-          {
-            if (getter_sq->get_one (shape_info.out (), readinfo.out ()))
-              {
-                ACE_Time_Value time;
-                time <<= readinfo->source_timestamp;
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("<GET_ONE - SQUARE> ReadInfo -> ")
-                                      ACE_TEXT ("date = %#T\n"), &time));
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("<GET_ONE - SQUARE> : ")
-                                      ACE_TEXT ("received shape_info for <%C> at %u:%u:%u\n"),
-                                      shape_info->color.in (),
-                                      shape_info->x,
-                                      shape_info->y,
-                                      shape_info->shapesize));
-              }
-            else
-              {
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("<GET_ONE - SQUARE> No data available for <%C>\n"),
-                         shape_info->color.in ()));
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_one - "
-                      "ERROR: Getter for <SQUARE> seems to be nil\n"));
-          }
-
-        ::Shapes::DDS_Typed::Getter_var getter_tr =
-          this-> ciao_context_->get_connection_info_get_tr_fresh_data ();
-        if (!::CORBA::is_nil (getter_tr.in ()))
-          {
-            if (getter_tr->get_one (shape_info.out (), readinfo.out ()))
-              {
-                ACE_Time_Value time;
-                time <<= readinfo->source_timestamp;
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("<GET_ONE - TRIANGLE> ReadInfo -> ")
-                                      ACE_TEXT ("date = %#T\n"), &time));
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("<GET_ONE - TRIANGLE> : ")
-                                      ACE_TEXT ("received shape_info for <%C> at %u:%u:%u\n"),
-                                      shape_info->color.in (),
-                                      shape_info->x,
-                                      shape_info->y,
-                                      shape_info->shapesize));
-              }
-            else
-              {
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("<GET_ONE - TRIANGLE> : No data available for <%C>\n"),
-                            shape_info->color.in ()));
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_one - "
-                      "ERROR: Getter for TRIANGLE seems to be nil\n"));
-          }
-        //Circle is retrieved by the listener functionality
-      }
-    catch(const CCM_DDS::NonExistent& )
-       {
-         ACE_ERROR ((LM_ERROR, ACE_TEXT ("ShapeType_Read_One: no shape_info receieved\n")));
-       }
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Receiver_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Receiver_exec_i::start (void)
-  {
-    // calculate the interval time
-    long const usec = 1000000 / this->rate_;
-
-    if (this->reactor ()->schedule_timer (
-                this->ticker_,
-                0,
-                ACE_Time_Value (1, usec),
-                ACE_Time_Value (2*TIME_OUT_SEC, usec)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                              ACE_TEXT ("Error scheduling timer")));
-      }
-  }
-
-  void
-  Receiver_exec_i::stop (void)
-  {
-    this->reactor ()->cancel_timer (this->ticker_);
-    delete this->ticker_;
-  }
-  // Component attributes and port operations.
-
-  ::Shapes::DDS_Typed::CCM_Listener_ptr
-  Receiver_exec_i::get_info_out_sq_data_listener (void)
-  {
-    return ::Shapes::DDS_Typed::CCM_Listener::_nil ();
-  }
-
-  ::Shapes::DDS_Typed::CCM_Listener_ptr
-  Receiver_exec_i::get_info_out_tr_data_listener (void)
-  {
-    return ::Shapes::DDS_Typed::CCM_Listener::_nil ();
-  }
-
-  ::Shapes::DDS_Typed::CCM_Listener_ptr
-   Receiver_exec_i::get_info_out_cl_data_listener (void)
-   {
-     if ( ::CORBA::is_nil (this->ciao_info_out_cl_data_listener_.in ()))
-       {
-         info_out_data_listener_exec_i *tmp = 0;
-         ACE_NEW_RETURN (
-           tmp,
-           info_out_data_listener_exec_i (
-             this->ciao_context_.in ()),
-             ::Shapes::DDS_Typed::CCM_Listener::_nil ());
-
-           this->ciao_info_out_cl_data_listener_ = tmp;
-       }
-
-     return
-       ::Shapes::DDS_Typed::CCM_Listener::_duplicate (
-         this->ciao_info_out_cl_data_listener_.in ());
-   }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_sq_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_tr_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_cl_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_get_sq_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_get_tr_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_get_cl_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::CORBA::ULong
-  Receiver_exec_i::rate (void)
-  {
-    return this->rate_;
-  }
-
-  void
-  Receiver_exec_i::rate (
-    const ::CORBA::ULong rate)
-  {
-    this->rate_ = rate;
-  }
-
-  // Operations from Components::SessionComponent.
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Shapes::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    ::CCM_DDS::DataListenerControl_var lc_cl =
-    this->ciao_context_->get_connection_info_out_cl_data_control ();
-    if (::CORBA::is_nil (lc_cl.in ()))
-      {
-        ACE_ERROR ((LM_INFO,
-            ACE_TEXT ("Error:  Listener control receptacle cl is null!\n")));
-        throw ::CORBA::INTERNAL ();
-      }
-    lc_cl->mode (::CCM_DDS::ONE_BY_ONE);
-
-    ::DDS::Duration_t to;
-    to.sec = TIME_OUT_SEC;
-    to.nanosec = 0;
-
-    ::Shapes::DDS_Typed::Getter_var getter_sq =
-      this-> ciao_context_->get_connection_info_get_sq_fresh_data ();
-    if (CORBA::is_nil (getter_sq.in ()))
-      {
-        ACE_ERROR ((LM_INFO,
-            ACE_TEXT ("Error: Getter of SQUARE seems to be nil!\n")));
-        throw ::CORBA::INTERNAL ();
-      }
-    getter_sq->time_out (to);
-
-    ::Shapes::DDS_Typed::Getter_var getter_tr =
-      this-> ciao_context_->get_connection_info_get_tr_fresh_data ();
-    if (CORBA::is_nil (getter_tr.in ()))
-      {
-        ACE_ERROR ((LM_INFO,
-            ACE_TEXT ("Error: Getter of TRIANGLE seems to be nil!\n")));
-        throw ::CORBA::INTERNAL ();
-      }
-    getter_tr->time_out (to);
-    this->start ();
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    this->stop();
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" RECEIVER_EXEC_Export  ::Components::EnterpriseComponent_ptr
-  create_Shape_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.h
deleted file mode 100644
index d6da1384e16..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.h
+++ /dev/null
@@ -1,195 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_MULTITOPIC_RECEIVER_EXEC_BDTSSY_H_
-#define CIAO_MULTITOPIC_RECEIVER_EXEC_BDTSSY_H_
-
-
-#include "MultiTopic_ReceiverEC.h"
-
-#include /**/ "Receiver_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-namespace CIAO_Shapes_Receiver_Impl
-{
-  class Receiver_exec_i;
-   /**
-   * @class reader activity generator
-   *
-   * @brief an active object used by Receiver to perform a periodical read action
-   *
-   */
-   class read_action_Generator
-     : public ACE_Event_Handler
-   {
-   public:
-     read_action_Generator (Receiver_exec_i &callback);
-
-     ~read_action_Generator ();
-
-     virtual int handle_timeout (const ACE_Time_Value &tv,
-                                 const void *arg);
-
-   private:
-     Receiver_exec_i &pulse_callback_;
-
-   };
-
-  /**
-   * Provider Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  class RECEIVER_EXEC_Export info_out_data_listener_exec_i
-    : public virtual ::Shapes::DDS_Typed::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_data_listener_exec_i (
-      ::Shapes::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from Shapes::Listener. */
-
-    virtual
-    void on_one_data (const ::ShapeType & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (const ::ShapeTypeSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    ::Shapes::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class RECEIVER_EXEC_Export Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::Shapes::DDS_Typed::CCM_Listener_ptr
-    get_info_out_sq_data_listener (void);
-
-    virtual ::Shapes::DDS_Typed::CCM_Listener_ptr
-    get_info_out_tr_data_listener (void);
-
-    virtual ::Shapes::DDS_Typed::CCM_Listener_ptr
-    get_info_out_cl_data_listener (void);
-
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_sq_status (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_tr_status (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_cl_status (void);
-
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_get_sq_status (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_get_tr_status (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_get_cl_status (void);
-
-
-    virtual ::CORBA::ULong rate (void);
-
-    virtual void rate (::CORBA::ULong rate);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    virtual void get_one (void);
-    virtual void start (void);
-    virtual void stop (void);
-
-    //@}
-
-  private:
-    ::Shapes::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::Shapes::DDS_Typed::CCM_Listener_var ciao_info_out_cl_data_listener_;
-
-     read_action_Generator * ticker_;
-
-    ::CORBA::ULong rate_;
-    //@}
-
-    //@{
-    /** User defined members. */
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Shape_Receiver_Impl (void);
-}
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender.idl b/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender.idl
deleted file mode 100644
index a406582c556..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef DDS_MULTITOPIC_SENDER_IDL
-#define DDS_MULTITOPIC_SENDER_IDL
-
-#include "Connector/MultiTopic_Connector.idl"
-
-module Shapes
-{
-  component Sender
-  {
-    port DDS_Typed::DDS_Write info_write_sq;
-    port DDS_Typed::DDS_Write info_write_tr;
-    port DDS_Typed::DDS_Write info_write_cl;
-
-    attribute unsigned long rate;
-    attribute unsigned short max_x;
-    attribute unsigned short max_y;
-    attribute unsigned short max_size;
-    attribute boolean resize_shape;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender.mpc b/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender.mpc
deleted file mode 100644
index 8b4677dde14..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender.mpc
+++ /dev/null
@@ -1,138 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_MultiTopic_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_MultiTopic_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_MultiTopic_Connector_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I ..
-
-  IDL_Files {
-    MultiTopic_Sender.idl
-  }
-}
-
-project(DDS_MultiTopic_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_MultiTopic_Sender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    MultiTopic_SenderE.idl
-  }
-}
-
-project(DDS_MultiTopic_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_MultiTopic_Sender_lem_gen DDS_MultiTopic_Sender_stub DDS_MultiTopic_Base_stub
-  libs  += Sender_stub DDS_MultiTopic_Connector_stub DDS_MultiTopic_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    MultiTopic_SenderEC.cpp
-  }
-
-  Header_Files {
-    MultiTopic_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    MultiTopic_SenderEC.inl
-  }
-}
-
-project(DDS_MultiTopic_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_MultiTopic_Sender_idl_gen DDS_MultiTopic_Base_stub DDS_MultiTopic_Connector_stub
-  libs  += DDS_MultiTopic_Base_stub DDS_MultiTopic_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    MultiTopic_SenderC.cpp
-  }
-
-  Header_Files {
-    MultiTopic_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    MultiTopic_SenderC.inl
-  }
-}
-
-project(DDS_MultiTopic_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_MultiTopic_Sender_lem_stub DDS_MultiTopic_Sender_stub DDS_MultiTopic_Connector_lem_stub DDS_MultiTopic_Connector_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub DDS_MultiTopic_Base_stub DDS_MultiTopic_Connector_stub DDS_MultiTopic_Connector_lem_stub
-  libpaths += ../lib
-  includes += .. ../Connector
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    MultiTopic_Sender_exec.cpp
-  }
-
-  Header_Files {
-    MultiTopic_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_MultiTopic_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_MultiTopic_Base_stub  DDS_MultiTopic_Sender_lem_stub DDS_MultiTopic_Connector_stub DDS_MultiTopic_Connector_svnt  DDS_MultiTopic_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                DDS_MultiTopic_Base_stub DDS_MultiTopic_Connector_stub DDS_MultiTopic_Connector_svnt DDS_MultiTopic_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    MultiTopic_SenderS.cpp
-    MultiTopic_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    MultiTopic_SenderS.h
-    MultiTopic_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.cpp
deleted file mode 100644
index f8239046c6b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.cpp
+++ /dev/null
@@ -1,350 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "MultiTopic_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_Shapes_Sender_Impl
-{
-  //============================================================
-  // pulse_Generator
-  //============================================================
-  pulse_Generator::pulse_Generator (Sender_exec_i &callback)
-    : pulse_callback_ (callback)
-  {
-  }
-
-  pulse_Generator::~pulse_Generator ()
-  {
-  }
-
-  int
-  pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    this->pulse_callback_.tick ();
-    return 0;
-  }
-
-
-   /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-  Sender_exec_i::Sender_exec_i (void)
-    : rate_ (0),
-      max_x_ (0),
-      max_y_ (0),
-      max_size_ (0),
-      resize_shape_ (false),
-      TypeOfShape (SHAPE_TYPE_SQUARE)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      pulse_Generator (*this),
-                      ::CORBA::NO_MEMORY ());
-    ACE_NEW_THROW_EX (this->square_,
-                      ShapeType,
-                      ::CORBA::NO_MEMORY ());
-    ACE_NEW_THROW_EX (this->triangle_,
-                      ShapeType,
-                      ::CORBA::NO_MEMORY ());
-    ACE_NEW_THROW_EX (this->circle_,
-                      ShapeType,
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->ticker_;
-    delete this->square_;
-    delete this->triangle_;
-    delete this->circle_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Sender_exec_i::tick ()
-    {
-      try
-        {
-          ::Shapes::DDS_Typed::Writer_var writer;
-          if (this->TypeOfShape == SHAPE_TYPE_SQUARE)
-            {
-              writer = this->ciao_context_->get_connection_info_write_sq_data ();
-            }
-          else if (this->TypeOfShape == SHAPE_TYPE_TRIANGLE)
-            {
-              writer = this->ciao_context_->get_connection_info_write_tr_data ();
-            }
-          else if (this->TypeOfShape == SHAPE_TYPE_CIRCLE)
-            {
-              writer = this->ciao_context_->get_connection_info_write_cl_data ();
-            }
-          if (::CORBA::is_nil (writer.in ()))
-            {
-              ACE_ERROR ((LM_ERROR, "Sender_exec_i::tick () - "
-                        "ERROR: Unable to get connection to writer\n"));
-              return;
-            }
-
-         if (this->TypeOfShape == SHAPE_TYPE_SQUARE)
-          {
-            this->TypeOfShape = SHAPE_TYPE_TRIANGLE;
-            writer->write_one (*square_, ::DDS::HANDLE_NIL);
-            ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("UPDATED Shape_info Square for <%C> %u:%u:%u\n"),
-                this->square_->color.in (),
-                this->square_->x,
-                this->square_->y,
-                this->square_->shapesize));
-          }
-        else if (this->TypeOfShape == SHAPE_TYPE_TRIANGLE)
-          {
-            this->TypeOfShape = SHAPE_TYPE_CIRCLE;
-            writer->write_one (*triangle_, ::DDS::HANDLE_NIL);
-            ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("UPDATED Shape_info Triangle for <%C> %u:%u:%u\n"),
-                this->triangle_->color.in (),
-                this->triangle_->x,
-                this->triangle_->y,
-                this->triangle_->shapesize));
-          }
-        else if (this->TypeOfShape == SHAPE_TYPE_CIRCLE)
-          {
-            this->TypeOfShape = SHAPE_TYPE_SQUARE;
-            writer->write_one (*circle_, ::DDS::HANDLE_NIL);
-            ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("UPDATED Shape_info Circle for <%C> %u:%u:%u\n"),
-                this->circle_->color.in (),
-                this->circle_->x,
-                this->circle_->y,
-                this->circle_->shapesize));
-           }
-        }
-      catch (const CCM_DDS::NonExistent& )
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("Shape_info for <%C> not updated: <%C> didn't exist.\n"),
-                      this->square_->color.in (), this->square_->color.in ()));
-        }
-      catch (const CCM_DDS::InternalError& )
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("Internal Error while updating Shape_info for <%C>.\n"),
-                      this->square_->color.in ()));
-        }
-    }
-
-  // Component attributes and port operations.
-
-  ::CORBA::ULong
-  Sender_exec_i::rate (void)
-  {
-    return this->rate_;
-  }
-
-  void
-  Sender_exec_i::rate (
-    const ::CORBA::ULong rate)
-  {
-    this->rate_ = rate;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::max_x (void)
-  {
-    return this->max_x_;
-  }
-
-  void
-  Sender_exec_i::max_x (
-    const ::CORBA::UShort max_x)
-  {
-    this->max_x_ = max_x;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::max_y (void)
-  {
-    return this->max_y_;
-  }
-
-  void
-  Sender_exec_i::max_y (
-    const ::CORBA::UShort max_y)
-  {
-    this->max_y_ = max_y;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::max_size (void)
-  {
-    return this->max_size_;
-  }
-
-  void
-  Sender_exec_i::max_size (
-    const ::CORBA::UShort max_size)
-  {
-    this->max_size_ = max_size;
-  }
-
-  ::CORBA::Boolean
-  Sender_exec_i::resize_shape (void)
-  {
-    return this->resize_shape_;
-  }
-
-  void
-  Sender_exec_i::resize_shape (
-    const ::CORBA::Boolean resize_shape)
-  {
-    this->resize_shape_ = resize_shape;
-  }
-
-
-  void
-  Sender_exec_i::start (void)
-  {
-    // calculate the interval time
-    long const usec = 1000000 / this->rate_;
-
-    if (this->reactor ()->schedule_timer (
-                this->ticker_,
-                0,
-                ACE_Time_Value (0, usec),
-                ACE_Time_Value (0, usec)) == -1)
-    {
-      ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                             ACE_TEXT ("Error scheduling timer")));
-    }
-  }
-
-  void
-  Sender_exec_i::stop (void)
-  {
-    try
-      {
-        this->reactor ()->cancel_timer (this->ticker_);
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n")));
-        delete this->ticker_;
-        delete this->square_;
-        delete this->triangle_;
-        delete this->circle_;
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "Sender_exec_i::stop - "
-                  "ERROR: unexpected exception caught while shutting down.\n"));
-      }
-  }
-
-  // Operations from Components::SessionComponent.
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Shapes::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-    this->square_->x = ACE_OS::rand () % this->max_x_;
-    this->square_->y = ACE_OS::rand () % this->max_y_;
-    this->square_->shapesize = max_size_;
-    this->square_->color = CORBA::string_dup("GREEN");
-
-    this->triangle_->x = ACE_OS::rand () % this->max_x_;
-    this->triangle_->y = ACE_OS::rand () % this->max_y_;
-    this->triangle_->shapesize = max_size_;
-    this->triangle_->color = CORBA::string_dup("YELLOW");
-
-    this->circle_->x = ACE_OS::rand () % this->max_x_;
-    this->circle_->y = ACE_OS::rand () % this->max_y_;
-    this->circle_->shapesize = max_size_;
-    this->circle_->color = CORBA::string_dup("BLUE");
-
-    this->start ();
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-     this->stop ();
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C"  ::Components::EnterpriseComponent_ptr
-  create_Shape_Sender_Impl (void)
-  {
-
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.h
deleted file mode 100644
index 62cf9fa7d06..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.h
+++ /dev/null
@@ -1,160 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_MULTITOPIC_SENDER_EXEC_DNHPAQ_H_
-#define CIAO_MULTITOPIC_SENDER_EXEC_DNHPAQ_H_
-
-
-#include "MultiTopic_SenderEC.h"
-#include "Sender_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-namespace CIAO_Shapes_Sender_Impl
-{
-  class Sender_exec_i;
-  //============================================================
-  // pulse_Generator
-  //============================================================
-  class pulse_Generator : public ACE_Event_Handler
-  {
-  public:
-    pulse_Generator (Sender_exec_i &callback);
-
-    virtual ~pulse_Generator ();
-
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                   const void *arg);
-  private:
-    Sender_exec_i &pulse_callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class  SENDER_EXEC_Export Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-    enum TYPE_OF_SHAPE {
-      SHAPE_TYPE_SQUARE,
-      SHAPE_TYPE_TRIANGLE,
-      SHAPE_TYPE_CIRCLE
-    };
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CORBA::ULong rate (void);
-
-    virtual void rate (::CORBA::ULong rate);
-
-    virtual ::CORBA::UShort max_x (void);
-
-    virtual void max_x (::CORBA::UShort max_x);
-
-    virtual ::CORBA::UShort max_y (void);
-
-    virtual void max_y (::CORBA::UShort max_y);
-
-    virtual ::CORBA::UShort max_size (void);
-
-    virtual void max_size (::CORBA::UShort max_size);
-
-    virtual ::CORBA::Boolean resize_shape (void);
-
-    virtual void resize_shape (::CORBA::Boolean resize_shape);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void tick ();
-    void start ();
-    void stop ();
-    //@}
-
-  private:
-    ::Shapes::CCM_Sender_Context_var ciao_context_;
-
-    ShapeType* square_;
-    ShapeType* triangle_;
-    ShapeType* circle_;
-    pulse_Generator * ticker_;
-
-    //@{
-    /** Component attributes. */
-
-    ::CORBA::ULong rate_;
-
-    ::CORBA::UShort max_x_;
-
-    ::CORBA::UShort max_y_;
-
-    ::CORBA::UShort max_size_;
-
-    ::CORBA::Boolean resize_shape_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    TYPE_OF_SHAPE TypeOfShape;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Shape_Sender_Impl (void);
-}
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/MultiTopic/descriptors/Plan.cdp
deleted file mode 100644
index 780be477216..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/descriptors/Plan.cdp
+++ /dev/null
@@ -1,526 +0,0 @@
-<!--  -->
-<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>Shapes_Depl_1</label>
-  <UUID>Shapes_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shape_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Shapes_ConnectorComponentImplementation">
-    <name>Shapes_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Shapes_Connector_ExecArtifact" />
-    <artifact xmi:idref="Shapes_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_DDS_MT_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_DDS_MT_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shapes_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shapes_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shape_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>1</ulong>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="Shapes_ConnectorSenderInstance">
-    <name>Shapes_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Shapes_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name_sq</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Square</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name_tr</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Triangle</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name_cl</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Circle</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="Shapes_ConnectorReceiverInstance">
-    <name>Shapes_ConnectorReceiverInstance</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Shapes_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name_sq</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Square</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name_tr</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Triangle</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name_cl</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Circle</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>1</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_x</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>225</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_y</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>250</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_size</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>25</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>resize_shape</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>true</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <!-- SENDER SENDER SENDER SENDER SENDER -->
-
-  <!-- SQUARE -->
-  <connection>
-    <name>writer_sq_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_sq_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_sq_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Shapes_ConnectorSenderInstance" />
-    </internalEndpoint>
-  </connection>
-  <!-- TRIANGLE -->
-  <connection>
-    <name>writer_tr_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_tr_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_tr_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Shapes_ConnectorSenderInstance" />
-    </internalEndpoint>
-  </connection>
-  <!-- CIRCLE -->
-  <connection>
-    <name>writer_cl_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_cl_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_cl_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Shapes_ConnectorSenderInstance" />
-    </internalEndpoint>
-  </connection>
-
-
-  <!-- RECEIVER RECEIVER RECEIVER RECEIVER RECEIVER -->
-
-  <!-- SQUARE: (Getter only) -->
-  <connection>
-    <name>info_get_sq_fresh_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_sq_fresh_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_sq_fresh_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Shapes_ConnectorReceiverInstance" />
-    </internalEndpoint>
-  </connection>
-  <!-- TRIANGLE (Getter only) -->
-  <connection>
-    <name>info_get_tr_fresh_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_tr_fresh_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_tr_fresh_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Shapes_ConnectorReceiverInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <!-- CIRCLE (Listener only) -->
-  <connection>
-    <name>_listenercontrol_cl</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_cl_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_cl_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Shapes_ConnectorReceiverInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_listener_cl</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_cl_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_cl_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Shapes_ConnectorReceiverInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="Shapes_Connector_ExecArtifact">
-    <name>Shapes_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_MultiTopic_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Shapes_Connector_SvntArtifact">
-    <name>Shapes_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_MultiTopic_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Shapes_Connector_StubArtifact">
-    <name>Shapes_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_MultiTopic_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/MultiTopic/descriptors/run_test.pl
deleted file mode 100755
index 10f73a3be9f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 60 seconds to allow task to complete\n";
-sleep (60);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.idl b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.idl
deleted file mode 100644
index cd0486eba27..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.idl
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * @file MultipleTemp_Base.idl
- * @author Marijke Hengstmengel
- */
-
-#ifndef MULTIPLE_TEMP_BASE_IDL
-#define MULTIPLE_TEMP_BASE_IDL
-
-#pragma ndds typesupport "Base/MultipleTemp_BaseSupport.h"
-#pragma opendds typesupport "Base/MultipleTemp_BaseSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "TestTopicOne"
-#pragma DCPS_DATA_KEY "TestTopicOne keyOne"
-#pragma DCPS_DATA_TYPE "TestTopicTwo"
-#pragma DCPS_DATA_KEY "TestTopicTwo keyTwo"
-
-
-struct TestTopicOne {
-  string keyOne; //@key
-  long x;
-};
-
-struct TestTopicTwo {
-  string keyTwo; //@key
-  long y;
-  long z;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TestTopicOne> TestTopicOneSeq;
-#endif
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TestTopicTwo> TestTopicTwoSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.mpc b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.mpc
deleted file mode 100644
index 0b0e2cc5639..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.mpc
+++ /dev/null
@@ -1,25 +0,0 @@
-project (DDS_MultipleTemp_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  requires += dummy_label
-  sharedname = DDS_MultipleTemp_Base_stub
-  dynamicflags += MULTIPLE_TEMP_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=MULTIPLE_TEMP_BASE_STUB_Export \
-              -Wb,stub_export_include=MultipleTemp_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    MultipleTemp_Base.idl
-  }
-
-  opendds_ts_flags += --export=MULTIPLE_TEMP_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    MultipleTemp_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.idl b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.idl
deleted file mode 100644
index 4ce01c01aaa..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.idl
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * @file MultipleTemp_Connector.idl
- * @author Marijke Hengstmengel
- */
-
-#ifndef MULTIPLE_TEMP_CONNECTOR_IDL_
-#define MULTIPLE_TEMP_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <Connector/ccm_dds_mlt.idl>
-
-#include "Base/MultipleTemp_Base.idl"
-
-#pragma ciao lem "Connector/MultipleTemp_ConnectorE.idl"
-
-module MultipleTemp
-{
-  module ::CCM_DDS::Duplex_Typed < ::TestTopicOne, ::TestTopicOneSeq, ::TestTopicTwo, ::TestTopicTwoSeq> MultipleTempConnector;
-};
-
-#endif /* MULTIPLE_TEMP_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.mpc b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.mpc
deleted file mode 100644
index 06b2767a604..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.mpc
+++ /dev/null
@@ -1,166 +0,0 @@
-project (DDS_MLT_idl_gen) : taoidldefaults, anytypecode, dds4ccm {
-  requires += dummy_label
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=CCM_DDS_MLT_STUB_Export \
-              -Wb,stub_export_include=ccm_dds_mlt_stub_export.h \
-              -Wb,skel_export_macro=CCM_DDS_MLT_SKEL_Export \
-              -Wb,skel_export_include=ccm_dds_mlt_skel_export.h \
-              -SS -Scc -Sci -Gxhst \
-              -I $(CIAO_ROOT)/connectors/dds4ccm/idl
-
-  IDL_Files {
-    ccm_dds_mlt.idl
-  }
-}
-
-project(DDS_MT_TEMP_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  requires += dummy_label
-  after += DDS4CCM_idl_gen DDS_MLT_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=MULTIPLE_TEMP_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=MultipleTemp_Connector_stub_export.h \
-              -Wb,skel_export_macro=MULTIPLE_TEMP_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=MultipleTemp_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=MULTIPLE_TEMP_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=MultipleTemp_Connector_svnt_export.h \
-              -Wb,conn_export_macro=MULTIPLE_TEMP_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=MultipleTemp_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    MultipleTemp_Connector.idl
-  }
-}
-
-project(DDS_MT_TEMP_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  requires += dummy_label
-  custom_only = 1
-  after += DDS_MT_TEMP_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=MULTIPLE_TEMP_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=MultipleTemp_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    MultipleTemp_ConnectorE.idl
-  }
-}
-
-project(DDS_MT_TEMP_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  requires += dummy_label
-  after += DDS_MT_TEMP_Connector_lem_gen DDS_MultipleTemp_Connector_stub DDS_MultipleTemp_Base_stub
-  libs  += DDS_MultipleTemp_Base_stub DDS_MultipleTemp_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_MT_TEMP_Connector_lem_stub
-  dynamicflags += MULTIPLE_TEMP_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    MultipleTemp_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    MultipleTemp_ConnectorEC.h
-    MultipleTemp_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    MultipleTemp_ConnectorEC.inl
-  }
-}
-
-project(DDS_MultipleTemp_Connector_stub) : ccm_stub, dds4ccm_base {
-  requires += dummy_label
-  after += DDS_MT_TEMP_Connector_idl_gen DDS_MultipleTemp_Base_stub
-  libs  += DDS_MultipleTemp_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_MultipleTemp_Connector_stub
-  dynamicflags += MULTIPLE_TEMP_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    MultipleTemp_ConnectorC.cpp
-  }
-
-  Header_Files {
-    MultipleTemp_ConnectorC.h
-    MultipleTemp_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    MultipleTemp_ConnectorC.inl
-  }
-}
-
-project(DDS_MultipleTemp_Connector_exec) : ciao_executor, dds4ccm_impl {
-  requires += dummy_label
-  after   += DDS_MT_TEMP_Connector_lem_stub DDS_MultipleTemp_Connector_stub DDS_MultipleTemp_Base_stub
-  sharedname = DDS_MultipleTemp_Connector_exec
-  libs += DDS_MultipleTemp_Connector_stub DDS_MT_TEMP_Connector_lem_stub DDS_MultipleTemp_Base_stub DDS_MultipleTemp_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += MULTIPLE_TEMP_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Template_Files{
-    MultipleTemp_Connector_T.cpp
-  }
-
-  Source_Files {
-    MultipleTemp_Connector_conn.cpp
-  }
-
-  Header_Files {
-    MultipleTemp_Connector_conn.h
-    MultipleTemp_Connector_conn_export.h
-    MultipleTemp_Connector_T.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_MT_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  requires += dummy_label
-  after      += DDS_MT_TEMP_Connector_lem_stub DDS_MultipleTemp_Connector_exec DDS_MultipleTemp_Connector_stub
-  sharedname  = DDS_MultipleTemp_Connector_svnt
-  libs       += DDS_MultipleTemp_Connector_stub \
-                DDS_MT_TEMP_Connector_lem_stub  \
-                DDS_MultipleTemp_Base_stub \
-                DDS_MultipleTemp_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += MULTIPLE_TEMP_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    MultipleTemp_ConnectorS.cpp
-    MultipleTemp_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    MultipleTemp_ConnectorS.h
-    MultipleTemp_Connector_svnt.h
-    MultipleTemp_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.cpp b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.cpp
deleted file mode 100644
index 4b4f467b572..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.cpp
+++ /dev/null
@@ -1,517 +0,0 @@
-#include "connectors/dds4ccm/impl/DDS_Base_Connector_T.h"
-#include "ace/Reactor.h"
-
-template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y>
-FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::FooConnector_Connector_T(void)
-  : push_consumer_t_ (),
-    push_consumer_y_ (),
-    reactor_ (0)
-{
-}
-
-
-/**
-  * Type registration both topics
- **/
-template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y>
-void
-FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::register_type (
-  ::DDS::DomainParticipant_ptr participant,
-  const char * /*typesupport_name*/)
-{
-  DDS4CCM_TRACE ("FooConnector_Connector_T::register_type");
-
-  ::DDS::ReturnCode_t retcode_t = ::DDS::RETCODE_OK;
-  ::DDS::ReturnCode_t retcode_y = ::DDS::RETCODE_OK;
-#if (CIAO_DDS4CCM_NDDS==1)
-  ::CIAO::NDDS::DDS_DomainParticipant_i *part =
-    dynamic_cast< CIAO::NDDS::DDS_DomainParticipant_i * > (participant);
-  if (!part)
-    {
-      DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-          "DDS_MultipleTemp_FooConnector_T::register_type - "
-          "Unable to cast the DomainParticipant proxy to its internal "
-          "representation.\n"));
-      throw ::CORBA::INTERNAL ();
-    }
-
-  typedef ::CIAO::NDDS::DDS_TypeFactory_T <DDS_TYPE_T, SEQ_TYPE_T> dds_type_factory_t;
-  typedef ::CIAO::NDDS::DDS_TypeFactory_T <DDS_TYPE_Y, SEQ_TYPE_Y> dds_type_factory_y;
-
-  ::CIAO::NDDS::DDS_TypeFactory_i * factory_t = 0;
-  ::CIAO::NDDS::DDS_TypeFactory_i * factory_y = 0;
-
-  const char* typesupport_name_t = DDS_TYPE_T::type_support::get_type_name ();
-  const char* typesupport_name_y = DDS_TYPE_Y::type_support::get_type_name ();
-
-
-  ACE_NEW_THROW_EX (factory_t,
-                    dds_type_factory_t (),
-                    ::CORBA::NO_MEMORY ());
-  ::CIAO::NDDS::DDS_TypeSupport_i::register_type (typesupport_name_t,
-                                                  factory_t, participant);
-
-  ACE_NEW_THROW_EX (factory_y,
-                      dds_type_factory_y (),
-                      ::CORBA::NO_MEMORY ());
-
-  ::CIAO::NDDS::DDS_TypeSupport_i::register_type (typesupport_name_y,
-                                                  factory_y, participant);
-
-  retcode_t = DDS_TYPE_T::type_support::register_type(
-    part->get_rti_entity (), typesupport_name_t);
-
-  retcode_y = DDS_TYPE_Y::type_support::register_type(
-      part->get_rti_entity (), typesupport_name_y);
-
-#endif
-  if ((retcode_t != ::DDS::RETCODE_OK)  && (retcode_y != ::DDS::RETCODE_OK))
-    {
-      DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-          "DDS_MultipleTemp_FooConnector_T::register_type - "
-          "Error registering type T <%C> and type Y <%C>\n",
-          ::CIAO::DDS4CCM::translate_retcode (retcode_t),::CIAO::DDS4CCM::translate_retcode (retcode_y)));
-      throw ::CCM_DDS::InternalError (retcode_t, 0);
-    }
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y>
-void
-FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::unregister_type (
-  ::DDS::DomainParticipant_ptr participant,
-  const char * typesupport_name)
-{
-  DDS4CCM_TRACE ("FooConnector_Connector_T::unregister_type");
-#if (CIAO_DDS4CCM_NDDS==1)
-  ::CIAO::NDDS::DDS_TypeFactory_i * factory =
-    ::CIAO::NDDS::DDS_TypeSupport_i::unregister_type (typesupport_name, participant);
-  delete factory;
-#else
-  ACE_UNUSED_ARG (participant);
-  ACE_UNUSED_ARG (typesupport_name);
-#endif
-
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y>
-char *
-FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::topic_name_t (void)
-{
-  return CORBA::string_dup (this->topic_name_t_.in ());
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y>
-void
-FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::topic_name_t (
-  const char * topic_name_t)
-{
-  this->topic_name_t_ = topic_name_t;
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y>
-::CCM_DDS::CCM_ContentFilterSetting *
-FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::get_push_consumer_t_filter_config(void)
-{
-  DDS4CCM_TRACE ("FooConnector_Connector_T::get_push_consumer_t_filter_config");
-  this->push_consumer_t_.set_component (this);
-  return this->push_consumer_t_.get_filter_config ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y>
-::CCM_DDS::QueryFilter *
-FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::push_consumer_t_filter (void)
-{
-  return this->push_consumer_t_.filter ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y>
-void
-FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::push_consumer_t_filter (
-  const ::CCM_DDS::QueryFilter &filter)
-{
-  DDS4CCM_TRACE ("FooConnector_Connector_T::push_consumer_t_filter");
-  this->push_consumer_t_.filter (filter);
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y>
-typename CCM_TYPE::push_consumer_t_traits::data_type::_ptr_type
-FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::get_push_consumer_t_data (void)
-{
-  DDS4CCM_TRACE ("FooConnector_Connector_T::get_push_consumer_t_data");
-  this->push_consumer_t_.set_component (this);
-  return this->push_consumer_t_.get_data ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y>
-typename CCM_TYPE::push_consumer_t_traits::data_control_type::_ptr_type
-FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::get_push_consumer_t_data_control (void)
-{
-  DDS4CCM_TRACE ("FooConnector_Connector_T::get_push_consumer_t_data_control");
-  this->push_consumer_t_.set_component (this);
-  return this->push_consumer_t_.get_data_control ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y>
-typename CCM_TYPE::push_consumer_t_traits::dds_entity_type::_ptr_type
-FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::get_push_consumer_t_dds_entity (void)
-{
-  DDS4CCM_TRACE ("FooConnector_Connector_T::get_push_consumer_t_dds_entity");
-  this->push_consumer_t_.set_component (this);
-  return this->push_consumer_t_.get_dds_entity ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y>
-typename CCM_TYPE::observable_t_traits::data_type::_ptr_type
-FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::get_observable_t_data (void)
-{
-//  return CCM_TYPE::observable_t_traits::data_type::_nil();
-  this->observable_t_.set_component (this);
-  return this->observable_t_.get_data ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y>
-typename CCM_TYPE::observable_t_traits::dds_entity_type::_ptr_type
-FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::get_observable_t_dds_entity (void)
-{
-  this->observable_t_.set_component (this);
-  return this->observable_t_.get_dds_entity ();
-}
-
-// Y
-template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y>
-char *
-FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::topic_name_y (void)
-{
-  return CORBA::string_dup (this->topic_name_y_.in ());
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y>
-void
-FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::topic_name_y (
-  const char * topic_name_y)
-{
-  this->topic_name_y_ = topic_name_y;
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y>
-::CCM_DDS::CCM_ContentFilterSetting*
-FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::get_push_consumer_y_filter_config(void)
-{
-  DDS4CCM_TRACE ("FooConnector_Connector_T::get_push_consumer_y_filter_config");
-  this->push_consumer_y_.set_component (this);
-  return this->push_consumer_y_.get_filter_config ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y>
-::CCM_DDS::QueryFilter *
- FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::push_consumer_y_filter (void)
-{
-  return this->push_consumer_y_.filter ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y>
-void
-FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::push_consumer_y_filter (
-  const ::CCM_DDS::QueryFilter &filter)
-{
-  this->push_consumer_y_.filter (filter);
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y>
-typename CCM_TYPE::push_consumer_y_traits::data_type::_ptr_type
-FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::get_push_consumer_y_data (void)
-{
-  this->push_consumer_y_.set_component (this);
-  return this->push_consumer_y_.get_data ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y>
-typename CCM_TYPE::push_consumer_y_traits::data_control_type::_ptr_type
-FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::get_push_consumer_y_data_control (void)
-{
-  this->push_consumer_y_.set_component (this);
-  return this->push_consumer_y_.get_data_control ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y>
-typename CCM_TYPE::push_consumer_y_traits::dds_entity_type::_ptr_type
-FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::get_push_consumer_y_dds_entity (void)
-{
-  DDS4CCM_TRACE ("FooConnector_Connector_T::get_push_consumer_y_dds_entity");
-  this->push_consumer_y_.set_component (this);
-  return this->push_consumer_y_.get_dds_entity ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y>
-typename CCM_TYPE::observable_y_traits::data_type::_ptr_type
-FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::get_observable_y_data (void)
-{
-  this->observable_y_.set_component (this);
-  return this->observable_y_.get_data ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y>
-typename CCM_TYPE::observable_y_traits::dds_entity_type::_ptr_type
-FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::get_observable_y_dds_entity (void)
-{
-  DDS4CCM_TRACE ("FooConnector_Connector_T::get_observable_y_dds_entity");
-  this->observable_y_.set_component (this);
-  return this->observable_y_.get_dds_entity ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y>
-void
-FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::configuration_complete (void)
-{
-  DDS4CCM_TRACE ("FooConnector_Connector_T::configuration_complete");
-  // Init default domain in Base_Connector
-  BaseConnector::configuration_complete ();
-
-  if (::CORBA::is_nil (this->domain_participant_.in ()))
-    {
-      ACE_ERROR ((LM_ERROR, "FooConnector_Connector_T::configuration complete init_domain - "
-                   "Error domain_participant\n"));
-       throw ::CORBA::INTERNAL ();
-    }
-
-  // Second argument can be removed if register_type is changed in (Topic)Base_Connector_T
-  this->register_type (this->domain_participant_.in (),
-                       "dummy_name");
-
-  const char* typesupport_name_t = DDS_TYPE_T::type_support::get_type_name ();
-  const char* typesupport_name_y = DDS_TYPE_Y::type_support::get_type_name ();
-
-  // Create the topics needed
-  this->init_topic (this->domain_participant_.in (),
-                       this->topic_t_.inout () ,
-                       this->topic_name_t_.in (),
-                       typesupport_name_t);
-
-  if (::CORBA::is_nil (this->topic_t_.in ()))
-     {
-       ACE_ERROR ((LM_ERROR, "FooConnector_Connector_T*** configuration complete init_topic - "
-                  "Error creating topic for t\n"));
-       throw ::CORBA::INTERNAL ();
-     }
-
-  this->init_topic (this->domain_participant_.in (),
-                         this->topic_y_.inout () ,
-                         this->topic_name_y_.in (),
-                         typesupport_name_y);
-
-  if (::CORBA::is_nil (this->topic_y_.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, "FooConnector_Connector_T*** configuration complete init_topic - "
-                   "Error creating topic for y\n"));
-        throw ::CORBA::INTERNAL ();
-      }
-
-  // Init the subscriber and publisher
-  this->init_subscriber (this->domain_participant_.in (),
-                         this->subscriber_t_.inout ());
-  this->init_publisher (this->domain_participant_.in (),
-                        this->publisher_t_.inout ());
-  this->init_subscriber (this->domain_participant_.in (),
-                         this->subscriber_y_.inout ());
-  this->init_publisher (this->domain_participant_.in (),
-                      this->publisher_y_.inout ());
-
-  this->observable_t_.configuration_complete (
-          this->topic_t_.in (),
-          this->publisher_t_.in (),
-          this->qos_profile_);
-  this->observable_y_.configuration_complete (
-           this->topic_y_.in (),
-           this->publisher_y_.in (),
-           this->qos_profile_);
-
-  this->dl_t_ = this->context_->get_connection_push_consumer_t_data_listener ();
-  this->dl_y_ = this->context_->get_connection_push_consumer_y_data_listener ();
-
-  this->push_consumer_t_psl =
-     this->context_->get_connection_push_consumer_t_status ();
-
-  this->push_consumer_y_psl =
-     this->context_->get_connection_push_consumer_y_status ();
-
-
-  this->push_consumer_t_.configuration_complete (
-                                      this->topic_t_.in (),
-                                      this->subscriber_t_.in (),
-                                      this->qos_profile_);
-  this->push_consumer_y_.configuration_complete (
-                                       this->topic_y_.in (),
-                                       this->subscriber_y_.in (),
-                                       this->qos_profile_);
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y>
-void
-FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::ccm_activate (void)
-{
-  DDS4CCM_TRACE ("FooConnector_Connector_T::ccm_activate");
-  BaseConnector::ccm_activate ();
-  ACE_Reactor* reactor = 0;
-
-  this->activate_subscriber (reactor,
-                             this->subscriber_t_.in (),
-                             this->subscriber_t_listener_.inout ());
-  this->activate_publisher (reactor,
-                            this->publisher_t_.in (),
-                            this->publisher_t_listener_.inout ());
-
-  this->activate_topic ( reactor,
-                         this->topic_t_.in (),
-                         this->topiclistener_t_.inout ());
-  this->activate_topic (reactor,
-                        this->topic_y_.in (),
-                        this->topiclistener_y_.inout ());
-
-  this->push_consumer_t_.activate (this->dl_t_.in (),
-                                    push_consumer_t_psl.in (),
-                                    this->reactor_);
-
-  this->push_consumer_y_.activate (this->dl_y_.in (),
-                                          push_consumer_y_psl.in (),
-                                          this->reactor_);
-  this->observable_t_.activate ();
-  this->observable_y_.activate ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y>
-void
-FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::ccm_passivate (void)
-{
-  DDS4CCM_TRACE ("FooConnector_Connector_T::ccm_passivate");
-
-  if (ACE_OS::strlen (this->topic_name_t_) != 0)
-    {
-      this->observable_t_.passivate ();
-      this->push_consumer_t_.passivate ();
-    }
-  if (ACE_OS::strlen (this->topic_name_y_) != 0)
-    {
-      this->observable_y_.passivate ();
-      this->push_consumer_y_.passivate ();
-    }
-
-  ::DDS::TopicListener_var topiclistener_t =
-     this->topiclistener_t_._retn ();
-   if (! CORBA::is_nil (topiclistener_t.in ()))
-     {
-       this->passivate_topic (this->topic_t_.in (),
-                              topiclistener_t.in ());
-     }
-
-   ::DDS::TopicListener_var topiclistener_y =
-       this->topiclistener_y_._retn ();
-   if (! CORBA::is_nil (topiclistener_y.in ()))
-     {
-       this->passivate_topic (this->topic_y_.in (),
-                              topiclistener_y.in ());
-     }
-
-  ::DDS::SubscriberListener_var subscriber_t_listener =
-    this->subscriber_t_listener_._retn ();
-  if (!::CORBA::is_nil (subscriber_t_listener.in ()))
-    {
-      this->passivate_subscriber (this->subscriber_t_.in (),
-                                    subscriber_t_listener.in ());
-    }
-
-  ::DDS::PublisherListener_var publisher_t_listener =
-    this->publisher_t_listener_._retn ();
-  if (!::CORBA::is_nil (publisher_t_listener.in ()))
-    {
-      this->passivate_publisher (this->publisher_t_.in (),
-                                   publisher_t_listener.in ());
-    }
-
-  ::DDS::SubscriberListener_var subscriber_y_listener =
-      this->subscriber_y_listener_._retn ();
-  if (!::CORBA::is_nil (subscriber_y_listener.in ()))
-    {
-      this->passivate_subscriber (this->subscriber_y_.in (),
-                                    subscriber_y_listener.in ());
-    }
-
-  ::DDS::PublisherListener_var publisher_y_listener =
-      this->publisher_y_listener_._retn ();
-  if (!::CORBA::is_nil (publisher_y_listener.in ()))
-    {
-      this->passivate_publisher (this->publisher_y_.in (),
-                                   publisher_y_listener.in ());
-    }
-
-  BaseConnector::ccm_passivate ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y>
-void
-FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::ccm_remove (void)
-{
-  DDS4CCM_TRACE ("FooConnector_Connector_T::ccm_remove");
-
-  if (ACE_OS::strlen (this->topic_name_t_) != 0)
-    {
-      this->observable_t_.remove (this->publisher_t_.in ());
-      this->push_consumer_t_.remove (this->subscriber_t_.in ());
-
-    }
-
-  if (ACE_OS::strlen (this->topic_name_y_) != 0)
-    {
-      this->observable_y_.remove (this->publisher_y_.in ());
-      this->push_consumer_y_.remove (this->subscriber_y_.in ());
-    }
-
-  ::DDS::Topic_var topic_t = this->topic_t_._retn ();
-  if (! CORBA::is_nil (topic_t.in ()))
-    {
-      this->remove_topic (this->domain_participant_.in (),
-                          topic_t.in ());
-    }
-
-  ::DDS::Topic_var topic_y = this->topic_y_._retn ();
-  if (! CORBA::is_nil (topic_y.in ()))
-    {
-      this->remove_topic (this->domain_participant_.in (),
-                          topic_y.in ());
-    }
-
-  const char* typesupport_name_t = DDS_TYPE_T::type_support::get_type_name ();
-  this->unregister_type (this->domain_participant_.in (),
-                        typesupport_name_t);
-  const char* typesupport_name_y = DDS_TYPE_Y::type_support::get_type_name ();
-  this->unregister_type (this->domain_participant_.in (),
-                        typesupport_name_y);
-
-  ::DDS::Publisher_var publisher_t = this->publisher_t_._retn ();
-  if (!::CORBA::is_nil (publisher_t.in ()))
-    {
-      this->remove_publisher (this->domain_participant_.in (),
-                              publisher_t.in ());
-    }
-
-  ::DDS::Subscriber_var subscriber_t = this->subscriber_t_._retn ();
-  if (!::CORBA::is_nil (subscriber_t.in ()))
-    {
-       this->remove_subscriber (this->domain_participant_.in (),
-                                   subscriber_t.in ());
-    }
-
-  ::DDS::Publisher_var publisher_y = this->publisher_y_._retn ();
-  if (!::CORBA::is_nil (publisher_y.in ()))
-    {
-      this->remove_publisher (this->domain_participant_.in (),
-                                 publisher_y.in ());
-    }
-  ::DDS::Subscriber_var subscriber_y = this->subscriber_y_._retn ();
-  if (!::CORBA::is_nil (subscriber_y.in ()))
-    {
-      this->remove_subscriber (this->domain_participant_.in (),
-                                  subscriber_y.in ());
-    }
-
-  BaseConnector::ccm_remove ();
- }
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.h b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.h
deleted file mode 100644
index 140f5aab79d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.h
+++ /dev/null
@@ -1,193 +0,0 @@
-#ifndef DDS_MLT_CONNECTOR_T_H_
-#define DDS_MLT_CONNECTOR_T_H_
-
-#include "connectors/dds4ccm/impl/DDS_Base_Connector_T.h"
-#include "connectors/dds4ccm/impl/DDS_Write_T.h"
-#include "connectors/dds4ccm/impl/DDS_Get_T.h"
-#include "connectors/dds4ccm/impl/DDS_Listen_T.h"
-#include "connectors/dds4ccm/impl/DDS_Update_T.h"
-#include "connectors/dds4ccm/impl/DataListenerControl_T.h"
-
-template <typename CCM_TYPE,
-          typename DDS_TYPE_T, bool FIXED_T,
-          typename SEQ_TYPE_T,
-          typename DDS_TYPE_Y, bool FIXED_Y,
-          typename SEQ_TYPE_Y>
-class FooConnector_Connector_T
-  : public virtual DDS_Base_Connector_T<CCM_TYPE>
-{
-
-  typedef DDS_Base_Connector_T<CCM_TYPE> BaseConnector;
-
-public:
-  FooConnector_Connector_T (void);
-
-  virtual
-  void
-  register_type (
-  ::DDS::DomainParticipant_ptr participant,
-  const char * typesupport_name);
-
-  virtual
-  void
-  unregister_type (
-  ::DDS::DomainParticipant_ptr participant,
-  const char * typesupport_name);
-
-  /**
-   * T type connector
-   **/
-  // DDS_Listen operations
-  virtual
-  CCM_DDS::CCM_ContentFilterSetting*
-  get_push_consumer_t_filter_config(void);
-
-  virtual
-  CCM_DDS::QueryFilter *
-  push_consumer_t_filter (void);
-
-  virtual
-  void
-  push_consumer_t_filter (const ::CCM_DDS::QueryFilter &);
-
-  virtual
-  typename CCM_TYPE::push_consumer_t_traits::data_type::_ptr_type
-  get_push_consumer_t_data (void);
-
-  virtual
-  typename CCM_TYPE::push_consumer_t_traits::data_control_type::_ptr_type
-  get_push_consumer_t_data_control (void);
-
-  virtual
-  typename CCM_TYPE::push_consumer_t_traits::dds_entity_type::_ptr_type
-  get_push_consumer_t_dds_entity (void);
-
-  // DDS_Update operations
-  virtual
-  typename CCM_TYPE::observable_t_traits::data_type::_ptr_type
-  get_observable_t_data (void);
-
-  virtual
-  typename CCM_TYPE::observable_t_traits::dds_entity_type::_ptr_type
-  get_observable_t_dds_entity (void);
-
-
-
-  /**
-    * Y type connector
-   **/
-  // DDS_Listen operations
-  virtual
-  CCM_DDS::CCM_ContentFilterSetting*
-  get_push_consumer_y_filter_config(void);
-
-  virtual
-  CCM_DDS::QueryFilter *
-  push_consumer_y_filter (void);
-
-  virtual
-  void
-  push_consumer_y_filter (const ::CCM_DDS::QueryFilter &);
-
-  virtual
-  typename CCM_TYPE::push_consumer_y_traits::data_type::_ptr_type
-  get_push_consumer_y_data (void);
-
-  virtual
-  typename CCM_TYPE::push_consumer_y_traits::data_control_type::_ptr_type
-  get_push_consumer_y_data_control (void);
-
-  virtual
-  typename CCM_TYPE::push_consumer_y_traits::dds_entity_type::_ptr_type
-  get_push_consumer_y_dds_entity (void);
-
-  // DDS_Update operations
-  virtual
-  typename CCM_TYPE::observable_y_traits::data_type::_ptr_type
-  get_observable_y_data (void);
-
-  virtual
-  typename CCM_TYPE::observable_y_traits::dds_entity_type::_ptr_type
-  get_observable_y_dds_entity (void);
-
-
-
-  /**
-    * Topic names.
-    **/
-  virtual char * topic_name_t (void);
-  virtual void topic_name_t (const char * topic_name_t);
-  virtual char * topic_name_y (void);
-  virtual void topic_name_y (const char * topic_name_y);
-
-  /**
-    * Deployment methods.
-    **/
-  virtual void configuration_complete (void);
-  virtual void ccm_remove (void);
-  virtual void ccm_activate (void);
-  virtual void ccm_passivate (void);
-
-private:
-  DDS_Listen_T<
-      typename CCM_TYPE::push_consumer_t_traits,
-      typename DDS_TYPE_T::typed_reader_type,
-      typename DDS_TYPE_T::value_type,
-      SEQ_TYPE_T>
-    push_consumer_t_;
-  DDS_Listen_T<
-      typename CCM_TYPE::push_consumer_y_traits,
-      typename DDS_TYPE_Y::typed_reader_type,
-      typename DDS_TYPE_Y::value_type,
-      SEQ_TYPE_Y>
-    push_consumer_y_;
-
-  DDS_Update_T<
-      typename CCM_TYPE::observable_t_traits,
-      typename DDS_TYPE_T::typed_writer_type,
-      typename DDS_TYPE_T::value_type,
-      SEQ_TYPE_T>
-    observable_t_;
-
-  DDS_Update_T<
-      typename CCM_TYPE::observable_y_traits,
-      typename DDS_TYPE_Y::typed_writer_type,
-      typename DDS_TYPE_Y::value_type,
-      SEQ_TYPE_Y>
-    observable_y_;
-
-  //connection to the receiver implementation
-  typename CCM_TYPE::push_consumer_t_traits::data_listener_type::_var_type dl_t_;
-  typename CCM_TYPE::push_consumer_y_traits::data_listener_type::_var_type dl_y_;
-
-  ::CCM_DDS::PortStatusListener_var push_consumer_t_psl;
-  ::CCM_DDS::PortStatusListener_var push_consumer_y_psl;
-
-  ::DDS::Publisher_var publisher_t_;
-  ::DDS::PublisherListener_var publisher_t_listener_;
-  ::DDS::Subscriber_var subscriber_t_;
-  ::DDS::SubscriberListener_var subscriber_t_listener_;
-
-  ::DDS::Publisher_var publisher_y_;
-  ::DDS::PublisherListener_var publisher_y_listener_;
-  ::DDS::Subscriber_var subscriber_y_;
-  ::DDS::SubscriberListener_var subscriber_y_listener_;
-
-  CORBA::String_var topic_name_t_;
-  CORBA::String_var topic_name_y_;
-
-  ::DDS::Topic_var topic_t_;
-  ::DDS::Topic_var topic_y_;
-
-  ::DDS::TopicListener_var topiclistener_t_;
-  ::DDS::TopicListener_var topiclistener_y_;
-
-  ACE_Reactor * reactor_;
-
-  void create_topics (const char * typesupport_name);
-
-};
-
-#include "MultipleTemp_Connector_T.cpp"
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/ccm_dds_mlt.idl b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/ccm_dds_mlt.idl
deleted file mode 100644
index 9a3df82c7f0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/ccm_dds_mlt.idl
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef CCM_DDS_MLT_IDL
-#define CCM_DDS_MLT_IDL
-
-#include <Components.idl>
-
-#pragma dds4ccm impl "MultipleTemp_Connector_T.h"
-
-#include <ccm_dds.idl>
-
-module CCM_DDS
-{
-  module Duplex_Typed <typename T, sequence<T> TSeq, typename Y,  sequence <Y> YSeq> {
-    alias Typed <T, TSeq> T_Typed;
-    alias Typed <Y, YSeq> Y_Typed;
-
-    connector FooConnector : CCM_DDS::DDS_Base
-    {
-      mirrorport T_Typed::DDS_Listen push_consumer_t;
-      mirrorport Y_Typed::DDS_Listen push_consumer_y;
-      mirrorport T_Typed::DDS_Update observable_t;
-      mirrorport Y_Typed::DDS_Update observable_y;
-
-      attribute string topic_name_t;
-      attribute string topic_name_y;
-
-    };
-  };
-};
-
-#endif // CCM_DDS_MLT_IDL
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.idl b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.idl
deleted file mode 100644
index 6b259d3b560..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.idl
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * @file
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/MultipleTemp_Connector.idl"
-
-module MultipleTemp
-{
-  component Receiver
-  {
-    port MultipleTempConnector::T_Typed::DDS_Listen info_one_out;
-    port MultipleTempConnector::Y_Typed::DDS_Listen info_two_out;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.mpc
deleted file mode 100644
index e7d436114cc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.mpc
+++ /dev/null
@@ -1,141 +0,0 @@
-project(DDS_MultipleTemp_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  requires += dummy_label
-  custom_only = 1
-  after += DDS_MT_TEMP_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h -I..
-
-  IDL_Files {
-    MultipleTemp_Receiver.idl
-  }
-}
-
-project(DDS_MultipleTemp_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  requires += dummy_label
-  after += DDS_MultipleTemp_Receiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    MultipleTemp_ReceiverE.idl
-  }
-}
-
-project(DDS_MT_TEMP_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  requires += dummy_label
-  after += DDS_MultipleTemp_Receiver_lem_gen DDS_MultipleTemp_Receiver_stub  DDS_MultipleTemp_Connector_stub DDS_MultipleTemp_Base_stub
-  libs  +=  Receiver_stub DDS_MultipleTemp_Connector_stub DDS_MultipleTemp_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    MultipleTemp_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    MultipleTemp_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    MultipleTemp_ReceiverEC.inl
-  }
-}
-
-project(DDS_MultipleTemp_Receiver_stub) : ccm_stub, dds4ccm_base {
-  requires += dummy_label
-  after += DDS_MultipleTemp_Receiver_idl_gen  DDS_MultipleTemp_Connector_stub DDS_MultipleTemp_Base_stub DDS_MT_TEMP_Connector_lem_gen
-  libs  += DDS_MultipleTemp_Connector_stub DDS_MultipleTemp_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    MultipleTemp_ReceiverC.cpp
-  }
-
-  Header_Files {
-    MultipleTemp_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    MultipleTemp_ReceiverC.inl
-  }
-}
-
-project(DDS_MultipleTemp_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  requires += dummy_label
-  after   += DDS_MT_TEMP_Receiver_lem_stub DDS_MultipleTemp_Receiver_stub DDS_MultipleTemp_Base_stub DDS_MultipleTemp_Connector_stub DDS_MT_TEMP_Connector_lem_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_MultipleTemp_Base_stub DDS_MultipleTemp_Connector_stub DDS_MT_TEMP_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    MultipleTemp_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    MultipleTemp_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_MultipleTemp_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  requires += dummy_label
-  after      +=   DDS_MT_TEMP_Receiver_lem_stub DDS_MultipleTemp_Base_stub DDS_MultipleTemp_Connector_stub DDS_MultipleTemp_Connector_svnt DDS_MultipleTemp_Receiver_exec DDS_MT_TEMP_Connector_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_MultipleTemp_Base_stub DDS_MultipleTemp_Connector_stub DDS_MultipleTemp_Connector_svnt Receiver_exec DDS_MT_TEMP_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    MultipleTemp_ReceiverS.cpp
-    MultipleTemp_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    MultipleTemp_ReceiverS.h
-    MultipleTemp_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.cpp
deleted file mode 100644
index 0f6ccb4596c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.cpp
+++ /dev/null
@@ -1,250 +0,0 @@
-// -*- C++ -*-
-// Test for MULTIPLE_TEMPLATES
-
-#include "MultipleTemp_Receiver_exec.h"
-#include "ace/Log_Msg.h"
-
-#include "ace/OS_NS_time.h"
-#include "dds4ccm/impl/Utils.h"
-#include "dds4ccm/impl/TimeUtilities.h"
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-namespace CIAO_MultipleTemp_Receiver_Impl
-{
-  CORBA::UShort received_one= 0;
-  CORBA::UShort received_two= 0;
-
-  //============================================================
-  // ListenOne_Listener_exec_i Listener to topic One
-  //============================================================
-  ListenOne_Listener_exec_i::ListenOne_Listener_exec_i (
-      ::MultipleTemp::CCM_Receiver_Context_ptr ctx)
-  : ciao_context_ (
-      ::MultipleTemp::CCM_Receiver_Context::_duplicate (ctx))
-
-  {
-  }
-
-  ListenOne_Listener_exec_i::~ListenOne_Listener_exec_i (void)
-  {
-  }
-
-  void
-  ListenOne_Listener_exec_i::on_one_data (
-                                  const TestTopicOne & an_instance,
-                                  const ::CCM_DDS::ReadInfo & info)
-  {
-    ACE_DEBUG ((LM_DEBUG, "ListenOne_Listener_exec_i::on_one_data: "
-                            "key <%C> - x <%d>\n",
-                            an_instance.keyOne.in (),
-                            an_instance.x));
-    if ( info.instance_handle == ::DDS::HANDLE_NIL)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: ListenOne_Listener_exec_i::on_one_data: "
-                            "instance handle seems to be invalid "
-                            "key <%C> - x <%d>\n",
-                            an_instance.keyOne.in (),
-                            an_instance.x));
-      }
-    if (info.source_timestamp.sec == 0 &&
-        info.source_timestamp.nanosec == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: ListenOne_Listener_exec_i::on_one_data: "
-                            "source timestamp seems to be invalid (nil) "
-                            "key <%C> - x <%d>\n",
-                            an_instance.keyOne.in (),
-                            an_instance.x));
-      }
-    ++received_one;
-  }
-
-  void
-  ListenOne_Listener_exec_i::on_many_data (
-                                  const TestTopicOneSeq & ,
-                                  const ::CCM_DDS::ReadInfoSeq & )
-  {
-  }
-  //============================================================
-  // ListenTwo_Listener_exec_i Listener to topic Two
-  //============================================================
-  ListenTwo_Listener_exec_i::ListenTwo_Listener_exec_i (
-      ::MultipleTemp::CCM_Receiver_Context_ptr ctx)
-  : ciao_context_ (
-      ::MultipleTemp::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  ListenTwo_Listener_exec_i::~ListenTwo_Listener_exec_i (void)
-  {
-  }
-
-  void
-  ListenTwo_Listener_exec_i::on_one_data (
-                                  const TestTopicTwo & an_instance,
-                                  const ::CCM_DDS::ReadInfo & info)
-    {
-      ACE_DEBUG ((LM_DEBUG, "ListenTwo_Listener_exec_i::on_one_data: "
-                              "key <%C> - y <%d>\n",
-                              an_instance.keyTwo.in (),
-                              an_instance.y));
-      if (::DDS::HANDLE_NIL == info.instance_handle)
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR: ListenTwo_Listener_exec_i::on_one_data: "
-                              "instance handle seems to be invalid "
-                              "key <%C> - y <%d>\n",
-                              an_instance.keyTwo.in (),
-                              an_instance.y));
-        }
-      if (info.source_timestamp.sec == 0 &&
-          info.source_timestamp.nanosec == 0)
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR: ListenTwo_Listener_exec_i::on_one_data: "
-                              "source timestamp seems to be invalid (nil) "
-                              "key <%C> - iteration <%d>\n",
-                              an_instance.keyTwo.in (),
-                              an_instance.y));
-        }
-    ++received_two;
-  }
-
-  void
-  ListenTwo_Listener_exec_i::on_many_data (
-                                  const TestTopicTwoSeq & ,
-                                  const ::CCM_DDS::ReadInfoSeq & )
-  {
-  }
-
-  //============================================================
-  // Receiver_exec_i
-  //============================================================
-  Receiver_exec_i::Receiver_exec_i (void)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-   // Port operations.
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_one_out_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-   Receiver_exec_i::get_info_two_out_status (void)
-   {
-     return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-   }
-
-  ::MultipleTemp::MultipleTempConnector::T_Typed::CCM_Listener_ptr
-  Receiver_exec_i::get_info_one_out_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_one_data_listener_.in ()))
-       {
-         ListenOne_Listener_exec_i *tmp = 0;
-         ACE_NEW_RETURN (
-           tmp,
-           ListenOne_Listener_exec_i (
-             this->ciao_context_.in ()),
-             ::MultipleTemp::MultipleTempConnector::T_Typed::CCM_Listener::_nil ());
-           this->ciao_info_out_one_data_listener_ = tmp;
-       }
-
-     return
-         ::MultipleTemp::MultipleTempConnector::T_Typed::CCM_Listener::_duplicate (
-         this->ciao_info_out_one_data_listener_.in ());
-   }
-
-  ::MultipleTemp::MultipleTempConnector::Y_Typed::CCM_Listener_ptr
-   Receiver_exec_i::get_info_two_out_data_listener (void)
-   {
-    if ( ::CORBA::is_nil (this->ciao_info_out_two_data_listener_.in ()))
-        {
-          ListenTwo_Listener_exec_i *tmp = 0;
-          ACE_NEW_RETURN (
-            tmp,
-            ListenTwo_Listener_exec_i (
-              this->ciao_context_.in ()),
-              ::MultipleTemp::MultipleTempConnector::Y_Typed::CCM_Listener::_nil ());
-            this->ciao_info_out_two_data_listener_ = tmp;
-        }
-
-      return
-          ::MultipleTemp::MultipleTempConnector::Y_Typed::CCM_Listener::_duplicate (
-          this->ciao_info_out_two_data_listener_.in ());
-   }
-
-  // Operations from Components::SessionComponent.
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::MultipleTemp::CCM_Receiver_Context::_narrow (ctx);
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    ::CCM_DDS::DataListenerControl_var dlc_one =
-        this->ciao_context_->get_connection_info_one_out_data_control ();
-    ::CCM_DDS::DataListenerControl_var dlc_two =
-        this->ciao_context_->get_connection_info_two_out_data_control ();
-    dlc_one->mode (::CCM_DDS::ONE_BY_ONE);
-    dlc_two->mode (::CCM_DDS::ONE_BY_ONE);
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    if (received_one != 8)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver: "
-                               "Received wrong number of topic one: "
-                               "received <%C> - expected <8>\n",
-                               received_one));
-       }
-    if (received_two != 8)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver: "
-                               "Received wrong number of topic two: "
-                               "received <%C> - expected <8>\n",
-                               received_two));
-       }
-    if ((received_two == 8) && (received_one == 8))
-      {
-        ACE_DEBUG ((LM_DEBUG, "OK: Receiver: "
-                               "Received received expected topics.\n"));
-      }
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_MultipleTemp_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.h
deleted file mode 100644
index f49ef8e3df1..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.h
+++ /dev/null
@@ -1,111 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_RECEIVER_EXEC_H_
-#define CIAO_RECEIVER_EXEC_H_
-
-#include "MultipleTemp_ReceiverEC.h"
-
-#include /**/ "Receiver_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-
-namespace CIAO_MultipleTemp_Receiver_Impl
-{
-  class Receiver_exec_i;
-
-  //============================================================
-  // ListenOneByOneTest_Listener_exec_i one
-  //============================================================
-  class RECEIVER_EXEC_Export ListenOne_Listener_exec_i
-  : public virtual ::MultipleTemp::MultipleTempConnector::T_Typed::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ListenOne_Listener_exec_i (
-        ::MultipleTemp::CCM_Receiver_Context_ptr ctx);
-
-    virtual ~ListenOne_Listener_exec_i (void);
-
-    virtual void
-    on_one_data (
-      const TestTopicOne& an_instance,
-      const ::CCM_DDS::ReadInfo & info);
-    virtual void
-    on_many_data (
-      const TestTopicOneSeq & an_instance,
-      const ::CCM_DDS::ReadInfoSeq & info);
-  private:
-    ::MultipleTemp::CCM_Receiver_Context_var ciao_context_;
-  };
-  //============================================================
-  // ListenOneByOneTest_Listener_exec_i two
-  //============================================================
-  class RECEIVER_EXEC_Export ListenTwo_Listener_exec_i
-  : public virtual ::MultipleTemp::MultipleTempConnector::Y_Typed::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ListenTwo_Listener_exec_i (
-        ::MultipleTemp::CCM_Receiver_Context_ptr ctx);
-
-    virtual ~ListenTwo_Listener_exec_i (void);
-
-    virtual void
-    on_one_data (
-      const TestTopicTwo& an_instance,
-      const ::CCM_DDS::ReadInfo & info);
-    virtual void
-      on_many_data (
-        const TestTopicTwoSeq & an_instance,
-        const ::CCM_DDS::ReadInfoSeq & info);
-  private:
-    ::MultipleTemp::CCM_Receiver_Context_var ciao_context_;
-  };
-  //============================================================
-  // Receiver_exec_i
-  //============================================================
-  class RECEIVER_EXEC_Export Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    // Port operations.
-    virtual ::MultipleTemp::MultipleTempConnector::T_Typed::CCM_Listener_ptr
-    get_info_one_out_data_listener (void);
-    virtual ::MultipleTemp::MultipleTempConnector::Y_Typed::CCM_Listener_ptr
-    get_info_two_out_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_one_out_status (void);
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_two_out_status (void);
-
-    // Operations from Components::SessionComponent.
-    virtual void
-    set_session_context (
-      ::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete (void);
-
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-
-  private:
-    ::MultipleTemp::CCM_Receiver_Context_var ciao_context_;
-    ::MultipleTemp::MultipleTempConnector::T_Typed::CCM_Listener_var ciao_info_out_one_data_listener_;
-    ::MultipleTemp::MultipleTempConnector::Y_Typed::CCM_Listener_var ciao_info_out_two_data_listener_;
-   };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_MultipleTemp_Receiver_Impl (void);
-}
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.idl b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.idl
deleted file mode 100644
index 8d9bc7ac108..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.idl
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * @file
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef DDS_MULTIPLE_TEMP_SENDER_IDL
-#define DDS_MULTIPLE_TEMP_SENDER_IDL
-
-#include "Connector/MultipleTemp_Connector.idl"
-
-module MultipleTemp
-{
-  component Sender
-  {
-    port MultipleTempConnector::T_Typed::DDS_Update test_topic_one_update;
-    port MultipleTempConnector::Y_Typed::DDS_Update test_topic_two_update;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.mpc b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.mpc
deleted file mode 100644
index 2fad9a0818e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-project(DDS_MultipleTemp_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  requires += dummy_label
-  after += DDS_MT_TEMP_Connector_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I ..
-
-  IDL_Files {
-    MultipleTemp_Sender.idl
-  }
-}
-
-project(DDS_MultipleTemp_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  requires += dummy_label
-  after += DDS_MultipleTemp_Sender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    MultipleTemp_SenderE.idl
-  }
-}
-
-project(DDS_MultipleTemp_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  requires += dummy_label
-  after += DDS_MultipleTemp_Sender_lem_gen DDS_MultipleTemp_Sender_stub DDS_MultipleTemp_Base_stub
-  libs  += DDS_MultipleTemp_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    MultipleTemp_SenderEC.cpp
-  }
-
-  Header_Files {
-    MultipleTemp_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    MultipleTemp_SenderEC.inl
-  }
-}
-
-project(DDS_MultipleTemp_Sender_stub) : ccm_stub, dds4ccm_base {
-  requires += dummy_label
-  after += DDS_MultipleTemp_Sender_idl_gen DDS_MultipleTemp_Base_stub DDS_MultipleTemp_Connector_stub
-  libs  += DDS_MultipleTemp_Base_stub DDS_MultipleTemp_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    MultipleTemp_SenderC.cpp
-  }
-
-  Header_Files {
-    MultipleTemp_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    MultipleTemp_SenderC.inl
-  }
-}
-
-project(DDS_MultipleTemp_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  requires += dummy_label
-  after   += DDS_MultipleTemp_Sender_lem_stub DDS_MultipleTemp_Sender_stub DDS_MT_TEMP_Connector_lem_stub DDS_MultipleTemp_Connector_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub DDS_MultipleTemp_Base_stub DDS_MT_TEMP_Connector_lem_stub  DDS_MultipleTemp_Connector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    MultipleTemp_Sender_exec.cpp
-  }
-
-  Header_Files {
-    MultipleTemp_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_MultipleTemp_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  requires += dummy_label
-  after      += DDS_MultipleTemp_Base_stub  DDS_MultipleTemp_Sender_lem_stub DDS_MultipleTemp_Connector_stub DDS_MultipleTemp_Connector_svnt DDS_MT_TEMP_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                DDS_MultipleTemp_Base_stub DDS_MultipleTemp_Connector_stub  DDS_MultipleTemp_Connector_svnt DDS_MT_TEMP_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    MultipleTemp_SenderS.cpp
-    MultipleTemp_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    MultipleTemp_SenderS.h
-    MultipleTemp_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.cpp
deleted file mode 100644
index 5df1ea1c79c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.cpp
+++ /dev/null
@@ -1,373 +0,0 @@
-// -*- C++ -*-
-//Test Multiple templates connector
-#include "MultipleTemp_Sender_exec.h"
-#include "ace/Guard_T.h"
-#include "ace/Log_Msg.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_MultipleTemp_Sender_Impl
-{
-
-  //============================================================
-  // Pulse generator
-  //============================================================
-  pulse_Generator::pulse_Generator (Sender_exec_i &callback)
-    : pulse_callback_ (callback)
-  {
-  }
-
-  int
-  pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    // Notify the subscribers
-    this->pulse_callback_.tick ();
-    return 0;
-  }
-
-  //============================================================
-  // Component Executor Implementation Class: Sender_exec_i
-  //============================================================
-  Sender_exec_i::Sender_exec_i (void)
-  : test_nr_(UPDATE_CREATE),
-    test_ok_(true)
-  {
-    this->ticker_ = new pulse_Generator (*this);
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-  }
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-  // Supported operations and attributes.
-  CORBA::Boolean
-  Sender_exec_i::create_one_topic()
-  {
-    CORBA::Boolean result = true;
-    TestTopicOne i = this->topic_one_seq_one_[0];
-    TestTopicTwo u = this->topic_two_seq_one_[0];
-  try
-    {
-      if ( ::CORBA::is_nil (this->updater_one_) ||
-           ::CORBA::is_nil (this->updater_two_))
-        {
-           ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: updater_ is nil")));
-           result= false;
-         }
-      else
-        {
-          this->updater_one_->create_one(i);
-          this->updater_two_->create_one(u);
-          ACE_DEBUG ((LM_DEBUG,
-                       ACE_TEXT ("MultipleTemp: create_one for both topics ")
-                       ACE_TEXT ("<%C> and <%C>\n"),
-                       i.keyOne.in(), u.keyTwo.in()));
-        }
-    }
-    catch(const CCM_DDS::AlreadyCreated &)
-    {
-      ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Unexpected exception: ")
-                            ACE_TEXT ("AlreadyCreated with test updater")
-                            ACE_TEXT (" create_one <%C> or <%C>.\n"),
-                            i.keyOne.in(), u.keyTwo.in()));
-      result= false;
-    }
-    catch (const CCM_DDS::InternalError& )
-    {
-      ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while create_one.\n")));
-      result = false;;
-    }
-    return result;
-  }
-
-
-  CORBA::Boolean
-  Sender_exec_i::update_one_topic()
-  {
-    //update already created instance with handle nil
-    CORBA::Boolean result = true;
-    TestTopicOne i = this->topic_one_seq_one_[0];
-    TestTopicTwo u = this->topic_two_seq_one_[0];
-
-    try
-    {
-      this->updater_one_->update_one(i, DDS::HANDLE_NIL);
-      this->updater_two_->update_one(u, DDS::HANDLE_NIL);
-
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("MultipleTemp: update_one with already")
-                  ACE_TEXT (" existing instance with DDS::HANDLE_NIL,")
-                  ACE_TEXT (" key <%C> and key <%C>\n"),
-                  i.keyOne.in(), u.keyTwo.in()));
-    }
-    catch(const CCM_DDS::NonExistent &)
-    {
-      ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Unexpected exception: ")
-                            ACE_TEXT ("NonExistent with test updater ")
-                            ACE_TEXT ("update_one.\n")));
-      result = false;
-    }
-    catch (const CCM_DDS::InternalError& )
-    {
-      ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while update_one.\n")));
-      result = false;
-    }
-    return result;
-  }
-
-  CORBA::Boolean
-  Sender_exec_i::create_many_topics()
-  {
-    //create many with no exception
-    CORBA::Boolean result = false;
-    try
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("create_many both topics : <%u> samples\n"),
-                  this->topic_one_seq_many_.length ()));
-      this->updater_one_->create_many (this->topic_one_seq_many_);
-      this->updater_two_->create_many (this->topic_two_seq_many_);
-
-      result = true;
-    }
-    catch(const CCM_DDS::NonExistent& )
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("ERROR Unexpected exception:")
-                  ACE_TEXT (" NonExistent with test updater create_many\n")));
-    }
-    catch (const CCM_DDS::InternalError& ex)
-    {
-       ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error in updater:")
-                   ACE_TEXT (" create_many: index <%d> - retval <%d>\n"),
-                   ex.index, ex.error_code));
-
-    }
-    return result;
-  }
-
-  CORBA::Boolean
-  Sender_exec_i::update_many_topics()
-  {
-    CORBA::Boolean result = false;
-    try
-    {
-      this->updater_one_->update_many (this->topic_one_seq_many_);
-      this->updater_two_->update_many (this->topic_two_seq_many_);
-      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("update_many : written <%u> samples\n"),
-                 this->topic_one_seq_many_.length ()));
-      result = true;
-    }
-    catch(const CCM_DDS::NonExistent& )
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("Unexpected exception: NonExistent ")
-                  ACE_TEXT ("with test updater update_many.\n")));
-      result = false;
-    }
-    catch (const CCM_DDS::InternalError& ex)
-    {
-      ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                   ACE_TEXT ("with update_many: index <%d> - retval <%d>\n"),
-                   ex.index, ex.error_code));
-      result = false;
-    }
-    return result;
-  }
-
-  void
-  Sender_exec_i::add_instances_of_topic ()
-  {
-    //make 4 sequences of instances as testdata
-    CORBA::UShort total = 3;
-    this->topic_one_seq_one_.length (total);
-    //sequence for tests with .._one
-    for (int i = 1; i < (total + 1); i++)
-      {
-        char key[9];
-        TestTopicOne new_key;
-        ACE_OS::sprintf (key, "keyONE_%d", i);
-        new_key.keyOne = CORBA::string_dup(key);
-        new_key.x = i;
-        this->topic_one_seq_one_[i-1] = new_key;
-      }
-    //sequence for tests with .._many
-    this->topic_one_seq_many_.length (total);
-    for (int i = 1; i < (total + 1); i++)
-      {
-        char key[10];
-        TestTopicOne new_key;
-        ACE_OS::sprintf (key, "manyOne_%d", i);
-        new_key.keyOne = CORBA::string_dup(key);
-        new_key.x = i;
-        this->topic_one_seq_many_[i-1] = new_key;
-      }
-    this->topic_two_seq_one_.length (total);
-    //sequence for tests with .._one
-    for (int i = 1; i < (total + 1); i++)
-      {
-        char key[9];
-        TestTopicTwo new_key;
-        ACE_OS::sprintf (key, "keyTWO_%d", i);
-        new_key.keyTwo = CORBA::string_dup(key);
-        new_key.y = i;
-        new_key.z = i;
-        this->topic_two_seq_one_[i-1] = new_key;
-      }
-     //sequence for tests with .._many
-    this->topic_two_seq_many_.length (total);
-    for (int i = 1; i < (total + 1); i++)
-      {
-        char key[10];
-        TestTopicTwo new_key;
-        ACE_OS::sprintf (key, "manyTwo_%d", i);
-        new_key.keyTwo = CORBA::string_dup(key);
-        new_key.y = i;
-        new_key.z = i;
-        this->topic_two_seq_many_[i-1] = new_key;
-      }
-  }
-
-  void
-  Sender_exec_i::tick ()
-  {
-    if(this->test_ok_.value())
-    {
-      switch (this->test_nr_)
-      {
-        case UPDATE_CREATE:
-          this->test_ok_ = this->create_one_topic();
-          if(this->test_ok_.value())
-            {
-              this->test_nr_ = UPDATE_ONE;
-            }
-          else
-            {
-              this->test_nr_ = END_TEST;
-            }
-          break;
-        case UPDATE_ONE:
-          this->test_ok_ = this->update_one_topic();
-          this->test_nr_ = CREATE_MANY;
-          break;
-        case CREATE_MANY:
-          this->test_ok_ = this->create_many_topics();
-          if(this->test_ok_.value())
-            {
-              this->test_nr_ = UPDATE_MANY;
-            }
-          else
-            {
-              this->test_nr_ = END_TEST;
-            }
-          this->test_nr_ = UPDATE_MANY;
-          break;
-        case UPDATE_MANY:
-          this->test_ok_ = this->update_many_topics();
-          this->test_nr_ = END_TEST;
-          break;
-        default:
-          break;
-      }
-    }
-  }
-  void
-  Sender_exec_i::start (void)
-  {
-    long sec = 3L;
-    long const usec = 0L;
-    if (this->reactor ()->schedule_timer (
-                this->ticker_,
-                0,
-                ACE_Time_Value (sec, usec),
-                ACE_Time_Value (sec, usec)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                               ACE_TEXT ("Error scheduling timer")));
-      }
-  }
-
-  void
-  Sender_exec_i::stop (void)
-  {
-    this->reactor ()->cancel_timer (this->ticker_);
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n")));
-    delete this->ticker_;
-  }
-
-  void
-  Sender_exec_i::set_session_context (
-      ::Components::SessionContext_ptr ctx)
-  {
-    this->context_ = ::MultipleTemp::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-   }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    this->updater_one_  =
-        this->context_->get_connection_test_topic_one_update_data ();
-    this->updater_two_  =
-        this->context_->get_connection_test_topic_two_update_data ();
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-    this->add_instances_of_topic ();
-    this->start ();
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    this->stop ();
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    if(!this->test_ok_.value())
-      {
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("ERROR: Error in MultipleTemp in Sender")));
-      }
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_MultipleTemp_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.h
deleted file mode 100644
index 7158bbe145e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.h
+++ /dev/null
@@ -1,83 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_SENDER_EXEC_H_
-#define CIAO_SENDER_EXEC_H_
-
-#include "MultipleTemp_SenderEC.h"
-
-#include /**/ "Sender_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-namespace CIAO_MultipleTemp_Sender_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
-
-  class Sender_exec_i;
-
-  enum MULTIPLE_TEMP_TEST {
-    UPDATE_CREATE,
-    UPDATE_ONE,
-    CREATE_MANY,
-    UPDATE_MANY,
-    END_TEST
-  };
-
-  class pulse_Generator :
-    public ACE_Event_Handler
-  {
-  public:
-    pulse_Generator (Sender_exec_i &callback);
-    /// Handle the timeout.
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    /// Maintains a handle that actually process the event
-    Sender_exec_i &pulse_callback_;
-  };
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    void tick (void);
-
-  private:
-    ACE_Reactor* reactor (void);
-    void start (void);
-    void stop (void);
-    void add_instances_of_topic (void);
-    CORBA::Boolean create_one_topic(void);
-    CORBA::Boolean update_one_topic(void);
-    CORBA::Boolean create_many_topics(void);
-    CORBA::Boolean update_many_topics(void);
-
-    pulse_Generator * ticker_;
-    ::MultipleTemp::CCM_Sender_Context_var context_;
-    ::MultipleTemp::MultipleTempConnector::T_Typed::Updater_var updater_one_;
-    ::MultipleTemp::MultipleTempConnector::Y_Typed::Updater_var updater_two_;
-
-    MULTIPLE_TEMP_TEST test_nr_;
-    Atomic_Boolean test_ok_;
-    TestTopicOneSeq topic_one_seq_one_;
-    TestTopicOneSeq topic_one_seq_many_;
-    TestTopicTwoSeq topic_two_seq_one_;
-    TestTopicTwoSeq topic_two_seq_many_;
-
- };
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_MultipleTemp_Sender_Impl (void);
-}
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/MultipleTemp/descriptors/Plan.cdp
deleted file mode 100644
index 49bff6b4ba0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/descriptors/Plan.cdp
+++ /dev/null
@@ -1,489 +0,0 @@
-<!--  -->
-<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>MultipleTemp_Depl_1</label>
-  <UUID>MultipleTemp_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_MultipleTemp_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_MultipleTemp_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="MultipleTemp_ConnectorComponentImplementation">
-    <name>MultipleTemp_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="MultipleTemp_Connector_ExecArtifact" />
-    <artifact xmi:idref="MultipleTemp_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_MultipleTemp_MultipleTempConnector_FooConnector_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_MultipleTemp_MultipleTempConnector_FooConnector_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DDS_MultipleTemp_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DDS_MultipleTemp_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_MultipleTemp_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_MultipleTemp_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-  </instance>
-
-  <instance xmi:id="MultipleTemp_ConnectorComponentInstance">
-    <name>MultipleTemp_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="MultipleTemp_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name_t</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestOne</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name_y</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestTwo</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="MultipleTemp_ConnectorComponentInstance2">
-    <name>MultipleTemp_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="MultipleTemp_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name_t</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestOne</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name_y</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestTwo</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-  </instance>
-
-  <connection>
-    <name>_listenercontrol_one</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_one_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_t_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="MultipleTemp_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_statelistener_one</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_one_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_t_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="MultipleTemp_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <!--connection>
-    <name>_portstatuslistener_one</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_one_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_t_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="MultipleTemp_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection-->
-  <connection>
-    <name>info_one_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_one_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_t_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="MultipleTemp_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>updater_one_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>test_topic_one_update_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>observable_t_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="MultipleTemp_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>_listenercontrol_two</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_two_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_y_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="MultipleTemp_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_statelistener_two</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_two_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_y_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="MultipleTemp_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <!--connection>
-    <name>_portstatuslistener_two</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_two_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_y_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="MultipleTemp_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection-->
-
-  <connection>
-    <name>info_two_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_two_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_y_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="MultipleTemp_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>updater_two_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>test_topic_two_update_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>observable_y_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="MultipleTemp_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="MultipleTemp_Connector_ExecArtifact">
-    <name>DDS_MultipleTemp_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_MultipleTemp_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="MultipleTemp_Connector_SvntArtifact">
-    <name>DDS_MultipleTemp_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_MultipleTemp_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="MultipleTemp_Connector_StubArtifact">
-    <name>MultipleTemp_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_MultipleTemp_Connector_stub</location>
-  </artifact>
-
-
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/MultipleTemp/descriptors/run_test.pl
deleted file mode 100755
index 638d55cd247..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 30 seconds to allow task to complete\n";
-sleep (30);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -s\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/NoModule/.gitignore b/CIAO/connectors/dds4ccm/tests/NoModule/.gitignore
deleted file mode 100644
index d8421a46f0e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/NoModule/.gitignore
+++ /dev/null
@@ -1,14 +0,0 @@
-/NoModule.cxx
-/NoModule.h
-/NoModulePlugin.cxx
-/NoModulePlugin.h
-/NoModuleSupport.cxx
-/NoModuleSupport.h
-/NoModule_Common_stub_export.h
-/NoModule_ConnectorE.idl
-/NoModule_Connector_conn.cpp
-/NoModule_Connector_conn.h
-/NoModule_Connector_conn_export.h
-/NoModule_Connector_lem_stub_export.h
-/NoModule_Connector_stub_export.h
-/NoModule_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/NoModule/NoModule.idl b/CIAO/connectors/dds4ccm/tests/NoModule/NoModule.idl
deleted file mode 100644
index bbd7f4e74d7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/NoModule/NoModule.idl
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef NOMODULE_IDL
-#define NOMODULE_IDL
-
-#pragma ndds typesupport "NoModuleSupport.h"
-#pragma opendds typesupport "NoModuleTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "NoModuleType"
-#pragma DCPS_DATA_KEY "NoModuleType value"
-
-struct NoModuleType {
-  string value; //@key
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<NoModuleType> NoModuleTypeSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/NoModule/NoModule.mpc b/CIAO/connectors/dds4ccm/tests/NoModule/NoModule.mpc
deleted file mode 100644
index 0c26ca42da4..00000000000
--- a/CIAO/connectors/dds4ccm/tests/NoModule/NoModule.mpc
+++ /dev/null
@@ -1,22 +0,0 @@
-project (NoModule_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = NoModule_stub
-  dynamicflags += NOMODULE_COMMON_STUB_BUILD_DLL
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=NOMODULE_COMMON_STUB_Export \
-              -Wb,stub_export_include=NoModule_Common_stub_export.h 
-
-  IDL_Files {
-    idlflags += -Gxhst
-    NoModule.idl
-  }
-
-  opendds_ts_flags += --export=NOMODULE_COMMON_STUB_Export
-
-  DDSGenerator_Files {
-    NoModule.idl
-  }
-
-  Source_Files {
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.idl b/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.idl
deleted file mode 100644
index 1826d617ae5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.idl
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef NOMODULE_CONNECTOR_IDL
-#define NOMODULE_CONNECTOR_IDL
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "NoModule.idl"
-
-#pragma ciao lem "NoModule_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "NoModuleTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::NoModuleType, ::NoModuleTypeSeq> NoModuleTypeConnector;
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.mpc b/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.mpc
deleted file mode 100644
index 445ed545e45..00000000000
--- a/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.mpc
+++ /dev/null
@@ -1,130 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -b dds4ccm_base NoModule_Connector"
-
-project(NoModule_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  custom_only = 1
-  after += NoModule_stub
-  idlflags += -Wb,stub_export_macro=NOMODULE_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=NoModule_Connector_stub_export.h \
-              -Wb,skel_export_macro=NOMODULE_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=NoModule_Connector_svnt_export.h \
-              -Wb,conn_export_macro=NOMODULE_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=NoModule_Connector_conn_export.h \
-              -Gxhex -Gxhsk -Gxhst
-  IDL_Files {
-    NoModule_Connector.idl
-  }
-}
-
-project(NoModule_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += NoModule_Connector_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=NOMODULE_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=NoModule_Connector_lem_stub_export.h \
-              -SS -Gxhst
-
-  IDL_Files {
-    NoModule_ConnectorE.idl
-  }
-}
-
-project(NoModule_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub  {
-  after += NoModule_Connector_lem_gen NoModule_Connector_stub
-  libs  +=  NoModule_Connector_stub
-
-
-  sharedname = NoModule_Connector_lem_stub
-  dynamicflags += NOMODULE_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    NoModule_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    NoModule_ConnectorEC.h
-    NoModule_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    NoModule_ConnectorEC.inl
-  }
-}
-
-project(NoModule_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += NoModule_Connector_idl_gen NoModule_stub
-  libs  += NoModule_stub
-
-
-  sharedname = NoModule_Connector_stub
-  dynamicflags += NOMODULE_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    NoModule_ConnectorC.cpp
-  }
-
-  Header_Files {
-    NoModule_ConnectorC.h
-    NoModule_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    NoModule_ConnectorC.inl
-  }
-}
-
-project(NoModule_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += NoModule_Connector_lem_stub NoModule_Connector_stub
-  sharedname = NoModule_Connector_exec
-  libs += NoModule_Connector_stub NoModule_Connector_lem_stub NoModule_stub
-
-  dynamicflags += NOMODULE_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    NoModule_Connector_conn.cpp
-  }
-
-  Header_Files {
-    NoModule_Connector_conn.h
-    NoModule_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(NoModule_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += NoModule_Connector_lem_stub
-  sharedname  = NoModule_Connector_svnt
-  libs       += NoModule_Connector_stub NoModule_Connector_lem_stub  NoModule_stub
-
-
-  dynamicflags += NOMODULE_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    NoModule_ConnectorS.cpp
-    NoModule_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    NoModule_ConnectorS.h
-    NoModule_Connector_svnt.h
-    NoModule_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/.gitignore b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl
deleted file mode 100644
index be43e622d8f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file NonChangeable_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef NONCHANGEABLE_BASE_IDL
-#define NONCHANGEABLE_BASE_IDL
-
-#pragma ndds typesupport "Base/NonChangeable_BaseSupport.h"
-#pragma opendds typesupport "Base/NonChangeable_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "NonChangeableTest"
-
-struct NonChangeableTest {
-  string key;
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<NonChangeableTest> NonChangeableTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc
deleted file mode 100644
index 02f3162309f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_NonChangeableBase_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_NonChangeableBase_stub
-  dynamicflags += NONCHANGEABLE_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=NONCHANGEABLE_BASE_STUB_Export \
-              -Wb,stub_export_include=NonChangeable_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    NonChangeable_Base.idl
-  }
-
-  opendds_ts_flags += --export=NONCHANGEABLE_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    NonChangeable_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.idl b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.idl
deleted file mode 100644
index 56afbc8213c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @file NonChangeable_Component.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef COMPONENT_IDL
-#define COMPONENT_IDL
-
-#include "Connector/NonChangeable_Connector.idl"
-
-module NonChangeable
-{
-  component NonChangeableComponent
-  {
-    port NonChangeableTestConnector::DDS_Get info_get;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.mpc b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.mpc
deleted file mode 100644
index b9aa5408dfe..00000000000
--- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-project(NonChangeable_Component_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_NonChangeableConnector_idl_gen
-  idlflags += -Wb,stub_export_macro=COMPONENT_STUB_Export \
-              -Wb,stub_export_include=Component_stub_export.h \
-              -Wb,skel_export_macro=COMPONENT_SVNT_Export \
-              -Wb,skel_export_include=Component_svnt_export.h \
-              -Wb,svnt_export_macro=COMPONENT_SVNT_Export \
-              -Wb,svnt_export_include=Component_svnt_export.h \
-              -Wb,exec_export_macro=COMPONENT_EXEC_Export \
-              -Wb,exec_export_include=Component_exec_export.h -I..
-
-  IDL_Files {
-    NonChangeable_Component.idl
-  }
-}
-
-project(NonChangeable_Component_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += NonChangeable_Component_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=COMPONENT_LEM_STUB_Export \
-              -Wb,stub_export_include=Component_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    NonChangeable_ComponentE.idl
-  }
-}
-
-project(NonChangeable_Component_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += NonChangeable_Component_lem_gen NonChangeable_Component_stub  \
-           DDS_NonChangeableConnector_stub DDS_NonChangeableBase_stub
-  libs  +=  Component_stub DDS_NonChangeableConnector_stub \
-            DDS_NonChangeableBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Component_lem_stub
-  dynamicflags += COMPONENT_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    NonChangeable_ComponentEC.cpp
-  }
-
-  Header_Files {
-    NonChangeable_ComponentEC.h
-    Component_lem_stub_export.h
-  }
-
-  Inline_Files {
-    NonChangeable_ComponentEC.inl
-  }
-}
-
-project(NonChangeable_Component_stub) : ccm_stub, dds4ccm_base {
-  after += NonChangeable_Component_idl_gen  DDS_NonChangeableConnector_stub \
-           DDS_NonChangeableBase_stub DDS_NonChangeableConnector_lem_gen
-  libs  += DDS_NonChangeableConnector_stub DDS_NonChangeableBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Component_stub
-  dynamicflags += COMPONENT_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    NonChangeable_ComponentC.cpp
-  }
-
-  Header_Files {
-    NonChangeable_ComponentC.h
-    Component_stub_export.h
-  }
-
-  Inline_Files {
-    NonChangeable_ComponentC.inl
-  }
-}
-
-project(NonChangeable_Component_exec) : ciao_executor, dds4ccm_impl {
-  after   += NonChangeable_Component_lem_stub NonChangeable_Component_stub \
-             DDS_NonChangeableBase_stub DDS_NonChangeableConnector_stub \
-             DDS_NonChangeableConnector_lem_stub 
-  sharedname = Component_exec
-  libs += Component_stub Component_lem_stub DDS_NonChangeableBase_stub \
-          DDS_NonChangeableConnector_stub DDS_NonChangeableConnector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COMPONENT_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    NonChangeable_Component_exec.cpp
-  }
-
-  Header_Files {
-    NonChangeable_Component_exec.h
-    Component_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(NonChangeable_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   NonChangeable_Component_lem_stub DDS_NonChangeableBase_stub \
-                  DDS_NonChangeableConnector_stub DDS_NonChangeableConnector_svnt \
-                  NonChangeable_Component_exec DDS_NonChangeableConnector_lem_stub 
-  sharedname  = Component_svnt
-  libs       += Component_stub Component_lem_stub DDS_NonChangeableBase_stub \
-                DDS_NonChangeableConnector_stub DDS_NonChangeableConnector_svnt \
-                Component_exec DDS_NonChangeableConnector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COMPONENT_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    NonChangeable_ComponentS.cpp
-    NonChangeable_Component_svnt.cpp
-  }
-
-  Header_Files {
-    NonChangeable_ComponentS.h
-    NonChangeable_Component_svnt.h
-    Component_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component_exec.cpp
deleted file mode 100644
index f9f8da29692..00000000000
--- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component_exec.cpp
+++ /dev/null
@@ -1,255 +0,0 @@
-// -*- C++ -*-
-#include "NonChangeable_Component_exec.h"
-
-#include "dds4ccm/impl/Utils.h"
-
-#define DOMAIN_ID_IN_DP 56
-#define TOPIC_NAME_IN_DP "NonChangeable"
-
-#define DW_MAX_BLOCKING_TIME_SEC 11
-#define DW_MAX_BLOCKING_TIME_NSEC 200
-
-namespace CIAO_NonChangeable_NonChangeableComponent_Impl
-{
-  //============================================================
-  // Component_exec_i
-  //============================================================
-  Component_exec_i::Component_exec_i (void)
-  {
-  }
-
-  Component_exec_i::~Component_exec_i (void)
-  {
-  }
-
-  bool
-  Component_exec_i::test_topic_name (
-    ::NonChangeable::NonChangeableTestConnector::CCM_DDS_Event_ptr conn)
-  {
-    try
-      {
-        conn->topic_name ("nonchangeable_test");
-        ACE_DEBUG ((LM_DEBUG, "NonChangeable_Connector_exec_impl_i::test_topic_name - "
-                              "Able to reset topic name without an exception.\n"));
-        return true;
-      }
-    catch (const ::CCM_DDS::NonChangeable &)
-      {
-        ACE_ERROR ((LM_ERROR, "NonChangeable_Connector_exec_impl_i::test_topic_name - "
-                              "ERROR: Unable to reset topic name.\n"));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "NonChangeable_Connector_exec_impl_i::test_topic_name - "
-                              "ERROR: Caught unexpected exception.\n"));
-      }
-    return false;
-  }
-
-  bool
-  Component_exec_i::test_key_fields (
-    ::NonChangeable::NonChangeableTestConnector::CCM_DDS_Event_ptr conn)
-  {
-    try
-      {
-        ::DDS::StringSeq fields;
-        fields.length (2);
-        fields[0] = CORBA::string_dup ("field_0");
-        fields[1] = CORBA::string_dup ("field_1");
-        conn->key_fields (fields);
-        ACE_ERROR ((LM_ERROR, "NonChangeable_Connector_exec_impl_i::test_domain_id - "
-                              "ERROR: Able to set key fields without "
-                              "an exception.\n"));
-      }
-    catch (const ::CCM_DDS::NonChangeable &)
-      {
-        ACE_DEBUG ((LM_DEBUG, "NonChangeable_Connector_exec_impl_i::test_key_fields - "
-                              "Caught expected exception.\n"));
-        return true;
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "NonChangeable_Connector_exec_impl_i::test_key_fields - "
-                              "ERROR: Caught unexpected exception.\n"));
-        return false;
-      }
-    return false;
-  }
-
-  bool
-  Component_exec_i::test_domain_id (
-    ::NonChangeable::NonChangeableTestConnector::CCM_DDS_Event_ptr conn)
-  {
-    try
-      {
-        conn->domain_id (64);
-        ACE_ERROR ((LM_ERROR, "NonChangeable_Connector_exec_impl_i::test_domain_id - "
-                              "ERROR: Able to set domain ID without "
-                              "an exception.\n"));
-      }
-    catch (const ::CCM_DDS::NonChangeable &)
-      {
-        ACE_DEBUG ((LM_DEBUG, "NonChangeable_Connector_exec_impl_i::test_domain_id - "
-                              "Caught expected exception.\n"));
-        return true;
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "NonChangeable_Connector_exec_impl_i::test_domain_id - "
-                              "ERROR: Caught unexpected exception.\n"));
-        return false;
-      }
-    return false;
-  }
-
-  bool
-  Component_exec_i::test_qos_profile (
-    ::NonChangeable::NonChangeableTestConnector::CCM_DDS_Event_ptr conn)
-  {
-    try
-      {
-        conn->qos_profile ("nonchangeable_profile");
-        ACE_ERROR ((LM_ERROR, "NonChangeable_Connector_exec_impl_i::test_qos_profile - "
-                              "ERROR: Able to set QoS profile without "
-                              "an exception.\n"));
-      }
-    catch (const ::CCM_DDS::NonChangeable &)
-      {
-        ACE_DEBUG ((LM_DEBUG, "NonChangeable_Connector_exec_impl_i::test_qos_profile - "
-                              "Caught expected exception.\n"));
-        return true;
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "NonChangeable_Connector_exec_impl_i::test_qos_profile - "
-                              "ERROR: Caught unexpected exception.\n"));
-        return false;
-      }
-    return false;
-  }
-
-  bool
-  Component_exec_i::test_filter (
-    ::NonChangeable::NonChangeableTestConnector::CCM_DDS_Event_ptr conn)
-  {
-    try
-      {
-        ::CCM_DDS::QueryFilter filter;
-        filter.expression = ::CORBA::string_dup ("na");
-        conn->pull_consumer_filter (filter);
-        ACE_ERROR ((LM_ERROR, "NonChangeable_Connector_exec_impl_i::test_filter - "
-                              "ERROR: Able to set filter without "
-                              "an exception.\n"));
-      }
-    catch (const ::CCM_DDS::NonChangeable &)
-      {
-        ACE_DEBUG ((LM_DEBUG, "NonChangeable_Connector_exec_impl_i::test_filter - "
-                              "Caught expected exception.\n"));
-        return true;
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "NonChangeable_Connector_exec_impl_i::test_filter - "
-                              "ERROR: Caught unexpected exception.\n"));
-        return false;
-      }
-    return false;
-  }
-
-  // Operations from Components::SessionComponent.
-  CCM_DDS::CCM_PortStatusListener_ptr
-  Component_exec_i::get_info_get_status (void)
-  {
-    return CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  void
-  Component_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::NonChangeable::CCM_NonChangeableComponent_Context::_narrow (ctx);
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Component_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Component_exec_i::ccm_activate (void)
-  {
-    ::NonChangeable::NonChangeableTestConnector::Reader_var reader =
-      this->context_->get_connection_info_get_data ();
-    if (::CORBA::is_nil (reader.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Component_exec_i::ccm_activate - "
-                              "Unable to get reader interface\n"));
-        throw ::CORBA::INTERNAL ();
-      }
-    ::CORBA::Object_var cmp = reader->_get_component ();
-    if (::CORBA::is_nil (cmp.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Component_exec_i::ccm_activate - "
-                              "Unable to get component interface\n"));
-        throw ::CORBA::INTERNAL ();
-      }
-    ::NonChangeable::NonChangeableTestConnector::CCM_DDS_Event_var conn =
-      ::NonChangeable::NonChangeableTestConnector::CCM_DDS_Event::_narrow (cmp.in ());
-    if (::CORBA::is_nil (conn.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Component_exec_i::ccm_activate - "
-                              "Unable to narrow connector interface\n"));
-        throw ::CORBA::INTERNAL ();
-      }
-
-    if (this->test_topic_name (conn.in ()))
-      {
-        ACE_DEBUG ((LM_DEBUG, "Set topic_name test passed.\n"));
-      }
-    if (this->test_key_fields (conn.in ()))
-      {
-        ACE_DEBUG ((LM_DEBUG, "Set key_fields test passed.\n"));
-      }
-    if (this->test_domain_id (conn.in ()))
-      {
-        ACE_DEBUG ((LM_DEBUG, "Set domain_id test passed.\n"));
-      }
-    if (this->test_qos_profile (conn.in ()))
-      {
-        ACE_DEBUG ((LM_DEBUG, "Set qos_profile test passed.\n"));
-      }
-    if (this->test_filter (conn.in ()))
-      {
-        ACE_DEBUG ((LM_DEBUG, "Set qos_profile test passed.\n"));
-      }
-  }
-
-  void
-  Component_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Component_exec_i::ccm_remove (void)
-  {
-  }
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_NonChangeable_Component_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Component_exec_i);
-
-    return retval;
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component_exec.h b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component_exec.h
deleted file mode 100644
index bce33e2e3b4..00000000000
--- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component_exec.h
+++ /dev/null
@@ -1,75 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_COMPONENT_EXEC_H_
-#define CIAO_COMPONENT_EXEC_H_
-
-#include "NonChangeable_ComponentEC.h"
-
-#include /**/ "Component_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-namespace CIAO_NonChangeable_NonChangeableComponent_Impl
-{
-  //============================================================
-  // Component_exec_i
-  //============================================================
-  class COMPONENT_EXEC_Export Component_exec_i
-    : public virtual NonChangeableComponent_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Component_exec_i (void);
-    virtual ~Component_exec_i (void);
-
-    // Operations from Components::SessionComponent.
-    CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_get_status(void);
-
-    virtual void
-    set_session_context (
-      ::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete (void);
-
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-
-  private:
-    ::NonChangeable::CCM_NonChangeableComponent_Context_var context_;
-
-    bool
-    test_key_fields (
-      ::NonChangeable::NonChangeableTestConnector::CCM_DDS_Event_ptr conn);
-
-    bool
-    test_attributes (
-      ::NonChangeable::NonChangeableTestConnector::CCM_DDS_Event_ptr conn);
-
-    bool
-    test_qos_profile (
-      ::NonChangeable::NonChangeableTestConnector::CCM_DDS_Event_ptr conn);
-
-    bool
-    test_topic_name (
-      ::NonChangeable::NonChangeableTestConnector::CCM_DDS_Event_ptr conn);
-
-    bool
-    test_domain_id (
-      ::NonChangeable::NonChangeableTestConnector::CCM_DDS_Event_ptr conn);
-
-    bool
-    test_filter (
-      ::NonChangeable::NonChangeableTestConnector::CCM_DDS_Event_ptr conn);
-  };
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_NonChangeable_Component_Impl (void);
-}
-
-#endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.idl b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.idl
deleted file mode 100644
index a848e17fe87..00000000000
--- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * @file NonChangeable_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef NONCHANGABLE_CONNECTOR_IDL_
-#define NONCHANGABLE_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/NonChangeable_Base.idl"
-
-#pragma ciao lem "Connector/NonChangeable_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/NonChangeable_BaseTypeSupport.idl"
-#endif
-
-module NonChangeable
-{
-  module ::CCM_DDS::Typed
-    < ::NonChangeableTest, ::NonChangeableTestSeq>
-    NonChangeableTestConnector;
-};
-
-#endif /* NonChangeable_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc
deleted file mode 100644
index c2e73a35ca1..00000000000
--- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_NonChangeableBase -l .. -o ../lib -u DDS NonChangeable_Connector"
-
-project(DDS_NonChangeableConnector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_NonChangeableBase_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=NONCHANGABLE_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=NonChangeable_Connector_stub_export.h \
-              -Wb,skel_export_macro=NONCHANGABLE_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=NonChangeable_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=NONCHANGABLE_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=NonChangeable_Connector_svnt_export.h \
-              -Wb,conn_export_macro=NONCHANGABLE_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=NonChangeable_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    NonChangeable_Connector.idl
-  }
-}
-
-project(DDS_NonChangeableConnector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_NonChangeableConnector_idl_gen
-  idlflags += -Wb,stub_export_macro=NONCHANGABLE_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=NonChangeable_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    NonChangeable_ConnectorE.idl
-  }
-}
-
-project(DDS_NonChangeableConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_NonChangeableConnector_lem_gen DDS_NonChangeableConnector_stub DDS_NonChangeableBase_stub
-  libs  += DDS_NonChangeableBase_stub DDS_NonChangeableConnector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_NonChangeableConnector_lem_stub
-  dynamicflags += NONCHANGABLE_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    NonChangeable_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    NonChangeable_ConnectorEC.h
-    NonChangeable_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    NonChangeable_ConnectorEC.inl
-  }
-}
-
-project(DDS_NonChangeableConnector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_NonChangeableConnector_idl_gen DDS_NonChangeableBase_stub
-  libs  += DDS_NonChangeableBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_NonChangeableConnector_stub
-  dynamicflags += NONCHANGABLE_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    NonChangeable_ConnectorC.cpp
-  }
-
-  Header_Files {
-    NonChangeable_ConnectorC.h
-    NonChangeable_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    NonChangeable_ConnectorC.inl
-  }
-}
-
-project(DDS_NonChangeableConnector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_NonChangeableConnector_lem_stub DDS_NonChangeableConnector_stub DDS_NonChangeableBase_stub
-  sharedname = DDS_NonChangeableConnector_exec
-  libs += DDS_NonChangeableConnector_stub DDS_NonChangeableConnector_lem_stub DDS_NonChangeableBase_stub DDS_NonChangeableBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += NONCHANGABLE_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    NonChangeable_Connector_conn.cpp
-  }
-
-  Header_Files {
-    NonChangeable_Connector_conn.h
-    NonChangeable_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_NonChangeableConnector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_NonChangeableConnector_lem_stub DDS_NonChangeableConnector_exec DDS_NonChangeableConnector_stub
-  sharedname  = DDS_NonChangeableConnector_svnt
-  libs       += DDS_NonChangeableConnector_stub \
-                DDS_NonChangeableConnector_lem_stub  \
-                DDS_NonChangeableBase_stub \
-                DDS_NonChangeableConnector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += NONCHANGABLE_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    NonChangeable_ConnectorS.cpp
-    NonChangeable_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    NonChangeable_ConnectorS.h
-    NonChangeable_Connector_svnt.h
-    NonChangeable_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/README b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/README
deleted file mode 100644
index 15c5a62a44f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/README
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-This test tests whether the connection attributes
-can be set once the configuration is complete.
-This shouldn't be allowed and therefore a
-NonChangeable exception must be thrown.
-
-The following attributes are tested:
-  * key_fields
-  * domain_id
-  * qos_profile
-  * topic_name
-
-An error is reported for every attribute where
-no NonChangeable exception was catched.
diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/Plan.cdp
deleted file mode 100644
index cd45205b5b5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/Plan.cdp
+++ /dev/null
@@ -1,198 +0,0 @@
-<!--  -->
-<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>NonChangeableAttribute_Depl_1</label>
-  <UUID>NonChangeableAttribute_Depl_1</UUID>
-
-  <implementation xmi:id="NonChangeableComponentImplementation">
-    <name>NonChangeableComponentmplementation</name>
-    <source/>
-    <artifact xmi:idref="Component_ExecArtifact" />
-    <artifact xmi:idref="Component_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_NonChangeable_Component_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_NonChangeable_NonChangeableComponent_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="NonChangeableConnectorImplementation">
-    <name>NonChangeableConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="NonChangeableConnector_ExecArtifact" />
-    <artifact xmi:idref="NonChangeableConnector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_NonChangeable_NonChangeableTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_NonChangeable_NonChangeableTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>NonChangeableConnector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>NonChangeableConnector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="NonChangeableComponentInstance">
-    <name>NonChangeableComponentInstance</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="NonChangeableComponentImplementation" />
-  </instance>
-
-  <instance xmi:id="NonChangeableConnectorInstance">
-    <name>NonChangeableConnectorInstance</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="NonChangeableConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>NonChangeable</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>info_get_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="NonChangeableComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="NonChangeableConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="NonChangeableConnector_ExecArtifact">
-    <name>NonChangeableConnector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_NonChangeableConnector_exec</location>
-  </artifact>
-  <artifact xmi:id="NonChangeableConnector_SvntArtifact">
-    <name>NonChangeableConnector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_NonChangeableConnector_svnt</location>
-  </artifact>
-  <artifact xmi:id="NonChangeableConnector_StubArtifact">
-    <name>NonChangeableConnector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_NonChangeableConnector_stub</location>
-  </artifact>
-
-  <artifact xmi:id="Component_ExecArtifact">
-    <name>Component_exec</name>
-    <source/>
-    <node/>
-    <location>Component_exec</location>
-  </artifact>
-  <artifact xmi:id="Component_SvntArtifact">
-    <name>Component_svnt</name>
-    <source/>
-    <node/>
-    <location>Component_svnt</location>
-  </artifact>
-  <artifact xmi:id="Component_StubArtifact">
-    <name>Component_stub</name>
-    <source/>
-    <node/>
-    <location>Component_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl
deleted file mode 100755
index 445ce8b9d56..00000000000
--- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 1;
-@ports = ( 60001);
-@iorbases = ( "NodeApp1.ior" );
-@iorfiles = 0;
-@nodenames = ( "ComponentNode");
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 5 seconds to allow task to complete\n";
-sleep (5);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/.gitignore b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.idl
deleted file mode 100644
index c67d2b6caba..00000000000
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.idl
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * @file OIT_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef ON_INCONSISTENT_TOPIC_TEST_BASE_IDL
-#define ON_INCONSISTENT_TOPIC_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/OIT_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/OIT_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "OIT_Receiver_Topic"
-#pragma DCPS_DATA_KEY "OIT_Receiver_Topic symbol"
-
-struct OIT_Receiver_Topic {
-  string symbol; //@key
-  long x;
-  long y;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<OIT_Receiver_Topic> OIT_Receiver_TopicSeq;
-#endif
-
-#pragma DCPS_DATA_TYPE "OIT_Sender_Topic"
-#pragma DCPS_DATA_KEY "OIT_Sender_Topic symbol"
-
-struct OIT_Sender_Topic {
-  string symbol; //@key
-  long x;
-  short y;
-  long z;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<OIT_Sender_Topic> OIT_Sender_TopicSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.mpc
deleted file mode 100644
index 0b13c2744f6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (OIT_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = OIT_Test_Base_stub
-  dynamicflags += ON_INCONSISTENT_TOPIC_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=ON_INCONSISTENT_TOPIC_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=OIT_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    OIT_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=ON_INCONSISTENT_TOPIC_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    OIT_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/.gitignore b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/.gitignore
deleted file mode 100644
index 70b981aaaec..00000000000
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/OIT_Test_ReceiverE.idl
-/Receiver_exec_export.h
-/Receiver_lem_stub_export.h
-/Receiver_stub_export.h
-/Receiver_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver.idl
deleted file mode 100644
index 8c1ab7b70f2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver.idl
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "ReceiverConnector/OIT_Receiver_Connector.idl"
-
-module OIT_Test
-{
-  component Receiver
-  {
-    port OIT_Receiver_TopicConnector::DDS_Listen info_out;
-    provides CCM_DDS::ConnectorStatusListener connector_status;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver.mpc
deleted file mode 100644
index 2d0d4f3ed85..00000000000
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-project(OIT_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += OIT_Receiver_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h -I..
-
-  IDL_Files {
-    OIT_Test_Receiver.idl
-  }
-}
-
-project(OIT_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += OIT_Test_Receiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    OIT_Test_ReceiverE.idl
-  }
-}
-
-project(OIT_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += OIT_Test_Receiver_lem_gen OIT_Test_Receiver_stub  \
-           OIT_Receiver_Connector_stub OIT_Test_Base_stub
-  libs  +=  Receiver_stub OIT_Receiver_Connector_stub \
-            OIT_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    OIT_Test_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    OIT_Test_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    OIT_Test_ReceiverEC.inl
-  }
-}
-
-project(OIT_Test_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += OIT_Test_Receiver_idl_gen  OIT_Receiver_Connector_stub \
-           OIT_Test_Base_stub OIT_Receiver_Connector_lem_gen
-  libs  += OIT_Receiver_Connector_stub OIT_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    OIT_Test_ReceiverC.cpp
-  }
-
-  Header_Files {
-    OIT_Test_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    OIT_Test_ReceiverC.inl
-  }
-}
-
-project(OIT_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += OIT_Test_Receiver_lem_stub OIT_Test_Receiver_stub \
-             OIT_Test_Base_stub OIT_Receiver_Connector_stub \
-             OIT_Receiver_Connector_lem_stub 
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub OIT_Test_Base_stub \
-          OIT_Receiver_Connector_stub OIT_Receiver_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    OIT_Test_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    OIT_Test_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(OIT_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   OIT_Test_Receiver_lem_stub OIT_Test_Base_stub \
-                  OIT_Receiver_Connector_stub OIT_Receiver_Connector_svnt \
-                  OIT_Test_Receiver_exec OIT_Receiver_Connector_lem_stub 
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub OIT_Test_Base_stub \
-                OIT_Receiver_Connector_stub OIT_Receiver_Connector_svnt \
-                Receiver_exec OIT_Receiver_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    OIT_Test_ReceiverS.cpp
-    OIT_Test_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    OIT_Test_ReceiverS.h
-    OIT_Test_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.cpp
deleted file mode 100644
index 2484942d900..00000000000
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.cpp
+++ /dev/null
@@ -1,199 +0,0 @@
-// -*- C++ -*-
-#include "OIT_Test_Receiver_exec.h"
-
-#include "ace/Log_Msg.h"
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-namespace CIAO_OIT_Test_Receiver_Impl
-{
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (Atomic_Boolean &inconsistent,
-                                                                  ACE_Thread_ID &thread_id)
-    : inconsistent_ (inconsistent),
-      thread_id_ (thread_id)
-  {
-  }
-
-  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic(
-    ::DDS::Topic_ptr /* the_topic */,
-    const DDS::InconsistentTopicStatus & /* status */)
-  {
-    ACE_Thread_ID t_id;
-    this->thread_id_ = t_id;
-    this->inconsistent_ = true;
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos(
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected(
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status(
-    ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind  /*status_kind*/)
-  {
-  }
-
-  //============================================================
-  // Receiver_exec_i
-  //============================================================
-  Receiver_exec_i::Receiver_exec_i (void)
-    : inconsistent_ (false),
-      thread_id_listener_ (0, 0)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-
-  // Port operations.
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Receiver_exec_i::get_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i (this->inconsistent_,
-                                               this->thread_id_listener_);
-  }
-
-  ::OIT_Test::OIT_Receiver_TopicConnector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_out_data_listener (void)
-  {
-    return ::OIT_Test::OIT_Receiver_TopicConnector::CCM_Listener::_nil ();
-  }
-
-  // Operations from Components::SessionComponent.
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->context_ = ::OIT_Test::CCM_Receiver_Context::_narrow (ctx);
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    if (!this->inconsistent_.value ())
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("RECEIVER ERROR: did not receive the expected ")
-                              ACE_TEXT ("error 'on_inconsistent_topic'\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("RECEIVER OK: Received the expected ")
-                              ACE_TEXT ("'on_inconsistent_topic'\n")));
-      }
-    char ccm_buf [65];
-    ACE_Thread_ID ccm_thread_id;
-    ccm_thread_id.to_string (ccm_buf);
-
-    char list_buf [65];
-    this->thread_id_listener_.to_string(list_buf);
-
-    if (this->thread_id_listener_.id () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: "
-                              "Thread ID for ConnectorStatusListener not set!\n"));
-      }
-    #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (this->thread_id_listener_ == ccm_thread_id)
-      {
-        ACE_DEBUG ((LM_DEBUG, "RECEIVER OK: "
-                              "Thread switch for ConnectorStatusListener seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-     }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: "
-                              "Thread switch for ConnectorStatusListener "
-                              "doesn't seem to work! "
-                             "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    #else
-    else if (this->thread_id_listener_ == ccm_thread_id)
-      {
-        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: ConnectorStatusListener: "
-                              "DDS seems to use a CCM thread for its callback: "
-                             "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "RECEIVER OK: ConnectorStatusListener: "
-                              "DDS seems to use its own thread for its callback: "
-                             "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    #endif
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_OIT_Test_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-
-    return retval;
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.h
deleted file mode 100644
index dcc1b2c12d9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.h
+++ /dev/null
@@ -1,102 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_RECEIVER_EXEC_H_
-#define CIAO_RECEIVER_EXEC_H_
-
-#include "OIT_Test_ReceiverEC.h"
-
-#include /**/ "Receiver_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-namespace CIAO_OIT_Test_Receiver_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
-
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  class RECEIVER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Atomic_Boolean &,
-                                    ACE_Thread_ID &);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-      void on_unexpected_status (
-        ::DDS::Entity_ptr the_entity,
-        ::DDS::StatusKind  status_kind);
-    private:
-    Atomic_Boolean &inconsistent_;
-    ACE_Thread_ID &thread_id_;
-  };
-
-  //============================================================
-  // Receiver_exec_i
-  //============================================================
-  class RECEIVER_EXEC_Export Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    // Supported operations and attributes.
-    // Component attributes.
-
-    // Port operations.
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_status (void);
-
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_connector_status (void);
-
-    virtual ::OIT_Test::OIT_Receiver_TopicConnector::CCM_Listener_ptr
-    get_info_out_data_listener (void);
-
-    // Operations from Components::SessionComponent.
-    virtual void
-    set_session_context (
-      ::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete (void);
-
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-
-  private:
-    ::OIT_Test::CCM_Receiver_Context_var context_;
-
-    Atomic_Boolean inconsistent_;
-    ACE_Thread_ID thread_id_listener_;
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_OIT_Test_Receiver_Impl (void);
-}
-
-#endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/.gitignore b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/.gitignore
deleted file mode 100644
index 241d5a1d74e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/OIT_Receiver_ConnectorE.idl
-/OIT_Receiver_Connector_conn.cpp
-/OIT_Receiver_Connector_conn.h
-/OIT_Receiver_Connector_conn_export.h
-/OIT_Receiver_Connector_lem_stub_export.h
-/OIT_Receiver_Connector_stub_export.h
-/OIT_Receiver_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.idl b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.idl
deleted file mode 100644
index e326c3f6bb0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.idl
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * @file OIT_Receiver_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef ON_INCONSISTENT_TOPIC_TEST_RECEIVER_CONNECTOR_IDL_
-#define ON_INCONSISTENT_TOPIC_TEST_RECEIVER_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/OIT_Test_Base.idl"
-
-#pragma ciao lem "ReceiverConnector/OIT_Receiver_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/OIT_Test_BaseTypeSupport.idl"
-#endif
-
-module OIT_Test
-{
-  module ::CCM_DDS::Typed < ::OIT_Receiver_Topic, ::OIT_Receiver_TopicSeq>
-    OIT_Receiver_TopicConnector;
-};
-
-#endif /* ON_INCONSISTENT_TOPIC_TEST_RECEIVER_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.mpc b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.mpc
deleted file mode 100644
index 092a37dcd4c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p OIT_Test_Base -l .. -o ../lib -u DDS OIT_Receiver_Connector"
-
-project(OIT_Receiver_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen OIT_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=OIT_Receiver_Connector_stub_export.h \
-              -Wb,skel_export_macro=ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=OIT_Receiver_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=OIT_Receiver_Connector_svnt_export.h \
-              -Wb,conn_export_macro=ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=OIT_Receiver_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    OIT_Receiver_Connector.idl
-  }
-}
-
-project(OIT_Receiver_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += OIT_Receiver_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=OIT_Receiver_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    OIT_Receiver_ConnectorE.idl
-  }
-}
-
-project(OIT_Receiver_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += OIT_Receiver_Connector_lem_gen OIT_Receiver_Connector_stub OIT_Test_Base_stub
-  libs  += OIT_Test_Base_stub OIT_Receiver_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = OIT_Receiver_Connector_lem_stub
-  dynamicflags += ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    OIT_Receiver_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    OIT_Receiver_ConnectorEC.h
-    OIT_Receiver_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    OIT_Receiver_ConnectorEC.inl
-  }
-}
-
-project(OIT_Receiver_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += OIT_Receiver_Connector_idl_gen OIT_Test_Base_stub
-  libs  += OIT_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = OIT_Receiver_Connector_stub
-  dynamicflags += ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    OIT_Receiver_ConnectorC.cpp
-  }
-
-  Header_Files {
-    OIT_Receiver_ConnectorC.h
-    OIT_Receiver_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    OIT_Receiver_ConnectorC.inl
-  }
-}
-
-project(OIT_Receiver_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += OIT_Receiver_Connector_lem_stub OIT_Receiver_Connector_stub OIT_Test_Base_stub
-  sharedname = OIT_Receiver_Connector_exec
-  libs += OIT_Receiver_Connector_stub OIT_Receiver_Connector_lem_stub OIT_Test_Base_stub OIT_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    OIT_Receiver_Connector_conn.cpp
-  }
-
-  Header_Files {
-    OIT_Receiver_Connector_conn.h
-    OIT_Receiver_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(OIT_Receiver_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += OIT_Receiver_Connector_lem_stub OIT_Receiver_Connector_exec OIT_Receiver_Connector_stub
-  sharedname  = OIT_Receiver_Connector_svnt
-  libs       += OIT_Receiver_Connector_stub \
-                OIT_Receiver_Connector_lem_stub  \
-                OIT_Test_Base_stub \
-                OIT_Receiver_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    OIT_Receiver_ConnectorS.cpp
-    OIT_Receiver_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    OIT_Receiver_ConnectorS.h
-    OIT_Receiver_Connector_svnt.h
-    OIT_Receiver_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/.gitignore b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/.gitignore
deleted file mode 100644
index 49adbc26bc2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/OIT_Test_SenderE.idl
-/Sender_exec_export.h
-/Sender_lem_stub_export.h
-/Sender_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.idl
deleted file mode 100644
index afcd1df6db4..00000000000
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef ON_INCONSISTENT_TOPIC_TEST_SENDER_IDL
-#define ON_INCONSISTENT_TOPIC_TEST_SENDER_IDL
-
-#include "SenderConnector/OIT_Sender_Connector.idl"
-
-module OIT_Test
-{
-  component Sender
-  {
-    port OIT_Sender_TopicConnector::DDS_Write topic_write;
-    provides CCM_DDS::ConnectorStatusListener connector_status;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.mpc
deleted file mode 100644
index fb5578f9df6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p OIT_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(OIT_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += OIT_Sender_Connector_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I ..
-
-  IDL_Files {
-    OIT_Test_Sender.idl
-  }
-}
-
-project(OIT_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += OIT_Test_Sender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    OIT_Test_SenderE.idl
-  }
-}
-
-project(OIT_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += OIT_Test_Sender_lem_gen OIT_Test_Sender_stub \
-           OIT_Test_Base_stub
-  libs  += OIT_Test_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    OIT_Test_SenderEC.cpp
-  }
-
-  Header_Files {
-    OIT_Test_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    OIT_Test_SenderEC.inl
-  }
-}
-
-project(OIT_Test_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += OIT_Test_Sender_idl_gen OIT_Test_Base_stub \
-           OIT_Sender_Connector_stub
-  libs  += OIT_Test_Base_stub OIT_Sender_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    OIT_Test_SenderC.cpp
-  }
-
-  Header_Files {
-    OIT_Test_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    OIT_Test_SenderC.inl
-  }
-}
-
-project(OIT_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += OIT_Test_Sender_lem_stub OIT_Test_Sender_stub \
-             OIT_Sender_Connector_lem_stub OIT_Sender_Connector_stub 
-  sharedname = Sender_exec
-  libs    += Sender_stub Sender_lem_stub OIT_Test_Base_stub \
-             OIT_Sender_Connector_lem_stub OIT_Sender_Connector_stub 
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    OIT_Test_Sender_exec.cpp
-  }
-
-  Header_Files {
-    OIT_Test_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(OIT_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += OIT_Test_Base_stub  OIT_Test_Sender_lem_stub \
-                OIT_Sender_Connector_stub \
-                OIT_Sender_Connector_svnt OIT_Sender_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub OIT_Test_Base_stub \
-                OIT_Sender_Connector_stub OIT_Sender_Connector_svnt \
-                OIT_Sender_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    OIT_Test_SenderS.cpp
-    OIT_Test_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    OIT_Test_SenderS.h
-    OIT_Test_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender_exec.cpp
deleted file mode 100644
index e7c710051a8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender_exec.cpp
+++ /dev/null
@@ -1,189 +0,0 @@
-// -*- C++ -*-
-#include "OIT_Test_Sender_exec.h"
-
-#include "ace/Log_Msg.h"
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-namespace CIAO_OIT_Test_Sender_Impl
-{
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (
-                                             Atomic_Boolean &inconsistent,
-                                             ACE_Thread_ID &thread_id)
-    : inconsistent_ (inconsistent),
-      thread_id_ (thread_id)
-  {
-  }
-
-  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic (
-     ::DDS::Topic_ptr /*the_topic*/,
-     const DDS::InconsistentTopicStatus & /*status*/)
-  {
-    ACE_Thread_ID t_id;
-    this->thread_id_ = t_id;
-    this->inconsistent_ = true;
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed (
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos (
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status (
-    ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind  /*status_kind*/)
-  {
-  }
-
-  //============================================================
-  // Component Executor Implementation Class: Sender_exec_i
-  //============================================================
-  Sender_exec_i::Sender_exec_i (void)
-    : inconsistent_ (false),
-      thread_id_listener_ (0, 0)
-  {
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-  }
-
-  CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i (this->inconsistent_,
-                                               this->thread_id_listener_);
-  }
-
-  void
-  Sender_exec_i::set_session_context (::Components::SessionContext_ptr ctx)
-  {
-    this->context_ = ::OIT_Test::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    if (this->inconsistent_.value ())
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("SENDER OK: Received the expected ")
-                              ACE_TEXT ("'on_inconsistent_topic'\n")));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("SENDER ERROR: did not receive the expected ")
-                              ACE_TEXT ("error 'on_inconsistent_topic'\n")));
-      }
-
-    char ccm_buf [65];
-    ACE_Thread_ID ccm_thread_id;
-    ccm_thread_id.to_string (ccm_buf);
-
-    char list_buf [65];
-    this->thread_id_listener_.to_string(list_buf);
-
-    if (this->thread_id_listener_.id () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: "
-                              "Thread ID for ConnectorStatusListener not set!\n"));
-      }
-
-    #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (this->thread_id_listener_ == ccm_thread_id)
-      {
-        ACE_DEBUG ((LM_DEBUG, "SENDER OK: "
-                              "Thread switch for ConnectorStatusListener seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                             "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: "
-                              "Thread switch for ConnectorStatusListener "
-                              "doesn't seem to work! "
-                             "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    #else
-    else if (this->thread_id_listener_ == ccm_thread_id)
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: ConnectorStatusListener: "
-                              "DDS seems to use a CCM thread for its callback: "
-                             "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "SENDER OK: ConnectorStatusListener: "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-     }
-    #endif
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_OIT_Test_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender_exec.h
deleted file mode 100644
index b580b33a4bc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender_exec.h
+++ /dev/null
@@ -1,89 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_SENDER_EXEC_H_
-#define CIAO_SENDER_EXEC_H_
-
-
-#include "OIT_Test_SenderEC.h"
-
-#include /**/ "Sender_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-
-namespace CIAO_OIT_Test_Sender_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
-
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  class SENDER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Atomic_Boolean &,
-                                    ACE_Thread_ID &);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-      void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                                 ::DDS::StatusKind  status_kind);
-  private:
-    Atomic_Boolean &inconsistent_;
-    ACE_Thread_ID &thread_id_;
-  };
-
-  //============================================================
-  // Sender_exec_i
-  //============================================================
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-
-    virtual CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_connector_status (void);
-
-    virtual void configuration_complete (void);
-
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-  private:
-    ::OIT_Test::CCM_Sender_Context_var context_;
-
-    Atomic_Boolean inconsistent_;
-    ACE_Thread_ID thread_id_listener_;
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_OIT_Test_Sender_Impl (void);
-}
-
-#endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/.gitignore b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/.gitignore
deleted file mode 100644
index b16bcc4261d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/OIT_Sender_ConnectorE.idl
-/OIT_Sender_Connector_conn.cpp
-/OIT_Sender_Connector_conn.h
-/OIT_Sender_Connector_conn_export.h
-/OIT_Sender_Connector_lem_stub_export.h
-/OIT_Sender_Connector_stub_export.h
-/OIT_Sender_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.idl b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.idl
deleted file mode 100644
index a8e1bd58cbf..00000000000
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.idl
+++ /dev/null
@@ -1,26 +0,0 @@
-
-/**
- * @file OIT_Sender_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef ON_INCONSISTENT_TOPIC_TEST_SENDER_CONNECTOR_IDL_
-#define ON_INCONSISTENT_TOPIC_TEST_SENDER_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-#include "Base/OIT_Test_Base.idl"
-
-#pragma ciao lem "SenderConnector/OIT_Sender_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/OIT_Test_BaseTypeSupport.idl"
-#endif
-
-module OIT_Test
-{
-  module ::CCM_DDS::Typed < ::OIT_Sender_Topic, ::OIT_Sender_TopicSeq>
-    OIT_Sender_TopicConnector;
-};
-
-#endif /* ON_INCONSISTENT_TOPIC_TEST_SENDER_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.mpc b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.mpc
deleted file mode 100644
index 199cdb2ec8a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p OIT_Test_Base -l .. -o ../lib -u DDS OIT_Sender_Connector"
-
-project(OIT_Sender_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen OIT_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=OIT_Sender_Connector_stub_export.h \
-              -Wb,skel_export_macro=ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=OIT_Sender_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=OIT_Sender_Connector_svnt_export.h \
-              -Wb,conn_export_macro=ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=OIT_Sender_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    OIT_Sender_Connector.idl
-  }
-}
-
-project(OIT_Sender_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += OIT_Sender_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=OIT_Sender_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    OIT_Sender_ConnectorE.idl
-  }
-}
-
-project(OIT_Sender_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += OIT_Sender_Connector_lem_gen OIT_Sender_Connector_stub OIT_Test_Base_stub
-  libs  += OIT_Test_Base_stub OIT_Sender_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = OIT_Sender_Connector_lem_stub
-  dynamicflags += ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    OIT_Sender_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    OIT_Sender_ConnectorEC.h
-    OIT_Sender_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    OIT_Sender_ConnectorEC.inl
-  }
-}
-
-project(OIT_Sender_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += OIT_Sender_Connector_idl_gen OIT_Test_Base_stub
-  libs  += OIT_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = OIT_Sender_Connector_stub
-  dynamicflags += ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    OIT_Sender_ConnectorC.cpp
-  }
-
-  Header_Files {
-    OIT_Sender_ConnectorC.h
-    OIT_Sender_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    OIT_Sender_ConnectorC.inl
-  }
-}
-
-project(OIT_Sender_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += OIT_Sender_Connector_lem_stub OIT_Sender_Connector_stub OIT_Test_Base_stub
-  sharedname = OIT_Sender_Connector_exec
-  libs += OIT_Sender_Connector_stub OIT_Sender_Connector_lem_stub OIT_Test_Base_stub OIT_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    OIT_Sender_Connector_conn.cpp
-  }
-
-  Header_Files {
-    OIT_Sender_Connector_conn.h
-    OIT_Sender_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(OIT_Sender_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += OIT_Sender_Connector_lem_stub OIT_Sender_Connector_exec OIT_Sender_Connector_stub
-  sharedname  = OIT_Sender_Connector_svnt
-  libs       += OIT_Sender_Connector_stub \
-                OIT_Sender_Connector_lem_stub  \
-                OIT_Test_Base_stub \
-                OIT_Sender_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    OIT_Sender_ConnectorS.cpp
-    OIT_Sender_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    OIT_Sender_ConnectorS.h
-    OIT_Sender_Connector_svnt.h
-    OIT_Sender_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/Plan.cdp
deleted file mode 100644
index ddc1025aa90..00000000000
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/Plan.cdp
+++ /dev/null
@@ -1,403 +0,0 @@
-<!--  -->
-<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>On_Inconsistent_Topic_Depl</label>
-  <UUID>On_Inconsistent_Topic_Depl</UUID>
-
-  <implementation xmi:id="ReceiverImplementation">
-    <name>ReceiverImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_OIT_Test_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_OIT_Test_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Sender_ConnectorImplementation">
-    <name>Sender_ConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_Connector_ExecArtifact" />
-    <artifact xmi:idref="Sender_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_OIT_Test_OIT_Sender_TopicConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_OIT_Test_OIT_Sender_TopicConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Receiver_ConnectorImplementation">
-    <name>Receiver_ConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_Connector_ExecArtifact" />
-    <artifact xmi:idref="Receiver_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_OIT_Test_OIT_Receiver_TopicConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_OIT_Test_OIT_Receiver_TopicConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="SenderImplementation">
-    <name>SenderImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_OIT_Test_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_OIT_Test_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="ReceiverInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverImplementation" />
-  </instance>
-
-  <instance xmi:id="Receiver_ConnectorInstance">
-    <name>Receiver_ConnectorComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Receiver_ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestOIT</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-
-  <instance xmi:id="SenderInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderImplementation" />
-  </instance>
-
-  <instance xmi:id="Sender_ConnectorInstance">
-    <name>Sender_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Sender_ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestOIT</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>info_out_reader</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Receiver_ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>info_out_connector_status_receiver</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Receiver_ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>topic_write_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>topic_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Sender_ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>test_sec_topic_connector_status_sender</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Sender_ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-
-  <artifact xmi:id="Sender_Connector_ExecArtifact">
-    <name>Sender_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>OIT_Sender_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_Connector_SvntArtifact">
-    <name>Sender_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>OIT_Sender_Connector_svnt</location>
-  </artifact>
-
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-
-  <artifact xmi:id="Receiver_Connector_ExecArtifact">
-    <name>Receiver_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>OIT_Receiver_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_Connector_SvntArtifact">
-    <name>Receiver_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>OIT_Receiver_Connector_svnt</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl
deleted file mode 100755
index 8de796937cb..00000000000
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl
+++ /dev/null
@@ -1,244 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 10 seconds to allow task to complete\n";
-sleep (10);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/.gitignore b/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/.gitignore
deleted file mode 100644
index db0a52d9a85..00000000000
--- a/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/.gitignore
+++ /dev/null
@@ -1,13 +0,0 @@
-/OFM_Connector.cxx
-/OFM_Connector.h
-/OFM_ConnectorE.idl
-/OFM_ConnectorPlugin.cxx
-/OFM_ConnectorPlugin.h
-/OFM_ConnectorSupport.cxx
-/OFM_ConnectorSupport.h
-/OFM_Connector_conn.cpp
-/OFM_Connector_conn.h
-/OFM_Connector_conn_export.h
-/OFM_Connector_lem_stub_export.h
-/OFM_Connector_stub_export.h
-/OFM_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Base.idl b/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Base.idl
deleted file mode 100644
index fe3f5c1236f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Base.idl
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef OFM_BASE_IDL
-#define OFM_BASE_IDL
-
-#pragma ndds typesupport "OFM_BaseSupport.h"
-#pragma opendds typesupport "OFM_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "Topic1"
-#pragma DCPS_DATA_KEY "Topic1 key_value_topic1"
-
-struct Topic1 {
-  string key_value_topic1; //@key
-  long long_value;
-};
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<Topic1> Topic1Seq;
-#endif
-
-#pragma DCPS_DATA_TYPE "Topic2"
-#pragma DCPS_DATA_KEY "Topic2 key_value_topic2"
-
-struct Topic2 {
-  string key_value_topic2; //@key
-  float float_value;
-};
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<Topic2> Topic2Seq;
-#endif
-
-#pragma DCPS_DATA_TYPE "Topic3"
-#pragma DCPS_DATA_KEY "Topic3 key_value_topic3"
-
-struct Topic3 {
-  string key_value_topic3; //@key
-  short short_value;
-};
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<Topic3> Topic3Seq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.idl b/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.idl
deleted file mode 100644
index 1554b27a1aa..00000000000
--- a/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef OFM_CONNECTOR_IDL
-#define OFM_CONNECTOR_IDL
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "OFM_Base.idl"
-
-#pragma ciao lem "OFM_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "OFM_BaseTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::Topic1, ::Topic1Seq> Topic1Connector;
-module ::CCM_DDS::Typed < ::Topic2, ::Topic2Seq> Topic2Connector;
-module ::CCM_DDS::Typed < ::Topic3, ::Topic3Seq> Topic3Connector;
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc b/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc
deleted file mode 100644
index a61728181f5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc
+++ /dev/null
@@ -1,147 +0,0 @@
-project (OFM_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = OFM_Base_stub
-  dynamicflags += OFM_CONNECTOR_BASE_STUB_BUILD_DLL
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=OFM_CONNECTOR_BASE_STUB_Export \
-              -Wb,stub_export_include=OFM_Connector_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    OFM_Base.idl
-  }
-
-  opendds_ts_flags += --export=OFM_CONNECTOR_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    OFM_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
-
-project(OFM_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  custom_only = 1
-  after += OFM_Base_stub
-  idlflags += -Wb,stub_export_macro=OFM_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=OFM_Connector_stub_export.h \
-              -Wb,skel_export_macro=OFM_CONNECTOR_SKEL_Export \
-              -Wb,skel_export_include=OFM_Connector_skel_export.h \
-              -Wb,conn_export_macro=OFM_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=OFM_Connector_conn_export.h \
-              -Wb,svnt_export_macro=OFM_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=OFM_Connector_svnt_export.h
-
-  IDL_Files {
-    OFM_Connector.idl
-  }
-}
-
-project(OFM_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += OFM_Connector_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=OFM_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=OFM_Connector_lem_stub_export.h \
-              -SS -Gxhst
-
-  IDL_Files {
-    OFM_ConnectorE.idl
-  }
-}
-
-project(OFM_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub  {
-  after    += OFM_Connector_lem_gen OFM_Connector_stub OFM_Base_stub
-  libs     += OFM_Connector_stub OFM_Base_stub
-
-  sharedname = OFM_Connector_lem_stub
-  dynamicflags += OFM_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    OFM_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    OFM_ConnectorEC.h
-    OFM_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    OFM_ConnectorEC.inl
-  }
-}
-
-project(OFM_Connector_stub) : ccm_stub, dds4ccm_base, dds4ccm_ts_default {
-  after    += OFM_Connector_idl_gen OFM_Base_stub
-  sharedname = OFM_Connector_stub
-  dynamicflags += OFM_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    OFM_ConnectorC.cpp
-  }
-
-  Header_Files {
-    OFM_ConnectorC.h
-    OFM_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    OFM_ConnectorC.inl
-  }
-}
-
-project(OFM_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after += OFM_Connector_lem_stub OFM_Connector_stub OFM_Base_stub
-  libs  += OFM_Connector_stub OFM_Connector_lem_stub OFM_Base_stub
-  sharedname = OFM_Connector_exec
-
-  dynamicflags += OFM_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    OFM_Connector_conn.cpp
-  }
-
-  Header_Files {
-    OFM_Connector_conn.h
-    OFM_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(OFM_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after += OFM_Connector_lem_stub
-  libs  += OFM_Connector_stub OFM_Connector_lem_stub OFM_Base_stub
-  sharedname  = OFM_Connector_svnt
-
-  dynamicflags += OFM_CONNECTOR_SVNT_BUILD_DLL OFM_CONNECTOR_SKEL_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    OFM_ConnectorS.cpp
-    OFM_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    OFM_ConnectorS.h
-    OFM_Connector_svnt.h
-    OFM_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/OneFile/Single/.gitignore b/CIAO/connectors/dds4ccm/tests/OneFile/Single/.gitignore
deleted file mode 100644
index b4b90bfc61a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/OneFile/Single/.gitignore
+++ /dev/null
@@ -1,13 +0,0 @@
-/OneFile_Connector.cxx
-/OneFile_Connector.h
-/OneFile_ConnectorE.idl
-/OneFile_ConnectorPlugin.cxx
-/OneFile_ConnectorPlugin.h
-/OneFile_ConnectorSupport.cxx
-/OneFile_ConnectorSupport.h
-/OneFile_Connector_conn.cpp
-/OneFile_Connector_conn.h
-/OneFile_Connector_conn_export.h
-/OneFile_Connector_lem_stub_export.h
-/OneFile_Connector_stub_export.h
-/OneFile_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Base.idl b/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Base.idl
deleted file mode 100644
index afbaa15e6ce..00000000000
--- a/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Base.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file OneFile_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef ONEFILE_BASE_IDL_
-#define ONEFILE_BASE_IDL_
-
-#pragma ndds typesupport "OneFile_BaseSupport.h"
-#pragma opendds typesupport "OneFile_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "OneFileTopic"
-#pragma DCPS_DATA_KEY "OneFileTopic hello"
-
-struct OneFileTopic {
-  string hello; //@key
-  long iteration;
-};
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<OneFileTopic> OneFileTopicSeq;
-#endif
-
-#endif /* ONEFILE_BASE_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.idl b/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.idl
deleted file mode 100644
index 9ec4b65b603..00000000000
--- a/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * @file OneFile_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef ONEFILE_CONNECTOR_IDL_
-#define ONEFILE_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "OneFile_Base.idl"
-
-#pragma ciao lem "OneFile_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "OneFile_BaseTypeSupport.idl"
-#endif
-
-module OneFile_Connector
-{
-  module ::CCM_DDS::Typed < OneFileTopic, OneFileTopicSeq> OneFileConnector;
-};
-
-module ::CCM_DDS::Typed < OneFileTopic, OneFileTopicSeq> OneFileConnector;
-
-#endif /* ONEFILE_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc b/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc
deleted file mode 100644
index c459b45c687..00000000000
--- a/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc
+++ /dev/null
@@ -1,148 +0,0 @@
-project (OneFile_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = OneFile_Base_stub
-  dynamicflags += ONEFILE_CONNECTOR_BASE_STUB_BUILD_DLL
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=ONEFILE_CONNECTOR_BASE_STUB_Export \
-              -Wb,stub_export_include=ONEFILE_Connector_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    OneFile_Base.idl
-  }
-
-  opendds_ts_flags += --export=ONEFILE_CONNECTOR_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    OneFile_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
-project(OneFile_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  custom_only = 1
-  after += OneFile_Base_stub
-  idlflags += -Wb,stub_export_macro=ONEFILE_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=OneFile_Connector_stub_export.h \
-              -Wb,skel_export_macro=ONEFILE_CONNECTOR_SKEL_Export \
-              -Wb,skel_export_include=OneFile_Connector_skel_export.h \
-              -Wb,conn_export_macro=ONEFILE_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=OneFile_Connector_conn_export.h \
-              -Wb,skel_export_macro=ONEFILE_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=OneFile_Connector_svnt_export.h
-
-  IDL_Files {
-    OneFile_Connector.idl
-  }
-}
-
-project(OneFile_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  after    += OneFile_Connector_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=ONEFILE_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=OneFile_Connector_lem_stub_export.h \
-              -SS -Gxhst
-
-  IDL_Files {
-    OneFile_ConnectorE.idl
-  }
-}
-
-project(OneFile_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub  {
-  after    += OneFile_Connector_lem_gen OneFile_Connector_stub OneFile_Base_stub
-  libs     += OneFile_Connector_stub OneFile_Base_stub
-
-  sharedname = OneFile_Connector_lem_stub
-  dynamicflags += ONEFILE_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    OneFile_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    OneFile_ConnectorEC.h
-    OneFile_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    OneFile_ConnectorEC.inl
-  }
-}
-
-project(OneFile_Connector_stub) : ccm_stub, dds4ccm_base, dds4ccm_ts_default {
-  after    += OneFile_Connector_idl_gen OneFile_Base_stub
-  sharedname = OneFile_Connector_stub
-  dynamicflags += ONEFILE_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    OneFile_ConnectorC.cpp
-  }
-
-  Header_Files {
-    OneFile_ConnectorC.h
-    OneFile_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    OneFile_ConnectorC.inl
-  }
-}
-
-project(OneFile_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after    += OneFile_Connector_lem_stub OneFile_Connector_stub OneFile_Base_stub
-  libs     += OneFile_Connector_stub OneFile_Connector_lem_stub OneFile_Base_stub
-  sharedname = OneFile_Connector_exec
-
-  dynamicflags += ONEFILE_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    OneFile_Connector_conn.cpp
-  }
-
-  Header_Files {
-    OneFile_Connector_conn.h
-    OneFile_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(OneFile_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += OneFile_Connector_lem_stub
-  sharedname  = OneFile_Connector_svnt
-  libs       += OneFile_Connector_stub OneFile_Connector_lem_stub OneFile_Base_stub
-
-  dynamicflags += ONEFILE_CONNECTOR_SVNT_BUILD_DLL ONEFILE_CONNECTOR_SKEL_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    OneFile_ConnectorS.cpp
-    OneFile_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    OneFile_ConnectorS.h
-    OneFile_Connector_svnt.h
-    OneFile_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/PSAT/.gitignore b/CIAO/connectors/dds4ccm/tests/PSAT/.gitignore
deleted file mode 100644
index 4142f2e29ed..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSAT/.gitignore
+++ /dev/null
@@ -1,23 +0,0 @@
-/ccm_dds_psat.cxx
-/ccm_dds_psat.h
-/ccm_dds_psatE.idl
-/ccm_dds_psatPlugin.cxx
-/ccm_dds_psatPlugin.h
-/ccm_dds_psatSupport.cxx
-/ccm_dds_psatSupport.h
-/ccm_dds_psat_conn.cpp
-/ccm_dds_psat_conn.h
-/ccm_dds_psat_conn_export.h
-/ccm_dds_psat_lem_stub_export.h
-/ccm_dds_psat_stub_export.h
-/ccm_dds_psat_svnt_export.h
-/lib
-/psat_connE.idl
-/psat_conn_conn.h
-/psat_type.cxx
-/psat_type.h
-/psat_typePlugin.cxx
-/psat_typePlugin.h
-/psat_typeSupport.cxx
-/psat_typeSupport.h
-/psat_type_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/PSAT/DDS_PSAT_Connector_T.h b/CIAO/connectors/dds4ccm/tests/PSAT/DDS_PSAT_Connector_T.h
deleted file mode 100644
index 0f1bcc115dd..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSAT/DDS_PSAT_Connector_T.h
+++ /dev/null
@@ -1,95 +0,0 @@
-#ifndef DDS_PSAT_CONNECTOR_T
-#define DDS_PSAT_CONNECTOR_T
-
-#include "connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h"
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-class DDS_PSAT_Event_Connector_T
-  : public virtual DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE>
-{
-  virtual
-  typename CCM_TYPE::supplier_traits::data_type::_ptr_type
-  get_supplier_data (void)
-  {
-    return CCM_TYPE::supplier_traits::data_type::_nil ();
-  }
-
-  virtual
-  typename CCM_TYPE::supplier_traits::dds_entity_type::_ptr_type
-  get_supplier_dds_entity (void)
-  {
-    return CCM_TYPE::supplier_traits::dds_entity_type::_nil ();
-  }
-
-  virtual
-  typename CCM_TYPE::consumer_traits::data_type::_ptr_type
-  get_consumer_data (void)
-  {
-    return CCM_TYPE::consumer_traits::data_type::_nil ();
-  }
-
-  virtual
-  typename CCM_TYPE::consumer_traits::data_control_type::_ptr_type
-  get_consumer_data_control (void)
-  {
-    return CCM_TYPE::consumer_traits::data_control_type::_nil ();
-  }
-
-  virtual
-  typename CCM_TYPE::consumer_traits::dds_entity_type::_ptr_type
-  get_consumer_dds_entity (void)
-  {
-    return CCM_TYPE::consumer_traits::dds_entity_type::_nil ();
-  }
-
-  virtual
-  typename CCM_TYPE::consumer_traits::buffer_control_type::_ptr_type
-  get_consumer_buffer_control (void)
-  {
-    return CCM_TYPE::consumer_traits::buffer_control_type::_nil ();
-  }
-
-  virtual
-  ::CCM_DDS_PSAT::SharedMemoryConfig *
-  shared_memory_config (void)
-  {
-    return 0;
-  }
-
-  virtual
-  void
-  shared_memory_config (
-    const ::CCM_DDS_PSAT::SharedMemoryConfig & /*shared_memory_config */)
-  {
-  }
-
-  virtual
-  ::CCM_DDS_PSAT::BufferPoolConfig
-  attach_buffer_config (void)
-  {
-    return ::CCM_DDS_PSAT::BufferPoolConfig ();
-  }
-
-  virtual
-  void
-  attach_buffer_config (
-    const ::CCM_DDS_PSAT::BufferPoolConfig & /* attach_buffer_config */)
-  {
-  }
-
-  virtual
-  ::CCM_DDS_PSAT::TransportConfig *
-  transports_config (void)
-  {
-    return 0;
-  }
-
-  virtual
-  void
-  transports_config (
-    const ::CCM_DDS_PSAT::TransportConfig & /* transports_config */)
-  {
-  }
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/PSAT/PSAT_Connector.idl b/CIAO/connectors/dds4ccm/tests/PSAT/PSAT_Connector.idl
deleted file mode 100644
index 92d41cef253..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSAT/PSAT_Connector.idl
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * @file PSAT_Connector.idl
- */
-
-#ifndef PSAT_CONNECTOR_USER_IDL
-#define PSAT_CONNECTOR_USER_IDL
-
-#include  <Components.idl>
-
-#include "ccm_dds_psat.idl"
-#include "psat_type.idl"
-
-#pragma ciao lem "PSAT_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "psat_typeTypeSupport.idl"
-#endif
-
-module ::CCM_DDS_PSAT::Typed_PSAT < ::TestTopic, ::TestTopicSeq> TestTopicMod;
-
-#endif /* PSAT_CONNECTOR_USER_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.idl b/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.idl
deleted file mode 100644
index df0e7d7ff28..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.idl
+++ /dev/null
@@ -1,248 +0,0 @@
-#ifndef CCM_DDS_PSAT_IDL
-#define CCM_DDS_PSAT_IDL
-
-#pragma dds4ccm impl "DDS_PSAT_Connector_T.h"
-
-#if defined (__TAO_IDL)
-#include <ccm_dds.idl>
-#endif
-
-/**
- * @namespace CCM_DDS_PSAT
- *
- * Module containing all @ref PSAT related entities. Non-typed constructs are
- * directly defined in this module, while typed constructs are in a templated
- * sub-module.
- */
-module CCM_DDS_PSAT
-{
-   // ---------------------------
-   // Enums, structs and Typedefs
-   // ---------------------------
-
-   const long FIXED_STRING_SIZE = 50;
-
-   typedef char FixedString[FIXED_STRING_SIZE];
-
-   typedef sequence<string> StrSeq;
-
-   enum EndianType
-   {
-      PSAT_AD_LITTLE_ENDIAN,
-      PSAT_AD_BIG_ENDIAN
-   };
-
-   struct DataShape
-   {
-      long long num_blocks;
-
-      long long block_length;
-
-      long long stride;
-   };
-
-   struct SubscriberSideInfo
-   {
-      long long transferred_length;
-
-      long long sample_incomplete_deadline_usec;
-
-      boolean   deliver_sample;
-
-      long long            destination_offset;
-   };
-
-   struct ConnectorPrivateInfo
-   {
-      FixedString publisher_connector_id;
-
-      long long   internal_buffer_id;
-
-   };
-
-   struct PSAT_Header
-   {
-      long long            sample_start_address;
-
-      long long            ad_buffer_id;
-
-      long long            source_offset;
-
-      DataShape            psat_view;
-
-      EndianType           source_endian;
-
-      boolean              sample_complete;
-
-      SubscriberSideInfo   subscriber_side_info;
-
-      ConnectorPrivateInfo connector_only_info;
-   };
-
-   struct BasicUDM
-   {
-      PSAT_Header psatHeader;
-   };
-
-   struct AsynchErrorInfo
-   {
-      string get_rid_of_this; // TEMPORARY FIELD SO THE STRUCT COMPILES
-   };
-
-   struct SharedMemoryConfig
-   {
-      string    name;
-
-      long long size;
-
-      long long alignment;
-   };
-
-   struct BufferPoolConfig
-   {
-      long long buffer_start_offset;
-
-      long long num_buffers;
-
-      long long buffer_size;
-   };
-
-  struct TransportConfig
-   {
-      StrSeq  allowed_interfaces;
-
-      StrSeq  denied_interfaces;
-
-      StrSeq  transport_preference;
-   };
-
-   // ----------
-   // Exceptions
-   // ----------
-
-   exception SharedMemoryInitError
-   {
-      string explanation;
-   };
-
-   exception InvalidConnectorAttributes
-   {
-      string explanation;
-   };
-
-   exception NoAvailableAD_Buffer
-   {
-      string explanation;
-   };
-
-   exception InvalidAD_BufferState
-   {
-      string explanation;
-   };
-
-   exception InvalidUDM
-   {
-      string explanation;
-   };
-
-   exception UnsucessfulFlush
-   {
-      string explanation;
-   };
-
-   module Typed_PSAT<typename T, sequence<T> TSeq>
-   {
-      alias CCM_DDS::Typed<T, TSeq> DDS_Typed;
-      typedef DDS_Typed::DataReader DataReader;
-      typedef DDS_Typed::DataWriter DataWriter;
-
-      local interface PSAT_BufferControl
-      {
-         void release_buffer(in T datum)
-               raises(InvalidAD_BufferState, InvalidUDM);
-
-         void flush() raises(UnsucessfulFlush);
-      };
-
-      local interface PSAT_Writer : PSAT_BufferControl
-      {
-         void create_data(out T datum)
-               raises(CCM_DDS::InternalError, NoAvailableAD_Buffer);
-
-         void create_data_override(out T datum)
-               raises(CCM_DDS::InternalError);
-
-         void create_data_w_existing(in T existing_datum, out T datum)
-               raises(CCM_DDS::InternalError, InvalidAD_BufferState);
-
-         void notify_on_buffer_available(in long long timeoutUsec);
-
-         void write_one(in T datum)
-               raises(CCM_DDS::InternalError, InvalidUDM);
-      };
-
-      local interface PSAT_WriterStatusListener
-      {
-         void on_buffer_available();
-
-         void on_buffer_wait_timeout();
-      };
-
-      local interface PSAT_Interceptor
-      {
-         void on_metadata_intercept(inout T datum);
-      };
-
-      local interface PSAT_ReaderStatusListener : CCM_DDS::PortStatusListener
-      {
-         void on_copy_unsupported(in T datum, in AsynchErrorInfo info);
-         void on_data_corruption(in T datum, in AsynchErrorInfo info);
-         void on_incomplete_transfer(in T datum, in AsynchErrorInfo info);
-         void on_invalid_UDM(in T datum, in AsynchErrorInfo info);
-      };
-
-      // --------------
-      // DDS PSAT Ports
-      // --------------
-
-      porttype DDS_PSAT_Write
-      {
-         uses     PSAT_Writer               data;
-         uses     DDS::DataWriter           dds_entity;
-         provides PSAT_WriterStatusListener status;
-      };
-
-      porttype DDS_PSAT_Listen
-      {
-         uses     DDS_Typed::Reader            data;
-         provides DDS_Typed::Listener          data_listener;
-         uses     CCM_DDS::DataListenerControl data_control;
-         provides PSAT_ReaderStatusListener    status;
-         uses     DDS::DataReader              dds_entity;
-         provides PSAT_Interceptor             interceptor;
-         uses     PSAT_BufferControl           buffer_control;
-      };
-
-      // ------------------
-      // DDS PSAT Connector
-      // ------------------
-
-      connector DDS_PSAT_Event : CCM_DDS::DDS_TopicBase
-      {
-         mirrorport DDS_PSAT_Write       supplier;
-         mirrorport DDS_PSAT_Listen      consumer;
-
-         attribute  SharedMemoryConfig   shared_memory_config
-               setraises(CCM_DDS::NonChangeable);
-
-         attribute  BufferPoolConfig     attach_buffer_config
-               setraises(CCM_DDS::NonChangeable);
-
-         attribute  TransportConfig      transports_config
-               setraises(CCM_DDS::NonChangeable);
-      };
-   };
-};
-
-#endif // CCM_DDS_PSAT_IDL
-
diff --git a/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc b/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc
deleted file mode 100644
index 90be1668a36..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc
+++ /dev/null
@@ -1,204 +0,0 @@
-project (DDS_CCM_Example_PSAT_type_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_CCM_Example_PSAT_type_stub
-  dynamicflags += PSAT_TYPE_STUB_BUILD_DLL
-  libout = lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=PSAT_TYPE_STUB_Export \
-              -Wb,stub_export_include=psat_type_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    psat_type.idl
-  }
-
-  opendds_ts_flags += --export=PSAT_TYPE_STUB_Export
-
-  DDSGenerator_Files {
-    psat_type.idl
-  }
-
-  Source_Files {
-  }
-}
-
-project (DDS_CCM_Example_PSAT_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default, dds4ccm, dds4ccm_stub, ccm_stub {
-  sharedname = DDS_CCM_Example_PSAT_stub
-  dynamicflags += CCM_DDS_PSAT_STUB_BUILD_DLL
-  libout = lib
-
-  idlflags += -SS \
-              -Wb,stub_export_macro=CCM_DDS_PSAT_STUB_Export \
-              -Wb,stub_export_include=ccm_dds_psat_stub_export.h \
-              -Wb,skel_export_macro=CCM_DDS_PSAT_SKEL_Export \
-              -Wb,skel_export_include=ccm_dds_psat_skel_export.h \
-              -I $(CIAO_ROOT)/connectors/dds4ccm/idl
-
-  IDL_Files {
-    idlflags += -Gxhst -Gxhsk
-    ccm_dds_psat.idl
-  }
-
-  opendds_ts_flags += --export=CCM_DDS_PSAT_STUB_Export -I $(CIAO_ROOT)/connectors/dds4ccm/idl
-  ndds_ts_flags += -I $(CIAO_ROOT)/connectors/dds4ccm/idl
-
-  DDSGenerator_Files {
-    ccm_dds_psat.idl
-  }
-
-  Source_Files {
-  }
-}
-
-
-project(PSAT_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_CCM_Example_PSAT_type_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=PSAT_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=PSAT_Connector_stub_export.h \
-              -Wb,skel_export_macro=PSAT_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=PSAT_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=PSAT_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=PSAT_Connector_svnt_export.h \
-              -Wb,conn_export_macro=PSAT_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=PSAT_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    PSAT_Connector.idl
-  }
-}
-
-project(PSAT_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += PSAT_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=PSAT_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=PSAT_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    PSAT_ConnectorE.idl
-  }
-}
-
-project(PSAT_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after  += PSAT_Connector_lem_gen \
-            DDS_PSAT_Connector_stub \
-            DDS_CCM_Example_PSAT_stub
-  libs   += DDS_CCM_Example_PSAT_stub \
-            DDS_PSAT_Connector_stub
-  libpaths += lib
-  libout = lib
-  includes += ..
-  sharedname = PSAT_Connector_lem_stub
-  dynamicflags += PSAT_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSAT_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    PSAT_ConnectorEC.h
-    PSAT_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    PSAT_ConnectorEC.inl
-  }
-}
-
-project(DDS_PSAT_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += PSAT_Connector_idl_gen DDS_CCM_Example_PSAT_stub DDS_CCM_Example_PSAT_type_stub
-  libs  += DDS_CCM_Example_PSAT_stub
-  libpaths += lib
-  libout = lib
-  includes += ..
-  sharedname = DDS_PSAT_Connector_stub
-  dynamicflags += PSAT_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSAT_ConnectorC.cpp
-  }
-
-  Header_Files {
-    PSAT_ConnectorC.h
-    PSAT_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    PSAT_ConnectorC.inl
-  }
-}
-
-project(DDS_PSAT_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after    += DDS_CCM_Example_PSAT_type_stub \
-              PSAT_Connector_lem_stub \
-              DDS_PSAT_Connector_stub
-  sharedname = DDS_PSAT_Connector_exec
-  libs += DDS_CCM_Example_PSAT_type_stub \
-          DDS_PSAT_Connector_stub \
-          PSAT_Connector_lem_stub \
-          DDS_CCM_Example_PSAT_stub
-  libpaths += lib
-  libout = lib
-  includes += ..
-  dynamicflags += PSAT_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSAT_Connector_conn.cpp
-  }
-
-  Header_Files {
-    DDS_PSAT_Connector_T.h
-    PSAT_Connector_conn.h
-    PSAT_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_PSAT_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += PSAT_Connector_lem_stub \
-                DDS_PSAT_Connector_exec \
-                DDS_PSAT_Connector_skel
-  sharedname  = DDS_PSAT_Connector_svnt
-  libs       += DDS_PSAT_Connector_stub \
-                PSAT_Connector_lem_stub  \
-                DDS_CCM_Example_PSAT_stub \
-                DDS_PSAT_Connector_exec
-  libpaths += lib
-  libout = lib
-  includes += ..
-  dynamicflags += PSAT_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSAT_ConnectorS.cpp
-    PSAT_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    PSAT_ConnectorS.h
-    PSAT_Connector_svnt.h
-    PSAT_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/PSAT/psat_type.idl b/CIAO/connectors/dds4ccm/tests/PSAT/psat_type.idl
deleted file mode 100644
index 49ff5697c10..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSAT/psat_type.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file   psat_type.idl
- */
-
-#ifndef PSAT_TYPE_IDL
-#define PSAT_TYPE_IDL
-
-#pragma ndds typesupport "psat_typeSupport.h"
-#pragma opendds typesupport "psat_typeTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "TestTopic"
-#pragma DCPS_DATA_KEY "TestTopic key"
-
-struct TestTopic {
-  string key; //@key
-  long x;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TestTopic> TestTopicSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/.gitignore b/CIAO/connectors/dds4ccm/tests/PSLDeadline/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/.gitignore
deleted file mode 100644
index 2d9b539ddab..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/PSL_DeadlineTest_Base.cxx
-/PSL_DeadlineTest_Base.h
-/PSL_DeadlineTest_BasePlugin.cxx
-/PSL_DeadlineTest_BasePlugin.h
-/PSL_DeadlineTest_BaseSupport.cxx
-/PSL_DeadlineTest_BaseSupport.h
-/PSL_DeadlineTest_Base_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl
deleted file mode 100644
index 7ea3138441f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file   PSL_DeadlineTest_Base.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef PSL_DEADLINETEST_BASE_IDL
-#define PSL_DEADLINETEST_BASE_IDL
-
-#pragma ndds typesupport "Base/PSL_DeadlineTest_BaseSupport.h"
-#pragma opendds typesupport "Base/PSL_DeadlineTest_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "TestTopic"
-#pragma DCPS_DATA_KEY "TestTopic key"
-
-struct TestTopic {
-  string key; //@key
-  long x;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TestTopic> TestTopicSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc
deleted file mode 100644
index 66e0b1762cb..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_PSL_DeadlineTest_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_PSL_DeadlineTest_Base_stub
-  dynamicflags += PSL_DEADLINETEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=PSL_DEADLINETEST_BASE_STUB_Export \
-              -Wb,stub_export_include=PSL_DeadlineTest_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    PSL_DeadlineTest_Base.idl
-  }
-
-  opendds_ts_flags += --export=PSL_DEADLINETEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    PSL_DeadlineTest_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/.gitignore
deleted file mode 100644
index 4a97096073c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/PSL_DeadlineTest_ConnectorE.idl
-/PSL_DeadlineTest_Connector_conn.cpp
-/PSL_DeadlineTest_Connector_conn.h
-/PSL_DeadlineTest_Connector_conn_export.h
-/PSL_DeadlineTest_Connector_lem_stub_export.h
-/PSL_DeadlineTest_Connector_stub_export.h
-/PSL_DeadlineTest_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.idl b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.idl
deleted file mode 100644
index 6f3117be92e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file PSL_DeadlineTest_Connector.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef PSL_DeadlineTest_CONNECTOR_IDL_
-#define PSL_DeadlineTest_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/PSL_DeadlineTest_Base.idl"
-
-#pragma ciao lem "Connector/PSL_DeadlineTest_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/PSL_DeadlineTest_BaseTypeSupport.idl"
-#endif
-
-module PSL_DeadlineTest
-{
-  module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> PSLDeadlineConnector;
-};
-
-#endif /* PSL_DeadlineTest_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc
deleted file mode 100644
index 60489f913ca..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_PSL_DeadlineTest_Base -l .. -o ../lib -u DDS PSL_DeadlineTest_Connector"
-
-project(DDS_PSL_DT_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_PSL_DeadlineTest_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=PSL_DEADLINETEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=PSL_DeadlineTest_Connector_stub_export.h \
-              -Wb,skel_export_macro=PSL_DEADLINETEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=PSL_DeadlineTest_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=PSL_DEADLINETEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=PSL_DeadlineTest_Connector_svnt_export.h \
-              -Wb,conn_export_macro=PSL_DEADLINETEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=PSL_DeadlineTest_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    PSL_DeadlineTest_Connector.idl
-  }
-}
-
-project(DDS_PSL_DT_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_PSL_DT_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=PSL_DEADLINETEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=PSL_DeadlineTest_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    PSL_DeadlineTest_ConnectorE.idl
-  }
-}
-
-project(DDS_PSL_DT_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_PSL_DT_Connector_lem_gen DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DeadlineTest_Base_stub
-  libs  += DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DeadlineTest_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_PSL_DT_Connector_lem_stub
-  dynamicflags += PSL_DEADLINETEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSL_DeadlineTest_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    PSL_DeadlineTest_ConnectorEC.h
-    PSL_DeadlineTest_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    PSL_DeadlineTest_ConnectorEC.inl
-  }
-}
-
-project(DDS_PSL_DeadlineTest_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_PSL_DT_Connector_idl_gen DDS_PSL_DeadlineTest_Base_stub
-  libs  += DDS_PSL_DeadlineTest_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_PSL_DeadlineTest_Connector_stub
-  dynamicflags += PSL_DEADLINETEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSL_DeadlineTest_ConnectorC.cpp
-  }
-
-  Header_Files {
-    PSL_DeadlineTest_ConnectorC.h
-    PSL_DeadlineTest_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    PSL_DeadlineTest_ConnectorC.inl
-  }
-}
-
-project(DDS_PSL_DeadlineTest_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_PSL_DT_Connector_lem_stub DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DeadlineTest_Base_stub
-  sharedname = DDS_PSL_DeadlineTest_Connector_exec
-  libs += DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DT_Connector_lem_stub DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DeadlineTest_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += PSL_DEADLINETEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSL_DeadlineTest_Connector_conn.cpp
-  }
-
-  Header_Files {
-    PSL_DeadlineTest_Connector_conn.h
-    PSL_DeadlineTest_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_PSL_DeadlineTest_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_PSL_DT_Connector_lem_stub DDS_PSL_DeadlineTest_Connector_exec DDS_PSL_DeadlineTest_Connector_stub
-  sharedname  = DDS_PSL_DeadlineTest_Connector_svnt
-  libs       += DDS_PSL_DeadlineTest_Connector_stub \
-                DDS_PSL_DT_Connector_lem_stub  \
-                DDS_PSL_DeadlineTest_Base_stub \
-                DDS_PSL_DeadlineTest_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += PSL_DEADLINETEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSL_DeadlineTest_ConnectorS.cpp
-    PSL_DeadlineTest_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    PSL_DeadlineTest_ConnectorS.h
-    PSL_DeadlineTest_Connector_svnt.h
-    PSL_DeadlineTest_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/.gitignore b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/.gitignore
deleted file mode 100644
index dc6edf4befa..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/PSL_DeadlineTest_ReceiverE.idl
-/Receiver_exec_export.h
-/Receiver_lem_stub_export.h
-/Receiver_stub_export.h
-/Receiver_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.idl b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.idl
deleted file mode 100644
index 28afda4aea3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.idl
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * @file
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/PSL_DeadlineTest_Connector.idl"
-
-module PSL_DeadlineTest
-{
-  component Receiver
-  {
-    port PSLDeadlineConnector::DDS_Get info_get;
-    port PSLDeadlineConnector::DDS_Listen info_out;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc
deleted file mode 100644
index d69a0858a80..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc
+++ /dev/null
@@ -1,136 +0,0 @@
-project(DDS_PSL_DeadlineTest_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_PSL_DT_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h \
-              -I..
-
-  IDL_Files {
-    PSL_DeadlineTest_Receiver.idl
-  }
-}
-
-project(DDS_PSL_DeadlineTest_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_PSL_DeadlineTest_Receiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    PSL_DeadlineTest_ReceiverE.idl
-  }
-}
-
-project(DDS_PSL_DT_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_PSL_DeadlineTest_Receiver_lem_gen DDS_PSL_DeadlineTest_Receiver_stub  DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DeadlineTest_Base_stub
-  libs  +=  Receiver_stub DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DeadlineTest_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSL_DeadlineTest_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    PSL_DeadlineTest_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    PSL_DeadlineTest_ReceiverEC.inl
-  }
-}
-
-project(DDS_PSL_DeadlineTest_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_PSL_DeadlineTest_Receiver_idl_gen  DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DT_Connector_lem_gen
-  libs  += DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DeadlineTest_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSL_DeadlineTest_ReceiverC.cpp
-  }
-
-  Header_Files {
-    PSL_DeadlineTest_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    PSL_DeadlineTest_ReceiverC.inl
-  }
-}
-
-project(DDS_PSL_DeadlineTest_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_PSL_DT_Receiver_lem_stub DDS_PSL_DeadlineTest_Receiver_stub DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DT_Connector_lem_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DT_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSL_DeadlineTest_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    PSL_DeadlineTest_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_PSL_DeadlineTest_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_PSL_DT_Receiver_lem_stub DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DeadlineTest_Connector_svnt DDS_PSL_DeadlineTest_Receiver_exec DDS_PSL_DT_Connector_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DeadlineTest_Connector_svnt Receiver_exec DDS_PSL_DT_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSL_DeadlineTest_ReceiverS.cpp
-    PSL_DeadlineTest_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    PSL_DeadlineTest_ReceiverS.h
-    PSL_DeadlineTest_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp
deleted file mode 100644
index d0e8cc74f2d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp
+++ /dev/null
@@ -1,504 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "PSL_DeadlineTest_Receiver_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-#include "dds4ccm/impl/TimeUtilities.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-namespace CIAO_PSL_DeadlineTest_Receiver_Impl
-{
-
-  /**
-   * Read action Generator
-   */
-
-  read_action_Generator::read_action_Generator (Receiver_exec_i &callback)
-    : pulse_callback_ (callback)
-  {
-  }
-
-  read_action_Generator::~read_action_Generator ()
-  {
-  }
-
-  int
-  read_action_Generator::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    this->pulse_callback_.read_all();
-    return 0;
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_get_status_exec_i
-   */
-
-  info_get_status_exec_i::info_get_status_exec_i (
-        ::PSL_DeadlineTest::CCM_Receiver_Context_ptr ctx,
-        Atomic_Short &deadline_port_get,
-        ACE_Thread_ID &thread_id_get)
-    : ciao_context_ (
-        ::PSL_DeadlineTest::CCM_Receiver_Context::_duplicate (ctx))
-      , deadline_port_get_ (deadline_port_get)
-      , thread_id_get_ (thread_id_get)
-  {
-  }
-
-  info_get_status_exec_i::~info_get_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_get_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-  const ::DDS::RequestedDeadlineMissedStatus & status)
-  {
-    if (! ::CORBA::is_nil (the_reader) && status.total_count != 0)
-      {
-        ACE_DEBUG ((LM_DEBUG, "info_get_status_exec_i::on_requested_deadline_missed - "
-                    "on_requested_deadline_missed received in PSL of the Getter\n"));
-        ++this->deadline_port_get_;
-        ACE_Thread_ID t_id;
-        this->thread_id_get_ = t_id;
-      }
-  }
-
-  void
-  info_get_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  info_out_data_listener_exec_i::info_out_data_listener_exec_i (
-        ::PSL_DeadlineTest::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::PSL_DeadlineTest::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::PSL_DeadlineTest::PSLDeadlineConnector::Listener
-
-  void
-  info_out_data_listener_exec_i::on_one_data (const ::TestTopic & datum,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("info_out_data_listener_exec_i::on_one_data - ")
-              ACE_TEXT ("ERROR: received test_topic_info for <%C> at %u\n"),
-              datum.key.in (),
-              datum.x));
-  }
-
-  void
-  info_out_data_listener_exec_i::on_many_data (const ::TestTopicSeq & /* data */,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_status_exec_i
-   */
-
-  info_out_status_exec_i::info_out_status_exec_i (
-        ::PSL_DeadlineTest::CCM_Receiver_Context_ptr ctx,
-        Atomic_Short &deadline_port_listener,
-        ACE_Thread_ID &thread_id_listener)
-    : ciao_context_ (
-        ::PSL_DeadlineTest::CCM_Receiver_Context::_duplicate (ctx))
-      , deadline_port_listener_ (deadline_port_listener)
-      , thread_id_listener_ (thread_id_listener)
-  {
-  }
-
-  info_out_status_exec_i::~info_out_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-  const ::DDS::RequestedDeadlineMissedStatus & status)
-  {
-    if (! ::CORBA::is_nil (the_reader) && status.total_count != 0)
-      {
-        ACE_DEBUG ((LM_DEBUG, "info_get_status_exec_i::on_requested_deadline_missed - "
-                    "on_requested_deadline_missed received in PSL of the Listener\n"));
-        ++this->deadline_port_listener_;
-        ACE_Thread_ID t_id;
-        this->thread_id_listener_ = t_id;
-      }
-  }
-
-  void
-  info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : deadline_port_listener_ (0)
-      , deadline_port_get_ (0)
-      , thread_id_listener_listener_ (0, 0)
-      , thread_id_listener_get_ (0, 0)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      read_action_Generator (*this),
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Receiver_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Receiver_exec_i::read_all (void)
-  {
-    ::PSL_DeadlineTest::PSLDeadlineConnector::Reader_var reader =
-      this->ciao_context_->get_connection_info_out_data();
-    if (::CORBA::is_nil (reader.in ()))
-      {
-        return;
-      }
-    TestTopicSeq TestTopic_infos;
-    ::CCM_DDS::ReadInfoSeq readinfoseq;
-    try
-      {
-        reader->read_all(TestTopic_infos, readinfoseq);
-        for(CORBA::ULong i = 0; i < readinfoseq.length(); ++i)
-          {
-            ACE_Time_Value tv;
-            tv <<= readinfoseq[i].source_timestamp;
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL ReadInfo ")
-                                  ACE_TEXT ("-> UTC date =%#T ")
-                                  ACE_TEXT ("for sample %C:%u\n"),
-                                  &tv,
-                                  TestTopic_infos[i].key.in (),
-                                  TestTopic_infos[i].x));
-          }
-      }
-    catch (const CCM_DDS::InternalError& )
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("internal error or no data\n")));
-      }
-  }
-  // Component attributes and port operations.
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_get_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_get_status_.in ()))
-      {
-        info_get_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_get_status_exec_i (
-            this->ciao_context_.in (),
-            this->deadline_port_get_,
-            this->thread_id_listener_get_),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_get_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_get_status_.in ());
-  }
-
-  ::PSL_DeadlineTest::PSLDeadlineConnector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_out_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ()))
-      {
-        info_out_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_data_listener_exec_i (
-            this->ciao_context_.in ()),
-            ::PSL_DeadlineTest::PSLDeadlineConnector::CCM_Listener::_nil ());
-
-          this->ciao_info_out_data_listener_ = tmp;
-      }
-
-    return
-      ::PSL_DeadlineTest::PSLDeadlineConnector::CCM_Listener::_duplicate (
-        this->ciao_info_out_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ()))
-      {
-        info_out_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_status_exec_i (
-            this->ciao_context_.in (),
-            this->deadline_port_listener_,
-            this->thread_id_listener_listener_),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_out_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_out_status_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::PSL_DeadlineTest::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    ::CCM_DDS::DataListenerControl_var lc =
-      this->ciao_context_->get_connection_info_out_data_control ();
-
-    if (::CORBA::is_nil (lc.in ()))
-      {
-        ACE_ERROR ((LM_INFO, ACE_TEXT ("Error:  Listener control receptacle is null!\n")));
-        throw ::CORBA::INTERNAL ();
-      }
-    lc->mode (::CCM_DDS::NOT_ENABLED);
-
-    // calculate the interval time
-    if (this->reactor ()->schedule_timer (this->ticker_,
-                                          0,
-                                          ACE_Time_Value(2, 0),
-                                          ACE_Time_Value(1, 300000)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, "Unable to schedule Timer\n"));
-      }
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    this->reactor ()->cancel_timer (this->ticker_);
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-     if (this->deadline_port_get_.value () == 0)
-      {
-
-         ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: did not receive the expected ")
-                               ACE_TEXT (" error 'on_requested_deadline_missed' on PortStatusListener Get in Receiver\n")
-                    ));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK : Have received the expected ")
-                              ACE_TEXT ("'on_requested_deadline_missed' %d times in PortStatusListener Get in Receiver\n"),
-                              this->deadline_port_get_.value ()
-                    ));
-      }
-     if (this->deadline_port_listener_.value () == 0)
-      {
-
-         ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: did not receive the expected ")
-                               ACE_TEXT (" error 'on_requested_deadline_missed' on PortStatusListener Listener in Receiver\n")
-                    ));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK : Have received the expected ")
-                              ACE_TEXT ("'on_requested_deadline_missed' %d times in PortStatusListener Listener in Receiver\n"),
-                              this->deadline_port_listener_.value ()
-                    ));
-      }
-        //get current thread
-    char ccm_buf [65];
-    ACE_Thread_ID ccm_thread_id;
-    ccm_thread_id.to_string (ccm_buf);
-
-    char list_buf_1 [65];
-    this->thread_id_listener_get_.to_string (list_buf_1);
-    //check thread switch for listener 1
-    if (this->thread_id_listener_get_.id () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
-                              "Thread ID for PortStatusListener Get not set!\n"));
-      }
-    #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (this->thread_id_listener_get_ == ccm_thread_id)
-      {
-        ACE_DEBUG ((LM_DEBUG, "OK : "
-                              "Thread switch for PortStatusListener Get seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_1,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
-                              "Thread switch for PortStatusListener Get "
-                              "doesn't seem to work! "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_1,
-                              ccm_buf));
-      }
-    #else
-    else if (this->thread_id_listener_get_ == ccm_thread_id)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: PortStatusListener Get: "
-                              "DDS seems to use a CCM thread for its callback: "
-                               "listener <%C> - component <%C>\n",
-                              list_buf_1,
-                              ccm_buf));
-     }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "OK : PortStatusListener Get: "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_1,
-                              ccm_buf));
-      }
-    #endif
-
-    //check thread switch for listener 2
-   char list_buf_2 [65];
-   this->thread_id_listener_listener_.to_string (list_buf_2);
-   if (this->thread_id_listener_listener_.id () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
-                              "Thread ID for PortStatusListener Listener not set!\n"));
-      }
-    #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (this->thread_id_listener_listener_ == ccm_thread_id)
-      {
-        ACE_DEBUG ((LM_DEBUG, "OK : "
-                              "Thread switch for PortStatusListener Listener seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_2,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
-                              "Thread switch for PortStatusListener Listener "
-                              "doesn't seem to work! "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_2,
-                              ccm_buf));
-      }
-    #else
-    else if (this->thread_id_listener_listener_ == ccm_thread_id)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: PortStatusListener Listener: "
-                              "DDS seems to use a CCM thread for its callback: "
-                               "listener <%C> - component <%C>\n",
-                              list_buf_2,
-                              ccm_buf));
-     }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "OK : PortStatusListener Listener: "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_2,
-                              ccm_buf));
-      }
-    #endif
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_PSL_DeadlineTest_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h
deleted file mode 100644
index 28003e60820..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h
+++ /dev/null
@@ -1,240 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_PSL_DEADLINETEST_RECEIVER_EXEC_W7G6VT_H_
-#define CIAO_PSL_DEADLINETEST_RECEIVER_EXEC_W7G6VT_H_
-
-#include /**/ "ace/pre.h"
-
-#include "PSL_DeadlineTest_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_PSL_DeadlineTest_Receiver_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Short > Atomic_Short;
-
-  class Receiver_exec_i;
-  /**
-   * Read action generator
-   */
-
-  class read_action_Generator
-    : public ACE_Event_Handler
-  {
-  public:
-    read_action_Generator (Receiver_exec_i &callback);
-
-    ~read_action_Generator ();
-
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-
-  private:
-    Receiver_exec_i &pulse_callback_;
-
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_get_status_exec_i
-   */
-
-  class info_get_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_get_status_exec_i (
-      ::PSL_DeadlineTest::CCM_Receiver_Context_ptr ctx,
-      Atomic_Short &deadline_port_get,
-      ACE_Thread_ID &thread_id_get);
-    virtual ~info_get_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::PSL_DeadlineTest::CCM_Receiver_Context_var ciao_context_;
-    Atomic_Short &deadline_port_get_;
-    ACE_Thread_ID &thread_id_get_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  class info_out_data_listener_exec_i
-    : public virtual ::PSL_DeadlineTest::PSLDeadlineConnector::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_data_listener_exec_i (
-      ::PSL_DeadlineTest::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from PSL_DeadlineTest::PSLDeadlineConnector::Listener. */
-
-    virtual
-    void on_one_data (const ::TestTopic & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (const ::TestTopicSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    ::PSL_DeadlineTest::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_status_exec_i
-   */
-
-  class info_out_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_status_exec_i (
-      ::PSL_DeadlineTest::CCM_Receiver_Context_ptr ctx,
-      Atomic_Short &deadline_port_listener,
-      ACE_Thread_ID &thread_id_listener);
-    virtual ~info_out_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::PSL_DeadlineTest::CCM_Receiver_Context_var ciao_context_;
-    Atomic_Short &deadline_port_listener_;
-    ACE_Thread_ID &thread_id_listener_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_get_status (void);
-
-    virtual ::PSL_DeadlineTest::PSLDeadlineConnector::CCM_Listener_ptr
-    get_info_out_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_status (void);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void read_all(void);
-
-    //@}
-
-  private:
-    ::PSL_DeadlineTest::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_get_status_;
-    ::PSL_DeadlineTest::PSLDeadlineConnector::CCM_Listener_var ciao_info_out_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    read_action_Generator * ticker_;
-
-    Atomic_Short deadline_port_listener_;
-    Atomic_Short deadline_port_get_;
-    ACE_Thread_ID thread_id_listener_listener_;
-    ACE_Thread_ID thread_id_listener_get_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_PSL_DeadlineTest_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/.gitignore b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/.gitignore
deleted file mode 100644
index c687f2550a7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/PSL_DeadlineTest_SenderE.idl
-/Sender_exec_export.h
-/Sender_lem_stub_export.h
-/Sender_stub_export.h
-/Sender_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.idl b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.idl
deleted file mode 100644
index 0d5dc07f572..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.idl
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef DDS_PSL_DEADLINETEST_SENDER_IDL
-#define DDS_PSL_DEADLINETEST_SENDER_IDL
-
-#include "Connector/PSL_DeadlineTest_Connector.idl"
-
-module PSL_DeadlineTest
-{
-  component Sender
-  {
-     port PSLDeadlineConnector::DDS_Write test_topic_write;
-     provides CCM_DDS::ConnectorStatusListener test_topic_connector_status;
-
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc
deleted file mode 100644
index 6a4e5555900..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc
+++ /dev/null
@@ -1,138 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_PSL_DeadlineTest_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_PSL_DeadlineTest_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_PSL_DT_Connector_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I..
-
-  IDL_Files {
-    PSL_DeadlineTest_Sender.idl
-  }
-}
-
-project(DDS_PSL_DeadlineTest_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_PSL_DeadlineTest_Sender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    PSL_DeadlineTest_SenderE.idl
-  }
-}
-
-project(DDS_PSL_DeadlineTest_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_PSL_DeadlineTest_Sender_lem_gen DDS_PSL_DeadlineTest_Sender_stub DDS_PSL_DeadlineTest_Base_stub
-  libs  += DDS_PSL_DeadlineTest_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSL_DeadlineTest_SenderEC.cpp
-  }
-
-  Header_Files {
-    PSL_DeadlineTest_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    PSL_DeadlineTest_SenderEC.inl
-  }
-}
-
-project(DDS_PSL_DeadlineTest_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_PSL_DeadlineTest_Sender_idl_gen DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DeadlineTest_Connector_stub
-  libs  += DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DeadlineTest_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSL_DeadlineTest_SenderC.cpp
-  }
-
-  Header_Files {
-    PSL_DeadlineTest_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    PSL_DeadlineTest_SenderC.inl
-  }
-}
-
-project(DDS_PSL_DeadlineTest_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_PSL_DeadlineTest_Sender_lem_stub DDS_PSL_DeadlineTest_Sender_stub DDS_PSL_DT_Connector_lem_stub DDS_PSL_DeadlineTest_Connector_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DT_Connector_lem_stub  DDS_PSL_DeadlineTest_Connector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSL_DeadlineTest_Sender_exec.cpp
-  }
-
-  Header_Files {
-    PSL_DeadlineTest_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_PSL_DeadlineTest_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_PSL_DeadlineTest_Base_stub  DDS_PSL_DeadlineTest_Sender_lem_stub DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DeadlineTest_Connector_svnt DDS_PSL_DT_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DeadlineTest_Connector_stub  DDS_PSL_DeadlineTest_Connector_svnt DDS_PSL_DT_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSL_DeadlineTest_SenderS.cpp
-    PSL_DeadlineTest_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    PSL_DeadlineTest_SenderS.h
-    PSL_DeadlineTest_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp
deleted file mode 100644
index fc1f81ade1f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp
+++ /dev/null
@@ -1,292 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "PSL_DeadlineTest_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_PSL_DeadlineTest_Sender_Impl
-{
-
-  /**
-   * Write action generator
-   */
-
-  pulse_Generator::pulse_Generator (Sender_exec_i &callback)
-    : pulse_callback_ (callback)
-  {
-  }
-
-  int
-  pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    this->pulse_callback_.tick ();
-    return 0;
-  }
-
-  /**
-   * Facet Executor Implementation Class: test_topic_connector_status_exec_i
-   */
-
-  test_topic_connector_status_exec_i::test_topic_connector_status_exec_i (
-        ::PSL_DeadlineTest::CCM_Sender_Context_ptr ctx)
-    : ciao_context_ (
-        ::PSL_DeadlineTest::CCM_Sender_Context::_duplicate (ctx))
-  {
-  }
-
-  test_topic_connector_status_exec_i::~test_topic_connector_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-
-  void
-  test_topic_connector_status_exec_i::on_inconsistent_topic (::DDS::Topic_ptr /* the_topic */,
-  const ::DDS::InconsistentTopicStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  test_topic_connector_status_exec_i::on_requested_incompatible_qos (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedIncompatibleQosStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  test_topic_connector_status_exec_i::on_sample_rejected (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleRejectedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  test_topic_connector_status_exec_i::on_offered_deadline_missed (::DDS::DataWriter_ptr /* the_writer */,
-  const ::DDS::OfferedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  test_topic_connector_status_exec_i::on_offered_incompatible_qos (::DDS::DataWriter_ptr /* the_writer */,
-  const ::DDS::OfferedIncompatibleQosStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  test_topic_connector_status_exec_i::on_unexpected_status (::DDS::Entity_ptr /* the_entity */,
-  ::DDS::StatusKind /* status_kind */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      pulse_Generator (*this),
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Sender_exec_i::tick ()
-  {
-    ::PSL_DeadlineTest::PSLDeadlineConnector::Writer_var writer =
-      this->ciao_context_->get_connection_test_topic_write_data ();
-
-    for (PSL_DLTest_Table::iterator i = this->_ktests_.begin ();
-         i != this->_ktests_.end ();
-         ++i)
-      {
-         try
-          {
-            if (! ::CORBA::is_nil (writer.in ()))
-              {
-                writer->write_one(i->second,::DDS::HANDLE_NIL);
-                i->second->x++;
-              }
-          }
-         catch (const CCM_DDS::InternalError& )
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while creating topic for <%C>.\n"),
-                    i->first.c_str ()));
-          }
-       }
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    // deadline period in QoS is set to two so the reader expects data every
-    // two seconds. Setting the interval to somewhat more than two seconds,
-    // the reader should (almost) always receive an on_requested_deadline_missed
-    // callback from DDS.
-    long sec = 2L;
-    long const usec = 100000L;
-    if (this->reactor ()->schedule_timer (
-                this->ticker_,
-                0,
-                ACE_Time_Value (sec, usec),
-                ACE_Time_Value (sec, usec)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                             ACE_TEXT ("Error scheduling timer")));
-      }
-  }
-
-  void
-  Sender_exec_i::stop (void)
-  {
-    this->reactor ()->cancel_timer (this->ticker_);
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n")));
-  }
-
-  void
-  Sender_exec_i::add_instance_of_topic (const char * key, int x)
-  {
-    TestTopic *new_key = new TestTopic;
-    new_key->key = CORBA::string_dup(key);
-    new_key->x = x;
-    this->_ktests_[key] = new_key;
-  }
-
-  // Component attributes and port operations.
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_test_topic_connector_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_test_topic_connector_status_.in ()))
-      {
-        test_topic_connector_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          test_topic_connector_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_ConnectorStatusListener::_nil ());
-
-          this->ciao_test_topic_connector_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_ConnectorStatusListener::_duplicate (
-        this->ciao_test_topic_connector_status_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::PSL_DeadlineTest::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-    //add 2 different instances of topic
-    this->add_instance_of_topic ("ONE", 1);
-    this->add_instance_of_topic ("ONE", 2);
-    this->add_instance_of_topic ("ONE", 3);
-    this->add_instance_of_topic ("ONE", 4);
-    this->add_instance_of_topic ("ONE", 5);
-    this->add_instance_of_topic ("TWO", 1);
-    this->add_instance_of_topic ("TWO", 2);
-    this->add_instance_of_topic ("TWO", 3);
-    this->add_instance_of_topic ("TWO", 4);
-    this->add_instance_of_topic ("TWO", 5);
-    this->start ();
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    this->stop ();
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_PSL_DeadlineTest_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.h
deleted file mode 100644
index 7ad27c5579e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.h
+++ /dev/null
@@ -1,185 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_PSL_DEADLINETEST_SENDER_EXEC_RFOSRO_H_
-#define CIAO_PSL_DEADLINETEST_SENDER_EXEC_RFOSRO_H_
-
-#include /**/ "ace/pre.h"
-
-#include "PSL_DeadlineTest_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-#include <map>
-
-namespace CIAO_PSL_DeadlineTest_Sender_Impl
-{
-
- typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
-
-  class Sender_exec_i;
-
-  /**
-   * Write action generator
-   */
-
-  class pulse_Generator :
-    public ACE_Event_Handler
-  {
-  public:
-    pulse_Generator (Sender_exec_i &callback);
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    Sender_exec_i &pulse_callback_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: test_topic_connector_status_exec_i
-   */
-
-  class test_topic_connector_status_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    test_topic_connector_status_exec_i (
-      ::PSL_DeadlineTest::CCM_Sender_Context_ptr ctx);
-    virtual ~test_topic_connector_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-    const ::DDS::InconsistentTopicStatus & status);
-
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedIncompatibleQosStatus & status);
-
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleRejectedStatus & status);
-
-    virtual
-    void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-    const ::DDS::OfferedDeadlineMissedStatus & status);
-
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-    const ::DDS::OfferedIncompatibleQosStatus & status);
-
-    virtual
-    void on_unexpected_status (::DDS::Entity_ptr the_entity,
-    ::DDS::StatusKind status_kind);
-    //@}
-
-  private:
-    ::PSL_DeadlineTest::CCM_Sender_Context_var ciao_context_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_test_topic_connector_status (void);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-   void tick (void);
-
-    //@}
-
-  private:
-    ::PSL_DeadlineTest::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::CCM_DDS::CCM_ConnectorStatusListener_var ciao_test_topic_connector_status_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    pulse_Generator * ticker_;
-
-    TAO_SYNCH_MUTEX mutex_;
-    typedef std::map<ACE_CString, TestTopic_var> PSL_DLTest_Table;
-    PSL_DLTest_Table _ktests_;
-
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void start (void);
-    void stop (void);
-
-    void add_instance_of_topic (const char *, int x );
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_PSL_DeadlineTest_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/Deadline_Library.xml b/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/Deadline_Library.xml
deleted file mode 100644
index 3f0b16fb65f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/Deadline_Library.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-  <qos_profile name="DeadlineProfile">
-     <datawriter_qos>
-          <reliability>
-               <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-               <max_blocking_time>
-                    <sec>1</sec>
-                    <nanosec>0</nanosec>
-               </max_blocking_time>
-         </reliability>
-          <durability>
-               <kind>TRANSIENT_DURABILITY_QOS</kind>
-          </durability>
-          <history>
-               <kind>KEEP_ALL_HISTORY_QOS</kind>
-               <depth>2</depth>
-          </history>
-          <deadline>
-               <period>
-                    <sec>2</sec>
-                    <nanosec>0</nanosec>
-               </period>
-          </deadline>
-     </datawriter_qos>
-    <datareader_qos>
-          <reliability>
-               <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-          </reliability>
-          <history>
-               <kind>KEEP_ALL_HISTORY_QOS</kind>
-               <depth>1</depth>
-          </history>
-          <durability>
-                 <kind>TRANSIENT_DURABILITY_QOS</kind>
-          </durability>
-          <time_based_filter>
-               <minimum_separation>
-                    <sec>1</sec>
-                    <nanosec>50000000</nanosec>
-               </minimum_separation>
-          </time_based_filter>
-          <deadline>
-               <period>
-                    <sec>2</sec>
-                    <nanosec>0</nanosec>
-               </period>
-          </deadline>
-     </datareader_qos>
-  </qos_profile>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/Plan.cdp
deleted file mode 100644
index 516e0b44275..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/Plan.cdp
+++ /dev/null
@@ -1,431 +0,0 @@
-<!--  -->
-<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>PSL_DeadlineTest_Depl_1</label>
-  <UUID>PSL_DeadlineTest_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PSL_DeadlineTest_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PSL_DeadlineTest_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="PSL_DeadlineTest_ConnectorComponentImplementation">
-    <name>PSL_DeadlineTest_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="PSL_DeadlineTest_Connector_ExecArtifact" />
-    <artifact xmi:idref="PSL_DeadlineTest_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PSL_DeadlineTest_PSLDeadlineConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PSL_DeadlineTest_PSLDeadlineConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PSL_DeadlineTest_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PSL_DeadlineTest_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PSL_DeadlineTest_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PSL_DeadlineTest_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-  </instance>
-
-  <instance xmi:id="PSL_DeadlineTest_ConnectorComponentInstance">
-    <name>PSL_DeadlineTest_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="PSL_DeadlineTest_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestQoS</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-    <name>qos_profile</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>Deadline_Library#DeadlineProfile</string>
-      </value>
-    </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="PSL_DeadlineTest_ConnectorComponentInstance2">
-    <name>PSL_DeadlineTest_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="PSL_DeadlineTest_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestQoS</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Deadline_Library#DeadlineProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-  </instance>
-
-  <connection>
-    <name>_listenercontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="PSL_DeadlineTest_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_portstatuslistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="PSL_DeadlineTest_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_portstatuslistener2</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="PSL_DeadlineTest_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="PSL_DeadlineTest_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>info_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="PSL_DeadlineTest_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>test_topic_connector_status_sender</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>test_topic_connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="PSL_DeadlineTest_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>test_topic_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="PSL_DeadlineTest_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="PSL_DeadlineTest_Connector_ExecArtifact">
-    <name>PSL_DeadlineTest_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_PSL_DeadlineTest_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="PSL_DeadlineTest_Connector_SvntArtifact">
-    <name>PSL_DeadlineTest_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_PSL_DeadlineTest_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="PSL_DeadlineTest_Connector_StubArtifact">
-    <name>PSL_DeadlineTest_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_PSL_DeadlineTest_Connector_stub</location>
-  </artifact>
-
-
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index 116879bcf87..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-Description
-XML QoS Profile
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="Deadline_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="DeadlineProfile" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>1</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-          <depth>2</depth>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-        <deadline>
-          <period>
-            <sec>2</sec>
-            <nanosec>0</nanosec>
-          </period>
-        </deadline>
-      </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-          <depth>1</depth>
-        </history>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <time_based_filter>
-          <minimum_separation>
-            <sec>1</sec>
-            <nanosec>50000000</nanosec>
-          </minimum_separation>
-        </time_based_filter>
-        <deadline>
-          <period>
-            <sec>2</sec>
-            <nanosec>0</nanosec>
-          </period>
-        </deadline>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl
deleted file mode 100755
index 3318cb486e1..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 20 seconds to allow task to complete\n";
-sleep (20);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -s\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/.gitignore b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/.gitignore
deleted file mode 100644
index 944232d98a4..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/PSL_SampleLost_Base.cxx
-/PSL_SampleLost_Base.h
-/PSL_SampleLost_BasePlugin.cxx
-/PSL_SampleLost_BasePlugin.h
-/PSL_SampleLost_BaseSupport.cxx
-/PSL_SampleLost_BaseSupport.h
-/PSL_SampleLost_Base_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl
deleted file mode 100644
index 9ba9ea7c56b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file   PSL_SampleLost_Base.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef PSL_SAMPLELOST_BASE_IDL
-#define PSL_SAMPLELOST_BASE_IDL
-
-#pragma ndds typesupport "Base/PSL_SampleLost_BaseSupport.h"
-#pragma opendds typesupport "Base/PSL_SampleLost_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "TestTopic"
-#pragma DCPS_DATA_KEY "TestTopic key"
-
-struct TestTopic {
-  string key; //@key
-  long x;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TestTopic> TestTopicSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc
deleted file mode 100644
index 7fc4f39128e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_PSL_SampleLost_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_PSL_SampleLost_Base_stub
-  dynamicflags += PSL_SAMPLELOST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=PSL_SAMPLELOST_BASE_STUB_Export \
-              -Wb,stub_export_include=PSL_SampleLost_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    PSL_SampleLost_Base.idl
-  }
-
-  opendds_ts_flags += --export=PSL_SAMPLELOST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    PSL_SampleLost_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.idl b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.idl
deleted file mode 100644
index b79b3fa1266..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file PSL_SampleLost_Connector.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef PSL_SampleLost_CONNECTOR_IDL_
-#define PSL_SampleLost_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/PSL_SampleLost_Base.idl"
-
-#pragma ciao lem "Connector/PSL_SampleLost_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/PSL_SampleLost_BaseTypeSupport.idl"
-#endif
-
-module PSL_SampleLost
-{
-  module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> PSL_SampleLostConnector;
-};
-
-#endif /* PSL_SampleLost_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc
deleted file mode 100644
index 1f208fcca53..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_PSL_SampleLost_Base -l .. -o ../lib -u DDS PSL_SampleLost_Connector"
-
-project(DDS_PSL_SL_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_PSL_SampleLost_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=PSL_SAMPLELOST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=PSL_SampleLost_Connector_stub_export.h \
-              -Wb,skel_export_macro=PSL_SAMPLELOST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=PSL_SampleLost_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=PSL_SAMPLELOST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=PSL_SampleLost_Connector_svnt_export.h \
-              -Wb,conn_export_macro=PSL_SAMPLELOST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=PSL_SampleLost_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    PSL_SampleLost_Connector.idl
-  }
-}
-
-project(DDS_PSL_SL_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_PSL_SL_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=PSL_SAMPLELOST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=PSL_SampleLost_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    PSL_SampleLost_ConnectorE.idl
-  }
-}
-
-project(DDS_PSL_SL_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_PSL_SL_Connector_lem_gen DDS_PSL_SampleLost_Connector_stub DDS_PSL_SampleLost_Base_stub
-  libs  += DDS_PSL_SampleLost_Base_stub DDS_PSL_SampleLost_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_PSL_SL_Connector_lem_stub
-  dynamicflags += PSL_SAMPLELOST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSL_SampleLost_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    PSL_SampleLost_ConnectorEC.h
-    PSL_SampleLost_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    PSL_SampleLost_ConnectorEC.inl
-  }
-}
-
-project(DDS_PSL_SampleLost_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_PSL_SL_Connector_idl_gen DDS_PSL_SampleLost_Base_stub
-  libs  += DDS_PSL_SampleLost_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_PSL_SampleLost_Connector_stub
-  dynamicflags += PSL_SAMPLELOST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSL_SampleLost_ConnectorC.cpp
-  }
-
-  Header_Files {
-    PSL_SampleLost_ConnectorC.h
-    PSL_SampleLost_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    PSL_SampleLost_ConnectorC.inl
-  }
-}
-
-project(DDS_PSL_SampleLost_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_PSL_SL_Connector_lem_stub DDS_PSL_SampleLost_Connector_stub DDS_PSL_SampleLost_Base_stub
-  sharedname = DDS_PSL_SampleLost_Connector_exec
-  libs += DDS_PSL_SampleLost_Connector_stub DDS_PSL_SL_Connector_lem_stub DDS_PSL_SampleLost_Base_stub DDS_PSL_SampleLost_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += PSL_SAMPLELOST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSL_SampleLost_Connector_conn.cpp
-  }
-
-  Header_Files {
-    PSL_SampleLost_Connector_conn.h
-    PSL_SampleLost_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_PSL_SampleLost_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_PSL_SL_Connector_lem_stub DDS_PSL_SampleLost_Connector_exec DDS_PSL_SampleLost_Connector_stub
-  sharedname  = DDS_PSL_SampleLost_Connector_svnt
-  libs       += DDS_PSL_SampleLost_Connector_stub \
-                DDS_PSL_SL_Connector_lem_stub  \
-                DDS_PSL_SampleLost_Base_stub \
-                DDS_PSL_SampleLost_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += PSL_SAMPLELOST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSL_SampleLost_ConnectorS.cpp
-    PSL_SampleLost_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    PSL_SampleLost_ConnectorS.h
-    PSL_SampleLost_Connector_svnt.h
-    PSL_SampleLost_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.idl b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.idl
deleted file mode 100644
index 9d22dcc4c64..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.idl
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * @file
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/PSL_SampleLost_Connector.idl"
-
-module PSL_SampleLost
-{
-  component Receiver
-  {
-    port PSL_SampleLostConnector::DDS_Get info_get;
-    port PSL_SampleLostConnector::DDS_Listen info_out;
-   };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc
deleted file mode 100644
index 1b65cc914fe..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc
+++ /dev/null
@@ -1,136 +0,0 @@
-project(DDS_PSL_SampleLost_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_PSL_SL_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h \
-              -I..
-
-  IDL_Files {
-    PSL_SampleLost_Receiver.idl
-  }
-}
-
-project(DDS_PSL_SampleLost_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_PSL_SampleLost_Receiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    PSL_SampleLost_ReceiverE.idl
-  }
-}
-
-project(DDS_PSL_SL_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_PSL_SampleLost_Receiver_lem_gen DDS_PSL_SampleLost_Receiver_stub  DDS_PSL_SampleLost_Connector_stub DDS_PSL_SampleLost_Base_stub
-  libs  +=  Receiver_stub DDS_PSL_SampleLost_Connector_stub DDS_PSL_SampleLost_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSL_SampleLost_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    PSL_SampleLost_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    PSL_SampleLost_ReceiverEC.inl
-  }
-}
-
-project(DDS_PSL_SampleLost_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_PSL_SampleLost_Receiver_idl_gen  DDS_PSL_SampleLost_Connector_stub DDS_PSL_SampleLost_Base_stub DDS_PSL_SL_Connector_lem_gen
-  libs  += DDS_PSL_SampleLost_Connector_stub DDS_PSL_SampleLost_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSL_SampleLost_ReceiverC.cpp
-  }
-
-  Header_Files {
-    PSL_SampleLost_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    PSL_SampleLost_ReceiverC.inl
-  }
-}
-
-project(DDS_PSL_SampleLost_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_PSL_SL_Receiver_lem_stub DDS_PSL_SampleLost_Receiver_stub DDS_PSL_SampleLost_Base_stub DDS_PSL_SampleLost_Connector_stub DDS_PSL_SL_Connector_lem_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_PSL_SampleLost_Base_stub DDS_PSL_SampleLost_Connector_stub DDS_PSL_SL_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSL_SampleLost_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    PSL_SampleLost_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_PSL_SampleLost_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_PSL_SL_Receiver_lem_stub DDS_PSL_SampleLost_Base_stub DDS_PSL_SampleLost_Connector_stub DDS_PSL_SampleLost_Connector_svnt DDS_PSL_SampleLost_Receiver_exec DDS_PSL_SL_Connector_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_PSL_SampleLost_Base_stub DDS_PSL_SampleLost_Connector_stub DDS_PSL_SampleLost_Connector_svnt Receiver_exec DDS_PSL_SL_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSL_SampleLost_ReceiverS.cpp
-    PSL_SampleLost_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    PSL_SampleLost_ReceiverS.h
-    PSL_SampleLost_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp
deleted file mode 100644
index 73738cea795..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp
+++ /dev/null
@@ -1,506 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "PSL_SampleLost_Receiver_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-#include "dds4ccm/impl/TimeUtilities.h"
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-namespace CIAO_PSL_SampleLost_Receiver_Impl
-{
-  /**
-   * Read action generator
-   */
-
-  read_action_Generator::read_action_Generator (Receiver_exec_i &callback)
-    : pulse_callback_ (callback)
-  {
-  }
-
-  read_action_Generator::~read_action_Generator ()
-  {
-  }
-
-  int
-  read_action_Generator::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    this->pulse_callback_.read_all();
-    return 0;
-  }
-
-
-  /**
-   * Facet Executor Implementation Class: info_get_status_exec_i
-   */
-
-  info_get_status_exec_i::info_get_status_exec_i (
-        ::PSL_SampleLost::CCM_Receiver_Context_ptr ctx,
-        Atomic_Boolean &sample_port_get,
-        ACE_Thread_ID &thread_id_listener_get)
-    : ciao_context_ (
-        ::PSL_SampleLost::CCM_Receiver_Context::_duplicate (ctx))
-      , sample_port_get_ (sample_port_get)
-      , thread_id_listener_get_ (thread_id_listener_get)
-  {
-  }
-
-  info_get_status_exec_i::~info_get_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_get_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_get_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & status)
-  {
-    ACE_Thread_ID t_id;
-    this->thread_id_listener_get_ = t_id;
-
-    if (status.total_count > 0)
-      {
-        this->sample_port_get_ = true;
-      }
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  info_out_data_listener_exec_i::info_out_data_listener_exec_i (
-        ::PSL_SampleLost::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::PSL_SampleLost::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::PSL_SampleLost::PSL_SampleLostConnector::Listener
-
-  void
-  info_out_data_listener_exec_i::on_one_data (const ::TestTopic & datum,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("TestTopic_RawListener: ")
-            ACE_TEXT ("ERROR: received test_topic_info for <%C> at %u\n"),
-            datum.key.in (),
-            datum.x));
-  }
-
-  void
-  info_out_data_listener_exec_i::on_many_data (const ::TestTopicSeq & /* data */,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_status_exec_i
-   */
-
-  info_out_status_exec_i::info_out_status_exec_i (
-        ::PSL_SampleLost::CCM_Receiver_Context_ptr ctx,
-        Atomic_Boolean &sample_port_listener,
-        ACE_Thread_ID &thread_id_listener_listener)
-    : ciao_context_ (
-        ::PSL_SampleLost::CCM_Receiver_Context::_duplicate (ctx))
-      , sample_port_listener_ (sample_port_listener)
-      , thread_id_listener_listener_ (thread_id_listener_listener)
-  {
-  }
-
-  info_out_status_exec_i::~info_out_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & status)
-  {
-    ACE_Thread_ID t_id;
-    this->thread_id_listener_listener_ = t_id;
-
-    if (status.total_count > 0)
-      {
-        this->sample_port_listener_ = true;
-      }
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : sample_port_get_ (false)
-      , sample_port_listener_ (false)
-      , thread_id_listener_get_ (0, 0)
-      , thread_id_listener_listener_ (0, 0)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      read_action_Generator (*this),
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Receiver_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Receiver_exec_i::read_all (void)
-  {
-    ::PSL_SampleLost::PSL_SampleLostConnector::Reader_var reader =
-      this->ciao_context_->get_connection_info_out_data ();
-
-    if (!::CORBA::is_nil (reader.in ()))
-      {
-        TestTopicSeq TestTopic_infos;
-        ::CCM_DDS::ReadInfoSeq readinfoseq;
-        try
-          {
-            reader->read_all(TestTopic_infos, readinfoseq);
-            for(CORBA::ULong i = 0; i < readinfoseq.length(); ++i)
-              {
-                ACE_Time_Value tv;
-                tv <<= readinfoseq[i].source_timestamp;
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL ReadInfo ")
-                                      ACE_TEXT ("-> UTC date =%#T\n"),
-                                      &tv));
-              }
-            for(CORBA::ULong i = 0; i < TestTopic_infos.length(); ++i)
-              {
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL keyed test info : ")
-                      ACE_TEXT ("Number <%d> : received TestTopic_info for <%C> at %u\n"),
-                    i,
-                    TestTopic_infos[i].key.in (),
-                    TestTopic_infos[i].x));
-              }
-          }
-        catch (const CCM_DDS::InternalError& )
-          {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("internal error or no data\n")));
-          }
-      }
-  }
-
-  // Component attributes and port operations.
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_get_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_get_status_.in ()))
-      {
-        info_get_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_get_status_exec_i (
-            this->ciao_context_.in (),
-            this->sample_port_get_,
-            this->thread_id_listener_get_),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_get_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_get_status_.in ());
-  }
-
-  ::PSL_SampleLost::PSL_SampleLostConnector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_out_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ()))
-      {
-        info_out_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_data_listener_exec_i (
-            this->ciao_context_.in ()),
-            ::PSL_SampleLost::PSL_SampleLostConnector::CCM_Listener::_nil ());
-
-          this->ciao_info_out_data_listener_ = tmp;
-      }
-
-    return
-      ::PSL_SampleLost::PSL_SampleLostConnector::CCM_Listener::_duplicate (
-        this->ciao_info_out_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ()))
-      {
-        info_out_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_status_exec_i (
-            this->ciao_context_.in (),
-            this->sample_port_listener_,
-            this->thread_id_listener_listener_),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_out_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_out_status_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::PSL_SampleLost::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    ::CCM_DDS::DataListenerControl_var lc =
-    this->ciao_context_->get_connection_info_out_data_control ();
-
-    if (::CORBA::is_nil (lc.in ()))
-      {
-        ACE_ERROR ((LM_INFO, ACE_TEXT ("Error:  Listener control receptacle is null!\n")));
-        throw ::CORBA::INTERNAL ();
-      }
-    lc->mode (::CCM_DDS::NOT_ENABLED);
-
-    // calculate the interval time
-    long const usec = 100000;
-    if (this->reactor ()->schedule_timer (this->ticker_,
-                                          0,
-                                          ACE_Time_Value(3, usec),
-                                          ACE_Time_Value(3, usec)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, "Unable to schedule Timer\n"));
-      }
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    this->reactor ()->cancel_timer (this->ticker_);
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-     if(!this->sample_port_get_.value ())
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: did not receive the expected ")
-                         ACE_TEXT ("error 'on_sample_lost' on DDS_Listen port in Receiver\n")
-              ));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK : Have received the expected ")
-                               ACE_TEXT ("'on_sample_lost' in on DDS_Listen port Receiver\n")
-                    ));
-      }
-    if (!this->sample_port_listener_.value ())
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: did not receive the expected ")
-                         ACE_TEXT ("error 'on_sample_lost' on DDS_Get port in Receiver\n")
-              ));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK : Have received the expected ")
-                               ACE_TEXT ("'on_sample_lost' in on DDS_GET port Receiver\n")
-                    ));
-      }
-             //get current thread
-    char ccm_buf [65];
-    ACE_Thread_ID ccm_thread_id;
-    ccm_thread_id.to_string (ccm_buf);
-
-    char list_buf_1 [65];
-    this->thread_id_listener_get_.to_string (list_buf_1);
-
-    //check thread switch for listener 1
-    if (this->thread_id_listener_get_.id () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
-                              "Thread ID for PortStatusListener Get not set!\n"));
-      }
-    #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (this->thread_id_listener_get_ == ccm_thread_id)
-      {
-        ACE_DEBUG ((LM_DEBUG, "OK : "
-                              "Thread switch for PortStatusListener Get seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                               "listener <%C> - component <%C>\n",
-                              list_buf_1,
-                              ccm_buf));
-     }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
-                              "Thread switch for PortStatusListener Get "
-                              "doesn't seem to work! "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_1,
-                              ccm_buf));
-      }
-    #else
-    else if (this->thread_id_listener_get_ == ccm_thread_id)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: PortStatusListener Get: "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_1,
-                              ccm_buf));
-     }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "OK : PortStatusListener Get: "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_1,
-                              ccm_buf));
-      }
-    #endif
-
-    //check thread switch for listener 2
-    char list_buf_2 [65];
-   this->thread_id_listener_listener_.to_string (list_buf_2);
-   if (this->thread_id_listener_listener_.id () == 0)
-     {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
-                              "Thread ID for PortStatusListener Listener not set!\n"));
-      }
-    #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (this->thread_id_listener_listener_ == ccm_thread_id)
-      {
-        ACE_DEBUG ((LM_DEBUG, "OK : "
-                              "Thread switch for PortStatusListener Listener seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_2,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
-                              "Thread switch for PortStatusListener Listener "
-                              "doesn't seem to work! "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_2,
-                              ccm_buf));
-      }
-    #else
-    else if (this->thread_id_listener_listener_ == ccm_thread_id)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: PortStatusListener Listener: "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_2,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "OK : PortStatusListener Listener: "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_2,
-                              ccm_buf));
-      }
-    #endif
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_PSL_SampleLost_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h
deleted file mode 100644
index a70f89dfc7f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h
+++ /dev/null
@@ -1,241 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_PSL_SAMPLELOST_RECEIVER_EXEC_G6JDCF_H_
-#define CIAO_PSL_SAMPLELOST_RECEIVER_EXEC_G6JDCF_H_
-
-#include /**/ "ace/pre.h"
-
-#include "PSL_SampleLost_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_PSL_SampleLost_Receiver_Impl
-{
-
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean> Atomic_Boolean;
-
-  class Receiver_exec_i;
-
-  /**
-   * Read action generator
-   */
-
-  class read_action_Generator
-    : public ACE_Event_Handler
-  {
-  public:
-    read_action_Generator (Receiver_exec_i &callback);
-
-    ~read_action_Generator ();
-
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-
-  private:
-    Receiver_exec_i &pulse_callback_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_get_status_exec_i
-   */
-
-  class info_get_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_get_status_exec_i (
-      ::PSL_SampleLost::CCM_Receiver_Context_ptr ctx,
-      Atomic_Boolean &sample_port_get,
-      ACE_Thread_ID &thread_id_listener_get);
-    virtual ~info_get_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::PSL_SampleLost::CCM_Receiver_Context_var ciao_context_;
-    Atomic_Boolean &sample_port_get_;
-    ACE_Thread_ID &thread_id_listener_get_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  class info_out_data_listener_exec_i
-    : public virtual ::PSL_SampleLost::PSL_SampleLostConnector::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_data_listener_exec_i (
-      ::PSL_SampleLost::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from PSL_SampleLost::PSL_SampleLostConnector::Listener. */
-
-    virtual
-    void on_one_data (const ::TestTopic & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (const ::TestTopicSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    ::PSL_SampleLost::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_status_exec_i
-   */
-
-  class info_out_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_status_exec_i (
-      ::PSL_SampleLost::CCM_Receiver_Context_ptr ctx,
-      Atomic_Boolean &sample_port_listener,
-      ACE_Thread_ID &thread_id_listener_listener);
-    virtual ~info_out_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::PSL_SampleLost::CCM_Receiver_Context_var ciao_context_;
-    Atomic_Boolean &sample_port_listener_;
-    ACE_Thread_ID &thread_id_listener_listener_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_get_status (void);
-
-    virtual ::PSL_SampleLost::PSL_SampleLostConnector::CCM_Listener_ptr
-    get_info_out_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_status (void);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void read_all (void);
-
-    //@}
-
-  private:
-    ::PSL_SampleLost::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_get_status_;
-    ::PSL_SampleLost::PSL_SampleLostConnector::CCM_Listener_var ciao_info_out_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    read_action_Generator * ticker_;
-
-    Atomic_Boolean sample_port_get_;
-    Atomic_Boolean sample_port_listener_;
-    ACE_Thread_ID thread_id_listener_get_;
-    ACE_Thread_ID thread_id_listener_listener_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_PSL_SampleLost_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.idl b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.idl
deleted file mode 100644
index ca82d0a9095..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef DDS_PSL_SAMPLELOST_SENDER_IDL
-#define DDS_PSL_SAMPLELOST_SENDER_IDL
-
-#include "Connector/PSL_SampleLost_Connector.idl"
-
-module PSL_SampleLost
-{
-  component Sender
-  {
-    port PSL_SampleLostConnector::DDS_Write test_topic_write;
-    provides CCM_DDS::ConnectorStatusListener connector_status;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc
deleted file mode 100644
index 3df0cd46900..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc
+++ /dev/null
@@ -1,138 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_PSL_SampleLost_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_PSL_SampleLost_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_PSL_SL_Connector_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I..
-
-  IDL_Files {
-    PSL_SampleLost_Sender.idl
-  }
-}
-
-project(DDS_PSL_SampleLost_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_PSL_SampleLost_Sender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    PSL_SampleLost_SenderE.idl
-  }
-}
-
-project(DDS_PSL_SampleLost_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_PSL_SampleLost_Sender_lem_gen DDS_PSL_SampleLost_Sender_stub DDS_PSL_SampleLost_Base_stub
-  libs  += DDS_PSL_SampleLost_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSL_SampleLost_SenderEC.cpp
-  }
-
-  Header_Files {
-    PSL_SampleLost_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    PSL_SampleLost_SenderEC.inl
-  }
-}
-
-project(DDS_PSL_SampleLost_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_PSL_SampleLost_Sender_idl_gen DDS_PSL_SampleLost_Base_stub DDS_PSL_SampleLost_Connector_stub
-  libs  += DDS_PSL_SampleLost_Base_stub DDS_PSL_SampleLost_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSL_SampleLost_SenderC.cpp
-  }
-
-  Header_Files {
-    PSL_SampleLost_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    PSL_SampleLost_SenderC.inl
-  }
-}
-
-project(DDS_PSL_SampleLost_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_PSL_SampleLost_Sender_lem_stub DDS_PSL_SampleLost_Sender_stub DDS_PSL_SL_Connector_lem_stub DDS_PSL_SampleLost_Connector_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub DDS_PSL_SampleLost_Base_stub DDS_PSL_SL_Connector_lem_stub  DDS_PSL_SampleLost_Connector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSL_SampleLost_Sender_exec.cpp
-  }
-
-  Header_Files {
-    PSL_SampleLost_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_PSL_SampleLost_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_PSL_SampleLost_Base_stub  DDS_PSL_SampleLost_Sender_lem_stub DDS_PSL_SampleLost_Connector_stub DDS_PSL_SampleLost_Connector_svnt DDS_PSL_SL_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                DDS_PSL_SampleLost_Base_stub DDS_PSL_SampleLost_Connector_stub  DDS_PSL_SampleLost_Connector_svnt DDS_PSL_SL_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSL_SampleLost_SenderS.cpp
-    PSL_SampleLost_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    PSL_SampleLost_SenderS.h
-    PSL_SampleLost_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.cpp
deleted file mode 100644
index f974995a892..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.cpp
+++ /dev/null
@@ -1,270 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "PSL_SampleLost_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_PSL_SampleLost_Sender_Impl
-{
-  /**
-   * ConnectorStatusListener_exec_i
-   */
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (
-    Sender_exec_i &callback)
-    : callback_ (callback)
-    , started_(false)
-  {
-  }
-
-  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic (
-    ::DDS::Topic_ptr /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status(
-    ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind status_kind)
-  {
-    if (!this->started_ && status_kind == ::DDS::PUBLICATION_MATCHED_STATUS)
-      {
-        this->started_ = true;
-        ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_unexpected_status - "
-          "Publication matched received: starting the test\n"));
-        this->callback_.get_started ();
-      }
-  }
-
-  /**
-   * Write action generator
-   */
-
-  pulse_Generator::pulse_Generator (Sender_exec_i &callback)
-    : pulse_callback_ (callback)
-  {
-  }
-
-  int
-  pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    this->pulse_callback_.tick ();
-    return 0;
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      pulse_Generator (*this),
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i  (*this);
-  }
-
-  void
-  Sender_exec_i::tick ()
-  {
-    ::PSL_SampleLost::PSL_SampleLostConnector::Writer_var writer =
-      this->ciao_context_->get_connection_test_topic_write_data ();
-
-    for (PSL_DLTest_Table::iterator i = this->_ktests_.begin ();
-         i != this->_ktests_.end ();
-         ++i)
-      {
-         try
-          {
-            if (! ::CORBA::is_nil (writer.in ()) )
-              {
-                writer->write_one(i->second,::DDS::HANDLE_NIL);
-                i->second->x++;
-              }
-          }
-         catch (const CCM_DDS::InternalError& )
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while creating topic for <%C>.\n"),
-                    i->first.c_str ()));
-          }
-       }
-  }
-
-  void
-  Sender_exec_i::get_started (void)
-  {
-    //add 2 different instances of topic
-    this->add_instance_of_topic ("ONE",1);
-    this->add_instance_of_topic ("TWO",2);
-    this->start ();
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    long sec = 1L;
-    long const usec = 0L;
-    if (this->reactor ()->schedule_timer (
-                this->ticker_,
-                0,
-                ACE_Time_Value (sec, usec),
-                ACE_Time_Value (sec, usec)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                             ACE_TEXT ("Error scheduling timer")));
-      }
-  }
-
-  void
-  Sender_exec_i::stop (void)
-  {
-    this->reactor ()->cancel_timer (this->ticker_);
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n")));
-  }
-
-  void
-  Sender_exec_i::add_instance_of_topic (const char * key, int x)
-  {
-    TestTopic *new_key = new TestTopic;
-    new_key->key = CORBA::string_dup(key);
-    new_key->x = x;
-    this->_ktests_[key] = new_key;
-  }
-
-
-  // Component attributes and port operations.
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::PSL_SampleLost::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    this->stop ();
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_PSL_SampleLost_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.h
deleted file mode 100644
index a5a5601e815..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.h
+++ /dev/null
@@ -1,173 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_PSL_SAMPLELOST_SENDER_EXEC_S5YOJH_H_
-#define CIAO_PSL_SAMPLELOST_SENDER_EXEC_S5YOJH_H_
-
-#include /**/ "ace/pre.h"
-
-#include "PSL_SampleLost_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-#include <map>
-
-namespace CIAO_PSL_SampleLost_Sender_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
-
-  class Sender_exec_i;
-
-  /**
-   * ConnectorStatusListener_exec_i
-   */
-  class SENDER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Sender_exec_i &callback);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-      void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                                 ::DDS::StatusKind status_kind);
-  private:
-    Sender_exec_i &callback_;
-    bool started_;
-  };
-
-
-  /**
-   * Write action Generator
-   */
-
-  class pulse_Generator :
-    public ACE_Event_Handler
-  {
-  public:
-    pulse_Generator (Sender_exec_i &callback);
-
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    Sender_exec_i &pulse_callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_connector_status (void);
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void tick (void);
-    void get_started (void);
-
-    //@}
-
-  private:
-    ::PSL_SampleLost::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    //@}
-
-    //@{
-    /** User defined members. */
-    pulse_Generator * ticker_;
-
-    TAO_SYNCH_MUTEX mutex_;
-    typedef std::map<ACE_CString, TestTopic_var> PSL_DLTest_Table;
-    PSL_DLTest_Table _ktests_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void start (void);
-    void stop (void);
-
-    void add_instance_of_topic (const char *, int x );
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_PSL_SampleLost_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/HelloTest_Library.xml b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/HelloTest_Library.xml
deleted file mode 100644
index d5ffa603e00..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/HelloTest_Library.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-  <qos_profile name="HelloProfile">
-     <datawriter_qos>
-          <reliability>
-               <kind>RELIABLE_RELIABILITY_QOS</kind>
-               <max_blocking_time>
-                    <sec>2</sec>
-                    <nanosec>0</nanosec>
-               </max_blocking_time>
-         </reliability>
-          <durability>
-               <kind>TRANSIENT_DURABILITY_QOS</kind>
-          </durability>
-          <durability_service>
-               <history_kind>KEEP_LAST_HISTORY_QOS</history_kind>
-               <history_depth>10</history_depth>
-               <max_samples>10</max_samples>
-               <max_instances>2</max_instances>
-               <max_samples_per_instance>10</max_samples_per_instance>
-          </durability_service>
-          <deadline>
-               <period>
-                    <sec>3</sec>
-                    <nanosec>0</nanosec>
-               </period>
-          </deadline>
-     </datawriter_qos>
-    <datareader_qos>
-          <reliability>
-               <kind>RELIABLE_RELIABILITY_QOS</kind>
-          </reliability>
-          <history>
-               <kind>KEEP_LAST_HISTORY_QOS</kind>
-               <depth>10</depth>
-          </history>
-          <resource_limits>
-               <initial_samples>1</initial_samples>
-               <initial_instances>1</initial_instances>
-               <max_samples>10</max_samples>
-               <max_instances>1</max_instances>
-               <max_samples_per_instance>10</max_samples_per_instance>
-          </resource_limits>
-          <durability>
-                 <kind>TRANSIENT_DURABILITY_QOS</kind>
-          </durability>
-          <deadline>
-               <period>
-                    <sec>3</sec>
-                    <nanosec>0</nanosec>
-               </period>
-          </deadline>
-     </datareader_qos>
-  </qos_profile>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/Plan.cdp
deleted file mode 100644
index 63be232a68b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/Plan.cdp
+++ /dev/null
@@ -1,430 +0,0 @@
-<!--  -->
-<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>PSL_SampleLost_Depl_1</label>
-  <UUID>PSL_SampleLost_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PSL_SampleLost_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PSL_SampleLost_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="PSL_SampleLost_ConnectorComponentImplementation">
-    <name>PSL_SampleLost_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="PSL_SampleLost_Connector_ExecArtifact" />
-    <artifact xmi:idref="PSL_SampleLost_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PSL_SampleLost_PSL_SampleLostConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PSL_SampleLost_PSL_SampleLostConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PSL_SampleLost_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PSL_SampleLost_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PSL_SampleLost_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PSL_SampleLost_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-  </instance>
-
-  <instance xmi:id="PSL_SampleLost_ConnectorComponentInstance">
-    <name>PSL_SampleLost_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="PSL_SampleLost_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestQoS</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-    <name>qos_profile</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>HelloTest_Library#HelloProfile</string>
-      </value>
-    </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="PSL_SampleLost_ConnectorComponentInstance2">
-    <name>PSL_SampleLost_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="PSL_SampleLost_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestQoS</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>HelloTest_Library#HelloProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-  </instance>
-
-  <connection>
-    <name>_listenercontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="PSL_SampleLost_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_portstatuslistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="PSL_SampleLost_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_portstatuslistener2</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="PSL_SampleLost_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="PSL_SampleLost_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>info_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="PSL_SampleLost_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>test_topic_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="PSL_SampleLost_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>connector_status_connection_sender</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="PSL_SampleLost_ConnectorComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="PSL_SampleLost_Connector_ExecArtifact">
-    <name>PSL_SampleLost_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_PSL_SampleLost_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="PSL_SampleLost_Connector_SvntArtifact">
-    <name>PSL_SampleLost_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_PSL_SampleLost_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="PSL_SampleLost_Connector_StubArtifact">
-    <name>PSL_SampleLost_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_PSL_SampleLost_Connector_stub</location>
-  </artifact>
-
-
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index 9a3741f6c28..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-Description
-XML QoS Profile
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="HelloTest_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="HelloProfile" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>2</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <durability_service>
-          <history_kind>KEEP_LAST_HISTORY_QOS</history_kind>
-          <history_depth>10</history_depth>
-          <max_samples>10</max_samples>
-          <max_samples_per_instance>10</max_samples_per_instance>
-          <max_instances>2</max_instances>
-        </durability_service>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-        <deadline>
-          <period>
-            <sec>3</sec>
-            <nanosec>0</nanosec>
-          </period>
-        </deadline>
-      </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_LAST_HISTORY_QOS</kind>
-          <depth>10</depth>
-        </history>
-        <resource_limits>
-          <initial_samples>1</initial_samples>
-          <initial_instances>1</initial_instances>
-          <max_samples>10</max_samples>
-          <max_instances>1</max_instances>
-          <max_samples_per_instance>10</max_samples_per_instance>
-        </resource_limits>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <deadline>
-          <period>
-            <sec>3</sec>
-            <nanosec>0</nanosec>
-          </period>
-        </deadline>
-        </datareader_qos>
-
-    </qos_profile>
-  </qos_library>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl
deleted file mode 100755
index c5b1964e047..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 30 seconds to allow task to complete\n";
-sleep (30);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/deadline_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/deadline_qos_test.cpp
deleted file mode 100644
index 81b50b7a3e6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/deadline_qos_test.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "deadline_qos_test.h"
-
-#include "duration.h"
-
-DeadlinePolicyTest::DeadlinePolicyTest ()
-{
-}
-
-bool
-DeadlinePolicyTest::check (const ::DDS_DeadlineQosPolicy & dds_qos,
-                           const ::DDS::DeadlineQosPolicy & qos)
-{
-  return Duration::check (dds_qos.period, qos.period);
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/deadline_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/deadline_qos_test.h
deleted file mode 100644
index b2dd688bb25..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/deadline_qos_test.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef DEADLINE_QOS_TEST_H_
-#define DEADLINE_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/DeadlineQosPolicy.h"
-
-class DeadlinePolicyTest
-{
-public:
-  DeadlinePolicyTest ();
-
-  static bool check (const ::DDS_DeadlineQosPolicy & dds_qos,
-                     const ::DDS::DeadlineQosPolicy & qos);
-};
-
-#endif /* DEADLINE_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dest_order_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/dest_order_qos_test.cpp
deleted file mode 100644
index cbc982daa7e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/dest_order_qos_test.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "dest_order_qos_test.h"
-
-DestinationOrderPolicyTest::DestinationOrderPolicyTest ()
-{
-}
-
-bool
-DestinationOrderPolicyTest::check (const ::DDS_DestinationOrderQosPolicy & dds_qos,
-                                   const ::DDS::DestinationOrderQosPolicy & qos)
-{
-  return dds_qos.kind == static_cast <DDS_DestinationOrderQosPolicyKind> (qos.kind);
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dest_order_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/dest_order_qos_test.h
deleted file mode 100644
index 941a0fcbf81..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/dest_order_qos_test.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef DEST_ORDER_QOS_TEST_H_
-#define DEST_ORDER_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/DestinationOrderQosPolicy.h"
-
-class DestinationOrderPolicyTest
-{
-public:
-  DestinationOrderPolicyTest ();
-
-  static bool check (const ::DDS_DestinationOrderQosPolicy & dds_qos,
-                     const ::DDS::DestinationOrderQosPolicy & qos);
-};
-
-#endif /* DEST_ORDER_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dp_factory_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/dp_factory_qos_test.cpp
deleted file mode 100644
index 4c05f843c35..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/dp_factory_qos_test.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "dp_factory_qos_test.h"
-
-#include "entity_factory_qos_test.h"
-
-DomainParticipantFactoryPolicyTest::DomainParticipantFactoryPolicyTest ()
-{
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dp_factory_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/dp_factory_qos_test.h
deleted file mode 100644
index ee6daf56d75..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/dp_factory_qos_test.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef DP_FACTORY_QOS_TEST_H_
-#define DP_FACTORY_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/DomainParticipantFactoryQos.h"
-
-class DomainParticipantFactoryPolicyTest
-{
-public:
-  DomainParticipantFactoryPolicyTest ();
-
-};
-
-#endif /* DP_FACTORY_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dp_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/dp_qos_test.cpp
deleted file mode 100644
index 649fef081ca..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/dp_qos_test.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-#include "dp_qos_test.h"
-
-#include "entity_factory_qos_test.h"
-#include "user_data_qos_test.h"
-
-DomainParticipantPolicyTest::DomainParticipantPolicyTest ()
-{
-}
-
-int
-DomainParticipantPolicyTest::run ()
-{
-  int ret = 0;
-  try
-    {
-      ::DDS::DomainParticipantQos policy;
-      DDS_DomainParticipantQos dds_policy_org, dds_policy;
-
-      dds_policy_org = DDS_PARTICIPANT_QOS_DEFAULT;
-
-      policy <<= dds_policy_org;
-      dds_policy <<= policy;
-
-      if (!EntityFactoryPolicyTest::check (dds_policy.entity_factory, policy.entity_factory))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DOMAIN PARTICIPANT : "
-                                "Error in EntityFactoryQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!UserDataPolicyTest::check (dds_policy.user_data, policy.user_data))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DOMAIN PARTICIPANT : "
-                                "Error in UserDataQosPolicy.\n"));
-          ++ret;
-        }
-    }
-  catch (...)
-    {
-      ACE_ERROR ((LM_ERROR, "ERROR DOMAIN PARTICIPANT: Unexpected exception caught."));
-      return -1;
-    }
-  return ret;
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dp_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/dp_qos_test.h
deleted file mode 100644
index e18a64c6481..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/dp_qos_test.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef DOMAINPARTICIPANT_QOS_TEST_H_
-#define DOMAINPARTICIPANT_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/DomainParticipantQos.h"
-
-class DomainParticipantPolicyTest
-{
-public:
-  DomainParticipantPolicyTest ();
-
-  int run ();
-};
-
-#endif /* DOMAINPARTICIPANT_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dr_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/dr_qos_test.cpp
deleted file mode 100644
index 3b18c29614b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/dr_qos_test.cpp
+++ /dev/null
@@ -1,146 +0,0 @@
-#include "dr_qos_test.h"
-
-#include "dur_qos_test.h"
-#include "deadline_qos_test.h"
-#include "lat_budget_qos_test.h"
-#include "liveliness_qos_test.h"
-#include "reliability_qos_test.h"
-#include "dest_order_qos_test.h"
-#include "hist_qos_test.h"
-#include "resource_limits_qos_test.h"
-#include "user_data_qos_test.h"
-#include "ownership_qos_test.h"
-#include "tbf_qos_test.h"
-#include "rd_lifecycle_qos_test.h"
-#include "typeconsistencyenforcement_qos_test.h"
-
-DatareaderPolicyTest::DatareaderPolicyTest ()
-{
-}
-
-int
-DatareaderPolicyTest::run ()
-{
-  int ret = 0;
-  try
-    {
-      ::DDS::DataReaderQos policy;
-      DDS_DataReaderQos dds_policy_org, dds_policy;
-
-      dds_policy_org = DDS_DATAREADER_QOS_DEFAULT;
-
-      policy <<= dds_policy_org;
-      dds_policy <<= policy;
-
-      if (!DurabilityPolicyTest::check (dds_policy.durability,
-                                        policy.durability))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAREADER : "
-                                "Error in DurabilityQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!DeadlinePolicyTest::check (dds_policy.deadline,
-                                      policy.deadline))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAREADER : "
-                                "Error in DeadlineQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!LatencyBudgetPolicyTest::check (dds_policy.latency_budget,
-                                           policy.latency_budget))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAREADER : "
-                                "Error in LatencyBudgetQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!LivelinessPolicyTest::check (dds_policy.liveliness,
-                                        policy.liveliness))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAREADER : "
-                                "Error in LivelinessQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!ReliabilityPolicyTest::check (dds_policy.reliability,
-                                         policy.reliability))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAREADER : "
-                                "Error in ReliabilityQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!DestinationOrderPolicyTest::check (dds_policy.destination_order,
-                                             policy.destination_order))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAREADER : "
-                                "Error in DestinationOrderQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!HistoryPolicyTest::check (dds_policy.history,
-                                     policy.history))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAREADER : "
-                                "Error in HistoryQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!ResourceLimitsPolicyTest::check (dds_policy.resource_limits,
-                                     policy.resource_limits))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAREADER : "
-                                "Error in ResourceLimitsQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!UserDataPolicyTest::check (dds_policy.user_data, policy.user_data))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAREADER : "
-                                "Error in UserDataQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!OwnershipPolicyTest::check (dds_policy.ownership,
-                                       policy.ownership))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAREADER : "
-                                "Error in OwnershipQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!TimeBasedFilterPolicyTest::check (dds_policy.time_based_filter,
-                                             policy.time_based_filter))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAREADER : "
-                                "Error in TimeBasedFilterQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!ReaderDataLifecyclePolicyTest::check (dds_policy.reader_data_lifecycle,
-                                                 policy.reader_data_lifecycle))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAREADER : "
-                                "Error in ReaderDataLifecycleQosPolicy.\n"));
-          ++ret;
-        }
-
-#if defined (RTI_DDS_VERSION_MAJOR) && (RTI_DDS_VERSION_MAJOR >= 5)
-      if (!TypeConsistencyEnforcementPolicyPolicyTest::check (dds_policy.type_consistency,
-                                                 policy.type_consistency))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAREADER : "
-                                "Error in TypeConsistencyEnforcementQosPolicy.\n"));
-          ++ret;
-        }
-#endif
-    }
-  catch (...)
-    {
-      ACE_ERROR ((LM_ERROR, "ERROR DATAREADER: Unexpected exception caught."));
-      return -1;
-    }
-  return ret;
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dr_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/dr_qos_test.h
deleted file mode 100644
index 2c3cd0e8c60..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/dr_qos_test.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef DATAREADER_QOS_TEST_H_
-#define DATAREADER_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/DataReaderQos.h"
-
-class DatareaderPolicyTest
-{
-public:
-  DatareaderPolicyTest ();
-
-  int run ();
-};
-
-#endif /* DATAREADER_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dur_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/dur_qos_test.cpp
deleted file mode 100644
index c764b6dccbf..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/dur_qos_test.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "dur_qos_test.h"
-
-DurabilityPolicyTest::DurabilityPolicyTest ()
-{
-}
-
-
-bool
-DurabilityPolicyTest::check (const ::DDS_DurabilityQosPolicy & dds_qos,
-                             const ::DDS::DurabilityQosPolicy & qos)
-{
-  return dds_qos.kind == static_cast <DDS_DurabilityQosPolicyKind> (qos.kind);
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dur_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/dur_qos_test.h
deleted file mode 100644
index 07d6aa9b9b2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/dur_qos_test.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef DURABILITY_QOS_TEST_H_
-#define DURABILITY_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/DurabilityQosPolicy.h"
-
-class DurabilityPolicyTest
-{
-public:
-  DurabilityPolicyTest ();
-
-  static bool check (const ::DDS_DurabilityQosPolicy & dds_qos,
-                     const ::DDS::DurabilityQosPolicy & qos);
-};
-
-#endif /* DURABILITY_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dur_service_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/dur_service_qos_test.cpp
deleted file mode 100644
index 04e21f02bc3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/dur_service_qos_test.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "dur_service_qos_test.h"
-
-DurabilityServicePolicyTest::DurabilityServicePolicyTest ()
-{
-}
-
-bool
-DurabilityServicePolicyTest::check (const ::DDS_DurabilityServiceQosPolicy & dds_qos,
-                                    const ::DDS::DurabilityServiceQosPolicy & qos)
-{
-  return dds_qos.service_cleanup_delay.sec == qos.service_cleanup_delay.sec &&
-         dds_qos.history_kind == static_cast <DDS_HistoryQosPolicyKind> (qos.history_kind) &&
-         dds_qos.history_depth == qos.history_depth &&
-         dds_qos.max_samples == qos.max_samples &&
-         dds_qos.max_instances == qos.max_instances &&
-         dds_qos.max_samples_per_instance == qos.max_samples_per_instance;
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dur_service_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/dur_service_qos_test.h
deleted file mode 100644
index 5fde21bca60..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/dur_service_qos_test.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef DURABILITY_SERVICE_QOS_TEST_H_
-#define DURABILITY_SERVICE_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/DurabilityServiceQosPolicy.h"
-
-class DurabilityServicePolicyTest
-{
-public:
-  DurabilityServicePolicyTest ();
-
-  static bool check (const ::DDS_DurabilityServiceQosPolicy & dds_qos,
-                     const ::DDS::DurabilityServiceQosPolicy & qos);
-};
-
-#endif /* DURABILITY_SERVICE_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/duration.cpp b/CIAO/connectors/dds4ccm/tests/Policies/duration.cpp
deleted file mode 100644
index a7d652b93c7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/duration.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "duration.h"
-
-Duration::Duration ()
-{
-}
-
-
-bool
-Duration::check (const ::DDS_Duration_t & dds_dur,
-                 const ::DDS::Duration_t & dur)
-{
-  return dds_dur.sec == dur.sec &&
-         dds_dur.nanosec == dur.nanosec;
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/duration.h b/CIAO/connectors/dds4ccm/tests/Policies/duration.h
deleted file mode 100644
index abf2962c1a2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/duration.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef DURATION_H_
-#define DURATION_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/Duration_t.h"
-
-class Duration
-{
-public:
-  Duration ();
-
-  static bool check (const ::DDS_Duration_t & dds_dur,
-                     const ::DDS::Duration_t & dur);
-};
-
-#endif /* DURATION_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dw_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/dw_qos_test.cpp
deleted file mode 100644
index f3b05feb0b3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/dw_qos_test.cpp
+++ /dev/null
@@ -1,162 +0,0 @@
-#include "dw_qos_test.h"
-
-#include "dur_qos_test.h"
-#include "dur_service_qos_test.h"
-#include "deadline_qos_test.h"
-#include "lat_budget_qos_test.h"
-#include "liveliness_qos_test.h"
-#include "reliability_qos_test.h"
-#include "dest_order_qos_test.h"
-#include "hist_qos_test.h"
-#include "resource_limits_qos_test.h"
-#include "transport_prio_qos_test.h"
-#include "lifespan_qos_test.h"
-#include "user_data_qos_test.h"
-#include "ownership_qos_test.h"
-#include "ownership_strength_qos_test.h"
-#include "wr_lifecycle_qos_test.h"
-
-DatawriterPolicyTest::DatawriterPolicyTest ()
-{
-}
-
-int
-DatawriterPolicyTest::run ()
-{
-  int ret = 0;
-  try
-    {
-      ::DDS::DataWriterQos policy;
-      DDS_DataWriterQos dds_policy_org, dds_policy;
-
-      dds_policy_org = DDS_DATAWRITER_QOS_DEFAULT;
-
-      policy <<= dds_policy_org;
-      dds_policy <<= policy;
-
-      if (!DurabilityPolicyTest::check (dds_policy.durability,
-                                        policy.durability))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : "
-                                "Error in DurabilityQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!DurabilityServicePolicyTest::check (dds_policy.durability_service,
-                                               policy.durability_service))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : "
-                                "Error in DurabilityServiceQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!DeadlinePolicyTest::check (dds_policy.deadline,
-                                      policy.deadline))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : "
-                                "Error in DeadlineQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!LatencyBudgetPolicyTest::check (dds_policy.latency_budget,
-                                           policy.latency_budget))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : "
-                                "Error in LatencyBudgetQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!LivelinessPolicyTest::check (dds_policy.liveliness,
-                                        policy.liveliness))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : "
-                                "Error in LivelinessQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!ReliabilityPolicyTest::check (dds_policy.reliability,
-                                         policy.reliability))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : "
-                                "Error in ReliabilityQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!DestinationOrderPolicyTest::check (dds_policy.destination_order,
-                                             policy.destination_order))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : "
-                                "Error in DestinationOrderQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!HistoryPolicyTest::check (dds_policy.history,
-                                     policy.history))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : "
-                                "Error in HistoryQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!ResourceLimitsPolicyTest::check (dds_policy.resource_limits,
-                                     policy.resource_limits))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : "
-                                "Error in ResourceLimitsQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!TransportPriorityPolicyTest::check (dds_policy.transport_priority,
-                                              policy.transport_priority))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : "
-                                "Error in TransportPriorityQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!LifespanPolicyTest::check (dds_policy.lifespan,
-                                      policy.lifespan))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : "
-                                "Error in LifespanQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!UserDataPolicyTest::check (dds_policy.user_data, policy.user_data))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : "
-                                "Error in UserDataQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!OwnershipPolicyTest::check (dds_policy.ownership,
-                                       policy.ownership))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : "
-                                "Error in OwnershipQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!OwnershipStrengthPolicyTest::check (dds_policy.ownership_strength,
-                                       policy.ownership_strength))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : "
-                                "Error in OwnershipStrengthQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!WriterDataLifecyclePolicyTest::check (dds_policy.writer_data_lifecycle,
-                                                 policy.writer_data_lifecycle))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : "
-                                "Error in WriterDataLifecycleQosPolicy.\n"));
-          ++ret;
-        }
-    }
-  catch (...)
-    {
-      ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER: Unexpected exception caught."));
-      return -1;
-    }
-  return ret;
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dw_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/dw_qos_test.h
deleted file mode 100644
index 3e85b37d06c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/dw_qos_test.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef DATAWRITER_QOS_TEST_H_
-#define DATAWRITER_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/DataWriterQos.h"
-
-class DatawriterPolicyTest
-{
-public:
-  DatawriterPolicyTest ();
-
-  int run ();
-};
-
-#endif /* DATAWRITER_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/entity_factory_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/entity_factory_qos_test.cpp
deleted file mode 100644
index c5fecf7a4a8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/entity_factory_qos_test.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "entity_factory_qos_test.h"
-
-EntityFactoryPolicyTest::EntityFactoryPolicyTest ()
-{
-}
-
-bool
-EntityFactoryPolicyTest::check (const ::DDS_EntityFactoryQosPolicy & dds_qos,
-                                const ::DDS::EntityFactoryQosPolicy & qos)
-{
-  return dds_qos.autoenable_created_entities ==
-         static_cast <DDS_Boolean> (qos.autoenable_created_entities);
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/entity_factory_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/entity_factory_qos_test.h
deleted file mode 100644
index 30b4aaaa7f9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/entity_factory_qos_test.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef ENTITY_FACTORY_QOS_TEST_H_
-#define ENTITY_FACTORY_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/EntityFactoryQosPolicy.h"
-
-class EntityFactoryPolicyTest
-{
-public:
-  EntityFactoryPolicyTest ();
-
-  static bool check (const ::DDS_EntityFactoryQosPolicy & dds_qos,
-                     const ::DDS::EntityFactoryQosPolicy & qos);
-};
-
-#endif /* ENTITY_FACTORY_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/group_data_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/group_data_qos_test.cpp
deleted file mode 100644
index 3e2120c601d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/group_data_qos_test.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "group_data_qos_test.h"
-
-#include "octet_seq.h"
-
-GroupDataPolicyTest::GroupDataPolicyTest ()
-{
-}
-
-bool
-GroupDataPolicyTest::check (const ::DDS_GroupDataQosPolicy & dds_qos,
-                            const ::DDS::GroupDataQosPolicy & qos)
-{
-  return OctetSequence::check (dds_qos.value,
-                               qos.value,
-                               "GroupDataPolicyTest");
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/group_data_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/group_data_qos_test.h
deleted file mode 100644
index 2aa822bf935..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/group_data_qos_test.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef GROUP_DATA_QOS_TEST_H_
-#define GROUP_DATA_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/GroupDataQosPolicy.h"
-
-class GroupDataPolicyTest
-{
-public:
-  GroupDataPolicyTest ();
-
-  static bool check (const ::DDS_GroupDataQosPolicy & dds_qos,
-                     const ::DDS::GroupDataQosPolicy & qos);
-};
-
-#endif /* GROUP_DATA_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/hist_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/hist_qos_test.cpp
deleted file mode 100644
index d769ec1bc7d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/hist_qos_test.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "hist_qos_test.h"
-
-HistoryPolicyTest::HistoryPolicyTest ()
-{
-}
-
-bool
-HistoryPolicyTest::check (const ::DDS_HistoryQosPolicy & dds_qos,
-                          const ::DDS::HistoryQosPolicy & qos)
-{
-
-  return dds_qos.kind == static_cast <DDS_HistoryQosPolicyKind> (qos.kind) &&
-         dds_qos.depth == qos.depth;
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/hist_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/hist_qos_test.h
deleted file mode 100644
index 5776a879e7e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/hist_qos_test.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef HISTORY_QOS_TEST_H_
-#define HISTORY_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/HistoryQosPolicy.h"
-
-class HistoryPolicyTest
-{
-public:
-  HistoryPolicyTest ();
-
-  static bool check (const ::DDS_HistoryQosPolicy & dds_qos,
-                     const ::DDS::HistoryQosPolicy & qos);
-};
-
-#endif /* HISTORY_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/lat_budget_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/lat_budget_qos_test.cpp
deleted file mode 100644
index 26a7527d447..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/lat_budget_qos_test.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "lat_budget_qos_test.h"
-
-#include "duration.h"
-
-LatencyBudgetPolicyTest::LatencyBudgetPolicyTest ()
-{
-}
-
-bool
-LatencyBudgetPolicyTest::check (const ::DDS_LatencyBudgetQosPolicy & dds_qos,
-                                const ::DDS::LatencyBudgetQosPolicy & qos)
-{
-  return Duration::check (dds_qos.duration, qos.duration);
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/lat_budget_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/lat_budget_qos_test.h
deleted file mode 100644
index 968011fc581..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/lat_budget_qos_test.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef LATENCY_BUDGET_QOS_TEST_H_
-#define LATENCY_BUDGET_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/LatencyBudgetQosPolicy.h"
-
-class LatencyBudgetPolicyTest
-{
-public:
-  LatencyBudgetPolicyTest ();
-
-  static bool check (const ::DDS_LatencyBudgetQosPolicy & dds_qos,
-                     const ::DDS::LatencyBudgetQosPolicy & qos);
-};
-
-#endif /* LATENCY_BUDGET_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/lifespan_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/lifespan_qos_test.cpp
deleted file mode 100644
index fa1be610bd3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/lifespan_qos_test.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "lifespan_qos_test.h"
-
-#include "duration.h"
-
-LifespanPolicyTest::LifespanPolicyTest ()
-{
-}
-
-bool
-LifespanPolicyTest::check (const ::DDS_LifespanQosPolicy & dds_qos,
-                           const ::DDS::LifespanQosPolicy & qos)
-{
-  return Duration::check (dds_qos.duration, qos.duration);
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/lifespan_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/lifespan_qos_test.h
deleted file mode 100644
index 0977e58ccdc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/lifespan_qos_test.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef LIFESPAN_QOS_TEST_H_
-#define LIFESPAN_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/LifespanQosPolicy.h"
-
-class LifespanPolicyTest
-{
-public:
-  LifespanPolicyTest ();
-
-  static bool check (const ::DDS_LifespanQosPolicy & dds_qos,
-                     const ::DDS::LifespanQosPolicy & qos);
-};
-
-#endif /* LIFESPAN_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/liveliness_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/liveliness_qos_test.cpp
deleted file mode 100644
index 0064c309716..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/liveliness_qos_test.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "liveliness_qos_test.h"
-
-#include "duration.h"
-
-LivelinessPolicyTest::LivelinessPolicyTest ()
-{
-}
-
-bool
-LivelinessPolicyTest::check (const ::DDS_LivelinessQosPolicy & dds_qos,
-                             const ::DDS::LivelinessQosPolicy & qos)
-{
-  return dds_qos.kind == static_cast <DDS_LivelinessQosPolicyKind> (qos.kind) &&
-         Duration::check (dds_qos.lease_duration, qos.lease_duration);
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/liveliness_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/liveliness_qos_test.h
deleted file mode 100644
index 7fea05b6670..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/liveliness_qos_test.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef LIVELINESS_QOS_TEST_H_
-#define LIVELINESS_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/LivelinessQosPolicy.h"
-
-class LivelinessPolicyTest
-{
-public:
-  LivelinessPolicyTest ();
-
-  static bool check (const ::DDS_LivelinessQosPolicy & dds_qos,
-                     const ::DDS::LivelinessQosPolicy & qos);
-};
-
-#endif /* LIVELINESS_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/main.cpp b/CIAO/connectors/dds4ccm/tests/Policies/main.cpp
deleted file mode 100644
index e5072f852f8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/main.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-#include "ace/OS_main.h"
-#include "ace/Log_Msg.h"
-
-#include "pub_qos_test.h"
-#include "sub_qos_test.h"
-#include "dw_qos_test.h"
-#include "dr_qos_test.h"
-#include "tp_qos_test.h"
-#include "dp_qos_test.h"
-#include "states_test.h"
-#include "string_seq.h"
-
-int handle_result (const int & result,
-                   const char * test)
-{
-  int ret = 0;
-  if (result == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "ERROR POLICIES : "
-                            "Exception caught while testing "
-                            "%C QoS\n",
-                            test));
-    }
-  else if (result > 0)
-    {
-      ret = result;
-      ACE_ERROR ((LM_ERROR, "ERROR POLICIES : "
-                            "<%d> errors found while testing "
-                            "%C QoS\n",
-                            result, test));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "%C QoS test passed!\n",
-                             test));
-    }
-  return ret;
-}
-
-bool
-test_string_seq ()
-{
-  DDS::StringSeq foo (2);
-  foo.length (2);
-  foo[0] = CORBA::string_dup ("bar");
-  foo[1] = CORBA::string_dup ("foo");
-  DDS_StringSeq rti_foo;
-  rti_foo <<= foo;
-  DDS::StringSeq tao_foo;
-  tao_foo <<= rti_foo;
-  return StringSequence::check (rti_foo, tao_foo, "StringSeq");
-}
-
-int
-ACE_TMAIN (int , ACE_TCHAR **)
-{
-  PublisherPolicyTest publisher;
-  SubscriberPolicyTest subscriber;
-  DatawriterPolicyTest datawriter;
-  DatareaderPolicyTest datareader;
-  TopicPolicyTest topic;
-  StatesTest states;
-  DomainParticipantPolicyTest domainparticipant;
-
-  int ret = 0;
-  int test = 0;
-  try
-    {
-      test = publisher.run ();
-      ret += handle_result (test, "Publisher");
-      test = subscriber.run ();
-      ret += handle_result (test, "Subscriber");
-      test = datawriter.run ();
-      ret += handle_result (test, "Datawriter");
-      test = datareader.run ();
-      ret += handle_result (test, "DataReader");
-      test = topic.run ();
-      ret += handle_result (test, "Topic");
-      test = domainparticipant.run ();
-      ret += handle_result (test, "DomainParticipant");
-      test = states.run ();
-      ret += handle_result (test, "States");
-      ret += test_string_seq ();
-    }
-  catch (...)
-    {
-      ACE_ERROR ((LM_ERROR, "ERROR: Unexpected exception caught."));
-      return -1;
-    }
-  return 0;
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/octet_seq.cpp b/CIAO/connectors/dds4ccm/tests/Policies/octet_seq.cpp
deleted file mode 100644
index a3399da99d1..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/octet_seq.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-#include "octet_seq.h"
-
-OctetSequence::OctetSequence ()
-{
-}
-
-bool
-OctetSequence::check (const ::DDS_OctetSeq & dds_seq,
-                      const ::DDS::OctetSeq & seq,
-                      const char * test)
-{
-  if (static_cast < ::CORBA::ULong> (dds_seq.length ()) !=
-      seq.length ())
-    {
-      ACE_ERROR ((LM_ERROR, "ERROR %C : "
-                            "Length group_data is not equal to original length.\n",
-                            test));
-      return false;
-    }
-
-  for (::DDS_Long i = 0; i < dds_seq.length (); ++i)
-    {
-      if (seq[i] != dds_seq[i])
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR %C : "
-                            "Item %d of group_data is not equal to original.\n",
-                            test, i));
-          return false;
-        }
-    }
-  return true;
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/octet_seq.h b/CIAO/connectors/dds4ccm/tests/Policies/octet_seq.h
deleted file mode 100644
index f17bf8e0aab..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/octet_seq.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef OCTET_SEQ_H_
-#define OCTET_SEQ_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/OctetSeq.h"
-
-class OctetSequence
-{
-public:
-  OctetSequence ();
-
-  static bool check (const ::DDS_OctetSeq & dds_seq,
-                     const ::DDS::OctetSeq & seq,
-                     const char * test);
-};
-
-#endif /* OCTET_SEQ_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/ownership_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/ownership_qos_test.cpp
deleted file mode 100644
index eb36fc8dfca..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/ownership_qos_test.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "ownership_qos_test.h"
-
-OwnershipPolicyTest::OwnershipPolicyTest ()
-{
-}
-
-bool
-OwnershipPolicyTest::check (const ::DDS_OwnershipQosPolicy & dds_qos,
-                            const ::DDS::OwnershipQosPolicy & qos)
-{
-  return dds_qos.kind ==
-         static_cast <DDS_OwnershipQosPolicyKind> (qos.kind);
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/ownership_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/ownership_qos_test.h
deleted file mode 100644
index f1deb5aa63f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/ownership_qos_test.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef OWNERSHIP_QOS_TEST_H_
-#define OWNERSHIP_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/OwnershipQosPolicy.h"
-
-class OwnershipPolicyTest
-{
-public:
-  OwnershipPolicyTest ();
-
-  static bool check (const ::DDS_OwnershipQosPolicy & dds_qos,
-                     const ::DDS::OwnershipQosPolicy & qos);
-};
-
-#endif /* OWNERSHIP_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/ownership_strength_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/ownership_strength_qos_test.cpp
deleted file mode 100644
index a4e43c33972..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/ownership_strength_qos_test.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "ownership_strength_qos_test.h"
-
-OwnershipStrengthPolicyTest::OwnershipStrengthPolicyTest ()
-{
-}
-
-bool
-OwnershipStrengthPolicyTest::check (const ::DDS_OwnershipStrengthQosPolicy & dds_qos,
-                                    const ::DDS::OwnershipStrengthQosPolicy & qos)
-{
-  return dds_qos.value == qos.value;
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/ownership_strength_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/ownership_strength_qos_test.h
deleted file mode 100644
index fe46ea19f39..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/ownership_strength_qos_test.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef OWNERSHIP_STRENGTH_QOS_TEST_H_
-#define OWNERSHIP_STRENGTH_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/OwnershipStrengthQosPolicy.h"
-
-class OwnershipStrengthPolicyTest
-{
-public:
-  OwnershipStrengthPolicyTest ();
-
-  static bool check (const ::DDS_OwnershipStrengthQosPolicy & dds_qos,
-                     const ::DDS::OwnershipStrengthQosPolicy & qos);
-};
-
-#endif /* OWNERSHIP_STRENGTH_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/partition_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/partition_qos_test.cpp
deleted file mode 100644
index f092096fc6c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/partition_qos_test.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-#include "partition_qos_test.h"
-
-PartitionPolicyTest::PartitionPolicyTest ()
-{
-}
-
-bool
-PartitionPolicyTest::check (const ::DDS_PartitionQosPolicy & dds_qos,
-                            const ::DDS::PartitionQosPolicy & qos)
-{
-  if (static_cast <CORBA::ULong> (dds_qos.name.length ()) !=
-      qos.name.length ())
-    {
-      ACE_ERROR ((LM_ERROR, "ERROR PartitionPolicyTest : "
-                            "Length name sequence is not equal "
-                            "to original length.\n"));
-      return false;
-    }
-  for (DDS_Long i = 0; i < dds_qos.name.length (); ++i)
-    {
-      if (ACE_OS::strcmp (dds_qos.name[i], qos.name[i]) != 0)
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR PartitionPolicyTest : "
-                            "Item %d of name sequence is not equal "
-                            "to original.\n",
-                            i));
-          return false;
-        }
-    }
-  return true;
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/partition_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/partition_qos_test.h
deleted file mode 100644
index 329348a6d72..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/partition_qos_test.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef PARTITION_QOS_TEST_H_
-#define PARTITION_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/PartitionQosPolicy.h"
-
-class PartitionPolicyTest
-{
-public:
-  PartitionPolicyTest ();
-
-  static bool check (const ::DDS_PartitionQosPolicy & dds_qos,
-                     const ::DDS::PartitionQosPolicy & qos);
-};
-
-#endif /* PARTITION_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/policies.mpc b/CIAO/connectors/dds4ccm/tests/Policies/policies.mpc
deleted file mode 100644
index 88a5ac62309..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/policies.mpc
+++ /dev/null
@@ -1,47 +0,0 @@
-project(DDS_Policies_Test) : taoexe, typecode, dds4ccm_base {
-  includes += $(CIAO_ROOT)
-  exename = policies_test
-  requires += dds4ccm_ndds
-
-  Source_Files {
-    deadline_qos_test.cpp
-    dest_order_qos_test.cpp
-    dp_factory_qos_test.cpp
-    dp_qos_test.cpp
-    dr_qos_test.cpp
-    dur_qos_test.cpp
-    dur_service_qos_test.cpp
-    dw_qos_test.cpp
-    entity_factory_qos_test.cpp
-    group_data_qos_test.cpp
-    hist_qos_test.cpp
-    lat_budget_qos_test.cpp
-    lifespan_qos_test.cpp
-    liveliness_qos_test.cpp
-    main.cpp
-    ownership_qos_test.cpp
-    partition_qos_test.cpp
-    presentation_qos_test.cpp
-    pub_qos_test.cpp
-    reliability_qos_test.cpp
-    resource_limits_qos_test.cpp
-    sub_qos_test.cpp
-    tp_data_qos_test.cpp
-    tp_qos_test.cpp
-    transport_prio_qos_test.cpp
-    user_data_qos_test.cpp
-    rd_lifecycle_qos_test.cpp
-    tbf_qos_test.cpp
-    typeconsistencyenforcement_qos_test.cpp
-    ownership_strength_qos_test.cpp
-    wr_lifecycle_qos_test.cpp
-    duration.cpp
-    octet_seq.cpp
-    string_seq.cpp
-    states_test.cpp
-  }
-
-  Header_Files {
-    *.h
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/presentation_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/presentation_qos_test.cpp
deleted file mode 100644
index 661fe7a0421..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/presentation_qos_test.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "presentation_qos_test.h"
-
-PresentationPolicyTest::PresentationPolicyTest ()
-{
-}
-
-bool
-PresentationPolicyTest::check (const ::DDS_PresentationQosPolicy & dds_qos,
-                               const ::DDS::PresentationQosPolicy & qos)
-{
-  return dds_qos.access_scope ==
-              static_cast <DDS_PresentationQosPolicyAccessScopeKind>(qos.access_scope) &&
-         dds_qos.coherent_access ==
-              static_cast <DDS_Boolean> (qos.coherent_access) &&
-         dds_qos.ordered_access ==
-              static_cast <DDS_Boolean> (qos.ordered_access);
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/presentation_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/presentation_qos_test.h
deleted file mode 100644
index 6acfd5da5b2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/presentation_qos_test.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef PRESENTATION_QOS_TEST_H_
-#define PRESENTATION_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/PresentationQosPolicy.h"
-
-class PresentationPolicyTest
-{
-public:
-  PresentationPolicyTest ();
-
-  static bool check (const ::DDS_PresentationQosPolicy & dds_qos,
-                     const ::DDS::PresentationQosPolicy & qos);
-};
-
-#endif /* PRESENTATION_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/pub_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/pub_qos_test.cpp
deleted file mode 100644
index 8fe67e4728a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/pub_qos_test.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-#include "pub_qos_test.h"
-#include "group_data_qos_test.h"
-#include "entity_factory_qos_test.h"
-#include "presentation_qos_test.h"
-#include "partition_qos_test.h"
-
-PublisherPolicyTest::PublisherPolicyTest ()
-{
-}
-
-int
-PublisherPolicyTest::run ()
-{
-  int ret = 0;
-  try
-    {
-      ::DDS::PublisherQos policy;
-      DDS_PublisherQos dds_policy_org, dds_policy;
-
-      dds_policy_org = DDS_PUBLISHER_QOS_DEFAULT;
-
-      policy <<= dds_policy_org;
-      dds_policy <<= policy;
-
-      if (!PresentationPolicyTest::check (dds_policy.presentation, policy.presentation))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR PUBLISHER : "
-                                "Error in PresentationQosPolicy.\n"));
-          ++ret;
-        }
-      if (!PartitionPolicyTest::check (dds_policy.partition, policy.partition))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR PUBLISHER : "
-                                "Error in PartitionQosPolicy.\n"));
-          ++ret;
-        }
-      if (!GroupDataPolicyTest::check (dds_policy.group_data, policy.group_data))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR PUBLISHER : "
-                                "Error in GroupDataQosPolicy.\n"));
-          ++ret;
-        }
-      if (!EntityFactoryPolicyTest::check (dds_policy.entity_factory, policy.entity_factory))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR PUBLISHER : "
-                                "Error in EntityFactoryQosPolicy.\n"));
-          ++ret;
-        }
-    }
-  catch (...)
-    {
-      ACE_ERROR ((LM_ERROR, "ERROR PUBLISHER: Unexpected exception caught."));
-      return -1;
-    }
-  return ret;
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/pub_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/pub_qos_test.h
deleted file mode 100644
index 069c63f051a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/pub_qos_test.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef PUBLISHER_QOS_TEST_H_
-#define PUBLISHER_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/PublisherQos.h"
-
-class PublisherPolicyTest
-{
-public:
-  PublisherPolicyTest ();
-
-  int run ();
-};
-
-#endif /* PUBLISHER_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/rd_lifecycle_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/rd_lifecycle_qos_test.cpp
deleted file mode 100644
index ae419b62f8e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/rd_lifecycle_qos_test.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "rd_lifecycle_qos_test.h"
-
-#include "duration.h"
-
-ReaderDataLifecyclePolicyTest::ReaderDataLifecyclePolicyTest ()
-{
-}
-
-bool
-ReaderDataLifecyclePolicyTest::check (const ::DDS_ReaderDataLifecycleQosPolicy & dds_qos,
-                                      const ::DDS::ReaderDataLifecycleQosPolicy & qos)
-{
-  return Duration::check (dds_qos.autopurge_nowriter_samples_delay,
-                          qos.autopurge_nowriter_samples_delay)     &&
-         Duration::check (dds_qos.autopurge_disposed_samples_delay,
-                          qos.autopurge_disposed_samples_delay);
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/rd_lifecycle_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/rd_lifecycle_qos_test.h
deleted file mode 100644
index 6eff701402b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/rd_lifecycle_qos_test.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef READER_DATA_LIFECYCLE_QOS_TEST_H_
-#define READER_DATA_LIFECYCLE_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/ReaderDataLifecycleQosPolicy.h"
-
-class ReaderDataLifecyclePolicyTest
-{
-public:
-  ReaderDataLifecyclePolicyTest ();
-
-  static bool check (const ::DDS_ReaderDataLifecycleQosPolicy & dds_qos,
-                     const ::DDS::ReaderDataLifecycleQosPolicy & qos);
-};
-
-#endif /* READER_DATA_LIFECYCLE_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/reliability_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/reliability_qos_test.cpp
deleted file mode 100644
index 9d006a10d68..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/reliability_qos_test.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "reliability_qos_test.h"
-
-#include "duration.h"
-
-ReliabilityPolicyTest::ReliabilityPolicyTest ()
-{
-}
-
-bool
-ReliabilityPolicyTest::check (const ::DDS_ReliabilityQosPolicy & dds_qos,
-                              const ::DDS::ReliabilityQosPolicy & qos)
-{
-  return dds_qos.kind == static_cast <DDS_ReliabilityQosPolicyKind> (qos.kind) &&
-         Duration::check (dds_qos.max_blocking_time, qos.max_blocking_time);
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/reliability_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/reliability_qos_test.h
deleted file mode 100644
index 45887016444..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/reliability_qos_test.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef RELIABILITY_QOS_TEST_H_
-#define RELIABILITY_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/ReliabilityQosPolicy.h"
-
-class ReliabilityPolicyTest
-{
-public:
-  ReliabilityPolicyTest ();
-
-  static bool check (const ::DDS_ReliabilityQosPolicy & dds_qos,
-                     const ::DDS::ReliabilityQosPolicy & qos);
-};
-
-#endif /* RELIABILITY_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/resource_limits_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/resource_limits_qos_test.cpp
deleted file mode 100644
index 60cbdf49797..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/resource_limits_qos_test.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "resource_limits_qos_test.h"
-
-ResourceLimitsPolicyTest::ResourceLimitsPolicyTest ()
-{
-}
-
-
-bool
-ResourceLimitsPolicyTest::check (const ::DDS_ResourceLimitsQosPolicy & dds_qos,
-                                 const ::DDS::ResourceLimitsQosPolicy & qos)
-{
-  return dds_qos.max_samples == qos.max_samples &&
-         dds_qos.max_instances == qos.max_instances &&
-         dds_qos.max_samples_per_instance == qos.max_samples_per_instance;
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/resource_limits_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/resource_limits_qos_test.h
deleted file mode 100644
index 51d1bf84240..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/resource_limits_qos_test.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef RESOURCE_LIMITS_QOS_TEST_H_
-#define RESOURCE_LIMITS_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/ResourceLimitsQosPolicy.h"
-
-class ResourceLimitsPolicyTest
-{
-public:
-  ResourceLimitsPolicyTest ();
-
-  static bool check (const ::DDS_ResourceLimitsQosPolicy & dds_qos,
-                     const ::DDS::ResourceLimitsQosPolicy & qos);
-};
-
-#endif /* RESOURCE_LIMITS_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/run_test.pl b/CIAO/connectors/dds4ccm/tests/Policies/run_test.pl
deleted file mode 100755
index 6b2a3cbf722..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/run_test.pl
+++ /dev/null
@@ -1,27 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-     & eval 'exec perl -S $0 $argv:q'
-     if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{ACE_ROOT}/bin";
-use PerlACE::TestTarget;
-
-my $program = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
-
-$PROG = $program->CreateProcess ("policies_test", "");
-$program_status = $PROG->SpawnWaitKill ($program->ProcessStartWaitInterval());
-
-if ($program_status != 0) {
-    print STDERR "ERROR: policies_test returned $program_status\n";
-    exit 1;
-}
-
-$exit_status = $PROG->WaitKill ($program->ProcessStopWaitInterval());
-
-if ($exit_status != 0) {
-    print STDERR "ERROR: policies_test returned $server_status\n";
-    $status = 1;
-}
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/states_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/states_test.cpp
deleted file mode 100644
index 7232d3cfc1f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/states_test.cpp
+++ /dev/null
@@ -1,130 +0,0 @@
-#include "states_test.h"
-
-StatesTest::StatesTest()
-{
-
-}
-
-int
-StatesTest::run ()
-{
-  int ret = 0;
-  try
-    {
-      // SAMPLE STATES
-      if (DDS_READ_SAMPLE_STATE != ::DDS::READ_SAMPLE_STATE)
-        {
-          ACE_ERROR ((LM_ERROR, "StatesTest::run - "
-                                "ERROR : READ_SAMPLE_STATE states seem "
-                                "unequal: DDS4CCM <%u> - RTI <%u>\n",
-                                DDS_READ_SAMPLE_STATE,
-                                ::DDS::READ_SAMPLE_STATE));
-          ++ret;
-        }
-      if (DDS_NOT_READ_SAMPLE_STATE != ::DDS::NOT_READ_SAMPLE_STATE)
-        {
-          ACE_ERROR ((LM_ERROR, "StatesTest::run - "
-                                "ERROR : NOT_READ_SAMPLE_STATE states seem "
-                                "unequal: DDS4CCM <%u> - RTI <%u>\n",
-                                DDS_NOT_READ_SAMPLE_STATE,
-                                ::DDS::NOT_READ_SAMPLE_STATE));
-          ++ret;
-        }
-      if (DDS_ANY_SAMPLE_STATE != ::DDS::ANY_SAMPLE_STATE)
-        {
-          ACE_ERROR ((LM_ERROR, "StatesTest::run - "
-                                "ERROR : ANY_SAMPLE_STATE states seem "
-                                "unequal: DDS4CCM <%u> - RTI <%u>\n",
-                                DDS_ANY_SAMPLE_STATE,
-                                ::DDS::ANY_SAMPLE_STATE));
-          ++ret;
-        }
-      // VIEW STATES
-      if (DDS_NEW_VIEW_STATE != ::DDS::NEW_VIEW_STATE)
-        {
-          ACE_ERROR ((LM_ERROR, "StatesTest::run - "
-                                "ERROR : NEW_VIEW_STATE states seem "
-                                "unequal: DDS4CCM <%u> - RTI <%u>\n",
-                                DDS_NEW_VIEW_STATE,
-                                ::DDS::NEW_VIEW_STATE));
-          ++ret;
-        }
-      if (DDS_NOT_NEW_VIEW_STATE != ::DDS::NOT_NEW_VIEW_STATE)
-        {
-          ACE_ERROR ((LM_ERROR, "StatesTest::run - "
-                                "ERROR : NOT_NEW_VIEW_STATE states seem "
-                                "unequal: DDS4CCM <%u> - RTI <%u>\n",
-                                DDS_NOT_NEW_VIEW_STATE,
-                                ::DDS::NOT_NEW_VIEW_STATE));
-          ++ret;
-        }
-      if (DDS_ANY_VIEW_STATE != ::DDS::ANY_VIEW_STATE)
-        {
-          ACE_ERROR ((LM_ERROR, "StatesTest::run - "
-                                "ERROR : ANY_VIEW_STATE states seem "
-                                "unequal: DDS4CCM <%u> - RTI <%u>\n",
-                                DDS_ANY_VIEW_STATE,
-                                ::DDS::ANY_VIEW_STATE));
-          ++ret;
-        }
-      // VIEW STATES
-      if (DDS_ALIVE_INSTANCE_STATE != ::DDS::ALIVE_INSTANCE_STATE)
-        {
-          ACE_ERROR ((LM_ERROR, "StatesTest::run - "
-                                "ERROR : ALIVE_INSTANCE_STATE states seem "
-                                "unequal: DDS4CCM <%u> - RTI <%u>\n",
-                                DDS_ALIVE_INSTANCE_STATE,
-                                ::DDS::ALIVE_INSTANCE_STATE));
-          ++ret;
-        }
-      if (DDS_NOT_ALIVE_DISPOSED_INSTANCE_STATE !=
-          ::DDS::NOT_ALIVE_DISPOSED_INSTANCE_STATE)
-        {
-          ACE_ERROR ((LM_ERROR, "StatesTest::run - "
-                                "ERROR : NOT_ALIVE_DISPOSED_INSTANCE_STATE states seem "
-                                "unequal: DDS4CCM <%u> - RTI <%u>\n",
-                                DDS_NOT_ALIVE_DISPOSED_INSTANCE_STATE,
-                                ::DDS::NOT_ALIVE_DISPOSED_INSTANCE_STATE));
-          ++ret;
-        }
-      if (DDS_NOT_ALIVE_NO_WRITERS_INSTANCE_STATE !=
-          ::DDS::NOT_ALIVE_NO_WRITERS_INSTANCE_STATE)
-        {
-          ACE_ERROR ((LM_ERROR, "StatesTest::run - "
-                                "ERROR : NOT_ALIVE_NO_WRITERS_INSTANCE_STATE "
-                                "states seem "
-                                "unequal: DDS4CCM <%u> - RTI <%u>\n",
-                                DDS_NOT_ALIVE_NO_WRITERS_INSTANCE_STATE,
-                                ::DDS::NOT_ALIVE_NO_WRITERS_INSTANCE_STATE));
-          ++ret;
-        }
-      if (DDS_ANY_INSTANCE_STATE !=
-          ::DDS::ANY_INSTANCE_STATE)
-        {
-          ACE_ERROR ((LM_ERROR, "StatesTest::run - "
-                                "ERROR : ANY_INSTANCE_STATE "
-                                "states seem "
-                                "unequal: DDS4CCM <%u> - RTI <%u>\n",
-                                DDS_ANY_INSTANCE_STATE,
-                                ::DDS::ANY_INSTANCE_STATE));
-          ++ret;
-        }
-      if (DDS_NOT_ALIVE_INSTANCE_STATE !=
-          ::DDS::NOT_ALIVE_INSTANCE_STATE)
-        {
-          ACE_ERROR ((LM_ERROR, "StatesTest::run - "
-                                "ERROR : NOT_ALIVE_INSTANCE_STATE "
-                                "states seem "
-                                "unequal: DDS4CCM <%u> - RTI <%u>\n",
-                                DDS_NOT_ALIVE_INSTANCE_STATE,
-                                ::DDS::NOT_ALIVE_INSTANCE_STATE));
-          ++ret;
-        }
-    }
-  catch (...)
-    {
-      ACE_ERROR ((LM_ERROR, "ERROR STATES: Unexpected exception caught."));
-      return -1;
-    }
-  return ret;
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/states_test.h b/CIAO/connectors/dds4ccm/tests/Policies/states_test.h
deleted file mode 100644
index 1e9b3324248..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/states_test.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef STATES_TEST_H_
-#define STATES_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-
-class StatesTest
-{
-public:
-  StatesTest ();
-
-  int run ();
-};
-
-#endif /* STATES_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/string_seq.cpp b/CIAO/connectors/dds4ccm/tests/Policies/string_seq.cpp
deleted file mode 100644
index 78aeaad0098..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/string_seq.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-#include "string_seq.h"
-
-StringSequence::StringSequence ()
-{
-}
-
-bool
-StringSequence::check (const ::DDS_StringSeq & dds_seq,
-                      const ::DDS::StringSeq & seq,
-                      const char * test)
-{
-  if (static_cast < ::CORBA::ULong> (dds_seq.length ()) !=
-      seq.length ())
-    {
-      ACE_ERROR ((LM_ERROR, "ERROR %C : "
-                            "Length group_data is not equal to original length.\n",
-                            test));
-      return false;
-    }
-
-  for (::DDS_Long i = 0; i < dds_seq.length (); ++i)
-    {
-      if (ACE_OS::strcmp (seq[i], dds_seq[i]) != 0)
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR %C : "
-                            "Item %d of group_data is not equal to original <%C>:<%C>.\n",
-                            test, i, seq[i].in (), dds_seq[i]));
-          return false;
-        }
-    }
-  return true;
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/string_seq.h b/CIAO/connectors/dds4ccm/tests/Policies/string_seq.h
deleted file mode 100644
index 17d7e9419a2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/string_seq.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef STRING_SEQ_H_
-#define STRING_SEQ_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/StringSeq.h"
-
-class StringSequence
-{
-public:
-  StringSequence ();
-
-  static bool check (const ::DDS_StringSeq & dds_seq,
-                     const ::DDS::StringSeq & seq,
-                     const char * test);
-};
-
-#endif /* STRING_SEQ_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/sub_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/sub_qos_test.cpp
deleted file mode 100644
index 4c2cb845842..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/sub_qos_test.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-#include "sub_qos_test.h"
-
-#include "group_data_qos_test.h"
-#include "entity_factory_qos_test.h"
-#include "presentation_qos_test.h"
-#include "partition_qos_test.h"
-
-SubscriberPolicyTest::SubscriberPolicyTest ()
-{
-}
-
-int
-SubscriberPolicyTest::run ()
-{
-  int ret = 0;
-  try
-    {
-      ::DDS::SubscriberQos policy;
-      DDS_SubscriberQos dds_policy_org, dds_policy;
-
-      dds_policy_org = DDS_SUBSCRIBER_QOS_DEFAULT;
-
-      policy <<= dds_policy_org;
-      dds_policy <<= policy;
-
-      if (!PresentationPolicyTest::check (dds_policy.presentation, policy.presentation))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR SUBSCRIBER : "
-                                "Error in PresentationQosPolicy.\n"));
-          ++ret;
-        }
-      if (!PartitionPolicyTest::check (dds_policy.partition, policy.partition))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR SUBSCRIBER : "
-                                "Error in PartitionQosPolicy.\n"));
-          ++ret;
-        }
-      if (!GroupDataPolicyTest::check (dds_policy.group_data, policy.group_data))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR SUBSCRIBER : "
-                                "Error in GroupDataQosPolicy.\n"));
-          ++ret;
-        }
-      if (!EntityFactoryPolicyTest::check (dds_policy.entity_factory, policy.entity_factory))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR SUBSCRIBER : "
-                                "Error in EntityFactoryQosPolicy.\n"));
-          ++ret;
-        }
-    }
-  catch (...)
-    {
-      ACE_ERROR ((LM_ERROR, "ERROR SUBSCRIBER: Unexpected exception caught."));
-      return -1;
-    }
-  return ret;
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/sub_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/sub_qos_test.h
deleted file mode 100644
index ab88b9b099c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/sub_qos_test.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef SUBSCRIBER_QOS_TEST_H_
-#define SUBSCRIBER_QOS_TEST_H_
-
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/SubscriberQos.h"
-
-class SubscriberPolicyTest
-{
-public:
-  SubscriberPolicyTest ();
-
-  int run ();
-};
-
-#endif /* SUBSCRIBER_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/tbf_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/tbf_qos_test.cpp
deleted file mode 100644
index 95fe1f566ec..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/tbf_qos_test.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "tbf_qos_test.h"
-#include "duration.h"
-
-TimeBasedFilterPolicyTest::TimeBasedFilterPolicyTest ()
-{
-}
-
-bool
-TimeBasedFilterPolicyTest::check (const ::DDS_TimeBasedFilterQosPolicy & dds_qos,
-                                  const ::DDS::TimeBasedFilterQosPolicy & qos)
-{
-  return Duration::check (dds_qos.minimum_separation, qos.minimum_separation);
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/tbf_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/tbf_qos_test.h
deleted file mode 100644
index 832aa73a055..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/tbf_qos_test.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef TIME_BASED_FILTER_QOS_TEST_H_
-#define TIME_BASED_FILTER_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/TimeBasedFilterQosPolicy.h"
-
-class TimeBasedFilterPolicyTest
-{
-public:
-  TimeBasedFilterPolicyTest ();
-
-  static bool check (const ::DDS_TimeBasedFilterQosPolicy & dds_qos,
-                     const ::DDS::TimeBasedFilterQosPolicy & qos);
-};
-
-#endif /* TIME_BASED_FILTER_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/tp_data_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/tp_data_qos_test.cpp
deleted file mode 100644
index 154d4fa44e2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/tp_data_qos_test.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "tp_data_qos_test.h"
-
-#include "octet_seq.h"
-
-TopicDataPolicyTest::TopicDataPolicyTest ()
-{
-}
-
-bool
-TopicDataPolicyTest::check (const ::DDS_TopicDataQosPolicy & dds_qos,
-                            const ::DDS::TopicDataQosPolicy & qos)
-{
-  return OctetSequence::check (dds_qos.value,
-                               qos.value,
-                               "TopicDataPolicyTest");
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/tp_data_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/tp_data_qos_test.h
deleted file mode 100644
index 94707413a0a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/tp_data_qos_test.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef TOPIC_DATA_QOS_TEST_H_
-#define TOPIC_DATA_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/TopicDataQosPolicy.h"
-
-class TopicDataPolicyTest
-{
-public:
-  TopicDataPolicyTest ();
-
-  static bool check (const ::DDS_TopicDataQosPolicy & dds_qos,
-                     const ::DDS::TopicDataQosPolicy & qos);
-};
-
-#endif /* TOPIC_DATA_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/tp_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/tp_qos_test.cpp
deleted file mode 100644
index 65520b44e56..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/tp_qos_test.cpp
+++ /dev/null
@@ -1,146 +0,0 @@
-#include "tp_qos_test.h"
-
-#include "tp_data_qos_test.h"
-#include "dur_qos_test.h"
-#include "dur_service_qos_test.h"
-#include "deadline_qos_test.h"
-#include "lat_budget_qos_test.h"
-#include "liveliness_qos_test.h"
-#include "reliability_qos_test.h"
-#include "dest_order_qos_test.h"
-#include "hist_qos_test.h"
-#include "resource_limits_qos_test.h"
-#include "transport_prio_qos_test.h"
-#include "lifespan_qos_test.h"
-#include "ownership_qos_test.h"
-
-TopicPolicyTest::TopicPolicyTest ()
-{
-}
-
-int
-TopicPolicyTest::run ()
-{
-  int ret = 0;
-  try
-    {
-      ::DDS::TopicQos policy;
-      DDS_TopicQos dds_policy_org, dds_policy;
-
-      dds_policy_org = DDS_TOPIC_QOS_DEFAULT;
-
-      policy <<= dds_policy_org;
-      dds_policy <<= policy;
-
-
-      if (!TopicDataPolicyTest::check (dds_policy.topic_data,
-                                       policy.topic_data))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR TOPIC : "
-                                "Error in TopicDataQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!DurabilityPolicyTest::check (dds_policy.durability,
-                                        policy.durability))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR TOPIC : "
-                                "Error in DurabilityQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!DurabilityServicePolicyTest::check (dds_policy.durability_service,
-                                               policy.durability_service))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR TOPIC : "
-                                "Error in DurabilityServiceQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!DeadlinePolicyTest::check (dds_policy.deadline,
-                                      policy.deadline))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR TOPIC : "
-                                "Error in DeadlineQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!LatencyBudgetPolicyTest::check (dds_policy.latency_budget,
-                                           policy.latency_budget))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR TOPIC : "
-                                "Error in LatencyBudgetQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!LivelinessPolicyTest::check (dds_policy.liveliness,
-                                        policy.liveliness))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR TOPIC : "
-                                "Error in LivelinessQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!ReliabilityPolicyTest::check (dds_policy.reliability,
-                                         policy.reliability))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR TOPIC : "
-                                "Error in ReliabilityQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!DestinationOrderPolicyTest::check (dds_policy.destination_order,
-                                             policy.destination_order))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR TOPIC : "
-                                "Error in DestinationOrderQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!HistoryPolicyTest::check (dds_policy.history,
-                                     policy.history))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR TOPIC : "
-                                "Error in HistoryQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!ResourceLimitsPolicyTest::check (dds_policy.resource_limits,
-                                     policy.resource_limits))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR TOPIC : "
-                                "Error in ResourceLimitsQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!TransportPriorityPolicyTest::check (dds_policy.transport_priority,
-                                              policy.transport_priority))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR TOPIC : "
-                                "Error in TransportPriorityQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!LifespanPolicyTest::check (dds_policy.lifespan,
-                                      policy.lifespan))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR TOPIC : "
-                                "Error in LifespanQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!OwnershipPolicyTest::check (dds_policy.ownership,
-                                       policy.ownership))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR TOPIC : "
-                                "Error in OwnershipQosPolicy.\n"));
-          ++ret;
-        }
-    }
-  catch (...)
-    {
-      ACE_ERROR ((LM_ERROR, "ERROR TOPIC: Unexpected exception caught."));
-      return -1;
-    }
-  return ret;
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/tp_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/tp_qos_test.h
deleted file mode 100644
index 9f5c6fc5357..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/tp_qos_test.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef TOPIC_QOS_TEST_H_
-#define TOPIC_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/TopicQos.h"
-
-class TopicPolicyTest
-{
-public:
-  TopicPolicyTest ();
-
-  int run ();
-};
-
-#endif /* TOPIC_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/transport_prio_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/transport_prio_qos_test.cpp
deleted file mode 100644
index e776b9f132a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/transport_prio_qos_test.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "transport_prio_qos_test.h"
-
-TransportPriorityPolicyTest::TransportPriorityPolicyTest ()
-{
-}
-
-bool
-TransportPriorityPolicyTest::check (const ::DDS_TransportPriorityQosPolicy & dds_qos,
-                                    const ::DDS::TransportPriorityQosPolicy & qos)
-{
-  return dds_qos.value == qos.value;
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/transport_prio_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/transport_prio_qos_test.h
deleted file mode 100644
index fdc5ccf6155..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/transport_prio_qos_test.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef TRANSPORT_PRIORITY_QOS_TEST_H_
-#define TRANSPORT_PRIORITY_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/TransportPriorityQosPolicy.h"
-
-class TransportPriorityPolicyTest
-{
-public:
-  TransportPriorityPolicyTest ();
-
-  static bool check (const ::DDS_TransportPriorityQosPolicy & dds_qos,
-                     const ::DDS::TransportPriorityQosPolicy & qos);
-};
-
-#endif /* TRANSPORT_PRIORITY_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/typeconsistencyenforcement_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/typeconsistencyenforcement_qos_test.cpp
deleted file mode 100644
index 6f7ab19f9b7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/typeconsistencyenforcement_qos_test.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "typeconsistencyenforcement_qos_test.h"
-
-#if defined (RTI_DDS_VERSION_MAJOR) && (RTI_DDS_VERSION_MAJOR >= 5)
-
-TypeConsistencyEnforcementPolicyPolicyTest::TypeConsistencyEnforcementPolicyPolicyTest ()
-{
-}
-
-bool
-TypeConsistencyEnforcementPolicyPolicyTest::check (const ::DDS_TypeConsistencyEnforcementQosPolicy & dds_qos,
-                              const ::DDS::TypeConsistencyEnforcementQosPolicy & qos)
-{
-  return dds_qos.kind == static_cast <DDS_TypeConsistencyKind> (qos.kind);
-}
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/typeconsistencyenforcement_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/typeconsistencyenforcement_qos_test.h
deleted file mode 100644
index ba06c6420cd..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/typeconsistencyenforcement_qos_test.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef TYPECONSISTENCYENFORCEMENT_QOS_TEST_H_
-#define TYPECONSISTENCYENFORCEMENT_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/TypeConsistencyEnforcementQosPolicy.h"
-
-#if defined (RTI_DDS_VERSION_MAJOR) && (RTI_DDS_VERSION_MAJOR >= 5)
-
-class TypeConsistencyEnforcementPolicyPolicyTest
-{
-public:
-  TypeConsistencyEnforcementPolicyPolicyTest ();
-
-  static bool check (const ::DDS_TypeConsistencyEnforcementQosPolicy & dds_qos,
-                     const ::DDS::TypeConsistencyEnforcementQosPolicy & qos);
-};
-
-#endif
-
-#endif /* TYPECONSISTENCYENFORCEMENT_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/user_data_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/user_data_qos_test.cpp
deleted file mode 100644
index 6658311fcf3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/user_data_qos_test.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "user_data_qos_test.h"
-
-#include "octet_seq.h"
-
-UserDataPolicyTest::UserDataPolicyTest ()
-{
-}
-
-bool
-UserDataPolicyTest::check (const ::DDS_UserDataQosPolicy & dds_qos,
-                           const ::DDS::UserDataQosPolicy & qos)
-{
-  return OctetSequence::check (dds_qos.value,
-                               qos.value,
-                               "UserDataPolicyTest");
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/user_data_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/user_data_qos_test.h
deleted file mode 100644
index e0ce81b4159..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/user_data_qos_test.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef USER_DATA_QOS_TEST_H_
-#define USER_DATA_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/UserDataQosPolicy.h"
-
-class UserDataPolicyTest
-{
-public:
-  UserDataPolicyTest ();
-
-  static bool check (const ::DDS_UserDataQosPolicy & dds_qos,
-                     const ::DDS::UserDataQosPolicy & qos);
-};
-
-#endif /* USER_DATA_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/wr_lifecycle_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/wr_lifecycle_qos_test.cpp
deleted file mode 100644
index cdc29b90cae..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/wr_lifecycle_qos_test.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "wr_lifecycle_qos_test.h"
-
-WriterDataLifecyclePolicyTest::WriterDataLifecyclePolicyTest ()
-{
-}
-
-bool
-WriterDataLifecyclePolicyTest::check (const ::DDS_WriterDataLifecycleQosPolicy & dds_qos,
-                                      const ::DDS::WriterDataLifecycleQosPolicy & qos)
-{
-  return dds_qos.autodispose_unregistered_instances ==
-         static_cast <DDS_Boolean> (qos.autodispose_unregistered_instances);
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/wr_lifecycle_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/wr_lifecycle_qos_test.h
deleted file mode 100644
index 05536fc3dcd..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/wr_lifecycle_qos_test.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef WRITER_DATA_LIFECYCLE_QOS_TEST_H_
-#define WRITER_DATA_LIFECYCLE_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/WriterDataLifecycleQosPolicy.h"
-
-class WriterDataLifecyclePolicyTest
-{
-public:
-  WriterDataLifecyclePolicyTest ();
-
-  static bool check (const ::DDS_WriterDataLifecycleQosPolicy & dds_qos,
-                     const ::DDS::WriterDataLifecycleQosPolicy & qos);
-};
-
-#endif /* WRITER_DATA_LIFECYCLE_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/.gitignore b/CIAO/connectors/dds4ccm/tests/PortUsage/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.idl
deleted file mode 100644
index a5a6295900c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.idl
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * @file PortUsage_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef PORTUSAGE_EVENT_TEST_BASE_IDL
-#define PORTUSAGE_EVENT_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/PortUsage_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/PortUsage_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "PortUsageTest"
-#pragma DCPS_DATA_KEY "PortUsageTest symbol"
-
-struct PortUsageTest {
-  string symbol; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<PortUsageTest> PortUsageTestSeq;
-#endif
-
-enum PORT_USAGE_ASSIGNMENT {
-  //event ports
-  PORTUSAGE_ASSIGNMENT_WRITE,
-  //event and state ports
-  PORTUSAGE_ASSIGNMENT_GET,
-  PORTUSAGE_ASSIGNMENT_LISTEN,
-  //state ports
-  PORTUSAGE_ASSIGNMENT_UPDATE,
-  PORTUSAGE_ASSIGNMENT_READ,
-  PORTUSAGE_ASSIGNMENT_STATELISTEN
-};
-
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.mpc
deleted file mode 100644
index b541c285f2a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (PortUsage_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
-  sharedname = PortUsage_Test_Base_stub
-  dynamicflags += PORTUSAGE_EVENT_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=PORTUSAGE_EVENT_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=PortUsage_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    PortUsage_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=PORTUSAGE_EVENT_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    PortUsage_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.idl b/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.idl
deleted file mode 100644
index 04e0340f5a6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef EVENT_COMPONENT_IDL
-#define EVENT_COMPONENT_IDL
-
-#include "EventConnector/PortUsageEvent_Connector.idl"
-
-module PortUsageEvent_Test
-{
-  component PortUsageEventComponent
-  {
-    port PortUsageTestConnector::DDS_Write write_port;
-    port PortUsageTestConnector::DDS_Get get_port;
-    port PortUsageTestConnector::DDS_Listen listen_port;
-
-    provides CCM_DDS::ConnectorStatusListener connector_status;
-
-    attribute PORT_USAGE_ASSIGNMENT portusage_assignment;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.mpc b/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.mpc
deleted file mode 100644
index 19ccda457ed..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-project(PortUsageEvent_Component_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += PortUsageEvent_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=COMPONENT_STUB_Export \
-              -Wb,stub_export_include=Component_stub_export.h \
-              -Wb,skel_export_macro=COMPONENT_SVNT_Export \
-              -Wb,skel_export_include=Component_svnt_export.h \
-              -Wb,svnt_export_macro=COMPONENT_SVNT_Export \
-              -Wb,svnt_export_include=Component_svnt_export.h \
-              -Wb,exec_export_macro=COMPONENT_EXEC_Export \
-              -Wb,exec_export_include=Component_exec_export.h -I..
-
-  IDL_Files {
-    PortUsageEvent_Component.idl
-  }
-}
-
-project(PortUsageEvent_Component_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += PortUsageEvent_Component_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=COMPONENT_LEM_STUB_Export \
-              -Wb,stub_export_include=Component_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    PortUsageEvent_ComponentE.idl
-  }
-}
-
-project(PortUsageEvent_Component_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += PortUsageEvent_Component_lem_gen PortUsageEvent_Component_stub  \
-           PortUsageEvent_Connector_stub PortUsage_Test_Base_stub
-  libs  += EventComponent_stub PortUsageEvent_Connector_stub \
-           PortUsage_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = EventComponent_lem_stub
-  dynamicflags += COMPONENT_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PortUsageEvent_ComponentEC.cpp
-  }
-
-  Header_Files {
-    PortUsageEvent_ComponentEC.h
-    Component_lem_stub_export.h
-  }
-
-  Inline_Files {
-    PortUsageEvent_ComponentEC.inl
-  }
-}
-
-project(PortUsageEvent_Component_stub) : ccm_stub, dds4ccm_base {
-  after += PortUsageEvent_Component_idl_gen  PortUsageEvent_Connector_stub \
-           PortUsage_Test_Base_stub PortUsageEvent_Connector_lem_gen
-  libs  += PortUsageEvent_Connector_stub PortUsage_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = EventComponent_stub
-  dynamicflags += COMPONENT_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PortUsageEvent_ComponentC.cpp
-  }
-
-  Header_Files {
-    PortUsageEvent_ComponentC.h
-    Component_stub_export.h
-  }
-
-  Inline_Files {
-    PortUsageEvent_ComponentC.inl
-  }
-}
-
-project(PortUsageEvent_Component_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += PortUsageEvent_Component_lem_stub PortUsageEvent_Component_stub \
-             PortUsage_Test_Base_stub PortUsageEvent_Connector_stub \
-             PortUsageEvent_Connector_lem_stub 
-  sharedname = EventComponent_exec
-  libs += EventComponent_stub EventComponent_lem_stub PortUsage_Test_Base_stub \
-          PortUsageEvent_Connector_stub PortUsageEvent_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COMPONENT_EXEC_BUILD_DLL READER_STARTER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PortUsageEvent_Component_exec.cpp
-  }
-
-  Header_Files {
-    PortUsageEvent_Component_exec.h
-    Component_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(PortUsageEvent_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   PortUsageEvent_Component_lem_stub PortUsage_Test_Base_stub \
-                  PortUsageEvent_Connector_stub PortUsageEvent_Connector_svnt \
-                  PortUsageEvent_Component_exec PortUsageEvent_Connector_lem_stub 
-  sharedname  = EventComponent_svnt
-  libs       += EventComponent_stub EventComponent_lem_stub PortUsage_Test_Base_stub \
-                PortUsageEvent_Connector_stub PortUsageEvent_Connector_svnt \
-                EventComponent_exec PortUsageEvent_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COMPONENT_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PortUsageEvent_ComponentS.cpp
-    PortUsageEvent_Component_svnt.cpp
-  }
-
-  Header_Files {
-    PortUsageEvent_ComponentS.h
-    PortUsageEvent_Component_svnt.h
-    Component_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component_exec.cpp
deleted file mode 100644
index c932d5dd6bf..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component_exec.cpp
+++ /dev/null
@@ -1,291 +0,0 @@
-// -*- C++ -*-
-#include "PortUsageEvent_Component_exec.h"
-
-#include "ace/OS_NS_unistd.h"
-#include "ace/Log_Msg.h"
-#include "dds4ccm/impl/Utils.h"
-
-namespace CIAO_PortUsageEvent_Test_PortUsageEventComponent_Impl
-{
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (
-                                    Atomic_ULong& datareaders_count,
-                                    Atomic_ULong& datawriters_count)
-    : datareaders_count_ (datareaders_count),
-      datawriters_count_ (datawriters_count)
-  {
-  }
-
-  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic (
-    ::DDS::Topic_ptr /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed (
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos (
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status (
-    ::DDS::Entity_ptr the_entity,
-    ::DDS::StatusKind status_kind)
-  {
-    ACE_DEBUG ((LM_DEBUG,
-              "ConnectorStatusListener_exec_i::on_unexpected_status <%C>\n",
-              CIAO::DDS4CCM::translate_statuskind (status_kind)));
-    if (status_kind == DDS::PUBLICATION_MATCHED_STATUS)
-      {
-        DDS::DataWriter_var dw = DDS::DataWriter::_narrow (the_entity);
-        if (! ::CORBA::is_nil (dw.in ()))
-          {
-            ++this->datawriters_count_;
-            ACE_DEBUG ((LM_DEBUG, "DataWriters found until now <%u>\n",
-                this->datawriters_count_.value ()));
-          }
-        else
-          {
-            DDS::DataReader_var dr = DDS::DataReader::_narrow (the_entity);
-            if (! ::CORBA::is_nil (dr.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR : DATAREADER isn't nil when receiving an "
-                                      "on_publication_matched status\n"));
-              }
-          }
-      }
-    if (status_kind == DDS::SUBSCRIPTION_MATCHED_STATUS)
-      {
-        DDS::DataReader_var dw = DDS::DataReader::_narrow (the_entity);
-        if (! ::CORBA::is_nil (dw.in ()))
-          {
-            ++this->datareaders_count_;
-            ACE_DEBUG ((LM_DEBUG, "DataReaders found until now <%u>\n",
-                this->datareaders_count_.value ()));
-          }
-        DDS::DataWriter_var dr = DDS::DataWriter::_narrow (the_entity);
-        if (! ::CORBA::is_nil (dr.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR : DATAREADER isn't nil when receiving an "
-                                  "on_subscription_matched status\n"));
-          }
-      }
-  }
-
-  //============================================================
-  // Component_exec_i
-  //============================================================
-  Component_exec_i::Component_exec_i (void)
-    : assignment_ (PORTUSAGE_ASSIGNMENT_WRITE),
-      datareaders_count_ (0),
-      datawriters_count_ (0)
-  {
-  }
-
-  Component_exec_i::~Component_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-  void
-  Component_exec_i::check_writer ()
-  {
-     if (this->datawriters_count_.value () != 1)
-      {
-        ACE_ERROR ((LM_ERROR, "Component_exec_i::check_writer - "
-                  "ERROR : Unexpected number of DataWriters detected - "
-                  "expected <1> - detected <%u>\n",
-                  this->datawriters_count_.value ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "Component_exec_i::check_writer - "
-                  "OK : Detected the expected number of DataWriters - "
-                  "expected <1> - detected <%u>\n",
-                  this->datawriters_count_.value ()));
-      }
-  }
-
-  void
-  Component_exec_i::check_getter ()
-  {
-     if (this->datareaders_count_.value () != 1)
-      {
-        ACE_ERROR ((LM_ERROR, "Component_exec_i::check_getter - "
-                  "ERROR : Unexpected number of DataReaders detected - "
-                  "expected <1> - detected <%u>\n",
-                  this->datareaders_count_.value ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "Component_exec_i::check_getter - "
-                  "OK : Detected the expected number of DataReaders - "
-                  "expected <1> - detected <%u>\n",
-                  this->datareaders_count_.value ()));
-      }
-  }
-
-  void
-  Component_exec_i::check_listener ()
-  {
-     if (this->datareaders_count_.value () != 1)
-      {
-        ACE_ERROR ((LM_ERROR, "Component_exec_i::check_listener - "
-                  "ERROR : Unexpected number of DataReaders detected - "
-                  "expected <1> - detected <%u>\n",
-                  this->datareaders_count_.value ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "Component_exec_i::check_listener - "
-                  "OK : Detected the expected number of DataReaders - "
-                  "expected <1> - detected <%u>\n",
-                  this->datareaders_count_.value ()));
-      }
-  }
-
-  // Component attributes.
-  PORT_USAGE_ASSIGNMENT
-  Component_exec_i::portusage_assignment()
-  {
-    return this->assignment_;
-  }
-
-  void
-  Component_exec_i::portusage_assignment(PORT_USAGE_ASSIGNMENT assignment)
-  {
-    switch (assignment)
-      {
-        case PORTUSAGE_ASSIGNMENT_WRITE:
-          ACE_DEBUG ((LM_DEBUG, "New assigment: 'check writer port'\n"));
-          break;
-        case PORTUSAGE_ASSIGNMENT_GET:
-          ACE_DEBUG ((LM_DEBUG, "New assigment: 'check getter port'\n"));
-          break;
-        case PORTUSAGE_ASSIGNMENT_LISTEN:
-          ACE_DEBUG ((LM_DEBUG, "New assigment: 'check listener port'\n"));
-          break;
-        default:
-          ACE_ERROR ((LM_ERROR, "Component_exec_i::portusage_assignment - "
-                                "ERROR : Unknown assignment\n"));
-          break;
-
-      }
-    this->assignment_ = assignment;
-  }
-
-  // Port operations.
-  CCM_DDS::CCM_PortStatusListener_ptr
-  Component_exec_i::get_get_port_status()
-  {
-    return CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  PortUsageEvent_Test::PortUsageTestConnector::CCM_Listener_ptr
-  Component_exec_i::get_listen_port_data_listener()
-  {
-    return PortUsageEvent_Test::PortUsageTestConnector::CCM_Listener::_nil ();
-  }
-
-  CCM_DDS::CCM_PortStatusListener_ptr
-  Component_exec_i::get_listen_port_status()
-  {
-    return CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Component_exec_i::get_connector_status ()
-  {
-    return new ConnectorStatusListener_exec_i (
-                  this->datareaders_count_,
-                  this->datawriters_count_);
-  }
-
-  // Operations from Components::SessionComponent.
-  void
-  Component_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::PortUsageEvent_Test::CCM_PortUsageEventComponent_Context::_narrow (ctx);
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Component_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Component_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Component_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Component_exec_i::ccm_remove (void)
-  {
-    switch (this->assignment_)
-      {
-        case PORTUSAGE_ASSIGNMENT_WRITE:
-          this->check_writer ();
-          break;
-        case PORTUSAGE_ASSIGNMENT_GET:
-          this->check_getter ();
-          break;
-        case PORTUSAGE_ASSIGNMENT_LISTEN:
-          this->check_listener ();
-          break;
-        default:
-          ACE_ERROR ((LM_ERROR, "Component_exec_i::ccm_remove - "
-                                "ERROR : Unknown assignment\n"));
-          break;
-      }
-  }
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_PortUsageEvent_Component_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Component_exec_i);
-
-    return retval;
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component_exec.h b/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component_exec.h
deleted file mode 100644
index e1e605e05a8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component_exec.h
+++ /dev/null
@@ -1,117 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_COMPONENT_EXEC_H_
-#define CIAO_COMPONENT_EXEC_H_
-
-#include "PortUsageEvent_ComponentEC.h"
-
-#include /**/ "Component_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-namespace CIAO_PortUsageEvent_Test_PortUsageEventComponent_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::ULong> Atomic_ULong;
-
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  class COMPONENT_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Atomic_ULong&,
-                                    Atomic_ULong&);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-    void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                     const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-    void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                               ::DDS::StatusKind status_kind);
-  private:
-    Atomic_ULong& datareaders_count_;
-    Atomic_ULong& datawriters_count_;
-  };
-
-  //============================================================
-  // Component_exec_i
-  //============================================================
-  class COMPONENT_EXEC_Export Component_exec_i
-    : public virtual PortUsageEventComponent_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Component_exec_i (void);
-    virtual ~Component_exec_i (void);
-
-    // Component attributes.
-    virtual PORT_USAGE_ASSIGNMENT
-    portusage_assignment (void);
-
-    virtual void
-    portusage_assignment (PORT_USAGE_ASSIGNMENT assignment);
-
-    // Port operations.
-    virtual CCM_DDS::CCM_PortStatusListener_ptr
-    get_get_port_status (void);
-
-    virtual PortUsageEvent_Test::PortUsageTestConnector::CCM_Listener_ptr
-    get_listen_port_data_listener (void);
-
-    virtual CCM_DDS::CCM_PortStatusListener_ptr
-    get_listen_port_status (void);
-
-    virtual CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_connector_status ();
-
-    // Operations from Components::SessionComponent.
-    virtual void
-    set_session_context (
-      ::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete (void);
-
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-
-  private:
-    ::PortUsageEvent_Test::CCM_PortUsageEventComponent_Context_var context_;
-
-    PORT_USAGE_ASSIGNMENT assignment_;
-
-    Atomic_ULong datareaders_count_;
-    Atomic_ULong datawriters_count_;
-
-    // Supported operations and attributes.
-    void check_writer (void);
-
-    void check_getter (void);
-
-    void check_listener (void);
-  };
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_PortUsageEvent_Component_Impl (void);
-}
-
-#endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.idl b/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.idl
deleted file mode 100644
index 0ef5034d5d1..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file PortUsageEvent_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef PORTUSAGE_EVENT_TEST_CONNECTOR_IDL_
-#define PORTUSAGE_EVENT_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/PortUsage_Test_Base.idl"
-
-#pragma ciao lem "EventConnector/PortUsageEvent_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/PortUsage_Test_BaseTypeSupport.idl"
-#endif
-
-module PortUsageEvent_Test
-{
-  module ::CCM_DDS::Typed < ::PortUsageTest, ::PortUsageTestSeq> PortUsageTestConnector;
-};
-
-#endif /* PORTUSAGE_EVENT_TEST_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.mpc b/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.mpc
deleted file mode 100644
index 90cad48d622..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p PortUsage_Test_Base -l .. -o ../lib -u DDS PortUsageEvent_Connector"
-
-project(PortUsageEvent_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen PortUsage_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=PORTUSAGE_EVENT_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=PortUsageEvent_Connector_stub_export.h \
-              -Wb,skel_export_macro=PORTUSAGE_EVENT_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=PortUsageEvent_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=PORTUSAGE_EVENT_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=PortUsageEvent_Connector_svnt_export.h \
-              -Wb,conn_export_macro=PORTUSAGE_EVENT_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=PortUsageEvent_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    PortUsageEvent_Connector.idl
-  }
-}
-
-project(PortUsageEvent_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += PortUsageEvent_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=PORTUSAGE_EVENT_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=PortUsageEvent_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    PortUsageEvent_ConnectorE.idl
-  }
-}
-
-project(PortUsageEvent_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += PortUsageEvent_Connector_lem_gen PortUsageEvent_Connector_stub PortUsage_Test_Base_stub
-  libs  += PortUsage_Test_Base_stub PortUsageEvent_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = PortUsageEvent_Connector_lem_stub
-  dynamicflags += PORTUSAGE_EVENT_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PortUsageEvent_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    PortUsageEvent_ConnectorEC.h
-    PortUsageEvent_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    PortUsageEvent_ConnectorEC.inl
-  }
-}
-
-project(PortUsageEvent_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += PortUsageEvent_Connector_idl_gen PortUsage_Test_Base_stub
-  libs  += PortUsage_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = PortUsageEvent_Connector_stub
-  dynamicflags += PORTUSAGE_EVENT_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PortUsageEvent_ConnectorC.cpp
-  }
-
-  Header_Files {
-    PortUsageEvent_ConnectorC.h
-    PortUsageEvent_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    PortUsageEvent_ConnectorC.inl
-  }
-}
-
-project(PortUsageEvent_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += PortUsageEvent_Connector_lem_stub PortUsageEvent_Connector_stub PortUsage_Test_Base_stub
-  sharedname = PortUsageEvent_Connector_exec
-  libs += PortUsageEvent_Connector_stub PortUsageEvent_Connector_lem_stub PortUsage_Test_Base_stub PortUsage_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += PORTUSAGE_EVENT_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PortUsageEvent_Connector_conn.cpp
-  }
-
-  Header_Files {
-    PortUsageEvent_Connector_conn.h
-    PortUsageEvent_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(PortUsageEvent_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += PortUsageEvent_Connector_lem_stub PortUsageEvent_Connector_exec PortUsageEvent_Connector_stub
-  sharedname  = PortUsageEvent_Connector_svnt
-  libs       += PortUsageEvent_Connector_stub \
-                PortUsageEvent_Connector_lem_stub  \
-                PortUsage_Test_Base_stub \
-                PortUsageEvent_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += PORTUSAGE_EVENT_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PortUsageEvent_ConnectorS.cpp
-    PortUsageEvent_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    PortUsageEvent_ConnectorS.h
-    PortUsageEvent_Connector_svnt.h
-    PortUsageEvent_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.idl b/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.idl
deleted file mode 100644
index 67ee29bb7b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef STATE_COMPONENT_IDL
-#define STATE_COMPONENT_IDL
-
-#include "StateConnector/PortUsageState_Connector.idl"
-
-module PortUsageState_Test
-{
-  component PortUsageStateComponent
-  {
-    port PortUsageTestConnector::DDS_Update update_port;
-    port PortUsageTestConnector::DDS_Read read_port;
-    port PortUsageTestConnector::DDS_Get get_port;
-    port PortUsageTestConnector::DDS_Listen listen_port;
-    port PortUsageTestConnector::DDS_StateListen state_listen_port;
-
-    provides CCM_DDS::ConnectorStatusListener connector_status;
-
-    attribute PORT_USAGE_ASSIGNMENT portusage_assignment;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.mpc b/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.mpc
deleted file mode 100644
index 81252c6c330..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-project(PortUsageState_Component_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += PortUsageState_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=COMPONENT_STUB_Export \
-              -Wb,stub_export_include=Component_stub_export.h \
-              -Wb,skel_export_macro=COMPONENT_SVNT_Export \
-              -Wb,skel_export_include=Component_svnt_export.h \
-              -Wb,svnt_export_macro=COMPONENT_SVNT_Export \
-              -Wb,svnt_export_include=Component_svnt_export.h \
-              -Wb,exec_export_macro=COMPONENT_EXEC_Export \
-              -Wb,exec_export_include=Component_exec_export.h -I..
-
-  IDL_Files {
-    PortUsageState_Component.idl
-  }
-}
-
-project(PortUsageState_Component_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += PortUsageState_Component_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=COMPONENT_LEM_STUB_Export \
-              -Wb,stub_export_include=Component_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    PortUsageState_ComponentE.idl
-  }
-}
-
-project(PortUsageState_Component_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += PortUsageState_Component_lem_gen PortUsageState_Component_stub  \
-           PortUsageState_Connector_stub PortUsage_Test_Base_stub
-  libs  += StateComponent_stub PortUsageState_Connector_stub \
-           PortUsage_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = StateComponent_lem_stub
-  dynamicflags += COMPONENT_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PortUsageState_ComponentEC.cpp
-  }
-
-  Header_Files {
-    PortUsageState_ComponentEC.h
-    Component_lem_stub_export.h
-  }
-
-  Inline_Files {
-    PortUsageState_ComponentEC.inl
-  }
-}
-
-project(PortUsageState_Component_stub) : ccm_stub, dds4ccm_base {
-  after += PortUsageState_Component_idl_gen  PortUsageState_Connector_stub \
-           PortUsage_Test_Base_stub PortUsageState_Connector_lem_gen
-  libs  += PortUsageState_Connector_stub PortUsage_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = StateComponent_stub
-  dynamicflags += COMPONENT_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PortUsageState_ComponentC.cpp
-  }
-
-  Header_Files {
-    PortUsageState_ComponentC.h
-    Component_stub_export.h
-  }
-
-  Inline_Files {
-    PortUsageState_ComponentC.inl
-  }
-}
-
-project(PortUsageState_Component_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += PortUsageState_Component_lem_stub PortUsageState_Component_stub \
-             PortUsage_Test_Base_stub PortUsageState_Connector_stub \
-             PortUsageState_Connector_lem_stub 
-  sharedname = StateComponent_exec
-  libs += StateComponent_stub StateComponent_lem_stub PortUsage_Test_Base_stub \
-          PortUsageState_Connector_stub PortUsageState_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COMPONENT_EXEC_BUILD_DLL READER_STARTER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PortUsageState_Component_exec.cpp
-  }
-
-  Header_Files {
-    PortUsageState_Component_exec.h
-    Component_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(PortUsageState_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   PortUsageState_Component_lem_stub PortUsage_Test_Base_stub \
-                  PortUsageState_Connector_stub PortUsageState_Connector_svnt \
-                  PortUsageState_Component_exec PortUsageState_Connector_lem_stub 
-  sharedname  = StateComponent_svnt
-  libs       += StateComponent_stub StateComponent_lem_stub PortUsage_Test_Base_stub \
-                PortUsageState_Connector_stub PortUsageState_Connector_svnt \
-                StateComponent_exec PortUsageState_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COMPONENT_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PortUsageState_ComponentS.cpp
-    PortUsageState_Component_svnt.cpp
-  }
-
-  Header_Files {
-    PortUsageState_ComponentS.h
-    PortUsageState_Component_svnt.h
-    Component_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.cpp
deleted file mode 100644
index f53643b0832..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.cpp
+++ /dev/null
@@ -1,360 +0,0 @@
-// -*- C++ -*-
-#include "PortUsageState_Component_exec.h"
-
-#include "ace/OS_NS_unistd.h"
-#include "ace/Log_Msg.h"
-#include "dds4ccm/impl/Utils.h"
-
-namespace CIAO_PortUsageState_Test_PortUsageStateComponent_Impl
-{
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (
-                                    Atomic_ULong& datareaders_count,
-                                    Atomic_ULong& datawriters_count)
-    : datareaders_count_ (datareaders_count),
-      datawriters_count_ (datawriters_count)
-  {
-  }
-
-  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic (
-    ::DDS::Topic_ptr /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed (
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos (
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status (
-    ::DDS::Entity_ptr the_entity,
-    ::DDS::StatusKind status_kind)
-  {
-    ACE_DEBUG ((LM_DEBUG,
-              "ConnectorStatusListener_exec_i::on_unexpected_status <%C>\n",
-              CIAO::DDS4CCM::translate_statuskind (status_kind)));
-    if (status_kind == DDS::PUBLICATION_MATCHED_STATUS)
-      {
-        DDS::DataWriter_var dw = DDS::DataWriter::_narrow (the_entity);
-        if (! ::CORBA::is_nil (dw.in ()))
-          {
-            ++this->datawriters_count_;
-            ACE_DEBUG ((LM_DEBUG, "DataWriters found until now <%u>\n",
-                this->datawriters_count_.value ()));
-          }
-        else
-          {
-            DDS::DataReader_var dr = DDS::DataReader::_narrow (the_entity);
-            if (! ::CORBA::is_nil (dr.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR : DATAREADER isn't nil when receiving an "
-                                      "on_publication_matched status\n"));
-              }
-          }
-      }
-    if (status_kind == DDS::SUBSCRIPTION_MATCHED_STATUS)
-      {
-        DDS::DataReader_var dw = DDS::DataReader::_narrow (the_entity);
-        if (! ::CORBA::is_nil (dw.in ()))
-          {
-            ++this->datareaders_count_;
-            ACE_DEBUG ((LM_DEBUG, "DataReaders found until now <%u>\n",
-                this->datareaders_count_.value ()));
-          }
-        DDS::DataWriter_var dr = DDS::DataWriter::_narrow (the_entity);
-        if (! ::CORBA::is_nil (dr.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR : DATAREADER isn't nil when receiving an "
-                                  "on_subscription_matched status\n"));
-          }
-      }
-  }
-
-  //============================================================
-  // Component_exec_i
-  //============================================================
-  Component_exec_i::Component_exec_i (void)
-    : assignment_ (PORTUSAGE_ASSIGNMENT_WRITE),
-      datareaders_count_ (0),
-      datawriters_count_ (0)
-  {
-  }
-
-  Component_exec_i::~Component_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-  void
-  Component_exec_i::check_updater ()
-  {
-     if (this->datawriters_count_.value () != 1)
-      {
-        ACE_ERROR ((LM_ERROR, "Component_exec_i::check_writer - "
-                  "ERROR : Unexpected number of DataWriters detected - "
-                  "expected <1> - detected <%u>\n",
-                  this->datawriters_count_.value ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "Component_exec_i::check_writer - "
-                  "OK : Detected the expect number of DataWriters - "
-                  "expected <1> - detected <%u>\n",
-                  this->datawriters_count_.value ()));
-      }
-  }
-
-  void
-  Component_exec_i::check_getter ()
-  {
-     if (this->datareaders_count_.value () != 1)
-      {
-        ACE_ERROR ((LM_ERROR, "Component_exec_i::check_getter - "
-                  "ERROR : Unexpected number of DataReaders detected - "
-                  "expected <1> - detected <%u>\n",
-                  this->datareaders_count_.value ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "Component_exec_i::check_getter - "
-                  "OK : Detected the expected number of DataReaders - "
-                  "expected <1> - detected <%u>\n",
-                  this->datareaders_count_.value ()));
-      }
-  }
-
-  void
-  Component_exec_i::check_listener ()
-  {
-     if (this->datareaders_count_.value () != 1)
-      {
-        ACE_ERROR ((LM_ERROR, "Component_exec_i::check_listener - "
-                  "ERROR : Unexpected number of DataReaders detected - "
-                  "expected <1> - detected <%u>\n",
-                  this->datareaders_count_.value ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "Component_exec_i::check_listener - "
-                  "OK : Detected the expected number of DataReaders - "
-                  "expected <1> - detected <%u>\n",
-                  this->datareaders_count_.value ()));
-      }
-  }
-
-  void
-  Component_exec_i::check_reader ()
-  {
-     if (this->datareaders_count_.value () != 1)
-      {
-        ACE_ERROR ((LM_ERROR, "Component_exec_i::check_reader - "
-                  "ERROR : Unexpected number of DataReaders detected - "
-                  "expected <1> - detected <%u>\n",
-                  this->datareaders_count_.value ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "Component_exec_i::check_reader - "
-                  "OK : Detected the expected number of DataReaders - "
-                  "expected <1> - detected <%u>\n",
-                  this->datareaders_count_.value ()));
-      }
-  }
-
-  void
-  Component_exec_i::check_state_listen ()
-  {
-     if (this->datareaders_count_.value () != 1)
-      {
-        ACE_ERROR ((LM_ERROR, "Component_exec_i::check_state_listen - "
-                  "ERROR : Unexpected number of DataReaders detected - "
-                  "expected <1> - detected <%u>\n",
-                  this->datareaders_count_.value ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "Component_exec_i::check_state_listen - "
-                  "OK : Detected the expected number of DataReaders - "
-                  "expected <1> - detected <%u>\n",
-                  this->datareaders_count_.value ()));
-      }
-  }
-
-  // Component attributes.
-  PORT_USAGE_ASSIGNMENT
-  Component_exec_i::portusage_assignment()
-  {
-    return this->assignment_;
-  }
-
-  void
-  Component_exec_i::portusage_assignment (PORT_USAGE_ASSIGNMENT assignment)
-  {
-    switch (assignment)
-      {
-        case PORTUSAGE_ASSIGNMENT_UPDATE:
-          ACE_DEBUG ((LM_DEBUG, "New assigment: 'check updater port'\n"));
-          break;
-        case PORTUSAGE_ASSIGNMENT_GET:
-          ACE_DEBUG ((LM_DEBUG, "New assigment: 'check getter port'\n"));
-          break;
-        case PORTUSAGE_ASSIGNMENT_LISTEN:
-          ACE_DEBUG ((LM_DEBUG, "New assigment: 'check listener port'\n"));
-          break;
-        case PORTUSAGE_ASSIGNMENT_READ:
-          ACE_DEBUG ((LM_DEBUG, "New assigment: 'check reader port'\n"));
-          break;
-        case PORTUSAGE_ASSIGNMENT_STATELISTEN:
-          ACE_DEBUG ((LM_DEBUG, "New assigment: 'check state listen port'\n"));
-          break;
-        default:
-          ACE_ERROR ((LM_ERROR, "Component_exec_i::portusage_assignment - "
-                                "ERROR : Unknown assignment\n"));
-          break;
-
-      }
-    this->assignment_ = assignment;
-  }
-
-  // Port operations.
-  CCM_DDS::CCM_PortStatusListener_ptr
-  Component_exec_i::get_read_port_status()
-  {
-    return CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  PortUsageState_Test::PortUsageTestConnector::CCM_StateListener_ptr
-  Component_exec_i::get_state_listen_port_data_listener()
-  {
-    return PortUsageState_Test::PortUsageTestConnector::CCM_StateListener::_nil ();
-  }
-
-  CCM_DDS::CCM_PortStatusListener_ptr
-  Component_exec_i::get_state_listen_port_status()
-  {
-    return CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Component_exec_i::get_connector_status ()
-  {
-    return new ConnectorStatusListener_exec_i (
-                  this->datareaders_count_,
-                  this->datawriters_count_);
-  }
-
-  CCM_DDS::CCM_PortStatusListener_ptr
-  Component_exec_i::get_get_port_status (void)
-  {
-    return CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  PortUsageState_Test::PortUsageTestConnector::CCM_Listener_ptr
-  Component_exec_i::get_listen_port_data_listener (void)
-  {
-    return PortUsageState_Test::PortUsageTestConnector::CCM_Listener::_nil ();
-  }
-
-  CCM_DDS::CCM_PortStatusListener_ptr
-  Component_exec_i::get_listen_port_status (void)
-  {
-    return CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-
-  // Operations from Components::SessionComponent.
-  void
-  Component_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::PortUsageState_Test::CCM_PortUsageStateComponent_Context::_narrow (ctx);
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Component_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Component_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Component_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Component_exec_i::ccm_remove (void)
-  {
-    switch (this->assignment_)
-      {
-        case PORTUSAGE_ASSIGNMENT_UPDATE:
-          this->check_updater ();
-          break;
-        case PORTUSAGE_ASSIGNMENT_GET:
-          this->check_getter ();
-          break;
-        case PORTUSAGE_ASSIGNMENT_LISTEN:
-          this->check_listener ();
-          break;
-        case PORTUSAGE_ASSIGNMENT_READ:
-          this->check_reader ();
-          break;
-        case PORTUSAGE_ASSIGNMENT_STATELISTEN:
-          this->check_state_listen ();
-          break;
-        default:
-          ACE_ERROR ((LM_ERROR, "Component_exec_i::ccm_remove - "
-                                "ERROR : Unknown assignment\n"));
-          break;
-      }
-  }
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_PortUsageState_Component_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Component_exec_i);
-
-    return retval;
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.h b/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.h
deleted file mode 100644
index 04a8547e334..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.h
+++ /dev/null
@@ -1,130 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_COMPONENT_EXEC_H_
-#define CIAO_COMPONENT_EXEC_H_
-
-#include "PortUsageState_ComponentEC.h"
-
-#include /**/ "Component_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-namespace CIAO_PortUsageState_Test_PortUsageStateComponent_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::ULong> Atomic_ULong;
-
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  class COMPONENT_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Atomic_ULong&,
-                                    Atomic_ULong&);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-    void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                     const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-    void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                               ::DDS::StatusKind status_kind);
-  private:
-    Atomic_ULong& datareaders_count_;
-    Atomic_ULong& datawriters_count_;
-  };
-
-  //============================================================
-  // Component_exec_i
-  //============================================================
-  class COMPONENT_EXEC_Export Component_exec_i
-    : public virtual PortUsageStateComponent_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Component_exec_i (void);
-    virtual ~Component_exec_i (void);
-
-    // Component attributes.
-    virtual PORT_USAGE_ASSIGNMENT
-    portusage_assignment (void);
-
-    virtual void
-    portusage_assignment (PORT_USAGE_ASSIGNMENT assignment);
-
-    // Port operations.
-    virtual CCM_DDS::CCM_PortStatusListener_ptr
-    get_read_port_status (void);
-
-    virtual PortUsageState_Test::PortUsageTestConnector::CCM_StateListener_ptr
-    get_state_listen_port_data_listener (void);
-
-    virtual CCM_DDS::CCM_PortStatusListener_ptr
-    get_state_listen_port_status (void);
-
-    virtual CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_connector_status ();
-
-    virtual CCM_DDS::CCM_PortStatusListener_ptr
-    get_get_port_status (void);
-
-    virtual PortUsageState_Test::PortUsageTestConnector::CCM_Listener_ptr
-    get_listen_port_data_listener (void);
-
-    virtual CCM_DDS::CCM_PortStatusListener_ptr
-    get_listen_port_status (void);
-
-    // Operations from Components::SessionComponent.
-    virtual void
-    set_session_context (
-      ::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete (void);
-
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-
-  private:
-    ::PortUsageState_Test::CCM_PortUsageStateComponent_Context_var context_;
-
-    PORT_USAGE_ASSIGNMENT assignment_;
-
-    Atomic_ULong datareaders_count_;
-    Atomic_ULong datawriters_count_;
-
-    // Supported operations and attributes.
-    void check_updater (void);
-
-    void check_getter (void);
-
-    void check_listener (void);
-
-    void check_reader (void);
-
-    void check_state_listen (void);
-  };
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_PortUsageState_Component_Impl (void);
-}
-
-#endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.idl b/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.idl
deleted file mode 100644
index 742b2087ac3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file PortUsageState_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef PORTUSAGE_STATE_CONNECTOR_IDL_
-#define PORTUSAGE_STATE_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/PortUsage_Test_Base.idl"
-
-#pragma ciao lem "StateConnector/PortUsageState_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/PortUsage_Test_BaseTypeSupport.idl"
-#endif
-
-module PortUsageState_Test
-{
-  module ::CCM_DDS::Typed < ::PortUsageTest, ::PortUsageTestSeq> PortUsageTestConnector;
-};
-
-#endif /* PORTUSAGE_STATE_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.mpc b/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.mpc
deleted file mode 100644
index c9dcc39fdb5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p PortUsage_Test_Base -l .. -o ../lib -u DDS PortUsageState_Connector"
-
-project(PortUsageState_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen PortUsage_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=PORTUSAGE_EVENT_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=PortUsageState_Connector_stub_export.h \
-              -Wb,skel_export_macro=PORTUSAGE_EVENT_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=PortUsageState_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=PORTUSAGE_EVENT_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=PortUsageState_Connector_svnt_export.h \
-              -Wb,conn_export_macro=PORTUSAGE_EVENT_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=PortUsageState_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    PortUsageState_Connector.idl
-  }
-}
-
-project(PortUsageState_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += PortUsageState_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=PORTUSAGE_EVENT_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=PortUsageState_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    PortUsageState_ConnectorE.idl
-  }
-}
-
-project(PortUsageState_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += PortUsageState_Connector_lem_gen PortUsageState_Connector_stub PortUsage_Test_Base_stub
-  libs  += PortUsage_Test_Base_stub PortUsageState_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = PortUsageState_Connector_lem_stub
-  dynamicflags += PORTUSAGE_EVENT_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PortUsageState_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    PortUsageState_ConnectorEC.h
-    PortUsageState_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    PortUsageState_ConnectorEC.inl
-  }
-}
-
-project(PortUsageState_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += PortUsageState_Connector_idl_gen PortUsage_Test_Base_stub
-  libs  += PortUsage_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = PortUsageState_Connector_stub
-  dynamicflags += PORTUSAGE_EVENT_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PortUsageState_ConnectorC.cpp
-  }
-
-  Header_Files {
-    PortUsageState_ConnectorC.h
-    PortUsageState_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    PortUsageState_ConnectorC.inl
-  }
-}
-
-project(PortUsageState_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += PortUsageState_Connector_lem_stub PortUsageState_Connector_stub PortUsage_Test_Base_stub
-  sharedname = PortUsageState_Connector_exec
-  libs += PortUsageState_Connector_stub PortUsageState_Connector_lem_stub PortUsage_Test_Base_stub PortUsage_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += PORTUSAGE_EVENT_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PortUsageState_Connector_conn.cpp
-  }
-
-  Header_Files {
-    PortUsageState_Connector_conn.h
-    PortUsageState_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(PortUsageState_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += PortUsageState_Connector_lem_stub PortUsageState_Connector_exec PortUsageState_Connector_stub
-  sharedname  = PortUsageState_Connector_svnt
-  libs       += PortUsageState_Connector_stub \
-                PortUsageState_Connector_lem_stub  \
-                PortUsage_Test_Base_stub \
-                PortUsageState_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += PORTUSAGE_EVENT_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PortUsageState_ConnectorS.cpp
-    PortUsageState_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    PortUsageState_ConnectorS.h
-    PortUsageState_Connector_svnt.h
-    PortUsageState_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/Event_Get.cdp b/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/Event_Get.cdp
deleted file mode 100644
index 999db538fa5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/Event_Get.cdp
+++ /dev/null
@@ -1,259 +0,0 @@
-<!--  -->
-<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>PortUsage_Test_Depl</label>
-  <UUID>PortUsage_Test_Depl</UUID>
-
-  <implementation xmi:id="ComponentImplementation">
-    <name>ComponentComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Component_ExecArtifact" />
-    <artifact xmi:idref="Component_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageEvent_Component_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageEvent_Test_PortUsageEventComponent_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>EventComponent_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>EventComponent_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="ConnectorImplementation">
-    <name>ConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="PortUsageEvent_Connector_ExecArtifact" />
-    <artifact xmi:idref="PortUsageEvent_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageEvent_Test_PortUsageTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageEvent_Test_PortUsageTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PortUsageEvent_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PortUsageEvent_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="ComponentInstance">
-    <name>ComponentInstance</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ComponentImplementation" />
-    <configProperty>
-      <name>portusage_assignment</name>
-      <value>
-        <type>
-          <kind>tk_enum</kind>
-          <enum>
-            <name>PORT_USAGE_ASSIGNMENT</name>
-            <typeId>IDL:PORT_USAGE_ASSIGNMENT:1.0</typeId>
-            <member>PORTUSAGE_ASSIGNMENT_WRITE</member>
-            <member>PORTUSAGE_ASSIGNMENT_GET</member>
-            <member>PORTUSAGE_ASSIGNMENT_LISTEN</member>
-            <member>PORTUSAGE_ASSIGNMENT_UPDATE</member>
-            <member>PORTUSAGE_ASSIGNMENT_READ</member>
-            <member>PORTUSAGE_ASSIGNMENT_STATELISTEN</member>
-          </enum>
-        </type>
-        <value>
-          <enum>PORTUSAGE_ASSIGNMENT_GET</enum>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ConnectorInstance">
-    <name>ConnectorInstance</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PortUsage_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <!-- a writer is need to force an on_subscription_matched -->
-  <connection>
-    <name>write_port_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>write_port_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>get_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>get_port_fresh_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_fresh_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="PortUsageEvent_Connector_ExecArtifact">
-    <name>PortUsageEvent_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>PortUsageEvent_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="PortUsageEvent_Connector_SvntArtifact">
-    <name>PortUsageEvent_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>PortUsageEvent_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="PortUsageEvent_Connector_StubArtifact">
-    <name>PortUsageEvent_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>PortUsageEvent_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Component_ExecArtifact">
-    <name>EventComponent_exec</name>
-    <source/>
-    <node/>
-    <location>EventComponent_exec</location>
-  </artifact>
-  <artifact xmi:id="Component_SvntArtifact">
-    <name>EventComponent_svnt</name>
-    <source/>
-    <node/>
-    <location>EventComponent_svnt</location>
-  </artifact>
-  <artifact xmi:id="Component_StubArtifact">
-    <name>Component_stub</name>
-    <source/>
-    <node/>
-    <location>Component_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/Event_Listen.cdp b/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/Event_Listen.cdp
deleted file mode 100644
index 49954dfeee5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/Event_Listen.cdp
+++ /dev/null
@@ -1,259 +0,0 @@
-<!--  -->
-<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>PortUsage_Test_Depl</label>
-  <UUID>PortUsage_Test_Depl</UUID>
-
-  <implementation xmi:id="ComponentImplementation">
-    <name>ComponentComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Component_ExecArtifact" />
-    <artifact xmi:idref="Component_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageEvent_Component_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageEvent_Test_PortUsageEventComponent_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>EventComponent_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>EventComponent_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="ConnectorImplementation">
-    <name>ConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="PortUsageEvent_Connector_ExecArtifact" />
-    <artifact xmi:idref="PortUsageEvent_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageEvent_Test_PortUsageTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageEvent_Test_PortUsageTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PortUsageEvent_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PortUsageEvent_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="ComponentInstance">
-    <name>ComponentInstance</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ComponentImplementation" />
-    <configProperty>
-      <name>portusage_assignment</name>
-      <value>
-        <type>
-          <kind>tk_enum</kind>
-          <enum>
-            <name>PORT_USAGE_ASSIGNMENT</name>
-            <typeId>IDL:PORT_USAGE_ASSIGNMENT:1.0</typeId>
-            <member>PORTUSAGE_ASSIGNMENT_WRITE</member>
-            <member>PORTUSAGE_ASSIGNMENT_GET</member>
-            <member>PORTUSAGE_ASSIGNMENT_LISTEN</member>
-            <member>PORTUSAGE_ASSIGNMENT_UPDATE</member>
-            <member>PORTUSAGE_ASSIGNMENT_READ</member>
-            <member>PORTUSAGE_ASSIGNMENT_STATELISTEN</member>
-          </enum>
-        </type>
-        <value>
-          <enum>PORTUSAGE_ASSIGNMENT_LISTEN</enum>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ConnectorInstance">
-    <name>ConnectorInstance</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PortUsage_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <!-- a writer is need to force an on_subscription_matched -->
-  <connection>
-    <name>write_port_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>write_port_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>listen_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>listen_port_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="PortUsageEvent_Connector_ExecArtifact">
-    <name>PortUsageEvent_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>PortUsageEvent_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="PortUsageEvent_Connector_SvntArtifact">
-    <name>PortUsageEvent_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>PortUsageEvent_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="PortUsageEvent_Connector_StubArtifact">
-    <name>PortUsageEvent_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>PortUsageEvent_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Component_ExecArtifact">
-    <name>EventComponent_exec</name>
-    <source/>
-    <node/>
-    <location>EventComponent_exec</location>
-  </artifact>
-  <artifact xmi:id="Component_SvntArtifact">
-    <name>EventComponent_svnt</name>
-    <source/>
-    <node/>
-    <location>EventComponent_svnt</location>
-  </artifact>
-  <artifact xmi:id="Component_StubArtifact">
-    <name>Component_stub</name>
-    <source/>
-    <node/>
-    <location>Component_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/Event_Write.cdp b/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/Event_Write.cdp
deleted file mode 100644
index ce71a0f288c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/Event_Write.cdp
+++ /dev/null
@@ -1,259 +0,0 @@
-<!--  -->
-<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>PortUsage_Test_Depl</label>
-  <UUID>PortUsage_Test_Depl</UUID>
-
-  <implementation xmi:id="ComponentImplementation">
-    <name>ComponentComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Component_ExecArtifact" />
-    <artifact xmi:idref="Component_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageEvent_Component_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageEvent_Test_PortUsageEventComponent_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>EventComponent_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>EventComponent_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="ConnectorImplementation">
-    <name>ConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="PortUsageEvent_Connector_ExecArtifact" />
-    <artifact xmi:idref="PortUsageEvent_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageEvent_Test_PortUsageTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageEvent_Test_PortUsageTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PortUsageEvent_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PortUsageEvent_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="ComponentInstance">
-    <name>ComponentInstance</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ComponentImplementation" />
-    <configProperty>
-      <name>portusage_assignment</name>
-      <value>
-        <type>
-          <kind>tk_enum</kind>
-          <enum>
-            <name>PORT_USAGE_ASSIGNMENT</name>
-            <typeId>IDL:PORT_USAGE_ASSIGNMENT:1.0</typeId>
-            <member>PORTUSAGE_ASSIGNMENT_WRITE</member>
-            <member>PORTUSAGE_ASSIGNMENT_GET</member>
-            <member>PORTUSAGE_ASSIGNMENT_LISTEN</member>
-            <member>PORTUSAGE_ASSIGNMENT_UPDATE</member>
-            <member>PORTUSAGE_ASSIGNMENT_READ</member>
-            <member>PORTUSAGE_ASSIGNMENT_STATELISTEN</member>
-          </enum>
-        </type>
-        <value>
-          <enum>PORTUSAGE_ASSIGNMENT_WRITE</enum>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ConnectorInstance">
-    <name>ConnectorInstance</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PortUsage_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>write_port_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>write_port_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <!-- a writer is need to force an on_publication_matched -->
-  <connection>
-    <name>listen_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>listen_port_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="PortUsageEvent_Connector_ExecArtifact">
-    <name>PortUsageEvent_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>PortUsageEvent_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="PortUsageEvent_Connector_SvntArtifact">
-    <name>PortUsageEvent_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>PortUsageEvent_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="PortUsageEvent_Connector_StubArtifact">
-    <name>PortUsageEvent_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>PortUsageEvent_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Component_ExecArtifact">
-    <name>EventComponent_exec</name>
-    <source/>
-    <node/>
-    <location>EventComponent_exec</location>
-  </artifact>
-  <artifact xmi:id="Component_SvntArtifact">
-    <name>EventComponent_svnt</name>
-    <source/>
-    <node/>
-    <location>EventComponent_svnt</location>
-  </artifact>
-  <artifact xmi:id="Component_StubArtifact">
-    <name>Component_stub</name>
-    <source/>
-    <node/>
-    <location>Component_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Get.cdp b/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Get.cdp
deleted file mode 100644
index 14df33ab775..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Get.cdp
+++ /dev/null
@@ -1,259 +0,0 @@
-<!--  -->
-<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>PortUsage_Test_Depl</label>
-  <UUID>PortUsage_Test_Depl</UUID>
-
-  <implementation xmi:id="ComponentImplementation">
-    <name>ComponentComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Component_ExecArtifact" />
-    <artifact xmi:idref="Component_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageState_Component_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageState_Test_PortUsageStateComponent_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>StateComponent_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>StateComponent_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="ConnectorImplementation">
-    <name>ConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="PortUsageState_Connector_ExecArtifact" />
-    <artifact xmi:idref="PortUsageState_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageState_Test_PortUsageTestConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageState_Test_PortUsageTestConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PortUsageState_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PortUsageState_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="ComponentInstance">
-    <name>ComponentInstance</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ComponentImplementation" />
-    <configProperty>
-      <name>portusage_assignment</name>
-      <value>
-        <type>
-          <kind>tk_enum</kind>
-          <enum>
-            <name>PORT_USAGE_ASSIGNMENT</name>
-            <typeId>IDL:PORT_USAGE_ASSIGNMENT:1.0</typeId>
-            <member>PORTUSAGE_ASSIGNMENT_WRITE</member>
-            <member>PORTUSAGE_ASSIGNMENT_GET</member>
-            <member>PORTUSAGE_ASSIGNMENT_LISTEN</member>
-            <member>PORTUSAGE_ASSIGNMENT_UPDATE</member>
-            <member>PORTUSAGE_ASSIGNMENT_READ</member>
-            <member>PORTUSAGE_ASSIGNMENT_STATELISTEN</member>
-          </enum>
-        </type>
-        <value>
-          <enum>PORTUSAGE_ASSIGNMENT_GET</enum>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ConnectorInstance">
-    <name>ConnectorInstance</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PortUsage_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <!-- a writer is need to force an on_subscription_matched -->
-  <connection>
-    <name>update_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>update_port_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>observable_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>get_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>get_port_fresh_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_observer_fresh_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="PortUsageState_Connector_ExecArtifact">
-    <name>PortUsageState_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>PortUsageState_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="PortUsageState_Connector_SvntArtifact">
-    <name>PortUsageState_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>PortUsageState_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="PortUsageState_Connector_StubArtifact">
-    <name>PortUsageState_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>PortUsageState_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Component_ExecArtifact">
-    <name>StateComponent_exec</name>
-    <source/>
-    <node/>
-    <location>StateComponent_exec</location>
-  </artifact>
-  <artifact xmi:id="Component_SvntArtifact">
-    <name>StateComponent_svnt</name>
-    <source/>
-    <node/>
-    <location>StateComponent_svnt</location>
-  </artifact>
-  <artifact xmi:id="Component_StubArtifact">
-    <name>StateComponent_stub</name>
-    <source/>
-    <node/>
-    <location>StateComponent_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Listen.cdp b/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Listen.cdp
deleted file mode 100644
index b32f7add651..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Listen.cdp
+++ /dev/null
@@ -1,259 +0,0 @@
-<!--  -->
-<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>PortUsage_Test_Depl</label>
-  <UUID>PortUsage_Test_Depl</UUID>
-
-  <implementation xmi:id="ComponentImplementation">
-    <name>ComponentComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Component_ExecArtifact" />
-    <artifact xmi:idref="Component_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageState_Component_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageState_Test_PortUsageStateComponent_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>StateComponent_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>StateComponent_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="ConnectorImplementation">
-    <name>ConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="PortUsageState_Connector_ExecArtifact" />
-    <artifact xmi:idref="PortUsageState_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageState_Test_PortUsageTestConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageState_Test_PortUsageTestConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PortUsageState_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PortUsageState_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="ComponentInstance">
-    <name>ComponentInstance</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ComponentImplementation" />
-    <configProperty>
-      <name>portusage_assignment</name>
-      <value>
-        <type>
-          <kind>tk_enum</kind>
-          <enum>
-            <name>PORT_USAGE_ASSIGNMENT</name>
-            <typeId>IDL:PORT_USAGE_ASSIGNMENT:1.0</typeId>
-            <member>PORTUSAGE_ASSIGNMENT_WRITE</member>
-            <member>PORTUSAGE_ASSIGNMENT_GET</member>
-            <member>PORTUSAGE_ASSIGNMENT_LISTEN</member>
-            <member>PORTUSAGE_ASSIGNMENT_UPDATE</member>
-            <member>PORTUSAGE_ASSIGNMENT_READ</member>
-            <member>PORTUSAGE_ASSIGNMENT_STATELISTEN</member>
-          </enum>
-        </type>
-        <value>
-          <enum>PORTUSAGE_ASSIGNMENT_LISTEN</enum>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ConnectorInstance">
-    <name>ConnectorInstance</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PortUsage_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <!-- a writer is need to force an on_subscription_matched -->
-  <connection>
-    <name>update_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>update_port_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>observable_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>listen_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>listen_port_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="PortUsageState_Connector_ExecArtifact">
-    <name>PortUsageState_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>PortUsageState_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="PortUsageState_Connector_SvntArtifact">
-    <name>PortUsageState_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>PortUsageState_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="PortUsageState_Connector_StubArtifact">
-    <name>PortUsageState_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>PortUsageState_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Component_ExecArtifact">
-    <name>StateComponent_exec</name>
-    <source/>
-    <node/>
-    <location>StateComponent_exec</location>
-  </artifact>
-  <artifact xmi:id="Component_SvntArtifact">
-    <name>StateComponent_svnt</name>
-    <source/>
-    <node/>
-    <location>StateComponent_svnt</location>
-  </artifact>
-  <artifact xmi:id="Component_StubArtifact">
-    <name>Component_stub</name>
-    <source/>
-    <node/>
-    <location>Component_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Read.cdp b/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Read.cdp
deleted file mode 100644
index 71c98f743d0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Read.cdp
+++ /dev/null
@@ -1,247 +0,0 @@
-<!--  -->
-<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>PortUsage_Test_Depl</label>
-  <UUID>PortUsage_Test_Depl</UUID>
-
-  <implementation xmi:id="ComponentImplementation">
-    <name>ComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Component_ExecArtifact" />
-    <artifact xmi:idref="Component_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageState_Component_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageState_Test_PortUsageStateComponent_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>StateComponent_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>StateComponent_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="ConnectorImplementation">
-    <name>ConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="PortUsageState_Connector_ExecArtifact" />
-    <artifact xmi:idref="PortUsageState_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageState_Test_PortUsageTestConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageState_Test_PortUsageTestConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PortUsageState_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PortUsageState_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="ComponentInstance">
-    <name>ComponentInstance</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ComponentImplementation" />
-    <configProperty>
-      <name>portusage_assignment</name>
-      <value>
-        <type>
-          <kind>tk_enum</kind>
-          <enum>
-            <name>PORT_USAGE_ASSIGNMENT</name>
-            <typeId>IDL:PORT_USAGE_ASSIGNMENT:1.0</typeId>
-            <member>PORTUSAGE_ASSIGNMENT_WRITE</member>
-            <member>PORTUSAGE_ASSIGNMENT_GET</member>
-            <member>PORTUSAGE_ASSIGNMENT_LISTEN</member>
-            <member>PORTUSAGE_ASSIGNMENT_UPDATE</member>
-            <member>PORTUSAGE_ASSIGNMENT_READ</member>
-            <member>PORTUSAGE_ASSIGNMENT_STATELISTEN</member>
-          </enum>
-        </type>
-        <value>
-          <enum>PORTUSAGE_ASSIGNMENT_READ</enum>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ConnectorInstance">
-    <name>ConnectorInstance</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PortUsage_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <!-- a writer is need to force an on_subscription_matched -->
-  <connection>
-    <name>update_port_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>update_port_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>observable_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>read_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>read_port_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>passive_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="PortUsageState_Connector_ExecArtifact">
-    <name>PortUsageState_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>PortUsageState_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="PortUsageState_Connector_SvntArtifact">
-    <name>PortUsageState_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>PortUsageState_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Component_ExecArtifact">
-    <name>StateComponent_exec</name>
-    <source/>
-    <node/>
-    <location>StateComponent_exec</location>
-  </artifact>
-  <artifact xmi:id="Component_SvntArtifact">
-    <name>StateComponent_svnt</name>
-    <source/>
-    <node/>
-    <location>StateComponent_svnt</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_StateListen.cdp b/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_StateListen.cdp
deleted file mode 100644
index 8dd0fcd2878..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_StateListen.cdp
+++ /dev/null
@@ -1,259 +0,0 @@
-<!--  -->
-<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>PortUsage_Test_Depl</label>
-  <UUID>PortUsage_Test_Depl</UUID>
-
-  <implementation xmi:id="ComponentImplementation">
-    <name>ComponentComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Component_ExecArtifact" />
-    <artifact xmi:idref="Component_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageState_Component_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageState_Test_PortUsageStateComponent_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>StateComponent_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>StateComponent_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="ConnectorImplementation">
-    <name>ConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="PortUsageState_Connector_ExecArtifact" />
-    <artifact xmi:idref="PortUsageState_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageState_Test_PortUsageTestConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageState_Test_PortUsageTestConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PortUsageState_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PortUsageState_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="ComponentInstance">
-    <name>ComponentInstance</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ComponentImplementation" />
-    <configProperty>
-      <name>portusage_assignment</name>
-      <value>
-        <type>
-          <kind>tk_enum</kind>
-          <enum>
-            <name>PORT_USAGE_ASSIGNMENT</name>
-            <typeId>IDL:PORT_USAGE_ASSIGNMENT:1.0</typeId>
-            <member>PORTUSAGE_ASSIGNMENT_WRITE</member>
-            <member>PORTUSAGE_ASSIGNMENT_GET</member>
-            <member>PORTUSAGE_ASSIGNMENT_LISTEN</member>
-            <member>PORTUSAGE_ASSIGNMENT_UPDATE</member>
-            <member>PORTUSAGE_ASSIGNMENT_READ</member>
-            <member>PORTUSAGE_ASSIGNMENT_STATELISTEN</member>
-          </enum>
-        </type>
-        <value>
-          <enum>PORTUSAGE_ASSIGNMENT_STATELISTEN</enum>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ConnectorInstance">
-    <name>ConnectorInstance</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PortUsage_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <!-- a writer is need to force an on_subscription_matched -->
-  <connection>
-    <name>update_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>update_port_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>observable_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>state_listen_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>state_listen_port_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="PortUsageState_Connector_ExecArtifact">
-    <name>PortUsageState_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>PortUsageState_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="PortUsageState_Connector_SvntArtifact">
-    <name>PortUsageState_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>PortUsageState_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="PortUsageState_Connector_StubArtifact">
-    <name>PortUsageState_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>PortUsageState_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Component_ExecArtifact">
-    <name>StateComponent_exec</name>
-    <source/>
-    <node/>
-    <location>StateComponent_exec</location>
-  </artifact>
-  <artifact xmi:id="Component_SvntArtifact">
-    <name>StateComponent_svnt</name>
-    <source/>
-    <node/>
-    <location>StateComponent_svnt</location>
-  </artifact>
-  <artifact xmi:id="Component_StubArtifact">
-    <name>Component_stub</name>
-    <source/>
-    <node/>
-    <location>Component_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Update.cdp b/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Update.cdp
deleted file mode 100644
index da83275473d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Update.cdp
+++ /dev/null
@@ -1,259 +0,0 @@
-<!--  -->
-<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>PortUsage_Test_Depl</label>
-  <UUID>PortUsage_Test_Depl</UUID>
-
-  <implementation xmi:id="ComponentImplementation">
-    <name>ComponentComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Component_ExecArtifact" />
-    <artifact xmi:idref="Component_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageState_Component_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageState_Test_PortUsageStateComponent_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>StateComponent_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>StateComponent_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="ConnectorImplementation">
-    <name>ConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="PortUsageState_Connector_ExecArtifact" />
-    <artifact xmi:idref="PortUsageState_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageState_Test_PortUsageTestConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageState_Test_PortUsageTestConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PortUsageState_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PortUsageState_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="ComponentInstance">
-    <name>ComponentInstance</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ComponentImplementation" />
-    <configProperty>
-      <name>portusage_assignment</name>
-      <value>
-        <type>
-          <kind>tk_enum</kind>
-          <enum>
-            <name>PORT_USAGE_ASSIGNMENT</name>
-            <typeId>IDL:PORT_USAGE_ASSIGNMENT:1.0</typeId>
-            <member>PORTUSAGE_ASSIGNMENT_WRITE</member>
-            <member>PORTUSAGE_ASSIGNMENT_GET</member>
-            <member>PORTUSAGE_ASSIGNMENT_LISTEN</member>
-            <member>PORTUSAGE_ASSIGNMENT_UPDATE</member>
-            <member>PORTUSAGE_ASSIGNMENT_READ</member>
-            <member>PORTUSAGE_ASSIGNMENT_STATELISTEN</member>
-          </enum>
-        </type>
-        <value>
-          <enum>PORTUSAGE_ASSIGNMENT_UPDATE</enum>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ConnectorInstance">
-    <name>ConnectorInstance</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PortUsage_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>update_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>update_port_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>observable_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <!-- a reader is need to force an on_publication_matched -->
-  <connection>
-    <name>read_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>read_port_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>passive_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="PortUsageState_Connector_ExecArtifact">
-    <name>PortUsageState_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>PortUsageState_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="PortUsageState_Connector_SvntArtifact">
-    <name>PortUsageState_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>PortUsageState_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="PortUsageState_Connector_StubArtifact">
-    <name>PortUsageState_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>PortUsageState_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Component_ExecArtifact">
-    <name>StateComponent_exec</name>
-    <source/>
-    <node/>
-    <location>StateComponent_exec</location>
-  </artifact>
-  <artifact xmi:id="Component_SvntArtifact">
-    <name>StateComponent_svnt</name>
-    <source/>
-    <node/>
-    <location>StateComponent_svnt</location>
-  </artifact>
-  <artifact xmi:id="Component_StubArtifact">
-    <name>Component_stub</name>
-    <source/>
-    <node/>
-    <location>Component_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/run_test.pl
deleted file mode 100755
index 2fe18b6d1d0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/run_test.pl
+++ /dev/null
@@ -1,216 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 1;
-@ports = ( 60001 );
-@iorbases = ( "NodeApp1.ior" );
-@iorfiles = 0;
-@nodenames = ( "ComponentNode" );
-
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run node daemon\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-              "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-if ($#ARGV == -1) {
-    opendir(DIR, ".");
-    @files = grep(/\.cdp$/,readdir(DIR));
-    closedir(DIR);
-}
-else {
-    @files = @ARGV;
-}
-
-create_targets ();
-init_ior_files ();
-
-foreach $file (@files) {
-    print "*********** Starting test for deployment $file ***********\n";
-
-    print STDERR "Starting Naming Service\n";
-
-    $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-    $NS->Spawn ();
-
-    if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                      $tg_naming->ProcessStartWaitInterval ()) == -1) {
-        print STDERR "ERROR: cannot find naming service IOR file\n";
-        $NS->Kill (); $NS->TimedWait (1);
-        exit 1;
-    }
-
-    $ns_running = 1;
-    # Set up NamingService environment
-    $ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-    # Invoke node daemon.
-    print "Invoking node daemon\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 = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-    $EM->Spawn ();
-
-    if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                    $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-    $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                                      "-x $file -k file://$ior_emfile");
-    $E->SpawnWaitKill (5 * $tg_executor->ProcessStartWaitInterval ());
-
-    print "Sleeping 60 seconds to allow task to complete\n";
-    sleep (60);
-
-    print "Teardown the application\n";
-    $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                                      "-k file://$ior_emfile -x $file -s");
-    $E->SpawnWaitKill (5 * $tg_executor->ProcessStartWaitInterval ());
-    print "Executor finished.\n";
-
-    delete_ior_files ();
-    kill_open_processes ();
-}
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Proxy_RW_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Proxy_RW_Test_Base.idl
deleted file mode 100644
index 8f0e65bbb1a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Proxy_RW_Test_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file Proxy_RW_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef PROXY_RW_TEST_BASE_IDL
-#define PROXY_RW_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/Proxy_RW_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/Proxy_RW_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "ProxyReadWriteTest"
-#pragma DCPS_DATA_KEY "ProxyReadWriteTest key"
-
-struct ProxyReadWriteTest {
-  string key; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<ProxyReadWriteTest> ProxyReadWriteTestSeq;
-#endif
-
-#endif /* PROXY_RW_TEST_BASE_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Proxy_RW_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Proxy_RW_Test_Base.mpc
deleted file mode 100644
index d399d3e68b1..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Proxy_RW_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (Proxy_RW_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = Proxy_RW_Test_Base_stub
-  dynamicflags += PROXY_RW_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=PROXY_RW_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=Proxy_RW_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    Proxy_RW_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=PROXY_RW_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    Proxy_RW_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Reader_Starter.idl b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Reader_Starter.idl
deleted file mode 100644
index d2af2883d1f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Reader_Starter.idl
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * @file Reader_Starter.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef READER_STARTER_IDL
-#define READER_STARTER_IDL
-
-#pragma ciao lem "Base/Reader_StarterE.idl"
-
-interface ReaderStarter
-{
-  enum assignment {
-    READ_USING_IDL_PROXY,
-    TAKE_USING_IDL_PROXY,
-    READ_USING_CPP_PROXY,
-    TAKE_USING_CPP_PROXY
-  };
-  void start_read (in assignment task);
-  void set_reader_properties (in unsigned short nr_keys,
-                              in unsigned short nr_iterations);
-};
-
-interface WriterRestarter
-{
-  void restart_write (in ReaderStarter::assignment task);
-};
-
-#endif /* SAMPLE_INFO_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Reader_Starter.mpc b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Reader_Starter.mpc
deleted file mode 100644
index f5d4f9fb784..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Reader_Starter.mpc
+++ /dev/null
@@ -1,110 +0,0 @@
-project(RW_RW_Reader_Starter_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after +=
-  idlflags += -Wb,stub_export_macro=READER_STARTER_STUB_Export \
-              -Wb,stub_export_include=Reader_Starter_stub_export.h \
-              -Wb,skel_export_macro=READER_STARTER_SVNT_Export \
-              -Wb,skel_export_include=Reader_Starter_svnt_export.h \
-              -Wb,svnt_export_macro=READER_STARTER_SVNT_Export \
-              -Wb,svnt_export_include=Reader_Starter_svnt_export.h \
-              -Wb,exec_export_macro=READER_STARTER_EXEC_Export \
-              -Wb,exec_export_include=Reader_Starter_exec_export.h -I..
-
-  IDL_Files {
-    Reader_Starter.idl
-  }
-}
-
-project(RW_Reader_Starter_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += RW_RW_Reader_Starter_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=READER_STARTER_LEM_STUB_Export \
-              -Wb,stub_export_include=RW_Reader_Starter_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    Reader_StarterE.idl
-  }
-}
-
-project(RW_Reader_Starter_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += RW_Reader_Starter_lem_gen RW_Reader_Starter_stub
-  libs  += RW_Reader_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = RW_Reader_Starter_lem_stub
-  dynamicflags += READER_STARTER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_StarterEC.cpp
-  }
-
-  Header_Files {
-    Reader_StarterEC.h
-    Reader_Starter_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Reader_StarterEC.inl
-  }
-}
-
-project(RW_Reader_Starter_stub) : ccm_stub, dds4ccm_base {
-  after += RW_RW_Reader_Starter_idl_gen
-  libs  +=
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = RW_Reader_Starter_stub
-  dynamicflags += READER_STARTER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_StarterC.cpp
-  }
-
-  Header_Files {
-    Reader_StarterC.h
-    Reader_Starter_stub_export.h
-  }
-
-  Inline_Files {
-    Reader_StarterC.inl
-  }
-}
-
-
-project(RW_Reader_Starter_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   RW_Reader_Starter_lem_stub RW_Reader_Starter_stub
-  sharedname  = RW_Reader_Starter_svnt
-  libs       += RW_Reader_Starter_stub RW_Reader_Starter_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += READER_STARTER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_StarterS.cpp
-    Reader_Starter_svnt.cpp
-  }
-
-  Header_Files {
-    Reader_StarterS.h
-    Reader_Starter_svnt.h
-    Reader_Starter_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.idl
deleted file mode 100644
index 57ce9775dcf..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file Proxy_RW_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef PROXY_RW_TEST_CONNECTOR_IDL_
-#define PROXY_RW_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Proxy_RW_Test_Base.idl"
-
-#pragma ciao lem "Connector/Proxy_RW_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/Proxy_RW_Test_BaseTypeSupport.idl"
-#endif
-
-module Proxy_RW_Test
-{
-  module ::CCM_DDS::Typed < ::ProxyReadWriteTest, ::ProxyReadWriteTestSeq> ProxyReadWriteTestConnector;
-};
-
-#endif /* Reader_Test_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.mpc
deleted file mode 100644
index e29d85dabe9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p Proxy_RW_Test_Base -l .. -o ../lib -u DDS Proxy_RW_Test_Connector"
-
-project(Proxy_RW_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen Proxy_RW_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=PROXY_RW_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=Proxy_RW_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=PROXY_RW_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=Proxy_RW_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=PROXY_RW_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=Proxy_RW_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=PROXY_RW_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Proxy_RW_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Proxy_RW_Test_Connector.idl
-  }
-}
-
-project(Proxy_RW_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += Proxy_RW_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=PROXY_RW_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=Proxy_RW_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    Proxy_RW_Test_ConnectorE.idl
-  }
-}
-
-project(Proxy_RW_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += Proxy_RW_Test_Connector_lem_gen Proxy_RW_Test_Connector_stub Proxy_RW_Test_Base_stub
-  libs  += Proxy_RW_Test_Base_stub Proxy_RW_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Proxy_RW_Test_Connector_lem_stub
-  dynamicflags += PROXY_RW_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Proxy_RW_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    Proxy_RW_Test_ConnectorEC.h
-    Proxy_RW_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Proxy_RW_Test_ConnectorEC.inl
-  }
-}
-
-project(Proxy_RW_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += Proxy_RW_Test_Connector_idl_gen Proxy_RW_Test_Base_stub
-  libs  += Proxy_RW_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Proxy_RW_Test_Connector_stub
-  dynamicflags += PROXY_RW_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Proxy_RW_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    Proxy_RW_Test_ConnectorC.h
-    Proxy_RW_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    Proxy_RW_Test_ConnectorC.inl
-  }
-}
-
-project(Proxy_RW_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += Proxy_RW_Test_Connector_lem_stub Proxy_RW_Test_Connector_stub Proxy_RW_Test_Base_stub
-  sharedname = Proxy_RW_Test_Connector_exec
-  libs += Proxy_RW_Test_Connector_stub Proxy_RW_Test_Connector_lem_stub Proxy_RW_Test_Base_stub Proxy_RW_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += PROXY_RW_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Proxy_RW_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    Proxy_RW_Test_Connector_conn.h
-    Proxy_RW_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(Proxy_RW_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += Proxy_RW_Test_Connector_lem_stub Proxy_RW_Test_Connector_exec Proxy_RW_Test_Connector_stub
-  sharedname  = Proxy_RW_Test_Connector_svnt
-  libs       += Proxy_RW_Test_Connector_stub \
-                Proxy_RW_Test_Connector_lem_stub  \
-                Proxy_RW_Test_Base_stub \
-                Proxy_RW_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += PROXY_RW_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Proxy_RW_Test_ConnectorS.cpp
-    Proxy_RW_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    Proxy_RW_Test_ConnectorS.h
-    Proxy_RW_Test_Connector_svnt.h
-    Proxy_RW_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver.idl
deleted file mode 100644
index 0a8fab4e505..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file Proxy_RW_Test_Receiver.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/Proxy_RW_Test_Connector.idl"
-#include "Base/Reader_Starter.idl"
-
-module Proxy_RW_Test
-{
-  component Receiver
-  {
-    port ProxyReadWriteTestConnector::DDS_Listen info_out;
-
-    provides ReaderStarter reader_start;
-    uses WriterRestarter writer_restart;
-  };
-};
-
-#endif /* RECEIVER_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver.mpc
deleted file mode 100644
index 7fb6136a015..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver.mpc
+++ /dev/null
@@ -1,155 +0,0 @@
-project(Proxy_RW_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += Proxy_RW_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h \
-              -I..
-
-  IDL_Files {
-    Proxy_RW_Test_Receiver.idl
-  }
-}
-
-project(Proxy_RW_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += Proxy_RW_Test_Receiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    Proxy_RW_Test_ReceiverE.idl
-  }
-}
-
-project(Proxy_RW_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += Proxy_RW_Test_Receiver_lem_gen Proxy_RW_Test_Receiver_stub  \
-           Proxy_RW_Test_Connector_stub Proxy_RW_Test_Base_stub \
-           RW_Reader_Starter_stub
-  libs  +=  Receiver_stub Proxy_RW_Test_Connector_stub \
-            Proxy_RW_Test_Base_stub RW_Reader_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Proxy_RW_Test_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    Proxy_RW_Test_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Proxy_RW_Test_ReceiverEC.inl
-  }
-}
-
-project(Proxy_RW_Test_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += Proxy_RW_Test_Receiver_idl_gen  Proxy_RW_Test_Connector_stub \
-           Proxy_RW_Test_Base_stub Proxy_RW_Test_Connector_lem_gen \
-           RW_Reader_Starter_stub RW_Reader_Starter_lem_stub
-  libs  += Proxy_RW_Test_Connector_stub Proxy_RW_Test_Base_stub \
-           RW_Reader_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Proxy_RW_Test_ReceiverC.cpp
-  }
-
-  Header_Files {
-    Proxy_RW_Test_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    Proxy_RW_Test_ReceiverC.inl
-  }
-}
-
-project(Proxy_RW_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub, dds4ccm_impl {
-  after   += Proxy_RW_Test_Receiver_lem_stub Proxy_RW_Test_Receiver_stub \
-             Proxy_RW_Test_Base_stub Proxy_RW_Test_Connector_stub \
-             Proxy_RW_Test_Connector_lem_stub \
-             RW_Reader_Starter_lem_stub RW_Reader_Starter_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub Proxy_RW_Test_Base_stub \
-          Proxy_RW_Test_Connector_stub Proxy_RW_Test_Connector_lem_stub \
-          RW_Reader_Starter_lem_stub RW_Reader_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL READER_STARTER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Proxy_RW_Test_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    Proxy_RW_Test_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(Proxy_RW_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   Proxy_RW_Test_Receiver_lem_stub Proxy_RW_Test_Base_stub \
-                  Proxy_RW_Test_Connector_stub Proxy_RW_Test_Connector_svnt \
-                  Proxy_RW_Test_Receiver_exec Proxy_RW_Test_Connector_lem_stub \
-                  RW_Reader_Starter_stub \
-                  RW_Reader_Starter_svnt RW_Reader_Starter_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub Proxy_RW_Test_Base_stub \
-                Proxy_RW_Test_Connector_stub Proxy_RW_Test_Connector_svnt \
-                Receiver_exec Proxy_RW_Test_Connector_lem_stub \
-                RW_Reader_Starter_stub RW_Reader_Starter_svnt \
-                RW_Reader_Starter_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Proxy_RW_Test_ReceiverS.cpp
-    Proxy_RW_Test_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    Proxy_RW_Test_ReceiverS.h
-    Proxy_RW_Test_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver_exec.cpp
deleted file mode 100644
index 51430bbe7c4..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver_exec.cpp
+++ /dev/null
@@ -1,584 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "Proxy_RW_Test_Receiver_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-#include "Connector/Proxy_RW_Test_Connector_conn.h"
-#include "dds4ccm/impl/Utils.h"
-
-namespace CIAO_Proxy_RW_Test_Receiver_Impl
-{
-  /**
-   * Start Handler using IDL Proxy to Read
-   */
-
-  StartHandlerIdlProxyRead::StartHandlerIdlProxyRead (Receiver_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  StartHandlerIdlProxyRead::handle_exception (ACE_HANDLE)
-  {
-    this->callback_.start_read_using_idl_proxy ();
-    return 0;
-  }
-
-  /**
-   * Start Handler using CPP Proxy to Take
-   */
-
-  StartHandlerIdlProxyTake::StartHandlerIdlProxyTake (Receiver_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  StartHandlerIdlProxyTake::handle_exception (ACE_HANDLE)
-  {
-    this->callback_.start_take_using_idl_proxy ();
-    return 0;
-  }
-
-  /**
-   * Check last
-   */
-  LastSampleChecker::LastSampleChecker (Receiver_exec_i &callback,
-                                        const ::ReaderStarter::assignment &task,
-                                        const ::CORBA::UShort &iterations)
-    : callback_ (callback)
-      , task_ (task)
-      , iterations_ (iterations)
-  {
-  }
-
-  LastSampleChecker::~LastSampleChecker ()
-  {
-  }
-
-  int
-  LastSampleChecker::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Checking if last sample "
-                          "is available in DDS...\n"));
-    if (this->callback_.check_last (this->iterations_ + (this->iterations_ * this->task_)))
-      {
-        this->callback_.start_task (this->task_);
-      }
-    return 0;
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  info_out_data_listener_exec_i::info_out_data_listener_exec_i (
-        ::Proxy_RW_Test::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::Proxy_RW_Test::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::Proxy_RW_Test::ProxyReadWriteTestConnector::Listener
-
-  void
-  info_out_data_listener_exec_i::on_one_data (const ::ProxyReadWriteTest & /* datum */,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_data_listener_exec_i::on_many_data (const ::ProxyReadWriteTestSeq & /* data */,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_status_exec_i
-   */
-
-  info_out_status_exec_i::info_out_status_exec_i (
-        ::Proxy_RW_Test::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::Proxy_RW_Test::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_status_exec_i::~info_out_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: reader_start_exec_i
-   */
-
-  reader_start_exec_i::reader_start_exec_i (
-        ::Proxy_RW_Test::CCM_Receiver_Context_ptr ctx,
-        Receiver_exec_i &callback)
-    : ciao_context_ (
-        ::Proxy_RW_Test::CCM_Receiver_Context::_duplicate (ctx))
-      , callback_ (callback)
-  {
-  }
-
-  reader_start_exec_i::~reader_start_exec_i (void)
-  {
-  }
-
-  // Operations from ::ReaderStarter
-
-  void
-  reader_start_exec_i::start_read (::ReaderStarter::assignment task)
-  {
-    this->callback_.start_read (task);
-  }
-
-  void
-  reader_start_exec_i::set_reader_properties (::CORBA::UShort nr_keys,
-  ::CORBA::UShort nr_iterations)
-  {
-    this->callback_.keys (nr_keys);
-    this->callback_.iterations (nr_iterations);
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : iterations_ (0)
-      , keys_ (0)
-      , checker_ (0)
-  {
-    ACE_NEW_THROW_EX (this->rh_idl_read_,
-                      StartHandlerIdlProxyRead (*this),
-                      ::CORBA::NO_MEMORY ());
-    ACE_NEW_THROW_EX (this->rh_idl_take_,
-                      StartHandlerIdlProxyTake (*this),
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-    delete this->rh_idl_read_;
-    delete this->rh_idl_take_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Receiver_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  bool
-  Receiver_exec_i::check_last (const ::CORBA::UShort &iteration_to_check)
-  {
-    ::Proxy_RW_Test::ProxyReadWriteTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_info_out_data ();
-    try
-      {
-        ProxyReadWriteTest datum;
-        ::CCM_DDS::ReadInfo readinfo;
-        char key[10];
-        ACE_OS::sprintf (key, "KEY_%d", this->keys_);
-        datum.key = CORBA::string_dup (key);
-        reader->read_one_last (
-                datum,
-                readinfo,
-                ::DDS::HANDLE_NIL);
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_last - "
-                              "last iteration <%02d> - <%02d>\n",
-                               datum.iteration,
-                               iteration_to_check));
-        return datum.iteration >= iteration_to_check;
-      }
-    catch (const ::CCM_DDS::InternalError &)
-      {
-      }
-    catch (const ::CCM_DDS::NonExistent &)
-      {
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::check_last: "
-                              "ERROR: Unexpected exception caught\n"));
-      }
-    return false;
-  }
-
-  void
-  Receiver_exec_i::check_samples (const ProxyReadWriteTestSeq & data,
-                                  ::ReaderStarter::assignment task)
-  {
-    for (::CORBA::ULong i = 0; i < data.length (); ++i)
-      {
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_samples - "
-                  "Received sample: key <%C> - iteration <%u>\n",
-                  data[i].key.in (),
-                  data[i].iteration));
-        //TODO Check for invalid iterataions
-      }
-    WriterRestarter_var restarter =
-      this->ciao_context_->get_connection_writer_restart ();
-    if (!::CORBA::is_nil (restarter.in ()))
-      {
-        if (task == ::ReaderStarter::READ_USING_IDL_PROXY)
-          {
-            ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_samples - "
-                      "Inform the Sender that is should write the next bunch.\n"));
-            restarter->restart_write (::ReaderStarter::TAKE_USING_IDL_PROXY);
-          }
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::check_samples - "
-                  "ERROR: Restarter is nil\n"));
-      }
-  }
-
-  void
-  Receiver_exec_i::start_read (::ReaderStarter::assignment task)
-  {
-    if (this->checker_)
-      {
-        this->reactor ()->cancel_timer (this->checker_);
-        delete this->checker_;
-        this->checker_ = 0;
-      }
-    ACE_NEW_THROW_EX (this->checker_,
-                      LastSampleChecker (*this,
-                                         task,
-                                         this->iterations_),
-                      ::CORBA::NO_MEMORY ());
-    this->schedule_timer ();
-  }
-
-  void
-  Receiver_exec_i::start_task (::ReaderStarter::assignment task)
-  {
-    if (this->checker_)
-      {
-        this->reactor ()->cancel_timer (this->checker_);
-        delete this->checker_;
-        this->checker_ = 0;
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::start_task - "
-                  "Timer canceled and deleted.\n"));
-      }
-    if (task == ::ReaderStarter::READ_USING_IDL_PROXY)
-      {
-        this->reactor ()->notify (this->rh_idl_read_);
-      }
-    else if (task == ::ReaderStarter::TAKE_USING_IDL_PROXY)
-      {
-        this->reactor ()->notify (this->rh_idl_take_);
-      }
-  }
-
-  void
-  Receiver_exec_i::schedule_timer (void)
-  {
-    if (this->reactor ()->schedule_timer (this->checker_,
-                                          0,
-                                          ACE_Time_Value (1, 0),
-                                          ACE_Time_Value (1, 0)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::schedule_timer - "
-                  "ERROR: Error while starting LastSampleChecker\n"));
-      }
-  }
-
-  Receiver_exec_i::TypedDataReader::_ptr_type
-  Receiver_exec_i::get_typed_idl_reader (void)
-  {
-    TypedDataReader::_var_type idl_reader;
-    ::DDS::DataReader_var dds_dr =
-      this->ciao_context_->get_connection_info_out_dds_entity ();
-
-    if (::CORBA::is_nil (dds_dr.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::get_typed_idl_reader - "
-                    "DataReader connection is NIL.\n"));
-        return TypedDataReader::_nil ();
-      }
-
-    ::CIAO::DDS4CCM::CCM_DataReader * ccm_dr =
-      dynamic_cast < ::CIAO::DDS4CCM::CCM_DataReader * > (dds_dr.in ());
-
-    if (ccm_dr)
-      {
-        ::DDS::DataReader_var tmp = ccm_dr->get_dds_entity ();
-        if (! ::CORBA::is_nil (tmp.in ()))
-          {
-            idl_reader =
-              ::CIAO_Proxy_RW_Test_ProxyReadWriteTestConnector_DDS_Event_Impl
-              ::ProxyReadWriteTest_DDS_Traits::typed_reader_type::_narrow (tmp.in ());
-            return idl_reader._retn ();
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_typed_idl_reader - "
-                      "ERROR: CCM DataReader returned NIL as DDS entity\n"));
-            return TypedDataReader::_nil ();
-          }
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_typed_idl_reader - "
-                  "ERROR: Unable to cast to CCM DataReader\n"));
-        return TypedDataReader::_nil ();
-      }
-  }
-
-  void
-  Receiver_exec_i::start_read_using_idl_proxy (void)
-  {
-    TypedDataReader::_var_type idl_reader = this->get_typed_idl_reader ();
-
-    if (!::CORBA::is_nil (idl_reader.in ()))
-      {
-
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::start_read_using_idl_proxy - "
-                  "Start reading."));
-        // Start to read
-        ProxyReadWriteTestSeq data;
-        ::DDS::SampleInfoSeq  info;
-
-        ::DDS::ReturnCode_t retcode = idl_reader->read (data,
-                                                        info,
-                                                        ::DDS::LENGTH_UNLIMITED,
-                                                        ::DDS::NOT_READ_SAMPLE_STATE,
-                                                        ::DDS::ANY_VIEW_STATE,
-                                                        ::DDS::ALIVE_INSTANCE_STATE);
-        if (retcode == ::DDS::RETCODE_OK)
-          {
-            this->check_samples (data,
-                                 ::ReaderStarter::READ_USING_IDL_PROXY);
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "Receiver_exec_i::start_read_using_idl_proxy - "
-                      "ERROR: Error during read: <%C>\n",
-                      ::CIAO::DDS4CCM::translate_retcode (retcode)));
-          }
-      }
-  }
-
-  void
-  Receiver_exec_i::start_take_using_idl_proxy (void)
-  {
-    TypedDataReader::_var_type idl_reader = this->get_typed_idl_reader ();
-
-    if (!::CORBA::is_nil (idl_reader.in ()))
-      {
-        // Start to read
-        ProxyReadWriteTestSeq data;
-        ::DDS::SampleInfoSeq  info;
-
-        ::DDS::ReturnCode_t retcode = idl_reader->take (data,
-                                                        info,
-                                                        ::DDS::LENGTH_UNLIMITED,
-                                                        ::DDS::NOT_READ_SAMPLE_STATE,
-                                                        ::DDS::ANY_VIEW_STATE,
-                                                        ::DDS::ALIVE_INSTANCE_STATE);
-        if (retcode == ::DDS::RETCODE_OK)
-          {
-            this->check_samples (data,
-                                 ::ReaderStarter::TAKE_USING_IDL_PROXY);
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "Receiver_exec_i::start_read_using_idl_proxy - "
-                      "ERROR: Error during read: <%C>\n",
-                      ::CIAO::DDS4CCM::translate_retcode (retcode)));
-          }
-      }
-  }
-
-  void
-  Receiver_exec_i::keys (::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  void
-  Receiver_exec_i::iterations (::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-  // Component attributes and port operations.
-
-  ::Proxy_RW_Test::ProxyReadWriteTestConnector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_out_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ()))
-      {
-        info_out_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_data_listener_exec_i (
-            this->ciao_context_.in ()),
-            ::Proxy_RW_Test::ProxyReadWriteTestConnector::CCM_Listener::_nil ());
-
-          this->ciao_info_out_data_listener_ = tmp;
-      }
-
-    return
-      ::Proxy_RW_Test::ProxyReadWriteTestConnector::CCM_Listener::_duplicate (
-        this->ciao_info_out_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ()))
-      {
-        info_out_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_out_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_out_status_.in ());
-  }
-
-  ::CCM_ReaderStarter_ptr
-  Receiver_exec_i::get_reader_start (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_reader_start_.in ()))
-      {
-        reader_start_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          reader_start_exec_i (
-            this->ciao_context_.in (),
-            *this),
-            ::CCM_ReaderStarter::_nil ());
-
-          this->ciao_reader_start_ = tmp;
-      }
-
-    return
-      ::CCM_ReaderStarter::_duplicate (
-        this->ciao_reader_start_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Proxy_RW_Test::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Proxy_RW_Test_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver_exec.h
deleted file mode 100644
index d6d49b11553..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver_exec.h
+++ /dev/null
@@ -1,280 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_PROXY_RW_TEST_RECEIVER_EXEC_IWMK2R_H_
-#define CIAO_PROXY_RW_TEST_RECEIVER_EXEC_IWMK2R_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Proxy_RW_Test_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-#include "Connector/Proxy_RW_Test_Connector_conn.h"
-
-namespace CIAO_Proxy_RW_Test_Receiver_Impl
-{
-  class Receiver_exec_i;
-
-  /**
-   * LastSampleChecker
-   */
-  class LastSampleChecker
-    : public ACE_Event_Handler
-  {
-  public:
-    LastSampleChecker (Receiver_exec_i &callback,
-                       const ::ReaderStarter::assignment &task,
-                       const ::CORBA::UShort &iterations);
-
-    virtual ~LastSampleChecker (void);
-
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    Receiver_exec_i &callback_;
-    const ::ReaderStarter::assignment task_;
-    const ::CORBA::UShort iterations_;
-
-  };
-
-  /**
-   * Start Handler using IDL Proxy to Read
-   */
-
-  class StartHandlerIdlProxyRead :
-    public ACE_Event_Handler
-  {
-  public:
-    StartHandlerIdlProxyRead (Receiver_exec_i &callback);
-    virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
-  private:
-    Receiver_exec_i &callback_;
-  };
-
-  /**
-   * Start Handler using IDL Proxy to Take
-   */
-
-  class StartHandlerIdlProxyTake :
-    public ACE_Event_Handler
-  {
-  public:
-    StartHandlerIdlProxyTake (Receiver_exec_i &callback);
-    virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
-  private:
-    Receiver_exec_i &callback_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  class info_out_data_listener_exec_i
-    : public virtual ::Proxy_RW_Test::ProxyReadWriteTestConnector::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_data_listener_exec_i (
-      ::Proxy_RW_Test::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from Proxy_RW_Test::ProxyReadWriteTestConnector::Listener. */
-
-    virtual
-    void on_one_data (const ::ProxyReadWriteTest & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (const ::ProxyReadWriteTestSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    ::Proxy_RW_Test::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_status_exec_i
-   */
-
-  class info_out_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_status_exec_i (
-      ::Proxy_RW_Test::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::Proxy_RW_Test::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: reader_start_exec_i
-   */
-
-  class reader_start_exec_i
-    : public virtual ::CCM_ReaderStarter,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    reader_start_exec_i (
-      ::Proxy_RW_Test::CCM_Receiver_Context_ptr ctx,
-      Receiver_exec_i &callback);
-    virtual ~reader_start_exec_i (void);
-
-    //@{
-    /** Operations and attributes from ReaderStarter. */
-
-    virtual
-    void start_read (::ReaderStarter::assignment task);
-
-    virtual
-    void set_reader_properties (::CORBA::UShort nr_keys,
-    ::CORBA::UShort nr_iterations);
-    //@}
-
-  private:
-    ::Proxy_RW_Test::CCM_Receiver_Context_var ciao_context_;
-    Receiver_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    typedef ::CIAO_Proxy_RW_Test_ProxyReadWriteTestConnector_DDS_Event_Impl
-            ::ProxyReadWriteTest_DDS_Traits::typed_reader_type
-            TypedDataReader;
-
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::Proxy_RW_Test::ProxyReadWriteTestConnector::CCM_Listener_ptr
-    get_info_out_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_status (void);
-
-    virtual ::CCM_ReaderStarter_ptr
-    get_reader_start (void);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void keys (::CORBA::UShort keys);
-    void iterations (::CORBA::UShort iterations);
-
-    bool check_last (const ::CORBA::UShort &iteration_to_check);
-
-    void start_task (::ReaderStarter::assignment task);
-    void start_read (::ReaderStarter::assignment task);
-    void start_read_using_idl_proxy (void);
-    void start_take_using_idl_proxy (void);
-
-    //@}
-
-  private:
-    ::Proxy_RW_Test::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::Proxy_RW_Test::ProxyReadWriteTestConnector::CCM_Listener_var ciao_info_out_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_;
-    ::CCM_ReaderStarter_var ciao_reader_start_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    ::CORBA::UShort iterations_;
-    ::CORBA::UShort keys_;
-
-    StartHandlerIdlProxyRead *rh_idl_read_;
-    StartHandlerIdlProxyTake *rh_idl_take_;
-
-    LastSampleChecker * checker_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void check_samples (const ProxyReadWriteTestSeq & data,
-                        ::ReaderStarter::assignment task);
-
-    void schedule_timer (void);
-    TypedDataReader::_ptr_type get_typed_idl_reader (void);
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Proxy_RW_Test_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender.idl
deleted file mode 100644
index f70bb9808a4..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender.idl
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef PROXY_RW_TEST_SENDER_IDL
-#define PROXY_RW_TEST_SENDER_IDL
-
-#include "Connector/Proxy_RW_Test_Connector.idl"
-#include "Base/Reader_Starter.idl"
-
-module Proxy_RW_Test
-{
-  component Sender
-  {
-    port ProxyReadWriteTestConnector::DDS_Write info_write;
-    provides CCM_DDS::ConnectorStatusListener info_out_connector_status;
-
-    uses ReaderStarter start_reader;
-    provides WriterRestarter restart_writer;
-
-    attribute unsigned short keys;
-    attribute unsigned short iterations;
-  };
-};
-
-#endif /* PROXY_RW_TEST_SENDER_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender.mpc
deleted file mode 100644
index 1a975f1dfa9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender.mpc
+++ /dev/null
@@ -1,151 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p Proxy_RW_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(Proxy_RW_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += Proxy_RW_Test_Connector_idl_gen RW_Reader_Starter_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I ..
-
-  IDL_Files {
-    Proxy_RW_Test_Sender.idl
-  }
-}
-
-project(Proxy_RW_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += Proxy_RW_Test_Sender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    Proxy_RW_Test_SenderE.idl
-  }
-}
-
-project(Proxy_RW_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += Proxy_RW_Test_Sender_lem_gen Proxy_RW_Test_Sender_stub \
-           Proxy_RW_Test_Base_stub RW_Reader_Starter_stub
-  libs  += Proxy_RW_Test_Base_stub Sender_stub RW_Reader_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Proxy_RW_Test_SenderEC.cpp
-  }
-
-  Header_Files {
-    Proxy_RW_Test_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Proxy_RW_Test_SenderEC.inl
-  }
-}
-
-project(Proxy_RW_Test_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += Proxy_RW_Test_Sender_idl_gen Proxy_RW_Test_Base_stub \
-           Proxy_RW_Test_Connector_stub RW_Reader_Starter_stub \
-           RW_Reader_Starter_lem_stub
-  libs  += Proxy_RW_Test_Base_stub Proxy_RW_Test_Connector_stub \
-           RW_Reader_Starter_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Proxy_RW_Test_SenderC.cpp
-  }
-
-  Header_Files {
-    Proxy_RW_Test_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    Proxy_RW_Test_SenderC.inl
-  }
-}
-
-project(Proxy_RW_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub, dds4ccm_impl {
-  after   += Proxy_RW_Test_Sender_lem_stub Proxy_RW_Test_Sender_stub \
-             Proxy_RW_Test_Connector_lem_stub Proxy_RW_Test_Connector_stub \
-             RW_Reader_Starter_svnt RW_Reader_Starter_lem_stub
-  sharedname = Sender_exec
-  libs    += Sender_stub Sender_lem_stub Proxy_RW_Test_Base_stub \
-             Proxy_RW_Test_Connector_lem_stub Proxy_RW_Test_Connector_stub \
-             RW_Reader_Starter_stub RW_Reader_Starter_svnt RW_Reader_Starter_lem_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Proxy_RW_Test_Sender_exec.cpp
-  }
-
-  Header_Files {
-    Proxy_RW_Test_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(Proxy_RW_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += Proxy_RW_Test_Base_stub  Proxy_RW_Test_Sender_lem_stub \
-                Proxy_RW_Test_Connector_stub \
-                Proxy_RW_Test_Connector_svnt Proxy_RW_Test_Connector_lem_stub \
-                RW_Reader_Starter_stub RW_Reader_Starter_lem_stub RW_Reader_Starter_svnt
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub Proxy_RW_Test_Base_stub \
-                Proxy_RW_Test_Connector_stub Proxy_RW_Test_Connector_svnt \
-                Proxy_RW_Test_Connector_lem_stub RW_Reader_Starter_stub \
-                RW_Reader_Starter_lem_stub RW_Reader_Starter_svnt
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Proxy_RW_Test_SenderS.cpp
-    Proxy_RW_Test_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    Proxy_RW_Test_SenderS.h
-    Proxy_RW_Test_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender_exec.cpp
deleted file mode 100644
index e895270cd84..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender_exec.cpp
+++ /dev/null
@@ -1,420 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "Proxy_RW_Test_Sender_exec.h"
-
-namespace CIAO_Proxy_RW_Test_Sender_Impl
-{
-
-  /**
-   * Facet Executor Implementation Class: restart_writer_exec_i
-   */
-
-  restart_writer_exec_i::restart_writer_exec_i (
-        ::Proxy_RW_Test::CCM_Sender_Context_ptr ctx,
-        Sender_exec_i &callback)
-    : ciao_context_ (
-        ::Proxy_RW_Test::CCM_Sender_Context::_duplicate (ctx))
-      , callback_ (callback)
-  {
-  }
-
-  restart_writer_exec_i::~restart_writer_exec_i (void)
-  {
-  }
-
-  // Operations from ::ReadGetRestarter
-
-  void
-  restart_writer_exec_i::restart_write (::ReaderStarter::assignment task)
-  {
-    this->callback_.restart_write (task);
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_connector_status_exec_i
-   */
-
-  info_out_connector_status_exec_i::info_out_connector_status_exec_i (
-        ::Proxy_RW_Test::CCM_Sender_Context_ptr ctx,
-        Sender_exec_i &callback)
-    : ciao_context_ (
-        ::Proxy_RW_Test::CCM_Sender_Context::_duplicate (ctx))
-      , callback_ (callback)
-  {
-  }
-
-  info_out_connector_status_exec_i::~info_out_connector_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-
-  void
-  info_out_connector_status_exec_i::on_inconsistent_topic (::DDS::Topic_ptr /* the_topic */,
-  const ::DDS::InconsistentTopicStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_requested_incompatible_qos (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedIncompatibleQosStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_sample_rejected (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleRejectedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_offered_deadline_missed (::DDS::DataWriter_ptr /* the_writer */,
-  const ::DDS::OfferedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_offered_incompatible_qos (::DDS::DataWriter_ptr /* the_writer */,
-  const ::DDS::OfferedIncompatibleQosStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_unexpected_status (::DDS::Entity_ptr /* the_entity */,
-  ::DDS::StatusKind status_kind)
-  {
-    if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS)
-      this->callback_.start ();
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : keys_ (0)
-      , iterations_ (0)
-      , done_ (false)
-      , ccm_activated_ (false)
-  {
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-  Sender_exec_i::TypedDataWriter::_ptr_type
-  Sender_exec_i::get_typed_idl_writer (void)
-  {
-    TypedDataWriter::_var_type idl_writer;
-    ::DDS::DataWriter_var dds_dw =
-      this->ciao_context_->get_connection_info_write_dds_entity ();
-
-    if (::CORBA::is_nil (dds_dw.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR : Sender_exec_i::get_typed_idl_writer - "
-                    "Datawriter connection is NIL.\n"));
-        return TypedDataWriter::_nil ();
-      }
-
-    ::CIAO::DDS4CCM::CCM_DataWriter * ccm_dw =
-      dynamic_cast < ::CIAO::DDS4CCM::CCM_DataWriter * > (dds_dw.in ());
-
-    if (ccm_dw)
-      {
-        ::DDS::DataWriter_var tmp = ccm_dw->get_dds_entity ();
-        if (! ::CORBA::is_nil (tmp.in ()))
-          {
-            idl_writer =
-              ::CIAO_Proxy_RW_Test_ProxyReadWriteTestConnector_DDS_Event_Impl
-              ::ProxyReadWriteTest_DDS_Traits::typed_writer_type::_narrow (tmp.in ());
-            return idl_writer._retn ();
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "Sender_exec_i::get_typed_idl_writer - "
-                      "ERROR: CCM DataWriter returned NIL as DDS entity\n"));
-            return TypedDataWriter::_nil ();
-          }
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "Sender_exec_i::get_typed_idl_writer - "
-                  "ERROR: Unable to cast to CCM DataWriter\n"));
-        return TypedDataWriter::_nil ();
-      }
-  }
-
-  void
-  Sender_exec_i::write_using_idl_proxy_for_read (void)
-  {
-    TypedDataWriter::_var_type idl_writer = this->get_typed_idl_writer ();
-
-    if (!::CORBA::is_nil (idl_writer.in ()))
-      {
-        ReaderStarter_var starter =
-          this->ciao_context_->get_connection_start_reader ();
-
-        if (! ::CORBA::is_nil (starter.in ()))
-          {
-            starter->set_reader_properties (this->keys_, this->iterations_);
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Unable to start the sender\n")));
-            return;
-          }
-        for (CORBA::UShort iter_key = 1; iter_key < this->keys_ + 1; ++iter_key)
-          {
-            char key[7];
-            ProxyReadWriteTest *new_key = new ProxyReadWriteTest;
-            ACE_OS::sprintf (key, "KEY_%d", iter_key);
-            new_key->key = CORBA::string_dup(key);
-
-            const ::CORBA::UShort offset =
-              ::ReaderStarter::READ_USING_IDL_PROXY * this->iterations_ + 1;
-            for (CORBA::UShort iter = offset;
-                 iter < offset + this->iterations_;
-                 ++iter)
-              {
-                new_key->iteration = iter;
-                idl_writer->write (*new_key, ::DDS::HANDLE_NIL);
-                ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::write_using_idl_proxy_for_read - "
-                          "Written key <%C> with <%d>\n",
-                          key, iter));
-              }
-            delete new_key;
-          }
-        starter->start_read (::ReaderStarter::READ_USING_IDL_PROXY);
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "Sender_exec_i::write_using_idl_proxy_for_read - "
-                  "ERROR: Error retrieving IDL DataWriter\n"));
-      }
-    ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::write_using_idl_proxy_for_read - "
-              "Finished writing sample for read.\n"));
-  }
-
-  void
-  Sender_exec_i::write_using_idl_proxy_for_take (void)
-  {
-    TypedDataWriter::_var_type idl_writer = this->get_typed_idl_writer ();
-
-    if (!::CORBA::is_nil (idl_writer.in ()))
-      {
-        ReaderStarter_var starter =
-          this->ciao_context_->get_connection_start_reader ();
-
-        if (! ::CORBA::is_nil (starter.in ()))
-          {
-            starter->set_reader_properties (this->keys_, this->iterations_);
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Unable to start the sender\n")));
-            return;
-          }
-        for (CORBA::UShort iter_key = 1; iter_key < this->keys_ + 1; ++iter_key)
-          {
-            char key[7];
-            ProxyReadWriteTest *new_key = new ProxyReadWriteTest;
-            ACE_OS::sprintf (key, "KEY_%d", iter_key);
-            new_key->key = CORBA::string_dup(key);
-
-            const ::CORBA::UShort offset =
-              ::ReaderStarter::TAKE_USING_IDL_PROXY * this->iterations_ + 1;
-            for (CORBA::UShort iter = offset;
-                 iter < offset + this->iterations_;
-                 ++iter)
-              {
-                new_key->iteration = iter;
-                idl_writer->write (*new_key, ::DDS::HANDLE_NIL);
-                ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::write_using_idl_proxy_for_take - "
-                          "Written key <%C> with <%d>\n",
-                          key, iter));
-              }
-            delete new_key;
-          }
-        starter->start_read (::ReaderStarter::TAKE_USING_IDL_PROXY);
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "Sender_exec_i::write_using_idl_proxy_for_take - "
-                  "ERROR: Error retrieving IDL DataWriter\n"));
-      }
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    if (!this->done_ && this->ccm_activated_)
-      {
-        this->done_ = true;
-        this->write_using_idl_proxy_for_read ();
-      }
-  }
-
-  void
-  Sender_exec_i::restart_write (::ReaderStarter::assignment task)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::restart_write - "
-              "New assignment received <%d>", task));
-    if (task == ::ReaderStarter::TAKE_USING_IDL_PROXY)
-      {
-        this->write_using_idl_proxy_for_take ();
-      }
-  }
-
-  // Component attributes and port operations.
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_info_out_connector_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_connector_status_.in ()))
-      {
-        info_out_connector_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_connector_status_exec_i (
-            this->ciao_context_.in (),
-            *this),
-            ::CCM_DDS::CCM_ConnectorStatusListener::_nil ());
-
-          this->ciao_info_out_connector_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_ConnectorStatusListener::_duplicate (
-        this->ciao_info_out_connector_status_.in ());
-  }
-
-  ::CCM_WriterRestarter_ptr
-  Sender_exec_i::get_restart_writer (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_restart_writer_.in ()))
-      {
-        restart_writer_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          restart_writer_exec_i (
-            this->ciao_context_.in (),
-            *this),
-            ::CCM_WriterRestarter::_nil ());
-
-          this->ciao_restart_writer_ = tmp;
-      }
-
-    return
-      ::CCM_WriterRestarter::_duplicate (
-        this->ciao_restart_writer_.in ());
-  }
-
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Proxy_RW_Test::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-    this->ccm_activated_ = true;
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Proxy_RW_Test_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender_exec.h
deleted file mode 100644
index fc357c79cd0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender_exec.h
+++ /dev/null
@@ -1,207 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_PROXY_RW_TEST_SENDER_EXEC_HWK1EN_H_
-#define CIAO_PROXY_RW_TEST_SENDER_EXEC_HWK1EN_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Proxy_RW_Test_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-#include "Connector/Proxy_RW_Test_Connector_conn.h"
-
-namespace CIAO_Proxy_RW_Test_Sender_Impl
-{
-  class Sender_exec_i;
-
-  /**
-   * Provider Executor Implementation Class: restart_writer_exec_i
-   */
-
-  class restart_writer_exec_i
-    : public virtual ::CCM_WriterRestarter,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    restart_writer_exec_i (
-      ::Proxy_RW_Test::CCM_Sender_Context_ptr ctx,
-      Sender_exec_i & callback);
-    virtual ~restart_writer_exec_i (void);
-
-    //@{
-    /** Operations and attributes from ReadGetRestarter. */
-
-    virtual
-    void restart_write (::ReaderStarter::assignment task);
-    //@}
-
-  private:
-    ::Proxy_RW_Test::CCM_Sender_Context_var ciao_context_;
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_connector_status_exec_i
-   */
-
-  class info_out_connector_status_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_connector_status_exec_i (
-      ::Proxy_RW_Test::CCM_Sender_Context_ptr ctx,
-      Sender_exec_i &callback);
-    virtual ~info_out_connector_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-    const ::DDS::InconsistentTopicStatus & status);
-
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedIncompatibleQosStatus & status);
-
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleRejectedStatus & status);
-
-    virtual
-    void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-    const ::DDS::OfferedDeadlineMissedStatus & status);
-
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-    const ::DDS::OfferedIncompatibleQosStatus & status);
-
-    virtual
-    void on_unexpected_status (::DDS::Entity_ptr the_entity,
-    ::DDS::StatusKind status_kind);
-    //@}
-
-  private:
-    ::Proxy_RW_Test::CCM_Sender_Context_var ciao_context_;
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    typedef ::CIAO_Proxy_RW_Test_ProxyReadWriteTestConnector_DDS_Event_Impl
-            ::ProxyReadWriteTest_DDS_Traits::typed_writer_type
-            TypedDataWriter;
-
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_info_out_connector_status (void);
-
-    virtual ::CCM_WriterRestarter_ptr
-    get_restart_writer (void);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void start (void);
-    void restart_write (::ReaderStarter::assignment task);
-    //@}
-
-  private:
-    ::Proxy_RW_Test::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::CCM_DDS::CCM_ConnectorStatusListener_var ciao_info_out_connector_status_;
-    ::CCM_WriterRestarter_var ciao_restart_writer_;
-
-    ::CORBA::UShort keys_;
-
-    ::CORBA::UShort iterations_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    bool done_;
-    bool ccm_activated_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void write_using_idl_proxy_for_read (void);
-    void write_using_idl_proxy_for_take (void);
-
-    TypedDataWriter::_ptr_type get_typed_idl_writer (void);
-    //@}
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Proxy_RW_Test_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/Plan.cdp
deleted file mode 100644
index af3d89f4e2b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/Plan.cdp
+++ /dev/null
@@ -1,425 +0,0 @@
-<!--  -->
-<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>Proxy_RW_Test_Depl_1</label>
-  <UUID>Proxy_RW_Test_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Proxy_RW_Test_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Proxy_RW_Test_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Proxy_RW_Test_ConnectorComponentImplementation">
-    <name>Proxy_RW_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Proxy_RW_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="Proxy_RW_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Proxy_RW_Test_ProxyReadWriteTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Proxy_RW_Test_ProxyReadWriteTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Proxy_RW_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Proxy_RW_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Proxy_RW_Test_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Proxy_RW_Test_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-  </instance>
-  <instance xmi:id="Proxy_RW_Test_ConnectorComponentInstance">
-    <name>Proxy_RW_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Proxy_RW_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Proxy_RW_Library#ProxyRWProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Proxy_RW_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="Proxy_RW_Test_ConnectorComponentInstance2">
-    <name>Proxy_RW_Test_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Proxy_RW_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Proxy_RW_Library#ProxyRWProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Proxy_RW_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>info_out_dds_entity</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Proxy_RW_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Proxy_RW_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_out_connector_status_sender</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Proxy_RW_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Proxy_RW_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>reader_starter</name>
-    <internalEndpoint>
-      <portName>start_reader</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>reader_start</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>restart_writer</name>
-    <internalEndpoint>
-      <portName>writer_restart</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>restart_writer</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="Proxy_RW_Test_Connector_ExecArtifact">
-    <name>Proxy_RW_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>Proxy_RW_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Proxy_RW_Test_Connector_SvntArtifact">
-    <name>Proxy_RW_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>Proxy_RW_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Proxy_RW_Test_Connector_StubArtifact">
-    <name>Proxy_RW_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>Proxy_RW_Test_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/Proxy_RW_Library.xml b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/Proxy_RW_Library.xml
deleted file mode 100644
index 3ef510066e7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/Proxy_RW_Library.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-
-  <qos_profile name="ProxyRWProfile">
-    <!-- QoS used to configure the data writer created in the example code -->
-    <datawriter_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-        <max_blocking_time>
-          <sec>10</sec>
-          <nanosec>0</nanosec>
-        </max_blocking_time>
-      </reliability>
-      <durability>
-        <kind>TRANSIENT_DURABILITY_QOS</kind>
-      </durability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-    </datawriter_qos>
-    <!-- QoS used to configure the data reader created in the example code -->
-    <datareader_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-      </reliability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-      <durability>
-        <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-      </durability>
-    </datareader_qos>
-  </qos_profile>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index ffc32755202..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-Description
-XML QoS Profile
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="Proxy_RW_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="ProxyRWProfile" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>10</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/run_test.pl
deleted file mode 100755
index c5b1964e047..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 30 seconds to allow task to complete\n";
-sleep (30);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/.gitignore b/CIAO/connectors/dds4ccm/tests/QosProfile/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QosProfile/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.idl
deleted file mode 100644
index 9813ce3d75a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file QosProfile_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef QOSPROFILE_TEST_BASE_IDL
-#define QOSPROFILE_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/QosProfile_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/QosProfile_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "QosProfileTest"
-#pragma DCPS_DATA_KEY "QosProfileTest symbol"
-
-struct QosProfileTest {
-  string symbol; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<QosProfileTest> QosProfileTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.mpc
deleted file mode 100644
index da6d3f3b7d0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (QosProfile_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = QosProfile_Test_Base_stub
-  dynamicflags += COHERENT_WRITE_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=COHERENT_WRITE_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=QosProfile_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    QosProfile_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=COHERENT_WRITE_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    QosProfile_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.idl b/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.idl
deleted file mode 100644
index 5aec5157741..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.idl
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef COMPONENT_IDL
-#define COMPONENT_IDL
-
-#include "Connector/QosProfile_Test_Connector.idl"
-
-module QosProfile_Test
-{
-  component QosProfileComponent
-  {
-    port QosProfileTestConnector::DDS_Write info_write;
-  };
-};
-
-#endif /* COMPONENT_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.mpc
deleted file mode 100644
index 20004d702df..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-project(QosProfile_Test_Component_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += QosProfile_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=COMPONENT_STUB_Export \
-              -Wb,stub_export_include=Component_stub_export.h \
-              -Wb,skel_export_macro=COMPONENT_SVNT_Export \
-              -Wb,skel_export_include=Component_svnt_export.h \
-              -Wb,svnt_export_macro=COMPONENT_SVNT_Export \
-              -Wb,svnt_export_include=Component_svnt_export.h \
-              -Wb,exec_export_macro=COMPONENT_EXEC_Export \
-              -Wb,exec_export_include=Component_exec_export.h -I..
-
-  IDL_Files {
-    QosProfile_Test_Component.idl
-  }
-}
-
-project(QosProfile_Test_Component_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += QosProfile_Test_Component_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=COMPONENT_LEM_STUB_Export \
-              -Wb,stub_export_include=Component_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    QosProfile_Test_ComponentE.idl
-  }
-}
-
-project(QosProfile_Test_Component_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += QosProfile_Test_Component_lem_gen QosProfile_Test_Component_stub  \
-           QosProfile_Test_Connector_stub QosProfile_Test_Base_stub
-  libs  +=  Component_stub QosProfile_Test_Connector_stub \
-            QosProfile_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Component_lem_stub
-  dynamicflags += COMPONENT_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QosProfile_Test_ComponentEC.cpp
-  }
-
-  Header_Files {
-    QosProfile_Test_ComponentEC.h
-    Component_lem_stub_export.h
-  }
-
-  Inline_Files {
-    QosProfile_Test_ComponentEC.inl
-  }
-}
-
-project(QosProfile_Test_Component_stub) : ccm_stub, dds4ccm_base {
-  after += QosProfile_Test_Component_idl_gen  QosProfile_Test_Connector_stub \
-           QosProfile_Test_Base_stub QosProfile_Test_Connector_lem_gen
-  libs  += QosProfile_Test_Connector_stub QosProfile_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Component_stub
-  dynamicflags += COMPONENT_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QosProfile_Test_ComponentC.cpp
-  }
-
-  Header_Files {
-    QosProfile_Test_ComponentC.h
-    Component_stub_export.h
-  }
-
-  Inline_Files {
-    QosProfile_Test_ComponentC.inl
-  }
-}
-
-project(QosProfile_Test_Component_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += QosProfile_Test_Component_lem_stub QosProfile_Test_Component_stub \
-             QosProfile_Test_Base_stub QosProfile_Test_Connector_stub \
-             QosProfile_Test_Connector_lem_stub 
-  sharedname = Component_exec
-  libs += Component_stub Component_lem_stub QosProfile_Test_Base_stub \
-          QosProfile_Test_Connector_stub QosProfile_Test_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COMPONENT_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QosProfile_Test_Component_exec.cpp
-  }
-
-  Header_Files {
-    QosProfile_Test_Component_exec.h
-    Component_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(QosProfile_Test_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   QosProfile_Test_Component_lem_stub QosProfile_Test_Base_stub \
-                  QosProfile_Test_Connector_stub QosProfile_Test_Connector_svnt \
-                  QosProfile_Test_Component_exec QosProfile_Test_Connector_lem_stub 
-  sharedname  = Component_svnt
-  libs       += Component_stub Component_lem_stub QosProfile_Test_Base_stub \
-                QosProfile_Test_Connector_stub QosProfile_Test_Connector_svnt \
-                Component_exec QosProfile_Test_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COMPONENT_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QosProfile_Test_ComponentS.cpp
-    QosProfile_Test_Component_svnt.cpp
-  }
-
-  Header_Files {
-    QosProfile_Test_ComponentS.h
-    QosProfile_Test_Component_svnt.h
-    Component_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component_exec.cpp
deleted file mode 100644
index 868450365c9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component_exec.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-// -*- C++ -*-
-#include "QosProfile_Test_Component_exec.h"
-
-namespace CIAO_QosProfile_Test_QosProfileComponent_Impl
-{
-  //============================================================
-  // Component_exec_i
-  //============================================================
-  Component_exec_i::Component_exec_i (void)
-  {
-  }
-
-  Component_exec_i::~Component_exec_i (void)
-  {
-  }
-
-  // Operations from Components::SessionComponent.
-  void
-  Component_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::QosProfile_Test::CCM_QosProfileComponent_Context::_narrow (ctx);
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Component_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Component_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Component_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Component_exec_i::ccm_remove (void)
-  {
-  }
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_QosProfile_Test_Component_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Component_exec_i);
-
-    return retval;
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component_exec.h b/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component_exec.h
deleted file mode 100644
index 0c5b8442e0c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component_exec.h
+++ /dev/null
@@ -1,48 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_COMPONENT_EXEC_H_
-#define CIAO_COMPONENT_EXEC_H_
-
-#include "QosProfile_Test_ComponentEC.h"
-
-#include /**/ "Component_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-namespace CIAO_QosProfile_Test_QosProfileComponent_Impl
-{
-  //============================================================
-  // Component_exec_i
-  //============================================================
-  class COMPONENT_EXEC_Export Component_exec_i
-    : public virtual QosProfileComponent_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Component_exec_i (void);
-    virtual ~Component_exec_i (void);
-
-    // Operations from Components::SessionComponent.
-    virtual void
-    set_session_context (
-      ::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete (void);
-
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-
-  private:
-    ::QosProfile_Test::CCM_QosProfileComponent_Context_var context_;
-  };
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_QosProfile_Test_Component_Impl (void);
-}
-
-#endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.idl
deleted file mode 100644
index d0ddb1d9a6c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file QosProfile_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef QOS_PROFILE_TEST_CONNECTOR_IDL_
-#define QOS_PROFILE_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/QosProfile_Test_Base.idl"
-
-#pragma ciao lem "Connector/QosProfile_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/QosProfile_Test_BaseTypeSupport.idl"
-#endif
-
-module QosProfile_Test
-{
-  module ::CCM_DDS::Typed < ::QosProfileTest, ::QosProfileTestSeq> QosProfileTestConnector;
-};
-
-#endif /* QOS_PROFILE_TEST_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.mpc
deleted file mode 100644
index 8f32d311e41..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p QosProfile_Test_Base -l .. -o ../lib -u DDS QosProfile_Test_Connector"
-
-project(QosProfile_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen QosProfile_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=COHERENT_WRITE_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=QosProfile_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=COHERENT_WRITE_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=QosProfile_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=COHERENT_WRITE_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=QosProfile_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=COHERENT_WRITE_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=QosProfile_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    QosProfile_Test_Connector.idl
-  }
-}
-
-project(QosProfile_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += QosProfile_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=COHERENT_WRITE_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=QosProfile_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    QosProfile_Test_ConnectorE.idl
-  }
-}
-
-project(QosProfile_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += QosProfile_Test_Connector_lem_gen QosProfile_Test_Connector_stub QosProfile_Test_Base_stub
-  libs  += QosProfile_Test_Base_stub QosProfile_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = QosProfile_Test_Connector_lem_stub
-  dynamicflags += COHERENT_WRITE_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QosProfile_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    QosProfile_Test_ConnectorEC.h
-    QosProfile_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    QosProfile_Test_ConnectorEC.inl
-  }
-}
-
-project(QosProfile_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += QosProfile_Test_Connector_idl_gen QosProfile_Test_Base_stub
-  libs  += QosProfile_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = QosProfile_Test_Connector_stub
-  dynamicflags += COHERENT_WRITE_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QosProfile_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    QosProfile_Test_ConnectorC.h
-    QosProfile_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    QosProfile_Test_ConnectorC.inl
-  }
-}
-
-project(QosProfile_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += QosProfile_Test_Connector_lem_stub QosProfile_Test_Connector_stub QosProfile_Test_Base_stub
-  sharedname = QosProfile_Test_Connector_exec
-  libs += QosProfile_Test_Connector_stub QosProfile_Test_Connector_lem_stub QosProfile_Test_Base_stub QosProfile_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COHERENT_WRITE_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QosProfile_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    QosProfile_Test_Connector_conn.h
-    QosProfile_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(QosProfile_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += QosProfile_Test_Connector_lem_stub QosProfile_Test_Connector_exec QosProfile_Test_Connector_stub
-  sharedname  = QosProfile_Test_Connector_svnt
-  libs       += QosProfile_Test_Connector_stub \
-                QosProfile_Test_Connector_lem_stub  \
-                QosProfile_Test_Base_stub \
-                QosProfile_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COHERENT_WRITE_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QosProfile_Test_ConnectorS.cpp
-    QosProfile_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    QosProfile_Test_ConnectorS.h
-    QosProfile_Test_Connector_svnt.h
-    QosProfile_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/PlanMultipleHashes.cdp b/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/PlanMultipleHashes.cdp
deleted file mode 100644
index c3d16970d98..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/PlanMultipleHashes.cdp
+++ /dev/null
@@ -1,206 +0,0 @@
-<!--  -->
-<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>QosProfile_Test_Depl_1</label>
-  <UUID>QosProfile_Test_Depl_1</UUID>
-
-  <implementation xmi:id="ComponentComponentImplementation">
-    <name>ComponentComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Component_ExecArtifact" />
-    <artifact xmi:idref="Component_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QosProfile_Test_Component_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QosProfile_Test_QosProfileComponent_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="QosProfile_Test_ConnectorComponentImplementation">
-    <name>QosProfile_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="QosProfile_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="QosProfile_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QosProfile_Test_QosProfileTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QosProfile_Test_QosProfileTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QosProfile_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QosProfile_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ComponentComponentInstance">
-    <name>ComponentComponent</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ComponentComponentImplementation" />
-  </instance>
-  <instance xmi:id="QosProfile_Test_ConnectorComponentInstance">
-    <name>QosProfile_Test_ConnectorComponent</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="QosProfile_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QosProfile_Library#QosProfile_Profile#TooMany</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QosProfile_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>info_write_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="QosProfile_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="QosProfile_Test_Connector_ExecArtifact">
-    <name>QosProfile_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>QosProfile_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="QosProfile_Test_Connector_SvntArtifact">
-    <name>QosProfile_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>QosProfile_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="QosProfile_Test_Connector_StubArtifact">
-    <name>QosProfile_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>QosProfile_Test_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Component_ExecArtifact">
-    <name>Component_exec</name>
-    <source/>
-    <node/>
-    <location>Component_exec</location>
-  </artifact>
-  <artifact xmi:id="Component_SvntArtifact">
-    <name>Component_svnt</name>
-    <source/>
-    <node/>
-    <location>Component_svnt</location>
-  </artifact>
-  <artifact xmi:id="Component_StubArtifact">
-    <name>Component_stub</name>
-    <source/>
-    <node/>
-    <location>Component_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/PlanNoHash.cdp b/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/PlanNoHash.cdp
deleted file mode 100644
index 8bef833b7bc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/PlanNoHash.cdp
+++ /dev/null
@@ -1,206 +0,0 @@
-<!--  -->
-<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>QosProfile_Test_Depl_1</label>
-  <UUID>QosProfile_Test_Depl_1</UUID>
-
-  <implementation xmi:id="ComponentComponentImplementation">
-    <name>ComponentComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Component_ExecArtifact" />
-    <artifact xmi:idref="Component_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QosProfile_Test_Component_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QosProfile_Test_QosProfileComponent_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="QosProfile_Test_ConnectorComponentImplementation">
-    <name>QosProfile_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="QosProfile_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="QosProfile_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QosProfile_Test_QosProfileTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QosProfile_Test_QosProfileTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QosProfile_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QosProfile_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ComponentComponentInstance">
-    <name>ComponentComponent</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ComponentComponentImplementation" />
-  </instance>
-  <instance xmi:id="QosProfile_Test_ConnectorComponentInstance">
-    <name>QosProfile_Test_ConnectorComponent</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="QosProfile_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QosProfile_Library::QosProfileProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QosProfile_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>info_write_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="QosProfile_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="QosProfile_Test_Connector_ExecArtifact">
-    <name>QosProfile_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>QosProfile_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="QosProfile_Test_Connector_SvntArtifact">
-    <name>QosProfile_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>QosProfile_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="QosProfile_Test_Connector_StubArtifact">
-    <name>QosProfile_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>QosProfile_Test_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Component_ExecArtifact">
-    <name>Component_exec</name>
-    <source/>
-    <node/>
-    <location>Component_exec</location>
-  </artifact>
-  <artifact xmi:id="Component_SvntArtifact">
-    <name>Component_svnt</name>
-    <source/>
-    <node/>
-    <location>Component_svnt</location>
-  </artifact>
-  <artifact xmi:id="Component_StubArtifact">
-    <name>Component_stub</name>
-    <source/>
-    <node/>
-    <location>Component_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/PlanWrongNames.cdp b/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/PlanWrongNames.cdp
deleted file mode 100644
index b8525348547..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/PlanWrongNames.cdp
+++ /dev/null
@@ -1,206 +0,0 @@
-<!--  -->
-<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>QosProfile_Test_Depl_1</label>
-  <UUID>QosProfile_Test_Depl_1</UUID>
-
-  <implementation xmi:id="ComponentComponentImplementation">
-    <name>ComponentComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Component_ExecArtifact" />
-    <artifact xmi:idref="Component_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QosProfile_Test_Component_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QosProfile_Test_QosProfileComponent_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="QosProfile_Test_ConnectorComponentImplementation">
-    <name>QosProfile_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="QosProfile_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="QosProfile_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QosProfile_Test_QosProfileTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QosProfile_Test_QosProfileTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QosProfile_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QosProfile_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ComponentComponentInstance">
-    <name>ComponentComponent</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ComponentComponentImplementation" />
-  </instance>
-  <instance xmi:id="QosProfile_Test_ConnectorComponentInstance">
-    <name>QosProfile_Test_ConnectorComponent</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="QosProfile_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Wrong_Library#WrongProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QosProfile_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>info_write_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="QosProfile_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="QosProfile_Test_Connector_ExecArtifact">
-    <name>QosProfile_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>QosProfile_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="QosProfile_Test_Connector_SvntArtifact">
-    <name>QosProfile_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>QosProfile_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="QosProfile_Test_Connector_StubArtifact">
-    <name>QosProfile_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>QosProfile_Test_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Component_ExecArtifact">
-    <name>Component_exec</name>
-    <source/>
-    <node/>
-    <location>Component_exec</location>
-  </artifact>
-  <artifact xmi:id="Component_SvntArtifact">
-    <name>Component_svnt</name>
-    <source/>
-    <node/>
-    <location>Component_svnt</location>
-  </artifact>
-  <artifact xmi:id="Component_StubArtifact">
-    <name>Component_stub</name>
-    <source/>
-    <node/>
-    <location>Component_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/QosProfile_Library.xml b/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/QosProfile_Library.xml
deleted file mode 100644
index f6b2c3c06d5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/QosProfile_Library.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-
-  <qos_profile name="QosProfileProfile">
-    <datawriter_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-        <max_blocking_time>
-          <sec>10</sec>
-          <nanosec>0</nanosec>
-        </max_blocking_time>
-      </reliability>
-      <durability>
-        <kind>TRANSIENT_DURABILITY_QOS</kind>
-      </durability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-    </datawriter_qos>
-    <datareader_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-      </reliability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-      <durability>
-        <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-      </durability>
-    </datareader_qos>
-  </qos_profile>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index 7652e49300c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<dds xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <qos_library name="QosProfile_Library">
-    <qos_profile name="QosProfileProfile" is_default_qos="false">
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>10</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/run_test.pl
deleted file mode 100755
index d23862e4e88..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/run_test.pl
+++ /dev/null
@@ -1,229 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 1;
-@ports = ( 60001 );
-@iorbases = ( "NodeApp1.ior" );
-@iorfiles = 0;
-@nodenames = ( "ComponentNode" );
-
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run node daemon\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-              "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-if ($#ARGV == -1) {
-    opendir(DIR, ".");
-    @files = grep(/\.cdp$/,readdir(DIR));
-    closedir(DIR);
-}
-else {
-    @files = @ARGV;
-}
-
-create_targets ();
-init_ior_files ();
-
-foreach $file (@files) {
-    print "*********** Starting test for deployment $file ***********\n";
-
-    print STDERR "Starting Naming Service\n";
-
-    $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-    $NS->Spawn ();
-
-    if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                      $tg_naming->ProcessStartWaitInterval ()) == -1) {
-        print STDERR "ERROR: cannot find naming service IOR file\n";
-        $NS->Kill (); $NS->TimedWait (1);
-        exit 1;
-    }
-
-    $ns_running = 1;
-    # Set up NamingService environment
-    $ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-    # Invoke node daemon.
-    print "Invoking node daemon\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 = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-    $EM->Spawn ();
-
-    if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                    $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-    print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-    $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                            "-x $file -k file://$ior_emfile -q");
-    $pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-    if ($pl_status != 0) {
-        print STDERR "OK: dance_plan_launcher returned an error status ($pl_status)\n";
-        kill_open_processes ();
-    }
-    else {
-        print "ERROR : dance_plan_launcher didn't return with an error.\n";
-        $status=$pl_status;
-    }
-
-
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                                $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-            print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-            kill_open_processes ();
-            exit 1;
-        }
-    }
-
-    delete_ior_files ();
-    kill_open_processes ();
-}
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.idl
deleted file mode 100644
index de514308408..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.idl
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * @file Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef BASE_IDL_
-#define BASE_IDL_
-
-struct QueryConditionTest {
-  string symbol; //@key
-  long iteration;
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.mpc
deleted file mode 100644
index 351304a0a57..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.mpc
+++ /dev/null
@@ -1,13 +0,0 @@
-project(QC_Base_stub) : ndds_ts_defaults, nddslib {
-  sharedname = QC_Base_stub
-  dynamicflags += NDDS_USER_DLL_EXPORT
-  libout = ../descriptors
-
-  NDDSTypeSupport_Files {
-    Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/DDS_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/DDS_Receiver.mpc
deleted file mode 100644
index 7a9b9e20b27..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/DDS_Receiver.mpc
+++ /dev/null
@@ -1,19 +0,0 @@
-project(*qc_receiver) : aceexe, nddslib, ndds_ts_defaults {
-  exename = DDS_receiver
-  after += QC_Base_stub
-
-  includes += ../Base
-
-  libs += QC_Base_stub
-  libpaths += ../descriptors
-
-  exeout += ../descriptors
-
-  Source_Files {
-    QC_Receiver.cpp
-  }
-
-  Header_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp
deleted file mode 100644
index 72620a0ce0f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp
+++ /dev/null
@@ -1,418 +0,0 @@
-#include <stdio.h>
-#include <iostream>
-
-using namespace std;
-
-#include "Base.h"
-#include "BaseSupport.h"
-
-#include "ace/OS_main.h"
-#include "ace/OS_NS_stdlib.h"
-
-#define LIBRARY_NAME  "QueryCondition_Library"
-#define PROFILE_NAME  "QueryConditionProfile"
-
-bool shutdown_flag = false;
-long num_samples = 0;
-long received_samples = 0;
-long expected_samples_run1 = 1 * 2;    //only sample 2 should be received of 2 keys
-long expected_samples_run2 = 1 * 2;   //only sample 5 should be received o 2 keys
-long expected_samples_run3 = (9 - 2) * 2; //all samples 1-9 except sample 2 and 5 of both keys.
-
-DDSWaitSet* ws_ = new DDSWaitSet ();
-DDS_Duration_t dur_ = {9, 0};
-
-void sleep_now (int sleeptime)
-{
-#ifdef RTI_WIN32
-        Sleep(sleeptime * 1000);
-#else
-        sleep(sleeptime);
-#endif
-}
-
-void check_iter (const QueryConditionTest & sample,
-                   const DDS_SampleInfo & readinfo,
-                   const int & run)
-{
-  bool error = false;
-  if (run == 1)
-    {
-      //only sample 2 should be received
-      error = sample.iteration <= 1 && sample.iteration >= 3;
-    }
-  else if (run == 2)
-    {
-      //only samples 8 should be received
-      error = sample.iteration <= 4 && sample.iteration >= 6;
-    }
-  else if (run == 3)
-    {
-      //all other unread samples.
-      error = sample.iteration == 2;
-      error |= sample.iteration ==5;
-    }
-
-  error
-    ?
-    cerr << "ERROR Received: key <"
-        << sample.symbol
-        << "> - iteration <"
-        << sample.iteration
-        << ">"
-        << endl
-    :
-    cout << "Received: key <"
-        << sample.symbol
-        << "> - iteration <"
-        << sample.iteration
-        << "> - instance status <"
-        << readinfo.instance_state
-        << "> - view status <"
-        << readinfo.view_state
-        << "> - sample status <"
-        << readinfo.sample_state
-        << ">"
-        << endl;
-}
-
-
-void read (DDSDataReader * dr,
-           DDSQueryCondition * qc,
-           DDSReadCondition * rc,
-           const int & run)
-{
-  QueryConditionTestDataReader* typed_dr = QueryConditionTestDataReader::narrow (dr);
-
-  DDSConditionSeq cond;
-
-  if (ws_->wait (cond, dur_) == DDS_RETCODE_TIMEOUT)
-    {
-      cerr << "ERROR: wait timed out" << endl;
-    }
-  else
-    {
-      //wait a moment to allow DDS to write all samples we need here...
-      QueryConditionTestSeq data;
-      DDS_SampleInfoSeq     info_seq;
-      sleep_now (3);
-      for (DDS_Long i = 0; i < cond.length (); ++i)
-        {
-          if (run == 3)
-            {
-              sleep_now (10);
-              if (cond[i] == rc)
-                {
-                  received_samples = 0;
-
-                  //  **************  read all in one
-                  cout << "CHECKING..... SAMPLES with read_w_condition with readcondition:" << endl;
-                  typed_dr->read_w_condition (data,
-                                              info_seq,
-                                              DDS_LENGTH_UNLIMITED,
-                                              rc);
-                  for (DDS_Long y = 0; y < data.length (); ++y)
-                    {
-                      if (info_seq[y].valid_data)
-                        {
-                          check_iter (data[y], info_seq[y], run);
-                          received_samples ++;
-                        }
-                    }
-                  typed_dr->return_loan (data, info_seq);
-                  if (received_samples !=  expected_samples_run3)
-                    {
-                      cerr << "ERROR: run  3 unexpected number of samples received : "
-                           << "expected < "
-                           <<  expected_samples_run3 << "> - received <"
-                           << received_samples << ">" << endl;
-                    }
-                // end read all in one
-
-                }
-              else
-                {
-                  cerr << "ERROR: Should be woken up on ReadCondition" << endl;
-                }
-            }
-          else // run 1 and 2
-            {
-              if (cond[i] == qc)
-                {
-                  received_samples = 0;
-                  cout << "CHECKING..... SAMPLES with read_w_condition with querycondition:" << endl;
-                  typed_dr->read_w_condition (data,
-                                               info_seq,
-                                              DDS_LENGTH_UNLIMITED,
-                                              qc);
-                  for (DDS_Long i = 0; i < data.length (); ++i)
-                     {
-                       if (info_seq[i].valid_data)
-                         {
-                           check_iter (data[i], info_seq[i], run);
-                           received_samples ++;
-                         }
-                     }
-                   typed_dr->return_loan (data, info_seq);
-
-                  if (run == 1)
-                    {
-                      if (received_samples !=  expected_samples_run1)
-                        {
-                          cerr << "ERROR: run  1 unexpected number of samples received : "
-                          << "expected < "
-                          <<  expected_samples_run1 << "> - received <"
-                          << received_samples << ">" << endl;
-                        }
-                    }
-                  else
-                    {
-                      if (received_samples !=  expected_samples_run2)
-                        {
-                           cerr << "ERROR: run  2 unexpected number of samples received : "
-                           << "expected < "
-                           <<  expected_samples_run2 << "> - received <"
-                           << received_samples << ">" << endl;
-                        }
-                    }
-                 }
-              else
-                {
-                  cerr << "ERROR: Should be woken up on QueryCondition" << endl;
-                }
-             }
-        }
-      if (run != 3)
-        {
-        }
-
-    }
-
-  //check if all samples are still available.
-  if (run == 3)
-    {
-      QueryConditionTestSeq data;
-      DDS_SampleInfoSeq     info_seq;
-      sleep_now (3);
-      typed_dr->read (data,
-                      info_seq,
-                      DDS_LENGTH_UNLIMITED);
-      cout << "\nCHECKING..... TOTAL NUMBER OF SAMPLES IN DDS with a read : <"
-             << data.length ()
-             << ">"
-             << endl;
-      for (DDS_Long i = 0; i < data.length (); ++i)
-        {
-          cout << "Received: key <"
-              << data[i].symbol
-              << "> - iteration <"
-              << data[i].iteration
-              << "> - instance status <"
-              << info_seq[i].instance_state
-              << "> - view status <"
-              << info_seq[i].view_state
-              << "> - sample status <"
-              << info_seq[i].sample_state
-              << ">"
-              << endl;
-        }
-      if (data.length () != 18)
-        {
-          cerr << "ERROR: unexpected number of samples received : "
-          << "expected <18> - received <"
-          << data.length () << ">" << endl;
-        }
-      typed_dr->return_loan (data, info_seq);
-    }
-    sleep_now (5);
-}
-
-int clean_up (DDSDomainParticipant * participant)
-{
-  DDS_ReturnCode_t    retcode = DDS_RETCODE_OK;
-  int main_result = 0;
-
-  cout << "RECEIVER: Exiting ..." << endl;
-  if (participant) {
-    retcode = participant->delete_contained_entities();
-    if (retcode != DDS_RETCODE_OK) {
-      main_result = 1;
-    }
-    retcode = DDSDomainParticipantFactory::get_instance()->
-      delete_participant(participant);
-    if (retcode != DDS_RETCODE_OK) {
-      main_result = 1;
-    }
-  }
-  delete ws_;
-  DDSDomainParticipantFactory::finalize_instance ();
-  return main_result;
-}
-
-int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
-{
-  DDSTopic*           topic = 0;
-  DDSDataReader*      data_reader = 0;
-  DDSSubscriber*      sub = 0;
-  DDS_ReturnCode_t    retcode = DDS_RETCODE_OK;
-  QueryConditionTestDataReader* typed_dr = 0;
-  DDSQueryCondition*  qc = 0;
-  DDSReadCondition*   rc = 0;
-  int run = 0;
-
-//     NDDS_Config_LogVerbosity n_verbosity =
-//       static_cast <NDDS_Config_LogVerbosity> (3);
-//     NDDSConfigLogger::get_instance()->set_verbosity (n_verbosity);
-
-  const ACE_TCHAR * env_domain_id = 0;
-  if (argc > 1)
-    {
-      env_domain_id = argv[1];
-    }
-  if (!env_domain_id)
-    {
-      printf ("Environment variable DEFAULT_DOMAIN_ID not set "
-              "=> setting it to 2\n");
-      env_domain_id = "2";
-    }
-  else
-    printf ("Domain ID set to %s\n", env_domain_id);
-
-  const int domain_id = ACE_OS::atoi (env_domain_id);
-  /* Create the domain participant on domain ID 0 */
-  DDSDomainParticipant *participant = DDSDomainParticipantFactory::get_instance()->
-      create_participant_with_profile (domain_id,    /* Domain ID */
-                                       LIBRARY_NAME, /* QoS */
-                                       PROFILE_NAME,
-                                       0,            /* Listener */
-                                       DDS_STATUS_MASK_NONE);
-  if (!participant) {
-    cerr << "RECEIVER: Error creating participant" << endl;
-    return 1;
-  }
-
-  retcode = QueryConditionTestTypeSupport::register_type(
-    participant, QueryConditionTestTypeSupport::get_type_name ());
-
-  if (retcode != DDS_RETCODE_OK) {
-    cerr << "RECEIVER: Error registering type" << endl;
-    return clean_up (participant);
-  }
-
-  topic = participant->create_topic_with_profile (
-                                    "QC",                   /* Topic name*/
-                                    QueryConditionTestTypeSupport::get_type_name (), /* Type name */
-                                    LIBRARY_NAME,       /* QoS */
-                                    PROFILE_NAME,
-                                    0,                  /* Listener  */
-                                    DDS_STATUS_MASK_NONE);
-  if (!topic) {
-    cerr << "RECEIVER: Error creating topic" << endl;
-    return clean_up (participant);
-  }
-
-  sub = participant->create_subscriber_with_profile (LIBRARY_NAME,
-                                                     PROFILE_NAME,
-                                                     0,
-                                                     0);
-  if (!sub) {
-    cerr << "RECEIVER: Error creating subscriber" << endl;
-    return clean_up (participant);
-  }
-
-  data_reader = sub->create_datareader_with_profile (
-                                               topic,
-                                               LIBRARY_NAME, /* QoS */
-                                               PROFILE_NAME,
-                                               0,            /* Listener */
-                                               DDS_STATUS_MASK_NONE);
-  if (!data_reader) {
-    cerr << "RECEIVER: Error creating data reader" << endl;
-    return clean_up (participant);
-  }
-
-  typed_dr = QueryConditionTestDataReader::narrow (data_reader);
-
-  if (!typed_dr) {
-    cerr << "RECEIVER: Unable to cast to a type specific data reader" << endl;
-    return clean_up (participant);
-  }
-
-  const char* PARAMS_RUN_1[] = {"1", "3"};
-  DDS_StringSeq parameters_run_1;
-  parameters_run_1.from_array (PARAMS_RUN_1, 2);
-
-  qc = typed_dr->create_querycondition (
-                                DDS_NOT_READ_SAMPLE_STATE,
-                                DDS_NEW_VIEW_STATE | DDS_NOT_NEW_VIEW_STATE,
-                                DDS_ALIVE_INSTANCE_STATE | DDS_NOT_ALIVE_INSTANCE_STATE,
-                                "iteration > %0 AND iteration < %1",
-                                parameters_run_1);
-  if (!qc) {
-    cerr << "RECEIVER: Error creating query condition" << endl;
-    return clean_up (participant);
-  }
-  else
-    cout << "RECEIVER: query condition created : iteration > 1 AND iteration < 3" << endl;
-
-  ws_->attach_condition (qc);
-
-  cout << "RECEIVER: Expecting two samples (key_1 and key_2) with iteration 3." <<endl;
-
-  read (data_reader, qc, rc, ++run);
-
-  //Second run: change the parameters
-  if (qc)
-    {
-      const char* PARAMS_RUN_2[] = {"4", "6"};
-      DDS_StringSeq parameters_run_2;
-      parameters_run_2.from_array (PARAMS_RUN_2, 2);
-      if (qc->set_query_parameters (parameters_run_2) != DDS_RETCODE_OK)
-        {
-          cerr << "RECEIVER: Unable the set the new query parameters!!!" << endl;
-          return clean_up (participant);
-        }
-    }
-  cout << "RECEIVER: query condition changed : iteration > 4 AND iteration < 6" << endl;
-
-  cout << "RECEIVER: Expecting two samples (key_1 and key_2) with iterations 5" <<endl;
-
-  read (data_reader, qc, rc, ++run);
-  // Third run: Detach querycondition and create read condition instead.
-  // Remove the qc from the waitset and create a readcondition and start receiving
-  // samples
-  if (ws_->detach_condition (qc) != DDS_RETCODE_OK)
-    {
-      cerr << "RECEIVER: Error detaching query condition" << endl;
-      return clean_up (participant);
-    }
-  cout << "RECEIVER: query condition deleted" << endl;
-  cout << "RECEIVER: create read condition : DDS_NOT_READ_SAMPLE_STATE,"
-       << "DDS_NEW_VIEW_STATE | DDS_NOT_NEW_VIEW_STATE,"
-       << "DDS_ALIVE_INSTANCE_STATE | DDS_NOT_ALIVE_INSTANCE_STATE" << endl;
-
-  // Delete the query condition from the data reader
-  typed_dr->delete_readcondition (qc);
-  sleep_now(10);
-
-  rc = typed_dr->create_readcondition (
-                            DDS_NOT_READ_SAMPLE_STATE,
-                            DDS_NEW_VIEW_STATE | DDS_NOT_NEW_VIEW_STATE,
-                            DDS_ALIVE_INSTANCE_STATE | DDS_NOT_ALIVE_INSTANCE_STATE);
-  if (!rc) {
-    cerr << "RECEIVER: Error creating read condition" << endl;
-    return clean_up (participant);
-  }
-
-  if (ws_->attach_condition (rc) != DDS_RETCODE_OK)
-    {
-      cerr << "RECEIVER: Error attaching read condition" << endl;
-      return clean_up (participant);
-    }
-
-  cout << "RECEIVER: Expecting ALL UNREAD samples (key_1 and key_2) with iterations between 1 and 9, except 2 and 5" <<endl;
-
-  read (data_reader, qc, rc, ++run);
-
-  return clean_up (participant);
-}
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/DDS_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/DDS_Sender.mpc
deleted file mode 100644
index a58d846f7cd..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/DDS_Sender.mpc
+++ /dev/null
@@ -1,18 +0,0 @@
-project(*qc_sender) : aceexe, nddslib, ndds_ts_defaults {
-  exename = DDS_Sender
-  after += QC_Base_stub
-
-  includes += ../Base
-
-  exeout += ../descriptors
-  libs += QC_Base_stub
-  libpaths += ../descriptors
-
-  Source_Files {
-    QC_Sender.cpp
-  }
-
-  Header_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/QC_Sender.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/QC_Sender.cpp
deleted file mode 100644
index 3c018dc45f2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/QC_Sender.cpp
+++ /dev/null
@@ -1,172 +0,0 @@
-#include <stdio.h>
-#include <iostream>
-
-using namespace std;
-
-#include "Base.h"
-#include "BaseSupport.h"
-
-#include "ace/OS_main.h"
-#include "ace/OS_NS_stdlib.h"
-
-#define LIBRARY_NAME  "QueryCondition_Library"
-#define PROFILE_NAME  "QueryConditionProfile"
-
-const int number_of_iterations_ = 3;
-
-const int number_of_keys_ = 2;
-
-int last_iteration_ = 0;
-int run_ = 0;
-
-void sleep_now (int sleeptime)
-{
-#ifdef RTI_WIN32
-        Sleep(sleeptime * 1000);
-#else
-        sleep(sleeptime);
-#endif
-}
-
-void write (DDSDataWriter * writer)
-{
-  QueryConditionTestDataWriter* typed_writer = 0;
-  typed_writer = QueryConditionTestDataWriter::narrow (writer);
-  for (int iter_key = 1; iter_key < number_of_keys_ + 1; ++iter_key)
-    {
-      char key[7];
-      QueryConditionTest new_key;
-      sprintf (key, "KEY_%d", iter_key);
-      new_key.symbol = key;
-      for (int iter = 1;
-          iter < number_of_iterations_ + 1;
-          ++iter)
-        {
-          new_key.iteration = iter + last_iteration_;
-          DDS_ReturnCode_t retcode = typed_writer->write (new_key, DDS_HANDLE_NIL);
-          if (retcode != DDS_RETCODE_OK)
-            {
-              cout << "ERROR writing symbol <"
-                  << key
-                  << "> - iteration <"
-                  << new_key.iteration
-                  << ">"
-                  << endl;
-            }
-        }
-      cout << "Sender: Written samples with symbol <"
-            << key
-            << "> and iteration <"
-            << last_iteration_ + 1
-            << "> through <"
-            << new_key.iteration
-            << ">"
-            << endl;
-    }
-  ++run_;
-  last_iteration_ = number_of_iterations_ * run_;
-}
-
-int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
-{
-    DDS_ReturnCode_t    retcode;
-    DDSTopic*           topic = 0;
-    DDSDataWriter*      data_writer = 0;
-    DDSPublisher*       publisher = 0;
-    int                 main_result = 1; /* error by default */
-
-//     NDDS_Config_LogVerbosity n_verbosity =
-//       static_cast <NDDS_Config_LogVerbosity> (3);
-//     NDDSConfigLogger::get_instance()->set_verbosity (n_verbosity);
-    const ACE_TCHAR * env_domain_id = 0;
-    if (argc > 1)
-      {
-        env_domain_id = argv[1];
-      }
-    if (!env_domain_id)
-      {
-        printf ("Environment variable DEFAULT_DOMAIN_ID not set "
-                "=> setting it to 2\n");
-        env_domain_id = "2";
-      }
-    else
-      printf ("Domain ID set to %s\n", env_domain_id);
-
-    const int domain_id = ACE_OS::atoi (env_domain_id);
-
-    DDSDomainParticipant *participant = DDSDomainParticipantFactory::get_instance()->
-        create_participant_with_profile (domain_id,    /* Domain ID */
-                                         LIBRARY_NAME, /* QoS */
-                                         PROFILE_NAME,
-                                         0,            /* Listener */
-                                         DDS_STATUS_MASK_NONE);
-    if (!participant) {
-      cerr << "SENDER: Error creating participant" << endl;
-      goto clean_exit;
-    }
-
-    retcode = QueryConditionTestTypeSupport::register_type(
-      participant, QueryConditionTestTypeSupport::get_type_name ());
-
-    if (retcode != DDS_RETCODE_OK) {
-      cerr << "SENDER: Error registering type" << endl;
-      goto clean_exit;
-    }
-
-    topic = participant->create_topic_with_profile (
-                                      "QC",                   /* Topic name*/
-                                      QueryConditionTestTypeSupport::get_type_name (), /* Type name */
-                                      LIBRARY_NAME,       /* QoS */
-                                      PROFILE_NAME,
-                                      0,                  /* Listener  */
-                                      DDS_STATUS_MASK_NONE);
-    if (!topic) {
-      cerr << "SENDER: Error creating topic" << endl;
-      goto clean_exit;
-    }
-
-    publisher = participant->create_publisher_with_profile (LIBRARY_NAME,
-                                                            PROFILE_NAME,
-                                                            0,
-                                                            0);
-    if (!publisher) {
-      cerr << "SENDER: Error creating publisher" << endl;
-      goto clean_exit;
-    }
-
-    data_writer = publisher->create_datawriter_with_profile (
-                                               topic,
-                                               LIBRARY_NAME, /* QoS */
-                                               PROFILE_NAME,
-                                               0,            /* Listener */
-                                               DDS_STATUS_MASK_NONE);
-    if (!data_writer) {
-      cerr << "SENDER: Error creating data writer" << endl;
-      goto clean_exit;
-    }
-
-    write (data_writer);
-    sleep_now (8);
-    write (data_writer);
-    sleep_now (8);
-    write (data_writer);
-    sleep_now (30);
-
-    main_result = 0;
-clean_exit:
-    cout << "SENDER: Exiting ..." << endl;
-    if (participant) {
-        retcode = participant->delete_contained_entities();
-        if (retcode != DDS_RETCODE_OK) {
-            main_result = 1;
-        }
-        retcode = DDSDomainParticipantFactory::get_instance()->
-                        delete_participant(participant);
-        if (retcode != DDS_RETCODE_OK) {
-            main_result = 1;
-        }
-    }
-    DDSDomainParticipantFactory::finalize_instance ();
-    return main_result;
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/README b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/README
deleted file mode 100644
index b276b44a76f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/README
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-This is a plain DDS test, which test the use of 2 different query conditions, followed through a
-readcondition.
-
-Use a sample with {
-  string symbol; //@key
-  long iteration;
-}
-
-The sender writes samples with symbol <KEY_1> and <KEY_2> and iteration <1> through <3>
-The  receiver uses a querycondition with 'iteration > 1 AND iteration < 3' and use a
-read_w_condition with this querycondition.
-
-What we expect is that the receiver receives two samples (key_1 and key_2) with iteration 2.
-
-Next, the sender writes samples with symbol <KEY_1> and <KEY_2> and iteration <4> through <6>
-The  receiver changes the querycondition with 'iteration > 4 AND iteration < 6' and use a
-read_w_condition with this querycondition.
-
-What we expect is that the receiver receives two samples (key_1 and key_2) with iteration 5.
-
-Next, the sender writes samples with symbol <KEY_1> and <KEY_2> and iteration <7> through <9>
-The receiver deletes the query condition and creates the next  readcondition:
-  "DDS_NOT_READ_SAMPLE_STATE,DDS_NEW_VIEW_STATE | DDS_NOT_NEW_VIEW_STATE,DDS_ALIVE_INSTANCE_STATE | DDS_NOT_ALIVE_INSTANCE_STATE"
-and uses a read_w_condition with this readcondition and number of samples = DDS_LENGTH_UNLIMITED.
-
-(This test (QueryCondition/DDS) differs with the test QueryCondition/DDS_OneByOne that the DDS_OneByOne test does use a loop with
-read_w_condition with this readcondition and number of samples = 1.)
-
-
-What we expect is that the receiver receives samples (key_1 and key_2) with iterations between 1 and 9, except 2 and 5 which
-are already received before.
-
-Next we check the number of samples in DDS with a plain read.
-What we expect is that the receiver receives all 18 samples.
-
-
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index d061e075aae..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-Description
-XML QoS Profile
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5c/scripts/../resource/rtiddsgen/../qos_profiles_4.5c/schema/rti_dds_qos_profiles.xsd"
-     version="4.5c">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="QueryCondition_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="QueryConditionProfile" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>10</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/run_test.pl
deleted file mode 100755
index a24f5ff02ac..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/run_test.pl
+++ /dev/null
@@ -1,31 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$tg_sender = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-$tg_receiver = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-
-$domain_id = "$ENV{'DDS4CCM_DEFAULT_DOMAIN_ID'}";
-
-print "Start receiver\n";
-$R = $tg_receiver->CreateProcess ("./DDS_receiver", "$domain_id");
-$R->Spawn();
-
-sleep (1);
-
-print "Start sender\n";
-$S = $tg_sender->CreateProcess ("./DDS_Sender", "$domain_id");
-$S->Spawn ();
-
-
-sleep (90);
-
-$R->Kill ();
-$S->Kill ();
-
-exit 0;
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/Base/Base_ObO.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/Base/Base_ObO.idl
deleted file mode 100644
index 57e69fd440c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/Base/Base_ObO.idl
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * @file Base_ObO.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef BASE_OBO_IDL_
-#define BASE_OBO_IDL_
-
-struct QueryConditionTest {
-  string symbol; //@key
-  long iteration;
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/Base/Base_ObO.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/Base/Base_ObO.mpc
deleted file mode 100644
index 89919baf0de..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/Base/Base_ObO.mpc
+++ /dev/null
@@ -1,13 +0,0 @@
-project(Base_obo_stub) : ndds_ts_defaults, nddslib {
-  sharedname = Base_obo_stub
-  dynamicflags += NDDS_USER_DLL_EXPORT
-  libout = ../descriptors
-
-  NDDSTypeSupport_Files {
-    Base_ObO.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/DDS_ObO_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/DDS_ObO_Receiver.mpc
deleted file mode 100644
index e42dd1dad99..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/DDS_ObO_Receiver.mpc
+++ /dev/null
@@ -1,19 +0,0 @@
-project(*qc_receiver) : aceexe, nddslib, ndds_ts_defaults {
-  exename = DDS_ObO_receiver
-  after += Base_obo_stub
-
-  includes += ../Base
-
-  libs += Base_obo_stub
-  libpaths += ../descriptors
-
-  exeout += ../descriptors
-
-  Source_Files {
-    ObO_Receiver.cpp
-  }
-
-  Header_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/ObO_Receiver.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/ObO_Receiver.cpp
deleted file mode 100644
index e2e21d90d6b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/ObO_Receiver.cpp
+++ /dev/null
@@ -1,432 +0,0 @@
-#include <stdio.h>
-#include <iostream>
-
-using namespace std;
-
-#include "ace/OS_main.h"
-#include "ace/OS_NS_stdlib.h"
-
-#include "Base_ObO.h"
-#include "Base_ObOSupport.h"
-
-#define LIBRARY_NAME  "QueryCondition_Library"
-#define PROFILE_NAME  "QueryConditionProfile"
-
-bool shutdown_flag = false;
-long num_samples = 0;
-long received_samples = 0;
-long expected_samples_run1 = 1 * 2;    //only sample 2 should be received of 2 keys
-long expected_samples_run2 = 1 * 2;   //only sample 5 should be received o 2 keys
-long expected_samples_run3 = (9 - 2) * 2; //all samples 1-9 except sample 2 and 5 of both keys.
-
-DDSWaitSet* ws_ = new DDSWaitSet ();
-DDS_Duration_t dur_ = {9, 0};
-
-void sleep_now (int sleeptime)
-{
-#ifdef RTI_WIN32
-        Sleep(sleeptime * 1000);
-#else
-        sleep(sleeptime);
-#endif
-}
-
-
-void check_iter (const QueryConditionTest & sample,
-                   const DDS_SampleInfo & readinfo,
-                   const int & run)
-{
-  bool error = false;
-  if (run == 1)
-    {
-      //only sample 2 should be received
-      error = sample.iteration <= 1 && sample.iteration >= 3;
-    }
-  else if (run == 2)
-    {
-      //only samples 5 should be received
-      error = sample.iteration <= 4 && sample.iteration >= 6;
-    }
-  else if (run == 3)
-    {
-      //all other unread samples.
-      error = sample.iteration == 2;
-      error |= sample.iteration ==5;
-    }
-
-  error
-    ?
-    cerr << "ERROR Received: key <"
-        << sample.symbol
-        << "> - iteration <"
-        << sample.iteration
-        << ">"
-        << endl
-    :
-    cout << "Received: key <"
-        << sample.symbol
-        << "> - iteration <"
-        << sample.iteration
-        << "> - instance status <"
-        << readinfo.instance_state
-        << "> - view status <"
-        << readinfo.view_state
-        << "> - sample status <"
-        << readinfo.sample_state
-        << ">"
-        << endl;
-}
-
-
-void read (DDSDataReader * dr,
-           DDSQueryCondition * qc,
-           DDSReadCondition * rc,
-           const int & run)
-{
-  QueryConditionTestDataReader* typed_dr = QueryConditionTestDataReader::narrow (dr);
-
-  DDSConditionSeq cond;
-
-  if (ws_->wait (cond, dur_) == DDS_RETCODE_TIMEOUT)
-    {
-      cerr << "ERROR: wait timed out" << endl;
-    }
-  else
-    {
-      //wait a moment to allow DDS to write all samples we need here...
-      QueryConditionTestSeq data;
-      DDS_SampleInfoSeq     info_seq;
-      sleep_now (3);
-      for (DDS_Long i = 0; i < cond.length (); ++i)
-        {
-          if (run == 3)
-            {
-              sleep_now (10);
-              if (cond[i] == rc)
-                {
-
-                // *************** read one by one : max_number of samples = 1 ************
-                  int loop = 0;
-                  cout << "CHECKING..... SAMPLES with read_w_condition with readcondition:" << endl;
-
-                  received_samples = 0;
-
-                  while (loop  < 30)
-                    {
-                      DDS_ReturnCode_t retcode = typed_dr->read_w_condition (data,
-                                                            info_seq,
-                                                            1,
-                                                            rc);
-                      loop ++;
-                      if (retcode == 0)
-                        {
-                          for (DDS_Long y = 0; y < data.length (); ++y)
-                            {
-                              if (info_seq[y].valid_data)
-                                {
-                                  check_iter (data[y], info_seq[y], run);
-                                  received_samples ++;
-                                }
-                            }
-                        }
-                      typed_dr->return_loan (data, info_seq);
-
-                    }
-                  // *************** end read one by one
-                  if (received_samples !=  expected_samples_run3)
-                    {
-                      cerr << "ERROR: RUN 3 UNEXPECTED NUMBER OF SAMPLES RECEIVED : "
-                           << "with read_w_condition and read condition, expected < "
-                           <<  expected_samples_run3 << "> - received <"
-                           << received_samples << ">" << endl;
-                    }
-                  // check readcondition
-                  //DDS_SampleStateMask sample = rc->get_sample_state_mask ();
-                  //DDS_ViewStateMask view = rc->get_view_state_mask ();
-                  //DDS_InstanceStateMask instance = rc->get_instance_state_mask ();
-                  //::printf("************sample_state %ld, view_state %ld instance_state %ld\n",
-                  //                             (long)sample, (long)view, (long)instance);
-                }
-              else
-                {
-                  cerr << "ERROR: Should be woken up on ReadCondition" << endl;
-                }
-            }
-          else   // run 1 and 2
-            {
-              if (cond[i] == qc)
-                {
-                  cout << "CHECKING..... SAMPLES with read_w_condition with querycondition:" << endl;
-                  received_samples = 0;
-                  typed_dr->read_w_condition (data,
-                                              info_seq,
-                                              DDS_LENGTH_UNLIMITED,
-                                              qc);
-
-                  for (DDS_Long i = 0; i < data.length (); ++i)
-                    {
-                      if (info_seq[i].valid_data)
-                        {
-                          check_iter (data[i], info_seq[i], run);
-                          received_samples ++;
-                        }
-                    }
-                  typed_dr->return_loan (data, info_seq);
-                  if (run == 1)
-                    {
-                      if (received_samples !=  expected_samples_run1)
-                        {
-                          cerr << "ERROR: run  1 unexpected number of samples received : "
-                          << "expected < "
-                          <<  expected_samples_run1 << "> - received <"
-                          << received_samples << ">" << endl;
-                        }
-                    }
-                  else
-                    {
-                      if (received_samples !=  expected_samples_run2)
-                        {
-                           cerr << "ERROR: run  2 unexpected number of samples received : "
-                           << "expected < "
-                           <<  expected_samples_run2 << "> - received <"
-                           << received_samples << ">" << endl;
-                        }
-                    }
-                }
-              else
-                {
-                  cerr << "ERROR: Should be woken up on QueryCondition" << endl;
-                }
-            }
-        }
-    }
-
-
-  //check after run 3 if all samples are still available.
-  if (run == 3)
-    {
-      QueryConditionTestSeq data;
-      DDS_SampleInfoSeq     info_seq;
-      sleep_now (3);
-      typed_dr->read (data,
-                      info_seq,
-                      DDS_LENGTH_UNLIMITED);
-      cout << "\nCHECKING..... TOTAL NUMBER OF SAMPLES IN DDS with a read : <"
-            << data.length ()
-            << ">"
-            << endl;
-      for (DDS_Long i = 0; i < data.length (); ++i)
-        {
-          cout << "Received: key <"
-              << data[i].symbol
-              << "> - iteration <"
-              << data[i].iteration
-              << "> - instance status <"
-              << info_seq[i].instance_state
-              << "> - view status <"
-              << info_seq[i].view_state
-              << "> - sample status <"
-              << info_seq[i].sample_state
-              << ">"
-              << endl;
-        }
-      if (data.length () != 18)
-        {
-          cerr << "ERROR: unexpected number of samples received : "
-          << "expected <18> - received <"
-          << data.length () << ">" << endl;
-        }
-      typed_dr->return_loan (data, info_seq);
-    }
-    sleep_now (5);
-}
-
-int clean_up (DDSDomainParticipant * participant)
-{
-  DDS_ReturnCode_t    retcode = DDS_RETCODE_OK;
-  int main_result = 0;
-
-  cout << "RECEIVER: Exiting ..." << endl;
-  if (participant) {
-    retcode = participant->delete_contained_entities();
-    if (retcode != DDS_RETCODE_OK) {
-      main_result = 1;
-    }
-    retcode = DDSDomainParticipantFactory::get_instance()->
-      delete_participant(participant);
-    if (retcode != DDS_RETCODE_OK) {
-      main_result = 1;
-    }
-  }
-  delete ws_;
-  DDSDomainParticipantFactory::finalize_instance ();
-  return main_result;
-}
-
-int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
-{
-  DDSTopic*           topic = 0;
-  DDSDataReader*      data_reader = 0;
-  DDSSubscriber*      sub = 0;
-  DDS_ReturnCode_t    retcode = DDS_RETCODE_OK;
-  QueryConditionTestDataReader* typed_dr = 0;
-  DDSQueryCondition*  qc = 0;
-  DDSReadCondition*   rc = 0;
-  int run = 0;
-
-//     NDDS_Config_LogVerbosity n_verbosity =
-//       static_cast <NDDS_Config_LogVerbosity> (3);
-//     NDDSConfigLogger::get_instance()->set_verbosity (n_verbosity);
-
-  const ACE_TCHAR * env_domain_id = 0;
-  if (argc > 1)
-    {
-      env_domain_id = argv[1];
-    }
-  if (!env_domain_id)
-    {
-      printf ("Environment variable DEFAULT_DOMAIN_ID not set "
-              "=> setting it to 2\n");
-      env_domain_id = "2";
-    }
-  else
-    printf ("Domain ID set to %s\n", env_domain_id);
-
-  const int domain_id = ACE_OS::atoi (env_domain_id);
-
-  DDSDomainParticipant *participant = DDSDomainParticipantFactory::get_instance()->
-      create_participant_with_profile (domain_id,    /* Domain ID */
-                                       LIBRARY_NAME, /* QoS */
-                                       PROFILE_NAME,
-                                       0,            /* Listener */
-                                       DDS_STATUS_MASK_NONE);
-  if (!participant) {
-    cerr << "RECEIVER: Error creating participant" << endl;
-    return 1;
-  }
-
-  retcode = QueryConditionTestTypeSupport::register_type(
-    participant, QueryConditionTestTypeSupport::get_type_name ());
-
-  if (retcode != DDS_RETCODE_OK) {
-    cerr << "RECEIVER: Error registering type" << endl;
-    return clean_up (participant);
-  }
-
-  topic = participant->create_topic_with_profile (
-                                    "QC",                   /* Topic name*/
-                                    QueryConditionTestTypeSupport::get_type_name (), /* Type name */
-                                    LIBRARY_NAME,       /* QoS */
-                                    PROFILE_NAME,
-                                    0,                  /* Listener  */
-                                    DDS_STATUS_MASK_NONE);
-  if (!topic) {
-    cerr << "RECEIVER: Error creating topic" << endl;
-    return clean_up (participant);
-  }
-
-  sub = participant->create_subscriber_with_profile (LIBRARY_NAME,
-                                                     PROFILE_NAME,
-                                                     0,
-                                                     0);
-  if (!sub) {
-    cerr << "RECEIVER: Error creating subscriber" << endl;
-    return clean_up (participant);
-  }
-
-  data_reader = sub->create_datareader_with_profile (
-                                               topic,
-                                               LIBRARY_NAME, /* QoS */
-                                               PROFILE_NAME,
-                                               0,            /* Listener */
-                                               DDS_STATUS_MASK_NONE);
-  if (!data_reader) {
-    cerr << "RECEIVER: Error creating data reader" << endl;
-    return clean_up (participant);
-  }
-
-  typed_dr = QueryConditionTestDataReader::narrow (data_reader);
-
-  if (!typed_dr) {
-    cerr << "RECEIVER: Unable to cast to a type specific data reader" << endl;
-    return clean_up (participant);
-  }
-
-  const char* PARAMS_RUN_1[] = {"1", "3"};
-  DDS_StringSeq parameters_run_1;
-  parameters_run_1.from_array (PARAMS_RUN_1, 2);
-
-  qc = typed_dr->create_querycondition (
-                                DDS_NOT_READ_SAMPLE_STATE,
-                                DDS_NEW_VIEW_STATE | DDS_NOT_NEW_VIEW_STATE,
-                                DDS_ALIVE_INSTANCE_STATE | DDS_NOT_ALIVE_INSTANCE_STATE,
-                                "iteration > %0 AND iteration < %1",
-                                parameters_run_1);
-  if (!qc) {
-    cerr << "RECEIVER: Error creating query condition" << endl;
-    return clean_up (participant);
-  }
-  else
-    cout << "RECEIVER: query condition created : iteration > 1 AND iteration < 3" << endl;
-
-  ws_->attach_condition (qc);
-
-  cout << "RECEIVER: Expecting two samples (key_1 and key_2) with iteration 2." <<endl;
-
-  read (data_reader, qc, rc, ++run);
-
-  //Second run: change the parameters
-  if (qc)
-    {
-      const char* PARAMS_RUN_2[] = {"4", "6"};
-      DDS_StringSeq parameters_run_2;
-      parameters_run_2.from_array (PARAMS_RUN_2, 2);
-      if (qc->set_query_parameters (parameters_run_2) != DDS_RETCODE_OK)
-        {
-          cerr << "RECEIVER: Unable the set the new query parameters!!!" << endl;
-          return clean_up (participant);
-        }
-    }
-  cout << "RECEIVER: query condition changed : iteration > 4 AND iteration < 6" << endl;
-
-  cout << "RECEIVER: Expecting two samples (key_1 and key_2) with iterations 5" <<endl;
-
-  read (data_reader, qc, rc, ++run);
-  // Third run: Detach querycondition and create read condition instead.
-  // Remove the qc from the waitset and create a readcondition and start receiving
-  // samples
-  if (ws_->detach_condition (qc) != DDS_RETCODE_OK)
-    {
-      cerr << "RECEIVER: Error detaching query condition" << endl;
-      return clean_up (participant);
-    }
-  // Delete the query condition from the data reader
-  typed_dr->delete_readcondition (qc);
-  cout << "RECEIVER: query condition deleted" << endl;
-  cout << "RECEIVER: create read condition : DDS_NOT_READ_SAMPLE_STATE,"
-       << "DDS_NEW_VIEW_STATE | DDS_NOT_NEW_VIEW_STATE,"
-       << "DDS_ALIVE_INSTANCE_STATE | DDS_NOT_ALIVE_INSTANCE_STATE" << endl;
-
-  sleep_now(10);
-
-  rc = typed_dr->create_readcondition (
-                            DDS_NOT_READ_SAMPLE_STATE,
-                            DDS_NEW_VIEW_STATE | DDS_NOT_NEW_VIEW_STATE,
-                            DDS_ALIVE_INSTANCE_STATE | DDS_NOT_ALIVE_INSTANCE_STATE);
-  if (!rc) {
-    cerr << "RECEIVER: Error creating read condition" << endl;
-    return clean_up (participant);
-  }
-
-  if (ws_->attach_condition (rc) != DDS_RETCODE_OK)
-    {
-      cerr << "RECEIVER: Error attaching read condition" << endl;
-      return clean_up (participant);
-    }
-
-  cout << "RECEIVER: Expecting ALL UNREAD samples (key_1 and key_2) with iterations between 1 and 9, except 2 and 5" <<endl;
-
-  read (data_reader, qc, rc, ++run);
-
-  return clean_up (participant);
-}
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/DDS_ObO_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/DDS_ObO_Sender.mpc
deleted file mode 100644
index 1f88cb930a2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/DDS_ObO_Sender.mpc
+++ /dev/null
@@ -1,18 +0,0 @@
-project(*qc_sender) : aceexe, nddslib, ndds_ts_defaults {
-  exename = DDS_ObO_Sender
-  after += Base_obo_stub
-
-  includes += ../Base
-
-  exeout += ../descriptors
-  libs += Base_obo_stub
-  libpaths += ../descriptors
-
-  Source_Files {
-    ObO_Sender.cpp
-  }
-
-  Header_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/ObO_Sender.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/ObO_Sender.cpp
deleted file mode 100644
index b4fd5eae5e3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/ObO_Sender.cpp
+++ /dev/null
@@ -1,172 +0,0 @@
-#include <stdio.h>
-#include <iostream>
-
-using namespace std;
-
-#include "ace/OS_main.h"
-#include "ace/OS_NS_stdlib.h"
-
-#include "Base_ObO.h"
-#include "Base_ObOSupport.h"
-
-#define LIBRARY_NAME  "QueryCondition_Library"
-#define PROFILE_NAME  "QueryConditionProfile"
-
-const int number_of_iterations_ = 3;
-
-const int number_of_keys_ = 2;
-
-int last_iteration_ = 0;
-int run_ = 0;
-
-void sleep_now (int sleeptime)
-{
-#ifdef RTI_WIN32
-        Sleep(sleeptime * 1000);
-#else
-        sleep(sleeptime);
-#endif
-}
-
-void write (DDSDataWriter * writer)
-{
-  QueryConditionTestDataWriter* typed_writer = 0;
-  typed_writer = QueryConditionTestDataWriter::narrow (writer);
-  for (int iter_key = 1; iter_key < number_of_keys_ + 1; ++iter_key)
-    {
-      char key[7];
-      QueryConditionTest new_key;
-      sprintf (key, "KEY_%d", iter_key);
-      new_key.symbol = key;
-      for (int iter = 1;
-          iter < number_of_iterations_ + 1;
-          ++iter)
-        {
-          new_key.iteration = iter + last_iteration_;
-          DDS_ReturnCode_t retcode = typed_writer->write (new_key, DDS_HANDLE_NIL);
-          if (retcode != DDS_RETCODE_OK)
-            {
-              cout << "ERROR writing symbol <"
-                  << key
-                  << "> - iteration <"
-                  << new_key.iteration
-                  << ">"
-                  << endl;
-            }
-         }
-      cout << "Sender: Written samples with symbol <"
-            << key
-            << "> and iteration <"
-            << last_iteration_ + 1
-            << "> through <"
-            << new_key.iteration
-            << ">"
-            << endl;
-    }
-  ++run_;
-  last_iteration_ = number_of_iterations_ * run_;
-}
-
-int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
-{
-    DDS_ReturnCode_t    retcode;
-    DDSTopic*           topic = 0;
-    DDSDataWriter*      data_writer = 0;
-    DDSPublisher*       publisher = 0;
-    int                 main_result = 1; /* error by default */
-
-//     NDDS_Config_LogVerbosity n_verbosity =
-//       static_cast <NDDS_Config_LogVerbosity> (3);
-//     NDDSConfigLogger::get_instance()->set_verbosity (n_verbosity);
-    const ACE_TCHAR * env_domain_id = 0;
-    if (argc > 1)
-      {
-        env_domain_id = argv[1];
-      }
-    if (!env_domain_id)
-      {
-        printf ("Environment variable DEFAULT_DOMAIN_ID not set "
-                "=> setting it to 2\n");
-        env_domain_id = "2";
-      }
-    else
-      printf ("Domain ID set to %s\n", env_domain_id);
-
-    const int domain_id = ACE_OS::atoi (env_domain_id);
-
-    DDSDomainParticipant *participant = DDSDomainParticipantFactory::get_instance()->
-        create_participant_with_profile (domain_id,    /* Domain ID */
-                                         LIBRARY_NAME, /* QoS */
-                                         PROFILE_NAME,
-                                         0,            /* Listener */
-                                         DDS_STATUS_MASK_NONE);
-    if (!participant) {
-      cerr << "SENDER: Error creating participant" << endl;
-      goto clean_exit;
-    }
-
-    retcode = QueryConditionTestTypeSupport::register_type(
-      participant, QueryConditionTestTypeSupport::get_type_name ());
-
-    if (retcode != DDS_RETCODE_OK) {
-      cerr << "SENDER: Error registering type" << endl;
-      goto clean_exit;
-    }
-
-    topic = participant->create_topic_with_profile (
-                                      "QC",                   /* Topic name*/
-                                      QueryConditionTestTypeSupport::get_type_name (), /* Type name */
-                                      LIBRARY_NAME,       /* QoS */
-                                      PROFILE_NAME,
-                                      0,                  /* Listener  */
-                                      DDS_STATUS_MASK_NONE);
-    if (!topic) {
-      cerr << "SENDER: Error creating topic" << endl;
-      goto clean_exit;
-    }
-
-    publisher = participant->create_publisher_with_profile (LIBRARY_NAME,
-                                                            PROFILE_NAME,
-                                                            0,
-                                                            0);
-    if (!publisher) {
-      cerr << "SENDER: Error creating publisher" << endl;
-      goto clean_exit;
-    }
-
-    data_writer = publisher->create_datawriter_with_profile (
-                                               topic,
-                                               LIBRARY_NAME, /* QoS */
-                                               PROFILE_NAME,
-                                               0,            /* Listener */
-                                               DDS_STATUS_MASK_NONE);
-    if (!data_writer) {
-      cerr << "SENDER: Error creating data writer" << endl;
-      goto clean_exit;
-    }
-
-    write (data_writer);
-    sleep_now (8);
-    write (data_writer);
-    sleep_now (8);
-    write (data_writer);
-    sleep_now (30);
-
-    main_result = 0;
-clean_exit:
-    cout << "SENDER: Exiting ..." << endl;
-    if (participant) {
-        retcode = participant->delete_contained_entities();
-        if (retcode != DDS_RETCODE_OK) {
-            main_result = 1;
-        }
-        retcode = DDSDomainParticipantFactory::get_instance()->
-                        delete_participant(participant);
-        if (retcode != DDS_RETCODE_OK) {
-            main_result = 1;
-        }
-    }
-    DDSDomainParticipantFactory::finalize_instance ();
-    return main_result;
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/README b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/README
deleted file mode 100644
index ff6cdedb542..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/README
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-This is a plain DDS test, which test the use of 2 different query conditions, followed through a
-readcondition.
-
-Use a sample with {
-  string symbol; //@key
-  long iteration;
-}
-
-The sender writes samples with symbol <KEY_1> and <KEY_2> and iteration <1> through <3>
-The  receiver uses a querycondition with 'iteration > 1 AND iteration < 3' and use a
-read_w_condition with this querycondition.
-
-What we expect is that the receiver receives two samples (key_1 and key_2) with iteration 2.
-
-Next, the sender writes samples with symbol <KEY_1> and <KEY_2> and iteration <4> through <6>
-The  receiver changes the querycondition with 'iteration > 4 AND iteration < 6' and use a
-read_w_condition with this querycondition.
-
-What we expect is that the receiver receives two samples (key_1 and key_2) with iteration 5.
-
-Next, the sender writes samples with symbol <KEY_1> and <KEY_2> and iteration <7> through <9>
-The receiver deletes the query condition and creates the next readcondition:
-  "DDS_NOT_READ_SAMPLE_STATE,DDS_NEW_VIEW_STATE | DDS_NOT_NEW_VIEW_STATE,DDS_ALIVE_INSTANCE_STATE | DDS_NOT_ALIVE_INSTANCE_STATE"
-and uses, in a loop, a read_w_condition with this readcondition and number of samples = 1.
-
-(This test (QueryCondition/DDS_OneByOne) differs with the test QueryCondition/DDS that the DDS test doesn't use a loop, but a
-read_w_condition with this readcondition and number of samples = DDS_LENGTH_UNLIMITED.)
-
-
-What we expect is that the receiver receives samples (key_1 and key_2) with iterations between 1 and 9, except 2 and 5 which
-are already received before.
-
-Next we check the number of samples in DDS with a plain read.
-What we expect is that the receiver receives all 18 samples.
-
-
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index d061e075aae..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-Description
-XML QoS Profile
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5c/scripts/../resource/rtiddsgen/../qos_profiles_4.5c/schema/rti_dds_qos_profiles.xsd"
-     version="4.5c">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="QueryCondition_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="QueryConditionProfile" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>10</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/descriptors/run_test.pl
deleted file mode 100755
index 10b65e2a7e6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/descriptors/run_test.pl
+++ /dev/null
@@ -1,31 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$tg_sender = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-$tg_receiver = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-
-$domain_id = "$ENV{'DDS4CCM_DEFAULT_DOMAIN_ID'}";
-
-print "Start receiver\n";
-$R = $tg_receiver->CreateProcess ("./DDS_ObO_receiver", "$domain_id");
-$R->Spawn();
-
-sleep (1);
-
-print "Start sender\n";
-$S = $tg_sender->CreateProcess ("./DDS_ObO_Sender", "$domain_id");
-$S->Spawn ();
-
-
-sleep (90);
-
-$R->Kill ();
-$S->Kill ();
-
-exit 0;
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.idl
deleted file mode 100644
index fd242249ca4..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file Different_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DIFFERENT_TEST_BASE_IDL
-#define DIFFERENT_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/Different_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/Different_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "QueryConditionTest"
-#pragma DCPS_DATA_KEY "QueryConditionTest symbol"
-
-struct QueryConditionTest {
-  string symbol; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<QueryConditionTest> QueryConditionTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.mpc
deleted file mode 100644
index e547afe5044..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project(QC_Different_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = QC_Different_Test_Base_stub
-  dynamicflags += QUERY_CONDITION_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=QUERY_CONDITION_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=Different_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    Different_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=QUERY_CONDITION_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    Different_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.idl
deleted file mode 100644
index ac2292fbeff..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file Different_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef QUERY_CONDITION_TEST_CONNECTOR_IDL_
-#define QUERY_CONDITION_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Different_Test_Base.idl"
-
-#pragma ciao lem "Connector/Different_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/Different_Test_BaseTypeSupport.idl"
-#endif
-
-module Different_Test
-{
-  module ::CCM_DDS::Typed < ::QueryConditionTest, ::QueryConditionTestSeq> QueryConditionTestConnector;
-};
-
-#endif /* QUERY_CONDITION_TEST_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.mpc
deleted file mode 100644
index 9ec837bc806..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.mpc
+++ /dev/null
@@ -1,146 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p Different_Test_Base -l .. -o ../lib -u DDS Different_Test_Connector"
-
-project(QC_Different_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen QC_Different_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=QUERY_CONDITION_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=Different_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=QUERY_CONDITION_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=Different_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=QUERY_CONDITION_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=Different_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=QUERY_CONDITION_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Different_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Different_Test_Connector.idl
-  }
-}
-
-project(QC_Different_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += QC_Different_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=QUERY_CONDITION_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=Different_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    Different_Test_ConnectorE.idl
-  }
-}
-
-project(QC_Different_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += QC_Different_Test_Connector_lem_gen QC_Different_Test_Connector_stub \
-           QC_Different_Test_Base_stub
-  libs  += QC_Different_Test_Base_stub QC_Different_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = QC_Different_Test_Connector_lem_stub
-  dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Different_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    Different_Test_ConnectorEC.h
-    Different_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Different_Test_ConnectorEC.inl
-  }
-}
-
-project(QC_Different_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += QC_Different_Test_Connector_idl_gen QC_Different_Test_Base_stub
-  libs  += QC_Different_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = QC_Different_Test_Connector_stub
-  dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Different_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    Different_Test_ConnectorC.h
-    Different_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    Different_Test_ConnectorC.inl
-  }
-}
-
-project(QC_Different_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += QC_Different_Test_Connector_lem_stub QC_Different_Test_Connector_stub \
-             QC_Different_Test_Base_stub
-  sharedname = QC_Different_Test_Connector_exec
-  libs += QC_Different_Test_Connector_stub QC_Different_Test_Connector_lem_stub \
-          QC_Different_Test_Base_stub QC_Different_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Different_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    Different_Test_Connector_conn.h
-    Different_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(QC_Different_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += QC_Different_Test_Connector_lem_stub QC_Different_Test_Connector_exec \
-                QC_Different_Test_Connector_stub
-  sharedname  = QC_Different_Test_Connector_svnt
-  libs       += QC_Different_Test_Connector_stub \
-                QC_Different_Test_Connector_lem_stub  \
-                QC_Different_Test_Base_stub \
-                QC_Different_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Different_Test_ConnectorS.cpp
-    Different_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    Different_Test_ConnectorS.h
-    Different_Test_Connector_svnt.h
-    Different_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/README b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/README
deleted file mode 100644
index 7fb894432cc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/README
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-Test whether Querycondition are NOT shared between two extended ports.
-
-The receiver uses two extend ports of the DDS4CCM State connector:
-1. the DDS_Get port
-2. the DDS_Read port
-
-The Queryfilter on the reader interface of the DDS_Get extended port is different
-from the Queryfilter on the reader interface of the DDS_Read extended port.
-This test checks whether that's the case by checking the query filter expressions.
-Besides that, it verifies that the received data is correct according to the filter
-expression and parameters.
-
-The sender sends 15 samples which are kept in DDS (KEEP_ALL Qos) with iteration 1 to 15.
-The Getter extended port should receive iterations between 6 and 9
-(thus samples with iteration 7 and 8).
-The Reader should receive the other samples (and not samples with iteration 7 and 8).
-
-There's one DDS4CCM connector instance connected to the Receiver.
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver.idl
deleted file mode 100644
index 3c2cac4f3dd..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver.idl
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/Different_Test_Connector.idl"
-
-module Different_Test
-{
-  component Receiver
-  {
-    port QueryConditionTestConnector::DDS_Get get_port;
-    port QueryConditionTestConnector::DDS_Read read_port;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver.mpc
deleted file mode 100644
index 263e0419596..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver.mpc
+++ /dev/null
@@ -1,146 +0,0 @@
-project(QC_Different_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += QC_Different_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h \
-              -I..
-
-  IDL_Files {
-    Different_Test_Receiver.idl
-  }
-}
-
-project(QC_Different_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += QC_Different_Test_Receiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    Different_Test_ReceiverE.idl
-  }
-}
-
-project(QC_Different_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += QC_Different_Test_Receiver_lem_gen QC_Different_Test_Receiver_stub  \
-           QC_Different_Test_Connector_stub QC_Different_Test_Base_stub
-  libs  +=  Receiver_stub QC_Different_Test_Connector_stub \
-            QC_Different_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Different_Test_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    Different_Test_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Different_Test_ReceiverEC.inl
-  }
-}
-
-project(QC_Different_Test_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += QC_Different_Test_Receiver_idl_gen  QC_Different_Test_Connector_stub \
-           QC_Different_Test_Base_stub QC_Different_Test_Connector_lem_gen
-  libs  += QC_Different_Test_Connector_stub QC_Different_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Different_Test_ReceiverC.cpp
-  }
-
-  Header_Files {
-    Different_Test_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    Different_Test_ReceiverC.inl
-  }
-}
-
-project(QC_Different_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += QC_Different_Test_Receiver_lem_stub QC_Different_Test_Receiver_stub \
-             QC_Different_Test_Base_stub QC_Different_Test_Connector_stub \
-             QC_Different_Test_Connector_lem_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub QC_Different_Test_Base_stub \
-          QC_Different_Test_Connector_stub QC_Different_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL READER_STARTER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Different_Test_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    Different_Test_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(QC_Different_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   QC_Different_Test_Receiver_lem_stub QC_Different_Test_Base_stub \
-                  QC_Different_Test_Connector_stub QC_Different_Test_Connector_svnt \
-                  QC_Different_Test_Receiver_exec QC_Different_Test_Connector_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub QC_Different_Test_Base_stub \
-                QC_Different_Test_Connector_stub QC_Different_Test_Connector_svnt \
-                Receiver_exec QC_Different_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Different_Test_ReceiverS.cpp
-    Different_Test_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    Different_Test_ReceiverS.h
-    Different_Test_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.cpp
deleted file mode 100644
index 78b7c696c59..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.cpp
+++ /dev/null
@@ -1,661 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "Different_Test_Receiver_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-#define QUERY_GETTER "( (iteration > %0) AND (iteration < %1) )"
-#define QUERY_READER "( (iteration < %0) OR (iteration > %1) )"
-
-#define MIN_ITERATION "6"
-#define MAX_ITERATION "9"
-
-namespace CIAO_Different_Test_Receiver_Impl
-{
-  /**
-   * Read action Generator
-   */
-
-  read_action_Generator::read_action_Generator (Receiver_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  read_action_Generator::~read_action_Generator ()
-  {
-  }
-
-  int
-  read_action_Generator::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Checking if last sample "
-                          "is available in DDS...\n"));
-    if (this->callback_.check_last ())
-      {
-        this->callback_.run ();
-      }
-    return 0;
-  }
-
-  /**
-   * Facet Executor Implementation Class: get_port_status_exec_i
-   */
-
-  get_port_status_exec_i::get_port_status_exec_i (
-        ::Different_Test::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::Different_Test::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  get_port_status_exec_i::~get_port_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  get_port_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  get_port_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: read_port_status_exec_i
-   */
-
-  read_port_status_exec_i::read_port_status_exec_i (
-        ::Different_Test::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::Different_Test::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  read_port_status_exec_i::~read_port_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  read_port_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  read_port_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : iterations_ (15)
-      , keys_ (5)
-      , ticker_ (0)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Receiver_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  bool
-  Receiver_exec_i::check_last ()
-  {
-    ::Different_Test::QueryConditionTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_get_port_data ();
-
-    try
-      {
-        QueryConditionTest queryfiltertest_info;
-        ::CCM_DDS::ReadInfo readinfo;
-        char key[10];
-        ACE_OS::sprintf (key, "KEY_%d", this->keys_);
-        queryfiltertest_info.symbol = CORBA::string_dup (key);
-        reader->read_one_last (
-                queryfiltertest_info,
-                readinfo,
-                ::DDS::HANDLE_NIL);
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_last - "
-                              "last iteration <%d> - <%d>\n",
-                               queryfiltertest_info.iteration,
-                               this->iterations_));
-        return queryfiltertest_info.iteration == this->iterations_;
-      }
-    catch (const ::CCM_DDS::InternalError &)
-      {
-      }
-    catch (const ::CCM_DDS::NonExistent &)
-      {
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::check_last: "
-                              "ERROR: Unexpected exception caught\n"));
-      }
-    return false;
-  }
-
-  // Supported operations and attributes.
-  void
-  Receiver_exec_i::check_iter_reader (const QueryConditionTest & sample)
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ ALL : ")
-        ACE_TEXT ("sample received for <%C>: iteration <%u>\n"),
-        sample.symbol.in (),
-        sample.iteration));
-    if (sample.iteration > ACE_OS::atoi (MIN_ITERATION) &&
-        sample.iteration < ACE_OS::atoi (MAX_ITERATION))
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ ALL : ")
-                              ACE_TEXT ("Didn't expect samples between ")
-                              ACE_TEXT ("%C and %C\n"),
-                              MIN_ITERATION,
-                              MAX_ITERATION));
-      }
-  }
-
-  bool
-  Receiver_exec_i::check_iter_getter (const QueryConditionTest & sample)
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("GET ALL : ")
-        ACE_TEXT ("sample received for <%C>: iteration <%u>\n"),
-        sample.symbol.in (),
-        sample.iteration));
-    if (sample.iteration <= ACE_OS::atoi (MIN_ITERATION))
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: GET ALL: "
-                              "Didn't expect samples with iteration %C "
-                              "<= %C\n", sample.iteration,
-                              MIN_ITERATION));
-        return false;
-      }
-    if (sample.iteration > ACE_OS::atoi (MAX_ITERATION))
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: GET ALL: "
-                              "Didn't expect samples with iteration %C"
-                              "> %C\n", sample.iteration,
-                              MAX_ITERATION));
-        return false;
-      }
-    return true;
-  }
-
-
-  void
-  Receiver_exec_i::read_all (void)
-  {
-    ::Different_Test::QueryConditionTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_read_port_data ();
-
-    QueryConditionTestSeq queryfiltertest_info_seq;
-    ::CCM_DDS::ReadInfoSeq readinfo_seq;
-    reader->read_all (queryfiltertest_info_seq, readinfo_seq);
-    if (queryfiltertest_info_seq.length () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::read_all : "
-                              "No samples available in Reader!\n"));
-      }
-    for (CORBA::ULong it = 0; it < queryfiltertest_info_seq.length (); ++it)
-      {
-        this->check_iter_reader (queryfiltertest_info_seq[it]);
-      }
-  }
-
-  void
-  Receiver_exec_i::get_all (void)
-  {
-    ::Different_Test::QueryConditionTestConnector::Getter_var getter =
-      this->ciao_context_->get_connection_get_port_fresh_data ();
-
-    if (::CORBA::is_nil (getter.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_all - "
-                              "ERROR: No Getter\n"));
-      }
-    QueryConditionTest_var qf_info;
-    ::CCM_DDS::ReadInfo readinfo;
-    CORBA::Boolean result = getter->get_one (qf_info.out (), readinfo);
-    if (result)
-      {
-        if (!this->check_iter_getter (qf_info.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_all - "
-                                  "ERROR: got unexpected "
-                                  "sample, bailing out\n"));
-          }
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_all - "
-                              "ERROR: time out when retrieving "
-                              "first sample.\n"));
-      }
-    while (result)
-      {
-        result = getter->get_one (qf_info.out (), readinfo);
-        if (result)
-          {
-            if (!this->check_iter_getter (qf_info.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_all - "
-                                      "ERROR: got unexpected "
-                                      "sample, bailing out\n"));
-                break;
-              }
-          }
-      }
-  }
-
-  void
-  Receiver_exec_i::test_all ()
-  {
-    const char * test = "GET ALL";
-    try
-      {
-        get_all ();
-        test = "READ ALL";
-        read_all ();
-      }
-    catch (const CCM_DDS::NonExistent& ex)
-      {
-        for (CORBA::ULong i = 0; i < ex.indexes.length (); ++i)
-          {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ERROR %C: ")
-                  ACE_TEXT ("caught expected exception: index <%u>\n"),
-                  test,
-                  ex.indexes[i]));
-          }
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: %C: ")
-              ACE_TEXT ("caught InternalError exception: retval <%u>\n"),
-              test,
-              ex.error_code));
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception (test);
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Receiver_exec_i::test_all : Exception caught\n")));
-      }
-  }
-
-  void
-  Receiver_exec_i::check_filters (void)
-  {
-    ::Different_Test::QueryConditionTestConnector::Reader_var get_reader =
-      this->ciao_context_->get_connection_get_port_data ();
-    if (! ::CORBA::is_nil (get_reader.in ()))
-      {
-        this->check_filter (get_reader.in (), true);
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "Unable to retrieve pointer to the reader.\n"));
-      }
-
-    ::Different_Test::QueryConditionTestConnector::Reader_var read_reader =
-      this->ciao_context_->get_connection_read_port_data ();
-    if (! ::CORBA::is_nil (read_reader.in ()))
-      {
-        this->check_filter (read_reader.in (), false);
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "Unable to retrieve pointer to the reader.\n"));
-      }
-  }
-
-  void
-  Receiver_exec_i::check_filter (
-    ::Different_Test::QueryConditionTestConnector::Reader_ptr reader,
-    bool check_getter)
-  {
-    ::CCM_DDS::QueryFilter_var filter;
-    try
-      {
-        filter = reader->query ();
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - "
-                              "caught InternalError exception: retval <%u>\n",
-                              ex.error_code));
-        return;
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Receiver_exec_i::check_filter: ");
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - "
-                              "Exception caught\n"));
-        return;
-      }
-
-    //check query
-    bool error = false;
-
-    const char * query = "";
-    const char * port = "";
-    if (check_getter)
-      {
-        query = QUERY_GETTER;
-        port = "GETTER";
-      }
-    else
-      {
-        query = QUERY_READER;
-        port = "READER";
-      }
-
-    if (ACE_OS::strcmp (filter->expression, query) != 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter <%C> - "
-                              "Unexpected query when retrieving filter: "
-                              "expected <%C> - received <%C>\n",
-                              port, query, filter->expression.in ()));
-        error = true;
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_filter <%C> - "
-                              "Query expression seems correct : "
-                              "expected <%C> - received <%C>\n",
-                              port, query, filter->expression.in ()));
-      }
-    //check current parameters.
-    if (filter->parameters.length () != 2)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter <%C> - "
-                              "Unexpected number of parameters: "
-                              "expected <%d> - received <%d>\n",
-                              port, 2, filter->parameters.length ()));
-        error = true;
-      }
-
-    if (filter->parameters.length () >= 1)
-      {
-        if (ACE_OS::atoi (filter->parameters[0]) != ACE_OS::atoi(MIN_ITERATION))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter <%C> - "
-                                  "Unexpected param value: "
-                                  "expected <%d> - received <%C>\n",
-                                  port,
-                                  MIN_ITERATION,
-                                  filter->parameters[0].in ()));
-            error = true;
-          }
-      }
-    if (filter->parameters.length () >= 2)
-      {
-        if (ACE_OS::atoi (filter->parameters[1]) != ACE_OS::atoi (MAX_ITERATION))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter <%C> - "
-                                  "Unexpected query when retrieving filter: "
-                                  "expected <%d> - received <%C>\n",
-                                  port,
-                                  MAX_ITERATION,
-                                  filter->parameters[1].in ()));
-            error = true;
-          }
-      }
-    if (!error)
-      {
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_filter <%C> - "
-                              "Passed check_filter test.\n",
-                              port));
-      }
-  }
-
-  void
-  Receiver_exec_i::set_filters ()
-  {
-    ACE_DEBUG ((LM_DEBUG, "Set filters\n"));
-
-    try
-      {
-        ::Different_Test::QueryConditionTestConnector::Reader_var get_reader =
-          this->ciao_context_->get_connection_get_port_data ();
-
-        ::Different_Test::QueryConditionTestConnector::Reader_var read_reader =
-          this->ciao_context_->get_connection_read_port_data ();
-
-        ::CCM_DDS::QueryFilter get_filter;
-        get_filter.expression = CORBA::string_dup (QUERY_GETTER);
-        get_filter.parameters.length (2);
-        get_filter.parameters[0] = CORBA::string_dup (MIN_ITERATION);
-        get_filter.parameters[1] = CORBA::string_dup (MAX_ITERATION);
-        get_reader->query (get_filter);
-        ACE_DEBUG ((LM_DEBUG, "Filter set for the getter.\n"));
-
-
-        ::CCM_DDS::QueryFilter read_filter;
-        read_filter.expression = CORBA::string_dup (QUERY_READER);
-        read_filter.parameters.length (2);
-        read_filter.parameters[0] = CORBA::string_dup (MIN_ITERATION);
-        read_filter.parameters[1] = CORBA::string_dup (MAX_ITERATION);
-        read_reader->query (read_filter);
-        ACE_DEBUG ((LM_DEBUG, "Filter set for the reader.\n"));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::set_filters () - "
-                    "Unexpected exception caught.\n"));
-      }
-  }
-
-  void
-  Receiver_exec_i::start_read (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Start reading by starting a timer.\n"));
-
-    this->ticker_ = new read_action_Generator (*this);
-    if (this->reactor ()->schedule_timer (
-                                          this->ticker_,
-                                          0,
-                                          ACE_Time_Value(1, 0),
-                                          ACE_Time_Value(1, 0)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, "Unable to schedule Timer\n"));
-      }
-  }
-
-  void
-  Receiver_exec_i::run (void)
-  {
-    if (this->ticker_)
-      {
-        this->reactor ()->cancel_timer (this->ticker_);
-        delete this->ticker_;
-        this->ticker_ = 0;
-      }
-    this->test_all ();
-  }
-  void
-  Receiver_exec_i::iterations (::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  void
-  Receiver_exec_i::keys (::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-  // Component attributes and port operations.
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_get_port_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_get_port_status_.in ()))
-      {
-        get_port_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          get_port_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_get_port_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_get_port_status_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_read_port_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_read_port_status_.in ()))
-      {
-        read_port_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          read_port_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_read_port_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_read_port_status_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Different_Test::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    ::Different_Test::QueryConditionTestConnector::Getter_var getter =
-      this->ciao_context_->get_connection_get_port_fresh_data ();
-    DDS::Duration_t to;
-    to.sec = 5;
-    to.nanosec = 0;
-    if (! ::CORBA::is_nil (getter))
-      {
-        getter->time_out (to);
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Unable to set time out.\n"));
-      }
-
-    this->set_filters ();
-    this->check_filters ();
-    this->start_read ();
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    if (this->ticker_)
-      {
-        this->reactor ()->cancel_timer (this->ticker_);
-        delete this->ticker_;
-        this->ticker_ = 0;
-      }
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Different_Test_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.h
deleted file mode 100644
index 2f38be10194..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.h
+++ /dev/null
@@ -1,212 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_DIFFERENT_TEST_RECEIVER_EXEC_IK2VYJ_H_
-#define CIAO_DIFFERENT_TEST_RECEIVER_EXEC_IK2VYJ_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Different_Test_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_Different_Test_Receiver_Impl
-{
-  class Receiver_exec_i;
-
-  /**
-   * Read action generator
-   */
-
-  class read_action_Generator
-    : public ACE_Event_Handler
-  {
-  public:
-    read_action_Generator (Receiver_exec_i &callback);
-
-    ~read_action_Generator ();
-
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    Receiver_exec_i &callback_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: get_port_status_exec_i
-   */
-
-  class get_port_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    get_port_status_exec_i (
-      ::Different_Test::CCM_Receiver_Context_ptr ctx);
-    virtual ~get_port_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::Different_Test::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: read_port_status_exec_i
-   */
-
-  class read_port_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    read_port_status_exec_i (
-      ::Different_Test::CCM_Receiver_Context_ptr ctx);
-    virtual ~read_port_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::Different_Test::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_get_port_status (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_read_port_status (void);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    bool check_last (void);
-    void start_read (void);
-    void run (void);
-
-    void iterations (::CORBA::UShort iterations);
-    void keys (::CORBA::UShort keys);
-
-    //@}
-
-  private:
-    ::Different_Test::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_get_port_status_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_read_port_status_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    CORBA::UShort   iterations_;
-    CORBA::UShort   keys_;
-
-    read_action_Generator *ticker_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void test_all (void);
-    void read_all (void);
-    void get_all (void);
-
-    void check_iter_reader (const QueryConditionTest & sample);
-    bool check_iter_getter (const QueryConditionTest & sample);
-
-    void check_filters (void);
-    void check_filter (
-      ::Different_Test::QueryConditionTestConnector::Reader_ptr reader,
-      bool check_getter);
-
-    void set_filters (void);
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Different_Test_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender.idl
deleted file mode 100644
index 9fcd7823e7b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender.idl
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_QUERY_CONDITION_TEST_SENDER_IDL
-#define DDS_QUERY_CONDITION_TEST_SENDER_IDL
-
-#include "Connector/Different_Test_Connector.idl"
-
-module Different_Test
-{
-  component Sender
-  {
-    port Different_Test::QueryConditionTestConnector::DDS_Write info_write;
-    provides CCM_DDS::ConnectorStatusListener connector_status;
-
-    attribute unsigned short keys;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender.mpc
deleted file mode 100644
index 618c9190c21..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p Different_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(QC_Different_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += QC_Different_Test_Connector_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I..
-
-  IDL_Files {
-    Different_Test_Sender.idl
-  }
-}
-
-project(QC_Different_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += QC_Different_Test_Sender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    Different_Test_SenderE.idl
-  }
-}
-
-project(QC_Different_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += QC_Different_Test_Sender_lem_gen QC_Different_Test_Sender_stub \
-           QC_Different_Test_Base_stub
-  libs  += QC_Different_Test_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Different_Test_SenderEC.cpp
-  }
-
-  Header_Files {
-    Different_Test_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Different_Test_SenderEC.inl
-  }
-}
-
-project(QC_Different_Test_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += QC_Different_Test_Sender_idl_gen QC_Different_Test_Base_stub \
-           QC_Different_Test_Connector_stub
-  libs  += QC_Different_Test_Base_stub QC_Different_Test_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Different_Test_SenderC.cpp
-  }
-
-  Header_Files {
-    Different_Test_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    Different_Test_SenderC.inl
-  }
-}
-
-project(QC_Different_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += QC_Different_Test_Sender_lem_stub QC_Different_Test_Sender_stub \
-             QC_Different_Test_Connector_lem_stub QC_Different_Test_Connector_stub
-  sharedname = Sender_exec
-  libs    += Sender_stub Sender_lem_stub QC_Different_Test_Base_stub \
-             QC_Different_Test_Connector_lem_stub QC_Different_Test_Connector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Different_Test_Sender_exec.cpp
-  }
-
-  Header_Files {
-    Different_Test_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(QC_Different_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += QC_Different_Test_Base_stub  QC_Different_Test_Sender_lem_stub \
-                QC_Different_Test_Connector_stub \
-                QC_Different_Test_Connector_svnt QC_Different_Test_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub QC_Different_Test_Base_stub \
-                QC_Different_Test_Connector_stub QC_Different_Test_Connector_svnt \
-                QC_Different_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Different_Test_SenderS.cpp
-    Different_Test_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    Different_Test_SenderS.h
-    Different_Test_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender_exec.cpp
deleted file mode 100644
index f9b4abe9103..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender_exec.cpp
+++ /dev/null
@@ -1,262 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "Different_Test_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-#define ITERATIONS 15
-
-namespace CIAO_Different_Test_Sender_Impl
-{
-
-  /**
-   * ConnectorStatusListener_exec_i
-   */
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (
-    Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic (
-    ::DDS::Topic_ptr /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status(
-    ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind status_kind)
-  {
-    if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS)
-      {
-        ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_unexpected_status - "
-          "Publication matched received: starting the test\n"));
-
-        this->callback_.get_started ();
-      }
-  }
-
-  /**
-   * WriteHandler
-   */
-
-  WriteHandler::WriteHandler (Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  WriteHandler::handle_exception (ACE_HANDLE)
-  {
-    this->callback_.start ();
-    return 0;
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : keys_ (5)
-      , iterations_ (ITERATIONS)
-  {
-    ACE_NEW_THROW_EX (this->wh_,
-                      WriteHandler (*this),
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->wh_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Sender_exec_i::get_started (void)
-  {
-    try
-      {
-        this->reactor ()->notify (this->wh_);
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("Exception caught:");
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: get_started : Exception caught\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: get_started : Unknown exception caught\n")));
-      }
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    for (CORBA::UShort iter_key = 1; iter_key < this->keys_ + 1; ++iter_key)
-      {
-        char key[7];
-        QueryConditionTest new_key;
-        ACE_OS::sprintf (key, "KEY_%d", iter_key);
-        new_key.symbol = CORBA::string_dup(key);
-        for (CORBA::UShort iter = 1;
-            iter < this->iterations_ + 1;
-            ++iter)
-          {
-            new_key.iteration = iter;
-            ::Different_Test::QueryConditionTestConnector::Writer_var writer
-              = this->ciao_context_->get_connection_info_write_data ();
-            writer->write_one (new_key, ::DDS::HANDLE_NIL);
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Written key <%C> with <%d>\n"),
-                        key, iter));
-          }
-      }
-    ACE_OS::sleep (1);
-  }
-
-  // Component attributes and port operations.
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i  (*this);
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Different_Test::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Different_Test_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender_exec.h
deleted file mode 100644
index 547e17478ab..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender_exec.h
+++ /dev/null
@@ -1,162 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_DIFFERENT_TEST_SENDER_EXEC_7V9ND5_H_
-#define CIAO_DIFFERENT_TEST_SENDER_EXEC_7V9ND5_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Different_Test_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_Different_Test_Sender_Impl
-{
-  class Sender_exec_i;
-
-  /**
-   * ConnectorStatusListener_exec_i
-   */
-  class SENDER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Sender_exec_i &callback);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-      void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                                 ::DDS::StatusKind status_kind);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * WriteHandler
-   */
-
-  class WriteHandler :
-    public ACE_Event_Handler
-  {
-  public:
-    WriteHandler (Sender_exec_i &callback);
-    virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_connector_status (void);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void start (void);
-    void get_started (void);
-    //@}
-
-  private:
-    ::Different_Test::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-
-    ::CORBA::UShort keys_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    CORBA::UShort iterations_;
-    WriteHandler *wh_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Different_Test_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/Plan.cdp
deleted file mode 100644
index a6cc92082b6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/Plan.cdp
+++ /dev/null
@@ -1,458 +0,0 @@
-<!--  -->
-<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>Different_Test_Depl_1</label>
-  <UUID>Different_Test_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Different_Test_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Different_Test_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Different_Test_ReceiverConnectorComponentImplementation">
-    <name>Different_Test_ReceiverConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Different_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="Different_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Different_Test_QueryConditionTestConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Different_Test_QueryConditionTestConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QC_Different_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QC_Different_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Different_Test_SenderConnectorComponentImplementation">
-    <name>Different_Test_SenderConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Different_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="Different_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Different_Test_QueryConditionTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Different_Test_QueryConditionTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QC_Different_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QC_Different_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Different_Test_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Different_Test_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-  </instance>
-
-  <instance xmi:id="Different_Test_SenderConnectorComponentInstance">
-    <name>Different_Test_SenderConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Different_Test_SenderConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QueryCondition_Library#QueryConditionProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Different_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Different_Test_ReceiverConnectorComponentInstance">
-    <name>Different_Test_ReceiverConnectorComponentInstance</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Different_Test_ReceiverConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QueryCondition_Library#QueryConditionProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Different_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>read_port_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>read_port_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>passive_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Different_Test_ReceiverConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>get_port_fresh_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>get_port_fresh_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_observer_fresh_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Different_Test_ReceiverConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>get_port_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>get_port_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Different_Test_ReceiverConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Different_Test_SenderConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Different_Test_SenderConnectorComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="Different_Test_Connector_ExecArtifact">
-    <name>QC_Different_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>QC_Different_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Different_Test_Connector_SvntArtifact">
-    <name>QC_Different_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>QC_Different_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Different_Test_Connector_StubArtifact">
-    <name>QC_Different_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>QC_Different_Test_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/QueryCondition_Library.xml b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/QueryCondition_Library.xml
deleted file mode 100644
index b9cba6277a3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/QueryCondition_Library.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-
-  <qos_profile name="QueryConditionProfile">
-    <!-- QoS used to configure the data writer created in the example code -->
-    <datawriter_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-        <max_blocking_time>
-          <sec>10</sec>
-          <nanosec>0</nanosec>
-        </max_blocking_time>
-      </reliability>
-      <durability>
-        <kind>TRANSIENT_DURABILITY_QOS</kind>
-      </durability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-    </datawriter_qos>
-    <!-- QoS used to configure the data reader created in the example code -->
-    <datareader_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-      </reliability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-      <durability>
-        <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-      </durability>
-    </datareader_qos>
-  </qos_profile>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index 37e7ff8dec9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-Description
-XML QoS Profile
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="QueryCondition_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="QueryConditionProfile" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>10</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/run_test.pl
deleted file mode 100755
index 638d55cd247..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 30 seconds to allow task to complete\n";
-sleep (30);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -s\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.idl
deleted file mode 100644
index f0bfd6bcc95..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file QCLE_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef QUERY_CONDITION_LISTEN_EVENT_TEST_BASE_IDL
-#define QUERY_CONDITION_LISTEN_EVENT_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/QCLE_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/QCLE_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "QueryConditionListenEventTest"
-#pragma DCPS_DATA_KEY "QueryConditionListenEventTest key"
-
-struct QueryConditionListenEventTest {
-  string key; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<QueryConditionListenEventTest> QueryConditionListenEventTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.mpc
deleted file mode 100644
index e9918ebd97a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_QCLE_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_QCLE_Test_Base_stub
-  dynamicflags += QUERY_CONDITION_LISTEN_EVENT_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=QUERY_CONDITION_LISTEN_EVENT_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=QCLE_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    QCLE_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=QUERY_CONDITION_LISTEN_EVENT_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    QCLE_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.idl
deleted file mode 100644
index 8224dd82403..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file QCLE_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef QUERY_CONDITION_LISTEN_EVENT_TEST_CONNECTOR_IDL_
-#define QUERY_CONDITION_LISTEN_EVENT_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/QCLE_Test_Base.idl"
-
-#pragma ciao lem "Connector/QCLE_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/QCLE_Test_BaseTypeSupport.idl"
-#endif
-
-module QCLE_Test
-{
-  module ::CCM_DDS::Typed < ::QueryConditionListenEventTest, ::QueryConditionListenEventTestSeq> QueryConditionListenEventTestConnector;
-};
-
-#endif /* QCLE_Test_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.mpc
deleted file mode 100644
index da83149c589..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_QCLE_Test_Base -l .. -o ../lib -u DDS QCLE_Test_Connector"
-
-project(DDS_QCLE_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_QCLE_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=QUERY_CONDITION_LISTEN_EVENT_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=QCLE_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=QUERY_CONDITION_LISTEN_EVENT_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=QCLE_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=QUERY_CONDITION_LISTEN_EVENT_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=QCLE_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=QUERY_CONDITION_LISTEN_EVENT_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=QCLE_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    QCLE_Test_Connector.idl
-  }
-}
-
-project(DDS_QCLE_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_QCLE_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=QUERY_CONDITION_LISTEN_EVENT_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=QCLE_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    QCLE_Test_ConnectorE.idl
-  }
-}
-
-project(DDS_QCLE_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_QCLE_Test_Connector_lem_gen DDS_QCLE_Test_Connector_stub DDS_QCLE_Test_Base_stub
-  libs  += DDS_QCLE_Test_Base_stub DDS_QCLE_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_QCLE_Test_Connector_lem_stub
-  dynamicflags += QUERY_CONDITION_LISTEN_EVENT_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCLE_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    QCLE_Test_ConnectorEC.h
-    QCLE_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    QCLE_Test_ConnectorEC.inl
-  }
-}
-
-project(DDS_QCLE_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_QCLE_Test_Connector_idl_gen DDS_QCLE_Test_Base_stub
-  libs  += DDS_QCLE_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_QCLE_Test_Connector_stub
-  dynamicflags += QUERY_CONDITION_LISTEN_EVENT_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCLE_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    QCLE_Test_ConnectorC.h
-    QCLE_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    QCLE_Test_ConnectorC.inl
-  }
-}
-
-project(DDS_QCLE_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_QCLE_Test_Connector_lem_stub DDS_QCLE_Test_Connector_stub DDS_QCLE_Test_Base_stub
-  sharedname = DDS_QCLE_Test_Connector_exec
-  libs += DDS_QCLE_Test_Connector_stub DDS_QCLE_Test_Connector_lem_stub DDS_QCLE_Test_Base_stub DDS_QCLE_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += QUERY_CONDITION_LISTEN_EVENT_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCLE_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    QCLE_Test_Connector_conn.h
-    QCLE_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_QCLE_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_QCLE_Test_Connector_lem_stub DDS_QCLE_Test_Connector_exec DDS_QCLE_Test_Connector_stub
-  sharedname  = DDS_QCLE_Test_Connector_svnt
-  libs       += DDS_QCLE_Test_Connector_stub \
-                DDS_QCLE_Test_Connector_lem_stub  \
-                DDS_QCLE_Test_Base_stub \
-                DDS_QCLE_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += QUERY_CONDITION_LISTEN_EVENT_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCLE_Test_ConnectorS.cpp
-    QCLE_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    QCLE_Test_ConnectorS.h
-    QCLE_Test_Connector_svnt.h
-    QCLE_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver.idl
deleted file mode 100644
index 613ef825f4c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/QCLE_Test_Connector.idl"
-
-module QCLE_Test
-{
-  component Receiver
-  {
-    port QueryConditionListenEventTestConnector::DDS_Listen info_listen;
-
-    attribute unsigned short keys;
-    attribute unsigned short iterations;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver.mpc
deleted file mode 100644
index df60dc7545c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver.mpc
+++ /dev/null
@@ -1,146 +0,0 @@
-project(DDS_QCLE_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_QCLE_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h \
-              -I..
-
-  IDL_Files {
-    QCLE_Test_Receiver.idl
-  }
-}
-
-project(DDS_QCLE_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_QCLE_Test_Receiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    QCLE_Test_ReceiverE.idl
-  }
-}
-
-project(DDS_QCLE_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_QCLE_Test_Receiver_lem_gen DDS_QCLE_Test_Receiver_stub  \
-           DDS_QCLE_Test_Connector_stub DDS_QCLE_Test_Base_stub
-  libs  +=  Receiver_stub DDS_QCLE_Test_Connector_stub \
-            DDS_QCLE_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCLE_Test_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    QCLE_Test_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    QCLE_Test_ReceiverEC.inl
-  }
-}
-
-project(DDS_QCLE_Test_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_QCLE_Test_Receiver_idl_gen  DDS_QCLE_Test_Connector_stub \
-           DDS_QCLE_Test_Base_stub DDS_QCLE_Test_Connector_lem_gen
-  libs  += DDS_QCLE_Test_Connector_stub DDS_QCLE_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCLE_Test_ReceiverC.cpp
-  }
-
-  Header_Files {
-    QCLE_Test_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    QCLE_Test_ReceiverC.inl
-  }
-}
-
-project(DDS_QCLE_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_QCLE_Test_Receiver_lem_stub DDS_QCLE_Test_Receiver_stub \
-             DDS_QCLE_Test_Base_stub DDS_QCLE_Test_Connector_stub \
-             DDS_QCLE_Test_Connector_lem_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_QCLE_Test_Base_stub \
-          DDS_QCLE_Test_Connector_stub DDS_QCLE_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCLE_Test_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    QCLE_Test_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_QCLE_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_QCLE_Test_Receiver_lem_stub DDS_QCLE_Test_Base_stub \
-                  DDS_QCLE_Test_Connector_stub DDS_QCLE_Test_Connector_svnt \
-                  DDS_QCLE_Test_Receiver_exec DDS_QCLE_Test_Connector_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_QCLE_Test_Base_stub \
-                DDS_QCLE_Test_Connector_stub DDS_QCLE_Test_Connector_svnt \
-                Receiver_exec DDS_QCLE_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCLE_Test_ReceiverS.cpp
-    QCLE_Test_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    QCLE_Test_ReceiverS.h
-    QCLE_Test_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp
deleted file mode 100644
index 189a1b08bf8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp
+++ /dev/null
@@ -1,364 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "QCLE_Test_Receiver_exec.h"
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-#define QUERY "( (iteration > %0) AND (iteration < %1) )"
-
-#define MIN_ITERATION "2"
-#define MAX_ITERATION "5"
-
-#define SAMPLES_PER_KEY 2 //only iteration 3 and 4 should be coming in....
-
-namespace CIAO_QCLE_Test_Receiver_Impl
-{
-
-  /**
-   * Facet Executor Implementation Class: info_listen_data_listener_exec_i
-   */
-
-  info_listen_data_listener_exec_i::info_listen_data_listener_exec_i (
-        ::QCLE_Test::CCM_Receiver_Context_ptr ctx,
-        ACE_Thread_ID &thread_id,
-        Atomic_Long &samples_received)
-    : ciao_context_ (
-        ::QCLE_Test::CCM_Receiver_Context::_duplicate (ctx))
-      , thread_id_ (thread_id)
-      , samples_received_ (samples_received)
-  {
-  }
-
-  info_listen_data_listener_exec_i::~info_listen_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::QCLE_Test::QueryConditionListenEventTestConnector::Listener
-
-  void
-  info_listen_data_listener_exec_i::on_one_data (const ::QueryConditionListenEventTest & datum,
-  const ::CCM_DDS::ReadInfo & info)
-  {
-    ACE_Thread_ID t_id;
-    this->thread_id_ = t_id;
-    ++this->samples_received_;
-
-    ACE_DEBUG ((LM_DEBUG, "QueryConditionListenEventTest_Listener::on_one_data: "
-                            "key <%C> - iteration <%d>\n",
-                            datum.key.in (),
-                            datum.iteration));
-    if (info.instance_handle == ::DDS::HANDLE_NIL)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: QueryConditionListenEventTest_Listener::on_one_data: "
-                            "instance handle seems to be invalid "
-                            "key <%C> - iteration <%d>\n",
-                            datum.key.in (),
-                            datum.iteration));
-      }
-    if (info.source_timestamp.sec == 0 &&
-        info.source_timestamp.nanosec == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: QueryConditionListenEventTest_Listener::on_one_data: "
-                            "source timestamp seems to be invalid (nil) "
-                            "key <%C> - iteration <%d>\n",
-                            datum.key.in (),
-                            datum.iteration));
-      }
-    if (datum.iteration <= ACE_OS::atoi (MIN_ITERATION) ||
-        datum.iteration  > ACE_OS::atoi (MAX_ITERATION) )
-      {
-        ACE_ERROR ((LM_ERROR, "QueryConditionListenEventTest_Listener::on_one_data: "
-                              "ERROR: Unexpected iteration received.\n"));
-      }
-  }
-
-  void
-  info_listen_data_listener_exec_i::on_many_data (const ::QueryConditionListenEventTestSeq & /* data */,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_listen_status_exec_i
-   */
-
-  info_listen_status_exec_i::info_listen_status_exec_i (
-        ::QCLE_Test::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::QCLE_Test::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_listen_status_exec_i::~info_listen_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_listen_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_listen_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : keys_ (5)
-      , iterations_ (10)
-      , thread_id_listener_ (0, 0)
-      , samples_expected_ (keys_ * SAMPLES_PER_KEY)
-      , samples_received_ (0)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-  void
-  Receiver_exec_i::start ()
-  {
-    ::CCM_DDS::DataListenerControl_var dlc =
-        this->ciao_context_->get_connection_info_listen_data_control ();
-    dlc->mode (::CCM_DDS::ONE_BY_ONE);
-  }
-
-  // Component attributes and port operations.
-
-  ::QCLE_Test::QueryConditionListenEventTestConnector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_listen_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_listen_data_listener_.in ()))
-      {
-        info_listen_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_listen_data_listener_exec_i (
-            this->ciao_context_.in (),
-            this->thread_id_listener_,
-            this->samples_received_),
-            ::QCLE_Test::QueryConditionListenEventTestConnector::CCM_Listener::_nil ());
-
-          this->ciao_info_listen_data_listener_ = tmp;
-      }
-
-    return
-      ::QCLE_Test::QueryConditionListenEventTestConnector::CCM_Listener::_duplicate (
-        this->ciao_info_listen_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_listen_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_listen_status_.in ()))
-      {
-        info_listen_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_listen_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_listen_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_listen_status_.in ());
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Receiver_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Receiver_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::QCLE_Test::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_activate - "
-                          "Set filter.\n"));
-
-    CCM_DDS::QueryFilter filter;
-    filter.expression = CORBA::string_dup (QUERY);
-    filter.parameters.length (2);
-    filter.parameters[0] = CORBA::string_dup (MIN_ITERATION);
-    filter.parameters[1] = CORBA::string_dup (MAX_ITERATION);
-
-    ::QCLE_Test::QueryConditionListenEventTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_info_listen_data ();
-
-    reader->query (filter);
-
-    ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_activate - "
-                          "Start listening.\n"));
-    start ();
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    char ccm_buf [65];
-    ACE_Thread_ID ccm_thread_id;
-    ccm_thread_id.to_string (ccm_buf);
-
-    char list_buf [65];
-    this->thread_id_listener_.to_string (list_buf);
-
-
-    if (this->thread_id_listener_.id () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
-                              "Thread ID for ReaderListener not set!\n"));
-      }
-    #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (this->thread_id_listener_ == ccm_thread_id)
-      {
-        ACE_DEBUG ((LM_DEBUG, "QF_EVENT: "
-                              "Thread switch for ReaderListener seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: QF_EVENT: "
-                              "Thread switch for ReaderListener "
-                              "doesn't seem to work! "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    #else
-    else if (this->thread_id_listener_ == ccm_thread_id)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: QF_EVENT: ReaderListener: "
-                              "DDS seems to use a CCM thread for its callback: "
-                               "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-     }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "QF_EVENT: ReaderListener: "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    #endif
-    if (this->samples_received_ != this->samples_expected_)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: QF_EVENT: ReaderListener: "
-                              "Unexpected number of samples received: "
-                              "expected <%d> - received <%d>\n",
-                              this->samples_expected_,
-                              this->samples_received_.value ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "QF_EVENT: ReaderListener: "
-                              "Expected number of samples received: "
-                              "expected <%d> - received <%d>\n",
-                              this->samples_expected_,
-                              this->samples_received_.value ()));
-      }
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_QCLE_Test_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.h
deleted file mode 100644
index 00745c85c30..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.h
+++ /dev/null
@@ -1,191 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_QCLE_TEST_RECEIVER_EXEC_EETZIS_H_
-#define CIAO_QCLE_TEST_RECEIVER_EXEC_EETZIS_H_
-
-#include /**/ "ace/pre.h"
-
-#include "QCLE_Test_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_QCLE_Test_Receiver_Impl
-{
-  class Receiver_exec_i;
-
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Long> Atomic_Long;
-
-  /**
-   * Provider Executor Implementation Class: info_listen_data_listener_exec_i
-   */
-
-  class info_listen_data_listener_exec_i
-    : public virtual ::QCLE_Test::QueryConditionListenEventTestConnector::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_listen_data_listener_exec_i (
-      ::QCLE_Test::CCM_Receiver_Context_ptr ctx,
-      ACE_Thread_ID &thread_id,
-      Atomic_Long &samples_received);
-    virtual ~info_listen_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from QCLE_Test::QueryConditionListenEventTestConnector::Listener. */
-
-    virtual
-    void on_one_data (const ::QueryConditionListenEventTest & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (const ::QueryConditionListenEventTestSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    ::QCLE_Test::CCM_Receiver_Context_var ciao_context_;
-    ACE_Thread_ID &thread_id_;
-    Atomic_Long &samples_received_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_listen_status_exec_i
-   */
-
-  class info_listen_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_listen_status_exec_i (
-      ::QCLE_Test::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_listen_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::QCLE_Test::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::QCLE_Test::QueryConditionListenEventTestConnector::CCM_Listener_ptr
-    get_info_listen_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_listen_status (void);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void start (void);
-
-    //@}
-
-  private:
-    ::QCLE_Test::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::QCLE_Test::QueryConditionListenEventTestConnector::CCM_Listener_var ciao_info_listen_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_listen_status_;
-
-    ::CORBA::UShort keys_;
-
-    ::CORBA::UShort iterations_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    ACE_Thread_ID thread_id_listener_;
-
-    CORBA::Long samples_expected_;
-    Atomic_Long samples_received_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_QCLE_Test_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.idl
deleted file mode 100644
index 174c6d68a69..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_QUERY_CONDITION_LISTEN_EVENT_TEST_SENDER_IDL
-#define DDS_QUERY_CONDITION_LISTEN_EVENT_TEST_SENDER_IDL
-
-#include "Connector/QCLE_Test_Connector.idl"
-
-module QCLE_Test
-{
-  component Sender
-  {
-    port QueryConditionListenEventTestConnector::DDS_Write info_write;
-    provides CCM_DDS::ConnectorStatusListener connector_status;
-
-    attribute unsigned short keys;
-    attribute unsigned short iterations;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.mpc
deleted file mode 100644
index 6db4c023bf0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_QCLE_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_QCLE_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_QCLE_Test_Connector_idl_gen DDS_Starter_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I..
-
-  IDL_Files {
-    QCLE_Test_Sender.idl
-  }
-}
-
-project(DDS_QCLE_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_QCLE_Test_Sender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    QCLE_Test_SenderE.idl
-  }
-}
-
-project(DDS_QCLE_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_QCLE_Test_Sender_lem_gen DDS_QCLE_Test_Sender_stub \
-           DDS_QCLE_Test_Base_stub
-  libs  += DDS_QCLE_Test_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCLE_Test_SenderEC.cpp
-  }
-
-  Header_Files {
-    QCLE_Test_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    QCLE_Test_SenderEC.inl
-  }
-}
-
-project(DDS_QCLE_Test_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_QCLE_Test_Sender_idl_gen DDS_QCLE_Test_Base_stub \
-           DDS_QCLE_Test_Connector_stub
-  libs  += DDS_QCLE_Test_Base_stub DDS_QCLE_Test_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCLE_Test_SenderC.cpp
-  }
-
-  Header_Files {
-    QCLE_Test_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    QCLE_Test_SenderC.inl
-  }
-}
-
-project(DDS_QCLE_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_QCLE_Test_Sender_lem_stub DDS_QCLE_Test_Sender_stub \
-             DDS_QCLE_Test_Connector_lem_stub DDS_QCLE_Test_Connector_stub
-  sharedname = Sender_exec
-  libs    += Sender_stub Sender_lem_stub DDS_QCLE_Test_Base_stub \
-             DDS_QCLE_Test_Connector_lem_stub DDS_QCLE_Test_Connector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCLE_Test_Sender_exec.cpp
-  }
-
-  Header_Files {
-    QCLE_Test_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_QCLE_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_QCLE_Test_Base_stub  DDS_QCLE_Test_Sender_lem_stub \
-                DDS_QCLE_Test_Connector_stub \
-                DDS_QCLE_Test_Connector_svnt DDS_QCLE_Test_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub DDS_QCLE_Test_Base_stub \
-                DDS_QCLE_Test_Connector_stub DDS_QCLE_Test_Connector_svnt \
-                DDS_QCLE_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCLE_Test_SenderS.cpp
-    QCLE_Test_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    QCLE_Test_SenderS.h
-    QCLE_Test_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender_exec.cpp
deleted file mode 100644
index 4da701e33f9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender_exec.cpp
+++ /dev/null
@@ -1,323 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "QCLE_Test_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_QCLE_Test_Sender_Impl
-{
-  /**
-   * Write ticker
-   */
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (
-    Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic (
-    ::DDS::Topic_ptr /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status(
-    ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind status_kind)
-  {
-    if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS)
-      {
-        ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_unexpected_status - "
-          "Publication matched received: starting the test\n"));
-
-        this->callback_.get_started ();
-      }
-  }
-
-  /**
-   * Write ticker
-   */
-
-  WriteTicker::WriteTicker (Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  WriteTicker::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    // Notify the subscribers
-    this->callback_.write_one ();
-    return 0;
-  }
-
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : keys_ (5)
-      , iterations_ (10)
-  {
-    this->ticker_ = new WriteTicker (*this);
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Sender_exec_i::write_one (void)
-  {
-    if (this->last_key_ != this->samples_.end ())
-      {
-        try
-          {
-            ::QCLE_Test::QueryConditionListenEventTestConnector::Writer_var writer =
-              this->ciao_context_->get_connection_info_write_data ();
-
-            ++this->last_key_->second->iteration;
-            writer->write_one (this->last_key_->second, ::DDS::HANDLE_NIL);
-            ACE_DEBUG ((LM_DEBUG, "Written key <%C> - <%u>\n",
-                          this->last_key_->first.c_str (),
-                          this->last_key_->second->iteration));
-          }
-        catch (const CCM_DDS::InternalError& )
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                        ACE_TEXT ("while updating writer info for <%C>.\n"),
-                          this->last_key_->first.c_str ()));
-          }
-        ++this->last_key_;
-      }
-    else
-      {
-        //onto the next iteration
-        this->last_key_ = this->samples_.begin ();
-        while (this->last_key_ != this->samples_.end ())
-          {
-            if (this->last_key_->second->iteration == this->iterations_)
-              {
-                //next key
-                ++this->last_key_;
-              }
-            else
-              {
-                break;
-              }
-          }
-        if (this->last_key_ == this->samples_.end ())
-          {
-            this->reactor ()->cancel_timer (this->ticker_);
-          }
-      }
-  }
-
-  void
-  Sender_exec_i::get_started (void)
-  {
-    try
-      {
-        this->start ();
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("Exception caught:");
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Sender_exec_i::get_started: Exception caught\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Sender_exec_i::get_started: Unknown exception caught\n")));
-      }
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard,
-                        this->mutex_, CORBA::INTERNAL ());
-
-    for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i)
-      {
-        char key[7];
-        QueryConditionListenEventTest* new_key = new QueryConditionListenEventTest;
-        ACE_OS::sprintf (key, "KEY_%d", i);
-        new_key->key = CORBA::string_dup(key);
-        new_key->iteration = 0;
-
-        this->samples_[key] = new_key;
-      }
-   this->last_key_ = this->samples_.begin ();
-   if (this->reactor ()->schedule_timer (
-                this->ticker_,
-                0,
-                ACE_Time_Value (5, 50000),
-                ACE_Time_Value (0, 50000)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                              ACE_TEXT ("Error scheduling timer")));
-      }
-  }
-
-  // Component attributes and port operations.
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i  (*this);
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::QCLE_Test::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_QCLE_Test_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender_exec.h
deleted file mode 100644
index 63db4bc3888..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender_exec.h
+++ /dev/null
@@ -1,179 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_QCLE_TEST_SENDER_EXEC_ZNGRZK_H_
-#define CIAO_QCLE_TEST_SENDER_EXEC_ZNGRZK_H_
-
-#include /**/ "ace/pre.h"
-
-#include "QCLE_Test_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-#include <map>
-
-namespace CIAO_QCLE_Test_Sender_Impl
-{
-  class Sender_exec_i;
-
-  /**
-   * ConnectorStatusListener_exec_i
-   */
-  class SENDER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Sender_exec_i &callback);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-      void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                                 ::DDS::StatusKind status_kind);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Write ticker
-   */
-
-  class WriteTicker :
-    public ACE_Event_Handler
-  {
-  public:
-    WriteTicker (Sender_exec_i &callback);
-    int handle_timeout (const ACE_Time_Value &, const void *);
-  private:
-    /// Maintains a handle that actually process the event
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_connector_status (void);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void get_started (void);
-    void write_one (void);
-
-    //@}
-
-  private:
-    ::QCLE_Test::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-
-    ::CORBA::UShort keys_;
-
-    ::CORBA::UShort iterations_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    WriteTicker *ticker_;
-
-    TAO_SYNCH_MUTEX mutex_;
-    typedef std::map<ACE_CString, QueryConditionListenEventTest_var> Writer_Table;
-    Writer_Table samples_;
-
-    Writer_Table::iterator last_key_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void start (void);
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_QCLE_Test_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/descriptors/Plan.cdp
deleted file mode 100644
index e3b0bb0a926..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/descriptors/Plan.cdp
+++ /dev/null
@@ -1,413 +0,0 @@
-<!--  -->
-<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>QCLE_Test_Depl_1</label>
-  <UUID>QCLE_Test_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QCLE_Test_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QCLE_Test_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="QCLE_Test_ConnectorComponentImplementation">
-    <name>QCLE_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="QCLE_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="QCLE_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QCLE_Test_QueryConditionListenEventTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QCLE_Test_QueryConditionListenEventTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QCLE_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QCLE_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QCLE_Test_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QCLE_Test_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="QCLE_Test_ConnectorComponentInstance">
-    <name>QCLE_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="QCLE_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QCLE_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="QCLE_Test_ConnectorComponentInstance2">
-    <name>QCLE_Test_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="QCLE_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QCLE_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>info_listen_reader_receiver</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="QCLE_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_listen_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="QCLE_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_listen_data_control</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="QCLE_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="QCLE_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="QCLE_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="QCLE_Test_Connector_ExecArtifact">
-    <name>QCLE_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_QCLE_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="QCLE_Test_Connector_SvntArtifact">
-    <name>QCLE_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_QCLE_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="QCLE_Test_Connector_StubArtifact">
-    <name>QCLE_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_QCLE_Test_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/descriptors/run_test.pl
deleted file mode 100755
index d8b4eca445d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 30 seconds to allow task to complete\n";
-sleep (30);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Starter.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Starter.idl
deleted file mode 100644
index b61d30c7687..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Starter.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file ReadGet_Starter.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef QUERYCONDITION_STARTER_IDL
-#define QUERYCONDITION_STARTER_IDL
-
-#pragma ciao lem "Base/ReadGet_StarterE.idl"
-
-interface ReadGetStarter
-{
-  void set_reader_properties (in unsigned short nr_keys,
-                              in unsigned short nr_iterations);
-  void start_read (in unsigned short run);
-};
-
-interface ReadGetRestarter
-{
-  void restart_write ();
-};
-
-#endif /* QUERYCONDITION_STARTER_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Starter.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Starter.mpc
deleted file mode 100644
index 4c41bda9f0c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Starter.mpc
+++ /dev/null
@@ -1,109 +0,0 @@
-project(QC_ReadGet_Starter_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=READER_STARTER_STUB_Export \
-              -Wb,stub_export_include=ReadGet_Starter_stub_export.h \
-              -Wb,skel_export_macro=READER_STARTER_SVNT_Export \
-              -Wb,skel_export_include=ReadGet_Starter_svnt_export.h \
-              -Wb,svnt_export_macro=READER_STARTER_SVNT_Export \
-              -Wb,svnt_export_include=ReadGet_Starter_svnt_export.h \
-              -Wb,exec_export_macro=READER_STARTER_EXEC_Export \
-              -Wb,exec_export_include=ReadGet_Starter_exec_export.h -I..
-
-  IDL_Files {
-    ReadGet_Starter.idl
-  }
-}
-
-project(QC_ReadGet_Starter_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += QC_ReadGet_Starter_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=READER_STARTER_LEM_STUB_Export \
-              -Wb,stub_export_include=ReadGet_Starter_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    ReadGet_StarterE.idl
-  }
-}
-
-project(QC_ReadGet_Starter_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += QC_ReadGet_Starter_lem_gen QC_ReadGet_Starter_stub
-  libs  += QC_ReadGet_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = QC_ReadGet_Starter_lem_stub
-  dynamicflags += READER_STARTER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_StarterEC.cpp
-  }
-
-  Header_Files {
-    ReadGet_StarterEC.h
-    ReadGet_Starter_lem_stub_export.h
-  }
-
-  Inline_Files {
-    ReadGet_StarterEC.inl
-  }
-}
-
-project(QC_ReadGet_Starter_stub) : ccm_stub, dds4ccm_base {
-  after += QC_ReadGet_Starter_idl_gen
-  libs  +=
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = QC_ReadGet_Starter_stub
-  dynamicflags += READER_STARTER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_StarterC.cpp
-  }
-
-  Header_Files {
-    ReadGet_StarterC.h
-    ReadGet_Starter_stub_export.h
-  }
-
-  Inline_Files {
-    ReadGet_StarterC.inl
-  }
-}
-
-
-project(QC_ReadGet_Starter_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += QC_ReadGet_Starter_lem_stub QC_ReadGet_Starter_stub
-  sharedname  = QC_ReadGet_Starter_svnt
-  libs       += QC_ReadGet_Starter_stub QC_ReadGet_Starter_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += READER_STARTER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_StarterS.cpp
-    ReadGet_Starter_svnt.cpp
-  }
-
-  Header_Files {
-    ReadGet_StarterS.h
-    ReadGet_Starter_svnt.h
-    ReadGet_Starter_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.idl
deleted file mode 100644
index 7fadf380e9f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file ReadGet_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef QUERY_CONDITION_TEST_BASE_IDL
-#define QUERY_CONDITION_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/ReadGet_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/ReadGet_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "QueryConditionTest"
-#pragma DCPS_DATA_KEY "QueryConditionTest symbol"
-
-struct QueryConditionTest {
-  string symbol; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<QueryConditionTest> QueryConditionTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.mpc
deleted file mode 100644
index ee8127d2cb3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project(QC_ReadGet_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = QC_ReadGet_Test_Base_stub
-  dynamicflags += QUERY_CONDITION_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=QUERY_CONDITION_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=ReadGet_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    ReadGet_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=QUERY_CONDITION_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    ReadGet_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.idl
deleted file mode 100644
index 7a280e41771..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file ReadGet_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef QUERY_CONDITION_TEST_CONNECTOR_IDL_
-#define QUERY_CONDITION_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/ReadGet_Test_Base.idl"
-
-#pragma ciao lem "Connector/ReadGet_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/ReadGet_Test_BaseTypeSupport.idl"
-#endif
-
-module ReadGet_Test
-{
-  module ::CCM_DDS::Typed < ::QueryConditionTest, ::QueryConditionTestSeq> QueryConditionTestConnector;
-};
-
-#endif /* QUERY_CONDITION_TEST_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.mpc
deleted file mode 100644
index bf66a086bcf..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.mpc
+++ /dev/null
@@ -1,146 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p ReadGet_Test_Base -l .. -o ../lib -u DDS ReadGet_Test_Connector"
-
-project(QC_ReadGet_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen QC_ReadGet_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=QUERY_CONDITION_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=ReadGet_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=QUERY_CONDITION_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=ReadGet_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=QUERY_CONDITION_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=ReadGet_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=QUERY_CONDITION_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=ReadGet_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    ReadGet_Test_Connector.idl
-  }
-}
-
-project(QC_ReadGet_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += QC_ReadGet_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=QUERY_CONDITION_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=ReadGet_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    ReadGet_Test_ConnectorE.idl
-  }
-}
-
-project(QC_ReadGet_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += QC_ReadGet_Test_Connector_lem_gen QC_ReadGet_Test_Connector_stub \
-           QC_ReadGet_Test_Base_stub
-  libs  += QC_ReadGet_Test_Base_stub QC_ReadGet_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = QC_ReadGet_Test_Connector_lem_stub
-  dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    ReadGet_Test_ConnectorEC.h
-    ReadGet_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    ReadGet_Test_ConnectorEC.inl
-  }
-}
-
-project(QC_ReadGet_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += QC_ReadGet_Test_Connector_idl_gen QC_ReadGet_Test_Base_stub
-  libs  += QC_ReadGet_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = QC_ReadGet_Test_Connector_stub
-  dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    ReadGet_Test_ConnectorC.h
-    ReadGet_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    ReadGet_Test_ConnectorC.inl
-  }
-}
-
-project(QC_ReadGet_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += QC_ReadGet_Test_Connector_lem_stub QC_ReadGet_Test_Connector_stub \
-             QC_ReadGet_Test_Base_stub
-  sharedname = QC_ReadGet_Test_Connector_exec
-  libs += QC_ReadGet_Test_Connector_stub QC_ReadGet_Test_Connector_lem_stub \
-          QC_ReadGet_Test_Base_stub QC_ReadGet_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    ReadGet_Test_Connector_conn.h
-    ReadGet_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(QC_ReadGet_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += QC_ReadGet_Test_Connector_lem_stub QC_ReadGet_Test_Connector_exec \
-                QC_ReadGet_Test_Connector_stub
-  sharedname  = QC_ReadGet_Test_Connector_svnt
-  libs       += QC_ReadGet_Test_Connector_stub \
-                QC_ReadGet_Test_Connector_lem_stub  \
-                QC_ReadGet_Test_Base_stub \
-                QC_ReadGet_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_Test_ConnectorS.cpp
-    ReadGet_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    ReadGet_Test_ConnectorS.h
-    ReadGet_Test_Connector_svnt.h
-    ReadGet_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.idl
deleted file mode 100644
index d77408ba757..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/ReadGet_Test_Connector.idl"
-#include "Base/ReadGet_Starter.idl"
-
-module ReadGet_Test
-{
-  component Receiver
-  {
-    port QueryConditionTestConnector::DDS_Get get_port;
-    port QueryConditionTestConnector::DDS_Read check_port;
-
-    provides ReadGetStarter reader_start;
-    uses ReadGetRestarter writer_restart;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.mpc
deleted file mode 100644
index ff25d209f83..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.mpc
+++ /dev/null
@@ -1,155 +0,0 @@
-project(QC_ReadGet_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += QC_ReadGet_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h \
-              -I..
-
-  IDL_Files {
-    ReadGet_Test_Receiver.idl
-  }
-}
-
-project(QC_ReadGet_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += QC_ReadGet_Test_Receiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    ReadGet_Test_ReceiverE.idl
-  }
-}
-
-project(QC_ReadGet_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += QC_ReadGet_Test_Receiver_lem_gen QC_ReadGet_Test_Receiver_stub  \
-           QC_ReadGet_Test_Connector_stub QC_ReadGet_Test_Base_stub \
-           QC_ReadGet_Starter_stub
-  libs  +=  Receiver_stub QC_ReadGet_Test_Connector_stub \
-            QC_ReadGet_Test_Base_stub QC_ReadGet_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_Test_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    ReadGet_Test_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    ReadGet_Test_ReceiverEC.inl
-  }
-}
-
-project(QC_ReadGet_Test_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += QC_ReadGet_Test_Receiver_idl_gen  QC_ReadGet_Test_Connector_stub \
-           QC_ReadGet_Test_Base_stub QC_ReadGet_Test_Connector_lem_gen \
-           QC_ReadGet_Starter_stub QC_ReadGet_Starter_lem_stub
-  libs  += QC_ReadGet_Test_Connector_stub QC_ReadGet_Test_Base_stub \
-           QC_ReadGet_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_Test_ReceiverC.cpp
-  }
-
-  Header_Files {
-    ReadGet_Test_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    ReadGet_Test_ReceiverC.inl
-  }
-}
-
-project(QC_ReadGet_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += QC_ReadGet_Test_Receiver_lem_stub QC_ReadGet_Test_Receiver_stub \
-             QC_ReadGet_Test_Base_stub QC_ReadGet_Test_Connector_stub \
-             QC_ReadGet_Test_Connector_lem_stub \
-             QC_ReadGet_Starter_lem_stub QC_ReadGet_Starter_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub QC_ReadGet_Test_Base_stub \
-          QC_ReadGet_Test_Connector_stub QC_ReadGet_Test_Connector_lem_stub \
-          QC_ReadGet_Starter_lem_stub QC_ReadGet_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL READER_STARTER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_Test_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    ReadGet_Test_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(QC_ReadGet_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   QC_ReadGet_Test_Receiver_lem_stub QC_ReadGet_Test_Base_stub \
-                  QC_ReadGet_Test_Connector_stub QC_ReadGet_Test_Connector_svnt \
-                  QC_ReadGet_Test_Receiver_exec QC_ReadGet_Test_Connector_lem_stub \
-                  QC_ReadGet_Starter_stub \
-                  QC_ReadGet_Starter_svnt QC_ReadGet_Starter_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub QC_ReadGet_Test_Base_stub \
-                QC_ReadGet_Test_Connector_stub QC_ReadGet_Test_Connector_svnt \
-                Receiver_exec QC_ReadGet_Test_Connector_lem_stub \
-                QC_ReadGet_Starter_stub QC_ReadGet_Starter_svnt \
-                QC_ReadGet_Starter_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_Test_ReceiverS.cpp
-    ReadGet_Test_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    ReadGet_Test_ReceiverS.h
-    ReadGet_Test_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp
deleted file mode 100644
index cc2da4b2fb7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp
+++ /dev/null
@@ -1,823 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "ReadGet_Test_Receiver_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-#include "dds4ccm/impl/dds4ccm_utils.h"
-
-#define QUERY "( (iteration > %0) AND (iteration < %1) )"
-
-#define MIN_ITERATION_1 "2"
-#define MAX_ITERATION_1 "5"
-
-// First run filtered in : 2 (iteration 3 and 4)
-
-// Since QueryCondition contains a bug, we've changed
-// the iterations of the second run in order for this test
-// to succeed. There's a different tests which reproduces
-// the bug.
-// #define MIN_ITERATION_2 "22"
-// #define MAX_ITERATION_2 "34"
-
-#define MIN_ITERATION_2 "7"
-#define MAX_ITERATION_2 "9"
-
-// Should be : Second run filtered in : 11 (iterations between 22 and 34)
-// Is now : Second run filtered in : 1 (only iteration 8)
-
-#define SAMPLES_PER_KEY_GETTER (2 + 1)
-
-// Reader also reads already read samples.
-#define SAMPLES_PER_KEY_READER (2 + 1)
-
-namespace CIAO_ReadGet_Test_Receiver_Impl
-{
-  /**
-   * Read Action Generator
-   */
-  read_action_Generator::read_action_Generator (Receiver_exec_i &callback,
-                                                int run)
-    : callback_ (callback),
-      run_ (run)
-  {
-  }
-
-  read_action_Generator::~read_action_Generator ()
-  {
-  }
-
-  int
-  read_action_Generator::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Checking if last sample "
-                          "is available in DDS...\n"));
-    if (this->run_ == 1 || this->callback_.check_last ())
-      {
-        this->callback_.run (this->run_);
-      }
-    return 0;
-  }
-
-  /**
-   * Facet Executor Implementation Class: get_port_status_exec_i
-   */
-
-  get_port_status_exec_i::get_port_status_exec_i (
-        ::ReadGet_Test::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::ReadGet_Test::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  get_port_status_exec_i::~get_port_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  get_port_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  get_port_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: check_port_status_exec_i
-   */
-
-  check_port_status_exec_i::check_port_status_exec_i (
-        ::ReadGet_Test::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::ReadGet_Test::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  check_port_status_exec_i::~check_port_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  check_port_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  check_port_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: reader_start_exec_i
-   */
-
-  reader_start_exec_i::reader_start_exec_i (
-        ::ReadGet_Test::CCM_Receiver_Context_ptr ctx,
-        Receiver_exec_i &callback)
-    : ciao_context_ (
-        ::ReadGet_Test::CCM_Receiver_Context::_duplicate (ctx))
-      , callback_ (callback)
-  {
-  }
-
-  reader_start_exec_i::~reader_start_exec_i (void)
-  {
-  }
-
-  // Operations from ::ReadGetStarter
-
-  void
-  reader_start_exec_i::set_reader_properties (::CORBA::UShort nr_keys,
-  ::CORBA::UShort nr_iterations)
-  {
-    this->callback_.keys (nr_keys);
-    this->callback_.iterations (nr_iterations);
-  }
-
-  void
-  reader_start_exec_i::start_read (::CORBA::UShort run)
-  {
-    this->callback_.start_read (run);
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-      : iterations_ (20)
-        , keys_ (5)
-        , current_min_iteration_ (ACE_OS::atoi (MIN_ITERATION_1))
-        , current_max_iteration_ (ACE_OS::atoi (MAX_ITERATION_1))
-        , ticker_ (0)
-        , samples_expected_getter_ (0)
-        , samples_received_getter_ (0)
-        , samples_expected_reader_ (0)
-        , samples_received_reader_ (0)
-
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Receiver_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  bool
-  Receiver_exec_i::check_last ()
-  {
-    ::ReadGet_Test::QueryConditionTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_get_port_data ();
-
-    try
-      {
-        QueryConditionTest queryfiltertest_info;
-        ::CCM_DDS::ReadInfo readinfo;
-        char key[10];
-        ACE_OS::sprintf (key, "KEY_%d", this->keys_);
-        queryfiltertest_info.symbol = CORBA::string_dup (key);
-        reader->read_one_last (
-                queryfiltertest_info,
-                readinfo,
-                ::DDS::HANDLE_NIL);
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_last - "
-                              "last iteration <%02d> - <%02d>\n",
-                               queryfiltertest_info.iteration,
-                               this->current_max_iteration_ - 1));
-        return queryfiltertest_info.iteration >= this->current_max_iteration_ - 1;
-      }
-    catch (const ::CCM_DDS::InternalError &)
-      {
-      }
-    catch (const ::CCM_DDS::NonExistent &)
-      {
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::check_last: "
-                              "ERROR: Unexpected exception caught\n"));
-      }
-    return false;
-  }
-
-  // Supported operations and attributes.
-  void
-  Receiver_exec_i::check_iter (const QueryConditionTest & sample,
-                               const char * test)
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%C ALL : ")
-        ACE_TEXT ("sample received for <%C>: iteration <%02u>\n"),
-        test,
-        sample.symbol.in (),
-        sample.iteration));
-    if (sample.iteration <= ACE_OS::atoi (MIN_ITERATION_1))
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: %C ALL: "
-                              "Didn't expect samples with iterations "
-                              "<= %02d\n",
-                              test,
-                              this->current_min_iteration_));
-      }
-    if (sample.iteration > this->current_max_iteration_)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: %C ALL: "
-                              "Didn't expect samples with iterations "
-                              "> %02d\n",
-                              test,
-                              this->current_max_iteration_));
-      }
-  }
-
-
-  void
-  Receiver_exec_i::read_all (void)
-  {
-    ::ReadGet_Test::QueryConditionTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_get_port_data ();
-
-    QueryConditionTestSeq queryfiltertest_info_seq;
-    ::CCM_DDS::ReadInfoSeq readinfo_seq;
-    reader->read_all (queryfiltertest_info_seq, readinfo_seq);
-    if (queryfiltertest_info_seq.length () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::read_all : "
-                              "No samples available in Reader!\n"));
-      }
-    for (CORBA::ULong it = 0; it < queryfiltertest_info_seq.length (); ++it)
-      {
-        this->check_iter (queryfiltertest_info_seq[it], "READ");
-      }
-    this->samples_received_reader_ += queryfiltertest_info_seq.length ();
-  }
-
-  void
-  Receiver_exec_i::get_all (void)
-  {
-    ::ReadGet_Test::QueryConditionTestConnector::Getter_var getter =
-      this->ciao_context_->get_connection_get_port_fresh_data ();
-
-    if (::CORBA::is_nil (getter.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_all - "
-                              "ERROR: No Getter\n"));
-      }
-    QueryConditionTest_var qf_info;
-    ::CCM_DDS::ReadInfo readinfo;
-    CORBA::Boolean result = getter->get_one (qf_info.out (), readinfo);
-    if (ACE_OS::strlen (qf_info->symbol.in ()) == 0)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::get_all - ")
-                              ACE_TEXT ("Name of key seems to be empty-> bailing out\n")));
-        return;
-      }
-    if (result)
-      {
-        this->check_iter (qf_info.in (), "GET");
-        ++this->samples_received_getter_;
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_all - "
-                              "ERROR: time out when retrieving "
-                              "first sample.\n"));
-      }
-    while (result)
-      {
-        result = getter->get_one (qf_info.out (), readinfo);
-        if (result)
-          {
-            this->check_iter (qf_info.in (), "GET");
-            ++this->samples_received_getter_;
-          }
-      }
-  }
-
-  void
-  Receiver_exec_i::check_all (void)
-  {
-    ::ReadGet_Test::QueryConditionTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_check_port_data ();
-
-    QueryConditionTestSeq queryfiltertest_info_seq;
-    ::CCM_DDS::ReadInfoSeq readinfo_seq;
-    reader->read_all (queryfiltertest_info_seq, readinfo_seq);
-
-    for (CORBA::ULong it = 0; it < queryfiltertest_info_seq.length (); ++it)
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\t\tCHECK ALL : ")
-            ACE_TEXT ("sample received for <%C>: iteration <%02u> - ")
-            ACE_TEXT ("access_status <%C> - instance_status <%d>\n"),
-            queryfiltertest_info_seq[it].symbol.in (),
-            queryfiltertest_info_seq[it].iteration,
-            CIAO::DDS4CCM::translate_ccm_dds_accessstatus (readinfo_seq[it].access_status),
-            readinfo_seq[it].instance_status));
-      }
-    CORBA::ULong expected = 0;
-    if (this->current_min_iteration_ == ACE_OS::atoi (MIN_ITERATION_1))
-      {
-        expected = this->iterations_ * this->keys_;
-      }
-    else if (this->current_min_iteration_ == ACE_OS::atoi (MIN_ITERATION_2))
-      {
-        expected = this->iterations_ * this->keys_ * 2;
-      }
-    if (queryfiltertest_info_seq.length () == expected)
-      {
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_all - "
-                    "OK : All samples received on the DDS_Read port: "
-                    "expected <%02u> - received <%02u>\n",
-                    expected,
-                    queryfiltertest_info_seq.length ()));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::check_all - "
-                    "ERROR: Unexpected number of samples received "
-                    "on the DDS_Read port: "
-                    "expected <%u> - received <%u>\n",
-                    expected,
-                    queryfiltertest_info_seq.length ()));
-      }
-  }
-
-  void
-  Receiver_exec_i::test_all ()
-  {
-    const char * test = "GET ALL";
-    try
-      {
-        get_all ();
-        test = "READ ALL";
-        read_all ();
-        // reading all samples on a different port.
-         check_all ();
-      }
-    catch (const CCM_DDS::NonExistent& ex)
-      {
-        for (CORBA::ULong i = 0; i < ex.indexes.length (); ++i)
-          {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ERROR %C: ")
-                  ACE_TEXT ("caught expected exception: index <%u>\n"),
-                  test,
-                  ex.indexes[i]));
-          }
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: %C: ")
-              ACE_TEXT ("caught InternalError exception: retval <%u>\n"),
-              test,
-              ex.error_code));
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception (test);
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Receiver_exec_i::test_all : Exception caught\n")));
-      }
-  }
-
-  void
-  Receiver_exec_i::test_exception ()
-  {
-    ::CCM_DDS::QueryFilter_var query;
-    ::ReadGet_Test::QueryConditionTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_get_port_data ();
-
-    try
-      {
-        query = reader->query ();
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::test_excep - "
-                              "Expected InternalErr excep caught : retval <%u>\n",
-                              ex.error_code));
-        return;
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Receiver_exec_i::test_exception: ");
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::test_exception - "
-                              "Unexpected exception caught\n"));
-        return;
-      }
-    ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::test_exception - "
-                          "No exception caught while retrieving unset filter.\n"));
-  }
-
-  void
-  Receiver_exec_i::check_filter ()
-  {
-    ::CCM_DDS::QueryFilter_var filter;
-    ::ReadGet_Test::QueryConditionTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_get_port_data ();
-    try
-      {
-        filter = reader->query ();
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - "
-                              "caught InternalError exception: retval <%u>\n",
-                              ex.error_code));
-        return;
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Receiver_exec_i::check_filter: ");
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - "
-                              "Exception caught\n"));
-        return;
-      }
-
-    //check query
-    bool error = false;
-    if (ACE_OS::strcmp (filter->expression, QUERY) != 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - "
-                              "Unexpected query when retrieving filter: "
-                              "expected <%C> - received <%C>\n",
-                              QUERY, filter->expression.in ()));
-        error = true;
-      }
-    //check current parameters.
-    if (filter->parameters.length () != 2)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - "
-                              "Unexpected number of parameters: "
-                              "expected <%d> - received <%d>\n",
-                              2, filter->parameters.length ()));
-        error = true;
-      }
-
-    if (filter->parameters.length () >= 1)
-      {
-        if (ACE_OS::atoi (filter->parameters[0]) != this->current_min_iteration_)
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - "
-                                  "Unexpected param value: "
-                                  "expected <%d> - received <%C>\n",
-                                  this->current_min_iteration_,
-                                  filter->parameters[0].in ()));
-            error = true;
-          }
-      }
-    if (filter->parameters.length () >= 2)
-      {
-        if (ACE_OS::atoi (filter->parameters[1]) != this->current_max_iteration_)
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - "
-                                  "Unexpected param value: "
-                                  "expected <%d> - received <%C>\n",
-                                  this->current_max_iteration_,
-                                  filter->parameters[1].in ()));
-            error = true;
-          }
-      }
-    if (!error)
-      {
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_filter - "
-                              "Passed check_filter test.\n"));
-      }
-  }
-
-  void
-  Receiver_exec_i::test_set_query_parameters ()
-  {
-    try
-      {
-        ::ReadGet_Test::QueryConditionTestConnector::Reader_var reader =
-          this->ciao_context_->get_connection_get_port_data ();
-
-        ::CCM_DDS::QueryFilter filter;
-        filter.expression = CORBA::string_dup (QUERY);
-        filter.parameters.length (2);
-        filter.parameters[0] = CORBA::string_dup (MIN_ITERATION_2);
-        filter.parameters[1] = CORBA::string_dup (MAX_ITERATION_2);
-        reader->query (filter);
-        this->current_min_iteration_ = ACE_OS::atoi (MIN_ITERATION_2);
-        this->current_max_iteration_ = ACE_OS::atoi (MAX_ITERATION_2);
-
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::test_set_query_parameters - "
-                    "New query parameters set (<%C> - <%C>)!\n",
-                    MIN_ITERATION_2, MAX_ITERATION_2));
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::test_set_query_parameters - "
-                              "caught InternalError exception: retval <%u>\n",
-                              ex.error_code));
-        return;
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Receiver_exec_i::test_set_query_parameters: ");
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::test_set_query_parameters - "
-                              "Exception caught\n"));
-        return;
-      }
-  }
-
-  void
-  Receiver_exec_i::set_filter ()
-  {
-    ACE_DEBUG ((LM_DEBUG, "Set filter\n"));
-    ::ReadGet_Test::QueryConditionTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_get_port_data ();
-    ::CCM_DDS::QueryFilter filter;
-    filter.expression = CORBA::string_dup (QUERY);
-    filter.parameters.length (2);
-    filter.parameters[0] = CORBA::string_dup (MIN_ITERATION_1);
-    filter.parameters[1] = CORBA::string_dup (MAX_ITERATION_1);
-    reader->query (filter);
-  }
-
-  void
-  Receiver_exec_i::start_read (CORBA::UShort run)
-  {
-    this->ticker_ = new read_action_Generator (*this, run);
-    if (this->reactor ()->schedule_timer (this->ticker_,
-                                          0,
-                                          ACE_Time_Value(1, 0),
-                                          ACE_Time_Value(1, 0)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, "Unable to schedule Timer\n"));
-      }
-  }
-
-  void
-  Receiver_exec_i::run (CORBA::UShort run)
-  {
-    if (this->ticker_)
-      {
-        this->reactor ()->cancel_timer (this->ticker_);
-        delete this->ticker_;
-        this->ticker_ = 0;
-      }
-    ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::run - "
-                          "Starting run number <%d>\n",
-                          run));
-    switch (run)
-    {
-      case 1:
-        {
-          this->test_exception ();
-          this->set_filter ();
-          this->restarter_->restart_write ();
-        }
-        break;
-      case 2:
-        {
-          this->test_all ();
-          check_filter ();
-          this->test_set_query_parameters ();
-          this->restarter_->restart_write ();
-        }
-        break;
-      case 3:
-        {
-          this->test_all ();
-          this->check_filter ();
-        }
-        break;
-    }
-  }
-
-  void
-  Receiver_exec_i::iterations (::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-
-  }
-
-  void
-  Receiver_exec_i::keys (::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-
-    this->samples_expected_getter_ = (this->keys_ - 1) * SAMPLES_PER_KEY_GETTER;
-    this->samples_expected_reader_ = (this->keys_) * SAMPLES_PER_KEY_READER;
-  }
-
-  // Component attributes and port operations.
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_get_port_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_get_port_status_.in ()))
-      {
-        get_port_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          get_port_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_get_port_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_get_port_status_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_check_port_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_check_port_status_.in ()))
-      {
-        check_port_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          check_port_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_check_port_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_check_port_status_.in ());
-  }
-
-  ::CCM_ReadGetStarter_ptr
-  Receiver_exec_i::get_reader_start (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_reader_start_.in ()))
-      {
-        reader_start_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          reader_start_exec_i (
-            this->ciao_context_.in (),
-            *this),
-            ::CCM_ReadGetStarter::_nil ());
-
-          this->ciao_reader_start_ = tmp;
-      }
-
-    return
-      ::CCM_ReadGetStarter::_duplicate (
-        this->ciao_reader_start_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::ReadGet_Test::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    ::ReadGet_Test::QueryConditionTestConnector::Getter_var getter =
-      this->ciao_context_->get_connection_get_port_fresh_data ();
-    DDS::Duration_t to;
-    to.sec = 5;
-    to.nanosec = 0;
-    if (! ::CORBA::is_nil (getter))
-      {
-        getter->time_out (to);
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Unable to set time out.\n"));
-      }
-    this->restarter_ = this->ciao_context_->get_connection_writer_restart ();
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    if (this->ticker_)
-      {
-        this->reactor ()->cancel_timer (this->ticker_);
-        delete this->ticker_;
-        this->ticker_ = 0;
-      }
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    if (this->samples_received_getter_ != this->samples_expected_getter_)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: READGET GETTER : "
-                              "Unexpected number of samples received: "
-                              "expected <%d> - received <%d>\n",
-                              this->samples_expected_getter_,
-                              this->samples_received_getter_));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "READGET : GETTER : "
-                              "Expected number of samples received: "
-                              "expected <%d> - received <%d>\n",
-                              this->samples_expected_getter_,
-                              this->samples_received_getter_));
-      }
-    if (this->samples_received_reader_ != this->samples_expected_reader_)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: READGET READER : "
-                              "Unexpected number of samples received: "
-                              "expected <%d> - received <%d>\n",
-                              this->samples_expected_reader_,
-                              this->samples_received_reader_));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "READGET : READER : "
-                              "Expected number of samples received: "
-                              "expected <%d> - received <%d>\n",
-                              this->samples_expected_reader_,
-                              this->samples_received_reader_));
-      }
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_ReadGet_Test_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h
deleted file mode 100644
index 9411f74f4b6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h
+++ /dev/null
@@ -1,253 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_READGET_TEST_RECEIVER_EXEC_WOPYWH_H_
-#define CIAO_READGET_TEST_RECEIVER_EXEC_WOPYWH_H_
-
-#include /**/ "ace/pre.h"
-
-#include "ReadGet_Test_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_ReadGet_Test_Receiver_Impl
-{
-  class Receiver_exec_i;
-
-  /**
-   * Read action generator
-   */
-  class read_action_Generator
-    : public ACE_Event_Handler
-  {
-  public:
-    read_action_Generator (Receiver_exec_i &callback,
-                           int run);
-
-    ~read_action_Generator ();
-
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    Receiver_exec_i &callback_;
-    int run_;
-
-  };
-
-
-  /**
-   * Provider Executor Implementation Class: get_port_status_exec_i
-   */
-
-  class get_port_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    get_port_status_exec_i (
-      ::ReadGet_Test::CCM_Receiver_Context_ptr ctx);
-    virtual ~get_port_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::ReadGet_Test::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: check_port_status_exec_i
-   */
-
-  class check_port_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    check_port_status_exec_i (
-      ::ReadGet_Test::CCM_Receiver_Context_ptr ctx);
-    virtual ~check_port_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::ReadGet_Test::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: reader_start_exec_i
-   */
-
-  class reader_start_exec_i
-    : public virtual ::CCM_ReadGetStarter,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    reader_start_exec_i (
-      ::ReadGet_Test::CCM_Receiver_Context_ptr ctx,
-      Receiver_exec_i &callback);
-    virtual ~reader_start_exec_i (void);
-
-    //@{
-    /** Operations and attributes from ReadGetStarter. */
-
-    virtual
-    void set_reader_properties (::CORBA::UShort nr_keys,
-    ::CORBA::UShort nr_iterations);
-
-    virtual
-    void start_read (::CORBA::UShort run);
-    //@}
-
-  private:
-    ::ReadGet_Test::CCM_Receiver_Context_var ciao_context_;
-    Receiver_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_get_port_status (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_check_port_status (void);
-
-    virtual ::CCM_ReadGetStarter_ptr
-    get_reader_start (void);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void iterations (CORBA::UShort iterations);
-    void keys (::CORBA::UShort keys);
-
-    bool check_last (void);
-    void start_read (::CORBA::UShort run);
-    void run (::CORBA::UShort run);
-    //@}
-
-  private:
-    ::ReadGet_Test::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_get_port_status_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_check_port_status_;
-    ::CCM_ReadGetStarter_var ciao_reader_start_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    ReadGetRestarter_var restarter_;
-    ::CORBA::UShort   iterations_;
-    ::CORBA::UShort   keys_;
-
-    int current_min_iteration_;
-    int current_max_iteration_;
-
-    read_action_Generator *ticker_;
-
-    ::CORBA::ULong samples_expected_getter_;
-    ::CORBA::ULong samples_received_getter_;
-    ::CORBA::ULong samples_expected_reader_;
-    ::CORBA::ULong samples_received_reader_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void test_all (void);
-    void read_all (void);
-    void get_all (void);
-    void check_all (void);
-    void check_iter (const QueryConditionTest & sample,
-                     const char * test);
-    void check_filter (void);
-    void test_exception (void);
-    void test_set_query_parameters (void);
-    void set_filter (void);
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_ReadGet_Test_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.idl
deleted file mode 100644
index fa2aa12902b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_QUERY_CONDITION_TEST_SENDER_IDL
-#define DDS_QUERY_CONDITION_TEST_SENDER_IDL
-
-#include "Connector/ReadGet_Test_Connector.idl"
-#include "Base/ReadGet_Starter.idl"
-
-module ReadGet_Test
-{
-  component Sender
-  {
-    port ReadGet_Test::QueryConditionTestConnector::DDS_Write info_write;
-    provides CCM_DDS::ConnectorStatusListener connector_status;
-
-    uses ReadGetStarter start_reader;
-    provides ReadGetRestarter restart_writer;
-
-    attribute unsigned short keys;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.mpc
deleted file mode 100644
index 324b3be379a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.mpc
+++ /dev/null
@@ -1,153 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p ReadGet_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(QC_ReadGet_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += QC_ReadGet_Test_Connector_idl_gen QC_ReadGet_Starter_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I ..
-
-  IDL_Files {
-    ReadGet_Test_Sender.idl
-  }
-}
-
-project(QC_ReadGet_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += QC_ReadGet_Test_Sender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    ReadGet_Test_SenderE.idl
-  }
-}
-
-project(QC_ReadGet_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += QC_ReadGet_Test_Sender_lem_gen QC_ReadGet_Test_Sender_stub \
-           QC_ReadGet_Test_Base_stub QC_ReadGet_Starter_stub
-  libs  += QC_ReadGet_Test_Base_stub Sender_stub QC_ReadGet_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_Test_SenderEC.cpp
-  }
-
-  Header_Files {
-    ReadGet_Test_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    ReadGet_Test_SenderEC.inl
-  }
-}
-
-project(QC_ReadGet_Test_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += QC_ReadGet_Test_Sender_idl_gen QC_ReadGet_Test_Base_stub \
-           QC_ReadGet_Test_Connector_stub QC_ReadGet_Starter_stub \
-           QC_ReadGet_Starter_lem_stub
-  libs  += QC_ReadGet_Test_Base_stub QC_ReadGet_Test_Connector_stub \
-           QC_ReadGet_Starter_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_Test_SenderC.cpp
-  }
-
-  Header_Files {
-    ReadGet_Test_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    ReadGet_Test_SenderC.inl
-  }
-}
-
-project(QC_ReadGet_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += QC_ReadGet_Test_Sender_lem_stub QC_ReadGet_Test_Sender_stub \
-             QC_ReadGet_Test_Connector_lem_stub QC_ReadGet_Test_Connector_stub \
-             QC_ReadGet_Starter_lem_stub
-  sharedname = Sender_exec
-  libs    += Sender_stub Sender_lem_stub QC_ReadGet_Test_Base_stub \
-             QC_ReadGet_Test_Connector_lem_stub QC_ReadGet_Test_Connector_stub \
-             QC_ReadGet_Starter_stub QC_ReadGet_Starter_lem_stub \
-             QC_ReadGet_Starter_lem_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_Test_Sender_exec.cpp
-  }
-
-  Header_Files {
-    ReadGet_Test_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(QC_ReadGet_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += QC_ReadGet_Test_Base_stub  QC_ReadGet_Test_Sender_lem_stub \
-                QC_ReadGet_Test_Connector_stub \
-                QC_ReadGet_Test_Connector_svnt QC_ReadGet_Test_Connector_lem_stub \
-                QC_ReadGet_Starter_stub QC_ReadGet_Starter_svnt \
-                QC_ReadGet_Starter_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub QC_ReadGet_Test_Base_stub \
-                QC_ReadGet_Test_Connector_stub QC_ReadGet_Test_Connector_svnt \
-                QC_ReadGet_Test_Connector_lem_stub QC_ReadGet_Starter_stub \
-                QC_ReadGet_Starter_svnt QC_ReadGet_Starter_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_Test_SenderS.cpp
-    ReadGet_Test_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    ReadGet_Test_SenderS.h
-    ReadGet_Test_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp
deleted file mode 100644
index 65ef479b4dc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp
+++ /dev/null
@@ -1,345 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "ReadGet_Test_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-#define ITERATIONS 20
-
-namespace CIAO_ReadGet_Test_Sender_Impl
-{
-  /**
-   * ConnectorStatusListener_exec_i
-   */
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (
-    Sender_exec_i &callback)
-    : callback_ (callback)
-    , started_ (false)
-  {
-  }
-
-  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic (
-    ::DDS::Topic_ptr /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status(
-    ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind status_kind)
-  {
-    if (!this->started_ && status_kind == ::DDS::PUBLICATION_MATCHED_STATUS)
-      {
-        this->started_ = true;
-        ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_unexpected_status - "
-          "Publication matched received: starting the test\n"));
-
-        this->callback_.get_started ();
-      }
-  }
-
-  /**
-   * Writehandler
-   */
-
-  WriteHandler::WriteHandler (Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  WriteHandler::handle_exception (ACE_HANDLE)
-  {
-    this->callback_.start ();
-    return 0;
-  }
-
-  /**
-   * Facet Executor Implementation Class: restart_writer_exec_i
-   */
-
-  restart_writer_exec_i::restart_writer_exec_i (
-        ::ReadGet_Test::CCM_Sender_Context_ptr ctx,
-        Sender_exec_i &callback)
-    : ciao_context_ (
-        ::ReadGet_Test::CCM_Sender_Context::_duplicate (ctx))
-      , callback_ (callback)
-  {
-  }
-
-  restart_writer_exec_i::~restart_writer_exec_i (void)
-  {
-  }
-
-  // Operations from ::ReadGetRestarter
-
-  void
-  restart_writer_exec_i::restart_write (void)
-  {
-    this->callback_.restart ();
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : keys_ (5)
-      , iterations_ (ITERATIONS)
-      , run_ (1)
-  {
-    ACE_NEW_THROW_EX (this->wh_,
-                      WriteHandler (*this),
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->wh_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Sender_exec_i::restart (void)
-  {
-    ++this->run_;
-    if (this->wh_)
-      {
-        delete this->wh_;
-        this->wh_ = 0;
-      }
-    ACE_NEW_THROW_EX (this->wh_,
-                      WriteHandler (*this),
-                      ::CORBA::NO_MEMORY ());
-    this->reactor ()->notify (this->wh_);
-  }
-
-  void
-  Sender_exec_i::get_started (void)
-  {
-    try
-      {
-        this->reactor ()->notify (this->wh_);
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("Exception caught:");
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: get_started : Exception caught\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: get_started : Unknown exception caught\n")));
-      }
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    ::ReadGet_Test::QueryConditionTestConnector::Writer_var writer =
-      this->ciao_context_->get_connection_info_write_data ();
-    ReadGetStarter_var starter =
-      this->ciao_context_->get_connection_start_reader ();
-
-    if (! ::CORBA::is_nil (starter.in ()))
-      {
-        starter->set_reader_properties (this->keys_, this->iterations_);
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Unable to start the reader\n")));
-        return;
-      }
-    if (this->run_ > 1)
-      {
-        for (CORBA::UShort iter_key = 1; iter_key < this->keys_ + 1; ++iter_key)
-          {
-            char key[7];
-            QueryConditionTest new_key;
-            ACE_OS::sprintf (key, "KEY_%d", iter_key);
-            new_key.symbol = CORBA::string_dup(key);
-            CORBA::UShort iter = 1;
-            if (this->run_ == 3)
-              {
-                iter = this->iterations_ + 1;
-              }
-            while (iter < (this->run_ - 1) * this->iterations_ + 1)
-              {
-                new_key.iteration = iter;
-                writer->write_one (new_key, ::DDS::HANDLE_NIL);
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Written key <%C> with <%d>\n"),
-                            key, iter));
-                ++iter;
-              }
-          }
-        ACE_OS::sleep (1);
-      }
-    starter->start_read (this->run_);
-  }
-
-  // Component attributes and port operations.
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i  (*this);
-  }
-
-  ::CCM_ReadGetRestarter_ptr
-  Sender_exec_i::get_restart_writer (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_restart_writer_.in ()))
-      {
-        restart_writer_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          restart_writer_exec_i (
-            this->ciao_context_.in (),
-            *this),
-            ::CCM_ReadGetRestarter::_nil ());
-
-          this->ciao_restart_writer_ = tmp;
-      }
-
-    return
-      ::CCM_ReadGetRestarter::_duplicate (
-        this->ciao_restart_writer_.in ());
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::ReadGet_Test::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_ReadGet_Test_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.h
deleted file mode 100644
index f0e764a708b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.h
+++ /dev/null
@@ -1,195 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_READGET_TEST_SENDER_EXEC_CB6ML7_H_
-#define CIAO_READGET_TEST_SENDER_EXEC_CB6ML7_H_
-
-#include /**/ "ace/pre.h"
-
-#include "ReadGet_Test_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_ReadGet_Test_Sender_Impl
-{
-  class Sender_exec_i;
-
-  /**
-   * ConnectorStatusListener_exec_i
-   */
-  class SENDER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Sender_exec_i &callback);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-      void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                                 ::DDS::StatusKind status_kind);
-  private:
-    Sender_exec_i &callback_;
-    bool started_;
-  };
-
-  /**
-   * Write Handler
-   */
-  class WriteHandler :
-    public ACE_Event_Handler
-  {
-  public:
-    WriteHandler (Sender_exec_i &callback);
-    virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: restart_writer_exec_i
-   */
-
-  class restart_writer_exec_i
-    : public virtual ::CCM_ReadGetRestarter,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    restart_writer_exec_i (
-      ::ReadGet_Test::CCM_Sender_Context_ptr ctx,
-      Sender_exec_i & callback);
-    virtual ~restart_writer_exec_i (void);
-
-    //@{
-    /** Operations and attributes from ReadGetRestarter. */
-
-    virtual
-    void restart_write (void);
-    //@}
-
-  private:
-    ::ReadGet_Test::CCM_Sender_Context_var ciao_context_;
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_connector_status (void);
-
-    virtual ::CCM_ReadGetRestarter_ptr
-    get_restart_writer (void);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void get_started (void);
-    void start (void);
-    void restart (void);
-
-    //@}
-
-  private:
-    ::ReadGet_Test::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::CCM_ReadGetRestarter_var ciao_restart_writer_;
-
-    ::CORBA::UShort keys_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    ::CORBA::UShort iterations_;
-    ::CORBA::UShort run_;
-    WriteHandler *wh_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_ReadGet_Test_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/Plan.cdp
deleted file mode 100644
index 49eda282c3c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/Plan.cdp
+++ /dev/null
@@ -1,516 +0,0 @@
-<!--  -->
-<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>ReadGet_Test_Depl_1</label>
-  <UUID>ReadGet_Test_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_ReadGet_Test_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_ReadGet_Test_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="ReadGet_Test_EventConnectorImplementation">
-    <name>ReadGet_Test_EventConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="ReadGet_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="ReadGet_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_ReadGet_Test_QueryConditionTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_ReadGet_Test_QueryConditionTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QC_ReadGet_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QC_ReadGet_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="ReadGet_Test_StateConnectorImplementation">
-    <name>ReadGet_Test_StateConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="ReadGet_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="ReadGet_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_ReadGet_Test_QueryConditionTestConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_ReadGet_Test_QueryConditionTestConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QC_ReadGet_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QC_ReadGet_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_ReadGet_Test_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_ReadGet_Test_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-  </instance>
-
-  <instance xmi:id="ReadGet_Test_SenderConnectorInstance">
-    <name>ReadGet_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReadGet_Test_EventConnectorImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QueryCondition_Library#QueryConditionProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReadGet_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ReadGet_Test_EventConnector">
-    <name>ReadGet_Test_EventConnector</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReadGet_Test_EventConnectorImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QueryCondition_Library#QueryConditionProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReadGet_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="ReadGet_Test_StateConnector">
-    <name>ReadGet_Test_ConnectorComponent3</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReadGet_Test_StateConnectorImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QueryCondition_Library#QueryConditionProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReadGet_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>get_port_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>get_port_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReadGet_Test_EventConnector" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>check_port_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>check_port_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReadGet_Test_StateConnector" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>get_port_fresh_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>get_port_fresh_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_fresh_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReadGet_Test_EventConnector" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReadGet_Test_SenderConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>reader_starter</name>
-    <internalEndpoint>
-      <portName>start_reader</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>reader_start</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>restart_writer</name>
-    <internalEndpoint>
-      <portName>writer_restart</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>restart_writer</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReadGet_Test_SenderConnectorInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="ReadGet_Test_Connector_ExecArtifact">
-    <name>QC_ReadGet_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>QC_ReadGet_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="ReadGet_Test_Connector_SvntArtifact">
-    <name>QC_ReadGet_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>QC_ReadGet_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="ReadGet_Test_Connector_StubArtifact">
-    <name>QC_ReadGet_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>QC_ReadGet_Test_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/QueryCondition_Library.xml b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/QueryCondition_Library.xml
deleted file mode 100644
index b9cba6277a3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/QueryCondition_Library.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-
-  <qos_profile name="QueryConditionProfile">
-    <!-- QoS used to configure the data writer created in the example code -->
-    <datawriter_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-        <max_blocking_time>
-          <sec>10</sec>
-          <nanosec>0</nanosec>
-        </max_blocking_time>
-      </reliability>
-      <durability>
-        <kind>TRANSIENT_DURABILITY_QOS</kind>
-      </durability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-    </datawriter_qos>
-    <!-- QoS used to configure the data reader created in the example code -->
-    <datareader_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-      </reliability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-      <durability>
-        <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-      </durability>
-    </datareader_qos>
-  </qos_profile>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index 37e7ff8dec9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-Description
-XML QoS Profile
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="QueryCondition_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="QueryConditionProfile" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>10</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/run_test.pl
deleted file mode 100755
index 638d55cd247..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 30 seconds to allow task to complete\n";
-sleep (30);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -s\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.idl
deleted file mode 100644
index 2f470af6d24..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file QCLS_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef QUERY_CONDITION_LISTEN_STATE_TEST_BASE_IDL
-#define QUERY_CONDITION_LISTEN_STATE_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/QCLS_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/QCLS_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "QueryConditionListenStateTest"
-#pragma DCPS_DATA_KEY "QueryConditionListenStateTest key"
-
-struct QueryConditionListenStateTest {
-  string key; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<QueryConditionListenStateTest> QueryConditionListenStateTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.mpc
deleted file mode 100644
index 99a8da1826c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_QCLS_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_QCLS_Test_Base_stub
-  dynamicflags += QUERY_CONDITION_LISTEN_STATE_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=QUERY_CONDITION_LISTEN_STATE_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=QCLS_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    QCLS_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=QUERY_CONDITION_LISTEN_STATE_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    QCLS_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.idl
deleted file mode 100644
index 02f87bf8135..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file QCLS_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef QUERY_CONDITION_LISTEN_STATE_TEST_CONNECTOR_IDL_
-#define QUERY_CONDITION_LISTEN_STATE_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/QCLS_Test_Base.idl"
-
-#pragma ciao lem "Connector/QCLS_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/QCLS_Test_BaseTypeSupport.idl"
-#endif
-
-module QCLS_Test
-{
-  module ::CCM_DDS::Typed < ::QueryConditionListenStateTest, ::QueryConditionListenStateTestSeq> QueryConditionListenStateTestConnector;
-};
-
-#endif /* QCLS_Test_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.mpc
deleted file mode 100644
index 345969c2e1d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_QCLS_Test_Base -l .. -o ../lib -u DDS QCLS_Test_Connector"
-
-project(DDS_QCLS_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_QCLS_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=QUERY_CONDITION_LISTEN_STATE_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=QCLS_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=QUERY_CONDITION_LISTEN_STATE_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=QCLS_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=QUERY_CONDITION_LISTEN_STATE_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=QCLS_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=QUERY_CONDITION_LISTEN_STATE_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=QCLS_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    QCLS_Test_Connector.idl
-  }
-}
-
-project(DDS_QCLS_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_QCLS_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=QUERY_CONDITION_LISTEN_STATE_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=QCLS_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    QCLS_Test_ConnectorE.idl
-  }
-}
-
-project(DDS_QCLS_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_QCLS_Test_Connector_lem_gen DDS_QCLS_Test_Connector_stub DDS_QCLS_Test_Base_stub
-  libs  += DDS_QCLS_Test_Base_stub DDS_QCLS_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_QCLS_Test_Connector_lem_stub
-  dynamicflags += QUERY_CONDITION_LISTEN_STATE_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCLS_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    QCLS_Test_ConnectorEC.h
-    QCLS_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    QCLS_Test_ConnectorEC.inl
-  }
-}
-
-project(DDS_QCLS_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_QCLS_Test_Connector_idl_gen DDS_QCLS_Test_Base_stub
-  libs  += DDS_QCLS_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_QCLS_Test_Connector_stub
-  dynamicflags += QUERY_CONDITION_LISTEN_STATE_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCLS_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    QCLS_Test_ConnectorC.h
-    QCLS_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    QCLS_Test_ConnectorC.inl
-  }
-}
-
-project(DDS_QCLS_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_QCLS_Test_Connector_lem_stub DDS_QCLS_Test_Connector_stub DDS_QCLS_Test_Base_stub
-  sharedname = DDS_QCLS_Test_Connector_exec
-  libs += DDS_QCLS_Test_Connector_stub DDS_QCLS_Test_Connector_lem_stub DDS_QCLS_Test_Base_stub DDS_QCLS_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += QUERY_CONDITION_LISTEN_STATE_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCLS_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    QCLS_Test_Connector_conn.h
-    QCLS_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_QCLS_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_QCLS_Test_Connector_lem_stub DDS_QCLS_Test_Connector_exec DDS_QCLS_Test_Connector_stub
-  sharedname  = DDS_QCLS_Test_Connector_svnt
-  libs       += DDS_QCLS_Test_Connector_stub \
-                DDS_QCLS_Test_Connector_lem_stub  \
-                DDS_QCLS_Test_Base_stub \
-                DDS_QCLS_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += QUERY_CONDITION_LISTEN_STATE_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCLS_Test_ConnectorS.cpp
-    QCLS_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    QCLS_Test_ConnectorS.h
-    QCLS_Test_Connector_svnt.h
-    QCLS_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver.idl
deleted file mode 100644
index 6aaeda5aab0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/QCLS_Test_Connector.idl"
-
-module QCLS_Test
-{
-  component Receiver
-  {
-    port QueryConditionListenStateTestConnector::DDS_StateListen info_state;
-
-    attribute unsigned short keys;
-    attribute unsigned short iterations;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver.mpc
deleted file mode 100644
index d5fb10e8472..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver.mpc
+++ /dev/null
@@ -1,146 +0,0 @@
-project(DDS_QCLS_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_QCLS_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h \
-              -I..
-
-  IDL_Files {
-    QCLS_Test_Receiver.idl
-  }
-}
-
-project(DDS_QCLS_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_QCLS_Test_Receiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    QCLS_Test_ReceiverE.idl
-  }
-}
-
-project(DDS_QCLS_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_QCLS_Test_Receiver_lem_gen DDS_QCLS_Test_Receiver_stub  \
-           DDS_QCLS_Test_Connector_stub DDS_QCLS_Test_Base_stub
-  libs  +=  Receiver_stub DDS_QCLS_Test_Connector_stub \
-            DDS_QCLS_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCLS_Test_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    QCLS_Test_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    QCLS_Test_ReceiverEC.inl
-  }
-}
-
-project(DDS_QCLS_Test_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_QCLS_Test_Receiver_idl_gen  DDS_QCLS_Test_Connector_stub \
-           DDS_QCLS_Test_Base_stub DDS_QCLS_Test_Connector_lem_gen
-  libs  += DDS_QCLS_Test_Connector_stub DDS_QCLS_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCLS_Test_ReceiverC.cpp
-  }
-
-  Header_Files {
-    QCLS_Test_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    QCLS_Test_ReceiverC.inl
-  }
-}
-
-project(DDS_QCLS_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_QCLS_Test_Receiver_lem_stub DDS_QCLS_Test_Receiver_stub \
-             DDS_QCLS_Test_Base_stub DDS_QCLS_Test_Connector_stub \
-             DDS_QCLS_Test_Connector_lem_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_QCLS_Test_Base_stub \
-          DDS_QCLS_Test_Connector_stub DDS_QCLS_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCLS_Test_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    QCLS_Test_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_QCLS_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_QCLS_Test_Receiver_lem_stub DDS_QCLS_Test_Base_stub \
-                  DDS_QCLS_Test_Connector_stub DDS_QCLS_Test_Connector_svnt \
-                  DDS_QCLS_Test_Receiver_exec DDS_QCLS_Test_Connector_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_QCLS_Test_Base_stub \
-                DDS_QCLS_Test_Connector_stub DDS_QCLS_Test_Connector_svnt \
-                Receiver_exec DDS_QCLS_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCLS_Test_ReceiverS.cpp
-    QCLS_Test_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    QCLS_Test_ReceiverS.h
-    QCLS_Test_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.cpp
deleted file mode 100644
index 86b3ac813d2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.cpp
+++ /dev/null
@@ -1,371 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "QCLS_Test_Receiver_exec.h"
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-#define QUERY "( (iteration > %0) AND (iteration < %1) )"
-
-#define MIN_ITERATION "2"
-#define MAX_ITERATION "5"
-
-#define SAMPLES_PER_KEY 2 //only iteration 3 and 4 should be coming in....
-
-namespace CIAO_QCLS_Test_Receiver_Impl
-{
-
-  /**
-   * Facet Executor Implementation Class: info_state_data_listener_exec_i
-   */
-
-  info_state_data_listener_exec_i::info_state_data_listener_exec_i (
-        ::QCLS_Test::CCM_Receiver_Context_ptr ctx,
-        ACE_Thread_ID &thread_id,
-        Atomic_Long &samples_received)
-    : ciao_context_ (
-        ::QCLS_Test::CCM_Receiver_Context::_duplicate (ctx))
-      , thread_id_ (thread_id)
-      , samples_received_ (samples_received)
-  {
-  }
-
-  info_state_data_listener_exec_i::~info_state_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::QCLS_Test::QueryConditionListenStateTestConnector::StateListener
-
-  void
-  info_state_data_listener_exec_i::on_creation (const ::QueryConditionListenStateTest & datum,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    ++this->samples_received_;
-
-    ACE_DEBUG ((LM_DEBUG, "QueryConditionListenStateTest_Listener::on_creation: "
-                            "key <%C> - iteration <%d>\n",
-                            datum.key.in (),
-                            datum.iteration));
-    if (datum.iteration <= ACE_OS::atoi (MIN_ITERATION) ||
-        datum.iteration  > ACE_OS::atoi (MAX_ITERATION) )
-      {
-        ACE_ERROR ((LM_ERROR, "QueryConditionListenStateTest_Listener::on_creation: "
-                              "ERROR: Unexpected iteration received.\n"));
-      }
-  }
-
-  void
-  info_state_data_listener_exec_i::on_one_update (const ::QueryConditionListenStateTest & datum,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    ACE_Thread_ID t_id;
-    this->thread_id_ = t_id;
-    ++this->samples_received_;
-
-    ACE_DEBUG ((LM_DEBUG, "QueryConditionListenStateTest_Listener::on_one_update: "
-                            "key <%C> - iteration <%d>\n",
-                            datum.key.in (),
-                            datum.iteration));
-    if (datum.iteration <= ACE_OS::atoi (MIN_ITERATION) ||
-        datum.iteration  > ACE_OS::atoi (MAX_ITERATION) )
-      {
-        ACE_ERROR ((LM_ERROR, "QueryConditionListenStateTest_Listener::on_one_update: "
-                              "ERROR: Unexpected iteration received.\n"));
-      }
-  }
-
-  void
-  info_state_data_listener_exec_i::on_many_updates (const ::QueryConditionListenStateTestSeq & /* data */,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_state_data_listener_exec_i::on_deletion (const ::QueryConditionListenStateTest & /* datum */,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_state_status_exec_i
-   */
-
-  info_state_status_exec_i::info_state_status_exec_i (
-        ::QCLS_Test::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::QCLS_Test::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_state_status_exec_i::~info_state_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_state_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_state_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : keys_ (5)
-      , iterations_ (10)
-      , thread_id_listener_ (0, 0)
-      , samples_expected_ (keys_ * SAMPLES_PER_KEY)
-      , samples_received_ (0)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-  void
-  Receiver_exec_i::start ()
-  {
-    ::CCM_DDS::DataListenerControl_var dlc =
-        this->ciao_context_->get_connection_info_state_data_control ();
-    dlc->mode (::CCM_DDS::ONE_BY_ONE);
-  }
-
-  // Component attributes and port operations.
-
-  ::QCLS_Test::QueryConditionListenStateTestConnector::CCM_StateListener_ptr
-  Receiver_exec_i::get_info_state_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_state_data_listener_.in ()))
-      {
-        info_state_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_state_data_listener_exec_i (
-            this->ciao_context_.in (),
-            this->thread_id_listener_,
-            this->samples_received_),
-            ::QCLS_Test::QueryConditionListenStateTestConnector::CCM_StateListener::_nil ());
-
-          this->ciao_info_state_data_listener_ = tmp;
-      }
-
-    return
-      ::QCLS_Test::QueryConditionListenStateTestConnector::CCM_StateListener::_duplicate (
-        this->ciao_info_state_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_state_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_state_status_.in ()))
-      {
-        info_state_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_state_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_state_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_state_status_.in ());
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Receiver_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-    this->samples_expected_ = SAMPLES_PER_KEY * this->keys_;
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Receiver_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::QCLS_Test::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_activate - "
-                          "Set filter.\n"));
-    ::CCM_DDS::QueryFilter filter;
-    filter.expression = CORBA::string_dup (QUERY);
-    filter.parameters.length (2);
-    filter.parameters[0] = CORBA::string_dup (MIN_ITERATION);
-    filter.parameters[1] = CORBA::string_dup (MAX_ITERATION);
-    ::QCLS_Test::QueryConditionListenStateTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_info_state_data ();
-
-    reader->query (filter);
-
-    ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_activate - "
-                          "Start listening.\n"));
-    start ();
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    char ccm_buf [65];
-    ACE_Thread_ID ccm_thread_id;
-    ccm_thread_id.to_string (ccm_buf);
-
-    char list_buf [65];
-    this->thread_id_listener_.to_string (list_buf);
-
-
-    if (this->thread_id_listener_.id () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
-                              "Thread ID for ReaderListener not set!\n"));
-      }
-    #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (this->thread_id_listener_ == ccm_thread_id)
-      {
-        ACE_DEBUG ((LM_DEBUG, "QF_STATE: "
-                              "Thread switch for ReaderListener seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: QF_STATE: "
-                              "Thread switch for ReaderListener "
-                              "doesn't seem to work! "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    #else
-    else if (this->thread_id_listener_ == ccm_thread_id)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: QF_STATE: ReaderListener: "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "QF_STATE: ReaderListener: "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    #endif
-    if (this->samples_received_ != this->samples_expected_)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: QF_STATE: ReaderListener: "
-                              "Unexpected number of samples received: "
-                              "expected <%d> - received <%d>\n",
-                              this->samples_expected_,
-                              this->samples_received_.value ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "QF_STATE: ReaderListener: "
-                              "Expected number of samples received: "
-                              "expected <%d> - received <%d>\n",
-                              this->samples_expected_,
-                              this->samples_received_.value ()));
-      }
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_QCLS_Test_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.h
deleted file mode 100644
index d6667fb3fda..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.h
+++ /dev/null
@@ -1,198 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_QCLS_TEST_RECEIVER_EXEC_GHBRF4_H_
-#define CIAO_QCLS_TEST_RECEIVER_EXEC_GHBRF4_H_
-
-#include /**/ "ace/pre.h"
-
-#include "QCLS_Test_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_QCLS_Test_Receiver_Impl
-{
-  class Receiver_exec_i;
-
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Long> Atomic_Long;
-
-  /**
-   * Provider Executor Implementation Class: info_state_data_listener_exec_i
-   */
-
-  class info_state_data_listener_exec_i
-    : public virtual ::QCLS_Test::QueryConditionListenStateTestConnector::CCM_StateListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_state_data_listener_exec_i (
-      ::QCLS_Test::CCM_Receiver_Context_ptr ctx,
-      ACE_Thread_ID &thread_id,
-      Atomic_Long &samples_received);
-    virtual ~info_state_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from QCLS_Test::QueryConditionListenStateTestConnector::StateListener. */
-
-    virtual
-    void on_creation (const ::QueryConditionListenStateTest & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_one_update (const ::QueryConditionListenStateTest & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_updates (const ::QueryConditionListenStateTestSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-
-    virtual
-    void on_deletion (const ::QueryConditionListenStateTest & datum,
-    const ::CCM_DDS::ReadInfo & info);
-    //@}
-
-  private:
-    ::QCLS_Test::CCM_Receiver_Context_var ciao_context_;
-    ACE_Thread_ID &thread_id_;
-    Atomic_Long &samples_received_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_state_status_exec_i
-   */
-
-  class info_state_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_state_status_exec_i (
-      ::QCLS_Test::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_state_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::QCLS_Test::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::QCLS_Test::QueryConditionListenStateTestConnector::CCM_StateListener_ptr
-    get_info_state_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_state_status (void);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-
-    //@}
-
-  private:
-    ::QCLS_Test::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::QCLS_Test::QueryConditionListenStateTestConnector::CCM_StateListener_var ciao_info_state_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_state_status_;
-
-    ::CORBA::UShort keys_;
-
-    ::CORBA::UShort iterations_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    ACE_Thread_ID thread_id_listener_;
-
-    CORBA::Long samples_expected_;
-    Atomic_Long samples_received_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void start (void);
-    //@}
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_QCLS_Test_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.idl
deleted file mode 100644
index c82196ec2cd..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_QUERY_CONDITION_LISTEN_STATE_TEST_SENDER_IDL
-#define DDS_QUERY_CONDITION_LISTEN_STATE_TEST_SENDER_IDL
-
-#include "Connector/QCLS_Test_Connector.idl"
-
-module QCLS_Test
-{
-  component Sender
-  {
-    port QueryConditionListenStateTestConnector::DDS_Update info_update;
-    provides CCM_DDS::ConnectorStatusListener connector_status;
-
-    attribute unsigned short keys;
-    attribute unsigned short iterations;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.mpc
deleted file mode 100644
index 78a9a56c2a8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_QCLS_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_QCLS_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_QCLS_Test_Connector_idl_gen DDS_Starter_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I ..
-
-  IDL_Files {
-    QCLS_Test_Sender.idl
-  }
-}
-
-project(DDS_QCLS_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_QCLS_Test_Sender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    QCLS_Test_SenderE.idl
-  }
-}
-
-project(DDS_QCLS_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_QCLS_Test_Sender_lem_gen DDS_QCLS_Test_Sender_stub \
-           DDS_QCLS_Test_Base_stub
-  libs  += DDS_QCLS_Test_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCLS_Test_SenderEC.cpp
-  }
-
-  Header_Files {
-    QCLS_Test_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    QCLS_Test_SenderEC.inl
-  }
-}
-
-project(DDS_QCLS_Test_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_QCLS_Test_Sender_idl_gen DDS_QCLS_Test_Base_stub \
-           DDS_QCLS_Test_Connector_stub
-  libs  += DDS_QCLS_Test_Base_stub DDS_QCLS_Test_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCLS_Test_SenderC.cpp
-  }
-
-  Header_Files {
-    QCLS_Test_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    QCLS_Test_SenderC.inl
-  }
-}
-
-project(DDS_QCLS_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_QCLS_Test_Sender_lem_stub DDS_QCLS_Test_Sender_stub \
-             DDS_QCLS_Test_Connector_lem_stub DDS_QCLS_Test_Connector_stub
-  sharedname = Sender_exec
-  libs    += Sender_stub Sender_lem_stub DDS_QCLS_Test_Base_stub \
-             DDS_QCLS_Test_Connector_lem_stub DDS_QCLS_Test_Connector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCLS_Test_Sender_exec.cpp
-  }
-
-  Header_Files {
-    QCLS_Test_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_QCLS_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_QCLS_Test_Base_stub  DDS_QCLS_Test_Sender_lem_stub \
-                DDS_QCLS_Test_Connector_stub \
-                DDS_QCLS_Test_Connector_svnt DDS_QCLS_Test_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub DDS_QCLS_Test_Base_stub \
-                DDS_QCLS_Test_Connector_stub DDS_QCLS_Test_Connector_svnt \
-                DDS_QCLS_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCLS_Test_SenderS.cpp
-    QCLS_Test_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    QCLS_Test_SenderS.h
-    QCLS_Test_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.cpp
deleted file mode 100644
index 7189daaa26b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.cpp
+++ /dev/null
@@ -1,311 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "QCLS_Test_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_QCLS_Test_Sender_Impl
-{
-  /**
-   * ConnectorStatusListener_exec_i
-   */
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (
-    Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic (
-    ::DDS::Topic_ptr /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status(
-    ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind status_kind)
-  {
-    if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS)
-      {
-        ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_unexpected_status - "
-          "Publication matched received: starting the test\n"));
-
-        this->callback_.start ();
-      }
-  }
-
-  /**
-   * Start Handler
-   */
-
-  StartHandler::StartHandler(Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  StartHandler::handle_exception (ACE_HANDLE)
-  {
-    this->callback_.run ();
-    return 0;
-  }
-
-  /**
-   * Update Ticker
-   */
-
-  UpdateTicker::UpdateTicker (Sender_exec_i &callback)
-    : callback_ (callback),
-      last_iter_ (0)
-  {
-  }
-
-  int
-  UpdateTicker::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    // Notify the subscribers
-    this->callback_.update_one (++this->last_iter_);
-    return 0;
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : keys_ (5)
-      , iterations_ (10)
-  {
-    this->ticker_ = new UpdateTicker (*this);
-    this->rh_ = new StartHandler (*this);
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->rh_;
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Sender_exec_i::update_one (CORBA::UShort iter)
-  {
-    ::QCLS_Test::QueryConditionListenStateTestConnector::Updater_var
-      updater = this->ciao_context_->get_connection_info_update_data ();
-
-    if (! ::CORBA::is_nil (updater.in ()) &&
-        iter <= this->iterations ())
-      {
-        for (CORBA::UShort i = 1; i < this->keys () + 1; ++i)
-          {
-            char key[7];
-            ACE_OS::sprintf (key, "KEY_%d", i);
-            QueryConditionListenStateTest update_key;
-            update_key.key = CORBA::string_dup (key);
-            update_key.iteration = iter;
-            updater->update_one (update_key, ::DDS::HANDLE_NIL);
-            ACE_DEBUG ((LM_DEBUG, "Updated key <%C> - <%u>\n",
-                          key, iter));
-
-          }
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::update_one - "
-                              "Finished updating. Cancel Timer.\n"));
-        this->reactor ()->cancel_timer (this->ticker_);
-      }
-  }
-
-  void
-  Sender_exec_i::run ()
-  {
-    ::QCLS_Test::QueryConditionListenStateTestConnector::Updater_var
-      updater = this->ciao_context_->get_connection_info_update_data ();
-    // First create the instances for consecutive updating.
-    for (::CORBA::UShort i = 1;
-         i < this->keys () + 1 && !::CORBA::is_nil (updater.in ());
-         ++i)
-      {
-        char key[7];
-        ACE_OS::sprintf (key, "KEY_%d", i);
-        QueryConditionListenStateTest new_key;
-        new_key.key = CORBA::string_dup(key);
-        new_key.iteration = 0;
-        updater->create_one (new_key);
-      }
-
-   if (this->reactor ()->schedule_timer (
-                this->ticker_,
-                0,
-                ACE_Time_Value (5, 50000),
-                ACE_Time_Value (0, 50000)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                              ACE_TEXT ("Error scheduling timer")));
-      }
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    this->reactor ()->notify (this->rh_);
-  }
-
-  // Component attributes and port operations.
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i  (*this);
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::QCLS_Test::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_QCLS_Test_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.h
deleted file mode 100644
index a30ac6593d5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.h
+++ /dev/null
@@ -1,186 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_QCLS_TEST_SENDER_EXEC_GHBRF4_H_
-#define CIAO_QCLS_TEST_SENDER_EXEC_GHBRF4_H_
-
-#include /**/ "ace/pre.h"
-
-#include "QCLS_Test_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_QCLS_Test_Sender_Impl
-{
-  class Sender_exec_i;
-
-  /**
-   * ConnectorStatusListener_exec_i
-   */
-  class SENDER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Sender_exec_i &callback);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-      void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                                 ::DDS::StatusKind status_kind);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Start Handler
-   */
-
-  class StartHandler :
-    public ACE_Event_Handler
-  {
-  public:
-    StartHandler (Sender_exec_i &callback);
-    virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Update Ticker
-   */
-
-  class UpdateTicker :
-    public ACE_Event_Handler
-  {
-  public:
-    UpdateTicker (Sender_exec_i &callback);
-    int handle_timeout (const ACE_Time_Value &, const void *);
-  private:
-    Sender_exec_i &callback_;
-    CORBA::UShort last_iter_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_connector_status (void);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void start (void);
-    void run (void);
-    void update_one (CORBA::UShort iter);
-
-    //@}
-
-  private:
-    ::QCLS_Test::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-
-    ::CORBA::UShort keys_;
-
-    ::CORBA::UShort iterations_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    UpdateTicker *ticker_;
-    StartHandler *rh_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_QCLS_Test_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/descriptors/Plan.cdp
deleted file mode 100644
index 77795d9c1e3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/descriptors/Plan.cdp
+++ /dev/null
@@ -1,413 +0,0 @@
-<!--  -->
-<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>QCLS_Test_Depl_1</label>
-  <UUID>QCLS_Test_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QCLS_Test_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QCLS_Test_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="QCLS_Test_ConnectorComponentImplementation">
-    <name>QCLS_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="QCLS_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="QCLS_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QCLS_Test_QueryConditionListenStateTestConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QCLS_Test_QueryConditionListenStateTestConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QCLS_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QCLS_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QCLS_Test_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QCLS_Test_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="QCLS_Test_ConnectorComponentInstance">
-    <name>QCLS_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="QCLS_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QCLS_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="QCLS_Test_ConnectorComponentInstance2">
-    <name>QCLS_Test_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="QCLS_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QCLS_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>info_state_rdr</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_state_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="QCLS_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_state_dl</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_state_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="QCLS_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_state_dc</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_state_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="QCLS_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>updater_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_update_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>observable_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="QCLS_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="QCLS_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="QCLS_Test_Connector_ExecArtifact">
-    <name>QCLS_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_QCLS_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="QCLS_Test_Connector_SvntArtifact">
-    <name>QCLS_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_QCLS_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="QCLS_Test_Connector_StubArtifact">
-    <name>QCLS_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_QCLS_Test_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/descriptors/run_test.pl
deleted file mode 100755
index d8b4eca445d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 30 seconds to allow task to complete\n";
-sleep (30);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.idl
deleted file mode 100644
index 9d99e5b6378..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file QCTL_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef QUERY_CONDITION_TWO_LISTENERS_TEST_BASE_IDL
-#define QUERY_CONDITION_TWO_LISTENERS_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/QCTL_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/QCTL_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "QueryConditionTwoListenersTest"
-#pragma DCPS_DATA_KEY "QueryConditionTwoListenersTest key"
-
-struct QueryConditionTwoListenersTest {
-  string key; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<QueryConditionTwoListenersTest> QueryConditionTwoListenersTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.mpc
deleted file mode 100644
index d15827ffb44..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_QCTL_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_QCTL_Test_Base_stub
-  dynamicflags += QUERY_CONDITION_TWO_LISTENERS_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=QUERY_CONDITION_TWO_LISTENERS_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=QCTL_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    QCTL_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=QUERY_CONDITION_TWO_LISTENERS_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    QCTL_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.idl
deleted file mode 100644
index b58d65550e9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file QCTL_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef QUERY_CONDITION_TWO_LISTENERS_TEST_CONNECTOR_IDL_
-#define QUERY_CONDITION_TWO_LISTENERS_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/QCTL_Test_Base.idl"
-
-#pragma ciao lem "Connector/QCTL_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/QCTL_Test_BaseTypeSupport.idl"
-#endif
-
-module QCTL_Test
-{
-  module ::CCM_DDS::Typed < ::QueryConditionTwoListenersTest, ::QueryConditionTwoListenersTestSeq> QueryConditionTwoListenersTestConnector;
-};
-
-#endif /* QCTL_Test_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.mpc
deleted file mode 100644
index 0a40f94e8c0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_QCTL_Test_Base -l .. -o ../lib -u DDS QCTL_Test_Connector"
-
-project(DDS_QCTL_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_QCTL_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=QUERY_CONDITION_TWO_LISTENERS_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=QCTL_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=QUERY_CONDITION_TWO_LISTENERS_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=QCTL_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=QUERY_CONDITION_TWO_LISTENERS_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=QCTL_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=QUERY_CONDITION_TWO_LISTENERS_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=QCTL_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    QCTL_Test_Connector.idl
-  }
-}
-
-project(DDS_QCTL_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_QCTL_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=QUERY_CONDITION_TWO_LISTENERS_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=QCTL_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    QCTL_Test_ConnectorE.idl
-  }
-}
-
-project(DDS_QCTL_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_QCTL_Test_Connector_lem_gen DDS_QCTL_Test_Connector_stub DDS_QCTL_Test_Base_stub
-  libs  += DDS_QCTL_Test_Base_stub DDS_QCTL_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_QCTL_Test_Connector_lem_stub
-  dynamicflags += QUERY_CONDITION_TWO_LISTENERS_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTL_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    QCTL_Test_ConnectorEC.h
-    QCTL_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    QCTL_Test_ConnectorEC.inl
-  }
-}
-
-project(DDS_QCTL_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_QCTL_Test_Connector_idl_gen DDS_QCTL_Test_Base_stub
-  libs  += DDS_QCTL_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_QCTL_Test_Connector_stub
-  dynamicflags += QUERY_CONDITION_TWO_LISTENERS_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTL_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    QCTL_Test_ConnectorC.h
-    QCTL_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    QCTL_Test_ConnectorC.inl
-  }
-}
-
-project(DDS_QCTL_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_QCTL_Test_Connector_lem_stub DDS_QCTL_Test_Connector_stub DDS_QCTL_Test_Base_stub
-  sharedname = DDS_QCTL_Test_Connector_exec
-  libs += DDS_QCTL_Test_Connector_stub DDS_QCTL_Test_Connector_lem_stub DDS_QCTL_Test_Base_stub DDS_QCTL_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += QUERY_CONDITION_TWO_LISTENERS_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTL_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    QCTL_Test_Connector_conn.h
-    QCTL_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_QCTL_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_QCTL_Test_Connector_lem_stub DDS_QCTL_Test_Connector_exec DDS_QCTL_Test_Connector_stub
-  sharedname  = DDS_QCTL_Test_Connector_svnt
-  libs       += DDS_QCTL_Test_Connector_stub \
-                DDS_QCTL_Test_Connector_lem_stub  \
-                DDS_QCTL_Test_Base_stub \
-                DDS_QCTL_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += QUERY_CONDITION_TWO_LISTENERS_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTL_Test_ConnectorS.cpp
-    QCTL_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    QCTL_Test_ConnectorS.h
-    QCTL_Test_Connector_svnt.h
-    QCTL_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver.idl
deleted file mode 100644
index 38fc0004b02..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/QCTL_Test_Connector.idl"
-
-module QCTL_Test
-{
-  component Receiver
-  {
-    port QueryConditionTwoListenersTestConnector::DDS_Listen info_listen_1;
-    port QueryConditionTwoListenersTestConnector::DDS_Listen info_listen_2;
-
-    attribute unsigned short keys;
-    attribute unsigned short iterations;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver.mpc
deleted file mode 100644
index 916535d17c6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver.mpc
+++ /dev/null
@@ -1,146 +0,0 @@
-project(DDS_QCTL_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_QCTL_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h \
-              -I..
-
-  IDL_Files {
-    QCTL_Test_Receiver.idl
-  }
-}
-
-project(DDS_QCTL_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_QCTL_Test_Receiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    QCTL_Test_ReceiverE.idl
-  }
-}
-
-project(DDS_QCTL_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_QCTL_Test_Receiver_lem_gen DDS_QCTL_Test_Receiver_stub  \
-           DDS_QCTL_Test_Connector_stub DDS_QCTL_Test_Base_stub
-  libs  +=  Receiver_stub DDS_QCTL_Test_Connector_stub \
-            DDS_QCTL_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTL_Test_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    QCTL_Test_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    QCTL_Test_ReceiverEC.inl
-  }
-}
-
-project(DDS_QCTL_Test_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_QCTL_Test_Receiver_idl_gen  DDS_QCTL_Test_Connector_stub \
-           DDS_QCTL_Test_Base_stub DDS_QCTL_Test_Connector_lem_gen
-  libs  += DDS_QCTL_Test_Connector_stub DDS_QCTL_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTL_Test_ReceiverC.cpp
-  }
-
-  Header_Files {
-    QCTL_Test_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    QCTL_Test_ReceiverC.inl
-  }
-}
-
-project(DDS_QCTL_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_QCTL_Test_Receiver_lem_stub DDS_QCTL_Test_Receiver_stub \
-             DDS_QCTL_Test_Base_stub DDS_QCTL_Test_Connector_stub \
-             DDS_QCTL_Test_Connector_lem_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_QCTL_Test_Base_stub \
-          DDS_QCTL_Test_Connector_stub DDS_QCTL_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTL_Test_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    QCTL_Test_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_QCTL_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_QCTL_Test_Receiver_lem_stub DDS_QCTL_Test_Base_stub \
-                  DDS_QCTL_Test_Connector_stub DDS_QCTL_Test_Connector_svnt \
-                  DDS_QCTL_Test_Receiver_exec DDS_QCTL_Test_Connector_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_QCTL_Test_Base_stub \
-                DDS_QCTL_Test_Connector_stub DDS_QCTL_Test_Connector_svnt \
-                Receiver_exec DDS_QCTL_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTL_Test_ReceiverS.cpp
-    QCTL_Test_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    QCTL_Test_ReceiverS.h
-    QCTL_Test_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.cpp
deleted file mode 100644
index 2dd12cfab1e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.cpp
+++ /dev/null
@@ -1,593 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "QCTL_Test_Receiver_exec.h"
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-#define QUERY_1 "( (iteration > %0) AND (iteration < %1) )"
-#define QUERY_2 "( (iteration < %0) OR (iteration > %1) )"
-
-#define MIN_ITERATION "2"
-#define MAX_ITERATION "5"
-
-#define SAMPLES_PER_KEY_1 2
-
-namespace CIAO_QCTL_Test_Receiver_Impl
-{
-
-  /**
-   * Facet Executor Implementation Class: info_listen_1_data_listener_exec_i
-   */
-
-  info_listen_1_data_listener_exec_i::info_listen_1_data_listener_exec_i (
-        ::QCTL_Test::CCM_Receiver_Context_ptr ctx,
-        ACE_Thread_ID &thread_id,
-        Atomic_Long &samples_received)
-    : ciao_context_ (
-        ::QCTL_Test::CCM_Receiver_Context::_duplicate (ctx))
-      , thread_id_1_ (thread_id)
-      , samples_received_1_ (samples_received)
-  {
-  }
-
-  info_listen_1_data_listener_exec_i::~info_listen_1_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::QCTL_Test::QueryConditionTwoListenersTestConnector::Listener
-
-  void
-  info_listen_1_data_listener_exec_i::on_one_data (const ::QueryConditionTwoListenersTest & datum,
-  const ::CCM_DDS::ReadInfo & info)
-  {
-    ACE_Thread_ID t_id;
-    this->thread_id_1_ = t_id;
-    ++this->samples_received_1_;
-
-    ACE_DEBUG ((LM_DEBUG, "QueryConditionTwoListenersTest_Listener_1::on_one_data: "
-                            "key <%C> - iteration <%d>\n",
-                            datum.key.in (),
-                            datum.iteration));
-    if (::DDS::HANDLE_NIL == info.instance_handle)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: QueryConditionTwoListenersTest_Listener_1::on_one_data: "
-                            "instance handle seems to be invalid "
-                            "key <%C> - iteration <%d>\n",
-                            datum.key.in (),
-                            datum.iteration));
-      }
-    if (info.source_timestamp.sec == 0 &&
-        info.source_timestamp.nanosec == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: QueryConditionTwoListenersTest_Listener_1::on_one_data: "
-                            "source timestamp seems to be invalid (nil) "
-                            "key <%C> - iteration <%d>\n",
-                            datum.key.in (),
-                            datum.iteration));
-      }
-    if (datum.iteration <= ACE_OS::atoi (MIN_ITERATION) ||
-        datum.iteration  > ACE_OS::atoi (MAX_ITERATION) )
-      {
-        ACE_ERROR ((LM_ERROR, "QueryConditionTwoListenersTest_Listener_1::on_one_data: "
-                              "ERROR: Unexpected iteration received.\n"));
-      }
-  }
-
-  void
-  info_listen_1_data_listener_exec_i::on_many_data (const ::QueryConditionTwoListenersTestSeq & /* data */,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_listen_1_status_exec_i
-   */
-
-  info_listen_1_status_exec_i::info_listen_1_status_exec_i (
-        ::QCTL_Test::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::QCTL_Test::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_listen_1_status_exec_i::~info_listen_1_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_listen_1_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_listen_1_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_listen_2_data_listener_exec_i
-   */
-
-  info_listen_2_data_listener_exec_i::info_listen_2_data_listener_exec_i (
-        ::QCTL_Test::CCM_Receiver_Context_ptr ctx,
-        ACE_Thread_ID &thread_id,
-        Atomic_Long &samples_received)
-    : ciao_context_ (
-        ::QCTL_Test::CCM_Receiver_Context::_duplicate (ctx))
-      , thread_id_2_ (thread_id)
-      , samples_received_2_ (samples_received)
-  {
-  }
-
-  info_listen_2_data_listener_exec_i::~info_listen_2_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::QCTL_Test::QueryConditionTwoListenersTestConnector::Listener
-
-  void
-  info_listen_2_data_listener_exec_i::on_one_data (const ::QueryConditionTwoListenersTest & datum,
-  const ::CCM_DDS::ReadInfo & info)
-  {
-    ACE_Thread_ID t_id;
-    this->thread_id_2_ = t_id;
-
-    ++this->samples_received_2_;
-
-    ACE_DEBUG ((LM_DEBUG, "QueryConditionTwoListenersTest_Listener_2::on_one_data: "
-                            "key <%C> - iteration <%d>\n",
-                            datum.key.in (),
-                            datum.iteration));
-    if (::DDS::HANDLE_NIL == info.instance_handle)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: QueryConditionTwoListenersTest_Listener_2::on_one_data: "
-                            "instance handle seems to be invalid "
-                            "key <%C> - iteration <%d>\n",
-                            datum.key.in (),
-                            datum.iteration));
-      }
-    if (info.source_timestamp.sec == 0 &&
-        info.source_timestamp.nanosec == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: QueryConditionTwoListenersTest_Listener_2::on_one_data: "
-                            "source timestamp seems to be invalid (nil) "
-                            "key <%C> - iteration <%d>\n",
-                            datum.key.in (),
-                            datum.iteration));
-      }
-    if (datum.iteration > ACE_OS::atoi (MIN_ITERATION) &&
-        datum.iteration  < ACE_OS::atoi (MAX_ITERATION) )
-      {
-        ACE_ERROR ((LM_ERROR, "QueryConditionTwoListenersTest_Listener_2::on_one_data: "
-                              "ERROR: Unexpected iteration received.\n"));
-      }
-  }
-
-  void
-  info_listen_2_data_listener_exec_i::on_many_data (const ::QueryConditionTwoListenersTestSeq & /* data */,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_listen_2_status_exec_i
-   */
-
-  info_listen_2_status_exec_i::info_listen_2_status_exec_i (
-        ::QCTL_Test::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::QCTL_Test::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_listen_2_status_exec_i::~info_listen_2_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_listen_2_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_listen_2_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : keys_ (5)
-      , iterations_ (10)
-      , thread_id_listener_1_ (0, 0)
-      , thread_id_listener_2_ (0, 0)
-      , samples_expected_1_ (keys_ * SAMPLES_PER_KEY_1)
-      , samples_received_1_ (0)
-      , samples_expected_2_ (keys_ * (this->iterations_ - 4))
-      , samples_received_2_ (0)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-  void
-  Receiver_exec_i::start ()
-  {
-    ::CCM_DDS::DataListenerControl_var dlc1 =
-        this->ciao_context_->get_connection_info_listen_1_data_control ();
-    dlc1->mode (::CCM_DDS::ONE_BY_ONE);
-
-    ::CCM_DDS::DataListenerControl_var dlc2 =
-        this->ciao_context_->get_connection_info_listen_2_data_control ();
-    dlc2->mode (::CCM_DDS::ONE_BY_ONE);
-  }
-
-  // Component attributes and port operations.
-
-  ::QCTL_Test::QueryConditionTwoListenersTestConnector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_listen_1_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_listen_1_data_listener_.in ()))
-      {
-        info_listen_1_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_listen_1_data_listener_exec_i (
-            this->ciao_context_.in (),
-            this->thread_id_listener_1_,
-            this->samples_received_1_),
-            ::QCTL_Test::QueryConditionTwoListenersTestConnector::CCM_Listener::_nil ());
-
-          this->ciao_info_listen_1_data_listener_ = tmp;
-      }
-
-    return
-      ::QCTL_Test::QueryConditionTwoListenersTestConnector::CCM_Listener::_duplicate (
-        this->ciao_info_listen_1_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_listen_1_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_listen_1_status_.in ()))
-      {
-        info_listen_1_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_listen_1_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_listen_1_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_listen_1_status_.in ());
-  }
-
-  ::QCTL_Test::QueryConditionTwoListenersTestConnector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_listen_2_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_listen_2_data_listener_.in ()))
-      {
-        info_listen_2_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_listen_2_data_listener_exec_i (
-            this->ciao_context_.in (),
-            this->thread_id_listener_2_,
-            this->samples_received_2_),
-            ::QCTL_Test::QueryConditionTwoListenersTestConnector::CCM_Listener::_nil ());
-
-          this->ciao_info_listen_2_data_listener_ = tmp;
-      }
-
-    return
-      ::QCTL_Test::QueryConditionTwoListenersTestConnector::CCM_Listener::_duplicate (
-        this->ciao_info_listen_2_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_listen_2_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_listen_2_status_.in ()))
-      {
-        info_listen_2_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_listen_2_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_listen_2_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_listen_2_status_.in ());
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Receiver_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Receiver_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-    // Iterations between min and max (including min and max) are not received.
-    this->samples_expected_2_ = keys_ * (this->iterations_ - 4);
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::QCTL_Test::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_activate - "
-                          "Set filter 1.\n"));
-
-    CCM_DDS::QueryFilter filter_1;
-    filter_1.expression = CORBA::string_dup (QUERY_1);
-    filter_1.parameters.length (2);
-    filter_1.parameters[0] = CORBA::string_dup (MIN_ITERATION);
-    filter_1.parameters[1] = CORBA::string_dup (MAX_ITERATION);
-
-    ::QCTL_Test::QueryConditionTwoListenersTestConnector::Reader_var reader_1 =
-      this->ciao_context_->get_connection_info_listen_1_data ();
-
-    reader_1->query (filter_1);
-
-    ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_activate - "
-                      "Set filter 2.\n"));
-
-    CCM_DDS::QueryFilter filter_2;
-    filter_2.expression = CORBA::string_dup (QUERY_2);
-    filter_2.parameters.length (2);
-    filter_2.parameters[0] = CORBA::string_dup (MIN_ITERATION);
-    filter_2.parameters[1] = CORBA::string_dup (MAX_ITERATION);
-
-    ::QCTL_Test::QueryConditionTwoListenersTestConnector::Reader_var reader_2 =
-      this->ciao_context_->get_connection_info_listen_2_data ();
-
-    reader_2->query (filter_2);
-
-    ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_activate - "
-                          "Start listening on both listeners.\n"));
-    start ();
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    // get current thread
-    char ccm_buf [65];
-    ACE_Thread_ID ccm_thread_id;
-    ccm_thread_id.to_string (ccm_buf);
-
-    char list_buf_1 [65];
-    this->thread_id_listener_1_.to_string (list_buf_1);
-
-    if (this->thread_id_listener_1_.id () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
-                              "Thread ID for ReaderListener not set!\n"));
-      }
-    #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (this->thread_id_listener_1_ == ccm_thread_id)
-      {
-        ACE_DEBUG ((LM_DEBUG, "QF_TWO_LISTENERS: "
-                              "Thread switch for ReaderListener seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_1,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: QF_TWO_LISTENERS: "
-                              "Thread switch for ReaderListener "
-                              "doesn't seem to work! "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_1,
-                              ccm_buf));
-      }
-    #else
-    else if (this->thread_id_listener_1_ == ccm_thread_id)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: QF_TWO_LISTENERS: ReaderListener: "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_1,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "QF_TWO_LISTENERS: ReaderListener: "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_1,
-                              ccm_buf));
-     }
-    #endif
-   char list_buf_2 [65];
-   this->thread_id_listener_2_.to_string (list_buf_2);
-   if (this->thread_id_listener_2_.id () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
-                              "Thread ID for ReaderListener not set!\n"));
-      }
-    #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (this->thread_id_listener_2_ == ccm_thread_id)
-      {
-        ACE_DEBUG ((LM_DEBUG, "QF_TWO_LISTENERS: "
-                              "Thread switch for ReaderListener seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                               "listener <%C> - component <%C>\n",
-                              list_buf_2,
-                              ccm_buf));
-     }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: QF_TWO_LISTENERS: "
-                              "Thread switch for ReaderListener "
-                              "doesn't seem to work! "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_2,
-                              ccm_buf));
-      }
-    #else
-    else if (this->thread_id_listener_2_ == ccm_thread_id)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: QF_TWO_LISTENERS: ReaderListener: "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_2,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "QF_TWO_LISTENERS: ReaderListener: "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_2,
-                              ccm_buf));
-      }
-    #endif
-    //first listener
-    if (this->samples_received_1_ != this->samples_expected_1_)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: QF_TWO_LISTENERS: ReaderListener: "
-                              "Unexpected number of samples received "
-                              "on first listener : "
-                              "expected <%d> - received <%d>\n",
-                              this->samples_expected_1_,
-                              this->samples_received_1_.value ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "QF_TWO_LISTENERS: ReaderListener: "
-                              "Expected number of samples received "
-                              "on first listener : "
-                              "expected <%d> - received <%d>\n",
-                              this->samples_expected_1_,
-                              this->samples_received_1_.value ()));
-      }
-    //Second listener
-    if (this->samples_received_2_ != this->samples_expected_2_)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: QF_TWO_LISTENERS: ReaderListener: "
-                              "Unexpected number of samples received` "
-                              "on second listener : "
-                              "expected <%d> - received <%d>\n",
-                              this->samples_expected_2_,
-                              this->samples_received_2_.value ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "QF_TWO_LISTENERS: ReaderListener: "
-                              "Expected number of samples received "
-                              "on second listener : "
-                              "expected <%d> - received <%d>\n",
-                              this->samples_expected_2_,
-                              this->samples_received_2_.value ()));
-      }
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_QCTL_Test_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.h
deleted file mode 100644
index 58165f75751..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.h
+++ /dev/null
@@ -1,265 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_QCTL_TEST_RECEIVER_EXEC_OT3CNP_H_
-#define CIAO_QCTL_TEST_RECEIVER_EXEC_OT3CNP_H_
-
-#include /**/ "ace/pre.h"
-
-#include "QCTL_Test_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_QCTL_Test_Receiver_Impl
-{
-  class Receiver_exec_i;
-
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Long> Atomic_Long;
-
-  /**
-   * Provider Executor Implementation Class: info_listen_1_data_listener_exec_i
-   */
-
-  class info_listen_1_data_listener_exec_i
-    : public virtual ::QCTL_Test::QueryConditionTwoListenersTestConnector::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_listen_1_data_listener_exec_i (
-      ::QCTL_Test::CCM_Receiver_Context_ptr ctx,
-      ACE_Thread_ID &thread_id,
-      Atomic_Long &samples_received);
-
-    virtual ~info_listen_1_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from QCTL_Test::QueryConditionTwoListenersTestConnector::Listener. */
-
-    virtual
-    void on_one_data (const ::QueryConditionTwoListenersTest & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (const ::QueryConditionTwoListenersTestSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    ::QCTL_Test::CCM_Receiver_Context_var ciao_context_;
-    ACE_Thread_ID &thread_id_1_;
-    Atomic_Long &samples_received_1_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_listen_1_status_exec_i
-   */
-
-  class info_listen_1_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_listen_1_status_exec_i (
-      ::QCTL_Test::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_listen_1_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::QCTL_Test::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_listen_2_data_listener_exec_i
-   */
-
-  class info_listen_2_data_listener_exec_i
-    : public virtual ::QCTL_Test::QueryConditionTwoListenersTestConnector::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_listen_2_data_listener_exec_i (
-      ::QCTL_Test::CCM_Receiver_Context_ptr ctx,
-      ACE_Thread_ID &thread_id,
-      Atomic_Long &samples_received);
-    virtual ~info_listen_2_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from QCTL_Test::QueryConditionTwoListenersTestConnector::Listener. */
-
-    virtual
-    void on_one_data (const ::QueryConditionTwoListenersTest & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (const ::QueryConditionTwoListenersTestSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    ::QCTL_Test::CCM_Receiver_Context_var ciao_context_;
-    ACE_Thread_ID &thread_id_2_;
-    Atomic_Long &samples_received_2_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_listen_2_status_exec_i
-   */
-
-  class info_listen_2_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_listen_2_status_exec_i (
-      ::QCTL_Test::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_listen_2_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::QCTL_Test::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::QCTL_Test::QueryConditionTwoListenersTestConnector::CCM_Listener_ptr
-    get_info_listen_1_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_listen_1_status (void);
-
-    virtual ::QCTL_Test::QueryConditionTwoListenersTestConnector::CCM_Listener_ptr
-    get_info_listen_2_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_listen_2_status (void);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void start (void);
-
-    //@}
-
-  private:
-    ::QCTL_Test::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::QCTL_Test::QueryConditionTwoListenersTestConnector::CCM_Listener_var ciao_info_listen_1_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_listen_1_status_;
-    ::QCTL_Test::QueryConditionTwoListenersTestConnector::CCM_Listener_var ciao_info_listen_2_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_listen_2_status_;
-
-    ::CORBA::UShort keys_;
-
-    ::CORBA::UShort iterations_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    ACE_Thread_ID thread_id_listener_1_;
-    ACE_Thread_ID thread_id_listener_2_;
-
-    CORBA::Long samples_expected_1_;
-    Atomic_Long samples_received_1_;
-
-    CORBA::Long samples_expected_2_;
-    Atomic_Long samples_received_2_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_QCTL_Test_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.idl
deleted file mode 100644
index c91392633f0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_QUERY_CONDITION_TWO_LISTENERS_TEST_SENDER_IDL
-#define DDS_QUERY_CONDITION_TWO_LISTENERS_TEST_SENDER_IDL
-
-#include "Connector/QCTL_Test_Connector.idl"
-
-module QCTL_Test
-{
-  component Sender
-  {
-    port QueryConditionTwoListenersTestConnector::DDS_Write info_write;
-    provides CCM_DDS::ConnectorStatusListener connector_status;
-
-
-    attribute unsigned short keys;
-    attribute unsigned short iterations;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.mpc
deleted file mode 100644
index ffe3bb76dcc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_QCTL_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_QCTL_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_QCTL_Test_Connector_idl_gen DDS_Starter_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I..
-
-  IDL_Files {
-    QCTL_Test_Sender.idl
-  }
-}
-
-project(DDS_QCTL_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_QCTL_Test_Sender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    QCTL_Test_SenderE.idl
-  }
-}
-
-project(DDS_QCTL_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_QCTL_Test_Sender_lem_gen DDS_QCTL_Test_Sender_stub \
-           DDS_QCTL_Test_Base_stub
-  libs  += DDS_QCTL_Test_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTL_Test_SenderEC.cpp
-  }
-
-  Header_Files {
-    QCTL_Test_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    QCTL_Test_SenderEC.inl
-  }
-}
-
-project(DDS_QCTL_Test_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_QCTL_Test_Sender_idl_gen DDS_QCTL_Test_Base_stub \
-           DDS_QCTL_Test_Connector_stub
-  libs  += DDS_QCTL_Test_Base_stub DDS_QCTL_Test_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTL_Test_SenderC.cpp
-  }
-
-  Header_Files {
-    QCTL_Test_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    QCTL_Test_SenderC.inl
-  }
-}
-
-project(DDS_QCTL_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_QCTL_Test_Sender_lem_stub DDS_QCTL_Test_Sender_stub \
-             DDS_QCTL_Test_Connector_lem_stub DDS_QCTL_Test_Connector_stub
-  sharedname = Sender_exec
-  libs    += Sender_stub Sender_lem_stub DDS_QCTL_Test_Base_stub \
-             DDS_QCTL_Test_Connector_lem_stub DDS_QCTL_Test_Connector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTL_Test_Sender_exec.cpp
-  }
-
-  Header_Files {
-    QCTL_Test_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_QCTL_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_QCTL_Test_Base_stub  DDS_QCTL_Test_Sender_lem_stub \
-                DDS_QCTL_Test_Connector_stub \
-                DDS_QCTL_Test_Connector_svnt DDS_QCTL_Test_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub DDS_QCTL_Test_Base_stub \
-                DDS_QCTL_Test_Connector_stub DDS_QCTL_Test_Connector_svnt \
-                DDS_QCTL_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTL_Test_SenderS.cpp
-    QCTL_Test_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    QCTL_Test_SenderS.h
-    QCTL_Test_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender_exec.cpp
deleted file mode 100644
index ed9a7139adc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender_exec.cpp
+++ /dev/null
@@ -1,306 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "QCTL_Test_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_QCTL_Test_Sender_Impl
-{
-
-  /**
-   * ConnectorStatusListener_exec_i
-   */
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (
-    Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic (
-    ::DDS::Topic_ptr /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status(
-    ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind status_kind)
-  {
-    if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS)
-      {
-        ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_unexpected_status - "
-          "Publication matched received: starting the test\n"));
-
-        this->callback_.start ();
-      }
-  }
-
-
-  /**
-   * Write ticker
-   */
-
-  WriteTicker::WriteTicker (Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  WriteTicker::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    // Notify the subscribers
-    this->callback_.write_one ();
-    return 0;
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : keys_ (5)
-      , iterations_ (10)
-  {
-    this->ticker_ = new WriteTicker (*this);
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Sender_exec_i::write_one (void)
-  {
-    if (this->last_key_ != this->samples_.end ())
-      {
-        try
-          {
-            ::QCTL_Test::QueryConditionTwoListenersTestConnector::Writer_var writer =
-              this->ciao_context_->get_connection_info_write_data ();
-
-            ++this->last_key_->second->iteration;
-            writer->write_one (this->last_key_->second, ::DDS::HANDLE_NIL);
-            ACE_DEBUG ((LM_DEBUG, "Written key <%C> - <%u>\n",
-                          this->last_key_->first.c_str (),
-                          this->last_key_->second->iteration));
-          }
-        catch (const CCM_DDS::InternalError& )
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                        ACE_TEXT ("while updating writer info for <%C>.\n"),
-                          this->last_key_->first.c_str ()));
-          }
-        ++this->last_key_;
-      }
-    else
-      {
-        //onto the next iteration
-        this->last_key_ = this->samples_.begin ();
-        while (this->last_key_ != this->samples_.end ())
-          {
-            if (this->last_key_->second->iteration == this->iterations_)
-              {
-                //next key
-                ++this->last_key_;
-              }
-            else
-              {
-                break;
-              }
-          }
-        if (this->last_key_ == this->samples_.end ())
-          {
-            this->reactor ()->cancel_timer (this->ticker_);
-          }
-      }
-  }
-
-
-  void
-  Sender_exec_i::start (void)
-  {
-    ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard,
-                        this->mutex_, CORBA::INTERNAL ());
-
-    for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i)
-      {
-        char key[7];
-        QueryConditionTwoListenersTest* new_key = new QueryConditionTwoListenersTest;
-        ACE_OS::sprintf (key, "KEY_%d", i);
-        new_key->key = CORBA::string_dup(key);
-        new_key->iteration = 0;
-
-        this->samples_[key] = new_key;
-      }
-   this->last_key_ = this->samples_.begin ();
-   if (this->reactor ()->schedule_timer (
-                this->ticker_,
-                0,
-                ACE_Time_Value (5, 50000),
-                ACE_Time_Value (0, 50000)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                              ACE_TEXT ("Error scheduling timer")));
-      }
-  }
-
-  // Component attributes and port operations.
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i  (*this);
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::QCTL_Test::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_QCTL_Test_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender_exec.h
deleted file mode 100644
index 8782e933fc1..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender_exec.h
+++ /dev/null
@@ -1,177 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_QCTL_TEST_SENDER_EXEC_1OAY5Q_H_
-#define CIAO_QCTL_TEST_SENDER_EXEC_1OAY5Q_H_
-
-#include /**/ "ace/pre.h"
-
-#include "QCTL_Test_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-#include <map>
-
-namespace CIAO_QCTL_Test_Sender_Impl
-{
-  class Sender_exec_i;
-
-  /**
-   * ConnectorStatusListener_exec_i
-   */
-  class SENDER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Sender_exec_i &callback);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-      void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                                 ::DDS::StatusKind status_kind);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Write ticker
-   */
-
-  class WriteTicker :
-    public ACE_Event_Handler
-  {
-  public:
-    WriteTicker (Sender_exec_i &callback);
-    int handle_timeout (const ACE_Time_Value &, const void *);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr get_connector_status (
-      void);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void start (void);
-    void write_one (void);
-
-    //@}
-
-  private:
-    ::QCTL_Test::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-
-    ::CORBA::UShort keys_;
-
-    ::CORBA::UShort iterations_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    WriteTicker *ticker_;
-
-    TAO_SYNCH_MUTEX mutex_;
-    typedef std::map<ACE_CString, QueryConditionTwoListenersTest_var> Writer_Table;
-    Writer_Table samples_;
-
-    Writer_Table::iterator last_key_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_QCTL_Test_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/descriptors/Plan.cdp
deleted file mode 100644
index 1360f42e586..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/descriptors/Plan.cdp
+++ /dev/null
@@ -1,492 +0,0 @@
-<!--  -->
-<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>QCTL_Test_Depl_1</label>
-  <UUID>QCTL_Test_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QCTL_Test_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QCTL_Test_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="QCTL_Test_ConnectorComponentImplementation">
-    <name>QCTL_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="QCTL_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="QCTL_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QCTL_Test_QueryConditionTwoListenersTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QCTL_Test_QueryConditionTwoListenersTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QCTL_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QCTL_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QCTL_Test_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QCTL_Test_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="QCTL_Test_SenderConnectorInstance">
-    <name>QCTL_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="QCTL_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QCTL_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="QCTL_Test_ReceiverConnectorInstance_1">
-    <name>QCTL_Test_ReceiverConnectorInstance_1</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="QCTL_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QCTL_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="QCTL_Test_ReceiverConnectorInstance_2">
-    <name>QCTL_Test_ReceiverConnectorInstance_2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="QCTL_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QCTL_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>info_listen_1_reader_receiver</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_1_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="QCTL_Test_ReceiverConnectorInstance_1" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_listen_1_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_1_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="QCTL_Test_ReceiverConnectorInstance_1" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_listen_1_data_control</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_1_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="QCTL_Test_ReceiverConnectorInstance_1" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_listen_2_reader_receiver</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_2_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="QCTL_Test_ReceiverConnectorInstance_2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_listen_2_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_2_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="QCTL_Test_ReceiverConnectorInstance_2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_listen_2_data_control</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_2_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="QCTL_Test_ReceiverConnectorInstance_2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>test_topic_connector_status_sender</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="QCTL_Test_SenderConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="QCTL_Test_SenderConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="QCTL_Test_Connector_ExecArtifact">
-    <name>QCTL_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_QCTL_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="QCTL_Test_Connector_SvntArtifact">
-    <name>QCTL_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_QCTL_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="QCTL_Test_Connector_StubArtifact">
-    <name>QCTL_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_QCTL_Test_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/descriptors/run_test.pl
deleted file mode 100755
index d8b4eca445d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 30 seconds to allow task to complete\n";
-sleep (30);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Starter.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Starter.idl
deleted file mode 100644
index 55aafc4a95c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Starter.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file QCTQ_Starter.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef QUERYCONDITION_STARTER_IDL
-#define QUERYCONDITION_STARTER_IDL
-
-#pragma ciao lem "Base/QCTQ_StarterE.idl"
-
-interface TwoQueriesStarter
-{
-  void set_reader_properties (in unsigned short nr_keys,
-                              in unsigned short nr_iterations);
-  void start_read (in unsigned short run);
-};
-
-interface TwoQueriesRestarter
-{
-  void restart_write ();
-};
-
-#endif /* QUERYCONDITION_STARTER_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Starter.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Starter.mpc
deleted file mode 100644
index 6928a4e4c83..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Starter.mpc
+++ /dev/null
@@ -1,109 +0,0 @@
-project(QC_QCTQ_Starter_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=READER_STARTER_STUB_Export \
-              -Wb,stub_export_include=QCTQ_Starter_stub_export.h \
-              -Wb,skel_export_macro=READER_STARTER_SVNT_Export \
-              -Wb,skel_export_include=QCTQ_Starter_svnt_export.h \
-              -Wb,svnt_export_macro=READER_STARTER_SVNT_Export \
-              -Wb,svnt_export_include=QCTQ_Starter_svnt_export.h \
-              -Wb,exec_export_macro=READER_STARTER_EXEC_Export \
-              -Wb,exec_export_include=QCTQ_Starter_exec_export.h -I..
-
-  IDL_Files {
-    QCTQ_Starter.idl
-  }
-}
-
-project(QC_QCTQ_Starter_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += QC_QCTQ_Starter_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=READER_STARTER_LEM_STUB_Export \
-              -Wb,stub_export_include=QCTQ_Starter_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    QCTQ_StarterE.idl
-  }
-}
-
-project(QC_QCTQ_Starter_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += QC_QCTQ_Starter_lem_gen QC_QCTQ_Starter_stub
-  libs  += QC_QCTQ_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = QC_QCTQ_Starter_lem_stub
-  dynamicflags += READER_STARTER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQ_StarterEC.cpp
-  }
-
-  Header_Files {
-    QCTQ_StarterEC.h
-    QCTQ_Starter_lem_stub_export.h
-  }
-
-  Inline_Files {
-    QCTQ_StarterEC.inl
-  }
-}
-
-project(QC_QCTQ_Starter_stub) : ccm_stub, dds4ccm_base {
-  after += QC_QCTQ_Starter_idl_gen
-  libs  +=
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = QC_QCTQ_Starter_stub
-  dynamicflags += READER_STARTER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQ_StarterC.cpp
-  }
-
-  Header_Files {
-    QCTQ_StarterC.h
-    QCTQ_Starter_stub_export.h
-  }
-
-  Inline_Files {
-    QCTQ_StarterC.inl
-  }
-}
-
-
-project(QC_QCTQ_Starter_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += QC_QCTQ_Starter_lem_stub QC_QCTQ_Starter_stub
-  sharedname  = QC_QCTQ_Starter_svnt
-  libs       += QC_QCTQ_Starter_stub QC_QCTQ_Starter_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += READER_STARTER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQ_StarterS.cpp
-    QCTQ_Starter_svnt.cpp
-  }
-
-  Header_Files {
-    QCTQ_StarterS.h
-    QCTQ_Starter_svnt.h
-    QCTQ_Starter_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.idl
deleted file mode 100644
index ef66771bb8f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file QCTQ_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef QUERY_CONDITION_TEST_BASE_IDL
-#define QUERY_CONDITION_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/QCTQ_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/QCTQ_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "QueryConditionTest"
-#pragma DCPS_DATA_KEY "QueryConditionTest symbol"
-
-struct QueryConditionTest {
-  string symbol; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<QueryConditionTest> QueryConditionTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.mpc
deleted file mode 100644
index f959ec8a225..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project(QC_QCTQ_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = QC_QCTQ_Test_Base_stub
-  dynamicflags += QUERY_CONDITION_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=QUERY_CONDITION_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=QCTQ_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    QCTQ_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=QUERY_CONDITION_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    QCTQ_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.idl
deleted file mode 100644
index 069d2eda9b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file QCTQ_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef QUERY_CONDITION_TEST_CONNECTOR_IDL_
-#define QUERY_CONDITION_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/QCTQ_Test_Base.idl"
-
-#pragma ciao lem "Connector/QCTQ_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/QCTQ_Test_BaseTypeSupport.idl"
-#endif
-
-module QCTQ_Test
-{
-  module ::CCM_DDS::Typed < ::QueryConditionTest, ::QueryConditionTestSeq> QueryConditionTestConnector;
-};
-
-#endif /* QUERY_CONDITION_TEST_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.mpc
deleted file mode 100644
index 091cfc4ba36..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.mpc
+++ /dev/null
@@ -1,146 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p QCTQ_Test_Base -l .. -o ../lib -u DDS QCTQ_Test_Connector"
-
-project(QC_QCTQ_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen QC_QCTQ_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=QUERY_CONDITION_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=QCTQ_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=QUERY_CONDITION_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=QCTQ_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=QUERY_CONDITION_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=QCTQ_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=QUERY_CONDITION_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=QCTQ_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    QCTQ_Test_Connector.idl
-  }
-}
-
-project(QC_QCTQ_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += QC_QCTQ_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=QUERY_CONDITION_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=QCTQ_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    QCTQ_Test_ConnectorE.idl
-  }
-}
-
-project(QC_QCTQ_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += QC_QCTQ_Test_Connector_lem_gen QC_QCTQ_Test_Connector_stub \
-           QC_QCTQ_Test_Base_stub
-  libs  += QC_QCTQ_Test_Base_stub QC_QCTQ_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = QC_QCTQ_Test_Connector_lem_stub
-  dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQ_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    QCTQ_Test_ConnectorEC.h
-    QCTQ_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    QCTQ_Test_ConnectorEC.inl
-  }
-}
-
-project(QC_QCTQ_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += QC_QCTQ_Test_Connector_idl_gen QC_QCTQ_Test_Base_stub
-  libs  += QC_QCTQ_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = QC_QCTQ_Test_Connector_stub
-  dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQ_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    QCTQ_Test_ConnectorC.h
-    QCTQ_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    QCTQ_Test_ConnectorC.inl
-  }
-}
-
-project(QC_QCTQ_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += QC_QCTQ_Test_Connector_lem_stub QC_QCTQ_Test_Connector_stub \
-             QC_QCTQ_Test_Base_stub
-  sharedname = QC_QCTQ_Test_Connector_exec
-  libs += QC_QCTQ_Test_Connector_stub QC_QCTQ_Test_Connector_lem_stub \
-          QC_QCTQ_Test_Base_stub QC_QCTQ_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQ_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    QCTQ_Test_Connector_conn.h
-    QCTQ_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(QC_QCTQ_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += QC_QCTQ_Test_Connector_lem_stub QC_QCTQ_Test_Connector_exec \
-                QC_QCTQ_Test_Connector_stub
-  sharedname  = QC_QCTQ_Test_Connector_svnt
-  libs       += QC_QCTQ_Test_Connector_stub \
-                QC_QCTQ_Test_Connector_lem_stub  \
-                QC_QCTQ_Test_Base_stub \
-                QC_QCTQ_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQ_Test_ConnectorS.cpp
-    QCTQ_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    QCTQ_Test_ConnectorS.h
-    QCTQ_Test_Connector_svnt.h
-    QCTQ_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/README b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/README
deleted file mode 100644
index f2d19fb4eff..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/README
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-The TwoQueries exists of 4 runs. During each run the Sender writes 20 samples to DDS.
-After that it informs the receiver that the samples were written. The receiver
-in turn sets a filter and starts to pull the samples from DDS, using the Getter.
-Once the receiver has received all samples, it informs the Sender that the next
-run can be started.
-Since the getter only receives non-read samples, an extra check is build in. The
-receiver also performs a read on a different port in order to check whether the
-right samples are available in DDS. This Reader should always receive ALL samples
-since the QueryFilter only applies to the Getter.
-
-The following query expression is defined:
-  ( (iteration > %0) AND (iteration < %1) )
-
-The following runs are defined:
-
-1.  Sender writes iterations 1-20 to DDS for a certain number of keys,
-    defined in the deployment plan. The receiver sets the filter and filter
-    parameters and starts receiving the samples one by one, using get_one.
-    After that it changes the filter parameters and informs the Sender that a
-    new run can be started.
-2.  Sender writes iterations 21-40 to DDS for the defined number of keys. After
-    that it informs the receiver which starts to get the samples from DDS. After
-    that, the receiver reset the QueryFilter (by setting the expression to an
-    empty string) and informs the Sender that a new run can be started.
-3.  Sender writes iterations 41-60 to DDS for the defined number of keys. After
-    that it informs the receiver which should receive all samples with iterations
-    1-60 without the ones it read during run 1, 2 and 3.
-    The receiver then creates a new filter, using the same expression as used during
-    runs 1, 2 and 3 but with different parameters. Again the receiver informs the
-    Sender that a new run can be started.
-4.  Sender writes iterations 61-80 to DDS for the defined number of keys. Again it
-    informs the receiver about this action. The receiver should only get the samples
-    according to the query expression and its parameters.
-
-After each get-action, the receiver reads the data from DDS. During this read action,
-the receiver should read all samples the Sender has written up to that moment. Since
-there's no filter applied to this reader, all sample states should be 'FRESH_INFO'.
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver.idl
deleted file mode 100644
index 80d9f1fb76e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/QCTQ_Test_Connector.idl"
-#include "Base/QCTQ_Starter.idl"
-
-module QCTQ_Test
-{
-  component Receiver
-  {
-    port QueryConditionTestConnector::DDS_Get get_port;
-    port QueryConditionTestConnector::DDS_Read read_port;
-
-    provides TwoQueriesStarter reader_start;
-    uses TwoQueriesRestarter writer_restart;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver.mpc
deleted file mode 100644
index f38fa33da42..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver.mpc
+++ /dev/null
@@ -1,155 +0,0 @@
-project(QC_QCTQ_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += QC_QCTQ_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h \
-              -I..
-
-  IDL_Files {
-    QCTQ_Test_Receiver.idl
-  }
-}
-
-project(QC_QCTQ_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += QC_QCTQ_Test_Receiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    QCTQ_Test_ReceiverE.idl
-  }
-}
-
-project(QC_QCTQ_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += QC_QCTQ_Test_Receiver_lem_gen QC_QCTQ_Test_Receiver_stub  \
-           QC_QCTQ_Test_Connector_stub QC_QCTQ_Test_Base_stub \
-           QC_QCTQ_Starter_stub
-  libs  +=  Receiver_stub QC_QCTQ_Test_Connector_stub \
-            QC_QCTQ_Test_Base_stub QC_QCTQ_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQ_Test_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    QCTQ_Test_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    QCTQ_Test_ReceiverEC.inl
-  }
-}
-
-project(QC_QCTQ_Test_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += QC_QCTQ_Test_Receiver_idl_gen  QC_QCTQ_Test_Connector_stub \
-           QC_QCTQ_Test_Base_stub QC_QCTQ_Test_Connector_lem_gen \
-           QC_QCTQ_Starter_stub QC_QCTQ_Starter_lem_stub
-  libs  += QC_QCTQ_Test_Connector_stub QC_QCTQ_Test_Base_stub \
-           QC_QCTQ_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQ_Test_ReceiverC.cpp
-  }
-
-  Header_Files {
-    QCTQ_Test_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    QCTQ_Test_ReceiverC.inl
-  }
-}
-
-project(QC_QCTQ_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += QC_QCTQ_Test_Receiver_lem_stub QC_QCTQ_Test_Receiver_stub \
-             QC_QCTQ_Test_Base_stub QC_QCTQ_Test_Connector_stub \
-             QC_QCTQ_Test_Connector_lem_stub \
-             QC_QCTQ_Starter_lem_stub QC_QCTQ_Starter_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub QC_QCTQ_Test_Base_stub \
-          QC_QCTQ_Test_Connector_stub QC_QCTQ_Test_Connector_lem_stub \
-          QC_QCTQ_Starter_lem_stub QC_QCTQ_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL READER_STARTER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQ_Test_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    QCTQ_Test_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(QC_QCTQ_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   QC_QCTQ_Test_Receiver_lem_stub QC_QCTQ_Test_Base_stub \
-                  QC_QCTQ_Test_Connector_stub QC_QCTQ_Test_Connector_svnt \
-                  QC_QCTQ_Test_Receiver_exec QC_QCTQ_Test_Connector_lem_stub \
-                  QC_QCTQ_Starter_stub \
-                  QC_QCTQ_Starter_svnt QC_QCTQ_Starter_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub QC_QCTQ_Test_Base_stub \
-                QC_QCTQ_Test_Connector_stub QC_QCTQ_Test_Connector_svnt \
-                Receiver_exec QC_QCTQ_Test_Connector_lem_stub \
-                QC_QCTQ_Starter_stub QC_QCTQ_Starter_svnt \
-                QC_QCTQ_Starter_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQ_Test_ReceiverS.cpp
-    QCTQ_Test_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    QCTQ_Test_ReceiverS.h
-    QCTQ_Test_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.cpp
deleted file mode 100644
index 5982d0f880f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.cpp
+++ /dev/null
@@ -1,806 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "QCTQ_Test_Receiver_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-#include "dds4ccm/impl/Utils.h"
-#include "dds4ccm/impl/dds4ccm_utils.h"
-
-#define QUERY "( (iteration > %0) AND (iteration < %1) )"
-// #define QUERY_2 "( (iteration > %0) AND (iteration < %1) )"
-
-#define MIN_ITERATION_1 "2"
-#define MAX_ITERATION_1 "5"
-
-#define MIN_ITERATION_2 "22"
-#define MAX_ITERATION_2 "34"
-
-#define MIN_ITERATION_3 "68"
-#define MAX_ITERATION_3 "77"
-
-// Reader also reads already read samples.
-// The getter receives the following iterations:
-// During run 1: 2 (iterations 3 and 4)
-// During run 2: 11 (iterations between 22 and 34)
-// During run 3: 2 (all unread samples, meaning iterations 1-60
-//               without iteration 3, 4 and iterations between 22 and 34)
-// During run 4: 8 (iterations between 68 and 77)
-
-#define SAMPLES_PER_KEY_GETTER (2 + 11 + 47 + 8)
-
-namespace CIAO_QCTQ_Test_Receiver_Impl
-{
-  /**
-   * Read action generator
-   */
-
-  read_action_Generator::read_action_Generator (Receiver_exec_i &callback, int run)
-    : callback_ (callback),
-      run_ (run)
-  {
-  }
-
-  read_action_Generator::~read_action_Generator ()
-  {
-  }
-
-  int
-  read_action_Generator::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Checking if last sample "
-                          "is available in DDS...\n"));
-    if (this->callback_.check_last ())
-      {
-        this->callback_.run (this->run_);
-      }
-    return 0;
-  }
-
-  /**
-   * Facet Executor Implementation Class: get_port_status_exec_i
-   */
-
-  get_port_status_exec_i::get_port_status_exec_i (
-        ::QCTQ_Test::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::QCTQ_Test::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  get_port_status_exec_i::~get_port_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  get_port_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  get_port_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: reader_start_exec_i
-   */
-
-  reader_start_exec_i::reader_start_exec_i (
-        ::QCTQ_Test::CCM_Receiver_Context_ptr ctx,
-        Receiver_exec_i & callback)
-    : ciao_context_ (
-        ::QCTQ_Test::CCM_Receiver_Context::_duplicate (ctx))
-      , callback_ (callback)
-  {
-  }
-
-  reader_start_exec_i::~reader_start_exec_i (void)
-  {
-  }
-
-  // Operations from ::TwoQueriesStarter
-
-  void
-  reader_start_exec_i::set_reader_properties (::CORBA::UShort nr_keys,
-  ::CORBA::UShort nr_iterations)
-  {
-    this->callback_.keys (nr_keys);
-    this->callback_.iterations (nr_iterations);
-  }
-
-  void
-  reader_start_exec_i::start_read (::CORBA::UShort run)
-  {
-    this->callback_.start_read (run);
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : iterations_ (20)
-      , keys_ (5)
-      , current_min_iteration_ (ACE_OS::atoi (MIN_ITERATION_1))
-      , current_max_iteration_ (ACE_OS::atoi (MAX_ITERATION_1))
-      , ticker_ (0)
-      , samples_expected_ (0)
-      , samples_received_ (0)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Receiver_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  bool
-  Receiver_exec_i::check_last ()
-  {
-    ::QCTQ_Test::QueryConditionTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_get_port_data ();
-
-    try
-      {
-        QueryConditionTest queryfiltertest_info;
-        ::CCM_DDS::ReadInfo readinfo;
-        char key[10];
-        ACE_OS::sprintf (key, "KEY_%d", this->keys_);
-        queryfiltertest_info.symbol = ::CORBA::string_dup (key);
-        reader->read_one_last (
-                queryfiltertest_info,
-                readinfo,
-                ::DDS::HANDLE_NIL);
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_last - "
-                              "last iteration <%02d> - <%02d>\n",
-                               queryfiltertest_info.iteration,
-                               this->current_max_iteration_ - 1));
-        return queryfiltertest_info.iteration >= this->current_max_iteration_ - 1;
-      }
-    catch (const ::CCM_DDS::InternalError &)
-      {
-      }
-    catch (const ::CCM_DDS::NonExistent &)
-      {
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::check_last: "
-                              "ERROR: Unexpected exception caught\n"));
-      }
-    return false;
-  }
-
-  // Supported operations and attributes.
-  bool
-  Receiver_exec_i::check_iter (const QueryConditionTest & sample,
-                               ::CORBA::UShort run,
-                               ::CCM_DDS::ReadInfo * info)
-  {
-    if (!info)
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("GET ALL : ")
-            ACE_TEXT ("sample received for <%C>: iteration <%d>\n"),
-            sample.symbol.in (),
-            sample.iteration));
-      }
-    if (run == 3)
-      {
-        // We need to receive all UNread samples. Therefor we should
-        // receive all samples except the ones between
-        // MIN_ITERATION_1 and MAX_ITERATION_1 and between
-        // MIN_ITERATION_2 and MAX_ITERATION_2
-        if ((sample.iteration > ACE_OS::atoi (MIN_ITERATION_1)  &&
-             sample.iteration < ACE_OS::atoi (MAX_ITERATION_1)) ||
-            (sample.iteration > ACE_OS::atoi (MIN_ITERATION_2)  &&
-             sample.iteration < ACE_OS::atoi (MAX_ITERATION_2)))
-          {
-            // Read supplies info. There check the sample status mask
-            // as well
-            if (info != 0)
-              { // access mask should be "ALREADY_SEEN" since the getter should
-                // already have seen this sample.
-                if (info->access_status != ::CCM_DDS::ALREADY_SEEN)
-                  {
-                    // READ ALL since this check is only performed
-                    // during a read.
-                    ACE_ERROR ((LM_ERROR, "ERROR: READ ALL: "
-                                "Unexpected sample access mask - "
-                                "expected <%C> - "
-                                "received <%C>\n",
-                                CIAO::DDS4CCM::translate_ccm_dds_accessstatus (::CCM_DDS::ALREADY_SEEN),
-                                CIAO::DDS4CCM::translate_ccm_dds_accessstatus (info->access_status)
-                                ));
-                    return false;
-                  }
-              }
-            else
-              {
-                // Getter functionality
-                ACE_ERROR ((LM_ERROR, "ERROR: GET ALL: "
-                                      "Didn't except samples between "
-                                      "<%02d> and <%02d> and between "
-                                      "<%02d> and <%02d>\n",
-                                      ACE_OS::atoi (MIN_ITERATION_1),
-                                      ACE_OS::atoi (MAX_ITERATION_1),
-                                      ACE_OS::atoi (MIN_ITERATION_2),
-                                      ACE_OS::atoi (MAX_ITERATION_2)));
-                return false;
-              }
-          }
-      }
-    else if (!info)
-      {
-        if (sample.iteration <= current_min_iteration_)
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: GET ALL: "
-                                  "Didn't expect samples with iteration %d "
-                                  "<= %d\n", sample.iteration,
-                                  this->current_min_iteration_));
-            return false;
-          }
-        if (sample.iteration > this->current_max_iteration_)
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: GET ALL: "
-                                  "Didn't expect samples with iteration %d "
-                                  "> %2d\n", sample.iteration,
-                                  this->current_max_iteration_));
-            return false;
-          }
-      }
-    if (info != 0)
-      { // access mask should be "FRESH_INFO" since the getter has not
-        // "seen" this sample but the reader has seen the samples
-        // of the previous runs.
-        if (sample.iteration > this->current_min_iteration_)
-          {
-            if (info->access_status != ::CCM_DDS::FRESH_INFO)
-              {
-                // READ ALL since this check is only performed
-                // during a read.
-                ACE_ERROR ((LM_ERROR, "ERROR: READ ALL: "
-                            "Unexpected sample access mask - "
-                            "expected <%C> - "
-                            "received <%C>\n",
-                            CIAO::DDS4CCM::translate_ccm_dds_accessstatus (::CCM_DDS::FRESH_INFO),
-                            CIAO::DDS4CCM::translate_ccm_dds_accessstatus (info->access_status)));
-                return false;
-              }
-          }
-      }
-    return true;
-  }
-
-
-  void
-  Receiver_exec_i::read_all (::CORBA::UShort run)
-  {
-    ::QCTQ_Test::QueryConditionTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_read_port_data ();
-
-    if (::CORBA::is_nil (reader.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::read_all - "
-                              "ERROR: No Reader\n"));
-        return;
-      }
-    QueryConditionTestSeq qf_info;
-    ::CCM_DDS::ReadInfoSeq readinfos;
-    ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::read_all - "
-                "Start checking samples in DDS\n"));
-    reader->read_all (qf_info, readinfos);
-    ::CORBA::ULong expected =
-      static_cast < ::CORBA::ULong > (run * this->iterations_ * this->keys_);
-    if (qf_info.length () != expected)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::read_all - "
-                              "Unexpected number of samples received: "
-                              "expected <%d> - received <%u>\n",
-                               expected, qf_info.length ()));
-      }
-    for (::CORBA::ULong i = 0; i < qf_info.length (); ++i)
-      {
-        ACE_DEBUG ((LM_DEBUG, "READ ALL : Receiver_exec_i::read_all - "
-                              "Sample received: key <%C> - iteration <%d> - "
-                              "sample_read_state <%C>\n",
-                              qf_info[i].symbol.in (),
-                              qf_info[i].iteration,
-                              CIAO::DDS4CCM::translate_ccm_dds_accessstatus (readinfos[i].access_status)));
-        if (!this->check_iter (qf_info[i], run, &readinfos[i]))
-          break;
-      }
-  }
-
-
-  ::CORBA::ULong
-  Receiver_exec_i::get_all (::CORBA::UShort run)
-  {
-    ::QCTQ_Test::QueryConditionTestConnector::Getter_var getter =
-      this->ciao_context_->get_connection_get_port_fresh_data ();
-    ::CORBA::ULong samples_received = 0;
-
-    if (::CORBA::is_nil (getter.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_all - "
-                              "ERROR: No Getter\n"));
-        return 0;
-      }
-    QueryConditionTest_var qf_info;
-    ::CCM_DDS::ReadInfo readinfo;
-    ::CORBA::Boolean result = getter->get_one (qf_info.out (), readinfo);
-    if (result)
-      {
-        this->check_iter (qf_info.in (), run);
-        ++samples_received;
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_all - "
-                              "ERROR: time out when retrieving "
-                              "first sample.\n"));
-      }
-    while (result)
-      {
-        result = getter->get_one (qf_info.out (), readinfo);
-        if (result)
-          {
-            if (!this->check_iter (qf_info.in (), run))
-              break;
-            ++samples_received;
-          }
-      }
-    return samples_received;
-  }
-
-  ::CORBA::ULong
-  Receiver_exec_i::test_all (::CORBA::UShort run)
-  {
-    try
-      {
-        return get_all (run);
-      }
-    catch (const CCM_DDS::NonExistent& ex)
-      {
-        for (::CORBA::ULong i = 0; i < ex.indexes.length (); ++i)
-          {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ERROR test_all <%d>: ")
-                  ACE_TEXT ("caught expected exception: index <%u>\n"),
-                  run,
-                  ex.indexes[i]));
-          }
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: test_all <%d>: ")
-              ACE_TEXT ("caught InternalError exception: retval <%u>\n"),
-              run,
-              ex.error_code));
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("test_all");
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Receiver_exec_i::test_all <%d> : Exception caught\n"),
-          run));
-      }
-    return 0;
-  }
-
-  void
-  Receiver_exec_i::check_filter (::CORBA::UShort run)
-  {
-    ::CCM_DDS::QueryFilter_var filter;
-    ::QCTQ_Test::QueryConditionTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_get_port_data ();
-    try
-      {
-        filter = reader->query ();
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        if (run == 3)
-          {
-            ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_filter - "
-                                  "caught expected InternalEr excep: retval <%u>\n",
-                                  ex.error_code));
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - "
-                                  "caught InternalError exception: retval <%u>\n",
-                                  ex.error_code));
-          }
-        return;
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Receiver_exec_i::check_filter: ");
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - "
-                              "Exception caught\n"));
-        return;
-      }
-
-    //check query
-    bool error = false;
-
-    if (ACE_OS::strcmp (filter->expression, QUERY) != 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - "
-                              "Unexpected query when retrieving filter: "
-                              "expected <%C> - received <%C>\n",
-                              QUERY, filter->expression.in ()));
-        error = true;
-      }
-    //check current parameters.
-    if (filter->parameters.length () != 2)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - "
-                              "Unexpected number of parameters: "
-                              "expected <%d> - received <%d>\n",
-                              2, filter->parameters.length ()));
-        error = true;
-      }
-
-    if (filter->parameters.length () >= 1)
-      {
-        if (ACE_OS::atoi (filter->parameters[0]) != this->current_min_iteration_)
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - "
-                                  "Unexpected param value: "
-                                  "expected <%d> - received <%C>\n",
-                                  this->current_min_iteration_,
-                                  filter->parameters[0].in ()));
-            error = true;
-          }
-      }
-    if (filter->parameters.length () >= 2)
-      {
-        if (ACE_OS::atoi (filter->parameters[1]) != this->current_max_iteration_)
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - "
-                                  "Unexpected param value: "
-                                  "expected <%d> - received <%C>\n",
-                                  this->current_max_iteration_,
-                                  filter->parameters[1].in ()));
-            error = true;
-          }
-      }
-    if (!error)
-      {
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_filter - "
-                              "Passed check_filter test for run <%d>.\n",
-                              run));
-      }
-  }
-
-  void
-  Receiver_exec_i::set_filter (::CORBA::UShort run)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Set filter for run <%d>\n", run));
-    ::QCTQ_Test::QueryConditionTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_get_port_data ();
-
-    try
-      {
-        ::CCM_DDS::QueryFilter filter;
-        run != 3 ? filter.expression = ::CORBA::string_dup (QUERY) :
-                   filter.expression = ::CORBA::string_dup ("");
-        filter.parameters.length (2);
-        if (run == 1)
-          {
-            filter.parameters[0] = ::CORBA::string_dup (MIN_ITERATION_1);
-            filter.parameters[1] = ::CORBA::string_dup (MAX_ITERATION_1);
-            this->current_min_iteration_ = ACE_OS::atoi (MIN_ITERATION_1);
-            this->current_max_iteration_ = ACE_OS::atoi (MAX_ITERATION_1);
-          }
-        else if (run == 2)
-          {
-            filter.parameters[0] = ::CORBA::string_dup (MIN_ITERATION_2);
-            filter.parameters[1] = ::CORBA::string_dup (MAX_ITERATION_2);
-            this->current_min_iteration_ = ACE_OS::atoi (MIN_ITERATION_2);
-            this->current_max_iteration_ = ACE_OS::atoi (MAX_ITERATION_2);
-          }
-        else if (run == 3)
-          {
-            filter.parameters[0] = ::CORBA::string_dup ("0");
-            filter.parameters[1] = ::CORBA::string_dup ("0");
-            this->current_min_iteration_ = (run - 1) * this->iterations_;
-            this->current_max_iteration_ = run * this->iterations_;
-          }
-        else if (run == 4)
-          {
-            filter.parameters[0] = ::CORBA::string_dup (MIN_ITERATION_3);
-            filter.parameters[1] = ::CORBA::string_dup (MAX_ITERATION_3);
-            this->current_min_iteration_ = ACE_OS::atoi (MIN_ITERATION_3);
-            this->current_max_iteration_ = ACE_OS::atoi (MAX_ITERATION_3);
-          }
-        ACE_DEBUG ((LM_DEBUG, "Filter : Query <%C>, parameter[0] <%C>, parameter[1] <%C>\n",
-              filter.expression.in (), filter.parameters[0].in (), filter.parameters[1].in ()));
-        reader->query (filter);
-      }
-    catch (const ::CCM_DDS::InternalError &ex)
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::set_filter - "
-                    "ERROR: Unexpected InternalError exception caught "
-                    "with <%C> as error\n.",
-                    ::CIAO::DDS4CCM::translate_retcode (ex.error_code)));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::set_filter - "
-                    "ERROR: Unexpected exception caught.\n"));
-      }
-  }
-
-  void
-  Receiver_exec_i::start_read (::CORBA::UShort run)
-  {
-    this->ticker_ = new read_action_Generator (*this, run);
-    if (this->reactor ()->schedule_timer (this->ticker_,
-                                          0,
-                                          ACE_Time_Value(1, 0),
-                                          ACE_Time_Value(1, 0)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, "Unable to schedule Timer\n"));
-      }
-  }
-
-  void
-  Receiver_exec_i::run (::CORBA::UShort run)
-  {
-    if (this->ticker_)
-      {
-        this->reactor ()->cancel_timer (this->ticker_);
-        delete this->ticker_;
-        this->ticker_ = 0;
-      }
-    ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::run - "
-                          "Starting run number <%d>\n",
-                          run));
-    TwoQueriesRestarter_var restarter =
-      this->ciao_context_->get_connection_writer_restart ();
-    if (!::CORBA::is_nil (restarter.in ()))
-      {
-        switch (run)
-        {
-          case 1:
-            {
-              this->samples_received_ += this->test_all (run);
-              this->check_filter (run);
-              this->read_all (run);
-              //set filter for the next run
-              this->set_filter (run + 1);
-              // inform the sender that it may start the next run
-              restarter->restart_write ();
-            }
-            break;
-          case 2:
-            {
-              this->samples_received_ += this->test_all (run);
-              check_filter (run);
-              this->read_all (run);
-              //set filter for the next run
-              this->set_filter (run + 1);
-              // inform the sender that it may start the next run
-              restarter->restart_write ();
-            }
-            break;
-          case 3:
-            {
-              this->samples_received_ += this->test_all (run);
-              this->check_filter (run);
-              this->read_all (run);
-              //set filter for the next run
-              this->set_filter (run + 1);
-              // inform the sender that it may start the next run
-              restarter->restart_write ();
-            }
-            break;
-          case 4:
-            {
-              this->samples_received_ += this->test_all (run);
-              this->read_all (run);
-            }
-        }
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::run - "
-                  "ERROR: Reference to Restarter not found\n"));
-      }
-  }
-
-  void
-  Receiver_exec_i::iterations (::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-
-  }
-
-  void
-  Receiver_exec_i::keys (::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-
-    this->samples_expected_ = (this->keys_ - 1) * SAMPLES_PER_KEY_GETTER;
-  }
-
-  // Component attributes and port operations.
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_get_port_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_get_port_status_.in ()))
-      {
-        get_port_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          get_port_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_get_port_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_get_port_status_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_read_port_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::CCM_TwoQueriesStarter_ptr
-  Receiver_exec_i::get_reader_start (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_reader_start_.in ()))
-      {
-        reader_start_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          reader_start_exec_i (
-            this->ciao_context_.in (),
-            *this),
-            ::CCM_TwoQueriesStarter::_nil ());
-
-          this->ciao_reader_start_ = tmp;
-      }
-
-    return
-      ::CCM_TwoQueriesStarter::_duplicate (
-        this->ciao_reader_start_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::QCTQ_Test::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    ::QCTQ_Test::QueryConditionTestConnector::Getter_var getter =
-      this->ciao_context_->get_connection_get_port_fresh_data ();
-    DDS::Duration_t to;
-    to.sec = 5; to.nanosec = 0;
-    getter->time_out (to);
-    // Set filter for the first run
-    this->set_filter (1);
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    if (this->ticker_)
-      {
-        this->reactor ()->cancel_timer (this->ticker_);
-        delete this->ticker_;
-        this->ticker_ = 0;
-      }
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    if (this->samples_received_ != this->samples_expected_)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: TWO QUERIES GETTER : "
-                              "Unexpected number of samples received: "
-                              "expected <%d> - received <%d>\n",
-                              this->samples_expected_,
-                              this->samples_received_));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "TWO QUERIES : GETTER : "
-                              "Expected number of samples received: "
-                              "expected <%d> - received <%d>\n",
-                              this->samples_expected_,
-                              this->samples_received_));
-      }
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_QCTQ_Test_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.h
deleted file mode 100644
index de5c32eda55..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.h
+++ /dev/null
@@ -1,221 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_QCTQ_TEST_RECEIVER_EXEC_HWBPVD_H_
-#define CIAO_QCTQ_TEST_RECEIVER_EXEC_HWBPVD_H_
-
-#include /**/ "ace/pre.h"
-
-#include "QCTQ_Test_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_QCTQ_Test_Receiver_Impl
-{
-
-  class Receiver_exec_i;
-
-  /**
-   * Read action generator
-   */
-
-  class read_action_Generator
-    : public ACE_Event_Handler
-  {
-  public:
-    read_action_Generator (Receiver_exec_i &callback,
-                           int run);
-
-    ~read_action_Generator ();
-
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    Receiver_exec_i &callback_;
-    int run_;
-
-  };
-
-  /**
-   * Provider Executor Implementation Class: get_port_status_exec_i
-   */
-
-  class get_port_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    get_port_status_exec_i (
-      ::QCTQ_Test::CCM_Receiver_Context_ptr ctx);
-    virtual ~get_port_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::QCTQ_Test::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: reader_start_exec_i
-   */
-
-  class reader_start_exec_i
-    : public virtual ::CCM_TwoQueriesStarter,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    reader_start_exec_i (
-      ::QCTQ_Test::CCM_Receiver_Context_ptr ctx,
-      Receiver_exec_i & callback);
-    virtual ~reader_start_exec_i (void);
-
-    //@{
-    /** Operations and attributes from TwoQueriesStarter. */
-
-    virtual
-    void set_reader_properties (::CORBA::UShort nr_keys,
-    ::CORBA::UShort nr_iterations);
-
-    virtual
-    void start_read (::CORBA::UShort run);
-    //@}
-
-  private:
-    ::QCTQ_Test::CCM_Receiver_Context_var ciao_context_;
-    Receiver_exec_i & callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_get_port_status (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_read_port_status (void);
-
-
-    virtual ::CCM_TwoQueriesStarter_ptr
-    get_reader_start (void);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void iterations (CORBA::UShort iterations);
-    void keys (::CORBA::UShort keys);
-
-    bool check_last (void);
-    void start_read (::CORBA::UShort run);
-    void run (::CORBA::UShort run);
-    //@}
-
-  private:
-    ::QCTQ_Test::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_get_port_status_;
-    ::CCM_TwoQueriesStarter_var ciao_reader_start_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    ::CORBA::UShort iterations_;
-    ::CORBA::UShort keys_;
-
-    int current_min_iteration_;
-    int current_max_iteration_;
-
-    read_action_Generator *ticker_;
-
-    ::CORBA::ULong samples_expected_;
-    ::CORBA::ULong samples_received_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    ::CORBA::ULong test_all (::CORBA::UShort run);
-    ::CORBA::ULong get_all (::CORBA::UShort run);
-    void read_all (::CORBA::UShort run);
-    bool check_iter (const QueryConditionTest & sample,
-                     ::CORBA::UShort run,
-                     ::CCM_DDS::ReadInfo * info = 0);
-    void check_filter (::CORBA::UShort run);
-    void set_filter (::CORBA::UShort run);
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_QCTQ_Test_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender.idl
deleted file mode 100644
index 0b691cb570e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_QUERY_CONDITION_TEST_SENDER_IDL
-#define DDS_QUERY_CONDITION_TEST_SENDER_IDL
-
-#include "Connector/QCTQ_Test_Connector.idl"
-#include "Base/QCTQ_Starter.idl"
-
-module QCTQ_Test
-{
-  component Sender
-  {
-    port QCTQ_Test::QueryConditionTestConnector::DDS_Write info_write;
-    provides CCM_DDS::ConnectorStatusListener connector_status;
-
-    uses TwoQueriesStarter start_reader;
-    provides TwoQueriesRestarter restart_writer;
-
-    attribute unsigned short keys;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender.mpc
deleted file mode 100644
index 22fb33b6792..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender.mpc
+++ /dev/null
@@ -1,153 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p QCTQ_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(QC_QCTQ_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += QC_QCTQ_Test_Connector_idl_gen QC_QCTQ_Starter_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I..
-
-  IDL_Files {
-    QCTQ_Test_Sender.idl
-  }
-}
-
-project(QC_QCTQ_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += QC_QCTQ_Test_Sender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    QCTQ_Test_SenderE.idl
-  }
-}
-
-project(QC_QCTQ_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += QC_QCTQ_Test_Sender_lem_gen QC_QCTQ_Test_Sender_stub \
-           QC_QCTQ_Test_Base_stub QC_QCTQ_Starter_stub
-  libs  += QC_QCTQ_Test_Base_stub Sender_stub QC_QCTQ_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQ_Test_SenderEC.cpp
-  }
-
-  Header_Files {
-    QCTQ_Test_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    QCTQ_Test_SenderEC.inl
-  }
-}
-
-project(QC_QCTQ_Test_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += QC_QCTQ_Test_Sender_idl_gen QC_QCTQ_Test_Base_stub \
-           QC_QCTQ_Test_Connector_stub QC_QCTQ_Starter_stub \
-           QC_QCTQ_Starter_lem_stub
-  libs  += QC_QCTQ_Test_Base_stub QC_QCTQ_Test_Connector_stub \
-           QC_QCTQ_Starter_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQ_Test_SenderC.cpp
-  }
-
-  Header_Files {
-    QCTQ_Test_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    QCTQ_Test_SenderC.inl
-  }
-}
-
-project(QC_QCTQ_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += QC_QCTQ_Test_Sender_lem_stub QC_QCTQ_Test_Sender_stub \
-             QC_QCTQ_Test_Connector_lem_stub QC_QCTQ_Test_Connector_stub \
-             QC_QCTQ_Starter_lem_stub
-  sharedname = Sender_exec
-  libs    += Sender_stub Sender_lem_stub QC_QCTQ_Test_Base_stub \
-             QC_QCTQ_Test_Connector_lem_stub QC_QCTQ_Test_Connector_stub \
-             QC_QCTQ_Starter_stub QC_QCTQ_Starter_lem_stub \
-             QC_QCTQ_Starter_lem_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQ_Test_Sender_exec.cpp
-  }
-
-  Header_Files {
-    QCTQ_Test_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(QC_QCTQ_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += QC_QCTQ_Test_Base_stub  QC_QCTQ_Test_Sender_lem_stub \
-                QC_QCTQ_Test_Connector_stub \
-                QC_QCTQ_Test_Connector_svnt QC_QCTQ_Test_Connector_lem_stub \
-                QC_QCTQ_Starter_stub QC_QCTQ_Starter_svnt \
-                QC_QCTQ_Starter_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub QC_QCTQ_Test_Base_stub \
-                QC_QCTQ_Test_Connector_stub QC_QCTQ_Test_Connector_svnt \
-                QC_QCTQ_Test_Connector_lem_stub QC_QCTQ_Starter_stub \
-                QC_QCTQ_Starter_svnt QC_QCTQ_Starter_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQ_Test_SenderS.cpp
-    QCTQ_Test_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    QCTQ_Test_SenderS.h
-    QCTQ_Test_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender_exec.cpp
deleted file mode 100644
index 6f3213ead99..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender_exec.cpp
+++ /dev/null
@@ -1,349 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "QCTQ_Test_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-#define ITERATIONS 20
-
-namespace CIAO_QCTQ_Test_Sender_Impl
-{
-  /**
-   * ConnectorStatusListener_exec_i
-   */
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (
-    Sender_exec_i &callback)
-    : callback_ (callback)
-    , started_ (false)
-  {
-  }
-
-  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic (
-    ::DDS::Topic_ptr /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status(
-    ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind status_kind)
-  {
-    if (!this->started_ && status_kind == ::DDS::PUBLICATION_MATCHED_STATUS)
-      {
-        this->started_ = true;
-        ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_unexpected_status - "
-          "Publication matched received: starting the test\n"));
-
-        this->callback_.get_started ();
-      }
-  }
-
-  /**
-   * WriteHandler
-   */
-
-  WriteHandler::WriteHandler (Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  WriteHandler::handle_exception (ACE_HANDLE)
-  {
-    this->callback_.start ();
-    return 0;
-  }
-
-  /**
-   * Facet Executor Implementation Class: restart_writer_exec_i
-   */
-
-  restart_writer_exec_i::restart_writer_exec_i (
-        ::QCTQ_Test::CCM_Sender_Context_ptr ctx,
-        Sender_exec_i & callback)
-    : ciao_context_ (
-        ::QCTQ_Test::CCM_Sender_Context::_duplicate (ctx))
-      , callback_ (callback)
-  {
-  }
-
-  restart_writer_exec_i::~restart_writer_exec_i (void)
-  {
-  }
-
-  // Operations from ::TwoQueriesRestarter
-
-  void
-  restart_writer_exec_i::restart_write (void)
-  {
-    this->callback_.restart ();
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : keys_ (0)
-      , iterations_ (ITERATIONS)
-      , run_ (1)
-      , wh_ (0)
-
-  {
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    if (this->wh_)
-      {
-        delete this->wh_;
-      }
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Sender_exec_i::restart (void)
-  {
-    ++this->run_;
-    if (this->wh_)
-      {
-        delete this->wh_;
-        this->wh_ = 0;
-      }
-    ACE_NEW_THROW_EX (this->wh_,
-                     WriteHandler (*this),
-                     ::CORBA::NO_MEMORY ());
-    this->reactor ()->notify (this->wh_);
-  }
-
-
-  void
-  Sender_exec_i::get_started (void)
-  {
-    try
-      {
-        if (this->wh_)
-          {
-            delete this->wh_;
-            this->wh_ = 0;
-          }
-        ACE_NEW_THROW_EX (this->wh_,
-                          WriteHandler (*this),
-                          ::CORBA::NO_MEMORY ());
-        this->reactor ()->notify (this->wh_);
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("Exception caught:");
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: get_started : Exception caught\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: get_started : Unknown exception caught\n")));
-      }
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    ::QCTQ_Test::QueryConditionTestConnector::Writer_var writer =
-      this->ciao_context_->get_connection_info_write_data ();
-    TwoQueriesStarter_var starter =
-      this->ciao_context_->get_connection_start_reader ();
-
-    if (! ::CORBA::is_nil (starter.in ()))
-      {
-        starter->set_reader_properties (this->keys_, this->iterations_);
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Unable to start the reader\n")));
-        return;
-      }
-    for (CORBA::UShort iter_key = 1; iter_key < this->keys_ + 1; ++iter_key)
-      {
-        char key[7];
-        QueryConditionTest new_key;
-        ACE_OS::sprintf (key, "KEY_%d", iter_key);
-        new_key.symbol = CORBA::string_dup(key);
-        CORBA::UShort iter = ((this->run_ - 1) * this->iterations_) + 1;
-        while (iter < this->run_ * this->iterations_ + 1)
-          {
-            new_key.iteration = iter;
-            writer->write_one (new_key, ::DDS::HANDLE_NIL);
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Written key <%C> with <%d>\n"),
-                        key, iter));
-            ++iter;
-          }
-      }
-    ACE_OS::sleep (2);
-    starter->start_read (this->run_);
-  }
-
-  // Component attributes and port operations.
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i  (*this);
-  }
-
-  ::CCM_TwoQueriesRestarter_ptr
-  Sender_exec_i::get_restart_writer (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_restart_writer_.in ()))
-      {
-        restart_writer_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          restart_writer_exec_i (
-            this->ciao_context_.in (),
-            *this),
-            ::CCM_TwoQueriesRestarter::_nil ());
-
-          this->ciao_restart_writer_ = tmp;
-      }
-
-    return
-      ::CCM_TwoQueriesRestarter::_duplicate (
-        this->ciao_restart_writer_.in ());
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::QCTQ_Test::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_QCTQ_Test_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender_exec.h
deleted file mode 100644
index 37b8f265fb3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender_exec.h
+++ /dev/null
@@ -1,196 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_QCTQ_TEST_SENDER_EXEC_VZMKKL_H_
-#define CIAO_QCTQ_TEST_SENDER_EXEC_VZMKKL_H_
-
-#include /**/ "ace/pre.h"
-
-#include "QCTQ_Test_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_QCTQ_Test_Sender_Impl
-{
-  class Sender_exec_i;
-
-  /**
-   * ConnectorStatusListener_exec_i
-   */
-  class SENDER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Sender_exec_i &callback);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-      void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                                 ::DDS::StatusKind status_kind);
-  private:
-    Sender_exec_i &callback_;
-    bool started_;
-  };
-
-  /**
-   * WriteHandler
-   */
-
-  class WriteHandler :
-    public ACE_Event_Handler
-  {
-  public:
-    WriteHandler (Sender_exec_i &callback);
-    virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: restart_writer_exec_i
-   */
-
-  class restart_writer_exec_i
-    : public virtual ::CCM_TwoQueriesRestarter,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    restart_writer_exec_i (
-      ::QCTQ_Test::CCM_Sender_Context_ptr ctx,
-      Sender_exec_i & callback);
-    virtual ~restart_writer_exec_i (void);
-
-    //@{
-    /** Operations and attributes from TwoQueriesRestarter. */
-
-    virtual
-    void restart_write (void);
-    //@}
-
-  private:
-    ::QCTQ_Test::CCM_Sender_Context_var ciao_context_;
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_connector_status (void);
-
-    virtual ::CCM_TwoQueriesRestarter_ptr
-    get_restart_writer (void);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void get_started (void);
-    void start (void);
-    void restart (void);
-
-    //@}
-
-  private:
-    ::QCTQ_Test::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::CCM_TwoQueriesRestarter_var ciao_restart_writer_;
-
-    ::CORBA::UShort keys_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    CORBA::UShort iterations_;
-    CORBA::UShort run_;
-    WriteHandler *wh_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_QCTQ_Test_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/Plan.cdp
deleted file mode 100644
index 8349f74fcb1..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/Plan.cdp
+++ /dev/null
@@ -1,520 +0,0 @@
-<!--  -->
-<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>QCTQ_Test_Depl_1</label>
-  <UUID>QCTQ_Test_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QCTQ_Test_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QCTQ_Test_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="QCTQ_Test_EventConnectorImplementation">
-    <name>QCTQ_Test_EventConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="QCTQ_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="QCTQ_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QCTQ_Test_QueryConditionTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QCTQ_Test_QueryConditionTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QC_QCTQ_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QC_QCTQ_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="QCTQ_Test_StateConnectorImplementation">
-    <name>QCTQ_Test_StateConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="QCTQ_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="QCTQ_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QCTQ_Test_QueryConditionTestConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QCTQ_Test_QueryConditionTestConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QC_QCTQ_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QC_QCTQ_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QCTQ_Test_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QCTQ_Test_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-  </instance>
-
-  <instance xmi:id="QCTQ_Test_SenderConnectorInstance">
-    <name>QCTQ_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="QCTQ_Test_EventConnectorImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QueryCondition_Library#QueryConditionProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QCTQ_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="QCTQ_Test_EventConnector">
-    <name>QCTQ_Test_EventConnector</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="QCTQ_Test_EventConnectorImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QueryCondition_Library#QueryConditionProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QCTQ_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="QCTQ_Test_StateConnector">
-    <name>QCTQ_Test_StateConnector</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="QCTQ_Test_StateConnectorImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QueryCondition_Library#QueryConditionProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QCTQ_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>read_port_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>read_port_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>passive_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="QCTQ_Test_StateConnector" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>get_port_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>get_port_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="QCTQ_Test_EventConnector" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>get_port_fresh_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>get_port_fresh_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_fresh_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="QCTQ_Test_EventConnector" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="QCTQ_Test_SenderConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>reader_starter</name>
-    <internalEndpoint>
-      <portName>start_reader</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>reader_start</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>restart_writer</name>
-    <internalEndpoint>
-      <portName>writer_restart</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>restart_writer</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="QCTQ_Test_SenderConnectorInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="QCTQ_Test_Connector_ExecArtifact">
-    <name>QC_QCTQ_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>QC_QCTQ_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="QCTQ_Test_Connector_SvntArtifact">
-    <name>QC_QCTQ_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>QC_QCTQ_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="QCTQ_Test_Connector_StubArtifact">
-    <name>QC_QCTQ_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>QC_QCTQ_Test_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/QueryCondition_Library.xml b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/QueryCondition_Library.xml
deleted file mode 100644
index b9cba6277a3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/QueryCondition_Library.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-
-  <qos_profile name="QueryConditionProfile">
-    <!-- QoS used to configure the data writer created in the example code -->
-    <datawriter_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-        <max_blocking_time>
-          <sec>10</sec>
-          <nanosec>0</nanosec>
-        </max_blocking_time>
-      </reliability>
-      <durability>
-        <kind>TRANSIENT_DURABILITY_QOS</kind>
-      </durability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-    </datawriter_qos>
-    <!-- QoS used to configure the data reader created in the example code -->
-    <datareader_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-      </reliability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-      <durability>
-        <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-      </durability>
-    </datareader_qos>
-  </qos_profile>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index 37e7ff8dec9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-Description
-XML QoS Profile
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="QueryCondition_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="QueryConditionProfile" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>10</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/run_test.pl
deleted file mode 100755
index b87434bef7e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 60 seconds to allow task to complete\n";
-sleep (60);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -s\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Starter.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Starter.idl
deleted file mode 100644
index d9b7dc87807..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Starter.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file QCTQM_Starter.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef QUERYCONDITION_STARTER_IDL
-#define QUERYCONDITION_STARTER_IDL
-
-#pragma ciao lem "Base/QCTQM_StarterE.idl"
-
-interface TwoQueriesStarter
-{
-  void set_reader_properties (in unsigned short nr_keys,
-                              in unsigned short nr_iterations);
-  void start_read (in unsigned short run);
-};
-
-interface TwoQueriesRestarter
-{
-  void restart_write ();
-};
-
-#endif /* QUERYCONDITION_STARTER_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Starter.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Starter.mpc
deleted file mode 100644
index d5696898dd6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Starter.mpc
+++ /dev/null
@@ -1,109 +0,0 @@
-project(QC_QCTQM_Starter_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=READER_STARTER_STUB_Export \
-              -Wb,stub_export_include=QCTQM_Starter_stub_export.h \
-              -Wb,skel_export_macro=READER_STARTER_SVNT_Export \
-              -Wb,skel_export_include=QCTQM_Starter_svnt_export.h \
-              -Wb,svnt_export_macro=READER_STARTER_SVNT_Export \
-              -Wb,svnt_export_include=QCTQM_Starter_svnt_export.h \
-              -Wb,exec_export_macro=READER_STARTER_EXEC_Export \
-              -Wb,exec_export_include=QCTQM_Starter_exec_export.h -I..
-
-  IDL_Files {
-    QCTQM_Starter.idl
-  }
-}
-
-project(QC_QCTQM_Starter_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += QC_QCTQM_Starter_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=READER_STARTER_LEM_STUB_Export \
-              -Wb,stub_export_include=QCTQM_Starter_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    QCTQM_StarterE.idl
-  }
-}
-
-project(QC_QCTQM_Starter_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += QC_QCTQM_Starter_lem_gen QC_QCTQM_Starter_stub
-  libs  += QC_QCTQM_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = QC_QCTQM_Starter_lem_stub
-  dynamicflags += READER_STARTER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQM_StarterEC.cpp
-  }
-
-  Header_Files {
-    QCTQM_StarterEC.h
-    QCTQM_Starter_lem_stub_export.h
-  }
-
-  Inline_Files {
-    QCTQM_StarterEC.inl
-  }
-}
-
-project(QC_QCTQM_Starter_stub) : ccm_stub, dds4ccm_base {
-  after += QC_QCTQM_Starter_idl_gen
-  libs  +=
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = QC_QCTQM_Starter_stub
-  dynamicflags += READER_STARTER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQM_StarterC.cpp
-  }
-
-  Header_Files {
-    QCTQM_StarterC.h
-    QCTQM_Starter_stub_export.h
-  }
-
-  Inline_Files {
-    QCTQM_StarterC.inl
-  }
-}
-
-
-project(QC_QCTQM_Starter_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += QC_QCTQM_Starter_lem_stub QC_QCTQM_Starter_stub
-  sharedname  = QC_QCTQM_Starter_svnt
-  libs       += QC_QCTQM_Starter_stub QC_QCTQM_Starter_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += READER_STARTER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQM_StarterS.cpp
-    QCTQM_Starter_svnt.cpp
-  }
-
-  Header_Files {
-    QCTQM_StarterS.h
-    QCTQM_Starter_svnt.h
-    QCTQM_Starter_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.idl
deleted file mode 100644
index 71a086999ce..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file QCTQM_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef QUERY_CONDITION_TEST_BASE_IDL
-#define QUERY_CONDITION_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/QCTQM_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/QCTQM_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "QueryConditionTest"
-#pragma DCPS_DATA_KEY "QueryConditionTest symbol"
-
-struct QueryConditionTest {
-  string symbol; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<QueryConditionTest> QueryConditionTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.mpc
deleted file mode 100644
index 148f7d99637..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project(QC_QCTQM_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = QC_QCTQM_Test_Base_stub
-  dynamicflags += QUERY_CONDITION_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=QUERY_CONDITION_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=QCTQM_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    QCTQM_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=QUERY_CONDITION_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    QCTQM_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.idl
deleted file mode 100644
index a390ca52507..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file QCTQM_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef QUERY_CONDITION_TEST_CONNECTOR_IDL_
-#define QUERY_CONDITION_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/QCTQM_Test_Base.idl"
-
-#pragma ciao lem "Connector/QCTQM_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/QCTQM_Test_BaseTypeSupport.idl"
-#endif
-
-module QCTQM_Test
-{
-  module ::CCM_DDS::Typed < ::QueryConditionTest, ::QueryConditionTestSeq> QueryConditionTestConnector;
-};
-
-#endif /* QUERY_CONDITION_TEST_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.mpc
deleted file mode 100644
index cbbeffe6a03..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.mpc
+++ /dev/null
@@ -1,146 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p QCTQM_Test_Base -l .. -o ../lib -u DDS QCTQM_Test_Connector"
-
-project(QC_QCTQM_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen QC_QCTQM_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=QUERY_CONDITION_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=QCTQM_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=QUERY_CONDITION_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=QCTQM_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=QUERY_CONDITION_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=QCTQM_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=QUERY_CONDITION_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=QCTQM_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    QCTQM_Test_Connector.idl
-  }
-}
-
-project(QC_QCTQM_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += QC_QCTQM_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=QUERY_CONDITION_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=QCTQM_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    QCTQM_Test_ConnectorE.idl
-  }
-}
-
-project(QC_QCTQM_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += QC_QCTQM_Test_Connector_lem_gen QC_QCTQM_Test_Connector_stub \
-           QC_QCTQM_Test_Base_stub
-  libs  += QC_QCTQM_Test_Base_stub QC_QCTQM_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = QC_QCTQM_Test_Connector_lem_stub
-  dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQM_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    QCTQM_Test_ConnectorEC.h
-    QCTQM_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    QCTQM_Test_ConnectorEC.inl
-  }
-}
-
-project(QC_QCTQM_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += QC_QCTQM_Test_Connector_idl_gen QC_QCTQM_Test_Base_stub
-  libs  += QC_QCTQM_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = QC_QCTQM_Test_Connector_stub
-  dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQM_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    QCTQM_Test_ConnectorC.h
-    QCTQM_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    QCTQM_Test_ConnectorC.inl
-  }
-}
-
-project(QC_QCTQM_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += QC_QCTQM_Test_Connector_lem_stub QC_QCTQM_Test_Connector_stub \
-             QC_QCTQM_Test_Base_stub
-  sharedname = QC_QCTQM_Test_Connector_exec
-  libs += QC_QCTQM_Test_Connector_stub QC_QCTQM_Test_Connector_lem_stub \
-          QC_QCTQM_Test_Base_stub QC_QCTQM_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQM_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    QCTQM_Test_Connector_conn.h
-    QCTQM_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(QC_QCTQM_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += QC_QCTQM_Test_Connector_lem_stub QC_QCTQM_Test_Connector_exec \
-                QC_QCTQM_Test_Connector_stub
-  sharedname  = QC_QCTQM_Test_Connector_svnt
-  libs       += QC_QCTQM_Test_Connector_stub \
-                QC_QCTQM_Test_Connector_lem_stub  \
-                QC_QCTQM_Test_Base_stub \
-                QC_QCTQM_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQM_Test_ConnectorS.cpp
-    QCTQM_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    QCTQM_Test_ConnectorS.h
-    QCTQM_Test_Connector_svnt.h
-    QCTQM_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/README b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/README
deleted file mode 100644
index 81b1c73a9cb..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/README
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-The TwoQueriesMany exists of 4 runs. During each run the Sender writes 20 samples to DDS.
-After that it informs the receiver that the samples were written. The receiver
-in turn sets a filter and starts to pull the samples from DDS, using the Getter.
-Once the receiver has received all samples, it informs the Sender that the next
-run can be started.
-Since the getter only receives non-read samples, an extra check is build in. The
-receiver also performs a read on a different port in order to check whether the
-right samples are available in DDS. This Reader should always receive ALL samples
-since the QueryFilter only applies to the Getter.
-
-The following query expression is defined:
-  ( (iteration > %0) AND (iteration < %1) )
-
-The following runs are defined:
-
-1.  Sender writes iterations 1-20 to DDS for a certain number of keys,
-    defined in the deployment plan. The receiver sets the filter and filter
-    parameters and starts receiving the samples at once, using get_many.
-    After that it changes the filter parameters and informs the Sender that a
-    new run can be started.
-2.  Sender writes iterations 21-40 to DDS for the defined number of keys. After
-    that it informs the receiver which starts to get the samples from DDS. After
-    that, the receiver reset the QueryFilter (by setting the expression to an
-    empty string) and informs the Sender that a new run can be started.
-3.  Sender writes iterations 41-60 to DDS for the defined number of keys. After
-    that it informs the receiver which should receive with a get_many all samples
-    with iterations 1-60 without the ones it read during run 1 and 2.
-    The receiver then creates a new filter, using the same expression as used during
-    runs 1 and 2 but with different parameters. Again the receiver informs the
-    Sender that a new run can be started.
-4.  Sender writes iterations 61-80 to DDS for the defined number of keys. Again it
-    informs the receiver about this action. The receiver should only get the samples
-    according to the query expression and its parameters.
-
-After each get-action, the receiver reads the data from DDS. During this read action,
-the receiver should read all samples the Sender has written up to that moment. Since
-there's no filter applied to this reader, all sample states should be 'FRESH_INFO'.
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver.idl
deleted file mode 100644
index 5b6a79bf452..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/QCTQM_Test_Connector.idl"
-#include "Base/QCTQM_Starter.idl"
-
-module QCTQM_Test
-{
-  component Receiver
-  {
-    port QueryConditionTestConnector::DDS_Get get_port;
-    port QueryConditionTestConnector::DDS_Read read_port;
-
-    provides TwoQueriesStarter reader_start;
-    uses TwoQueriesRestarter writer_restart;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver.mpc
deleted file mode 100644
index d81eac6889b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver.mpc
+++ /dev/null
@@ -1,155 +0,0 @@
-project(QC_QCTQM_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += QC_QCTQM_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h \
-              -I..
-
-  IDL_Files {
-    QCTQM_Test_Receiver.idl
-  }
-}
-
-project(QC_QCTQM_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += QC_QCTQM_Test_Receiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    QCTQM_Test_ReceiverE.idl
-  }
-}
-
-project(QC_QCTQM_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += QC_QCTQM_Test_Receiver_lem_gen QC_QCTQM_Test_Receiver_stub  \
-           QC_QCTQM_Test_Connector_stub QC_QCTQM_Test_Base_stub \
-           QC_QCTQM_Starter_stub
-  libs  +=  Receiver_stub QC_QCTQM_Test_Connector_stub \
-            QC_QCTQM_Test_Base_stub QC_QCTQM_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQM_Test_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    QCTQM_Test_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    QCTQM_Test_ReceiverEC.inl
-  }
-}
-
-project(QC_QCTQM_Test_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += QC_QCTQM_Test_Receiver_idl_gen  QC_QCTQM_Test_Connector_stub \
-           QC_QCTQM_Test_Base_stub QC_QCTQM_Test_Connector_lem_gen \
-           QC_QCTQM_Starter_stub QC_QCTQM_Starter_lem_stub
-  libs  += QC_QCTQM_Test_Connector_stub QC_QCTQM_Test_Base_stub \
-           QC_QCTQM_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQM_Test_ReceiverC.cpp
-  }
-
-  Header_Files {
-    QCTQM_Test_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    QCTQM_Test_ReceiverC.inl
-  }
-}
-
-project(QC_QCTQM_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += QC_QCTQM_Test_Receiver_lem_stub QC_QCTQM_Test_Receiver_stub \
-             QC_QCTQM_Test_Base_stub QC_QCTQM_Test_Connector_stub \
-             QC_QCTQM_Test_Connector_lem_stub \
-             QC_QCTQM_Starter_lem_stub QC_QCTQM_Starter_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub QC_QCTQM_Test_Base_stub \
-          QC_QCTQM_Test_Connector_stub QC_QCTQM_Test_Connector_lem_stub \
-          QC_QCTQM_Starter_lem_stub QC_QCTQM_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL READER_STARTER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQM_Test_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    QCTQM_Test_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(QC_QCTQM_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   QC_QCTQM_Test_Receiver_lem_stub QC_QCTQM_Test_Base_stub \
-                  QC_QCTQM_Test_Connector_stub QC_QCTQM_Test_Connector_svnt \
-                  QC_QCTQM_Test_Receiver_exec QC_QCTQM_Test_Connector_lem_stub \
-                  QC_QCTQM_Starter_stub \
-                  QC_QCTQM_Starter_svnt QC_QCTQM_Starter_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub QC_QCTQM_Test_Base_stub \
-                QC_QCTQM_Test_Connector_stub QC_QCTQM_Test_Connector_svnt \
-                Receiver_exec QC_QCTQM_Test_Connector_lem_stub \
-                QC_QCTQM_Starter_stub QC_QCTQM_Starter_svnt \
-                QC_QCTQM_Starter_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQM_Test_ReceiverS.cpp
-    QCTQM_Test_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    QCTQM_Test_ReceiverS.h
-    QCTQM_Test_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver_exec.cpp
deleted file mode 100644
index 58bd8cc763f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver_exec.cpp
+++ /dev/null
@@ -1,831 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "QCTQM_Test_Receiver_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-#include "ace/OS_NS_unistd.h"
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-#include "dds4ccm/impl/Utils.h"
-#include "dds4ccm/impl/dds4ccm_utils.h"
-
-#define QUERY "( (iteration > %0) AND (iteration < %1) )"
-
-//run 1
-#define MIN_ITERATION_1 "2"
-#define MAX_ITERATION_1 "5"
-//run 2
-#define MIN_ITERATION_2 "22"
-#define MAX_ITERATION_2 "34"
-//run 4
-#define MIN_ITERATION_3 "68"
-#define MAX_ITERATION_3 "77"
-
-// Reader also reads already read samples.
-// The getter receives the following iterations:
-// During run 1: 2 (iterations 3 and 4)
-// During run 2: 11 (iterations between 22 and 34)
-// During run 3: 47 (all unread samples, meaning iterations 1-60
-//               without iteration 3, 4 and iterations between 22 and 34)
-// During run 4: 8 (iterations between 68 and 77)
-
-#define SAMPLES_PER_KEY_GETTER (2 + 11 + 47 + 8)
-
-namespace CIAO_QCTQM_Test_Receiver_Impl
-{
-  /**
-   * Read action generator
-   */
-
-  read_action_Generator::read_action_Generator (Receiver_exec_i &callback, int run)
-    : callback_ (callback),
-      run_ (run)
-  {
-  }
-
-  read_action_Generator::~read_action_Generator ()
-  {
-  }
-
-  int
-  read_action_Generator::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Checking if last sample "
-                          "is available in DDS...\n"));
-    if (this->callback_.check_last ())
-      {
-        this->callback_.run (this->run_);
-      }
-    return 0;
-  }
-
-  /**
-   * Facet Executor Implementation Class: get_port_status_exec_i
-   */
-
-  get_port_status_exec_i::get_port_status_exec_i (
-        ::QCTQM_Test::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::QCTQM_Test::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  get_port_status_exec_i::~get_port_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  get_port_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  get_port_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: reader_start_exec_i
-   */
-
-  reader_start_exec_i::reader_start_exec_i (
-        ::QCTQM_Test::CCM_Receiver_Context_ptr ctx,
-        Receiver_exec_i & callback)
-    : ciao_context_ (
-        ::QCTQM_Test::CCM_Receiver_Context::_duplicate (ctx))
-      , callback_ (callback)
-  {
-  }
-
-  reader_start_exec_i::~reader_start_exec_i (void)
-  {
-  }
-
-  // Operations from ::TwoQueriesStarter
-
-  void
-  reader_start_exec_i::set_reader_properties (::CORBA::UShort nr_keys,
-  ::CORBA::UShort nr_iterations)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Set reader propeties nr_keys %u, nr_iterations %u\n",
-                nr_keys, nr_iterations));
-
-    this->callback_.keys (nr_keys);
-    this->callback_.iterations (nr_iterations);
-  }
-
-  void
-  reader_start_exec_i::start_read (::CORBA::UShort run)
-  {
-    this->callback_.start_read (run);
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-  : iterations_ (20)
-      , keys_ (5)
-      , current_min_iteration_ (ACE_OS::atoi (MIN_ITERATION_1))
-      , current_max_iteration_ (ACE_OS::atoi (MAX_ITERATION_1))
-      , ticker_ (0)
-      , samples_expected_ (0)
-      , samples_received_ (0)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Receiver_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  // check if last key is received, if so we can assume
-  // that other key's are arrived too in Receiver.
-  bool
-  Receiver_exec_i::check_last ()
-  {
-     ::QCTQM_Test::QueryConditionTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_get_port_data ();
-
-    try
-      {
-        QueryConditionTest queryfiltertest_info;
-        ::CCM_DDS::ReadInfo readinfo;
-        char key[10];
-        ACE_OS::sprintf (key, "KEY_%d", this->keys_);
-
-        queryfiltertest_info.symbol = ::CORBA::string_dup (key);
-        reader->read_one_last (
-                queryfiltertest_info,
-                readinfo,
-                ::DDS::HANDLE_NIL);
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_last - "
-                              "last iteration <%02d> - <%02d> this->keys_ %s\n",
-                               queryfiltertest_info.iteration,
-                               this->current_max_iteration_ - 1, key));
-        return queryfiltertest_info.iteration >= this->current_max_iteration_ - 1;
-      }
-    catch (const ::CCM_DDS::InternalError &)
-      {
-      }
-    catch (const ::CCM_DDS::NonExistent &)
-      {
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::check_last: "
-                              "ERROR: Unexpected exception caught\n"));
-      }
-    return false;
-  }
-
-  // Supported operations and attributes.
-
-  // Check for correct iteration belonging to a run.
-  // If info == 0, check iteration after a get,
-  // else check iteration after a read
-  void
-  Receiver_exec_i::check_iter (const QueryConditionTest & sample,
-                               ::CORBA::UShort run,
-                               ::CCM_DDS::ReadInfo * info)
-  {
-    if (run == 3)
-      {
-        // We need to receive all UNread samples. Therefore we should
-        // receive all samples except the ones between
-        // MIN_ITERATION_1 and MAX_ITERATION_1 and between
-        // MIN_ITERATION_2 and MAX_ITERATION_2
-        if ((sample.iteration > ACE_OS::atoi (MIN_ITERATION_1)  &&
-             sample.iteration < ACE_OS::atoi (MAX_ITERATION_1)) ||
-            (sample.iteration > ACE_OS::atoi (MIN_ITERATION_2)  &&
-             sample.iteration < ACE_OS::atoi (MAX_ITERATION_2)))
-          {
-            // Read supplies info. There check the sample status mask
-            // as well
-            if (info != 0)
-              { // access mask should be "ALREADY_SEEN" since the getter should
-                // already have seen this sample.
-                if (info->access_status != ::CCM_DDS::ALREADY_SEEN)
-                  {
-                    // READ ALL since this check is only performed
-                    // during a read.
-                    ACE_ERROR ((LM_ERROR, "ERROR: READ ALL: "
-                                "Unexpected sample access mask - "
-                                "expected <%C> - "
-                                "received <%C>\n",
-                                CIAO::DDS4CCM::translate_ccm_dds_accessstatus (::CCM_DDS::ALREADY_SEEN),
-                                CIAO::DDS4CCM::translate_ccm_dds_accessstatus (info->access_status)
-                                ));
-                  }
-              }
-            else
-              {
-                // Getter functionality
-                ACE_ERROR ((LM_ERROR, "ERROR: GET ALL: "
-                                      "Didn't except samples between "
-                                      "<%02d> and <%02d> and between "
-                                      "<%02d> and <%02d>\n",
-                                      ACE_OS::atoi (MIN_ITERATION_1),
-                                      ACE_OS::atoi (MAX_ITERATION_1),
-                                      ACE_OS::atoi (MIN_ITERATION_2),
-                                      ACE_OS::atoi (MAX_ITERATION_2)));
-              }
-          }
-      }
-    else  //run 1,2, and 4
-      {
-        //after get
-        if (!info)
-          {
-            if (sample.iteration <= current_min_iteration_)
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR: GET ALL: "
-                                      "Didn't expect samples with iterations "
-                                      "<= %02d\n",
-                                      this->current_min_iteration_));
-              }
-            if (sample.iteration > this->current_max_iteration_)
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR: GET ALL: "
-                                      "Didn't expect samples with iterations "
-                                      "> %02d\n",
-                                      this->current_max_iteration_));
-              }
-          }
-        // after read
-        else if (info != 0)
-          { // access mask should be "FRESH_INFO" since the getter has not
-            // "seen" this sample.
-            if (sample.iteration > this->current_min_iteration_)
-              {
-                if (info->access_status != ::CCM_DDS::FRESH_INFO)
-                  {
-                    // READ ALL since this check is only performed
-                    // during a read.
-                    ACE_ERROR ((LM_ERROR, "ERROR: READ ALL: "
-                                "Unexpected sample access mask - "
-                                "expected <%C> - "
-                                "received <%C>\n",
-                                CIAO::DDS4CCM::translate_ccm_dds_accessstatus (::CCM_DDS::FRESH_INFO),
-                                CIAO::DDS4CCM::translate_ccm_dds_accessstatus (info->access_status)
-                                ));
-                  }
-              }
-          }
-      }
-  }
-
-
-  void
-  Receiver_exec_i::read_all (::CORBA::UShort run)
-  {
-    ::QCTQM_Test::QueryConditionTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_read_port_data ();
-
-    if (::CORBA::is_nil (reader.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::read_all - "
-                              "ERROR: No Reader\n"));
-        return;
-      }
-    QueryConditionTestSeq qf_info;
-    ::CCM_DDS::ReadInfoSeq readinfos;
-    ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::read_all - "
-                "Start checking samples in DDS\n"));
-    reader->read_all (qf_info, readinfos);
-    if (qf_info.length () !=
-        static_cast < ::CORBA::ULong > (run * this->iterations_ * this->keys_))
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::read_all - "
-                              "Unexpected number of samples received: "
-                              "expected <%d> - received <%u>\n",
-                              run * this->iterations_, qf_info.length ()));
-      }
-    for (::CORBA::ULong i = 0; i < qf_info.length (); ++i)
-      {
- /*     ACE_DEBUG ((LM_DEBUG, "READ ALL : Receiver_exec_i::read_all - "
-                              "Sample received: key <%C> - iteration <%d> - "
-                              "sample_read_state <%d>\n",
-                              qf_info[i].symbol.in (),
-                              qf_info[i].iteration,
-                              readinfos[i].access_status));
- */
-        this->check_iter (qf_info[i], run, &readinfos[i]);
-      }
-  }
-
-
-  ::CORBA::ULong
-  Receiver_exec_i::get_all (::CORBA::UShort run)
-  {
-
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("GET ALL  run %d: \n"), run));
-    ACE_OS::sleep (3);
-
-    ::QCTQM_Test::QueryConditionTestConnector::Getter_var getter =
-      this->ciao_context_->get_connection_get_port_fresh_data ();
-    ::CORBA::ULong samples_received = 0;
-
-    if (::CORBA::is_nil (getter.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_all - "
-                              "ERROR: No Getter\n"));
-        return 0;
-      }
-    DDS::Duration_t to;
-    to.sec = 10;
-    to.nanosec = 0;
-
-    getter->time_out (to);
-    getter->max_delivered_data (0);
-    QueryConditionTestSeq gettertest_seq;
-    ::CCM_DDS::ReadInfoSeq readinfo;
-    bool const res = getter->get_many (gettertest_seq, readinfo);
-    if (res)
-      {
-        if (gettertest_seq.length () == 0)
-          {
-            ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_many: "
-                                   "No data returned. "
-                                   "number of samples: "
-                                   "expected at least one - received <0>, res = %u\n", res));
-          }
-        for (CORBA::ULong i = 0; i < gettertest_seq.length (); ++i)
-          {
-            ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::get_many: "
-                                  "Returned data : key <%C> - iteration <%d>,"
-                                  "instance status <%u> - access status <%C>\n",
-                                  gettertest_seq[i].symbol.in (),
-                                  gettertest_seq[i].iteration,
-                                  readinfo[i].instance_status,
-                                  CIAO::DDS4CCM::translate_ccm_dds_accessstatus(readinfo[i].access_status)));
-            this->check_iter (gettertest_seq[i], run);
-            ++samples_received;
-          }
-       }
-     else
-       {
-         ACE_ERROR ((LM_ERROR, "ERROR: GET MANY: "
-                               "Time out occurred\n"));
-       }
-    return samples_received;
-  }
-
-  ::CORBA::ULong
-  Receiver_exec_i::test_all (::CORBA::UShort run)
-  {
-    try
-      {
-        return get_all (run);
-      }
-    catch (const CCM_DDS::NonExistent& ex)
-      {
-        for (::CORBA::ULong i = 0; i < ex.indexes.length (); ++i)
-          {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ERROR test_all <%d>: ")
-                  ACE_TEXT ("caught expected exception: index <%u>\n"),
-                  run,
-                  ex.indexes[i]));
-          }
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: test_all <%d>: ")
-              ACE_TEXT ("caught InternalError exception: retval <%u>\n"),
-              run,
-              ex.error_code));
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("test_all");
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Receiver_exec_i::test_all <%d> : Exception caught\n"),
-          run));
-      }
-    return 0;
-  }
-
-  void
-  Receiver_exec_i::check_filter (::CORBA::UShort run)
-  {
-    ::CCM_DDS::QueryFilter_var filter;
-    ::QCTQM_Test::QueryConditionTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_get_port_data ();
-    try
-      {
-        filter = reader->query ();
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        if (run == 3)
-          {
-            ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_filter - "
-                                  "caught expected InternalEr excep: retval <%u>\n",
-                                  ex.error_code));
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - "
-                                  "caught InternalError exception: retval <%u>\n",
-                                  ex.error_code));
-          }
-        return;
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Receiver_exec_i::check_filter: ");
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - "
-                              "Exception caught\n"));
-        return;
-      }
-
-    //check query
-    bool error = false;
-
-    if (run != 3)
-      {
-        if (ACE_OS::strcmp (filter->expression, QUERY) != 0)
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - "
-                                  "Unexpected query when retrieving filter: "
-                                  "expected <%C> - received <%C>\n",
-                                  QUERY, filter->expression.in ()));
-            error = true;
-          }
-        //check current parameters.
-        if (filter->parameters.length () != 2)
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - "
-                                  "Unexpected number of parameters: "
-                                  "expected <%d> - received <%d>\n",
-                                  2, filter->parameters.length ()));
-            error = true;
-          }
-
-        if (filter->parameters.length () >= 1)
-          {
-            if (ACE_OS::atoi (filter->parameters[0]) != this->current_min_iteration_)
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - "
-                                      "Unexpected param value: "
-                                      "expected <%d> - received <%C>\n",
-                                      this->current_min_iteration_,
-                                      filter->parameters[0].in ()));
-                error = true;
-              }
-          }
-        if (filter->parameters.length () >= 2)
-          {
-            if (ACE_OS::atoi (filter->parameters[1]) != this->current_max_iteration_)
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - "
-                                      "Unexpected param value: "
-                                      "expected <%d> - received <%C>\n",
-                                      this->current_max_iteration_,
-                                      filter->parameters[1].in ()));
-                error = true;
-              }
-          }
-      }
-    if (!error)
-      {
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_filter - "
-                              "Passed check_filter test for run <%d>.\n",
-                              run));
-      }
-  }
-
-  void
-  Receiver_exec_i::set_filter (::CORBA::UShort run)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Set filter for run <%d>\n", run));
-    ::QCTQM_Test::QueryConditionTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_get_port_data ();
-
-    try
-      {
-        ::CCM_DDS::QueryFilter filter;
-        run != 3 ? filter.expression = ::CORBA::string_dup (QUERY) :
-                    filter.expression = ::CORBA::string_dup ("");
-
-        filter.parameters.length (2);
-        if (run == 1)
-          {
-            filter.parameters[0] = ::CORBA::string_dup (MIN_ITERATION_1);
-            filter.parameters[1] = ::CORBA::string_dup (MAX_ITERATION_1);
-            this->current_min_iteration_ = ACE_OS::atoi (MIN_ITERATION_1);
-            this->current_max_iteration_ = ACE_OS::atoi (MAX_ITERATION_1);
-          }
-        else if (run == 2)
-          {
-            filter.parameters[0] = ::CORBA::string_dup (MIN_ITERATION_2);
-            filter.parameters[1] = ::CORBA::string_dup (MAX_ITERATION_2);
-            this->current_min_iteration_ = ACE_OS::atoi (MIN_ITERATION_2);
-            this->current_max_iteration_ = ACE_OS::atoi (MAX_ITERATION_2);
-          }
-        else if (run == 3)
-          {
-            // get all not yet seen by the getter samples of run 1, 2 and 3.
-            this->current_min_iteration_ = 1;
-            this->current_max_iteration_ = run * this->iterations_;
-            filter.parameters[0] = ::CORBA::string_dup (0);
-            filter.parameters[1] = ::CORBA::string_dup (0);
-          }
-        else if (run == 4)
-          {
-            filter.parameters[0] = ::CORBA::string_dup (MIN_ITERATION_3);
-            filter.parameters[1] = ::CORBA::string_dup (MAX_ITERATION_3);
-            this->current_min_iteration_ = ACE_OS::atoi (MIN_ITERATION_3);
-            this->current_max_iteration_ = ACE_OS::atoi (MAX_ITERATION_3);
-          }
-        ACE_DEBUG ((LM_DEBUG, "Filter : Query <%C>, parameter[0] <%C>, parameter[1] <%C>\n",
-              filter.expression.in (), filter.parameters[0].in (), filter.parameters[1].in ()));
-        reader->query (filter);
-      }
-    catch (const ::CCM_DDS::InternalError &ex)
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::set_filter - "
-                    "ERROR: Unexpected InternalError exception caught "
-                    "with <%C> as error\n.",
-                    ::CIAO::DDS4CCM::translate_retcode (ex.error_code)));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::set_filter - "
-                    "ERROR: Unexpected exception caught.\n"));
-      }
-  }
-
-  void
-  Receiver_exec_i::start_read (::CORBA::UShort run)
-  {
-    this->ticker_ = new read_action_Generator (*this, run);
-    if (this->reactor ()->schedule_timer (this->ticker_,
-                                          0,
-                                          ACE_Time_Value(1, 0),
-                                          ACE_Time_Value(1, 0)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, "Unable to schedule Timer\n"));
-      }
-  }
-
-  void
-  Receiver_exec_i::run (::CORBA::UShort run)
-  {
-    if (this->ticker_)
-      {
-        this->reactor ()->cancel_timer (this->ticker_);
-        delete this->ticker_;
-        this->ticker_ = 0;
-      }
-    ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::run - "
-                          "Starting run number <%d>\n",
-                          run));
-    TwoQueriesRestarter_var restarter =
-      this->ciao_context_->get_connection_writer_restart ();
-    if (!::CORBA::is_nil (restarter.in ()))
-      {
-        switch (run)
-        {
-          case 1:
-            {
-              this->samples_received_ += this->test_all (run);
-              this->check_filter (run);
-              this->read_all (run);
-              //set filter for the next run
-              this->set_filter (run + 1);
-              // inform the sender that it may start the next run
-              restarter->restart_write ();
-            }
-            break;
-          case 2:
-            {
-              this->samples_received_ += this->test_all (run);
-              check_filter (run);
-              this->read_all (run);
-              //set filter for the next run
-              this->set_filter (run + 1);
-              // inform the sender that it may start the next run
-              restarter->restart_write ();
-            }
-            break;
-          case 3:
-            {
-              this->samples_received_ += this->test_all (run);
-              this->check_filter (run);
-              this->read_all (run);
-              //set filter for the next run
-              this->set_filter (run + 1);
-              // inform the sender that it may start the next run
-              restarter->restart_write ();
-            }
-            break;
-          case 4:
-            {
-              this->samples_received_ += this->test_all (run);
-              this->read_all (run);
-            }
-        }
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::run - "
-                  "ERROR: Reference to Restarter not found\n"));
-      }
-  }
-
-  void
-  Receiver_exec_i::iterations (::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  void
-  Receiver_exec_i::keys (::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-
-    //the last key is used for checking if all samples are received and therefore
-    //get access status 1. So these samples are not read by following
-    //get_all method.
-    this->samples_expected_ = (this->keys_ - 1) * SAMPLES_PER_KEY_GETTER;
-  }
-
-  // Component attributes and port operations.
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_get_port_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_get_port_status_.in ()))
-      {
-        get_port_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          get_port_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_get_port_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_get_port_status_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_read_port_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::CCM_TwoQueriesStarter_ptr
-  Receiver_exec_i::get_reader_start (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_reader_start_.in ()))
-      {
-        reader_start_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          reader_start_exec_i (
-            this->ciao_context_.in (),
-            *this),
-            ::CCM_TwoQueriesStarter::_nil ());
-
-          this->ciao_reader_start_ = tmp;
-      }
-
-    return
-      ::CCM_TwoQueriesStarter::_duplicate (
-        this->ciao_reader_start_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::QCTQM_Test::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    ::QCTQM_Test::QueryConditionTestConnector::Getter_var getter =
-      this->ciao_context_->get_connection_get_port_fresh_data ();
-    DDS::Duration_t to;
-    to.sec = 5; to.nanosec = 0;
-    getter->time_out (to);
-    //set filter for the first run
-    this->set_filter (1);
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    if (this->ticker_)
-      {
-        this->reactor ()->cancel_timer (this->ticker_);
-        delete this->ticker_;
-        this->ticker_ = 0;
-      }
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    if (this->samples_received_ != this->samples_expected_)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: TWO QUERIES GET_MANY : "
-                              "Unexpected number of samples received: "
-                              "expected <%d> - received <%d>\n",
-                              this->samples_expected_,
-                              this->samples_received_));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "TWO QUERIES : GET_MANY : "
-                              "Expected number of samples received: "
-                              "expected <%d> - received <%d>\n",
-                              this->samples_expected_,
-                              this->samples_received_));
-      }
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_QCTQM_Test_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver_exec.h
deleted file mode 100644
index 43cec44cf93..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver_exec.h
+++ /dev/null
@@ -1,221 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_QCTQM_TEST_RECEIVER_EXEC_HWBPVD_H_
-#define CIAO_QCTQM_TEST_RECEIVER_EXEC_HWBPVD_H_
-
-#include /**/ "ace/pre.h"
-
-#include "QCTQM_Test_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_QCTQM_Test_Receiver_Impl
-{
-
-  class Receiver_exec_i;
-
-  /**
-   * Read action generator
-   */
-
-  class read_action_Generator
-    : public ACE_Event_Handler
-  {
-  public:
-    read_action_Generator (Receiver_exec_i &callback,
-                           int run);
-
-    ~read_action_Generator ();
-
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    Receiver_exec_i &callback_;
-    int run_;
-
-  };
-
-  /**
-   * Provider Executor Implementation Class: get_port_status_exec_i
-   */
-
-  class get_port_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    get_port_status_exec_i (
-      ::QCTQM_Test::CCM_Receiver_Context_ptr ctx);
-    virtual ~get_port_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::QCTQM_Test::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: reader_start_exec_i
-   */
-
-  class reader_start_exec_i
-    : public virtual ::CCM_TwoQueriesStarter,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    reader_start_exec_i (
-      ::QCTQM_Test::CCM_Receiver_Context_ptr ctx,
-      Receiver_exec_i & callback);
-    virtual ~reader_start_exec_i (void);
-
-    //@{
-    /** Operations and attributes from TwoQueriesStarter. */
-
-    virtual
-    void set_reader_properties (::CORBA::UShort nr_keys,
-    ::CORBA::UShort nr_iterations);
-
-    virtual
-    void start_read (::CORBA::UShort run);
-    //@}
-
-  private:
-    ::QCTQM_Test::CCM_Receiver_Context_var ciao_context_;
-    Receiver_exec_i & callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_get_port_status (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_read_port_status (void);
-
-
-    virtual ::CCM_TwoQueriesStarter_ptr
-    get_reader_start (void);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void iterations (CORBA::UShort iterations);
-    void keys (::CORBA::UShort keys);
-
-    bool check_last (void);
-    void start_read (::CORBA::UShort run);
-    void run (::CORBA::UShort run);
-    //@}
-
-  private:
-    ::QCTQM_Test::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_get_port_status_;
-    ::CCM_TwoQueriesStarter_var ciao_reader_start_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    ::CORBA::UShort iterations_;
-    ::CORBA::UShort keys_;
-
-    int current_min_iteration_;
-    int current_max_iteration_;
-
-    read_action_Generator *ticker_;
-
-    ::CORBA::ULong samples_expected_;
-    ::CORBA::ULong samples_received_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    ::CORBA::ULong test_all (::CORBA::UShort run);
-    ::CORBA::ULong get_all (::CORBA::UShort run);
-    void read_all (::CORBA::UShort run);
-    void check_iter (const QueryConditionTest & sample,
-                     ::CORBA::UShort run,
-                     ::CCM_DDS::ReadInfo * info = 0);
-    void check_filter (::CORBA::UShort run);
-    void set_filter (::CORBA::UShort run);
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_QCTQM_Test_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender.idl
deleted file mode 100644
index 90894c16c64..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef DDS_QUERY_CONDITION_TEST_SENDER_IDL
-#define DDS_QUERY_CONDITION_TEST_SENDER_IDL
-
-#include "Connector/QCTQM_Test_Connector.idl"
-#include "Base/QCTQM_Starter.idl"
-
-module QCTQM_Test
-{
-  component Sender
-  {
-    port QCTQM_Test::QueryConditionTestConnector::DDS_Write info_write;
-    provides CCM_DDS::ConnectorStatusListener connector_status;
-
-    uses TwoQueriesStarter start_reader;
-    provides TwoQueriesRestarter restart_writer;
-
-    attribute unsigned short keys;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender.mpc
deleted file mode 100644
index 07f150ee5b1..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender.mpc
+++ /dev/null
@@ -1,153 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p QCTQM_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(QC_QCTQM_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += QC_QCTQM_Test_Connector_idl_gen QC_QCTQM_Starter_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I..
-
-  IDL_Files {
-    QCTQM_Test_Sender.idl
-  }
-}
-
-project(QC_QCTQM_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += QC_QCTQM_Test_Sender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    QCTQM_Test_SenderE.idl
-  }
-}
-
-project(QC_QCTQM_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += QC_QCTQM_Test_Sender_lem_gen QC_QCTQM_Test_Sender_stub \
-           QC_QCTQM_Test_Base_stub QC_QCTQM_Starter_stub
-  libs  += QC_QCTQM_Test_Base_stub Sender_stub QC_QCTQM_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQM_Test_SenderEC.cpp
-  }
-
-  Header_Files {
-    QCTQM_Test_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    QCTQM_Test_SenderEC.inl
-  }
-}
-
-project(QC_QCTQM_Test_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += QC_QCTQM_Test_Sender_idl_gen QC_QCTQM_Test_Base_stub \
-           QC_QCTQM_Test_Connector_stub QC_QCTQM_Starter_stub \
-           QC_QCTQM_Starter_lem_stub
-  libs  += QC_QCTQM_Test_Base_stub QC_QCTQM_Test_Connector_stub \
-           QC_QCTQM_Starter_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQM_Test_SenderC.cpp
-  }
-
-  Header_Files {
-    QCTQM_Test_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    QCTQM_Test_SenderC.inl
-  }
-}
-
-project(QC_QCTQM_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += QC_QCTQM_Test_Sender_lem_stub QC_QCTQM_Test_Sender_stub \
-             QC_QCTQM_Test_Connector_lem_stub QC_QCTQM_Test_Connector_stub \
-             QC_QCTQM_Starter_lem_stub
-  sharedname = Sender_exec
-  libs    += Sender_stub Sender_lem_stub QC_QCTQM_Test_Base_stub \
-             QC_QCTQM_Test_Connector_lem_stub QC_QCTQM_Test_Connector_stub \
-             QC_QCTQM_Starter_stub QC_QCTQM_Starter_lem_stub \
-             QC_QCTQM_Starter_lem_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQM_Test_Sender_exec.cpp
-  }
-
-  Header_Files {
-    QCTQM_Test_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(QC_QCTQM_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += QC_QCTQM_Test_Base_stub  QC_QCTQM_Test_Sender_lem_stub \
-                QC_QCTQM_Test_Connector_stub \
-                QC_QCTQM_Test_Connector_svnt QC_QCTQM_Test_Connector_lem_stub \
-                QC_QCTQM_Starter_stub QC_QCTQM_Starter_svnt \
-                QC_QCTQM_Starter_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub QC_QCTQM_Test_Base_stub \
-                QC_QCTQM_Test_Connector_stub QC_QCTQM_Test_Connector_svnt \
-                QC_QCTQM_Test_Connector_lem_stub QC_QCTQM_Starter_stub \
-                QC_QCTQM_Starter_svnt QC_QCTQM_Starter_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQM_Test_SenderS.cpp
-    QCTQM_Test_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    QCTQM_Test_SenderS.h
-    QCTQM_Test_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender_exec.cpp
deleted file mode 100644
index 214e6d60e30..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender_exec.cpp
+++ /dev/null
@@ -1,348 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "QCTQM_Test_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-#define ITERATIONS 20
-
-
-namespace CIAO_QCTQM_Test_Sender_Impl
-{
-  /**
-   * ConnectorStatusListener_exec_i
-   */
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (
-    Sender_exec_i &callback)
-    : callback_ (callback)
-    , started_ (false)
-  {
-  }
-
-  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic (
-    ::DDS::Topic_ptr /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status(
-    ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind status_kind)
-  {
-    if (!this->started_ && status_kind == ::DDS::PUBLICATION_MATCHED_STATUS)
-      {
-        this->started_ = true;
-        ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_unexpected_status - "
-          "Publication matched received: starting the test\n"));
-
-        this->callback_.get_started ();
-      }
-  }
-
-  /**
-   * WriteHandler
-   */
-
-  WriteHandler::WriteHandler (Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  WriteHandler::handle_exception (ACE_HANDLE)
-  {
-    this->callback_.start ();
-    return 0;
-  }
-
-  /**
-   * Facet Executor Implementation Class: restart_writer_exec_i
-   */
-
-  restart_writer_exec_i::restart_writer_exec_i (
-        ::QCTQM_Test::CCM_Sender_Context_ptr ctx,
-        Sender_exec_i & callback)
-    : ciao_context_ (
-        ::QCTQM_Test::CCM_Sender_Context::_duplicate (ctx))
-      , callback_ (callback)
-  {
-  }
-
-  restart_writer_exec_i::~restart_writer_exec_i (void)
-  {
-  }
-
-  // Operations from ::TwoQueriesRestarter
-
-  void
-  restart_writer_exec_i::restart_write (void)
-  {
-    this->callback_.restart ();
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-  : keys_ (5)
-      , iterations_ (ITERATIONS)
-      , run_ (1)
-      , wh_ (0)
-
-  {
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    if (this->wh_)
-      {
-        delete this->wh_;
-      }
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Sender_exec_i::restart (void)
-  {
-    ++this->run_;
-    this->reactor ()->notify (this->wh_);
-  }
-
-  void
-  Sender_exec_i::get_started (void)
-  {
-    try
-      {
-        if (this->wh_)
-          {
-            delete this->wh_;
-            this->wh_ = 0;
-          }
-        ACE_NEW_THROW_EX (this->wh_,
-                          WriteHandler (*this),
-                          ::CORBA::NO_MEMORY ());
-        this->reactor ()->notify (this->wh_);
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("Exception caught:");
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: get_started : Exception caught\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: get_started : Unknown exception caught\n")));
-      }
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    ::QCTQM_Test::QueryConditionTestConnector::Writer_var writer =
-      this->ciao_context_->get_connection_info_write_data ();
-    TwoQueriesStarter_var starter =
-      this->ciao_context_->get_connection_start_reader ();
-
-    if (! ::CORBA::is_nil (starter.in ()))
-      {
-        starter->set_reader_properties (this->keys_, this->iterations_);
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Unable to start the reader\n")));
-        return;
-      }
-    for (CORBA::UShort iter_key = 1; iter_key < this->keys_ + 1; ++iter_key)
-      {
-        char key[7];
-        QueryConditionTest new_key;
-        ACE_OS::sprintf (key, "KEY_%d", iter_key);
-
-        new_key.symbol = CORBA::string_dup(key);
-        CORBA::UShort iter = ((this->run_ - 1) * this->iterations_) + 1;
-            ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("Write key <%C> with iterations <%d> to <%d>\n"),
-                        key, iter, (iter + this->iterations_)));
-
-        while (iter < this->run_ * this->iterations_ + 1)
-          {
-            new_key.iteration = iter;
-            writer->write_one (new_key, ::DDS::HANDLE_NIL);
-             ++iter;
-          }
-      }
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("Sender call start read with run_ = <%u>\n"),
-                this->run_));
-
-    ACE_OS::sleep (2);
-    starter->start_read (this->run_);
-  }
-
-  // Component attributes and port operations.
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i  (*this);
-  }
-
-  ::CCM_TwoQueriesRestarter_ptr
-  Sender_exec_i::get_restart_writer (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_restart_writer_.in ()))
-      {
-        restart_writer_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          restart_writer_exec_i (
-            this->ciao_context_.in (),
-            *this),
-            ::CCM_TwoQueriesRestarter::_nil ());
-
-          this->ciao_restart_writer_ = tmp;
-      }
-
-    return
-      ::CCM_TwoQueriesRestarter::_duplicate (
-        this->ciao_restart_writer_.in ());
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::QCTQM_Test::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_QCTQM_Test_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender_exec.h
deleted file mode 100644
index 2a991d94156..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender_exec.h
+++ /dev/null
@@ -1,196 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_QCTQM_TEST_SENDER_EXEC_VZMKKL_H_
-#define CIAO_QCTQM_TEST_SENDER_EXEC_VZMKKL_H_
-
-#include /**/ "ace/pre.h"
-
-#include "QCTQM_Test_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_QCTQM_Test_Sender_Impl
-{
-  class Sender_exec_i;
-
-  /**
-   * ConnectorStatusListener_exec_i
-   */
-  class SENDER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Sender_exec_i &callback);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-      void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                                 ::DDS::StatusKind status_kind);
-  private:
-    Sender_exec_i &callback_;
-    bool started_;
-  };
-
-  /**
-   * WriteHandler
-   */
-
-  class WriteHandler :
-    public ACE_Event_Handler
-  {
-  public:
-    WriteHandler (Sender_exec_i &callback);
-    virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: restart_writer_exec_i
-   */
-
-  class restart_writer_exec_i
-    : public virtual ::CCM_TwoQueriesRestarter,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    restart_writer_exec_i (
-      ::QCTQM_Test::CCM_Sender_Context_ptr ctx,
-      Sender_exec_i & callback);
-    virtual ~restart_writer_exec_i (void);
-
-    //@{
-    /** Operations and attributes from TwoQueriesRestarter. */
-
-    virtual
-    void restart_write (void);
-    //@}
-
-  private:
-    ::QCTQM_Test::CCM_Sender_Context_var ciao_context_;
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_connector_status (void);
-
-    virtual ::CCM_TwoQueriesRestarter_ptr
-    get_restart_writer (void);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void get_started (void);
-    void start (void);
-    void restart (void);
-
-    //@}
-
-  private:
-    ::QCTQM_Test::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::CCM_TwoQueriesRestarter_var ciao_restart_writer_;
-
-    ::CORBA::UShort keys_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    CORBA::UShort iterations_;
-    CORBA::UShort run_;
-    WriteHandler *wh_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_QCTQM_Test_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/Plan.cdp
deleted file mode 100644
index 12808211107..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/Plan.cdp
+++ /dev/null
@@ -1,520 +0,0 @@
-<!--  -->
-<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>QCTQM_Test_Depl_1</label>
-  <UUID>QCTQM_Test_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QCTQM_Test_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QCTQM_Test_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="QCTQM_Test_EventConnectorImplementation">
-    <name>QCTQM_Test_EventConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="QCTQM_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="QCTQM_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QCTQM_Test_QueryConditionTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QCTQM_Test_QueryConditionTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QC_QCTQM_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QC_QCTQM_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="QCTQM_Test_StateConnectorImplementation">
-    <name>QCTQM_Test_StateConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="QCTQM_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="QCTQM_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QCTQM_Test_QueryConditionTestConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QCTQM_Test_QueryConditionTestConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QC_QCTQM_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QC_QCTQM_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QCTQM_Test_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QCTQM_Test_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-  </instance>
-
-  <instance xmi:id="QCTQM_Test_SenderConnectorInstance">
-    <name>QCTQM_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="QCTQM_Test_EventConnectorImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QueryCondition_Library#QueryConditionProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QCTQM_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="QCTQM_Test_EventConnector">
-    <name>QCTQM_Test_EventConnector</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="QCTQM_Test_EventConnectorImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QueryCondition_Library#QueryConditionProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QCTQM_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="QCTQM_Test_StateConnector">
-    <name>QCTQM_Test_StateConnector</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="QCTQM_Test_StateConnectorImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QueryCondition_Library#QueryConditionProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QCTQM_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>read_port_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>read_port_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>passive_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="QCTQM_Test_StateConnector" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>get_port_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>get_port_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="QCTQM_Test_EventConnector" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>get_port_fresh_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>get_port_fresh_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_fresh_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="QCTQM_Test_EventConnector" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="QCTQM_Test_SenderConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>reader_starter</name>
-    <internalEndpoint>
-      <portName>start_reader</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>reader_start</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>restart_writer</name>
-    <internalEndpoint>
-      <portName>writer_restart</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>restart_writer</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="QCTQM_Test_SenderConnectorInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="QCTQM_Test_Connector_ExecArtifact">
-    <name>QC_QCTQM_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>QC_QCTQM_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="QCTQM_Test_Connector_SvntArtifact">
-    <name>QC_QCTQM_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>QC_QCTQM_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="QCTQM_Test_Connector_StubArtifact">
-    <name>QC_QCTQM_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>QC_QCTQM_Test_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/QueryCondition_Library.xml b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/QueryCondition_Library.xml
deleted file mode 100644
index a422b34b272..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/QueryCondition_Library.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--  -->
-
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-  <qos_profile name="QueryConditionProfile">
-    <datawriter_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-        <max_blocking_time>
-          <sec>10</sec>
-          <nanosec>0</nanosec>
-        </max_blocking_time>
-      </reliability>
-      <durability>
-        <kind>TRANSIENT_DURABILITY_QOS</kind>
-      </durability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-    </datawriter_qos>
-    <!-- QoS used to configure the data reader created in the example code -->
-    <datareader_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-      </reliability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-      <durability>
-        <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-      </durability>
-    </datareader_qos>
-  </qos_profile>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index b475d554b4d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-Description
-XML QoS Profile
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.4d/scripts/../resource/rtiddsgen/../qos_profiles_4.4d/schema/rti_dds_qos_profiles.xsd" version="4.4d">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="QueryCondition_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="QueryConditionProfile" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>10</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/run_test.pl
deleted file mode 100755
index b87434bef7e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 60 seconds to allow task to complete\n";
-sleep (60);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -s\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/.gitignore b/CIAO/connectors/dds4ccm/tests/Reader/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Reader/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.idl b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.idl
deleted file mode 100644
index 80dd04aac89..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @file Reader_Starter.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef READER_STARTER_IDL
-#define READER_STARTER_IDL
-
-#pragma ciao lem "Base/Reader_StarterE.idl"
-
-interface ReaderStarter
-{
-  void start_read ();
-  void read_no_data ();
-  void set_reader_properties (in unsigned short nr_keys,
-                              in unsigned short nr_iterations);
-};
-
-#endif /* SAMPLE_INFO_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc
deleted file mode 100644
index b14b7d49e69..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc
+++ /dev/null
@@ -1,110 +0,0 @@
-project(DDS_Reader_Starter_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after +=
-  idlflags += -Wb,stub_export_macro=READER_STARTER_STUB_Export \
-              -Wb,stub_export_include=Reader_Starter_stub_export.h \
-              -Wb,skel_export_macro=READER_STARTER_SVNT_Export \
-              -Wb,skel_export_include=Reader_Starter_svnt_export.h \
-              -Wb,svnt_export_macro=READER_STARTER_SVNT_Export \
-              -Wb,svnt_export_include=Reader_Starter_svnt_export.h \
-              -Wb,exec_export_macro=READER_STARTER_EXEC_Export \
-              -Wb,exec_export_include=Reader_Starter_exec_export.h -I..
-
-  IDL_Files {
-    Reader_Starter.idl
-  }
-}
-
-project(DDS_Reader_Starter_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_Reader_Starter_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=READER_STARTER_LEM_STUB_Export \
-              -Wb,stub_export_include=Reader_Starter_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    Reader_StarterE.idl
-  }
-}
-
-project(DDS_Reader_Starter_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_Reader_Starter_lem_gen DDS_Reader_Starter_stub
-  libs  += Reader_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Reader_Starter_lem_stub
-  dynamicflags += READER_STARTER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_StarterEC.cpp
-  }
-
-  Header_Files {
-    Reader_StarterEC.h
-    Reader_Starter_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Reader_StarterEC.inl
-  }
-}
-
-project(DDS_Reader_Starter_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_Reader_Starter_idl_gen
-  libs  +=
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Reader_Starter_stub
-  dynamicflags += READER_STARTER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_StarterC.cpp
-  }
-
-  Header_Files {
-    Reader_StarterC.h
-    Reader_Starter_stub_export.h
-  }
-
-  Inline_Files {
-    Reader_StarterC.inl
-  }
-}
-
-
-project(DDS_Reader_Starter_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_Reader_Starter_lem_stub DDS_Reader_Starter_stub
-  sharedname  = Reader_Starter_svnt
-  libs       += Reader_Starter_stub Reader_Starter_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += READER_STARTER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_StarterS.cpp
-    Reader_Starter_svnt.cpp
-  }
-
-  Header_Files {
-    Reader_StarterS.h
-    Reader_Starter_svnt.h
-    Reader_Starter_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl
deleted file mode 100644
index 38fec9c5a26..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file Reader_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef READER_TEST_BASE_IDL
-#define READER_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/Reader_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/Reader_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "ReaderTest"
-#pragma DCPS_DATA_KEY "ReaderTest key"
-
-struct ReaderTest {
-  string key; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<ReaderTest> ReaderTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc
deleted file mode 100644
index 3132fa2a690..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc
+++ /dev/null
@@ -1,25 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -u DDS -d -o../lib Reader_Test_Base
-
-project(DDS_Reader_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_Reader_Test_Base_stub
-  dynamicflags += READER_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=READER_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=Reader_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    Reader_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=READER_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    Reader_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.idl
deleted file mode 100644
index 3dc092c453c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file Reader_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef READER_TEST_CONNECTOR_IDL_
-#define READER_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Reader_Test_Base.idl"
-
-#pragma ciao lem "Connector/Reader_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/Reader_Test_BaseTypeSupport.idl"
-#endif
-
-module Reader_Test
-{
-  module ::CCM_DDS::Typed < ::ReaderTest, ::ReaderTestSeq> ReaderTestConnector;
-};
-
-#endif /* Reader_Test_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc
deleted file mode 100644
index a3c97e4c97b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_Reader_Test_Base -l .. -o ../lib -u DDS Reader_Test_Connector"
-
-project(DDS_Reader_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_Reader_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=READER_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=Reader_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=READER_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=Reader_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=READER_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=Reader_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=READER_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Reader_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Reader_Test_Connector.idl
-  }
-}
-
-project(DDS_Reader_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_Reader_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=READER_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=Reader_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    Reader_Test_ConnectorE.idl
-  }
-}
-
-project(DDS_Reader_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_Reader_Test_Connector_lem_gen DDS_Reader_Test_Connector_stub DDS_Reader_Test_Base_stub
-  libs  += DDS_Reader_Test_Base_stub DDS_Reader_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Reader_Test_Connector_lem_stub
-  dynamicflags += READER_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    Reader_Test_ConnectorEC.h
-    Reader_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Reader_Test_ConnectorEC.inl
-  }
-}
-
-project(DDS_Reader_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_Reader_Test_Connector_idl_gen DDS_Reader_Test_Base_stub
-  libs  += DDS_Reader_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Reader_Test_Connector_stub
-  dynamicflags += READER_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    Reader_Test_ConnectorC.h
-    Reader_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    Reader_Test_ConnectorC.inl
-  }
-}
-
-project(DDS_Reader_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_Reader_Test_Connector_lem_stub DDS_Reader_Test_Connector_stub DDS_Reader_Test_Base_stub
-  sharedname = DDS_Reader_Test_Connector_exec
-  libs += DDS_Reader_Test_Connector_stub DDS_Reader_Test_Connector_lem_stub DDS_Reader_Test_Base_stub DDS_Reader_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += READER_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    Reader_Test_Connector_conn.h
-    Reader_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_Reader_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_Reader_Test_Connector_lem_stub DDS_Reader_Test_Connector_exec DDS_Reader_Test_Connector_stub
-  sharedname  = DDS_Reader_Test_Connector_svnt
-  libs       += DDS_Reader_Test_Connector_stub \
-                DDS_Reader_Test_Connector_lem_stub  \
-                DDS_Reader_Test_Base_stub \
-                DDS_Reader_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += READER_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_Test_ConnectorS.cpp
-    Reader_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    Reader_Test_ConnectorS.h
-    Reader_Test_Connector_svnt.h
-    Reader_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/README b/CIAO/connectors/dds4ccm/tests/Reader/README
deleted file mode 100644
index fb55be4e5c7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Reader/README
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-This test tests the reader.
-
-The following methods of the reader are tested:
-
-* read_one
-* read_all
-* read_one_last
-* read_one_all
-
-First of all, the Sender writes a known number of samples to DDS.
-After that the Sender informs the Receiver which test is about
-to run and how many samples should be read from DDS. Before the
-Receiver starts reading, he must find out that all samples resides
-in DDS on the receiving side. He does that by calling read_last every
-time a DATA_ON_READERS_STATUS comes in on the ConnectorStatusListener.
-Once the very last sample is in DDS on the receiving side, the Receiver
-starts to read the samples. Afterwards he checks wether all samples are
-avaiable (thus are read correctly from DDS).
-
-The Receiver also test whether the correct exceptions are thrown.
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.idl
deleted file mode 100644
index c01b0c91d90..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/Reader_Test_Connector.idl"
-#include "Base/Reader_Starter.idl"
-
-module Reader_Test
-{
-  component Receiver
-  {
-    port ReaderTestConnector::DDS_Listen info_out;
-
-    provides ReaderStarter reader_start;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc
deleted file mode 100644
index 3bba5085b7b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc
+++ /dev/null
@@ -1,155 +0,0 @@
-project(DDS_Reader_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_Reader_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h \
-              -I..
-
-  IDL_Files {
-    Reader_Test_Receiver.idl
-  }
-}
-
-project(DDS_Reader_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_Reader_Test_Receiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    Reader_Test_ReceiverE.idl
-  }
-}
-
-project(DDS_Reader_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_Reader_Test_Receiver_lem_gen DDS_Reader_Test_Receiver_stub  \
-           DDS_Reader_Test_Connector_stub DDS_Reader_Test_Base_stub \
-           DDS_Reader_Starter_stub
-  libs  +=  Receiver_stub DDS_Reader_Test_Connector_stub \
-            DDS_Reader_Test_Base_stub Reader_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_Test_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    Reader_Test_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Reader_Test_ReceiverEC.inl
-  }
-}
-
-project(DDS_Reader_Test_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_Reader_Test_Receiver_idl_gen  DDS_Reader_Test_Connector_stub \
-           DDS_Reader_Test_Base_stub DDS_Reader_Test_Connector_lem_gen \
-           DDS_Reader_Starter_stub DDS_Reader_Starter_lem_stub
-  libs  += DDS_Reader_Test_Connector_stub DDS_Reader_Test_Base_stub \
-           Reader_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_Test_ReceiverC.cpp
-  }
-
-  Header_Files {
-    Reader_Test_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    Reader_Test_ReceiverC.inl
-  }
-}
-
-project(DDS_Reader_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_Reader_Test_Receiver_lem_stub DDS_Reader_Test_Receiver_stub \
-             DDS_Reader_Test_Base_stub DDS_Reader_Test_Connector_stub \
-             DDS_Reader_Test_Connector_lem_stub \
-             DDS_Reader_Starter_lem_stub DDS_Reader_Starter_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_Reader_Test_Base_stub \
-          DDS_Reader_Test_Connector_stub DDS_Reader_Test_Connector_lem_stub \
-          Reader_Starter_lem_stub Reader_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL READER_STARTER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_Test_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    Reader_Test_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_Reader_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_Reader_Test_Receiver_lem_stub DDS_Reader_Test_Base_stub \
-                  DDS_Reader_Test_Connector_stub DDS_Reader_Test_Connector_svnt \
-                  DDS_Reader_Test_Receiver_exec DDS_Reader_Test_Connector_lem_stub \
-                  DDS_Reader_Starter_stub \
-                  DDS_Reader_Starter_svnt DDS_Reader_Starter_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_Reader_Test_Base_stub \
-                DDS_Reader_Test_Connector_stub DDS_Reader_Test_Connector_svnt \
-                Receiver_exec DDS_Reader_Test_Connector_lem_stub \
-                Reader_Starter_stub Reader_Starter_svnt \
-                Reader_Starter_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_Test_ReceiverS.cpp
-    Reader_Test_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    Reader_Test_ReceiverS.h
-    Reader_Test_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp
deleted file mode 100644
index 3816c2e5a09..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp
+++ /dev/null
@@ -1,816 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "Reader_Test_Receiver_exec.h"
-#include "ace/Log_Msg.h"
-#include "ace/OS_NS_unistd.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-namespace CIAO_Reader_Test_Receiver_Impl
-{
-  /**   * Read action generator
-   */
-  read_action_Generator::read_action_Generator (Receiver_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  read_action_Generator::~read_action_Generator ()
-  {
-  }
-
-  int
-  read_action_Generator::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Checking if last sample "
-                          "is available in DDS...\n"));
-    if (this->callback_.check_last ())
-      this->callback_.run ();
-    return 0;
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  info_out_data_listener_exec_i::info_out_data_listener_exec_i (
-        ::Reader_Test::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::Reader_Test::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::Reader_Test::ReaderTestConnector::Listener
-
-  void
-  info_out_data_listener_exec_i::on_one_data (const ::ReaderTest & /* datum */,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_data_listener_exec_i::on_many_data (const ::ReaderTestSeq & /* data */,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_status_exec_i
-   */
-
-  info_out_status_exec_i::info_out_status_exec_i (
-        ::Reader_Test::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::Reader_Test::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_status_exec_i::~info_out_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: reader_start_exec_i
-   */
-
-  reader_start_exec_i::reader_start_exec_i (
-        ::Reader_Test::CCM_Receiver_Context_ptr ctx,
-        Receiver_exec_i &callback)
-    : ciao_context_ (
-        ::Reader_Test::CCM_Receiver_Context::_duplicate (ctx))
-      , callback_ (callback)
-  {
-  }
-
-  reader_start_exec_i::~reader_start_exec_i (void)
-  {
-  }
-
-  // Operations from ::ReaderStarter
-
-  void
-  reader_start_exec_i::start_read (void)
-  {
-    this->callback_.start_read ();
-  }
-
-  void
-  reader_start_exec_i::read_no_data (void)
-  {
-    this->callback_.read_no_data ();
-  }
-
-  void
-  reader_start_exec_i::set_reader_properties (::CORBA::UShort nr_keys,
-  ::CORBA::UShort nr_iterations)
-  {
-    this->callback_.keys (nr_keys);
-    this->callback_.iterations (nr_iterations);
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void) :
-    iterations_ (0),
-    keys_ (0),
-    has_run_ (false),
-    ticker_ (0)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Receiver_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  bool
-  Receiver_exec_i::check_last ()
-  {
-    ::Reader_Test::ReaderTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_info_out_data();
-
-    try
-      {
-        if (! ::CORBA::is_nil (reader.in ()))
-          {
-            ReaderTest readertest_info;
-            ::CCM_DDS::ReadInfo readinfo;
-            char key[10];
-            ACE_OS::sprintf (key, "KEY_%d", this->keys_);
-            readertest_info.key = CORBA::string_dup (key);
-            reader->read_one_last (
-                    readertest_info,
-                    readinfo,
-                    ::DDS::HANDLE_NIL);
-            ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_last: "
-                                  "key <%C> - iteration <%d>\n",
-                                  readertest_info.key.in (),
-                                  readertest_info.iteration));
-            return readertest_info.iteration == this->iterations_;
-          }
-      }
-    catch (const ::CCM_DDS::InternalError &)
-      {
-      }
-    catch (const ::CCM_DDS::NonExistent &)
-      {
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::check_last: "
-                              "ERROR: Unexpected exception caught\n"));
-      }
-    return false;
-  }
-
-  // Supported operations and attributes.
-  void
-  Receiver_exec_i::read_one_last (bool test_handles)
-  {
-    ::Reader_Test::ReaderTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_info_out_data();
-
-    try
-      {
-        for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i)
-          {
-            ReaderTest readertest_info;
-            ::CCM_DDS::ReadInfo readinfo;
-            char key[10];
-            ACE_OS::sprintf (key, "KEY_%d", i);
-            readertest_info.key = CORBA::string_dup (key);
-            DDS::InstanceHandle_t hnd = test_handles
-                ? this->handles_[key]
-                : ::DDS::HANDLE_NIL;
-            reader->read_one_last (readertest_info, readinfo, hnd);
-            if (readertest_info.iteration == this->iterations_)
-              {
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ ONE LAST: ")
-                    ACE_TEXT ("last iteration received for <%C>: iteration <%u>\n"),
-                    readertest_info.key.in (),
-                    readertest_info.iteration));
-              }
-            else
-              {
-                ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ ONE LAST: ")
-                    ACE_TEXT ("Didn't receive last iteration for <%C>: ")
-                    ACE_TEXT ("expected <%u> - received <%u>\n"),
-                    readertest_info.key.in (),
-                    this->iterations_,
-                    readertest_info.iteration));
-              }
-          }
-      }
-    catch (const CCM_DDS::NonExistent& ex)
-      {
-        for (CORBA::ULong i = 0; i < ex.indexes.length (); ++i)
-          {
-            ACE_DEBUG ((LM_ERROR, ACE_TEXT ("READ ONE LAST: ")
-                  ACE_TEXT ("caught expected exception: index <%u>\n"),
-                  ex.indexes[i]));
-          }
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ ONE LAST: ")
-              ACE_TEXT ("caught InternalError exception: retval <%u>\n"),
-              ex.error_code));
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: READ ONE LAST:");
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Receiver_exec_i::read_one_last : Exception caught\n")));
-      }
-  }
-
-  void
-  Receiver_exec_i::read_one_all (bool test_handles)
-  {
-    ::Reader_Test::ReaderTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_info_out_data();
-
-    try
-      {
-        for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i)
-          {
-            ReaderTest readertest_info;
-            ReaderTestSeq readertest_info_seq;
-            ::CCM_DDS::ReadInfoSeq readinfo_seq;
-            char key[10];
-            ACE_OS::sprintf (key, "KEY_%d", i);
-            readertest_info.key = CORBA::string_dup (key);
-            DDS::InstanceHandle_t hnd = test_handles
-                ? this->handles_[key]
-                : ::DDS::HANDLE_NIL;
-            reader->read_one_all (
-                    readertest_info,
-                    readertest_info_seq,
-                    readinfo_seq,
-                    hnd);
-
-            if (readertest_info_seq.length () != this->iterations_)
-              {
-                ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ ONE ALL: ")
-                    ACE_TEXT ("Didn't receive the expected number of ")
-                    ACE_TEXT ("samples for <%C>: expected <%u> - received <%u>\n"),
-                    key,
-                    this->iterations_,
-                    readertest_info_seq.length ()));
-              }
-            else
-              {
-                this->handles_[key] = readinfo_seq[0].instance_handle;
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ ONE ALL: ")
-                    ACE_TEXT ("All iterations received for <%C>: number of iterations <%u>\n"),
-                    key,
-                    readertest_info_seq.length ()));
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ ONE ALL: ")
-                    ACE_TEXT ("Handle created for <%C>: ")
-                    DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER ACE_TEXT ("\n"),
-                    key,
-                    DDS_INSTANCE_HANDLE_LOG(readinfo_seq[0].instance_handle)));
-              }
-          }
-      }
-    catch (const CCM_DDS::NonExistent& ex)
-      {
-        for (CORBA::ULong i = 0; i < ex.indexes.length (); ++i)
-          {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ ONE ALL: ")
-                  ACE_TEXT ("caught expected exception: index <%u>\n"),
-                  ex.indexes[i]));
-          }
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        if (ex.error_code == 0)
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ ONE ALL: ")
-                  ACE_TEXT ("caught InternalError exception: handles differ\n")));
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ ONE ALL: ")
-                  ACE_TEXT ("caught InternalError exception: retval <%u>\n"),
-                  ex.error_code));
-          }
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: READ ONE ALL: ");
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Receiver_exec_i::read_one_all : Exception caught\n")));
-      }
-  }
-
-  void
-  Receiver_exec_i::read_last (void)
-  {
-    ::Reader_Test::ReaderTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_info_out_data();
-
-    try
-      {
-        ReaderTestSeq readertest_info_seq;
-        ::CCM_DDS::ReadInfoSeq readinfo_seq;
-        reader->read_last (readertest_info_seq, readinfo_seq);
-
-        if (readertest_info_seq.length () != this->keys_)
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ LAST: ")
-                ACE_TEXT ("Didn't receive the expected number of ")
-                ACE_TEXT ("instances : expected <%u> - received <%u>\n"),
-                this->keys_,
-                readertest_info_seq.length ()));
-          }
-        for (CORBA::ULong it = 0; it < readertest_info_seq.length (); ++it)
-          {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ LAST : ")
-                ACE_TEXT ("last iteration received for <%C>: iteration <%u>\n"),
-                readertest_info_seq[it].key.in (),
-                readertest_info_seq[it].iteration));
-          }
-      }
-    catch (const CCM_DDS::NonExistent& ex)
-      {
-        for (CORBA::ULong i = 0; i < ex.indexes.length (); ++i)
-          {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ LAST: ")
-                  ACE_TEXT ("caught expected exception: index <%u>\n"),
-                  ex.indexes[i]));
-          }
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ LAST: ")
-              ACE_TEXT ("caught InternalError exception: retval <%u>\n"),
-              ex.error_code));
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: READ LAST: ");
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Receiver_exec_i::read_last : Exception caught\n")));
-      }
-  }
-
-  void
-  Receiver_exec_i::read_all (void)
-  {
-    ::Reader_Test::ReaderTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_info_out_data();
-
-    try
-      {
-        ReaderTestSeq readertest_info_seq;
-        ::CCM_DDS::ReadInfoSeq readinfo_seq;
-        reader->read_all (readertest_info_seq, readinfo_seq);
-
-        CORBA::ULong const nr_samples = this->keys_ * this->iterations_;
-        if (readertest_info_seq.length () != nr_samples)
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ ALL: ")
-                ACE_TEXT ("Didn't receive the expected number of ")
-                ACE_TEXT ("samples : expected <%u> - received <%u>\n"),
-                nr_samples,
-                readertest_info_seq.length ()));
-          }
-        if (readertest_info_seq.length () > 0)
-          {
-            CORBA::UShort nr_keys_changed = 1;
-            CORBA::String_var last_key (readertest_info_seq[0].key.in ());
-            CORBA::UShort iterations = 0;
-            for (CORBA::ULong it = 0; it < readertest_info_seq.length (); ++it)
-              {
-                if (ACE_OS::strcmp (last_key, readertest_info_seq[it].key.in ()) != 0)
-                  {
-                    ACE_OS::strcpy (last_key, readertest_info_seq[it].key.in ());
-                    ++nr_keys_changed;
-                  }
-                // check readinfo struct.
-                if (::DDS::HANDLE_NIL == readinfo_seq[it].instance_handle)
-                  {
-                    ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ ALL: ")
-                            ACE_TEXT ("received instance handle should be valid ")
-                            ACE_TEXT ("for keyed data: ")
-                            ACE_TEXT ("key <%C> - iteration <%u>\n"),
-                            readertest_info_seq[it].key.in (),
-                            readertest_info_seq[it].iteration));
-                  }
-                if (readinfo_seq[it].source_timestamp.sec == 0 &&
-                    readinfo_seq[it].source_timestamp.nanosec == 0)
-                  {
-                    ACE_ERROR ((LM_ERROR, "ERROR: READ ALL: "
-                                        "source timestamp seems to be invalid (nil) "
-                                        "key <%C> - iteration <%d>\n",
-                                        readertest_info_seq[it].key.in (),
-                                        readertest_info_seq[it].iteration));
-                  }
-                ++iterations;
-              }
-            if (nr_keys_changed != this->keys_)
-              {
-                ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ ALL: ")
-                    ACE_TEXT ("Didn't receive the expected number of ")
-                    ACE_TEXT ("instances : expected <%u> - received <%u>\n"),
-                    this->keys_,
-                    nr_keys_changed));
-              }
-            if (iterations != (this->keys_ * this->iterations_))
-              {
-                ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ ALL: ")
-                    ACE_TEXT ("Didn't receive the expected number of ")
-                    ACE_TEXT ("samples : expected <%u> - received <%u>\n"),
-                    nr_samples,
-                    iterations));
-              }
-          }
-      }
-    catch (const CCM_DDS::NonExistent& ex)
-      {
-        for (CORBA::ULong i = 0; i < ex.indexes.length (); ++i)
-          {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ ALL: ")
-                  ACE_TEXT ("caught expected exception: index <%u>\n"),
-                  ex.indexes[i]));
-          }
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ ALL: ")
-              ACE_TEXT ("caught InternalError exception: retval <%u>\n"),
-              ex.error_code));
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: READ ALL: ");
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Receiver_exec_i::read_all : Exception caught\n")));
-      }
-  }
-
-  void
-  Receiver_exec_i::test_exception ()
-  {
-    // test exception handling
-    bool except_caught = false;
-    ::Reader_Test::ReaderTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_info_out_data();
-
-    try
-      {
-        ReaderTest readertest_info;
-        readertest_info.key = CORBA::string_dup ("KEY_0");
-        ::CCM_DDS::ReadInfo readinfo;
-        reader->read_one_last (readertest_info, readinfo, ::DDS::HANDLE_NIL);
-      }
-    catch (const CCM_DDS::InternalError& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR : Receiver_exec_i::test_exception: ")
-                  ACE_TEXT ("Wrong exception caught while reading non existent instance\n")));
-      }
-    catch (const CCM_DDS::NonExistent& )
-      {
-        except_caught = true;
-      }
-    if (!except_caught)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR : Receiver_exec_i::test_exception: ")
-                  ACE_TEXT ("no excep caught while reading non existent instance\n")));
-      }
-  }
-
-  void
-  Receiver_exec_i::test_exception_with_handles ()
-  {
-    // test exception handling
-    ::Reader_Test::ReaderTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_info_out_data();
-
-    bool except_caught = false;
-    try
-      {
-        ReaderTest readertest_info;
-        readertest_info.key = CORBA::string_dup ("KEY_1");
-        ::CCM_DDS::ReadInfo readinfo;
-        DDS::InstanceHandle_t hnd = this->handles_["KEY_2"];
-        reader->read_one_last (readertest_info, readinfo, hnd);
-      }
-    catch (const CCM_DDS::InternalError& )
-      {
-        except_caught = true;
-        ACE_ERROR ((LM_DEBUG, ACE_TEXT ("Receiver_exec_i::test_exception_with_handles: ")
-                  ACE_TEXT ("Expected exception caught while reading non existent instance\n")));
-      }
-    catch (const CCM_DDS::NonExistent& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR : Receiver_exec_i::test_exception_with_handles: ")
-                  ACE_TEXT ("Wrong exception caught while reading non existent instance\n")));
-      }
-    if (!except_caught)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR : Receiver_exec_i::test_exception_with_handles: ")
-                  ACE_TEXT ("no excep caught while reading non existent instance\n")));
-      }
-  }
-
-  void
-  Receiver_exec_i::read_no_data ()
-  {
-    ::Reader_Test::ReaderTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_info_out_data();
-
-    try
-      {
-        ReaderTestSeq readertest_info_seq ;
-        ::CCM_DDS::ReadInfoSeq readinfo_seq;
-        reader->read_all (readertest_info_seq, readinfo_seq);
-
-        if (readertest_info_seq.length () > 0)
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ NO DATA: ")
-                ACE_TEXT ("Didn't receive the expected number of ")
-                ACE_TEXT ("samples : expected <%u> - received <%u>\n"),
-                0,
-                readertest_info_seq.length ()));
-          }
-        else
-          {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ NO DATA: ")
-                ACE_TEXT ("No data available.\n")));
-          }
-      }
-    catch (const CCM_DDS::NonExistent& )
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ERROR: READ NO DATA: ")
-              ACE_TEXT ("Caught NonExistent exception")));
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ NO DATA: ")
-              ACE_TEXT ("caught InternalError exception: retval <%u>\n"),
-              ex.error_code));
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: READ NO DATA: ");
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Receiver_exec_i::read_no_data : Exception caught\n")));
-      }
-  }
-
-  void
-  Receiver_exec_i::run ()
-  {
-    this->reactor ()->cancel_timer (this->ticker_);
-    delete this->ticker_;
-    this->ticker_ = 0;
-
-    this->has_run_ = true;
-    read_all ();
-    read_last ();
-    read_one_all ();
-    read_one_last ();
-    test_exception ();
-    //now test with collected handles
-    read_one_all (true);
-    read_one_last (true);
-    test_exception_with_handles ();
-  }
-
-  void
-  Receiver_exec_i::start_read ()
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      read_action_Generator (*this),
-                      ::CORBA::NO_MEMORY ());
-    if (this->reactor ()->schedule_timer (this->ticker_,
-                                          0,
-                                          ACE_Time_Value(1, 0),
-                                          ACE_Time_Value(1, 0)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, "Unable to schedule Timer\n"));
-      }
-  }
-
-  // Component attributes and port operations.
-  ::CORBA::UShort
-  Receiver_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Receiver_exec_i::iterations (::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Receiver_exec_i::keys (::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  ::Reader_Test::ReaderTestConnector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_out_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ()))
-      {
-        info_out_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_data_listener_exec_i (
-            this->ciao_context_.in ()),
-            ::Reader_Test::ReaderTestConnector::CCM_Listener::_nil ());
-
-          this->ciao_info_out_data_listener_ = tmp;
-      }
-
-    return
-      ::Reader_Test::ReaderTestConnector::CCM_Listener::_duplicate (
-        this->ciao_info_out_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ()))
-      {
-        info_out_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_out_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_out_status_.in ());
-  }
-
-  ::CCM_ReaderStarter_ptr
-  Receiver_exec_i::get_reader_start (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_reader_start_.in ()))
-      {
-        reader_start_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          reader_start_exec_i (
-            this->ciao_context_.in (),
-            *this),
-            ::CCM_ReaderStarter::_nil ());
-
-          this->ciao_reader_start_ = tmp;
-      }
-
-    return
-      ::CCM_ReaderStarter::_duplicate (
-        this->ciao_reader_start_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Reader_Test::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    if (this->ticker_)
-      {
-        ACE_ERROR ((LM_ERROR, "Still checking DDS upon exit\n"));
-        this->reactor ()->cancel_timer (this->ticker_);
-        delete this->ticker_;
-        this->ticker_ = 0;
-      }
-
-    if (!this->has_run_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: ")
-            ACE_TEXT ("Test did not run: Didn't receive ")
-            ACE_TEXT ("the expected number of samples\n")));
-      }
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Reader_Test_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h
deleted file mode 100644
index 29eac6dee2b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h
+++ /dev/null
@@ -1,251 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_READER_TEST_RECEIVER_EXEC_G1FCGC_H_
-#define CIAO_READER_TEST_RECEIVER_EXEC_G1FCGC_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Reader_Test_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-#include <map>
-
-namespace CIAO_Reader_Test_Receiver_Impl
-{
-  class Receiver_exec_i;
-
-  /**
-   * Read Action Generator
-   */
-  class read_action_Generator
-    : public ACE_Event_Handler
-  {
-  public:
-    read_action_Generator (Receiver_exec_i &callback);
-
-    ~read_action_Generator ();
-
-    virtual int handle_timeout (const ACE_Time_Value &tv, const void *arg);
-  private:
-    Receiver_exec_i &callback_;
-
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  class info_out_data_listener_exec_i
-    : public virtual ::Reader_Test::ReaderTestConnector::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_data_listener_exec_i (
-      ::Reader_Test::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from Reader_Test::ReaderTestConnector::Listener. */
-
-    virtual
-    void on_one_data (const ::ReaderTest & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (const ::ReaderTestSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    ::Reader_Test::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_status_exec_i
-   */
-
-  class info_out_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_status_exec_i (
-      ::Reader_Test::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::Reader_Test::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: reader_start_exec_i
-   */
-
-  class reader_start_exec_i
-    : public virtual ::CCM_ReaderStarter,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    reader_start_exec_i (
-      ::Reader_Test::CCM_Receiver_Context_ptr ctx,
-      Receiver_exec_i & callback);
-    virtual ~reader_start_exec_i (void);
-
-    //@{
-    /** Operations and attributes from ReaderStarter. */
-
-    virtual
-    void start_read (void);
-
-    virtual
-    void read_no_data (void);
-
-    virtual
-    void set_reader_properties (::CORBA::UShort nr_keys,
-    ::CORBA::UShort nr_iterations);
-    //@}
-
-  private:
-    ::Reader_Test::CCM_Receiver_Context_var ciao_context_;
-    Receiver_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::Reader_Test::ReaderTestConnector::CCM_Listener_ptr
-    get_info_out_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_status (void);
-
-    virtual ::CCM_ReaderStarter_ptr
-    get_reader_start (void);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void read_no_data ();
-    void start_read ();
-    bool check_last ();
-    void run (void);
-
-    ::CORBA::UShort iterations (void);
-
-    void iterations (::CORBA::UShort iterations);
-
-    ::CORBA::UShort keys (void);
-
-    void keys (::CORBA::UShort keys);
-    //@}
-
-  private:
-    ::Reader_Test::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::Reader_Test::ReaderTestConnector::CCM_Listener_var ciao_info_out_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_;
-    ::CCM_ReaderStarter_var ciao_reader_start_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    CORBA::UShort iterations_;
-    CORBA::UShort keys_;
-    CORBA::Boolean has_run_;
-
-    read_action_Generator *ticker_;
-
-    typedef std::map<ACE_CString, DDS::InstanceHandle_t> Handle_Table;
-    Handle_Table handles_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void read_all ();
-    void read_last ();
-    void read_one_all (bool test_handles = false);
-    void read_one_last (bool test_handles = false);
-    void test_exception ();
-    void test_exception_with_handles ();
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Reader_Test_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.idl
deleted file mode 100644
index 17ffb36be5c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_READER_TEST_SENDER_IDL
-#define DDS_READER_TEST_SENDER_IDL
-
-#include "Connector/Reader_Test_Connector.idl"
-#include "Base/Reader_Starter.idl"
-
-module Reader_Test
-{
-  component Sender
-  {
-    port ReaderTestConnector::DDS_Write info_write;
-    provides CCM_DDS::ConnectorStatusListener info_out_connector_status;
-
-    uses ReaderStarter start_reader;
-
-    attribute unsigned short keys;
-    attribute unsigned short iterations;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc
deleted file mode 100644
index a9fc0641804..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc
+++ /dev/null
@@ -1,149 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_Reader_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_Reader_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_Reader_Test_Connector_idl_gen DDS_Starter_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I ..
-
-  IDL_Files {
-    Reader_Test_Sender.idl
-  }
-}
-
-project(DDS_Reader_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_Reader_Test_Sender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    Reader_Test_SenderE.idl
-  }
-}
-
-project(DDS_Reader_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_Reader_Test_Sender_lem_gen DDS_Reader_Test_Sender_stub \
-           DDS_Reader_Test_Base_stub DDS_Reader_Starter_stub
-  libs  += DDS_Reader_Test_Base_stub Sender_stub Reader_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_Test_SenderEC.cpp
-  }
-
-  Header_Files {
-    Reader_Test_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Reader_Test_SenderEC.inl
-  }
-}
-
-project(DDS_Reader_Test_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_Reader_Test_Sender_idl_gen DDS_Reader_Test_Base_stub \
-           DDS_Reader_Test_Connector_stub DDS_Reader_Starter_stub \
-           DDS_Reader_Starter_lem_stub
-  libs  += DDS_Reader_Test_Base_stub DDS_Reader_Test_Connector_stub \
-           Reader_Starter_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_Test_SenderC.cpp
-  }
-
-  Header_Files {
-    Reader_Test_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    Reader_Test_SenderC.inl
-  }
-}
-
-project(DDS_Reader_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_Reader_Test_Sender_lem_stub DDS_Reader_Test_Sender_stub \
-             DDS_Reader_Test_Connector_lem_stub DDS_Reader_Test_Connector_stub
-  sharedname = Sender_exec
-  libs    += Sender_stub Sender_lem_stub DDS_Reader_Test_Base_stub \
-             DDS_Reader_Test_Connector_lem_stub DDS_Reader_Test_Connector_stub \
-             Reader_Starter_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_Test_Sender_exec.cpp
-  }
-
-  Header_Files {
-    Reader_Test_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_Reader_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_Reader_Test_Base_stub  DDS_Reader_Test_Sender_lem_stub \
-                DDS_Reader_Test_Connector_stub \
-                DDS_Reader_Test_Connector_svnt DDS_Reader_Test_Connector_lem_stub \
-                DDS_Reader_Starter_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub DDS_Reader_Test_Base_stub \
-                DDS_Reader_Test_Connector_stub DDS_Reader_Test_Connector_svnt \
-                DDS_Reader_Test_Connector_lem_stub Reader_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_Test_SenderS.cpp
-    Reader_Test_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    Reader_Test_SenderS.h
-    Reader_Test_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp
deleted file mode 100644
index 5fa4dbac125..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp
+++ /dev/null
@@ -1,255 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "Reader_Test_Sender_exec.h"
-
-namespace CIAO_Reader_Test_Sender_Impl
-{
-
-  /**
-   * Facet Executor Implementation Class: info_out_connector_status_exec_i
-   */
-
-  info_out_connector_status_exec_i::info_out_connector_status_exec_i (
-        ::Reader_Test::CCM_Sender_Context_ptr ctx,
-        Sender_exec_i &callback)
-    : ciao_context_ (
-        ::Reader_Test::CCM_Sender_Context::_duplicate (ctx))
-      , callback_ (callback)
-  {
-  }
-
-  info_out_connector_status_exec_i::~info_out_connector_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-
-  void
-  info_out_connector_status_exec_i::on_inconsistent_topic (::DDS::Topic_ptr /* the_topic */,
-  const ::DDS::InconsistentTopicStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_requested_incompatible_qos (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedIncompatibleQosStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_sample_rejected (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleRejectedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_offered_deadline_missed (::DDS::DataWriter_ptr /* the_writer */,
-  const ::DDS::OfferedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_offered_incompatible_qos (::DDS::DataWriter_ptr /* the_writer */,
-  const ::DDS::OfferedIncompatibleQosStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_unexpected_status (::DDS::Entity_ptr /* the_entity */,
-  ::DDS::StatusKind status_kind)
-  {
-    if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS)
-      this->callback_.start ();
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : keys_ (5)
-      , iterations_ (10)
-      , done_ (false)
-      , ccm_activated_ (false)
-  {
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-  void
-  Sender_exec_i::start (void)
-  {
-    ::Reader_Test::ReaderTestConnector::Writer_var writer =
-      this->ciao_context_->get_connection_info_write_data ();
-    ReaderStarter_var starter =
-      this->ciao_context_->get_connection_start_reader ();
-
-    // Start can be called more than once...
-    if (!this->done_ && this->ccm_activated_)
-      {
-        this->done_ = true;
-        if (! ::CORBA::is_nil (starter.in ()))
-          {
-            starter->set_reader_properties (this->keys_, this->iterations_);
-            starter->read_no_data ();
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Unable to start the sender\n")));
-            return;
-          }
-        for (CORBA::UShort iter_key = 1; iter_key < this->keys_ + 1; ++iter_key)
-          {
-            char key[7];
-            ReaderTest *new_key = new ReaderTest;
-            ACE_OS::sprintf (key, "KEY_%d", iter_key);
-            new_key->key = CORBA::string_dup(key);
-            for (CORBA::UShort iter = 1; iter < this->iterations_ + 1; ++iter)
-              {
-                new_key->iteration = iter;
-                writer->write_one (*new_key, ::DDS::HANDLE_NIL);
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Written key <%C> with <%d>\n"),
-                            key, iter));
-              }
-            delete new_key;
-          }
-        starter->start_read ();
-      }
-  }
-
-  // Component attributes and port operations.
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_info_out_connector_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_connector_status_.in ()))
-      {
-        info_out_connector_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_connector_status_exec_i (
-            this->ciao_context_.in (),
-            *this),
-            ::CCM_DDS::CCM_ConnectorStatusListener::_nil ());
-
-          this->ciao_info_out_connector_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_ConnectorStatusListener::_duplicate (
-        this->ciao_info_out_connector_status_.in ());
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Reader_Test::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-    this->ccm_activated_ = true;
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    if (!this->done_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Sender didn't receive a "
-                  "DDS::PUBLICATION_MATCHED_STATUS event!\n")));
-      }
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Reader_Test_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.h
deleted file mode 100644
index 0e900f1a7fb..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.h
+++ /dev/null
@@ -1,167 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_READER_TEST_SENDER_EXEC_NO0JUV_H_
-#define CIAO_READER_TEST_SENDER_EXEC_NO0JUV_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Reader_Test_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_Reader_Test_Sender_Impl
-{
-
-  class Sender_exec_i;
-
-  /**
-   * Provider Executor Implementation Class: info_out_connector_status_exec_i
-   */
-
-  class info_out_connector_status_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_connector_status_exec_i (
-      ::Reader_Test::CCM_Sender_Context_ptr ctx,
-      Sender_exec_i &callback);
-    virtual ~info_out_connector_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-    const ::DDS::InconsistentTopicStatus & status);
-
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedIncompatibleQosStatus & status);
-
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleRejectedStatus & status);
-
-    virtual
-    void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-    const ::DDS::OfferedDeadlineMissedStatus & status);
-
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-    const ::DDS::OfferedIncompatibleQosStatus & status);
-
-    virtual
-    void on_unexpected_status (::DDS::Entity_ptr the_entity,
-    ::DDS::StatusKind status_kind);
-    //@}
-
-  private:
-    ::Reader_Test::CCM_Sender_Context_var ciao_context_;
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_info_out_connector_status (void);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void start (void);
-    //@}
-
-  private:
-    ::Reader_Test::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::CCM_DDS::CCM_ConnectorStatusListener_var ciao_info_out_connector_status_;
-
-    ::CORBA::UShort keys_;
-
-    ::CORBA::UShort iterations_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    bool done_;
-    bool ccm_activated_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Reader_Test_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/Reader/descriptors/Plan.cdp
deleted file mode 100644
index 3b1136ca8c0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Reader/descriptors/Plan.cdp
+++ /dev/null
@@ -1,389 +0,0 @@
-<!--  -->
-<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>Reader_Test_Depl_1</label>
-  <UUID>Reader_Test_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Reader_Test_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Reader_Test_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Reader_Test_ConnectorComponentImplementation">
-    <name>Reader_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Reader_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="Reader_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Reader_Test_ReaderTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Reader_Test_ReaderTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Reader_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Reader_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Reader_Test_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Reader_Test_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-  </instance>
-  <instance xmi:id="Reader_Test_ConnectorComponentInstance">
-    <name>Reader_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Reader_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Reader_Library#ReaderProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Reader_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="Reader_Test_ConnectorComponentInstance2">
-    <name>Reader_Test_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Reader_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Reader_Library#ReaderProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Reader_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>50</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>info_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Reader_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_out_connector_status_sender</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Reader_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Reader_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>reader_starter</name>
-    <internalEndpoint>
-      <portName>start_reader</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>reader_start</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="Reader_Test_Connector_ExecArtifact">
-    <name>Reader_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Reader_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Reader_Test_Connector_SvntArtifact">
-    <name>Reader_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Reader_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Reader_Test_Connector_StubArtifact">
-    <name>Reader_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Reader_Test_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/descriptors/Reader_Library.xml b/CIAO/connectors/dds4ccm/tests/Reader/descriptors/Reader_Library.xml
deleted file mode 100644
index a92a127aa86..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Reader/descriptors/Reader_Library.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-
-  <qos_profile name="ReaderProfile">
-    <datawriter_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-        <max_blocking_time>
-          <sec>10</sec>
-          <nanosec>0</nanosec>
-        </max_blocking_time>
-      </reliability>
-      <durability>
-        <kind>TRANSIENT_DURABILITY_QOS</kind>
-      </durability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-    </datawriter_qos>
-    <!-- QoS used to configure the data reader created in the example code -->
-    <datareader_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-      </reliability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-      <durability>
-        <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-      </durability>
-    </datareader_qos>
-  </qos_profile>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/Reader/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index 62fcc57eeae..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Reader/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-Description
-XML QoS Profile
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="Reader_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="ReaderProfile" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>10</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/Reader/descriptors/run_test.pl
deleted file mode 100755
index c5b1964e047..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Reader/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 30 seconds to allow task to complete\n";
-sleep (30);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/README b/CIAO/connectors/dds4ccm/tests/ResetTopic/README
deleted file mode 100644
index e6e28715ebe..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/README
+++ /dev/null
@@ -1,32 +0,0 @@
-In the early days of the DDS4CCM specification a topic name was not changable.
-When it was set (doesn't matter if it was a late binded topic), the user was not
-allowed to change it, otherwise a NonChangeable exception was thrown.
-
-The requirement from the field dictates that a topic name should be changeable.
-When the topic name will be set a second time, the connector should shut down
-DDS and start it again, using the new topic name. The connector does not tear
-down the proxies. This means that the connector doesn't change on the outside.
-
-The ReadGet test has the following sequence:
-1. Sender starts writing samples for TopicI
-2. Sender informs the Receiver that samples has been written for TopicI
-3. Receiver sets this topic name on his connector (late binding), and starts to
-   collect the samples.
-4. Sender resets the topic name to TopicII and informs the receiver about this.
-5. Receiver resets the topic name on his connector and starts collecting the
-   samples belonging to TopicII.
-
-Both listeners tests (UpdateListen and WriteListen) have about the same sequence:
-1. Sender and Receiver start, writing and listening to the same topic.
-2. After 10 second, the perl script starts two small executables; one to inform
-   the receiver to switch to topic II and one to inform the sender to switch to
-   topic II. The executables are spawned in this order.
-3. Step one is repeated.
-4. Step two will be repeated.
-
-The ToEmpty test will initially start writing samples for TopicI. After a while,
-the topic name will be cleared. This means that the connector internally stops DDS.
-After another while, the sender will start writing samples again,
-but now for TopicII. This sequence repeats.
-
-TooLong will test whether an exception is thrown when an invalid topic name is applied.
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.idl
deleted file mode 100644
index e2c585fc01a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file RG_ResetTopic_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RG_RESETTOPIC_BASE_IDL
-#define RG_RESETTOPIC_BASE_IDL
-
-#pragma ndds typesupport "Base/RG_ResetTopic_BaseSupport.h"
-#pragma opendds typesupport "Base/RG_ResetTopic_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "RG_ResetTopicSample"
-#pragma DCPS_DATA_KEY "RG_ResetTopicSample key"
-
-struct RG_ResetTopicSample {
-  string key; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<RG_ResetTopicSample> RG_ResetTopicSampleSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.mpc
deleted file mode 100644
index 4a603838df6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (RG_ResetTopicBase_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = RG_ResetTopicBase_stub
-  dynamicflags += RG_RESETTOPIC_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=RG_RESETTOPIC_BASE_STUB_Export \
-              -Wb,stub_export_include=LateBinding_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    RG_ResetTopic_Base.idl
-  }
-
-  opendds_ts_flags += --export=RG_RESETTOPIC_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    RG_ResetTopic_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.idl
deleted file mode 100644
index b237220bed5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.idl
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * @file Reader_Starter.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef READER_STARTER_IDL
-#define READER_STARTER_IDL
-
-#pragma ciao lem "Base/Reader_StarterE.idl"
-
-interface ReaderStarter
-{
-  void start_read (in string topic_name);
-  void set_reader_properties (in unsigned short nr_keys,
-                              in unsigned short nr_iterations);
-};
-
-#endif /* READER_STARTER_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.mpc
deleted file mode 100644
index f557cee43cb..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.mpc
+++ /dev/null
@@ -1,110 +0,0 @@
-project(reader_starter_rt_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after +=
-  idlflags += -Wb,stub_export_macro=READER_STARTER_STUB_Export \
-              -Wb,stub_export_include=reader_starter_rt_stub_export.h \
-              -Wb,skel_export_macro=READER_STARTER_SVNT_Export \
-              -Wb,skel_export_include=reader_starter_rt_svnt_export.h \
-              -Wb,svnt_export_macro=READER_STARTER_SVNT_Export \
-              -Wb,svnt_export_include=reader_starter_rt_svnt_export.h \
-              -Wb,exec_export_macro=READER_STARTER_EXEC_Export \
-              -Wb,exec_export_include=Reader_Starter_exec_export.h -I..
-
-  IDL_Files {
-    Reader_Starter.idl
-  }
-}
-
-project(reader_starter_rt_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += reader_starter_rt_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=READER_STARTER_LEM_STUB_Export \
-              -Wb,stub_export_include=reader_starter_rt_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    Reader_StarterE.idl
-  }
-}
-
-project(reader_starter_rt_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += reader_starter_rt_lem_gen reader_starter_rt_stub
-  libs  += reader_starter_rt_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = reader_starter_rt_lem_stub
-  dynamicflags += READER_STARTER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_StarterEC.cpp
-  }
-
-  Header_Files {
-    Reader_StarterEC.h
-    reader_starter_rt_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Reader_StarterEC.inl
-  }
-}
-
-project(reader_starter_rt_stub) : ccm_stub, dds4ccm_base {
-  after += reader_starter_rt_idl_gen
-  libs  +=
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = reader_starter_rt_stub
-  dynamicflags += READER_STARTER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_StarterC.cpp
-  }
-
-  Header_Files {
-    Reader_StarterC.h
-    reader_starter_rt_stub_export.h
-  }
-
-  Inline_Files {
-    Reader_StarterC.inl
-  }
-}
-
-
-project(reader_starter_rt_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   reader_starter_rt_lem_stub reader_starter_rt_stub
-  sharedname  = reader_starter_rt_svnt
-  libs       += reader_starter_rt_stub reader_starter_rt_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += READER_STARTER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_StarterS.cpp
-    Reader_Starter_svnt.cpp
-  }
-
-  Header_Files {
-    Reader_StarterS.h
-    Reader_Starter_svnt.h
-    reader_starter_rt_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.idl
deleted file mode 100644
index a7551c9de29..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file RG_ResetTopic_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RG_RESETTOPIC_CONNECTOR_IDL_
-#define RG_RESETTOPIC_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/RG_ResetTopic_Base.idl"
-
-#pragma ciao lem "Connector/RG_ResetTopic_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/RG_ResetTopic_BaseTypeSupport.idl"
-#endif
-
-module RG_ResetTopic
-{
-  module ::CCM_DDS::Typed < ::RG_ResetTopicSample, ::RG_ResetTopicSampleSeq> RG_ResetTopicSampleConnector;
-};
-
-#endif /* RG_ResetTopic_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.mpc
deleted file mode 100644
index 8aac6031d88..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.mpc
+++ /dev/null
@@ -1,146 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p RG_ResetTopicBase -l .. -o ../lib -u DDS RG_ResetTopic_Connector"
-
-project (RG_ResetTopicConnector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen RG_ResetTopicBase_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RG_RESETTOPIC_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=LateBinding_Connector_stub_export.h \
-              -Wb,skel_export_macro=RG_RESETTOPIC_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=LateBinding_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=RG_RESETTOPIC_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=LateBinding_Connector_svnt_export.h \
-              -Wb,conn_export_macro=RG_RESETTOPIC_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=LateBinding_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    RG_ResetTopic_Connector.idl
-  }
-}
-
-project (RG_ResetTopicConnector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += RG_ResetTopicConnector_idl_gen
-  idlflags += -Wb,stub_export_macro=RG_RESETTOPIC_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=RG_ResetTopic_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    RG_ResetTopic_ConnectorE.idl
-  }
-}
-
-project (RG_ResetTopicConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += RG_ResetTopicConnector_lem_gen RG_ResetTopicConnector_stub \
-           RG_ResetTopicBase_stub
-  libs  += RG_ResetTopicBase_stub RG_ResetTopicConnector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = RG_ResetTopicConnector_lem_stub
-  dynamicflags += RG_RESETTOPIC_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    RG_ResetTopic_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    RG_ResetTopic_ConnectorEC.h
-    RG_ResetTopic_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    RG_ResetTopic_ConnectorEC.inl
-  }
-}
-
-project (RG_ResetTopicConnector_stub) : ccm_stub, dds4ccm_base {
-  after += RG_ResetTopicConnector_idl_gen RG_ResetTopicBase_stub
-  libs  += RG_ResetTopicBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = RG_ResetTopicConnector_stub
-  dynamicflags += RG_RESETTOPIC_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    RG_ResetTopic_ConnectorC.cpp
-  }
-
-  Header_Files {
-    RG_ResetTopic_ConnectorC.h
-    RG_ResetTopic_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    RG_ResetTopic_ConnectorC.inl
-  }
-}
-
-project (RG_ResetTopicConnector_exec) : ciao_executor, dds4ccm_impl {
-  after   += RG_ResetTopicConnector_lem_stub RG_ResetTopicConnector_stub \
-             RG_ResetTopicBase_stub
-  sharedname = RG_ResetTopicConnector_exec
-  libs += RG_ResetTopicConnector_stub RG_ResetTopicConnector_lem_stub \
-          RG_ResetTopicBase_stub RG_ResetTopicBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RG_RESETTOPIC_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    RG_ResetTopic_Connector_conn.cpp
-  }
-
-  Header_Files {
-    RG_ResetTopic_Connector_conn.h
-    RG_ResetTopic_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project (RG_ResetTopicConnector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += RG_ResetTopicConnector_lem_stub RG_ResetTopicConnector_exec \
-                RG_ResetTopicConnector_stub
-  sharedname  = RG_ResetTopicConnector_svnt
-  libs       += RG_ResetTopicConnector_stub \
-                RG_ResetTopicConnector_lem_stub  \
-                RG_ResetTopicBase_stub \
-                RG_ResetTopicConnector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RG_RESETTOPIC_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    RG_ResetTopic_ConnectorS.cpp
-    RG_ResetTopic_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    RG_ResetTopic_ConnectorS.h
-    RG_ResetTopic_Connector_svnt.h
-    RG_ResetTopic_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.idl
deleted file mode 100644
index 4322dffca5d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/RG_ResetTopic_Connector.idl"
-#include "Base/Reader_Starter.idl"
-
-module RG_ResetTopic
-{
-  component Receiver
-  {
-    port RG_ResetTopicSampleConnector::DDS_Get info_get;
-    port RG_ResetTopicSampleConnector::DDS_Read info_read;
-
-    provides ReaderStarter start_reading;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.mpc
deleted file mode 100644
index 2d24cf4f6a5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.mpc
+++ /dev/null
@@ -1,155 +0,0 @@
-project (RG_ResetTopicReceiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += RG_ResetTopicConnector_idl_gen
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h \
-              -I..
-  IDL_Files {
-    RG_ResetTopic_Receiver.idl
-  }
-}
-
-project (RG_ResetTopicReceiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += RG_ResetTopicReceiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    RG_ResetTopic_ReceiverE.idl
-  }
-}
-
-project (RG_ResetTopicReceiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after +=  RG_ResetTopicReceiver_lem_gen RG_ResetTopicReceiver_stub  RG_ResetTopicConnector_stub \
-            RG_ResetTopicBase_stub reader_starter_rt_stub
-  libs  +=  Receiver_stub RG_ResetTopicConnector_stub RG_ResetTopicBase_stub \
-            reader_starter_rt_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    RG_ResetTopic_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    RG_ResetTopic_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    RG_ResetTopic_ReceiverEC.inl
-  }
-}
-
-project (RG_ResetTopicReceiver_stub) : ccm_stub, dds4ccm_base {
-  after +=  RG_ResetTopicReceiver_idl_gen  RG_ResetTopicConnector_stub \
-            RG_ResetTopicBase_stub RG_ResetTopicConnector_lem_gen \
-            reader_starter_rt_stub reader_starter_rt_lem_stub
-  libs  +=  RG_ResetTopicConnector_stub RG_ResetTopicBase_stub \
-            reader_starter_rt_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    RG_ResetTopic_ReceiverC.cpp
-  }
-
-  Header_Files {
-    RG_ResetTopic_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    RG_ResetTopic_ReceiverC.inl
-  }
-}
-
-project (RG_ResetTopicReceiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += RG_ResetTopicReceiver_lem_stub RG_ResetTopicReceiver_stub \
-             RG_ResetTopicBase_stub RG_ResetTopicConnector_stub \
-             RG_ResetTopicConnector_lem_stub \
-             reader_starter_rt_lem_stub reader_starter_rt_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub RG_ResetTopicBase_stub \
-          RG_ResetTopicConnector_stub RG_ResetTopicConnector_lem_stub \
-          reader_starter_rt_lem_stub reader_starter_rt_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    RG_ResetTopic_Receiver_exec.cpp
-    RG_ResetTopic_Receiver_impl.cpp
-  }
-
-  Header_Files {
-    RG_ResetTopic_Receiver_exec.h
-    RG_ResetTopic_Receiver_impl.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project (RG_ResetTopicReceiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   RG_ResetTopicReceiver_lem_stub RG_ResetTopicBase_stub \
-                  RG_ResetTopicConnector_stub RG_ResetTopicConnector_svnt \
-                  RG_ResetTopicReceiver_exec RG_ResetTopicConnector_lem_stub \
-                  reader_starter_rt_stub \
-                  reader_starter_rt_svnt reader_starter_rt_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub RG_ResetTopicBase_stub \
-                RG_ResetTopicConnector_stub RG_ResetTopicConnector_svnt \
-                Receiver_exec RG_ResetTopicConnector_lem_stub \
-                reader_starter_rt_stub reader_starter_rt_svnt \
-                reader_starter_rt_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    RG_ResetTopic_ReceiverS.cpp
-    RG_ResetTopic_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    RG_ResetTopic_ReceiverS.h
-    RG_ResetTopic_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_exec.cpp
deleted file mode 100644
index 885a5ef4cb0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_exec.cpp
+++ /dev/null
@@ -1,281 +0,0 @@
-// -*- C++ -*-
-#include "RG_ResetTopic_Receiver_exec.h"
-#include "RG_ResetTopic_Receiver_impl.h"
-
-namespace CIAO_RG_ResetTopic_Receiver_Impl
-{
-
-  /**
-   * Facet Executor Implementation Class: info_get_status_exec_i
-   */
-
-  info_get_status_exec_i::info_get_status_exec_i (
-        ::RG_ResetTopic::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::RG_ResetTopic::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_get_status_exec_i::~info_get_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_get_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_get_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_read_status_exec_i
-   */
-
-  info_read_status_exec_i::info_read_status_exec_i (
-        ::RG_ResetTopic::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::RG_ResetTopic::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_read_status_exec_i::~info_read_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_read_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_read_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: start_reading_exec_i
-   */
-
-  start_reading_exec_i::start_reading_exec_i (
-        ::RG_ResetTopic::CCM_Receiver_Context_ptr ctx,
-        Receiver_exec_i &callback)
-    : ciao_context_ (
-        ::RG_ResetTopic::CCM_Receiver_Context::_duplicate (ctx))
-    , callback_ (callback)
-  {
-  }
-
-  start_reading_exec_i::~start_reading_exec_i (void)
-  {
-  }
-
-  // Operations from ::ReaderStarter
-
-  void
-  start_reading_exec_i::start_read (const char * topic_name)
-  {
-    this->callback_.start_read (topic_name);
-  }
-
-  void
-  start_reading_exec_i::set_reader_properties (::CORBA::UShort nr_keys,
-  ::CORBA::UShort nr_iterations)
-  {
-    this->callback_.keys (nr_keys);
-    this->callback_.iterations (nr_iterations);
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : iterations_ (10)
-    , keys_ (5)
-    , impl_(0)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-    delete this->impl_;
-  }
-
-  // Supported operations and attributes.
-  ::CORBA::UShort
-  Receiver_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Receiver_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-    if (this->impl_)
-      {
-        this->impl_->iterations (iterations);
-      }
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Receiver_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-    if (this->impl_)
-      {
-        this->impl_->keys (keys);
-      }
-  }
-
-  void
-  Receiver_exec_i::start_read (const char * topic_name)
-  {
-    if (!this->impl_)
-      ACE_NEW_THROW_EX (this->impl_,
-                        RG_ResetTopic_Receiver_impl (
-                          this->ciao_context_.in (),
-                          this->iterations_,
-                          this->keys_),
-                        ::CORBA::INTERNAL ());
-    this->impl_->start (topic_name);
-  }
-
-  // Component attributes and port operations.
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_get_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_get_status_.in ()))
-      {
-        info_get_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_get_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_get_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_get_status_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_read_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_read_status_.in ()))
-      {
-        info_read_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_read_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_read_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_read_status_.in ());
-  }
-
-  ::CCM_ReaderStarter_ptr
-  Receiver_exec_i::get_start_reading (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_start_reading_.in ()))
-      {
-        start_reading_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          start_reading_exec_i (
-            this->ciao_context_.in (),
-            *this),
-            ::CCM_ReaderStarter::_nil ());
-
-          this->ciao_start_reading_ = tmp;
-      }
-
-    return
-      ::CCM_ReaderStarter::_duplicate (
-        this->ciao_start_reading_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::RG_ResetTopic::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_RG_ResetTopic_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_exec.h
deleted file mode 100644
index c079a0b39af..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_exec.h
+++ /dev/null
@@ -1,192 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_RG_RESETTOPIC_RECEIVER_EXEC_MMKH3G_H_
-#define CIAO_RG_RESETTOPIC_RECEIVER_EXEC_MMKH3G_H_
-
-#include /**/ "ace/pre.h"
-
-#include "RG_ResetTopic_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_RG_ResetTopic_Receiver_Impl
-{
-  class Receiver_exec_i;
-  class RG_ResetTopic_Receiver_impl;
-  /**
-   * Provider Executor Implementation Class: info_get1_status_exec_i
-   */
-
-  class info_get_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_get_status_exec_i (
-      ::RG_ResetTopic::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_get_status_exec_i (void);
-
-    /** @name Operations and attributes from CCM_DDS::PortStatusListener */
-    //@{
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::RG_ResetTopic::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_read1_status_exec_i
-   */
-
-  class info_read_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_read_status_exec_i (
-      ::RG_ResetTopic::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_read_status_exec_i (void);
-
-    /** @name Operations and attributes from CCM_DDS::PortStatusListener */
-    //@{
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::RG_ResetTopic::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: start_reading_exec_i
-   */
-
-  class start_reading_exec_i
-    : public virtual ::CCM_ReaderStarter,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    start_reading_exec_i (
-      ::RG_ResetTopic::CCM_Receiver_Context_ptr ctx,
-      Receiver_exec_i &callback_);
-    virtual ~start_reading_exec_i (void);
-
-    /** @name Operations and attributes from ReaderStarter */
-    //@{
-
-    virtual
-    void start_read (const char * topic_name);
-
-    virtual
-    void set_reader_properties (::CORBA::UShort nr_keys,
-    ::CORBA::UShort nr_iterations);
-    //@}
-
-  private:
-    ::RG_ResetTopic::CCM_Receiver_Context_var ciao_context_;
-    Receiver_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    /** @name Supported operations and attributes. */
-    //@{
-
-    //@}
-
-    /** @name Component attributes and port operations. */
-    //@{
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_get_status (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_read_status (void);
-
-    virtual ::CCM_ReaderStarter_ptr
-    get_start_reading (void);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-    //@}
-
-    /** @name Operations from Components::SessionComponent. */
-    //@{
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    /** @name User defined public operations. */
-    //@{
-    void
-    start_read (const char * topic_name);
-    //@}
-
-  private:
-    ::RG_ResetTopic::CCM_Receiver_Context_var ciao_context_;
-
-    /** @name Component attributes. */
-    //@{
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_get_status_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_read_status_;
-    ::CCM_ReaderStarter_var ciao_start_reading_;
-
-    ::CORBA::UShort iterations_;
-
-    ::CORBA::UShort keys_;
-    //@}
-
-    /** @name User defined members. */
-    //@{
-    RG_ResetTopic_Receiver_impl *impl_;
-    //@}
-
-    /** @name User defined private operations. */
-    //@{
-
-    //@}
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_RG_ResetTopic_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_impl.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_impl.cpp
deleted file mode 100644
index 79686951697..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_impl.cpp
+++ /dev/null
@@ -1,394 +0,0 @@
-#include "RG_ResetTopic_Receiver_impl.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_RG_ResetTopic_Receiver_Impl
-{
-
-  /**
-   * Check last
-   */
-  LastSampleChecker::LastSampleChecker (RG_ResetTopic_Receiver_impl &callback,
-                                        const ::CORBA::UShort &iterations)
-    : callback_ (callback)
-    , iterations_ (iterations)
-  {
-  }
-
-  LastSampleChecker::~LastSampleChecker ()
-  {
-  }
-
-  int
-  LastSampleChecker::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Checking if last sample "
-                          "is available in DDS...\n"));
-    if (this->callback_.check_last ())
-      this->callback_.start_read ();
-    return 0;
-  }
-
-  /**
-   * RG_ResetTopic_Receiver_impl
-   */
-  RG_ResetTopic_Receiver_impl::RG_ResetTopic_Receiver_impl (
-      ::RG_ResetTopic::CCM_Receiver_Context_ptr ctx,
-      const ::CORBA::UShort & iterations,
-      const ::CORBA::UShort & keys)
-    : ciao_context_ (
-        ::RG_ResetTopic::CCM_Receiver_Context::_duplicate (ctx))
-    , iterations_ (iterations)
-    , keys_ (keys)
-    , expected_per_run_ (keys * iterations)
-    , checker_ (0)
-    , topic_name_("")
-  {
-  }
-
-  RG_ResetTopic_Receiver_impl::~RG_ResetTopic_Receiver_impl ()
-  {
-    delete this->checker_;
-  }
-
-  ACE_Reactor*
-  RG_ResetTopic_Receiver_impl::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  RG_ResetTopic_Receiver_impl::iterations (::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  void
-  RG_ResetTopic_Receiver_impl::keys (::CORBA::UShort keys)
-  {
-    this->keys_= keys;
-  }
-
-  bool
-  RG_ResetTopic_Receiver_impl::check_last (void)
-  {
-    ::RG_ResetTopic::RG_ResetTopicSampleConnector::Reader_var reader =
-      this->ciao_context_->get_connection_info_read_data ();
-    try
-      {
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_last - "
-                              "last iteration should be <%02d>\n",
-                              this->iterations_));
-        RG_ResetTopicSample datum;
-        ::CCM_DDS::ReadInfo readinfo;
-        char key[10];
-        ACE_OS::sprintf (key, "KEY_%d", this->keys_);
-        datum.key = CORBA::string_dup (key);
-        reader->read_one_last (
-                datum,
-                readinfo,
-                ::DDS::HANDLE_NIL);
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_last - "
-                              "last iteration <%02d> - <%02d>\n",
-                               datum.iteration,
-                               this->iterations_));
-        return datum.iteration >= this->iterations_;
-      }
-    catch (const ::CCM_DDS::InternalError &)
-      {
-        ACE_DEBUG ((LM_DEBUG, "INTERNAL ERROR\n"));
-      }
-    catch (const ::CCM_DDS::NonExistent &)
-      {
-        ACE_DEBUG ((LM_DEBUG, "NONEXISTENT\n"));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::check_last: "
-                              "ERROR: Unexpected exception caught\n"));
-      }
-    return false;
-  }
-
-  void
-  RG_ResetTopic_Receiver_impl::start (const char * topic_name)
-  {
-    this->topic_name_ = topic_name;
-    //only the first time...
-    if (!this->checker_)
-      this->test_exception ();
-    this->set_topic_name_reader (topic_name);
-
-    if (!this->checker_)
-      ACE_NEW_THROW_EX (this->checker_,
-                        LastSampleChecker (*this,
-                                          this->iterations_),
-                        ::CORBA::NO_MEMORY ());
-    if (this->reactor ()->schedule_timer (this->checker_,
-                                          0,
-                                          ACE_Time_Value (1, 0),
-                                          ACE_Time_Value (1, 0)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::schedule_timer - "
-                  "ERROR: Error while starting LastSampleChecker\n"));
-      }
-  }
-
-  void
-  RG_ResetTopic_Receiver_impl::start_read (void)
-  {
-    if (this->checker_)
-      {
-        this->reactor ()->cancel_timer (this->checker_);
-      }
-    this->start_reading ();
-    this->set_topic_name_getter (this->topic_name_.c_str());
-    this->start_getting ();
-  }
-
-  void
-  RG_ResetTopic_Receiver_impl::check_samples (
-    const char * test,
-    const RG_ResetTopicSampleSeq& samples,
-    const ::CORBA::UShort& expected)
-  {
-    bool error = samples.length () != expected;
-    if (ACE_OS::strcmp (test, "get") == 0)
-      {
-        error = !(samples.length () > 0);
-      }
-    if (error)
-      {
-        ACE_ERROR ((LM_ERROR, "RG_ResetTopic_Receiver_impl::check_samples - "
-                    "ERROR: Unexpected number of %C samples received: "
-                    "expected <%d> - received <%u>\n",
-                    test,
-                    expected,
-                    samples.length ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "RG_ResetTopic_Receiver_impl::check_samples - "
-                    "%C Samples found: <%u>\n",
-                    test,
-                    samples.length ()));
-      }
-    for (::CORBA::ULong i = 0;
-         i < samples.length ();
-         ++i)
-      {
-        ACE_DEBUG ((LM_DEBUG, "RG_ResetTopic_Receiver_impl::check_samples - "
-                    "Sample %C: sample <%d> - key <%C> - iteration <%d>\n",
-                    test,
-                    i,
-                    samples[i].key.in (),
-                    samples[i].iteration));
-      }
-  }
-
-  void
-  RG_ResetTopic_Receiver_impl::test_exception (void)
-  {
-    try
-      {
-        if (! ::CORBA::is_nil (this->ciao_context_.in ()))
-          {
-            ::RG_ResetTopic::RG_ResetTopicSampleConnector::Reader_var reader =
-              this->ciao_context_->get_connection_info_read_data ();
-            if (::CORBA::is_nil (reader.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, "RG_ResetTopic_Receiver_impl::test_exception - "
-                            "ERROR: Unable to get reader interface from the "
-                            "CIAO context\n"));
-                return;
-              }
-
-            RG_ResetTopicSample sample;
-            ::CCM_DDS::ReadInfo readinfo;
-            sample.key = CORBA::string_dup ("KEY_1");
-            reader->read_one_last (sample,
-                                   readinfo,
-                                   ::DDS::HANDLE_NIL);
-            ACE_ERROR ((LM_ERROR, "RG_ResetTopic_Receiver_impl::test_exception - "
-                        "ERROR: No exception caught before topic name has been set\n"));
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "RG_ResetTopic_Receiver_impl::test_exception - "
-                        "ERROR: CIAO context seems to be NIL\n"));
-          }
-      }
-    catch (const ::CORBA::BAD_INV_ORDER &)
-      {
-        ACE_DEBUG ((LM_DEBUG, "RG_ResetTopic_Receiver_impl::test_exception - "
-                    "Expected BAD_INV_ORDER thrown.\n"));
-      }
-    catch (const CORBA::Exception &e)
-      {
-        e._tao_print_exception("RG_ResetTopic_Receiver_impl::test_exception - "
-                               "ERROR: Unexpected exception");
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "RG_ResetTopic_Receiver_impl::test_exception - "
-                    "ERROR: expected and unknown exception caught\n"));
-      }
-  }
-
-  void
-  RG_ResetTopic_Receiver_impl::start_reading (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "RG_ResetTopic_Receiver_impl::start_reading - "
-                "Start reading\n"));
-    ::RG_ResetTopic::RG_ResetTopicSampleConnector::Reader_var reader =
-      this->ciao_context_->get_connection_info_read_data ();
-    try
-      {
-        RG_ResetTopicSampleSeq samples;
-        ::CCM_DDS::ReadInfoSeq readinfo_seq;
-        reader->read_all (samples, readinfo_seq);
-
-        this->check_samples ("read", samples, this->expected_per_run_);
-      }
-    catch (const CORBA::Exception &e)
-      {
-        e._tao_print_exception("RG_ResetTopic_Receiver_impl::start_reading - "
-                               "ERROR: Unexpected exception");
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "RG_ResetTopic_Receiver_impl::start_reading - "
-                    "ERROR: Caught unknow exception\n"));
-      }
-  }
-
-  void
-  RG_ResetTopic_Receiver_impl::start_getting (void)
-  {
-    try
-      {
-        ::RG_ResetTopic::RG_ResetTopicSampleConnector::Getter_var getter =
-          this->ciao_context_->get_connection_info_get_fresh_data ();
-        if (::CORBA::is_nil (getter.in ()))
-          {
-            ACE_DEBUG ((LM_DEBUG, "RG_ResetTopic_Receiver_impl::start_getting - "
-                        "ERROR: Unable to get writer interface from the "
-                        "CIAO context\n"));
-            return;
-          }
-        DDS::Duration_t to;
-        to.sec = 1;
-        to.nanosec = 0;
-        getter->time_out (to);
-
-        RG_ResetTopicSampleSeq samples;
-        ::CCM_DDS::ReadInfoSeq readinfos;
-        getter->get_many (samples, readinfos);
-        this->check_samples ("get", samples);
-      }
-    catch (const CORBA::Exception &e)
-      {
-        e._tao_print_exception("RG_ResetTopic_Receiver_impl::start_getting - "
-                               "ERROR: Unexpected exception");
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "RG_ResetTopic_Receiver_impl::start_getting - "
-                    "ERROR: expected and unknown exception caught\n"));
-      }
-  }
-
-  void
-  RG_ResetTopic_Receiver_impl::set_topic_name_reader (const char * topic_name)
-  {
-    try
-      {
-        ACE_DEBUG ((LM_DEBUG, "RG_ResetTopic_Receiver_impl::set_topic_name_reader - "
-                    "Setting topic name to <%C>\n", topic_name));
-        ::RG_ResetTopic::RG_ResetTopicSampleConnector::Reader_var reader =
-          this->ciao_context_->get_connection_info_read_data ();
-        if (::CORBA::is_nil (reader.in ()))
-            {
-              ACE_ERROR ((LM_ERROR, "ERROR: RG_ResetTopic_Receiver_impl::set_topic_name_reader - "
-                                    "Unable to get reader interface\n"));
-              throw ::CORBA::INTERNAL ();
-            }
-        ::CORBA::Object_var cmp = reader->_get_component ();
-        if (::CORBA::is_nil (cmp.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: RG_ResetTopic_Receiver_impl::set_topic_name_reader - "
-                                  "Unable to get component interface\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-        ::RG_ResetTopic::RG_ResetTopicSampleConnector::CCM_DDS_State_var conn =
-          ::RG_ResetTopic::RG_ResetTopicSampleConnector::CCM_DDS_State::_narrow (cmp.in ());
-        if (::CORBA::is_nil (conn.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: RG_ResetTopic_Receiver_impl::set_topic_name_reader - "
-                                  "Unable to narrow connector interface\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-
-        conn->topic_name (topic_name);
-      }
-    catch (const ::CCM_DDS::NonChangeable &)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: RG_ResetTopic_Receiver_impl::set_topic_name_reader - "
-                    "Caught NonChangeable exception.\n"));
-      }
-  }
-
-  void
-  RG_ResetTopic_Receiver_impl::set_topic_name_getter (const char * topic_name)
-  {
-    try
-      {
-        ACE_DEBUG ((LM_DEBUG, "RG_ResetTopic_Receiver_impl::set_topic_name_getter - "
-                    "Setting topic name to <%C>\n", topic_name));
-        ::RG_ResetTopic::RG_ResetTopicSampleConnector::Getter_var getter =
-          this->ciao_context_->get_connection_info_get_fresh_data ();
-        if (::CORBA::is_nil (getter.in ()))
-            {
-              ACE_ERROR ((LM_ERROR, "ERROR: RG_ResetTopic_Receiver_impl::set_topic_name_getter - "
-                                    "Unable to get getter interface\n"));
-              throw ::CORBA::INTERNAL ();
-            }
-          ::CORBA::Object_var cmp = getter->_get_component ();
-          if (::CORBA::is_nil (cmp.in ()))
-            {
-              ACE_ERROR ((LM_ERROR, "ERROR: RG_ResetTopic_Receiver_impl::set_topic_name_getter - "
-                                    "Unable to get component interface\n"));
-              throw ::CORBA::INTERNAL ();
-            }
-        ::RG_ResetTopic::RG_ResetTopicSampleConnector::CCM_DDS_Event_var conn =
-          ::RG_ResetTopic::RG_ResetTopicSampleConnector::CCM_DDS_Event::_narrow (cmp.in ());
-        if (::CORBA::is_nil (conn.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: RG_ResetTopic_Receiver_impl::set_topic_name_getter - "
-                                  "Unable to narrow connector interface\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-        conn->topic_name (topic_name);
-      }
-    catch (const ::CCM_DDS::NonChangeable &)
-      {
-        ACE_ERROR ((LM_ERROR, "RG_ResetTopic_Receiver_impl::set_topic_name_getter - "
-                    "ERROR: Caught NonChangeable exception.\n"));
-      }
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_impl.h b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_impl.h
deleted file mode 100644
index f60d7b058a0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_impl.h
+++ /dev/null
@@ -1,75 +0,0 @@
-#ifndef RG_RESETTOPIC_RECEIVER_IMPL_H_
-#define RG_RESETTOPIC_RECEIVER_IMPL_H_
-
-#include "RG_ResetTopic_ReceiverEC.h"
-
-namespace CIAO_RG_ResetTopic_Receiver_Impl
-{
-  class RG_ResetTopic_Receiver_impl;
-
-  /**
-   * LastSampleChecker
-   */
-  class LastSampleChecker
-    : public ACE_Event_Handler
-  {
-  public:
-    LastSampleChecker (RG_ResetTopic_Receiver_impl &callback,
-                       const ::CORBA::UShort &iterations);
-
-    virtual ~LastSampleChecker (void);
-
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    RG_ResetTopic_Receiver_impl &callback_;
-    const ::CORBA::UShort iterations_;
-  };
-
-  /**
-   * RG_ResetTopic_Receiver_impl
-   */
-  class RG_ResetTopic_Receiver_impl
-  {
-  public:
-    RG_ResetTopic_Receiver_impl (
-      ::RG_ResetTopic::CCM_Receiver_Context_ptr ctx,
-      const ::CORBA::UShort & iterations,
-      const ::CORBA::UShort & keys);
-    ~RG_ResetTopic_Receiver_impl (void);
-
-    void start (const char * topic_name);
-    bool check_last (void);
-    void start_read (void);
-
-
-    void iterations (::CORBA::UShort iterations);
-    void keys (::CORBA::UShort keys);
-
-  private:
-    ::RG_ResetTopic::CCM_Receiver_Context_var ciao_context_;
-    ::CORBA::UShort iterations_;
-    ::CORBA::UShort keys_;
-    ::CORBA::UShort expected_per_run_;
-
-    LastSampleChecker * checker_;
-
-    ACE_CString topic_name_;
-
-    void set_topic_name_reader (const char * topic_name);
-    void set_topic_name_getter (const char * topic_name);
-
-    void start_reading (void);
-    void start_getting (void);
-    void test_exception (void);
-
-    void check_samples (
-      const char * test,
-      const RG_ResetTopicSampleSeq& samples,
-      const ::CORBA::UShort& expected=0);
-
-    ACE_Reactor* reactor (void);
-  };
-};
-
-#endif /* RG_RESETTOPIC_RECEIVER_IMPL_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.idl
deleted file mode 100644
index f9fdc5723f4..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RG_RESETTOPIC_SENDER_IDL
-#define RG_RESETTOPIC_SENDER_IDL
-
-#include "Connector/RG_ResetTopic_Connector.idl"
-#include "Base/Reader_Starter.idl"
-
-module RG_ResetTopic
-{
-  component Sender
-  {
-    port RG_ResetTopicSampleConnector::DDS_Write  info_write;
-
-    attribute unsigned short iterations;
-    attribute unsigned short keys;
-
-    uses ReaderStarter reader_start;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.mpc
deleted file mode 100644
index 1df6ea4d45d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.mpc
+++ /dev/null
@@ -1,150 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p RG_ResetTopicBase -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project (RG_ResetTopicSender_idl_gen) : componentidldefaults, dds4ccm {
-  after += RG_ResetTopicConnector_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I ..
-
-  IDL_Files {
-    RG_ResetTopic_Sender.idl
-  }
-}
-
-project (RG_ResetTopicSender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += RG_ResetTopicSender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    RG_ResetTopic_SenderE.idl
-  }
-}
-
-project (RG_ResetTopicSender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += RG_ResetTopicSender_lem_gen RG_ResetTopicSender_stub \
-           RG_ResetTopicBase_stub reader_starter_rt_stub
-  libs  += RG_ResetTopicBase_stub Sender_stub reader_starter_rt_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    RG_ResetTopic_SenderEC.cpp
-  }
-
-  Header_Files {
-    RG_ResetTopic_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    RG_ResetTopic_SenderEC.inl
-  }
-}
-
-project (RG_ResetTopicSender_stub) : ccm_stub, dds4ccm_base {
-  after += RG_ResetTopicSender_idl_gen RG_ResetTopicBase_stub \
-           RG_ResetTopicConnector_stub reader_starter_rt_stub \
-           reader_starter_rt_lem_stub
-  libs  += RG_ResetTopicBase_stub RG_ResetTopicConnector_stub \
-           reader_starter_rt_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    RG_ResetTopic_SenderC.cpp
-  }
-
-  Header_Files {
-    RG_ResetTopic_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    RG_ResetTopic_SenderC.inl
-  }
-}
-
-project (RG_ResetTopicSender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += RG_ResetTopicSender_lem_stub RG_ResetTopicSender_stub \
-             RG_ResetTopicConnector_lem_stub RG_ResetTopicConnector_stub \
-             reader_starter_rt_svnt reader_starter_rt_lem_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub RG_ResetTopicBase_stub \
-          RG_ResetTopicConnector_lem_stub RG_ResetTopicConnector_stub \
-          reader_starter_rt_stub reader_starter_rt_svnt reader_starter_rt_lem_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    RG_ResetTopic_Sender_exec.cpp
-  }
-
-  Header_Files {
-    RG_ResetTopic_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project (RG_ResetTopicSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += RG_ResetTopicBase_stub  RG_ResetTopicSender_lem_stub RG_ResetTopicConnector_stub \
-                RG_ResetTopicConnector_svnt RG_ResetTopicConnector_lem_stub \
-                reader_starter_rt_stub reader_starter_rt_lem_stub reader_starter_rt_svnt
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                RG_ResetTopicBase_stub RG_ResetTopicConnector_stub RG_ResetTopicConnector_svnt \
-                RG_ResetTopicConnector_lem_stub reader_starter_rt_stub \
-                reader_starter_rt_lem_stub reader_starter_rt_svnt
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    RG_ResetTopic_SenderS.cpp
-    RG_ResetTopic_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    RG_ResetTopic_SenderS.h
-    RG_ResetTopic_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.cpp
deleted file mode 100644
index d4a54cded17..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.cpp
+++ /dev/null
@@ -1,256 +0,0 @@
-// -*- C++ -*-
-#include "RG_ResetTopic_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-#define TOPIC_1 "ResetTopic1"
-#define TOPIC_2 "ResetTopic2"
-
-
-namespace CIAO_RG_ResetTopic_Sender_Impl
-{
-
-  /**
-   * Timeout_Handler
-   */
-
-  Timeout_Handler::Timeout_Handler (Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  Timeout_Handler::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    this->callback_.start_write ();
-    return 0;
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : iterations_ (0)
-    , keys_ (0)
-    , to_handler_ (0)
-    , topic_name_ (TOPIC_2)
-    , run_(0)
-    , start_key_ (1)
-    , start_iteration_ (1)
-  {
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Sender_exec_i::start_write (void)
-  {
-    try
-      {
-        if (++this->run_ > 4)
-          return;
-        if (ACE_OS::strcmp (this->topic_name_.c_str(), TOPIC_1) == 0)
-          this->topic_name_ = TOPIC_2;
-        else
-          this->topic_name_ = TOPIC_1;
-
-        ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_write - "
-                    "Setting topic name to <%C>\n", this->topic_name_.c_str()));
-
-        ::RG_ResetTopic::RG_ResetTopicSampleConnector::Writer_var writer =
-          this->ciao_context_->get_connection_info_write_data ();
-        if (::CORBA::is_nil (writer.in ()))
-            {
-              ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::start_write - "
-                                    "Unable to get writer interface\n"));
-              throw ::CORBA::INTERNAL ();
-            }
-          ::CORBA::Object_var cmp = writer->_get_component ();
-          if (::CORBA::is_nil (cmp.in ()))
-            {
-              ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::start_write - "
-                                    "Unable to get component interface\n"));
-              throw ::CORBA::INTERNAL ();
-            }
-        ::RG_ResetTopic::RG_ResetTopicSampleConnector::CCM_DDS_Event_var conn =
-          ::RG_ResetTopic::RG_ResetTopicSampleConnector::CCM_DDS_Event::_narrow (cmp.in ());
-        if (::CORBA::is_nil (conn.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::start_write - "
-                                  "Unable to narrow connector interface\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-
-        conn->topic_name (this->topic_name_.c_str());
-
-        ::CORBA::UShort key = 0;
-        ::CORBA::UShort iter = 0;
-        for (key = this->start_key_; key < this->run_ * this->keys_ + 1; ++key)
-          {
-            RG_ResetTopicSample sample;
-            char tmp[7];
-            ACE_OS::sprintf (tmp, "KEY_%d", key);
-            sample.key = CORBA::string_dup(tmp);
-
-            for (iter = this->start_iteration_; iter < this->run_ * this->iterations_ + 1; ++iter)
-              {
-                sample.iteration = iter;
-                writer->write_one (sample, ::DDS::HANDLE_NIL);
-                ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - "
-                            "Sample written : key <%C> - iteration <%d>\n",
-                            tmp, iter));
-              }
-          }
-        this->start_key_ = key;
-        this->start_iteration_ = iter;
-        ACE_Time_Value tv (2, 0);
-        ACE_OS::sleep (tv);
-        ReaderStarter_var starter =
-          this->ciao_context_->get_connection_reader_start ();
-        if (!::CORBA::is_nil (starter.in ()))
-          {
-            ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - "
-                      "Inform the receiver that all samples were written\n"));
-            starter->set_reader_properties (this->start_key_ - 1, this->start_iteration_ - 1);
-
-            starter->start_read (this->topic_name_.c_str());
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "Sender_exec_i::start_event_test - "
-                      "ERROR: unable to get connection to the ReaderStarter\n"));
-          }
-      }
-    catch (const ::CCM_DDS::NonChangeable &)
-      {
-        ACE_ERROR ((LM_ERROR, "Sender_exec_i::start_event_test - "
-                              "ERROR: Caught NonChangeable exception.\n"));
-      }
-    catch (const ::CORBA::Exception & e)
-      {
-        e._tao_print_exception("Sender_exec_i::start_event_test - ERROR");
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "Sender_exec_i::start_event_test - "
-                    "ERROR: Unexpected and unknown exception caught.\n"));
-      }
-  }
-
-
-  // Component attributes and port operations.
-
-  ::CORBA::UShort
-  Sender_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::RG_ResetTopic::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-     ACE_NEW_THROW_EX (this->to_handler_,
-                       Timeout_Handler (*this),
-                       ::CORBA::INTERNAL ());
-     if (this->reactor ()->schedule_timer (
-                 this->to_handler_,
-                 0,
-                 ACE_Time_Value (1, 0),
-                 ACE_Time_Value (10, 0)) == -1)
-       {
-         ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                               ACE_TEXT ("Error scheduling timer")));
-       }
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    this->reactor()->cancel_timer(this->to_handler_);
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    delete this->to_handler_;
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_RG_ResetTopic_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.h
deleted file mode 100644
index 1c2bad99935..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.h
+++ /dev/null
@@ -1,137 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_RG_RESETTOPIC_SENDER_EXEC_YSJ9S8_H_
-#define CIAO_RG_RESETTOPIC_SENDER_EXEC_YSJ9S8_H_
-
-#include /**/ "ace/pre.h"
-
-#include "RG_ResetTopic_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_RG_ResetTopic_Sender_Impl
-{
-  class Sender_exec_i;
-
-  /**
-   * Timeout_Handler
-   */
-  class Timeout_Handler :
-    public ACE_Event_Handler
-  {
-  public:
-    Timeout_Handler (Sender_exec_i &callback);
-    /// Handle the timeout.
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    /// Maintains a handle that actually process the event
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void start_write (void);
-    //@}
-
-  private:
-    ::RG_ResetTopic::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-
-    ::CORBA::UShort iterations_;
-
-    ::CORBA::UShort keys_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    Timeout_Handler *to_handler_;
-    ACE_CString topic_name_;
-    ::CORBA::UShort run_;
-    ::CORBA::UShort start_key_;
-    ::CORBA::UShort start_iteration_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_RG_ResetTopic_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/Plan.cdp
deleted file mode 100644
index 4fb7f92d5af..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/Plan.cdp
+++ /dev/null
@@ -1,461 +0,0 @@
-<!--  -->
-<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>ResetTopic_Depl_1</label>
-  <UUID>ResetTopic_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_RG_ResetTopic_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_RG_ResetTopic_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="ResetTopic_EventConnectorImplementation">
-    <name>ResetTopic_EventConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="ResetTopic_Connector_ExecArtifact" />
-    <artifact xmi:idref="ResetTopic_Connector_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_RG_ResetTopic_RG_ResetTopicSampleConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_RG_ResetTopic_RG_ResetTopicSampleConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>RG_ResetTopic_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>RG_ResetTopic_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="ResetTopic_StateConnectorImplementation">
-    <name>ResetTopic_StateConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="ResetTopic_Connector_ExecArtifact" />
-    <artifact xmi:idref="ResetTopic_Connector_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_RG_ResetTopic_RG_ResetTopicSampleConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_RG_ResetTopic_RG_ResetTopicSampleConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>RG_ResetTopic_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>RG_ResetTopic_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_RG_ResetTopic_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_RG_ResetTopic_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-  </instance>
-
-  <instance xmi:id="ResetTopic_SenderEventConnectorInstance">
-    <name>ResetTopic_SenderEventConnectorInstance</name>
-    <node>SenderNode</node>
-    <source/>
-    <implementation xmi:idref="ResetTopic_EventConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ResetTopic1</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ResetTopic_Library#ResetTopicProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ResetTopic_ReceiverEventConnectorInstance">
-    <name>ResetTopic_ReceiverEventConnectorInstance</name>
-    <node>ReceiverNode</node>
-    <source/>
-    <implementation xmi:idref="ResetTopic_EventConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string></string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ResetTopic_Library#ResetTopicProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ResetTopic_ReceiverStateConnectorInstance">
-    <name>ResetTopic_ReceiverStateConnectorInstance</name>
-    <node>ReceiverNode</node>
-    <source/>
-    <implementation xmi:idref="ResetTopic_StateConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string></string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ResetTopic_Library#ResetTopicProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>reader_starter</name>
-    <internalEndpoint>
-      <portName>reader_start</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>start_reading</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>reader_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_read_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>passive_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ResetTopic_ReceiverStateConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>getter_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_fresh_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_fresh_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ResetTopic_ReceiverEventConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ResetTopic_SenderEventConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="ResetTopic_Connector_ExecArtifact">
-    <name>RG_ResetTopic_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>RG_ResetTopicConnector_exec</location>
-  </artifact>
-  <artifact xmi:id="ResetTopic_Connector_SvntArtifact">
-    <name>RG_ResetTopic_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>RG_ResetTopicConnector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/ResetTopic_Library.xml b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/ResetTopic_Library.xml
deleted file mode 100644
index 9bf40140294..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/ResetTopic_Library.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-
-  <qos_profile name="ResetTopicProfile">
-    <datawriter_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-        <max_blocking_time>
-          <sec>10</sec>
-          <nanosec>0</nanosec>
-        </max_blocking_time>
-      </reliability>
-      <durability>
-        <kind>TRANSIENT_DURABILITY_QOS</kind>
-      </durability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-    </datawriter_qos>
-    <datareader_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-      </reliability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-      <durability>
-        <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-      </durability>
-    </datareader_qos>
-  </qos_profile>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index e3268d2c621..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  -->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <qos_library name="ResetTopic_Library">
-    <qos_profile name="ResetTopicProfile" is_default_qos="false">
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>10</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/run_test.pl
deleted file mode 100755
index 87984594507..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 60 seconds to allow task to complete\n";
-sleep (60);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.idl
deleted file mode 100644
index 6d757cd12fd..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file TE_ResetTopic_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef TE_RESETTOPIC_BASE_IDL
-#define TE_RESETTOPIC_BASE_IDL
-
-#pragma ndds typesupport "Base/TE_ResetTopic_BaseSupport.h"
-#pragma opendds typesupport "Base/TE_ResetTopic_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "TE_ResetTopicTest"
-#pragma DCPS_DATA_KEY "TE_ResetTopicTest key"
-
-struct TE_ResetTopicTest {
-  string key; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TE_ResetTopicTest> TE_ResetTopicTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.mpc
deleted file mode 100644
index 61e2f2252cd..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (TE_ResetTopicBase_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = TE_ResetTopicBase_stub
-  dynamicflags += TE_RESETTOPIC_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=TE_RESETTOPIC_BASE_STUB_Export \
-              -Wb,stub_export_include=ResetTopic_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    TE_ResetTopic_Base.idl
-  }
-
-  opendds_ts_flags += --export=TE_RESETTOPIC_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    TE_ResetTopic_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.idl
deleted file mode 100644
index c3fd7df6416..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file TE_ResetTopic_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef TE_RESETTOPIC_CONNECTOR_IDL_
-#define TE_RESETTOPIC_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/TE_ResetTopic_Base.idl"
-
-#pragma ciao lem "Connector/TE_ResetTopic_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/TE_ResetTopic_BaseTypeSupport.idl"
-#endif
-
-module TE_ResetTopic
-{
-  module ::CCM_DDS::Typed < ::TE_ResetTopicTest, ::TE_ResetTopicTestSeq> TE_ResetTopicTestConnector;
-};
-
-#endif /* TE_ResetTopic_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.mpc
deleted file mode 100644
index dfbb50208a0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.mpc
+++ /dev/null
@@ -1,146 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p TE_ResetTopicBase -l .. -o ../lib -u DDS TE_ResetTopic_Connector"
-
-project (TE_ResetTopicConnector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen TE_ResetTopicBase_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=TE_RESETTOPIC_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=ResetTopic_Connector_stub_export.h \
-              -Wb,skel_export_macro=TE_RESETTOPIC_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=ResetTopic_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=TE_RESETTOPIC_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=ResetTopic_Connector_svnt_export.h \
-              -Wb,conn_export_macro=TE_RESETTOPIC_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=ResetTopic_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    TE_ResetTopic_Connector.idl
-  }
-}
-
-project (TE_ResetTopicConnector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += TE_ResetTopicConnector_idl_gen
-  idlflags += -Wb,stub_export_macro=TE_RESETTOPIC_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=TE_ResetTopic_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    TE_ResetTopic_ConnectorE.idl
-  }
-}
-
-project (TE_ResetTopicConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += TE_ResetTopicConnector_lem_gen TE_ResetTopicConnector_stub \
-           TE_ResetTopicBase_stub
-  libs  += TE_ResetTopicBase_stub TE_ResetTopicConnector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = TE_ResetTopicConnector_lem_stub
-  dynamicflags += TE_RESETTOPIC_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TE_ResetTopic_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    TE_ResetTopic_ConnectorEC.h
-    TE_ResetTopic_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    TE_ResetTopic_ConnectorEC.inl
-  }
-}
-
-project (TE_ResetTopicConnector_stub) : ccm_stub, dds4ccm_base {
-  after += TE_ResetTopicConnector_idl_gen TE_ResetTopicBase_stub
-  libs  += TE_ResetTopicBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = TE_ResetTopicConnector_stub
-  dynamicflags += TE_RESETTOPIC_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TE_ResetTopic_ConnectorC.cpp
-  }
-
-  Header_Files {
-    TE_ResetTopic_ConnectorC.h
-    TE_ResetTopic_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    TE_ResetTopic_ConnectorC.inl
-  }
-}
-
-project (TE_ResetTopicConnector_exec) : ciao_executor, dds4ccm_impl {
-  after   += TE_ResetTopicConnector_lem_stub TE_ResetTopicConnector_stub \
-             TE_ResetTopicBase_stub
-  sharedname = TE_ResetTopicConnector_exec
-  libs += TE_ResetTopicConnector_stub TE_ResetTopicConnector_lem_stub \
-          TE_ResetTopicBase_stub TE_ResetTopicBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += TE_RESETTOPIC_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TE_ResetTopic_Connector_conn.cpp
-  }
-
-  Header_Files {
-    TE_ResetTopic_Connector_conn.h
-    TE_ResetTopic_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project (TE_ResetTopicConnector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += TE_ResetTopicConnector_lem_stub TE_ResetTopicConnector_exec \
-                TE_ResetTopicConnector_stub
-  sharedname  = TE_ResetTopicConnector_svnt
-  libs       += TE_ResetTopicConnector_stub \
-                TE_ResetTopicConnector_lem_stub  \
-                TE_ResetTopicBase_stub \
-                TE_ResetTopicConnector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += TE_RESETTOPIC_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TE_ResetTopic_ConnectorS.cpp
-    TE_ResetTopic_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    TE_ResetTopic_ConnectorS.h
-    TE_ResetTopic_Connector_svnt.h
-    TE_ResetTopic_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/SenderDriver.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/SenderDriver.cpp
deleted file mode 100644
index fe3281faba3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/SenderDriver.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * @file SenderDriver.cpp
- *
- * @author Marcel Smit
- */
-
-
-#include "TE_ResetTopic_SenderC.h"
-#include "ace/streams.h"
-#include "ace/Get_Opt.h"
-
-const ACE_TCHAR *sender_ior = ACE_TEXT ("file://Sender.ior");
-const ACE_TCHAR *topic_name = ACE_TEXT ("");
-
-int
-parse_args (int argc, ACE_TCHAR *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("ek:n:"));
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    {
-      switch (c)
-        {
-          case 'k':
-            sender_ior = get_opts.opt_arg ();
-            break;
-
-          case 'n':
-            topic_name = get_opts.opt_arg ();
-            break;
-
-          case 'e':
-            topic_name = "";
-            break;
-
-          case '?':
-          default:
-            ACE_ERROR_RETURN ((LM_ERROR,
-                              "usage:  %s\n"
-                              "-k <Sender IOR> (default is file://Sender.ior)\n"
-                              "-n <new topic>\n"
-                              "-e <clearing topic name>\n"
-                              "\n",
-                              argv [0]),
-                              -1);
-        }
-    }
-
-  return 0;
-}
-
-
-int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
-{
-  try
-    {
-      // initialize the ORB
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv);
-      if (parse_args (argc, argv) != 0)
-        {
-          return -1;
-        }
-
-      // create the factory object reference,
-      CORBA::Object_var sender_obj =
-        orb->string_to_object (sender_ior);
-
-      // downcast the object reference to the appropriate type
-      ::TE_ResetTopic::Sender_var sender =
-        ::TE_ResetTopic::Sender::_narrow (sender_obj.in ());
-
-      if (CORBA::is_nil (sender.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                            "Unable to acquire 'Sender' objref\n"),
-                            -1);
-        }
-      sender->set_new_topic (topic_name);
-
-      orb->destroy ();
-    }
-  catch (const CORBA::Exception& ex)
-    {
-      ex._tao_print_exception ("Who is the culprit in the SenderDriver?\n");
-      ACE_ERROR_RETURN ((LM_ERROR,
-                          "Uncaught CORBA exception\n"),
-                        1);
-    }
-  return 0;
-}
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.idl
deleted file mode 100644
index 91e45c7c88c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef TE_RESETTOPIC_SENDER_IDL
-#define TE_RESETTOPIC_SENDER_IDL
-
-#include "Connector/TE_ResetTopic_Connector.idl"
-
-module TE_ResetTopic
-{
-  interface ChangeTopicInterface
-  {
-    void set_new_topic (in string topic_name);
-  };
-
-  component Sender supports ChangeTopicInterface
-  {
-    port TE_ResetTopicTestConnector::DDS_Write  info_write;
-    port TE_ResetTopicTestConnector::DDS_Update info_update;
-
-    attribute unsigned short iterations;
-    attribute unsigned short keys;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.mpc
deleted file mode 100644
index 4a4b30c044b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.mpc
+++ /dev/null
@@ -1,164 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p TE_ResetTopicBase -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project (TE_ResetTopicSender_idl_gen) : componentidldefaults, dds4ccm {
-  after += TE_ResetTopicConnector_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I ..
-
-  IDL_Files {
-    TE_ResetTopic_Sender.idl
-  }
-}
-
-project (TE_ResetTopicSender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += TE_ResetTopicSender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    TE_ResetTopic_SenderE.idl
-  }
-}
-
-project (TE_ResetTopicSender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += TE_ResetTopicSender_lem_gen TE_ResetTopicSender_stub TE_ResetTopicBase_stub
-  libs  += TE_ResetTopicBase_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TE_ResetTopic_SenderEC.cpp
-  }
-
-  Header_Files {
-    TE_ResetTopic_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    TE_ResetTopic_SenderEC.inl
-  }
-}
-
-project (TE_ResetTopicSender_stub) : ccm_stub, dds4ccm_base {
-  after += TE_ResetTopicSender_idl_gen TE_ResetTopicBase_stub TE_ResetTopicConnector_stub
-  libs  += TE_ResetTopicBase_stub TE_ResetTopicConnector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TE_ResetTopic_SenderC.cpp
-  }
-
-  Header_Files {
-    TE_ResetTopic_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    TE_ResetTopic_SenderC.inl
-  }
-}
-
-project (TE_ResetTopicSender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += TE_ResetTopicSender_lem_stub TE_ResetTopicSender_stub \
-             TE_ResetTopicConnector_lem_stub TE_ResetTopicConnector_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub TE_ResetTopicBase_stub \
-          TE_ResetTopicConnector_lem_stub TE_ResetTopicConnector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TE_ResetTopic_Sender_exec.cpp
-  }
-
-  Header_Files {
-    TE_ResetTopic_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project (TE_ResetTopicSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += TE_ResetTopicBase_stub  TE_ResetTopicSender_lem_stub TE_ResetTopicConnector_stub \
-                TE_ResetTopicConnector_svnt TE_ResetTopicConnector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                TE_ResetTopicBase_stub TE_ResetTopicConnector_stub TE_ResetTopicConnector_svnt TE_ResetTopicConnector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TE_ResetTopic_SenderS.cpp
-    TE_ResetTopic_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    TE_ResetTopic_SenderS.h
-    TE_ResetTopic_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-project (TE_ResetTopicSender_Driver) : ccm_stub, valuetype, dds4ccm_lem_stub {
-  exename = SenderDriver
-  after += TE_ResetTopicSender_stub TE_ResetTopicConnector_stub
-  libs  += Sender_stub TE_ResetTopicBase_stub TE_ResetTopicConnector_stub
-
-  includes += ..
-  libpaths += ../lib
-
-  exeout = ../lib
-  IDL_Files {
-  }
-
-  Source_Files {
-    SenderDriver.cpp
-  }
-
-  Header_Files {
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender_exec.cpp
deleted file mode 100644
index c132f64a7ef..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender_exec.cpp
+++ /dev/null
@@ -1,385 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "TE_ResetTopic_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_TE_ResetTopic_Sender_Impl
-{
-
-  /**
-   * Timeout_Handler
-   */
-
-  Timeout_Handler::Timeout_Handler (Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  Timeout_Handler::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    // Notify the subscribers
-    this->callback_.start_event_test ();
-    return 0;
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : iterations_ (0)
-    , keys_ (0)
-    , to_handler_ (0)
-    , topic_name_ ("TopicI")
-    , old_topic_name_ ("TopicI")
-    {
-     ACE_NEW_THROW_EX (this->to_handler_,
-                       Timeout_Handler (*this),
-                       ::CORBA::INTERNAL ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->to_handler_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void Sender_exec_i::set_new_topic (const char * topic_name)
-  {
-    ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, guard, this->topic_name_lock_);
-
-    this->old_topic_name_ = this->topic_name_;
-    this->topic_name_ = topic_name;
-    ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::set_new_topic - "
-              "New topic name set <%C>\n",
-              topic_name));
-  }
-
-  void
-  Sender_exec_i::create_samples (void)
-  {
-    for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i)
-      {
-        char key[7];
-        TE_ResetTopicTest *new_key = new TE_ResetTopicTest;
-        ACE_OS::sprintf (key, "KEY_%d", i);
-        new_key->key = CORBA::string_dup(key);
-        new_key->iteration = 0;
-        this->tests_[key] = new_key;
-
-        ::TE_ResetTopic::TE_ResetTopicTestConnector::Updater_var updater =
-          this->ciao_context_->get_connection_info_update_data();
-
-        updater->create_one (*new_key);
-        ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::create_samples - "
-                  "Sample <%C> created\n",
-                  key));
-      }
-  }
-
-  void
-  Sender_exec_i::set_topic_name (const char * topic_name)
-  {
-    if (ACE_OS::strcmp (topic_name, this->old_topic_name_.c_str()) != 0)
-      {
-        this->old_topic_name_ = topic_name;
-        this->set_topic_name_writer (topic_name);
-        this->set_topic_name_updater (topic_name);
-      }
-  }
-
-  void
-  Sender_exec_i::set_topic_name_writer (const char * topic_name)
-  {
-    try
-      {
-        ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::set_topic_name_writer - "
-                  "Setting topic to <%C>\n",
-                  topic_name));
-        ::TE_ResetTopic::TE_ResetTopicTestConnector:: Writer_var writer =
-          this->ciao_context_->get_connection_info_write_data ();
-        if (::CORBA::is_nil (writer.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - "
-                                  "Unable to get writer interface\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-        ::CORBA::Object_var cmp = writer->_get_component ();
-        if (::CORBA::is_nil (cmp.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - "
-                                  "Unable to get component interface\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-        ::TE_ResetTopic::TE_ResetTopicTestConnector::CCM_DDS_Event_var conn =
-          ::TE_ResetTopic::TE_ResetTopicTestConnector::CCM_DDS_Event::_narrow (cmp.in ());
-        if (::CORBA::is_nil (conn.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - "
-                                  "Unable to narrow connector interface\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-        {
-          ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, guard, this->topic_name_lock_);
-          conn->topic_name (topic_name);
-        }
-      }
-    catch (const ::CCM_DDS::NonChangeable &)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - "
-                    "Caught NonChangeable exception.\n"));
-      }
-  }
-
-  void
-  Sender_exec_i::set_topic_name_updater (const char * topic_name)
-  {
-    try
-      {
-        ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::set_topic_name_updater - "
-                  "Setting topic to <%C>\n",
-                  topic_name));
-        ::TE_ResetTopic::TE_ResetTopicTestConnector:: Updater_var updater =
-          this->ciao_context_->get_connection_info_update_data ();
-        if (::CORBA::is_nil (updater.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - "
-                                  "Unable to get updater interface\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-        ::CORBA::Object_var cmp = updater->_get_component ();
-        if (::CORBA::is_nil (cmp.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - "
-                                  "Unable to get component interface\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-        ::TE_ResetTopic::TE_ResetTopicTestConnector::CCM_DDS_State_var conn =
-          ::TE_ResetTopic::TE_ResetTopicTestConnector::CCM_DDS_State::_narrow (cmp.in ());
-        if (::CORBA::is_nil (conn.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - "
-                                  "Unable to narrow connector interface\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-        {
-          ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, guard, this->topic_name_lock_);
-          conn->topic_name (topic_name);
-        }
-        this->create_samples ();
-      }
-    catch (const ::CCM_DDS::NonChangeable &)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - "
-                    "Caught NonChangeable exception.\n"));
-      }
-  }
-
-  void
-  Sender_exec_i::start_event_test (void)
-  {
-    // Set the topic name on the connector first. Therefor we need to
-    // get to the connector first.
-    ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - Start\n"));
-
-    try
-      {
-        for (::CORBA::UShort key = 1; key < this->keys_ + 1; ++key)
-          {
-            TE_ResetTopicTest sample;
-            char tmp[7];
-            ACE_OS::sprintf (tmp, "KEY_%d", key);
-            sample.key = CORBA::string_dup(tmp);
-
-            for (::CORBA::UShort iter = 1; iter < this->iterations_ + 1; ++iter)
-              {
-                this->set_topic_name (this->topic_name_.c_str ());
-                ::TE_ResetTopic::TE_ResetTopicTestConnector:: Writer_var writer =
-                  this->ciao_context_->get_connection_info_write_data ();
-                sample.iteration = iter;
-                writer->write_one (sample, ::DDS::HANDLE_NIL);
-
-                ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - "
-                            "Sample for topic <%C> written : key <%C> - iteration <%d>\n",
-                            this->topic_name_.c_str (), tmp, iter));
-
-                ACE_Time_Value tv (0, 5000);
-                ACE_OS::sleep (tv);
-              }
-          }
-        for (Sample_Table::iterator iter = this->tests_.begin ();
-            iter != this->tests_.end ();
-            ++iter)
-          {
-            for (::CORBA::UShort i = 1; i < this->iterations_ + 1; ++i)
-              {
-                this->set_topic_name (this->topic_name_.c_str ());
-                ::TE_ResetTopic::TE_ResetTopicTestConnector:: Updater_var updater =
-                  this->ciao_context_->get_connection_info_update_data ();
-                iter->second->iteration = i;
-                updater->update_one (iter->second, ::DDS::HANDLE_NIL);
-
-                ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - "
-                            "Sample for topic <%C> updated : key <%C> - iteration <%d>\n",
-                            this->topic_name_.c_str (),
-                            iter->second->key.in (),
-                            i));
-
-                ACE_Time_Value tv (0, 5000);
-                ACE_OS::sleep (tv);
-              }
-          }
-      }
-    catch (const ::CORBA::BAD_INV_ORDER & ex)
-      {
-        if (this->topic_name_.empty())
-          ACE_DEBUG ((LM_DEBUG, "Expected BAD_INV_ORDER caught\n"));
-        else
-          ex._tao_print_exception("ERROR:");
-      }
-    catch (const ::CORBA::Exception & ex)
-      {
-        ex._tao_print_exception("ERROR:");
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "Sender_exec_i::start_event_test - "
-                    "ERROR: Unexpected and unknown exception caught.\n"));
-      }
-  }
-
-  // Component attributes and port operations.
-
-  ::CORBA::UShort
-  Sender_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::TE_ResetTopic::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-    this->create_samples ();
-    if (this->reactor ()->schedule_timer (
-                this->to_handler_,
-                0,
-                ACE_Time_Value (5, 0),
-                ACE_Time_Value (5, 0)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                              ACE_TEXT ("Error scheduling timer")));
-      }
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    this->reactor()->cancel_timer(this->to_handler_);
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_TE_ResetTopic_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender_exec.h
deleted file mode 100644
index f7152f8cdb5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender_exec.h
+++ /dev/null
@@ -1,145 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_TE_RESETTOPIC_SENDER_EXEC_YSJ9S8_H_
-#define CIAO_TE_RESETTOPIC_SENDER_EXEC_YSJ9S8_H_
-
-#include /**/ "ace/pre.h"
-
-#include "TE_ResetTopic_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-#include <map>
-
-namespace CIAO_TE_ResetTopic_Sender_Impl
-{
-  class Sender_exec_i;
-
-  /**
-   * Timeout_Handler
-   */
-  class Timeout_Handler :
-    public ACE_Event_Handler
-  {
-  public:
-    Timeout_Handler (Sender_exec_i &callback);
-    /// Handle the timeout.
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    /// Maintains a handle that actually process the event
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-    virtual void set_new_topic (const char * topic_name);
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void set_topic_name (const char * topic_name);
-    void set_topic_name_writer (const char * topic_name);
-    void set_topic_name_updater (const char * topic_name);
-    void start_event_test (void);
-    //@}
-
-  private:
-    ::TE_ResetTopic::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-
-    ::CORBA::UShort iterations_;
-
-    ::CORBA::UShort keys_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    Timeout_Handler *to_handler_;
-    ACE_CString topic_name_, old_topic_name_;
-
-    TAO_SYNCH_RECURSIVE_MUTEX topic_name_lock_;
-
-    typedef std::map<ACE_CString, TE_ResetTopicTest_var> Sample_Table;
-
-    Sample_Table tests_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void create_samples (void);
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_TE_ResetTopic_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/descriptors/Plan.cdp
deleted file mode 100644
index 6c3375f91f0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/descriptors/Plan.cdp
+++ /dev/null
@@ -1,338 +0,0 @@
-<!--  -->
-<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>ResetTopic_Depl_1</label>
-  <UUID>ResetTopic_Depl_1</UUID>
-
-  <implementation xmi:id="ResetTopic_EventConnectorImplementation">
-    <name>ResetTopic_EventConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="ResetTopic_Connector_ExecArtifact" />
-    <artifact xmi:idref="ResetTopic_Connector_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_TE_ResetTopic_TE_ResetTopicTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_TE_ResetTopic_TE_ResetTopicTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TE_ResetTopic_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TE_ResetTopic_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="ResetTopic_StateConnectorImplementation">
-    <name>ResetTopic_StateConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="ResetTopic_Connector_ExecArtifact" />
-    <artifact xmi:idref="ResetTopic_Connector_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_TE_ResetTopic_TE_ResetTopicTestConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_TE_ResetTopic_TE_ResetTopicTestConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TE_ResetTopic_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TE_ResetTopic_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_TE_ResetTopic_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_TE_ResetTopic_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="ResetTopic_SenderEventConnectorInstance">
-    <name>ResetTopic_SenderEventConnectorInstance</name>
-    <node>SenderNode</node>
-    <source/>
-    <implementation xmi:idref="ResetTopic_EventConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TopicI</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ResetTopic_SenderStateConnectorInstance">
-    <name>ResetTopic_SenderStateConnectorInstance</name>
-    <node>SenderNode</node>
-    <source/>
-    <implementation xmi:idref="ResetTopic_StateConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TopicI</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>15</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender.ior</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ResetTopic_SenderEventConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>updater_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_update_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>observable_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ResetTopic_SenderStateConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="ResetTopic_Connector_ExecArtifact">
-    <name>TE_ResetTopic_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>TE_ResetTopicConnector_exec</location>
-  </artifact>
-  <artifact xmi:id="ResetTopic_Connector_SvntArtifact">
-    <name>TE_ResetTopic_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>TE_ResetTopicConnector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/descriptors/run_test.pl
deleted file mode 100755
index 54d573aae7b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/descriptors/run_test.pl
+++ /dev/null
@@ -1,264 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 1;
-@ports = ( 60001 );
-@iorbases = ( "SenderNode.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode" );
-
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 10 seconds before clearing the topic name\n";
-sleep (10);
-
-$S = $tg_executor->CreateProcess ("../lib/SenderDriver", "-e");
-$driver_status = $S->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-if ($driver_status != 0) {
-    print STDERR "ERROR: unable to launch driver\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Sleeping 10 seconds before setting the topic name again\n";
-sleep (10);
-
-$S = $tg_executor->CreateProcess ("../lib/SenderDriver", "-n TopicIII");
-$driver_status = $S->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-if ($driver_status != 0) {
-    print STDERR "ERROR: unable to launch driver\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Sleeping 10 seconds before stopping\n";
-sleep (10);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.idl
deleted file mode 100644
index 03570b30e51..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file TL_ResetTopic_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef TL_RESETTOPIC_BASE_IDL
-#define TL_RESETTOPIC_BASE_IDL
-
-#pragma ndds typesupport "Base/TL_ResetTopic_BaseSupport.h"
-#pragma opendds typesupport "Base/TL_ResetTopic_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "TL_ResetTopicTest"
-#pragma DCPS_DATA_KEY "TL_ResetTopicTest key"
-
-struct TL_ResetTopicTest {
-  string key; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TL_ResetTopicTest> TL_ResetTopicTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.mpc
deleted file mode 100644
index 39c3065fb40..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (TL_ResetTopicBase_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = TL_ResetTopicBase_stub
-  dynamicflags += TL_RESETTOPIC_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=TL_RESETTOPIC_BASE_STUB_Export \
-              -Wb,stub_export_include=ResetTopic_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    TL_ResetTopic_Base.idl
-  }
-
-  opendds_ts_flags += --export=TL_RESETTOPIC_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    TL_ResetTopic_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.idl
deleted file mode 100644
index aa04ebb5c4f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file TL_ResetTopic_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef TL_RESETTOPIC_CONNECTOR_IDL_
-#define TL_RESETTOPIC_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/TL_ResetTopic_Base.idl"
-
-#pragma ciao lem "Connector/TL_ResetTopic_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/TL_ResetTopic_BaseTypeSupport.idl"
-#endif
-
-module TL_ResetTopic
-{
-  module ::CCM_DDS::Typed < ::TL_ResetTopicTest, ::TL_ResetTopicTestSeq> TL_ResetTopicTestConnector;
-};
-
-#endif /* TL_ResetTopic_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.mpc
deleted file mode 100644
index c8da3fd3e86..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.mpc
+++ /dev/null
@@ -1,146 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p TL_ResetTopicBase -l .. -o ../lib -u DDS TL_ResetTopic_Connector"
-
-project (TL_ResetTopicConnector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen TL_ResetTopicBase_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=TL_RESETTOPIC_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=ResetTopic_Connector_stub_export.h \
-              -Wb,skel_export_macro=TL_RESETTOPIC_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=ResetTopic_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=TL_RESETTOPIC_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=ResetTopic_Connector_svnt_export.h \
-              -Wb,conn_export_macro=TL_RESETTOPIC_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=ResetTopic_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    TL_ResetTopic_Connector.idl
-  }
-}
-
-project (TL_ResetTopicConnector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += TL_ResetTopicConnector_idl_gen
-  idlflags += -Wb,stub_export_macro=TL_RESETTOPIC_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=TL_ResetTopic_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    TL_ResetTopic_ConnectorE.idl
-  }
-}
-
-project (TL_ResetTopicConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += TL_ResetTopicConnector_lem_gen TL_ResetTopicConnector_stub \
-           TL_ResetTopicBase_stub
-  libs  += TL_ResetTopicBase_stub TL_ResetTopicConnector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = TL_ResetTopicConnector_lem_stub
-  dynamicflags += TL_RESETTOPIC_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TL_ResetTopic_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    TL_ResetTopic_ConnectorEC.h
-    TL_ResetTopic_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    TL_ResetTopic_ConnectorEC.inl
-  }
-}
-
-project (TL_ResetTopicConnector_stub) : ccm_stub, dds4ccm_base {
-  after += TL_ResetTopicConnector_idl_gen TL_ResetTopicBase_stub
-  libs  += TL_ResetTopicBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = TL_ResetTopicConnector_stub
-  dynamicflags += TL_RESETTOPIC_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TL_ResetTopic_ConnectorC.cpp
-  }
-
-  Header_Files {
-    TL_ResetTopic_ConnectorC.h
-    TL_ResetTopic_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    TL_ResetTopic_ConnectorC.inl
-  }
-}
-
-project (TL_ResetTopicConnector_exec) : ciao_executor, dds4ccm_impl {
-  after   += TL_ResetTopicConnector_lem_stub TL_ResetTopicConnector_stub \
-             TL_ResetTopicBase_stub
-  sharedname = TL_ResetTopicConnector_exec
-  libs += TL_ResetTopicConnector_stub TL_ResetTopicConnector_lem_stub \
-          TL_ResetTopicBase_stub TL_ResetTopicBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += TL_RESETTOPIC_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TL_ResetTopic_Connector_conn.cpp
-  }
-
-  Header_Files {
-    TL_ResetTopic_Connector_conn.h
-    TL_ResetTopic_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project (TL_ResetTopicConnector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += TL_ResetTopicConnector_lem_stub TL_ResetTopicConnector_exec \
-                TL_ResetTopicConnector_stub
-  sharedname  = TL_ResetTopicConnector_svnt
-  libs       += TL_ResetTopicConnector_stub \
-                TL_ResetTopicConnector_lem_stub  \
-                TL_ResetTopicBase_stub \
-                TL_ResetTopicConnector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += TL_RESETTOPIC_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TL_ResetTopic_ConnectorS.cpp
-    TL_ResetTopic_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    TL_ResetTopic_ConnectorS.h
-    TL_ResetTopic_Connector_svnt.h
-    TL_ResetTopic_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/SenderDriver.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/SenderDriver.cpp
deleted file mode 100644
index e60e2bb678c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/SenderDriver.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * @file SenderDriver.cpp
- *
- * @author Marcel Smit
- */
-
-
-#include "TL_ResetTopic_SenderC.h"
-#include "ace/streams.h"
-#include "ace/Get_Opt.h"
-
-const ACE_TCHAR *sender_ior = ACE_TEXT ("file://Sender.ior");
-const ACE_TCHAR *topic_name = ACE_TEXT ("");
-
-int
-parse_args (int argc, ACE_TCHAR *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("ek:n:"));
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    {
-      switch (c)
-        {
-          case 'k':
-            sender_ior = get_opts.opt_arg ();
-            break;
-
-          case 'n':
-            topic_name = get_opts.opt_arg ();
-            break;
-
-          case 'e':
-            topic_name = "";
-            break;
-
-          case '?':
-          default:
-            ACE_ERROR_RETURN ((LM_ERROR,
-                              "usage:  %s\n"
-                              "-k <Sender IOR> (default is file://Sender.ior)\n"
-                              "-n <new topic>\n"
-                              "-e <clearing topic name>\n"
-                              "\n",
-                              argv [0]),
-                              -1);
-        }
-    }
-
-  return 0;
-}
-
-
-int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
-{
-  try
-    {
-      // initialize the ORB
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv);
-      if (parse_args (argc, argv) != 0)
-        {
-          return -1;
-        }
-
-      // create the factory object reference,
-      CORBA::Object_var sender_obj =
-        orb->string_to_object (sender_ior);
-
-      // downcast the object reference to the appropriate type
-      ::TL_ResetTopic::Sender_var sender =
-        ::TL_ResetTopic::Sender::_narrow (sender_obj.in ());
-
-      if (CORBA::is_nil (sender.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                            "Unable to acquire 'Sender' objref\n"),
-                            -1);
-        }
-      sender->set_new_topic (topic_name);
-
-      orb->destroy ();
-    }
-  catch (const CORBA::Exception& ex)
-    {
-      ex._tao_print_exception ("Who is the culprit in the SenderDriver?\n");
-      ACE_ERROR_RETURN ((LM_ERROR,
-                          "Uncaught CORBA exception\n"),
-                        1);
-    }
-  return 0;
-}
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.idl
deleted file mode 100644
index 0e5fe02ca5d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef TL_RESETTOPIC_SENDER_IDL
-#define TL_RESETTOPIC_SENDER_IDL
-
-#include "Connector/TL_ResetTopic_Connector.idl"
-
-module TL_ResetTopic
-{
-  interface ChangeTopicInterface
-  {
-    void set_new_topic (in string topic_name);
-  };
-
-  component Sender supports ChangeTopicInterface
-  {
-    port TL_ResetTopicTestConnector::DDS_Write  info_write;
-    port TL_ResetTopicTestConnector::DDS_Update info_update;
-
-    attribute unsigned short iterations;
-    attribute unsigned short keys;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.mpc
deleted file mode 100644
index 8e2b8189b89..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.mpc
+++ /dev/null
@@ -1,164 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p TL_ResetTopicBase -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project (TL_ResetTopicSender_idl_gen) : componentidldefaults, dds4ccm {
-  after += TL_ResetTopicConnector_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I ..
-
-  IDL_Files {
-    TL_ResetTopic_Sender.idl
-  }
-}
-
-project (TL_ResetTopicSender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += TL_ResetTopicSender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    TL_ResetTopic_SenderE.idl
-  }
-}
-
-project (TL_ResetTopicSender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += TL_ResetTopicSender_lem_gen TL_ResetTopicSender_stub TL_ResetTopicBase_stub
-  libs  += TL_ResetTopicBase_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TL_ResetTopic_SenderEC.cpp
-  }
-
-  Header_Files {
-    TL_ResetTopic_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    TL_ResetTopic_SenderEC.inl
-  }
-}
-
-project (TL_ResetTopicSender_stub) : ccm_stub, dds4ccm_base {
-  after += TL_ResetTopicSender_idl_gen TL_ResetTopicBase_stub TL_ResetTopicConnector_stub
-  libs  += TL_ResetTopicBase_stub TL_ResetTopicConnector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TL_ResetTopic_SenderC.cpp
-  }
-
-  Header_Files {
-    TL_ResetTopic_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    TL_ResetTopic_SenderC.inl
-  }
-}
-
-project (TL_ResetTopicSender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += TL_ResetTopicSender_lem_stub TL_ResetTopicSender_stub \
-             TL_ResetTopicConnector_lem_stub TL_ResetTopicConnector_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub TL_ResetTopicBase_stub \
-          TL_ResetTopicConnector_lem_stub TL_ResetTopicConnector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TL_ResetTopic_Sender_exec.cpp
-  }
-
-  Header_Files {
-    TL_ResetTopic_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project (TL_ResetTopicSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += TL_ResetTopicBase_stub  TL_ResetTopicSender_lem_stub TL_ResetTopicConnector_stub \
-                TL_ResetTopicConnector_svnt TL_ResetTopicConnector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                TL_ResetTopicBase_stub TL_ResetTopicConnector_stub TL_ResetTopicConnector_svnt TL_ResetTopicConnector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TL_ResetTopic_SenderS.cpp
-    TL_ResetTopic_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    TL_ResetTopic_SenderS.h
-    TL_ResetTopic_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-project (TL_ResetTopicSender_Driver) : ccm_stub, valuetype, dds4ccm_lem_stub {
-  exename = SenderDriver
-  after += TL_ResetTopicSender_stub TL_ResetTopicConnector_stub
-  libs  += Sender_stub TL_ResetTopicBase_stub TL_ResetTopicConnector_stub
-
-  includes += ..
-  libpaths += ../lib
-
-  exeout = ../lib
-  IDL_Files {
-  }
-
-  Source_Files {
-    SenderDriver.cpp
-  }
-
-  Header_Files {
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender_exec.cpp
deleted file mode 100644
index 41f3ba0cdd9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender_exec.cpp
+++ /dev/null
@@ -1,426 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "TL_ResetTopic_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_TL_ResetTopic_Sender_Impl
-{
-
-  /**
-   * Timeout_Handler
-   */
-
-  Timeout_Handler::Timeout_Handler (Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  Timeout_Handler::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    // Notify the subscribers
-    this->callback_.start_event_test ();
-    return 0;
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : iterations_ (0)
-    , keys_ (0)
-    , to_handler_ (0)
-    , topic_name_ ("TopicI")
-    , old_topic_name_ ("TopicI")
-    {
-     ACE_NEW_THROW_EX (this->to_handler_,
-                       Timeout_Handler (*this),
-                       ::CORBA::INTERNAL ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->to_handler_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void Sender_exec_i::set_new_topic (const char * topic_name)
-  {
-    ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, guard, this->topic_name_lock_);
-
-    this->old_topic_name_ = this->topic_name_;
-    this->topic_name_ = topic_name;
-    ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::set_new_topic - "
-              "New topic name set <%C>\n",
-              topic_name));
-  }
-
-  void
-  Sender_exec_i::create_samples (void)
-  {
-    for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i)
-      {
-        char key[7];
-        TL_ResetTopicTest *new_key = new TL_ResetTopicTest;
-        ACE_OS::sprintf (key, "KEY_%d", i);
-        new_key->key = CORBA::string_dup(key);
-        new_key->iteration = 0;
-        this->tests_[key] = new_key;
-
-        ::TL_ResetTopic::TL_ResetTopicTestConnector::Updater_var updater =
-          this->ciao_context_->get_connection_info_update_data();
-
-        updater->create_one (*new_key);
-        ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::create_samples - "
-                  "Sample <%C> created\n",
-                  key));
-      }
-  }
-
-  bool
-  Sender_exec_i::set_topic_name (const char * topic_name)
-  {
-    if (ACE_OS::strcmp (topic_name, this->old_topic_name_.c_str()) != 0)
-      {
-        this->old_topic_name_ = topic_name;
-        bool ret = this->set_topic_name_writer (topic_name);
-        ret |= this->set_topic_name_updater (topic_name);
-        return ret;
-      }
-    if (ACE_OS::strlen (this->topic_name_.c_str()) > 256)
-      return false;
-    return true;
-  }
-
-  bool
-  Sender_exec_i::set_topic_name_writer (const char * topic_name)
-  {
-    try
-      {
-        ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::set_topic_name_writer - "
-                  "Setting topic to <%C>\n",
-                  topic_name));
-        ::TL_ResetTopic::TL_ResetTopicTestConnector:: Writer_var writer =
-          this->ciao_context_->get_connection_info_write_data ();
-        if (::CORBA::is_nil (writer.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - "
-                                  "Unable to get writer interface\n"));
-            return false;
-          }
-        ::CORBA::Object_var cmp = writer->_get_component ();
-        if (::CORBA::is_nil (cmp.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - "
-                                  "Unable to get component interface\n"));
-            return false;
-          }
-        ::TL_ResetTopic::TL_ResetTopicTestConnector::CCM_DDS_Event_var conn =
-          ::TL_ResetTopic::TL_ResetTopicTestConnector::CCM_DDS_Event::_narrow (cmp.in ());
-        if (::CORBA::is_nil (conn.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - "
-                                  "Unable to narrow connector interface\n"));
-            return false;
-          }
-        {
-          ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, guard, this->topic_name_lock_, false);
-          conn->topic_name (topic_name);
-        }
-      }
-    catch (const ::CCM_DDS::NonChangeable &)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - "
-                    "Caught NonChangeable exception.\n"));
-        return false;
-      }
-    catch (const ::CCM_DDS::InternalError &)
-      {
-        if (ACE_OS::strlen (topic_name) > 256)
-          {
-            ACE_DEBUG ((LM_ERROR, "Sender_exec_i::set_topic_name_writer - "
-                      "Expected InternalErr exception caught.\n"));
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - "
-                      "Caught InternalError exception.\n"));
-          }
-        return false;
-      }
-    return true;
-  }
-
-  bool
-  Sender_exec_i::set_topic_name_updater (const char * topic_name)
-  {
-    try
-      {
-        ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::set_topic_name_updater - "
-                  "Setting topic to <%C>\n",
-                  topic_name));
-        ::TL_ResetTopic::TL_ResetTopicTestConnector:: Updater_var updater =
-          this->ciao_context_->get_connection_info_update_data ();
-        if (::CORBA::is_nil (updater.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - "
-                                  "Unable to get updater interface\n"));
-            return false;
-          }
-        ::CORBA::Object_var cmp = updater->_get_component ();
-        if (::CORBA::is_nil (cmp.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - "
-                                  "Unable to get component interface\n"));
-            return false;
-          }
-        ::TL_ResetTopic::TL_ResetTopicTestConnector::CCM_DDS_State_var conn =
-          ::TL_ResetTopic::TL_ResetTopicTestConnector::CCM_DDS_State::_narrow (cmp.in ());
-        if (::CORBA::is_nil (conn.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - "
-                                  "Unable to narrow connector interface\n"));
-            return false;
-          }
-        {
-          ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, guard, this->topic_name_lock_, false);
-          conn->topic_name (topic_name);
-        }
-        this->create_samples ();
-      }
-    catch (const ::CCM_DDS::NonChangeable &)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - "
-                    "Caught NonChangeable exception.\n"));
-        return false;
-      }
-    catch (const ::CCM_DDS::InternalError &)
-      {
-        if (ACE_OS::strlen (topic_name) > 256)
-          {
-            ACE_DEBUG ((LM_ERROR, "Sender_exec_i::set_topic_name_updater - "
-                      "Expected InternalErr exception caught.\n"));
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - "
-                      "Caught InternalError exception.\n"));
-          }
-        return false;
-      }
-    return true;
-  }
-
-  void
-  Sender_exec_i::start_event_test (void)
-  {
-    // Set the topic name on the connector first. Therefor we need to
-    // get to the connector first.
-    ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - Start\n"));
-
-    try
-      {
-        for (::CORBA::UShort key = 1; key < this->keys_ + 1; ++key)
-          {
-            TL_ResetTopicTest sample;
-            char tmp[7];
-            ACE_OS::sprintf (tmp, "KEY_%d", key);
-            sample.key = CORBA::string_dup(tmp);
-
-            for (::CORBA::UShort iter = 1; iter < this->iterations_ + 1; ++iter)
-              {
-                if (this->set_topic_name (this->topic_name_.c_str ()))
-                  {
-                    ::TL_ResetTopic::TL_ResetTopicTestConnector:: Writer_var writer =
-                      this->ciao_context_->get_connection_info_write_data ();
-                    sample.iteration = iter;
-
-                    writer->write_one (sample, ::DDS::HANDLE_NIL);
-
-                    ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - "
-                                "Sample for topic <%C> written : key <%C> - iteration <%d>\n",
-                                this->topic_name_.c_str (), tmp, iter));
-                  }
-
-                ACE_Time_Value tv (0, 5000);
-                ACE_OS::sleep (tv);
-              }
-          }
-        for (Sample_Table::iterator iter = this->tests_.begin ();
-            iter != this->tests_.end ();
-            ++iter)
-          {
-            for (::CORBA::UShort i = 1; i < this->iterations_ + 1; ++i)
-              {
-                if (this->set_topic_name (this->topic_name_.c_str ()))
-                  {
-                    ::TL_ResetTopic::TL_ResetTopicTestConnector:: Updater_var updater =
-                      this->ciao_context_->get_connection_info_update_data ();
-                    iter->second->iteration = i;
-                    updater->update_one (iter->second, ::DDS::HANDLE_NIL);
-
-                    ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - "
-                                "Sample for topic <%C> updated : key <%C> - iteration <%d>\n",
-                                this->topic_name_.c_str (),
-                                iter->second->key.in (),
-                                i));
-                  }
-
-                ACE_Time_Value tv (0, 5000);
-                ACE_OS::sleep (tv);
-              }
-          }
-      }
-    catch (const ::CORBA::BAD_INV_ORDER & ex)
-      {
-        if (this->topic_name_.empty())
-          ACE_DEBUG ((LM_DEBUG, "Expected BAD_INV_ORDER caught\n"));
-        else
-          ex._tao_print_exception("ERROR:");
-      }
-    catch (const ::CORBA::Exception & ex)
-      {
-        ex._tao_print_exception("ERROR:");
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "Sender_exec_i::start_event_test - "
-                    "ERROR: Unexpected and unknown exception caught.\n"));
-      }
-  }
-
-  // Component attributes and port operations.
-
-  ::CORBA::UShort
-  Sender_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::TL_ResetTopic::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-    this->create_samples ();
-    if (this->reactor ()->schedule_timer (
-                this->to_handler_,
-                0,
-                ACE_Time_Value (5, 0),
-                ACE_Time_Value (5, 0)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                              ACE_TEXT ("Error scheduling timer")));
-      }
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    this->reactor()->cancel_timer(this->to_handler_);
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_TL_ResetTopic_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender_exec.h
deleted file mode 100644
index 7d738c58864..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender_exec.h
+++ /dev/null
@@ -1,145 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_TL_RESETTOPIC_SENDER_EXEC_YSJ9S8_H_
-#define CIAO_TL_RESETTOPIC_SENDER_EXEC_YSJ9S8_H_
-
-#include /**/ "ace/pre.h"
-
-#include "TL_ResetTopic_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-#include <map>
-
-namespace CIAO_TL_ResetTopic_Sender_Impl
-{
-  class Sender_exec_i;
-
-  /**
-   * Timeout_Handler
-   */
-  class Timeout_Handler :
-    public ACE_Event_Handler
-  {
-  public:
-    Timeout_Handler (Sender_exec_i &callback);
-    /// Handle the timeout.
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    /// Maintains a handle that actually process the event
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-    virtual void set_new_topic (const char * topic_name);
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    bool set_topic_name (const char * topic_name);
-    bool set_topic_name_writer (const char * topic_name);
-    bool set_topic_name_updater (const char * topic_name);
-    void start_event_test (void);
-    //@}
-
-  private:
-    ::TL_ResetTopic::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-
-    ::CORBA::UShort iterations_;
-
-    ::CORBA::UShort keys_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    Timeout_Handler *to_handler_;
-    ACE_CString topic_name_, old_topic_name_;
-
-    TAO_SYNCH_RECURSIVE_MUTEX topic_name_lock_;
-
-    typedef std::map<ACE_CString, TL_ResetTopicTest_var> Sample_Table;
-
-    Sample_Table tests_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void create_samples (void);
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_TL_ResetTopic_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/descriptors/Plan.cdp
deleted file mode 100644
index df3801d2d1e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/descriptors/Plan.cdp
+++ /dev/null
@@ -1,338 +0,0 @@
-<!--  -->
-<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>ResetTopic_Depl_1</label>
-  <UUID>ResetTopic_Depl_1</UUID>
-
-  <implementation xmi:id="ResetTopic_EventConnectorImplementation">
-    <name>ResetTopic_EventConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="ResetTopic_Connector_ExecArtifact" />
-    <artifact xmi:idref="ResetTopic_Connector_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_TL_ResetTopic_TL_ResetTopicTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_TL_ResetTopic_TL_ResetTopicTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TL_ResetTopic_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TL_ResetTopic_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="ResetTopic_StateConnectorImplementation">
-    <name>ResetTopic_StateConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="ResetTopic_Connector_ExecArtifact" />
-    <artifact xmi:idref="ResetTopic_Connector_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_TL_ResetTopic_TL_ResetTopicTestConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_TL_ResetTopic_TL_ResetTopicTestConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TL_ResetTopic_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TL_ResetTopic_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_TL_ResetTopic_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_TL_ResetTopic_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="ResetTopic_SenderEventConnectorInstance">
-    <name>ResetTopic_SenderEventConnectorInstance</name>
-    <node>SenderNode</node>
-    <source/>
-    <implementation xmi:idref="ResetTopic_EventConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TopicI</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ResetTopic_SenderStateConnectorInstance">
-    <name>ResetTopic_SenderStateConnectorInstance</name>
-    <node>SenderNode</node>
-    <source/>
-    <implementation xmi:idref="ResetTopic_StateConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TopicI</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>15</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender.ior</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ResetTopic_SenderEventConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>updater_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_update_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>observable_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ResetTopic_SenderStateConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="ResetTopic_Connector_ExecArtifact">
-    <name>TL_ResetTopic_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>TL_ResetTopicConnector_exec</location>
-  </artifact>
-  <artifact xmi:id="ResetTopic_Connector_SvntArtifact">
-    <name>TL_ResetTopic_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>TL_ResetTopicConnector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/descriptors/run_test.pl
deleted file mode 100755
index 4bc6525e238..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/descriptors/run_test.pl
+++ /dev/null
@@ -1,264 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 1;
-@ports = ( 60001 );
-@iorbases = ( "SenderNode.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode" );
-
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 10 seconds before clearing the topic name\n";
-sleep (10);
-
-$S = $tg_executor->CreateProcess ("../lib/SenderDriver", "-e");
-$driver_status = $S->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-if ($driver_status != 0) {
-    print STDERR "ERROR: unable to launch driver\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Sleeping 10 seconds before setting the topic name again\n";
-sleep (10);
-
-$S = $tg_executor->CreateProcess ("../lib/SenderDriver", "-n ABCEDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789ABCEDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789ABCEDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789ABCEDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789ABCEDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789");
-$driver_status = $S->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-if ($driver_status != 0) {
-    print STDERR "ERROR: unable to launch driver\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Sleeping 30 seconds before stopping\n";
-sleep (30);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.idl
deleted file mode 100644
index 03998e8d565..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file UL_ResetTopic_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef UL_RESETTOPIC_BASE_IDL
-#define UL_RESETTOPIC_BASE_IDL
-
-#pragma ndds typesupport "Base/UL_ResetTopic_BaseSupport.h"
-#pragma opendds typesupport "Base/UL_ResetTopic_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "UL_ResetTopicTest"
-#pragma DCPS_DATA_KEY "UL_ResetTopicTest key"
-
-struct UL_ResetTopicTest {
-  string key; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<UL_ResetTopicTest> UL_ResetTopicTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.mpc
deleted file mode 100644
index 7fb1ef387eb..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (UL_ResetTopicBase_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = UL_ResetTopicBase_stub
-  dynamicflags += UL_RESETTOPIC_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=UL_RESETTOPIC_BASE_STUB_Export \
-              -Wb,stub_export_include=ResetTopic_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    UL_ResetTopic_Base.idl
-  }
-
-  opendds_ts_flags += --export=UL_RESETTOPIC_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    UL_ResetTopic_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.idl
deleted file mode 100644
index 0ecc3800915..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file UL_ResetTopic_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef UL_RESETTOPIC_CONNECTOR_IDL_
-#define UL_RESETTOPIC_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/UL_ResetTopic_Base.idl"
-
-#pragma ciao lem "Connector/UL_ResetTopic_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/UL_ResetTopic_BaseTypeSupport.idl"
-#endif
-
-module UL_ResetTopic
-{
-  module ::CCM_DDS::Typed < ::UL_ResetTopicTest, ::UL_ResetTopicTestSeq> UL_ResetTopicTestConnector;
-};
-
-#endif /* UL_ResetTopic_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.mpc
deleted file mode 100644
index b6886bbcf53..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.mpc
+++ /dev/null
@@ -1,146 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p UL_ResetTopicBase -l .. -o ../lib -u DDS UL_ResetTopic_Connector"
-
-project (UL_ResetTopicConnector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen UL_ResetTopicBase_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=UL_RESETTOPIC_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=ResetTopic_Connector_stub_export.h \
-              -Wb,skel_export_macro=UL_RESETTOPIC_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=ResetTopic_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=UL_RESETTOPIC_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=ResetTopic_Connector_svnt_export.h \
-              -Wb,conn_export_macro=UL_RESETTOPIC_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=ResetTopic_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    UL_ResetTopic_Connector.idl
-  }
-}
-
-project (UL_ResetTopicConnector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += UL_ResetTopicConnector_idl_gen
-  idlflags += -Wb,stub_export_macro=UL_RESETTOPIC_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=UL_ResetTopic_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    UL_ResetTopic_ConnectorE.idl
-  }
-}
-
-project (UL_ResetTopicConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += UL_ResetTopicConnector_lem_gen UL_ResetTopicConnector_stub \
-           UL_ResetTopicBase_stub
-  libs  += UL_ResetTopicBase_stub UL_ResetTopicConnector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = UL_ResetTopicConnector_lem_stub
-  dynamicflags += UL_RESETTOPIC_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    UL_ResetTopic_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    UL_ResetTopic_ConnectorEC.h
-    UL_ResetTopic_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    UL_ResetTopic_ConnectorEC.inl
-  }
-}
-
-project (UL_ResetTopicConnector_stub) : ccm_stub, dds4ccm_base {
-  after += UL_ResetTopicConnector_idl_gen UL_ResetTopicBase_stub
-  libs  += UL_ResetTopicBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = UL_ResetTopicConnector_stub
-  dynamicflags += UL_RESETTOPIC_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    UL_ResetTopic_ConnectorC.cpp
-  }
-
-  Header_Files {
-    UL_ResetTopic_ConnectorC.h
-    UL_ResetTopic_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    UL_ResetTopic_ConnectorC.inl
-  }
-}
-
-project (UL_ResetTopicConnector_exec) : ciao_executor, dds4ccm_impl {
-  after   += UL_ResetTopicConnector_lem_stub UL_ResetTopicConnector_stub \
-             UL_ResetTopicBase_stub
-  sharedname = UL_ResetTopicConnector_exec
-  libs += UL_ResetTopicConnector_stub UL_ResetTopicConnector_lem_stub \
-          UL_ResetTopicBase_stub UL_ResetTopicBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += UL_RESETTOPIC_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    UL_ResetTopic_Connector_conn.cpp
-  }
-
-  Header_Files {
-    UL_ResetTopic_Connector_conn.h
-    UL_ResetTopic_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project (UL_ResetTopicConnector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += UL_ResetTopicConnector_lem_stub UL_ResetTopicConnector_exec \
-                UL_ResetTopicConnector_stub
-  sharedname  = UL_ResetTopicConnector_svnt
-  libs       += UL_ResetTopicConnector_stub \
-                UL_ResetTopicConnector_lem_stub  \
-                UL_ResetTopicBase_stub \
-                UL_ResetTopicConnector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += UL_RESETTOPIC_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    UL_ResetTopic_ConnectorS.cpp
-    UL_ResetTopic_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    UL_ResetTopic_ConnectorS.h
-    UL_ResetTopic_Connector_svnt.h
-    UL_ResetTopic_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/ReceiverDriver.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/ReceiverDriver.cpp
deleted file mode 100644
index a73c5ac6764..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/ReceiverDriver.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * @file ReceiverDriver.cpp
- *
- * @author Marcel Smit
- */
-
-
-#include "UL_ResetTopic_ReceiverC.h"
-#include "ace/streams.h"
-#include "ace/Get_Opt.h"
-
-const ACE_TCHAR *receiver_ior = ACE_TEXT ("file://Receiver.ior");
-const ACE_TCHAR *topic_name = ACE_TEXT ("");
-
-int
-parse_args (int argc, ACE_TCHAR *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:n:"));
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    {
-      switch (c)
-        {
-          case 'k':
-            receiver_ior = get_opts.opt_arg ();
-            break;
-
-          case 'n':
-            topic_name = get_opts.opt_arg ();
-            break;
-
-          case '?':
-          default:
-            ACE_ERROR_RETURN ((LM_ERROR,
-                              "usage:  %s\n"
-                              "-k <Receiver IOR> (default is file://Receiver.ior)\n"
-                              "-n <new topic>\n"
-                              "\n",
-                              argv [0]),
-                              -1);
-        }
-    }
-
-  return 0;
-}
-
-
-int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
-{
-  try
-    {
-      // initialize the ORB
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv);
-      if (parse_args (argc, argv) != 0)
-        {
-          return -1;
-        }
-
-      // create the factory object reference,
-      CORBA::Object_var receiver_obj =
-        orb->string_to_object (receiver_ior);
-
-      // downcast the object reference to the appropriate type
-      ::UL_ResetTopic::Receiver_var receiver =
-        ::UL_ResetTopic::Receiver::_narrow (receiver_obj.in ());
-
-      if (CORBA::is_nil (receiver.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                            "Unable to acquire 'Receiver' objref\n"),
-                            -1);
-        }
-      receiver->set_new_topic (topic_name);
-
-      orb->destroy ();
-    }
-  catch (const CORBA::Exception& ex)
-    {
-      ex._tao_print_exception ("Who is the culprit in the ReceiverDriver?\n");
-      ACE_ERROR_RETURN ((LM_ERROR,
-                          "Uncaught CORBA exception\n"),
-                        1);
-    }
-  return 0;
-}
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.idl
deleted file mode 100644
index 425e76bcf0c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.idl
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/UL_ResetTopic_Connector.idl"
-
-module UL_ResetTopic
-{
-  interface ChangeTopicInterface
-  {
-    void set_new_topic (in string topic_name);
-  };
-
-  component Receiver supports ChangeTopicInterface
-  {
-    port UL_ResetTopicTestConnector::DDS_StateListen info_out_state;
-
-    attribute unsigned short iterations;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.mpc
deleted file mode 100644
index 355adcd4f08..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.mpc
+++ /dev/null
@@ -1,160 +0,0 @@
-project (UL_ResetTopicReceiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += UL_ResetTopicConnector_idl_gen
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h \
-              -I..
-  IDL_Files {
-    UL_ResetTopic_Receiver.idl
-  }
-}
-
-project (UL_ResetTopicReceiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += UL_ResetTopicReceiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    UL_ResetTopic_ReceiverE.idl
-  }
-}
-
-project (UL_ResetTopicReceiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += UL_ResetTopicReceiver_lem_gen UL_ResetTopicReceiver_stub  UL_ResetTopicConnector_stub UL_ResetTopicBase_stub
-  libs  +=  Receiver_stub UL_ResetTopicConnector_stub UL_ResetTopicBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    UL_ResetTopic_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    UL_ResetTopic_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    UL_ResetTopic_ReceiverEC.inl
-  }
-}
-
-project (UL_ResetTopicReceiver_stub) : ccm_stub, dds4ccm_base {
-  after += UL_ResetTopicReceiver_idl_gen  UL_ResetTopicConnector_stub UL_ResetTopicBase_stub UL_ResetTopicConnector_lem_gen
-  libs  += UL_ResetTopicConnector_stub UL_ResetTopicBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    UL_ResetTopic_ReceiverC.cpp
-  }
-
-  Header_Files {
-    UL_ResetTopic_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    UL_ResetTopic_ReceiverC.inl
-  }
-}
-
-project (UL_ResetTopicReceiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += UL_ResetTopicReceiver_lem_stub UL_ResetTopicReceiver_stub \
-             UL_ResetTopicBase_stub UL_ResetTopicConnector_stub \
-             UL_ResetTopicConnector_lem_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub UL_ResetTopicBase_stub \
-          UL_ResetTopicConnector_stub UL_ResetTopicConnector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    UL_ResetTopic_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    UL_ResetTopic_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project (UL_ResetTopicReceiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   UL_ResetTopicReceiver_lem_stub UL_ResetTopicBase_stub UL_ResetTopicConnector_stub UL_ResetTopicConnector_svnt UL_ResetTopicReceiver_exec UL_ResetTopicConnector_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub UL_ResetTopicBase_stub UL_ResetTopicConnector_stub UL_ResetTopicConnector_svnt Receiver_exec UL_ResetTopicConnector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    UL_ResetTopic_ReceiverS.cpp
-    UL_ResetTopic_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    UL_ResetTopic_ReceiverS.h
-    UL_ResetTopic_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-project (UL_ResetTopicReceiver_Driver) : ccm_stub, valuetype, dds4ccm_lem_stub {
-  exename = ReceiverDriver
-  after += UL_ResetTopicReceiver_stub UL_ResetTopicConnector_stub
-  libs  += Receiver_stub UL_ResetTopicBase_stub UL_ResetTopicConnector_stub
-
-  includes += ..
-  libpaths += ../lib
-
-  exeout = ../lib
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReceiverDriver.cpp
-  }
-
-  Header_Files {
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.cpp
deleted file mode 100644
index 0bc5cdedc51..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.cpp
+++ /dev/null
@@ -1,328 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.4
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "UL_ResetTopic_Receiver_exec.h"
-
-namespace CIAO_UL_ResetTopic_Receiver_Impl
-{
-
-  /**
-   * Facet Executor Implementation Class: info_out_state_data_listener_exec_i
-   */
-
-  info_out_state_data_listener_exec_i::info_out_state_data_listener_exec_i (
-        ::UL_ResetTopic::CCM_Receiver_Context_ptr ctx,
-        Atomic_Boolean &samples_received)
-    : ciao_context_ (
-        ::UL_ResetTopic::CCM_Receiver_Context::_duplicate (ctx))
-    , samples_received_(samples_received)
-  {
-  }
-
-  info_out_state_data_listener_exec_i::~info_out_state_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::UL_ResetTopic::UL_ResetTopicTestConnector::StateListener
-
-  void
-  info_out_state_data_listener_exec_i::on_creation (
-    const ::UL_ResetTopicTest & datum,
-    const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    ACE_DEBUG ((LM_DEBUG, "info_out_state_data_listener_exec_i::on_creation - "
-              "Sample <%C> created\n",
-              datum.key.in ()));
-  }
-
-  void
-  info_out_state_data_listener_exec_i::on_one_update (
-    const ::UL_ResetTopicTest & datum,
-    const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    this->samples_received_ = true;
-    ACE_DEBUG ((LM_DEBUG, "info_out_state_data_listener_exec_i::on_one_update - "
-              "Sample <%C> updated: <%u>\n",
-              datum.key.in (),
-              datum.iteration));
-  }
-
-  void
-  info_out_state_data_listener_exec_i::on_many_updates (
-    const ::UL_ResetTopicTestSeq & /* data */,
-    const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_state_data_listener_exec_i::on_deletion (
-    const ::UL_ResetTopicTest & /* datum */,
-    const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_state_status_exec_i
-   */
-
-  info_out_state_status_exec_i::info_out_state_status_exec_i (
-        ::UL_ResetTopic::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::UL_ResetTopic::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_state_status_exec_i::~info_out_state_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_out_state_status_exec_i::on_requested_deadline_missed (
-    ::DDS::DataReader_ptr /* the_reader */,
-    const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_state_status_exec_i::on_sample_lost (
-    ::DDS::DataReader_ptr /* the_reader */,
-    const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : iterations_ (0)
-    , samples_received_(false)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-  void
-  Receiver_exec_i::set_new_topic (::CORBA::Object_ptr cmp,
-                                  const char * topic_name)
-  {
-    if (::CORBA::is_nil (cmp))
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::set_topic_name_writer - "
-                              "Unable to get component interface\n"));
-        throw ::CORBA::INTERNAL ();
-      }
-    ::UL_ResetTopic::UL_ResetTopicTestConnector::CCM_DDS_State_var conn =
-      ::UL_ResetTopic::UL_ResetTopicTestConnector::CCM_DDS_State::_narrow (cmp);
-    if (::CORBA::is_nil (conn.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::set_topic_name_writer - "
-                              "Unable to narrow connector interface\n"));
-        throw ::CORBA::INTERNAL ();
-      }
-    conn->topic_name (topic_name);
-
-//     ::CCM_DDS::DataListenerControl_var dlc =
-//       this->ciao_context_->get_connection_info_out_event_data_control ();
-//     dlc->mode (::CCM_DDS::ONE_BY_ONE);
-  }
-
-  void
-  Receiver_exec_i::set_new_topic (const char * topic_name)
-  {
-    // The ReceiverDriver invokes this method. Therefor first check wether
-    // samples were received during last run
-
-    if (this->samples_received_.value())
-      ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::set_new_topic - "
-                  "OK, samples received during last run\n"));
-    else
-      ACE_ERROR ((LM_ERROR, "Receiver_exec_i::set_new_topic - "
-                  "ERROR: No samples received during last run\n"));
-
-    this->samples_received_ = false;
-
-    ::CORBA::Object_var cmp;
-    try
-      {
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::set_new_topic - "
-                  "Setting topic to <%C>\n",
-                  topic_name));
-        //First listener
-        ::UL_ResetTopic::UL_ResetTopicTestConnector::Reader_var reader =
-          this->ciao_context_->get_connection_info_out_state_data();
-
-        if (::CORBA::is_nil (reader.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::set_new_topic - "
-                                  "ciao_info_out_event_data_listener_ seems nil\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-        cmp = reader->_get_component ();
-        this->set_new_topic (cmp.in (), topic_name);
-
-        //next listener
-        if (::CORBA::is_nil (this->ciao_info_out_state_status_.in ()))
-          {
-            ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::set_new_topic - "
-                                  "ciao_info_out_event_status_ seems nil\n"));
-          }
-        else
-          {
-            cmp = this->ciao_info_out_state_status_->_get_component ();
-            this->set_new_topic (cmp.in (), topic_name);
-          }
-      }
-    catch (const ::CCM_DDS::NonChangeable &)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::set_topic_name_writer - "
-                    "Caught NonChangeable exception.\n"));
-      }
-  }
-
-  // Component attributes and port operations.
-
-  ::UL_ResetTopic::UL_ResetTopicTestConnector::CCM_StateListener_ptr
-  Receiver_exec_i::get_info_out_state_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_state_data_listener_.in ()))
-      {
-        info_out_state_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_state_data_listener_exec_i (
-            this->ciao_context_.in (),
-            this->samples_received_),
-            ::UL_ResetTopic::UL_ResetTopicTestConnector::CCM_StateListener::_nil ());
-
-          this->ciao_info_out_state_data_listener_ = tmp;
-      }
-
-    return
-      ::UL_ResetTopic::UL_ResetTopicTestConnector::CCM_StateListener::_duplicate (
-        this->ciao_info_out_state_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_state_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_state_status_.in ()))
-      {
-        info_out_state_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_state_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_out_state_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_out_state_status_.in ());
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Receiver_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::UL_ResetTopic::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    ::CCM_DDS::StateListenerControl_var dlc =
-      this->ciao_context_->get_connection_info_out_state_data_control ();
-    dlc->mode (::CCM_DDS::ONE_BY_ONE);
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    if (this->samples_received_.value())
-      ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_remove - "
-                  "OK, samples received during last run\n"));
-    else
-      ACE_ERROR ((LM_ERROR, "Receiver_exec_i::ccm_remove - "
-                  "ERROR: No samples received during last run\n"));
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_UL_ResetTopic_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.h
deleted file mode 100644
index 34eae95bef7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.h
+++ /dev/null
@@ -1,197 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.4
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_UL_RESETTOPIC_RECEIVER_EXEC_WHDIFX_H_
-#define CIAO_UL_RESETTOPIC_RECEIVER_EXEC_WHDIFX_H_
-
-#include /**/ "ace/pre.h"
-
-#include "UL_ResetTopic_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_UL_ResetTopic_Receiver_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean> Atomic_Boolean;
-
-  /**
-   * Provider Executor Implementation Class: info_out_state_data_listener_exec_i
-   */
-
-  class info_out_state_data_listener_exec_i
-    : public virtual ::UL_ResetTopic::UL_ResetTopicTestConnector::CCM_StateListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_state_data_listener_exec_i (
-      ::UL_ResetTopic::CCM_Receiver_Context_ptr ctx,
-      Atomic_Boolean &samples_received);
-    virtual ~info_out_state_data_listener_exec_i (void);
-
-    /** @name Operations and attributes from UL_ResetTopic::UL_ResetTopicTestConnector::StateListener */
-    //@{
-
-    virtual
-    void on_creation (
-      const ::UL_ResetTopicTest & datum,
-      const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_one_update (
-      const ::UL_ResetTopicTest & datum,
-      const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_updates (
-      const ::UL_ResetTopicTestSeq & data,
-      const ::CCM_DDS::ReadInfoSeq & infos);
-
-    virtual
-    void on_deletion (
-      const ::UL_ResetTopicTest & datum,
-      const ::CCM_DDS::ReadInfo & info);
-    //@}
-
-  private:
-    ::UL_ResetTopic::CCM_Receiver_Context_var ciao_context_;
-    Atomic_Boolean &samples_received_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_state_status_exec_i
-   */
-
-  class info_out_state_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_state_status_exec_i (
-      ::UL_ResetTopic::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_state_status_exec_i (void);
-
-    /** @name Operations and attributes from CCM_DDS::PortStatusListener */
-    //@{
-
-    virtual
-    void on_requested_deadline_missed (
-      ::DDS::DataReader_ptr the_reader,
-      const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (
-      ::DDS::DataReader_ptr the_reader,
-      const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::UL_ResetTopic::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    /** @name Supported operations and attributes. */
-    //@{
-
-    virtual void set_new_topic (
-      const char * topic_name);
-
-    //@}
-
-    /** @name Component attributes and port operations. */
-    //@{
-
-    virtual ::UL_ResetTopic::UL_ResetTopicTestConnector::CCM_StateListener_ptr
-    get_info_out_state_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_state_status (void);
-
-    virtual ::CORBA::UShort iterations (
-      void);
-
-    virtual void iterations (
-      ::CORBA::UShort iterations);
-    //@}
-
-    /** @name Operations from Components::SessionComponent. */
-    //@{
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    /** @name User defined public operations. */
-    //@{
-
-    //@}
-
-  private:
-    ::UL_ResetTopic::CCM_Receiver_Context_var ciao_context_;
-
-    /** @name Component attributes. */
-    //@{
-    ::UL_ResetTopic::UL_ResetTopicTestConnector::CCM_StateListener_var ciao_info_out_state_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_state_status_;
-
-    ::CORBA::UShort iterations_;
-    //@}
-
-    /** @name User defined members. */
-    //@{
-    Atomic_Boolean samples_received_;
-    //@}
-
-    /** @name User defined private operations. */
-    //@{
-    void set_new_topic (::CORBA::Object_ptr cmp,
-                        const char * topic_name);
-
-    //@}
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_UL_ResetTopic_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/SenderDriver.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/SenderDriver.cpp
deleted file mode 100644
index 3002014b755..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/SenderDriver.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * @file SenderDriver.cpp
- *
- * @author Marcel Smit
- */
-
-
-#include "UL_ResetTopic_SenderC.h"
-#include "ace/streams.h"
-#include "ace/Get_Opt.h"
-
-const ACE_TCHAR *sender_ior = ACE_TEXT ("file://Sender.ior");
-const ACE_TCHAR *topic_name = ACE_TEXT ("");
-
-int
-parse_args (int argc, ACE_TCHAR *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:n:"));
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    {
-      switch (c)
-        {
-          case 'k':
-            sender_ior = get_opts.opt_arg ();
-            break;
-
-          case 'n':
-            topic_name = get_opts.opt_arg ();
-            break;
-
-          case '?':
-          default:
-            ACE_ERROR_RETURN ((LM_ERROR,
-                              "usage:  %s\n"
-                              "-k <Sender IOR> (default is file://Sender.ior)\n"
-                              "-n <new topic>\n"
-                              "\n",
-                              argv [0]),
-                              -1);
-        }
-    }
-
-  return 0;
-}
-
-
-int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
-{
-  try
-    {
-      // initialize the ORB
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv);
-      if (parse_args (argc, argv) != 0)
-        {
-          return -1;
-        }
-
-      // create the factory object reference,
-      CORBA::Object_var sender_obj =
-        orb->string_to_object (sender_ior);
-
-      // downcast the object reference to the appropriate type
-      ::UL_ResetTopic::Sender_var sender =
-        ::UL_ResetTopic::Sender::_narrow (sender_obj.in ());
-
-      if (CORBA::is_nil (sender.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                            "Unable to acquire 'Sender' objref\n"),
-                            -1);
-        }
-      sender->set_new_topic (topic_name);
-
-      orb->destroy ();
-    }
-  catch (const CORBA::Exception& ex)
-    {
-      ex._tao_print_exception ("Who is the culprit in the SenderDriver?\n");
-      ACE_ERROR_RETURN ((LM_ERROR,
-                          "Uncaught CORBA exception\n"),
-                        1);
-    }
-  return 0;
-}
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.idl
deleted file mode 100644
index 75d64b30c42..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.idl
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef UL_RESETTOPIC_SENDER_IDL
-#define UL_RESETTOPIC_SENDER_IDL
-
-#include "Connector/UL_ResetTopic_Connector.idl"
-
-module UL_ResetTopic
-{
-  interface ChangeTopicInterface
-  {
-    void set_new_topic (in string topic_name);
-  };
-
-  component Sender supports ChangeTopicInterface
-  {
-    port UL_ResetTopicTestConnector::DDS_Update info_update;
-
-    attribute unsigned short iterations;
-    attribute unsigned short keys;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.mpc
deleted file mode 100644
index 075fc8ad784..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.mpc
+++ /dev/null
@@ -1,164 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p UL_ResetTopicBase -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project (UL_ResetTopicSender_idl_gen) : componentidldefaults, dds4ccm {
-  after += UL_ResetTopicConnector_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I ..
-
-  IDL_Files {
-    UL_ResetTopic_Sender.idl
-  }
-}
-
-project (UL_ResetTopicSender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += UL_ResetTopicSender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    UL_ResetTopic_SenderE.idl
-  }
-}
-
-project (UL_ResetTopicSender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += UL_ResetTopicSender_lem_gen UL_ResetTopicSender_stub UL_ResetTopicBase_stub
-  libs  += UL_ResetTopicBase_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    UL_ResetTopic_SenderEC.cpp
-  }
-
-  Header_Files {
-    UL_ResetTopic_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    UL_ResetTopic_SenderEC.inl
-  }
-}
-
-project (UL_ResetTopicSender_stub) : ccm_stub, dds4ccm_base {
-  after += UL_ResetTopicSender_idl_gen UL_ResetTopicBase_stub UL_ResetTopicConnector_stub
-  libs  += UL_ResetTopicBase_stub UL_ResetTopicConnector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    UL_ResetTopic_SenderC.cpp
-  }
-
-  Header_Files {
-    UL_ResetTopic_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    UL_ResetTopic_SenderC.inl
-  }
-}
-
-project (UL_ResetTopicSender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += UL_ResetTopicSender_lem_stub UL_ResetTopicSender_stub \
-             UL_ResetTopicConnector_lem_stub UL_ResetTopicConnector_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub UL_ResetTopicBase_stub \
-          UL_ResetTopicConnector_lem_stub UL_ResetTopicConnector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    UL_ResetTopic_Sender_exec.cpp
-  }
-
-  Header_Files {
-    UL_ResetTopic_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project (UL_ResetTopicSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += UL_ResetTopicBase_stub  UL_ResetTopicSender_lem_stub UL_ResetTopicConnector_stub \
-                UL_ResetTopicConnector_svnt UL_ResetTopicConnector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                UL_ResetTopicBase_stub UL_ResetTopicConnector_stub UL_ResetTopicConnector_svnt UL_ResetTopicConnector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    UL_ResetTopic_SenderS.cpp
-    UL_ResetTopic_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    UL_ResetTopic_SenderS.h
-    UL_ResetTopic_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-project (UL_ResetTopicSender_Driver) : ccm_stub, valuetype, dds4ccm_lem_stub {
-  exename = SenderDriver
-  after += UL_ResetTopicSender_stub UL_ResetTopicConnector_stub
-  libs  += Sender_stub UL_ResetTopicBase_stub UL_ResetTopicConnector_stub
-
-  includes += ..
-  libpaths += ../lib
-
-  exeout = ../lib
-  IDL_Files {
-  }
-
-  Source_Files {
-    SenderDriver.cpp
-  }
-
-  Header_Files {
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender_exec.cpp
deleted file mode 100644
index f3fea603736..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender_exec.cpp
+++ /dev/null
@@ -1,333 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "UL_ResetTopic_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_UL_ResetTopic_Sender_Impl
-{
-
-  /**
-   * Timeout_Handler
-   */
-
-  Timeout_Handler::Timeout_Handler (Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  Timeout_Handler::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    // Notify the subscribers
-    this->callback_.start_event_test ();
-    return 0;
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : iterations_ (0)
-    , keys_ (0)
-    , to_handler_ (0)
-    , topic_name_ ("TopicI")
-    , old_topic_name_ ("TopicI")
-    {
-     ACE_NEW_THROW_EX (this->to_handler_,
-                       Timeout_Handler (*this),
-                       ::CORBA::INTERNAL ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->to_handler_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void Sender_exec_i::create_samples (void)
-  {
-    ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, _guard,
-                      this->keys_lock_);
-
-    for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i)
-      {
-        char key[7];
-        UL_ResetTopicTest *new_key = new UL_ResetTopicTest;
-        ACE_OS::sprintf (key, "KEY_%d", i);
-        new_key->key = CORBA::string_dup(key);
-        new_key->iteration = 0;
-        this->tests_[key] = new_key;
-
-        ::UL_ResetTopic::UL_ResetTopicTestConnector::Updater_var updater =
-          this->ciao_context_->get_connection_info_update_data();
-
-        updater->create_one (*new_key);
-        ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::create_samples - "
-                  "Sample <%C> created\n",
-                  key));
-      }
-    this->last_key_ = this->tests_.begin ();
-  }
-
-  void Sender_exec_i::set_new_topic (const char * topic_name)
-  {
-    ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, guard, this->topic_name_lock_);
-
-    this->old_topic_name_ = this->topic_name_;
-    this->topic_name_ = topic_name;
-    ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::set_new_topic - "
-              "New topic name set <%C>\n",
-              topic_name));
-  }
-
-  void
-  Sender_exec_i::set_topic_name_updater (const char * topic_name)
-  {
-    try
-      {
-        if (ACE_OS::strcmp (topic_name, this->old_topic_name_.c_str()) != 0)
-          {
-            ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::set_topic_name_updater - "
-                      "Setting topic to <%C>\n",
-                      topic_name));
-            this->old_topic_name_ = topic_name;
-            ::UL_ResetTopic::UL_ResetTopicTestConnector:: Updater_var updater =
-              this->ciao_context_->get_connection_info_update_data ();
-            if (::CORBA::is_nil (updater.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - "
-                                      "Unable to get updater interface\n"));
-                throw ::CORBA::INTERNAL ();
-              }
-            ::CORBA::Object_var cmp = updater->_get_component ();
-            if (::CORBA::is_nil (cmp.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - "
-                                      "Unable to get component interface\n"));
-                throw ::CORBA::INTERNAL ();
-              }
-            ::UL_ResetTopic::UL_ResetTopicTestConnector::CCM_DDS_State_var conn =
-              ::UL_ResetTopic::UL_ResetTopicTestConnector::CCM_DDS_State::_narrow (cmp.in ());
-            if (::CORBA::is_nil (conn.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - "
-                                      "Unable to narrow connector interface\n"));
-                throw ::CORBA::INTERNAL ();
-              }
-            {
-              ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, guard, this->topic_name_lock_);
-              conn->topic_name (topic_name);
-            }
-            this->create_samples ();
-          }
-      }
-    catch (const ::CCM_DDS::NonChangeable &)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - "
-                    "Caught NonChangeable exception.\n"));
-      }
-  }
-
-  void
-  Sender_exec_i::start_event_test (void)
-  {
-    // Set the topic name on the connector first. Therefor we need to
-    // get to the connector first.
-    ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - Start\n"));
-    try
-      {
-        if (this->last_key_ != this->tests_.end ())
-          {
-            try
-              {
-                this->set_topic_name_updater (this->topic_name_.c_str ());
-                ::UL_ResetTopic::UL_ResetTopicTestConnector:: Updater_var updater =
-                  this->ciao_context_->get_connection_info_update_data ();
-
-                {
-                  ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, guard, this->keys_lock_)
-                  ++this->last_key_->second->iteration;
-                  updater->update_one (this->last_key_->second, ::DDS::HANDLE_NIL);
-
-                  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Updated key <%C> with <%d>\n"),
-                          this->last_key_->first.c_str (),
-                          this->last_key_->second->iteration));
-                }
-              }
-            catch (const CCM_DDS::InternalError& )
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR: Internal Error while writing KeyedTest info for <%C>.\n",
-                            this->last_key_->first.c_str ()));
-              }
-            {
-              ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, guard, this->keys_lock_)
-              ++this->last_key_;
-            }
-          }
-        else
-          {
-            // Onto the next iteration
-            {
-              ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, guard, this->keys_lock_)
-              this->last_key_ = this->tests_.begin ();
-              while (this->last_key_ != this->tests_.end ())
-                {
-                  if (this->last_key_->second->iteration == this->iterations_)
-                    {
-                      ++this->last_key_;
-                    }
-                  else
-                    {
-                      break;
-                    }
-                }
-            }
-          }
-      }
-    catch (const ::CORBA::Exception & ex)
-      {
-        ex._tao_print_exception("ERROR:");
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "Sender_exec_i::start_event_test - "
-                    "ERROR: Unexpected and unknown exception caught.\n"));
-      }
-  }
-
-  // Component attributes and port operations.
-
-  ::CORBA::UShort
-  Sender_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::UL_ResetTopic::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-    this->create_samples ();
-
-    if (this->reactor ()->schedule_timer (
-                this->to_handler_,
-                0,
-                ACE_Time_Value (2, 0),
-                ACE_Time_Value (0, 500000)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                              ACE_TEXT ("Error scheduling timer")));
-      }
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    this->reactor()->cancel_timer(this->to_handler_);
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_UL_ResetTopic_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender_exec.h
deleted file mode 100644
index ed846ae064d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender_exec.h
+++ /dev/null
@@ -1,146 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_UL_RESETTOPIC_SENDER_EXEC_YSJ9S8_H_
-#define CIAO_UL_RESETTOPIC_SENDER_EXEC_YSJ9S8_H_
-
-#include /**/ "ace/pre.h"
-
-#include "UL_ResetTopic_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-#include <map>
-
-namespace CIAO_UL_ResetTopic_Sender_Impl
-{
-  class Sender_exec_i;
-
-  /**
-   * Timeout_Handler
-   */
-  class Timeout_Handler :
-    public ACE_Event_Handler
-  {
-  public:
-    Timeout_Handler (Sender_exec_i &callback);
-    /// Handle the timeout.
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    /// Maintains a handle that actually process the event
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-    virtual void set_new_topic (const char * topic_name);
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void set_topic_name_updater (const char * topic_name);
-    void start_event_test (void);
-    //@}
-
-  private:
-    ::UL_ResetTopic::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-
-    ::CORBA::UShort iterations_;
-
-    ::CORBA::UShort keys_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    Timeout_Handler *to_handler_;
-    ACE_CString topic_name_, old_topic_name_;
-
-    TAO_SYNCH_RECURSIVE_MUTEX topic_name_lock_;
-    TAO_SYNCH_RECURSIVE_MUTEX keys_lock_;
-
-    typedef std::map<ACE_CString, UL_ResetTopicTest_var> Sample_Table;
-
-    Sample_Table tests_;
-    Sample_Table::iterator last_key_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void create_samples (void);
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_UL_ResetTopic_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/descriptors/Plan.cdp
deleted file mode 100644
index 0098998a7b1..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/descriptors/Plan.cdp
+++ /dev/null
@@ -1,407 +0,0 @@
-<!--  -->
-<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>ResetTopic_Depl_1</label>
-  <UUID>ResetTopic_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_UL_ResetTopic_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_UL_ResetTopic_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="ResetTopic_StateConnectorImplementation">
-    <name>ResetTopic_StateConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="ResetTopic_Connector_ExecArtifact" />
-    <artifact xmi:idref="ResetTopic_Connector_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_UL_ResetTopic_UL_ResetTopicTestConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_UL_ResetTopic_UL_ResetTopicTestConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>UL_ResetTopic_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>UL_ResetTopic_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_UL_ResetTopic_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_UL_ResetTopic_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver.ior</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ResetTopic_SenderStateConnectorInstance">
-    <name>ResetTopic_SenderStateConnectorInstance</name>
-    <node>SenderNode</node>
-    <source/>
-    <implementation xmi:idref="ResetTopic_StateConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TopicI</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ResetTopic_ReceiverStateConnectorInstance">
-    <name>ResetTopic_ReceiverStateConnectorInstance</name>
-    <node>ReceiverNode</node>
-    <source/>
-    <implementation xmi:idref="ResetTopic_StateConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TopicI</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>15</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender.ior</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>state_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_state_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ResetTopic_ReceiverStateConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>state_reader_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_state_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ResetTopic_ReceiverStateConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>state_datacontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_state_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ResetTopic_ReceiverStateConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>updater_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_update_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>observable_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ResetTopic_SenderStateConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="ResetTopic_Connector_ExecArtifact">
-    <name>UL_ResetTopic_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>UL_ResetTopicConnector_exec</location>
-  </artifact>
-  <artifact xmi:id="ResetTopic_Connector_SvntArtifact">
-    <name>UL_ResetTopic_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>UL_ResetTopicConnector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/descriptors/run_test.pl
deleted file mode 100755
index e5226a3129f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/descriptors/run_test.pl
+++ /dev/null
@@ -1,280 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "ReceiverNode.ior", "SenderNode.ior" );
-@iorfiles = 0;
-@nodenames = ( "ReceiverNode", "SenderNode" );
-
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 10 seconds before changing topic name\n";
-sleep (10);
-
-$R = $tg_executor->CreateProcess ("../lib/ReceiverDriver", "-n TopicII");
-$driver_status = $R->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-if ($driver_status != 0) {
-    print STDERR "ERROR: unable to launch driver\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$S = $tg_executor->CreateProcess ("../lib/SenderDriver", "-n TopicII");
-$driver_status = $S->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-if ($driver_status != 0) {
-    print STDERR "ERROR: unable to launch driver\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Sleeping 10 seconds before changing topic name\n";
-sleep (10);
-
-$R = $tg_executor->CreateProcess ("../lib/ReceiverDriver", "-n TopicIII");
-$driver_status = $R->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-if ($driver_status != 0) {
-    print STDERR "ERROR: unable to launch driver\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$S = $tg_executor->CreateProcess ("../lib/SenderDriver", "-n TopicIII");
-$driver_status = $S->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-if ($driver_status != 0) {
-    print STDERR "ERROR: unable to launch driver\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Sleeping 10 seconds before stopping\n";
-sleep (10);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.idl
deleted file mode 100644
index 45311782947..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file WL_ResetTopic_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef WL_RESETTOPIC_BASE_IDL
-#define WL_RESETTOPIC_BASE_IDL
-
-#pragma ndds typesupport "Base/WL_ResetTopic_BaseSupport.h"
-#pragma opendds typesupport "Base/WL_ResetTopic_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "WL_ResetTopicTest"
-#pragma DCPS_DATA_KEY "WL_ResetTopicTest key"
-
-struct WL_ResetTopicTest {
-  string key; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<WL_ResetTopicTest> WL_ResetTopicTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.mpc
deleted file mode 100644
index 6ab7e88772c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (WL_ResetTopicBase_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = WL_ResetTopicBase_stub
-  dynamicflags += WL_RESETTOPIC_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=WL_RESETTOPIC_BASE_STUB_Export \
-              -Wb,stub_export_include=ResetTopic_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    WL_ResetTopic_Base.idl
-  }
-
-  opendds_ts_flags += --export=WL_RESETTOPIC_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    WL_ResetTopic_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.idl
deleted file mode 100644
index 83381d74410..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file WL_ResetTopic_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef WL_RESETTOPIC_CONNECTOR_IDL_
-#define WL_RESETTOPIC_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/WL_ResetTopic_Base.idl"
-
-#pragma ciao lem "Connector/WL_ResetTopic_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/WL_ResetTopic_BaseTypeSupport.idl"
-#endif
-
-module WL_ResetTopic
-{
-  module ::CCM_DDS::Typed < ::WL_ResetTopicTest, ::WL_ResetTopicTestSeq> WL_ResetTopicTestConnector;
-};
-
-#endif /* WL_ResetTopic_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.mpc
deleted file mode 100644
index dfaa2301b8e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.mpc
+++ /dev/null
@@ -1,146 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p WL_ResetTopicBase -l .. -o ../lib -u DDS WL_ResetTopic_Connector"
-
-project (WL_ResetTopicConnector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen WL_ResetTopicBase_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=WL_RESETTOPIC_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=ResetTopic_Connector_stub_export.h \
-              -Wb,skel_export_macro=WL_RESETTOPIC_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=ResetTopic_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=WL_RESETTOPIC_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=ResetTopic_Connector_svnt_export.h \
-              -Wb,conn_export_macro=WL_RESETTOPIC_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=ResetTopic_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    WL_ResetTopic_Connector.idl
-  }
-}
-
-project (WL_ResetTopicConnector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += WL_ResetTopicConnector_idl_gen
-  idlflags += -Wb,stub_export_macro=WL_RESETTOPIC_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=WL_ResetTopic_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    WL_ResetTopic_ConnectorE.idl
-  }
-}
-
-project (WL_ResetTopicConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += WL_ResetTopicConnector_lem_gen WL_ResetTopicConnector_stub \
-           WL_ResetTopicBase_stub
-  libs  += WL_ResetTopicBase_stub WL_ResetTopicConnector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = WL_ResetTopicConnector_lem_stub
-  dynamicflags += WL_RESETTOPIC_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    WL_ResetTopic_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    WL_ResetTopic_ConnectorEC.h
-    WL_ResetTopic_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    WL_ResetTopic_ConnectorEC.inl
-  }
-}
-
-project (WL_ResetTopicConnector_stub) : ccm_stub, dds4ccm_base {
-  after += WL_ResetTopicConnector_idl_gen WL_ResetTopicBase_stub
-  libs  += WL_ResetTopicBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = WL_ResetTopicConnector_stub
-  dynamicflags += WL_RESETTOPIC_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    WL_ResetTopic_ConnectorC.cpp
-  }
-
-  Header_Files {
-    WL_ResetTopic_ConnectorC.h
-    WL_ResetTopic_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    WL_ResetTopic_ConnectorC.inl
-  }
-}
-
-project (WL_ResetTopicConnector_exec) : ciao_executor, dds4ccm_impl {
-  after   += WL_ResetTopicConnector_lem_stub WL_ResetTopicConnector_stub \
-             WL_ResetTopicBase_stub
-  sharedname = WL_ResetTopicConnector_exec
-  libs += WL_ResetTopicConnector_stub WL_ResetTopicConnector_lem_stub \
-          WL_ResetTopicBase_stub WL_ResetTopicBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += WL_RESETTOPIC_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    WL_ResetTopic_Connector_conn.cpp
-  }
-
-  Header_Files {
-    WL_ResetTopic_Connector_conn.h
-    WL_ResetTopic_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project (WL_ResetTopicConnector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += WL_ResetTopicConnector_lem_stub WL_ResetTopicConnector_exec \
-                WL_ResetTopicConnector_stub
-  sharedname  = WL_ResetTopicConnector_svnt
-  libs       += WL_ResetTopicConnector_stub \
-                WL_ResetTopicConnector_lem_stub  \
-                WL_ResetTopicBase_stub \
-                WL_ResetTopicConnector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += WL_RESETTOPIC_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    WL_ResetTopic_ConnectorS.cpp
-    WL_ResetTopic_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    WL_ResetTopic_ConnectorS.h
-    WL_ResetTopic_Connector_svnt.h
-    WL_ResetTopic_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/ReceiverDriver.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/ReceiverDriver.cpp
deleted file mode 100644
index de62aa77ca1..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/ReceiverDriver.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * @file ReceiverDriver.cpp
- *
- * @author Marcel Smit
- */
-
-
-#include "WL_ResetTopic_ReceiverC.h"
-#include "ace/streams.h"
-#include "ace/Get_Opt.h"
-
-const ACE_TCHAR *receiver_ior = ACE_TEXT ("file://Receiver.ior");
-const ACE_TCHAR *topic_name = ACE_TEXT ("");
-
-int
-parse_args (int argc, ACE_TCHAR *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:n:"));
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    {
-      switch (c)
-        {
-          case 'k':
-            receiver_ior = get_opts.opt_arg ();
-            break;
-
-          case 'n':
-            topic_name = get_opts.opt_arg ();
-            break;
-
-          case '?':
-          default:
-            ACE_ERROR_RETURN ((LM_ERROR,
-                              "usage:  %s\n"
-                              "-k <Receiver IOR> (default is file://Receiver.ior)\n"
-                              "-n <new topic>\n"
-                              "\n",
-                              argv [0]),
-                              -1);
-        }
-    }
-
-  return 0;
-}
-
-
-int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
-{
-  try
-    {
-      // initialize the ORB
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv);
-      if (parse_args (argc, argv) != 0)
-        {
-          return -1;
-        }
-
-      // create the factory object reference,
-      CORBA::Object_var receiver_obj =
-        orb->string_to_object (receiver_ior);
-
-      // downcast the object reference to the appropriate type
-      ::WL_ResetTopic::Receiver_var receiver =
-        ::WL_ResetTopic::Receiver::_narrow (receiver_obj.in ());
-
-      if (CORBA::is_nil (receiver.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                            "Unable to acquire 'Receiver' objref\n"),
-                            -1);
-        }
-      receiver->set_new_topic (topic_name);
-
-      orb->destroy ();
-    }
-  catch (const CORBA::Exception& ex)
-    {
-      ex._tao_print_exception ("Who is the culprit in the ReceiverDriver?\n");
-      ACE_ERROR_RETURN ((LM_ERROR,
-                          "Uncaught CORBA exception\n"),
-                        1);
-    }
-  return 0;
-}
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.idl
deleted file mode 100644
index 0fe968e46ea..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.idl
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/WL_ResetTopic_Connector.idl"
-
-module WL_ResetTopic
-{
-  interface ChangeTopicInterface
-  {
-    void set_new_topic (in string topic_name);
-  };
-
-  component Receiver supports ChangeTopicInterface
-  {
-    port WL_ResetTopicTestConnector::DDS_Listen info_out_event;
-
-    attribute unsigned short iterations;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.mpc
deleted file mode 100644
index e23097f342f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.mpc
+++ /dev/null
@@ -1,160 +0,0 @@
-project (WL_ResetTopicReceiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += WL_ResetTopicConnector_idl_gen
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h \
-              -I..
-  IDL_Files {
-    WL_ResetTopic_Receiver.idl
-  }
-}
-
-project (WL_ResetTopicReceiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += WL_ResetTopicReceiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    WL_ResetTopic_ReceiverE.idl
-  }
-}
-
-project (WL_ResetTopicReceiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += WL_ResetTopicReceiver_lem_gen WL_ResetTopicReceiver_stub  WL_ResetTopicConnector_stub WL_ResetTopicBase_stub
-  libs  +=  Receiver_stub WL_ResetTopicConnector_stub WL_ResetTopicBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    WL_ResetTopic_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    WL_ResetTopic_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    WL_ResetTopic_ReceiverEC.inl
-  }
-}
-
-project (WL_ResetTopicReceiver_stub) : ccm_stub, dds4ccm_base {
-  after += WL_ResetTopicReceiver_idl_gen  WL_ResetTopicConnector_stub WL_ResetTopicBase_stub WL_ResetTopicConnector_lem_gen
-  libs  += WL_ResetTopicConnector_stub WL_ResetTopicBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    WL_ResetTopic_ReceiverC.cpp
-  }
-
-  Header_Files {
-    WL_ResetTopic_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    WL_ResetTopic_ReceiverC.inl
-  }
-}
-
-project (WL_ResetTopicReceiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += WL_ResetTopicReceiver_lem_stub WL_ResetTopicReceiver_stub \
-             WL_ResetTopicBase_stub WL_ResetTopicConnector_stub \
-             WL_ResetTopicConnector_lem_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub WL_ResetTopicBase_stub \
-          WL_ResetTopicConnector_stub WL_ResetTopicConnector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    WL_ResetTopic_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    WL_ResetTopic_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project (WL_ResetTopicReceiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   WL_ResetTopicReceiver_lem_stub WL_ResetTopicBase_stub WL_ResetTopicConnector_stub WL_ResetTopicConnector_svnt WL_ResetTopicReceiver_exec WL_ResetTopicConnector_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub WL_ResetTopicBase_stub WL_ResetTopicConnector_stub WL_ResetTopicConnector_svnt Receiver_exec WL_ResetTopicConnector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    WL_ResetTopic_ReceiverS.cpp
-    WL_ResetTopic_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    WL_ResetTopic_ReceiverS.h
-    WL_ResetTopic_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-project (WL_ResetTopicReceiver_Driver) : ccm_stub, valuetype, dds4ccm_lem_stub {
-  exename = ReceiverDriver
-  after += WL_ResetTopicReceiver_stub WL_ResetTopicConnector_stub
-  libs  += Receiver_stub WL_ResetTopicBase_stub WL_ResetTopicConnector_stub
-
-  includes += ..
-  libpaths += ../lib
-
-  exeout = ../lib
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReceiverDriver.cpp
-  }
-
-  Header_Files {
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.cpp
deleted file mode 100644
index 58eb1380560..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.cpp
+++ /dev/null
@@ -1,307 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "WL_ResetTopic_Receiver_exec.h"
-#include "dds4ccm/impl/logger/Log_Macros.h"
-
-namespace CIAO_WL_ResetTopic_Receiver_Impl
-{
-
-  /**
-   * Facet Executor Implementation Class: info_out_event_data_listener_exec_i
-   */
-
-  info_out_event_data_listener_exec_i::info_out_event_data_listener_exec_i (
-        ::WL_ResetTopic::CCM_Receiver_Context_ptr ctx,
-        Atomic_Boolean &samples_received)
-    : ciao_context_ (
-        ::WL_ResetTopic::CCM_Receiver_Context::_duplicate (ctx))
-    , samples_received_(samples_received)
-  {
-  }
-
-  info_out_event_data_listener_exec_i::~info_out_event_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::WL_ResetTopic::WL_ResetTopicTestConnector::Listener
-
-  void
-  info_out_event_data_listener_exec_i::on_one_data (const ::WL_ResetTopicTest & datum,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    this->samples_received_ = true;
-    ACE_DEBUG ((LM_ERROR, ACE_TEXT ("info_out_event_data_listener_exec_i::on_one_data - ")
-            ACE_TEXT ("received data for <%C> at %u\n"),
-            datum.key.in (),
-            datum.iteration));
-  }
-
-  void
-  info_out_event_data_listener_exec_i::on_many_data (const ::WL_ResetTopicTestSeq & /* data */,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    ACE_ERROR ((LM_ERROR, "info_out_event_data_listener_exec_i::on_many_data : "
-                          "Error: No callback to this method expected.\n"));
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_event_status_exec_i
-   */
-
-  info_out_event_status_exec_i::info_out_event_status_exec_i (
-        ::WL_ResetTopic::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::WL_ResetTopic::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_event_status_exec_i::~info_out_event_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_out_event_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_event_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : iterations_ (0)
-    , samples_received_(0)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-  void
-  Receiver_exec_i::set_new_topic (::CORBA::Object_ptr cmp,
-                                  const char * topic_name)
-  {
-    if (::CORBA::is_nil (cmp))
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::set_topic_name_writer - "
-                              "Unable to get component interface\n"));
-        throw ::CORBA::INTERNAL ();
-      }
-    ::WL_ResetTopic::WL_ResetTopicTestConnector::CCM_DDS_Event_var conn =
-      ::WL_ResetTopic::WL_ResetTopicTestConnector::CCM_DDS_Event::_narrow (cmp);
-    if (::CORBA::is_nil (conn.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::set_topic_name_writer - "
-                              "Unable to narrow connector interface\n"));
-        throw ::CORBA::INTERNAL ();
-      }
-    conn->topic_name (topic_name);
-
-//     ::CCM_DDS::DataListenerControl_var dlc =
-//       this->ciao_context_->get_connection_info_out_event_data_control ();
-//     dlc->mode (::CCM_DDS::ONE_BY_ONE);
-  }
-
-  void
-  Receiver_exec_i::set_new_topic (const char * topic_name)
-  {
-
-    if (this->samples_received_.value())
-      ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::set_new_topic - "
-                  "OK, samples received during last run\n"));
-    else
-      ACE_ERROR ((LM_ERROR, "Receiver_exec_i::set_new_topic - "
-                  "ERROR: No samples received during last run\n"));
-
-    this->samples_received_ = false;
-
-    ::CORBA::Object_var cmp;
-    try
-      {
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::set_new_topic - "
-                  "Setting topic to <%C>\n",
-                  topic_name));
-        //First listener
-        ::WL_ResetTopic::WL_ResetTopicTestConnector::Reader_var reader =
-          this->ciao_context_->get_connection_info_out_event_data();
-
-        if (::CORBA::is_nil (reader.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::set_new_topic - "
-                                  "ciao_info_out_event_data_listener_ seems nil\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-        cmp = reader->_get_component ();
-        this->set_new_topic (cmp.in (), topic_name);
-
-        //next listener
-        if (::CORBA::is_nil (this->ciao_info_out_event_status_.in ()))
-          {
-            ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::set_new_topic - "
-                                  "ciao_info_out_event_status_ seems nil\n"));
-          }
-        else
-          {
-            cmp = this->ciao_info_out_event_status_->_get_component ();
-            this->set_new_topic (cmp.in (), topic_name);
-          }
-      }
-    catch (const ::CCM_DDS::NonChangeable &)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::set_topic_name_writer - "
-                    "Caught NonChangeable exception.\n"));
-      }
-  }
-
-  // Component attributes and port operations.
-
-  ::WL_ResetTopic::WL_ResetTopicTestConnector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_out_event_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_event_data_listener_.in ()))
-      {
-        info_out_event_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_event_data_listener_exec_i (
-            this->ciao_context_.in (),
-            this->samples_received_),
-            ::WL_ResetTopic::WL_ResetTopicTestConnector::CCM_Listener::_nil ());
-
-          this->ciao_info_out_event_data_listener_ = tmp;
-      }
-
-    return
-      ::WL_ResetTopic::WL_ResetTopicTestConnector::CCM_Listener::_duplicate (
-        this->ciao_info_out_event_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_event_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_event_status_.in ()))
-      {
-        info_out_event_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_event_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_out_event_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_out_event_status_.in ());
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Receiver_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::WL_ResetTopic::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    ::CCM_DDS::DataListenerControl_var dlc =
-      this->ciao_context_->get_connection_info_out_event_data_control ();
-    dlc->mode (::CCM_DDS::ONE_BY_ONE);
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    if (this->samples_received_.value())
-      ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_remove - "
-                  "OK, samples received during last run\n"));
-    else
-      ACE_ERROR ((LM_ERROR, "Receiver_exec_i::ccm_remove - "
-                  "ERROR: No samples received during last run\n"));
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_WL_ResetTopic_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.h
deleted file mode 100644
index c56d34e8355..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.h
+++ /dev/null
@@ -1,179 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_WL_RESETTOPIC_RECEIVER_EXEC_KKU0OW_H_
-#define CIAO_WL_RESETTOPIC_RECEIVER_EXEC_KKU0OW_H_
-
-#include /**/ "ace/pre.h"
-
-#include "WL_ResetTopic_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_WL_ResetTopic_Receiver_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean> Atomic_Boolean;
-
-  /**
-   * Provider Executor Implementation Class: info_out_event_data_listener_exec_i
-   */
-
-  class info_out_event_data_listener_exec_i
-    : public virtual ::WL_ResetTopic::WL_ResetTopicTestConnector::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_event_data_listener_exec_i (
-      ::WL_ResetTopic::CCM_Receiver_Context_ptr ctx,
-      Atomic_Boolean &samples_received);
-    virtual ~info_out_event_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from WL_ResetTopic::WL_ResetTopicTestConnector::Listener. */
-
-    virtual
-    void on_one_data (const ::WL_ResetTopicTest & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (const ::WL_ResetTopicTestSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    ::WL_ResetTopic::CCM_Receiver_Context_var ciao_context_;
-    Atomic_Boolean &samples_received_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_event_status_exec_i
-   */
-
-  class info_out_event_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_event_status_exec_i (
-      ::WL_ResetTopic::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_event_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::WL_ResetTopic::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-    virtual void set_new_topic (const char * topic_name);
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::WL_ResetTopic::WL_ResetTopicTestConnector::CCM_Listener_ptr
-    get_info_out_event_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_event_status (void);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-
-    //@}
-
-  private:
-    ::WL_ResetTopic::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::WL_ResetTopic::WL_ResetTopicTestConnector::CCM_Listener_var ciao_info_out_event_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_event_status_;
-
-    ::CORBA::UShort iterations_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    Atomic_Boolean samples_received_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void set_new_topic (::CORBA::Object_ptr cmp,
-      const char * topic_name);
-
-    //@}
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_WL_ResetTopic_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/SenderDriver.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/SenderDriver.cpp
deleted file mode 100644
index b55e57cb764..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/SenderDriver.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * @file SenderDriver.cpp
- *
- * @author Marcel Smit
- */
-
-
-#include "WL_ResetTopic_SenderC.h"
-#include "ace/streams.h"
-#include "ace/Get_Opt.h"
-
-const ACE_TCHAR *sender_ior = ACE_TEXT ("file://Sender.ior");
-const ACE_TCHAR *topic_name = ACE_TEXT ("");
-
-int
-parse_args (int argc, ACE_TCHAR *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:n:"));
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    {
-      switch (c)
-        {
-          case 'k':
-            sender_ior = get_opts.opt_arg ();
-            break;
-
-          case 'n':
-            topic_name = get_opts.opt_arg ();
-            break;
-
-          case '?':
-          default:
-            ACE_ERROR_RETURN ((LM_ERROR,
-                              "usage:  %s\n"
-                              "-k <Sender IOR> (default is file://Sender.ior)\n"
-                              "-n <new topic>\n"
-                              "\n",
-                              argv [0]),
-                              -1);
-        }
-    }
-
-  return 0;
-}
-
-
-int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
-{
-  try
-    {
-      // initialize the ORB
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv);
-      if (parse_args (argc, argv) != 0)
-        {
-          return -1;
-        }
-
-      // create the factory object reference,
-      CORBA::Object_var sender_obj =
-        orb->string_to_object (sender_ior);
-
-      // downcast the object reference to the appropriate type
-      ::WL_ResetTopic::Sender_var sender =
-        ::WL_ResetTopic::Sender::_narrow (sender_obj.in ());
-
-      if (CORBA::is_nil (sender.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                            "Unable to acquire 'Sender' objref\n"),
-                            -1);
-        }
-      sender->set_new_topic (topic_name);
-
-      orb->destroy ();
-    }
-  catch (const CORBA::Exception& ex)
-    {
-      ex._tao_print_exception ("Who is the culprit in the SenderDriver?\n");
-      ACE_ERROR_RETURN ((LM_ERROR,
-                          "Uncaught CORBA exception\n"),
-                        1);
-    }
-  return 0;
-}
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.idl
deleted file mode 100644
index 171dbbea554..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.idl
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef WL_RESETTOPIC_SENDER_IDL
-#define WL_RESETTOPIC_SENDER_IDL
-
-#include "Connector/WL_ResetTopic_Connector.idl"
-
-module WL_ResetTopic
-{
-  interface ChangeTopicInterface
-  {
-    void set_new_topic (in string topic_name);
-  };
-
-  component Sender supports ChangeTopicInterface
-  {
-    port WL_ResetTopicTestConnector::DDS_Write  info_write;
-
-    attribute unsigned short iterations;
-    attribute unsigned short keys;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.mpc
deleted file mode 100644
index 717058be581..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.mpc
+++ /dev/null
@@ -1,164 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p WL_ResetTopicBase -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project (WL_ResetTopicSender_idl_gen) : componentidldefaults, dds4ccm {
-  after += WL_ResetTopicConnector_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I ..
-
-  IDL_Files {
-    WL_ResetTopic_Sender.idl
-  }
-}
-
-project (WL_ResetTopicSender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += WL_ResetTopicSender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    WL_ResetTopic_SenderE.idl
-  }
-}
-
-project (WL_ResetTopicSender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += WL_ResetTopicSender_lem_gen WL_ResetTopicSender_stub WL_ResetTopicBase_stub
-  libs  += WL_ResetTopicBase_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    WL_ResetTopic_SenderEC.cpp
-  }
-
-  Header_Files {
-    WL_ResetTopic_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    WL_ResetTopic_SenderEC.inl
-  }
-}
-
-project (WL_ResetTopicSender_stub) : ccm_stub, dds4ccm_base {
-  after += WL_ResetTopicSender_idl_gen WL_ResetTopicBase_stub WL_ResetTopicConnector_stub
-  libs  += WL_ResetTopicBase_stub WL_ResetTopicConnector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    WL_ResetTopic_SenderC.cpp
-  }
-
-  Header_Files {
-    WL_ResetTopic_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    WL_ResetTopic_SenderC.inl
-  }
-}
-
-project (WL_ResetTopicSender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += WL_ResetTopicSender_lem_stub WL_ResetTopicSender_stub \
-             WL_ResetTopicConnector_lem_stub WL_ResetTopicConnector_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub WL_ResetTopicBase_stub \
-          WL_ResetTopicConnector_lem_stub WL_ResetTopicConnector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    WL_ResetTopic_Sender_exec.cpp
-  }
-
-  Header_Files {
-    WL_ResetTopic_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project (WL_ResetTopicSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += WL_ResetTopicBase_stub  WL_ResetTopicSender_lem_stub WL_ResetTopicConnector_stub \
-                WL_ResetTopicConnector_svnt WL_ResetTopicConnector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                WL_ResetTopicBase_stub WL_ResetTopicConnector_stub WL_ResetTopicConnector_svnt WL_ResetTopicConnector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    WL_ResetTopic_SenderS.cpp
-    WL_ResetTopic_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    WL_ResetTopic_SenderS.h
-    WL_ResetTopic_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-project (WL_ResetTopicSender_Driver) : ccm_stub, valuetype, dds4ccm_lem_stub {
-  exename = SenderDriver
-  after += WL_ResetTopicSender_stub WL_ResetTopicConnector_stub
-  libs  += Sender_stub WL_ResetTopicBase_stub WL_ResetTopicConnector_stub
-
-  includes += ..
-  libpaths += ../lib
-
-  exeout = ../lib
-  IDL_Files {
-  }
-
-  Source_Files {
-    SenderDriver.cpp
-  }
-
-  Header_Files {
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender_exec.cpp
deleted file mode 100644
index 5e189c86fce..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender_exec.cpp
+++ /dev/null
@@ -1,281 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "WL_ResetTopic_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_WL_ResetTopic_Sender_Impl
-{
-
-  /**
-   * Timeout_Handler
-   */
-
-  Timeout_Handler::Timeout_Handler (Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  Timeout_Handler::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    // Notify the subscribers
-    this->callback_.start_event_test ();
-    return 0;
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : iterations_ (0)
-    , keys_ (0)
-    , to_handler_ (0)
-    , topic_name_ ("TopicI")
-    , old_topic_name_ ("TopicI")
-    {
-     ACE_NEW_THROW_EX (this->to_handler_,
-                       Timeout_Handler (*this),
-                       ::CORBA::INTERNAL ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->to_handler_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void Sender_exec_i::set_new_topic (const char * topic_name)
-  {
-    ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, guard, this->topic_name_lock_);
-
-    this->old_topic_name_ = this->topic_name_;
-    this->topic_name_ = topic_name;
-    ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::set_new_topic - "
-              "New topic name set <%C>\n",
-              topic_name));
-  }
-
-  void
-  Sender_exec_i::set_topic_name_writer (const char * topic_name)
-  {
-    try
-      {
-        if (ACE_OS::strcmp (topic_name, this->old_topic_name_.c_str()) != 0)
-          {
-            ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::set_topic_name_writer - "
-                      "Setting topic to <%C>\n",
-                      topic_name));
-            this->old_topic_name_ = topic_name;
-            ::WL_ResetTopic::WL_ResetTopicTestConnector:: Writer_var writer =
-              this->ciao_context_->get_connection_info_write_data ();
-            if (::CORBA::is_nil (writer.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - "
-                                      "Unable to get writer interface\n"));
-                throw ::CORBA::INTERNAL ();
-              }
-            ::CORBA::Object_var cmp = writer->_get_component ();
-            if (::CORBA::is_nil (cmp.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - "
-                                      "Unable to get component interface\n"));
-                throw ::CORBA::INTERNAL ();
-              }
-            ::WL_ResetTopic::WL_ResetTopicTestConnector::CCM_DDS_Event_var conn =
-              ::WL_ResetTopic::WL_ResetTopicTestConnector::CCM_DDS_Event::_narrow (cmp.in ());
-            if (::CORBA::is_nil (conn.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - "
-                                      "Unable to narrow connector interface\n"));
-                throw ::CORBA::INTERNAL ();
-              }
-            {
-              ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, guard, this->topic_name_lock_);
-              conn->topic_name (topic_name);
-            }
-          }
-      }
-    catch (const ::CCM_DDS::NonChangeable &)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - "
-                    "Caught NonChangeable exception.\n"));
-      }
-  }
-
-  void
-  Sender_exec_i::start_event_test (void)
-  {
-    // Set the topic name on the connector first. Therefor we need to
-    // get to the connector first.
-    ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - Start\n"));
-    try
-      {
-        for (::CORBA::UShort key = 1; key < this->keys_ + 1; ++key)
-          {
-            WL_ResetTopicTest sample;
-            char tmp[7];
-            ACE_OS::sprintf (tmp, "KEY_%d", key);
-            sample.key = CORBA::string_dup(tmp);
-
-            for (::CORBA::UShort iter = 1; iter < this->iterations_ + 1; ++iter)
-              {
-                this->set_topic_name_writer (this->topic_name_.c_str ());
-                ::WL_ResetTopic::WL_ResetTopicTestConnector:: Writer_var writer =
-                  this->ciao_context_->get_connection_info_write_data ();
-                sample.iteration = iter;
-                writer->write_one (sample, ::DDS::HANDLE_NIL);
-
-                ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - "
-                            "Sample for topic <%C> written : key <%C> - iteration <%d>\n",
-                            this->topic_name_.c_str (), tmp, iter));
-
-                ACE_Time_Value tv (0, 50000);
-                ACE_OS::sleep (tv);
-              }
-          }
-      }
-    catch (const ::CORBA::Exception & ex)
-      {
-        ex._tao_print_exception("ERROR:");
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "Sender_exec_i::start_event_test - "
-                    "ERROR: Unexpected and unknown exception caught.\n"));
-      }
-  }
-
-  // Component attributes and port operations.
-
-  ::CORBA::UShort
-  Sender_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::WL_ResetTopic::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-    if (this->reactor ()->schedule_timer (
-                this->to_handler_,
-                0,
-                ACE_Time_Value (5, 0),
-                ACE_Time_Value (5, 0)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                              ACE_TEXT ("Error scheduling timer")));
-      }
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    this->reactor()->cancel_timer(this->to_handler_);
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_WL_ResetTopic_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender_exec.h
deleted file mode 100644
index f7669e80f33..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender_exec.h
+++ /dev/null
@@ -1,137 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_WL_RESETTOPIC_SENDER_EXEC_YSJ9S8_H_
-#define CIAO_WL_RESETTOPIC_SENDER_EXEC_YSJ9S8_H_
-
-#include /**/ "ace/pre.h"
-
-#include "WL_ResetTopic_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_WL_ResetTopic_Sender_Impl
-{
-  class Sender_exec_i;
-
-  /**
-   * Timeout_Handler
-   */
-  class Timeout_Handler :
-    public ACE_Event_Handler
-  {
-  public:
-    Timeout_Handler (Sender_exec_i &callback);
-    /// Handle the timeout.
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    /// Maintains a handle that actually process the event
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-    virtual void set_new_topic (const char * topic_name);
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void set_topic_name_writer (const char * topic_name);
-    void start_event_test (void);
-    //@}
-
-  private:
-    ::WL_ResetTopic::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-
-    ::CORBA::UShort iterations_;
-
-    ::CORBA::UShort keys_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    Timeout_Handler *to_handler_;
-    ACE_CString topic_name_, old_topic_name_;
-
-    TAO_SYNCH_RECURSIVE_MUTEX topic_name_lock_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_WL_ResetTopic_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/descriptors/Plan.cdp
deleted file mode 100644
index 392974a1999..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/descriptors/Plan.cdp
+++ /dev/null
@@ -1,407 +0,0 @@
-<!--  -->
-<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>ResetTopic_Depl_1</label>
-  <UUID>ResetTopic_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_WL_ResetTopic_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_WL_ResetTopic_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="ResetTopic_EventConnectorImplementation">
-    <name>ResetTopic_EventConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="ResetTopic_Connector_ExecArtifact" />
-    <artifact xmi:idref="ResetTopic_Connector_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_WL_ResetTopic_WL_ResetTopicTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_WL_ResetTopic_WL_ResetTopicTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>WL_ResetTopic_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>WL_ResetTopic_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_WL_ResetTopic_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_WL_ResetTopic_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver.ior</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ResetTopic_SenderEventConnectorInstance">
-    <name>ResetTopic_SenderEventConnectorInstance</name>
-    <node>SenderNode</node>
-    <source/>
-    <implementation xmi:idref="ResetTopic_EventConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TopicI</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ResetTopic_ReceiverEventConnectorInstance">
-    <name>ResetTopic_ReceiverEventConnectorInstance</name>
-    <node>ReceiverNode</node>
-    <source/>
-    <implementation xmi:idref="ResetTopic_EventConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TopicI</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>15</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender.ior</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>event_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_event_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ResetTopic_ReceiverEventConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>event_reader_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_event_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ResetTopic_ReceiverEventConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>event_datacontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_event_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ResetTopic_ReceiverEventConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ResetTopic_SenderEventConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="ResetTopic_Connector_ExecArtifact">
-    <name>WL_ResetTopic_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>WL_ResetTopicConnector_exec</location>
-  </artifact>
-  <artifact xmi:id="ResetTopic_Connector_SvntArtifact">
-    <name>WL_ResetTopic_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>WL_ResetTopicConnector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/descriptors/run_test.pl
deleted file mode 100755
index e5226a3129f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/descriptors/run_test.pl
+++ /dev/null
@@ -1,280 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "ReceiverNode.ior", "SenderNode.ior" );
-@iorfiles = 0;
-@nodenames = ( "ReceiverNode", "SenderNode" );
-
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 10 seconds before changing topic name\n";
-sleep (10);
-
-$R = $tg_executor->CreateProcess ("../lib/ReceiverDriver", "-n TopicII");
-$driver_status = $R->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-if ($driver_status != 0) {
-    print STDERR "ERROR: unable to launch driver\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$S = $tg_executor->CreateProcess ("../lib/SenderDriver", "-n TopicII");
-$driver_status = $S->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-if ($driver_status != 0) {
-    print STDERR "ERROR: unable to launch driver\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Sleeping 10 seconds before changing topic name\n";
-sleep (10);
-
-$R = $tg_executor->CreateProcess ("../lib/ReceiverDriver", "-n TopicIII");
-$driver_status = $R->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-if ($driver_status != 0) {
-    print STDERR "ERROR: unable to launch driver\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$S = $tg_executor->CreateProcess ("../lib/SenderDriver", "-n TopicIII");
-$driver_status = $S->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-if ($driver_status != 0) {
-    print STDERR "ERROR: unable to launch driver\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Sleeping 10 seconds before stopping\n";
-sleep (10);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/.gitignore b/CIAO/connectors/dds4ccm/tests/SLDisabled/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl b/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl
deleted file mode 100644
index 61d37f5f4e4..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file   SL_Disabled_Base.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef SL_DISABLED_BASE_IDL
-#define SL_DISABLED_BASE_IDL
-
-#pragma ndds typesupport "Base/SL_Disabled_BaseSupport.h"
-#pragma opendds typesupport "Base/SL_Disabled_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "TestTopic"
-#pragma DCPS_DATA_KEY "TestTopic key"
-
-struct TestTopic {
-  string key; //@key
-  long x;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TestTopic> TestTopicSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc b/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc
deleted file mode 100644
index 4a1f4bb1c09..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_SL_Disabled_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_SL_Disabled_Base_stub
-  dynamicflags += SL_DISABLED_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=SL_DISABLED_BASE_STUB_Export \
-              -Wb,stub_export_include=SL_Disabled_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    SL_Disabled_Base.idl
-  }
-
-  opendds_ts_flags += --export=SL_DISABLED_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    SL_Disabled_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.idl b/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.idl
deleted file mode 100644
index 5db5f544e3e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file SL_Disabled_Connector.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef SL_DISABLED_CONNECTOR_IDL_
-#define SL_DISABLED_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/SL_Disabled_Base.idl"
-
-#pragma ciao lem "Connector/SL_Disabled_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/SL_Disabled_BaseTypeSupport.idl"
-#endif
-
-module SL_Disabled
-{
-  module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> SL_DisabledConnector;
-};
-
-#endif /* SL_Disabled_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc b/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc
deleted file mode 100644
index a3d3a95c921..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_SL_Disabled_Base -l .. -o ../lib -u DDS SL_Disabled_Connector"
-
-project(DDS_SL_OC_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_SL_Disabled_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SL_DISABLED_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=SL_Disabled_Connector_stub_export.h \
-              -Wb,skel_export_macro=SL_DISABLED_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=SL_Disabled_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=SL_DISABLED_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=SL_Disabled_Connector_svnt_export.h \
-              -Wb,conn_export_macro=SL_DISABLED_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=SL_Disabled_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    SL_Disabled_Connector.idl
-  }
-}
-
-project(DDS_SL_OC_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_SL_OC_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=SL_DISABLED_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=SL_Disabled_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    SL_Disabled_ConnectorE.idl
-  }
-}
-
-project(DDS_SL_OC_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_SL_OC_Connector_lem_gen DDS_SL_Disabled_Connector_stub DDS_SL_Disabled_Base_stub
-  libs  += DDS_SL_Disabled_Base_stub DDS_SL_Disabled_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_SL_OC_Connector_lem_stub
-  dynamicflags += SL_DISABLED_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_Disabled_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    SL_Disabled_ConnectorEC.h
-    SL_Disabled_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    SL_Disabled_ConnectorEC.inl
-  }
-}
-
-project(DDS_SL_Disabled_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_SL_OC_Connector_idl_gen DDS_SL_Disabled_Base_stub
-  libs  += DDS_SL_Disabled_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_SL_Disabled_Connector_stub
-  dynamicflags += SL_DISABLED_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_Disabled_ConnectorC.cpp
-  }
-
-  Header_Files {
-    SL_Disabled_ConnectorC.h
-    SL_Disabled_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    SL_Disabled_ConnectorC.inl
-  }
-}
-
-project(DDS_SL_Disabled_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_SL_OC_Connector_lem_stub DDS_SL_Disabled_Connector_stub DDS_SL_Disabled_Base_stub
-  sharedname = DDS_SL_Disabled_Connector_exec
-  libs += DDS_SL_Disabled_Connector_stub DDS_SL_OC_Connector_lem_stub DDS_SL_Disabled_Base_stub DDS_SL_Disabled_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SL_DISABLED_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_Disabled_Connector_conn.cpp
-  }
-
-  Header_Files {
-    SL_Disabled_Connector_conn.h
-    SL_Disabled_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_SL_Disabled_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_SL_OC_Connector_lem_stub DDS_SL_Disabled_Connector_exec DDS_SL_Disabled_Connector_stub
-  sharedname  = DDS_SL_Disabled_Connector_svnt
-  libs       += DDS_SL_Disabled_Connector_stub \
-                DDS_SL_OC_Connector_lem_stub  \
-                DDS_SL_Disabled_Base_stub \
-                DDS_SL_Disabled_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SL_DISABLED_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_Disabled_ConnectorS.cpp
-    SL_Disabled_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    SL_Disabled_ConnectorS.h
-    SL_Disabled_Connector_svnt.h
-    SL_Disabled_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.idl b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.idl
deleted file mode 100644
index 4863c6e2d01..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @file
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/SL_Disabled_Connector.idl"
-
-module SL_Disabled
-{
-  component Receiver
-  {
-    port SL_DisabledConnector::DDS_StateListen info_out;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc
deleted file mode 100644
index 18d20c311a0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc
+++ /dev/null
@@ -1,136 +0,0 @@
-project(DDS_SL_Disabled_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_SL_OC_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h \
-              -I..
-
-  IDL_Files {
-    SL_Disabled_Receiver.idl
-  }
-}
-
-project(DDS_SL_Disabled_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_SL_Disabled_Receiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    SL_Disabled_ReceiverE.idl
-  }
-}
-
-project(DDS_SL_OC_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_SL_Disabled_Receiver_lem_gen DDS_SL_Disabled_Receiver_stub  DDS_SL_Disabled_Connector_stub DDS_SL_Disabled_Base_stub
-  libs  +=  Receiver_stub DDS_SL_Disabled_Connector_stub DDS_SL_Disabled_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_Disabled_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    SL_Disabled_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    SL_Disabled_ReceiverEC.inl
-  }
-}
-
-project(DDS_SL_Disabled_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_SL_Disabled_Receiver_idl_gen  DDS_SL_Disabled_Connector_stub DDS_SL_Disabled_Base_stub DDS_SL_OC_Connector_lem_gen
-  libs  += DDS_SL_Disabled_Connector_stub DDS_SL_Disabled_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_Disabled_ReceiverC.cpp
-  }
-
-  Header_Files {
-    SL_Disabled_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    SL_Disabled_ReceiverC.inl
-  }
-}
-
-project(DDS_SL_Disabled_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_SL_OC_Receiver_lem_stub DDS_SL_Disabled_Receiver_stub DDS_SL_Disabled_Base_stub DDS_SL_Disabled_Connector_stub DDS_SL_OC_Connector_lem_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_SL_Disabled_Base_stub DDS_SL_Disabled_Connector_stub DDS_SL_OC_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_Disabled_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    SL_Disabled_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_SL_Disabled_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_SL_OC_Receiver_lem_stub DDS_SL_Disabled_Base_stub DDS_SL_Disabled_Connector_stub DDS_SL_Disabled_Connector_svnt DDS_SL_Disabled_Receiver_exec DDS_SL_OC_Connector_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_SL_Disabled_Base_stub DDS_SL_Disabled_Connector_stub DDS_SL_Disabled_Connector_svnt Receiver_exec DDS_SL_OC_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_Disabled_ReceiverS.cpp
-    SL_Disabled_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    SL_Disabled_ReceiverS.h
-    SL_Disabled_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp
deleted file mode 100644
index 0143a7785e9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp
+++ /dev/null
@@ -1,247 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "SL_Disabled_Receiver_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-#include "ace/OS_NS_time.h"
-#include "dds4ccm/impl/TimeUtilities.h"
-
-#define SAMPLES_EXPECTED 3
-
-namespace CIAO_SL_Disabled_Receiver_Impl
-{
-
-  /**
-   * Facet Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  info_out_data_listener_exec_i::info_out_data_listener_exec_i (
-        ::SL_Disabled::CCM_Receiver_Context_ptr ctx,
-        Atomic_Long & no_operation)
-    : ciao_context_ (
-        ::SL_Disabled::CCM_Receiver_Context::_duplicate (ctx))
-      , no_operation_ (no_operation)
-  {
-  }
-
-  info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::SL_Disabled::SL_DisabledConnector::StateListener
-
-  void
-  info_out_data_listener_exec_i::on_creation (const ::TestTopic & /* datum */,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    ++this->no_operation_;
-  }
-
-  void
-  info_out_data_listener_exec_i::on_one_update (const ::TestTopic & /* datum */,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    ++this->no_operation_;
-  }
-
-  void
-  info_out_data_listener_exec_i::on_many_updates (const ::TestTopicSeq & /* data */,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    ++this->no_operation_;
-  }
-
-  void
-  info_out_data_listener_exec_i::on_deletion (const ::TestTopic & /* datum */,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    ++this->no_operation_;
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_status_exec_i
-   */
-
-  info_out_status_exec_i::info_out_status_exec_i (
-        ::SL_Disabled::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::SL_Disabled::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_status_exec_i::~info_out_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : no_operation_ (0)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-  // Component attributes and port operations.
-
-  ::SL_Disabled::SL_DisabledConnector::CCM_StateListener_ptr
-  Receiver_exec_i::get_info_out_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ()))
-      {
-        info_out_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_data_listener_exec_i (
-            this->ciao_context_.in (),
-            this->no_operation_),
-            ::SL_Disabled::SL_DisabledConnector::CCM_StateListener::_nil ());
-
-          this->ciao_info_out_data_listener_ = tmp;
-      }
-
-    return
-      ::SL_Disabled::SL_DisabledConnector::CCM_StateListener::_duplicate (
-        this->ciao_info_out_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ()))
-      {
-        info_out_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_out_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_out_status_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::SL_Disabled::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    ::CCM_DDS::StateListenerControl_var lc =
-    this->ciao_context_->get_connection_info_out_data_control ();
-
-    if (::CORBA::is_nil (lc.in ()))
-      {
-         ACE_ERROR ((LM_INFO, ACE_TEXT ("Error:  Listener control receptacle is null!\n")));
-        throw ::CORBA::INTERNAL ();
-      }
-
-    lc->mode (::CCM_DDS::NOT_ENABLED);
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    if (this->no_operation_.value () > 0)
-      {
-
-         ACE_ERROR ((LM_ERROR,
-                     ACE_TEXT ("ERROR: Received an unexpected ")
-                     ACE_TEXT (" operation. StateListener doesn't work in Receiver\n")
-                    ));
-      }
-
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("OK : Haven't received an  unexpected ")
-                    ACE_TEXT (" operation from StateListener in Receiver\n")
-                   ));
-      }
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_SL_Disabled_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h
deleted file mode 100644
index d6020151dea..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h
+++ /dev/null
@@ -1,181 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_SL_DISABLED_RECEIVER_EXEC_WIX3WI_H_
-#define CIAO_SL_DISABLED_RECEIVER_EXEC_WIX3WI_H_
-
-#include /**/ "ace/pre.h"
-
-#include "SL_Disabled_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_SL_Disabled_Receiver_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Long > Atomic_Long;
-
-  class Receiver_exec_i;
-
-  /**
-   * Provider Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  class info_out_data_listener_exec_i
-    : public virtual ::SL_Disabled::SL_DisabledConnector::CCM_StateListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_data_listener_exec_i (
-      ::SL_Disabled::CCM_Receiver_Context_ptr ctx,
-      Atomic_Long &);
-    virtual ~info_out_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from SL_Disabled::SL_DisabledConnector::StateListener. */
-
-    virtual
-    void on_creation (const ::TestTopic & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_one_update (const ::TestTopic & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_updates (const ::TestTopicSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-
-    virtual
-    void on_deletion (const ::TestTopic & datum,
-    const ::CCM_DDS::ReadInfo & info);
-    //@}
-
-  private:
-    ::SL_Disabled::CCM_Receiver_Context_var ciao_context_;
-     Atomic_Long & no_operation_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_status_exec_i
-   */
-
-  class info_out_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_status_exec_i (
-      ::SL_Disabled::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::SL_Disabled::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::SL_Disabled::SL_DisabledConnector::CCM_StateListener_ptr
-    get_info_out_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_status (void);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    //@}
-
-  private:
-    ::SL_Disabled::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::SL_Disabled::SL_DisabledConnector::CCM_StateListener_var ciao_info_out_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    Atomic_Long no_operation_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_SL_Disabled_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.idl b/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.idl
deleted file mode 100644
index 3bf7d29b082..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef DDS_SL_DISABLED_SENDER_IDL
-#define DDS_SL_DISABLED_SENDER_IDL
-
-#include "Connector/SL_Disabled_Connector.idl"
-
-module SL_Disabled
-{
-  component Sender
-  {
-    port SL_DisabledConnector::DDS_Update test_topic_update;
-    provides CCM_DDS::ConnectorStatusListener connector_status;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc b/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc
deleted file mode 100644
index 21c0c44ec43..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc
+++ /dev/null
@@ -1,138 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_SL_Disabled_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_SL_Disabled_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_SL_OC_Connector_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I..
-
-  IDL_Files {
-    SL_Disabled_Sender.idl
-  }
-}
-
-project(DDS_SL_Disabled_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_SL_Disabled_Sender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    SL_Disabled_SenderE.idl
-  }
-}
-
-project(DDS_SL_Disabled_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_SL_Disabled_Sender_lem_gen DDS_SL_Disabled_Sender_stub DDS_SL_Disabled_Base_stub
-  libs  += DDS_SL_Disabled_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_Disabled_SenderEC.cpp
-  }
-
-  Header_Files {
-    SL_Disabled_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    SL_Disabled_SenderEC.inl
-  }
-}
-
-project(DDS_SL_Disabled_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_SL_Disabled_Sender_idl_gen DDS_SL_Disabled_Base_stub DDS_SL_Disabled_Connector_stub
-  libs  += DDS_SL_Disabled_Base_stub DDS_SL_Disabled_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_Disabled_SenderC.cpp
-  }
-
-  Header_Files {
-    SL_Disabled_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    SL_Disabled_SenderC.inl
-  }
-}
-
-project(DDS_SL_Disabled_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_SL_Disabled_Sender_lem_stub DDS_SL_Disabled_Sender_stub DDS_SL_OC_Connector_lem_stub DDS_SL_Disabled_Connector_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub DDS_SL_Disabled_Base_stub DDS_SL_OC_Connector_lem_stub  DDS_SL_Disabled_Connector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_Disabled_Sender_exec.cpp
-  }
-
-  Header_Files {
-    SL_Disabled_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_SL_Disabled_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_SL_Disabled_Base_stub  DDS_SL_Disabled_Sender_lem_stub DDS_SL_Disabled_Connector_stub DDS_SL_Disabled_Connector_svnt DDS_SL_OC_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                DDS_SL_Disabled_Base_stub DDS_SL_Disabled_Connector_stub  DDS_SL_Disabled_Connector_svnt DDS_SL_OC_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_Disabled_SenderS.cpp
-    SL_Disabled_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    SL_Disabled_SenderS.h
-    SL_Disabled_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.cpp
deleted file mode 100644
index e783f301425..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.cpp
+++ /dev/null
@@ -1,513 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "SL_Disabled_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_SL_Disabled_Sender_Impl
-{
-  /**
-   * ConnectorStatusListener_exec_i
-   */
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (
-    Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic (
-    ::DDS::Topic_ptr /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status(
-    ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind status_kind)
-  {
-    if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS)
-      {
-        ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_unexpected_status - "
-          "Publication matched received: starting the test\n"));
-
-        this->callback_.get_started ();
-      }
-  }
-
-  /**
-   * Write action generator
-   */
-
-  pulse_Generator::pulse_Generator (Sender_exec_i &callback)
-    : pulse_callback_ (callback)
-  {
-  }
-
-  int
-  pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    // Notify the subscribers
-    this->pulse_callback_.tick ();
-    return 0;
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : test_nr_(UPDATE_CREATE)
-      , test_ok_(true)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      pulse_Generator (*this),
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i  (*this);
-  }
-
-  ::CORBA::Boolean
-  Sender_exec_i::create_one (void)
-  {
-    TestTopic i = this->topic_seq_one_[0];
-    try
-      {
-        ::SL_Disabled::SL_DisabledConnector::Updater_var updater =
-          this->ciao_context_->get_connection_test_topic_update_data ();
-        if (::CORBA::is_nil (updater.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "Sender_exec_i::create_one - "
-                      "ERROR: Updater seems nil\n"));
-            return false;
-          }
-        updater->create_one(i);
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("SL_Disabled: create_one with instance key <%C>\n"),
-                   i.key.in()));
-      }
-    catch (const CCM_DDS::AlreadyCreated &)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: AlreadyCreated with test updater create_one <%C>.\n"),
-                      i.key.in()));
-        return false;
-      }
-    catch (const CCM_DDS::InternalError& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while create_one for <%C>.\n"),
-                      i.key.in()));
-        return false;
-      }
-    return true;
-  }
-
-  ::CORBA::Boolean
-  Sender_exec_i::update_one (void)
-  {
-    //update already created instance with handle nil
-    TestTopic i = this->topic_seq_one_[0];
-    try
-      {
-        ::SL_Disabled::SL_DisabledConnector::Updater_var updater =
-          this->ciao_context_->get_connection_test_topic_update_data ();
-        if (::CORBA::is_nil (updater.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "Sender_exec_i::update_one - "
-                      "ERROR: Updater seems nil\n"));
-            return false;
-          }
-        updater->update_one(i, DDS::HANDLE_NIL);
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Updater: update_one with already existing instance with DDS::HANDLE_NIL, key <%C>\n"),
-                      i.key.in()));
-      }
-    catch (const CCM_DDS::NonExistent &)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater update_one <%C>.\n"),
-                       i.key.in()));
-        return false;
-      }
-    catch (const CCM_DDS::InternalError& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while update_one for <%C>.\n"),
-                        i.key.in()));
-        return false;
-      }
-    return true;
-  }
-
-  ::CORBA::Boolean
-  Sender_exec_i::delete_one (void)
-  {
-    //delete registered instance with DDS::HANDLE_NIL
-    TestTopic i = this->topic_seq_one_[0];
-    try
-      {
-        ::SL_Disabled::SL_DisabledConnector::Updater_var updater =
-          this->ciao_context_->get_connection_test_topic_update_data ();
-        if (::CORBA::is_nil (updater.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "Sender_exec_i::delete_one - "
-                      "ERROR: Updater seems nil\n"));
-            return false;
-          }
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Updater: delete_one with registered instance with DDS::HANDLE_NIL, key <%C>\n"),
-                      i.key.in()));
-        updater->delete_one(i, DDS::HANDLE_NIL);
-      }
-    catch (const CCM_DDS::NonExistent &)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater delete_one <%C>.\n"),
-                       i.key.in()));
-        return false;
-      }
-    catch (const CCM_DDS::InternalError& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while delete_one for <%C>.\n"),
-                        i.key.in()));
-        return false;
-      }
-      return true;
-  }
-
-  ::CORBA::Boolean
-  Sender_exec_i::create_many (void)
-  {
-    //create many with no exception
-    try
-      {
-        ::SL_Disabled::SL_DisabledConnector::Updater_var updater =
-          this->ciao_context_->get_connection_test_topic_update_data ();
-        if (::CORBA::is_nil (updater.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "Sender_exec_i::create_many - "
-                      "ERROR: Updater seems nil\n"));
-            return false;
-          }
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("create_many : <%u> samples\n"),
-                         this->topic_seq_many_.length ()));
-        updater->create_many (this->topic_seq_many_);
-      }
-    catch (const CCM_DDS::NonExistent& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater create_many\n")));
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-         ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                     ACE_TEXT ("in updater: create_many: index <%d> - retval <%d>\n"),
-                     ex.index, ex.error_code));
-
-      }
-    return true;
-  }
-
-  ::CORBA::Boolean
-  Sender_exec_i::update_many (void)
-  {
-    try
-      {
-        ::SL_Disabled::SL_DisabledConnector::Updater_var updater =
-          this->ciao_context_->get_connection_test_topic_update_data ();
-        if (::CORBA::is_nil (updater.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "Sender_exec_i::update_many - "
-                      "ERROR: Updater seems nil\n"));
-            return false;
-          }
-        updater->update_many (this->topic_seq_many_);
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("update_many : written <%u> samples\n"),
-                   this->topic_seq_many_.length ()));
-      }
-    catch (const CCM_DDS::NonExistent& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater update_many.\n")));
-        return false;
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                     ACE_TEXT ("with update_many: index <%d> - retval <%d>\n"),
-                     ex.index, ex.error_code));
-        return false;
-      }
-    return true;
-  }
-
-  ::CORBA::Boolean
-  Sender_exec_i::delete_many (void)
-  {
-    try
-      {
-        ::SL_Disabled::SL_DisabledConnector::Updater_var updater =
-          this->ciao_context_->get_connection_test_topic_update_data ();
-        if (::CORBA::is_nil (updater.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "Sender_exec_i::delete_many - "
-                      "ERROR: Updater seems nil\n"));
-            return false;
-          }
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("delete_many : deleted <%u> samples\n"),
-                                          this->topic_seq_many_.length ()));
-        updater->delete_many (this->topic_seq_many_);
-      }
-    catch (const CCM_DDS::NonExistent& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater delete_many\n")));
-        return false;
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                   ACE_TEXT ("with test updater delete_many: index <%d> - retval <%d>\n"),
-                   ex.index, ex.error_code));
-        return false;
-      }
-
-    return true;
-  }
-
-  void
-  Sender_exec_i::add_instances_of_topic (void)
-  {
-    CORBA::UShort total = 3;
-    this->topic_seq_one_.length (total);
-    //sequence for tests with .._one
-    for (int i = 1; i < (total + 1); i++)
-      {
-        char key[7];
-        TestTopic new_key;
-        ACE_OS::sprintf (key, "KEY_%d", i);
-        new_key.key = CORBA::string_dup(key);
-        new_key.x = i;
-        this->topic_seq_one_[i-1] = new_key;
-      }
-    //sequence for tests with .._many
-    this->topic_seq_many_.length (total);
-    for (int i = 1; i < (total + 1); i++)
-      {
-        char key[7];
-        TestTopic new_key;
-        ACE_OS::sprintf (key, "many_%d", i);
-        new_key.key = CORBA::string_dup(key);
-        new_key.x = i;
-        this->topic_seq_many_[i-1] = new_key;
-      }
-  }
-
-  void
-  Sender_exec_i::tick (void)
-  {
-    if(this->test_ok_.value())
-     {
-       switch (this->test_nr_)
-         {
-          case UPDATE_CREATE:
-            this->test_ok_ = this->create_one();
-            if(this->test_ok_.value())
-              {
-                this->test_nr_ = UPDATE_ONE;
-              }
-            else
-              {
-                this->test_nr_ = END_TEST;
-              }
-            break;
-          case UPDATE_ONE:
-            this->test_ok_ = this->update_one();
-            this->test_nr_ = DELETE_ONE;
-            break;
-          case DELETE_ONE:
-            this->test_ok_ = this->delete_one();
-            this->test_nr_ = CREATE_MANY;
-            break;
-          case CREATE_MANY:
-            this->test_ok_ = this->create_many();
-            if(this->test_ok_.value())
-              {
-                this->test_nr_ = UPDATE_MANY;
-              }
-            else
-              {
-                this->test_nr_ = END_TEST;
-              }
-            this->test_nr_ = UPDATE_MANY;
-            break;
-          case UPDATE_MANY:
-            this->test_ok_ = this->update_many();
-            this->test_nr_ = DELETE_MANY;
-            break;
-          case DELETE_MANY:
-            this->test_ok_ = this->delete_many();
-            this->test_nr_ = END_TEST;
-            break;
-          default:
-            break;
-        }
-    }
-  }
-
-  void
-  Sender_exec_i::get_started (void)
-  {
-    this->add_instances_of_topic ();
-    this->start ();
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    long sec = 1L;
-    long const usec = 0L;
-    if (this->reactor ()->schedule_timer (
-                this->ticker_,
-                0,
-                ACE_Time_Value (sec, usec),
-                ACE_Time_Value (sec, usec)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                               ACE_TEXT ("Error scheduling timer")));
-      }
-  }
-
-  void
-  Sender_exec_i::stop (void)
-  {
-    this->reactor ()->cancel_timer (this->ticker_);
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n")));
-  }
-
-
-  // Component attributes and port operations.
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::SL_Disabled::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    this->stop ();
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_SL_Disabled_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.h
deleted file mode 100644
index b131f0fa51c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.h
+++ /dev/null
@@ -1,185 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_SL_DISABLED_SENDER_EXEC_MPPP2N_H_
-#define CIAO_SL_DISABLED_SENDER_EXEC_MPPP2N_H_
-
-#include /**/ "ace/pre.h"
-
-#include "SL_Disabled_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_SL_Disabled_Sender_Impl
-{
-
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, ::CORBA::Boolean > Atomic_Boolean;
-
-  class Sender_exec_i;
-
-  enum UPDATER_TEST {
-    UPDATE_CREATE,
-    UPDATE_ONE,
-    DELETE_ONE,
-    CREATE_MANY,
-    UPDATE_MANY,
-    DELETE_MANY,
-    END_TEST
-  };
-
-  /**
-   * ConnectorStatusListener_exec_i
-   */
-  class SENDER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Sender_exec_i &callback);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-      void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                                 ::DDS::StatusKind status_kind);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Write action generator
-   */
-
-  class pulse_Generator :
-    public ACE_Event_Handler
-  {
-  public:
-    pulse_Generator (Sender_exec_i &callback);
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    Sender_exec_i &pulse_callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_connector_status (void);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void tick (void);
-    void get_started (void);
-    //@}
-
-  private:
-    ::SL_Disabled::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    //@}
-
-    //@{
-    /** User defined members. */
-    pulse_Generator * ticker_;
-
-    UPDATER_TEST test_nr_;
-    Atomic_Boolean test_ok_;
-
-    TestTopicSeq topic_seq_one_;
-    TestTopicSeq topic_seq_many_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void start (void);
-    void stop (void);
-    void add_instances_of_topic (void);
-
-    ::CORBA::Boolean create_one (void);
-    ::CORBA::Boolean update_one (void);
-    ::CORBA::Boolean delete_one (void);
-    ::CORBA::Boolean create_many (void);
-    ::CORBA::Boolean update_many (void);
-    ::CORBA::Boolean delete_many (void);
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_SL_Disabled_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/Plan.cdp
deleted file mode 100644
index 6295f7a7efd..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/Plan.cdp
+++ /dev/null
@@ -1,386 +0,0 @@
-<!--  -->
-<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>SL_Disabled_Depl_1</label>
-  <UUID>SL_Disabled_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SL_Disabled_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SL_Disabled_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="SL_Disabled_ConnectorComponentImplementation">
-    <name>SL_Disabled_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="SL_Disabled_Connector_ExecArtifact" />
-    <artifact xmi:idref="SL_Disabled_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SL_Disabled_SL_DisabledConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SL_Disabled_SL_DisabledConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SL_Disabled_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SL_Disabled_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SL_Disabled_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SL_Disabled_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-  </instance>
-  <instance xmi:id="SL_Disabled_ConnectorComponentInstance">
-    <name>SL_Disabled_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SL_Disabled_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestQoS</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SL_Disabled_ConnectorComponentInstance2">
-    <name>SL_Disabled_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SL_Disabled_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestQoS</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-  </instance>
-
-  <connection>
-    <name>_listenercontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SL_Disabled_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_statelistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SL_Disabled_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_portstatuslistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SL_Disabled_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>info_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SL_Disabled_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>updater_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>test_topic_update_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>observable_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SL_Disabled_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SL_Disabled_ConnectorComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="SL_Disabled_Connector_ExecArtifact">
-    <name>SL_Disabled_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_SL_Disabled_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="SL_Disabled_Connector_SvntArtifact">
-    <name>SL_Disabled_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_SL_Disabled_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="SL_Disabled_Connector_StubArtifact">
-    <name>SL_Disabled_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_SL_Disabled_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl
deleted file mode 100755
index 2b535b3e697..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 20 seconds to allow task to complete\n";
-sleep (20);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/.gitignore b/CIAO/connectors/dds4ccm/tests/SLManyByMany/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl
deleted file mode 100644
index 6723cc83f06..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file   SL_ManyByMany_Base.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef SL_MANYBYMANY_BASE_IDL
-#define SL_MANYBYMANY_BASE_IDL
-
-#pragma ndds typesupport "Base/SL_ManyByMany_BaseSupport.h"
-#pragma opendds typesupport "Base/SL_ManyByMany_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "TestTopic"
-#pragma DCPS_DATA_KEY "TestTopic key"
-
-struct TestTopic {
-  string key; //@key
-  long x;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TestTopic> TestTopicSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc
deleted file mode 100644
index f530b760e3c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_SL_ManyByMany_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_SL_ManyByMany_Base_stub
-  dynamicflags += SL_MANYBYMANY_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=SL_MANYBYMANY_BASE_STUB_Export \
-              -Wb,stub_export_include=SL_ManyByMany_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    SL_ManyByMany_Base.idl
-  }
-
-  opendds_ts_flags += --export=SL_MANYBYMANY_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    SL_ManyByMany_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.idl b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.idl
deleted file mode 100644
index a5204526af8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file SL_ManyByMany_Connector.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef SL_MANYBYMANY_CONNECTOR_IDL_
-#define SL_MANYBYMANY_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-#include "Base/SL_ManyByMany_Base.idl"
-
-#pragma ciao lem "Connector/SL_ManyByMany_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/SL_ManyByMany_BaseTypeSupport.idl"
-#endif
-
-module SL_ManyByMany
-{
-  module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> SLManyByManyConnector;
-};
-
-#endif /* SL_ManyByMany_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc
deleted file mode 100644
index 78de5f326c2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_SL_ManyByMany_Base -l .. -o ../lib -u DDS SL_ManyByMany_Connector"
-
-project(DDS_SL_MBM_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_SL_ManyByMany_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SL_MANYBYMANY_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=SL_ManyByMany_Connector_stub_export.h \
-              -Wb,skel_export_macro=SL_MANYBYMANY_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=SL_ManyByMany_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=SL_MANYBYMANY_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=SL_ManyByMany_Connector_svnt_export.h \
-              -Wb,conn_export_macro=SL_MANYBYMANY_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=SL_ManyByMany_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    SL_ManyByMany_Connector.idl
-  }
-}
-
-project(DDS_SL_MBM_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_SL_MBM_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=SL_MANYBYMANY_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=SL_ManyByMany_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    SL_ManyByMany_ConnectorE.idl
-  }
-}
-
-project(DDS_SL_MBM_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_SL_MBM_Connector_lem_gen DDS_SL_ManyByMany_Connector_stub DDS_SL_ManyByMany_Base_stub
-  libs  += DDS_SL_ManyByMany_Base_stub DDS_SL_ManyByMany_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_SL_MBM_Connector_lem_stub
-  dynamicflags += SL_MANYBYMANY_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_ManyByMany_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    SL_ManyByMany_ConnectorEC.h
-    SL_ManyByMany_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    SL_ManyByMany_ConnectorEC.inl
-  }
-}
-
-project(DDS_SL_ManyByMany_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_SL_MBM_Connector_idl_gen DDS_SL_ManyByMany_Base_stub
-  libs  += DDS_SL_ManyByMany_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_SL_ManyByMany_Connector_stub
-  dynamicflags += SL_MANYBYMANY_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_ManyByMany_ConnectorC.cpp
-  }
-
-  Header_Files {
-    SL_ManyByMany_ConnectorC.h
-    SL_ManyByMany_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    SL_ManyByMany_ConnectorC.inl
-  }
-}
-
-project(DDS_SL_ManyByMany_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_SL_MBM_Connector_lem_stub DDS_SL_ManyByMany_Connector_stub DDS_SL_ManyByMany_Base_stub
-  sharedname = DDS_SL_ManyByMany_Connector_exec
-  libs += DDS_SL_ManyByMany_Connector_stub DDS_SL_MBM_Connector_lem_stub DDS_SL_ManyByMany_Base_stub DDS_SL_ManyByMany_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SL_MANYBYMANY_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_ManyByMany_Connector_conn.cpp
-  }
-
-  Header_Files {
-    SL_ManyByMany_Connector_conn.h
-    SL_ManyByMany_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_SL_ManyByMany_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_SL_MBM_Connector_lem_stub DDS_SL_ManyByMany_Connector_exec DDS_SL_ManyByMany_Connector_stub
-  sharedname  = DDS_SL_ManyByMany_Connector_svnt
-  libs       += DDS_SL_ManyByMany_Connector_stub \
-                DDS_SL_MBM_Connector_lem_stub  \
-                DDS_SL_ManyByMany_Base_stub \
-                DDS_SL_ManyByMany_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SL_MANYBYMANY_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_ManyByMany_ConnectorS.cpp
-    SL_ManyByMany_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    SL_ManyByMany_ConnectorS.h
-    SL_ManyByMany_Connector_svnt.h
-    SL_ManyByMany_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/README b/CIAO/connectors/dds4ccm/tests/SLManyByMany/README
deleted file mode 100644
index 622b15df743..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/README
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-This is a test for the StateListener when the StateListenerControl is in the MANY_BY_MANY mode.
-
-The test uses the Updater to sent samples.
-With a create_one ( 1 sample) and create_many (3 samples) of the Updater,
-the on_creation must be triggered ( 4 times 1 sample).
-
-With a delete_one ( 1 sample) and a delete_many (3 samples) of the Updater,
- the on_deletion must betriggered( 4 times 1 sample).
-
-With update_one  ( 1 sample) and update_many (3 samples) of the Updater,
- the on_many_updates must ideal be triggered 2 times (1 and 3 samples),
-but it is possible through timing problems that the 3 samples are nor received at one time.
-
-Because of the MANY_BY_MANY mode, the on_one_update must not be triggered,
-even if the Updater does a update_one.
-
-In on_deletion, the returning dataum.key is tested . The key shouldn't be empty, but have a valid value
-because of the  <serialize_key_with_dispose> and <propagate_dispose_of_unregistered_instances> settings in the QoS .
-
-
-Beccause the StateListener performs a get, a read_all of a Reader shouldn't receive any samples
-after the Statelistener has received his triggers.
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.idl b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.idl
deleted file mode 100644
index f80d7e5ab1c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @file
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/SL_ManyByMany_Connector.idl"
-
-module SL_ManyByMany
-{
-  component Receiver
-  {
-    port SLManyByManyConnector::DDS_StateListen info_out;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc
deleted file mode 100644
index 8b0fb7a0ef8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc
+++ /dev/null
@@ -1,136 +0,0 @@
-project(DDS_SL_ManyByMany_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_SL_MBM_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h \
-              -I..
-
-  IDL_Files {
-    SL_ManyByMany_Receiver.idl
-  }
-}
-
-project(DDS_SL_ManyByMany_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_SL_ManyByMany_Receiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    SL_ManyByMany_ReceiverE.idl
-  }
-}
-
-project(DDS_SL_MBM_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_SL_ManyByMany_Receiver_lem_gen DDS_SL_ManyByMany_Receiver_stub  DDS_SL_ManyByMany_Connector_stub DDS_SL_ManyByMany_Base_stub
-  libs  +=  Receiver_stub DDS_SL_ManyByMany_Connector_stub DDS_SL_ManyByMany_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_ManyByMany_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    SL_ManyByMany_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    SL_ManyByMany_ReceiverEC.inl
-  }
-}
-
-project(DDS_SL_ManyByMany_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_SL_ManyByMany_Receiver_idl_gen  DDS_SL_ManyByMany_Connector_stub DDS_SL_ManyByMany_Base_stub DDS_SL_MBM_Connector_lem_gen
-  libs  += DDS_SL_ManyByMany_Connector_stub DDS_SL_ManyByMany_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_ManyByMany_ReceiverC.cpp
-  }
-
-  Header_Files {
-    SL_ManyByMany_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    SL_ManyByMany_ReceiverC.inl
-  }
-}
-
-project(DDS_SL_ManyByMany_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_SL_MBM_Receiver_lem_stub DDS_SL_ManyByMany_Receiver_stub DDS_SL_ManyByMany_Base_stub DDS_SL_ManyByMany_Connector_stub DDS_SL_MBM_Connector_lem_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_SL_ManyByMany_Base_stub DDS_SL_ManyByMany_Connector_stub DDS_SL_MBM_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_ManyByMany_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    SL_ManyByMany_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_SL_ManyByMany_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_SL_MBM_Receiver_lem_stub DDS_SL_ManyByMany_Base_stub DDS_SL_ManyByMany_Connector_stub DDS_SL_ManyByMany_Connector_svnt DDS_SL_ManyByMany_Receiver_exec DDS_SL_MBM_Connector_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_SL_ManyByMany_Base_stub DDS_SL_ManyByMany_Connector_stub DDS_SL_ManyByMany_Connector_svnt Receiver_exec DDS_SL_MBM_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_ManyByMany_ReceiverS.cpp
-    SL_ManyByMany_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    SL_ManyByMany_ReceiverS.h
-    SL_ManyByMany_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp
deleted file mode 100644
index 938b46a013e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp
+++ /dev/null
@@ -1,612 +0,0 @@
-// -*- C++ -*-
-#include "SL_ManyByMany_Receiver_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-#include "dds4ccm/impl/TimeUtilities.h"
-
-#define ON_CREATION_EXPECTED 4
-#define ON_MANY_EXPECTED 4
-#define ON_MANY_TRIGGERED 2
-#define ON_DELETION_EXPECTED 4
-#define ON_READER_EXPECTED 0
-
-namespace CIAO_SL_ManyByMany_Receiver_Impl
-{
-  /**
-   * Facet Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  read_action_Generator::read_action_Generator (Receiver_exec_i &callback)
-    : pulse_callback_ (callback)
-  {
-  }
-
-  read_action_Generator::~read_action_Generator ()
-  {
-  }
-
-  int
-  read_action_Generator::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    this->pulse_callback_.read_all();
-    return 0;
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  info_out_data_listener_exec_i::info_out_data_listener_exec_i (
-        ::SL_ManyByMany::CCM_Receiver_Context_ptr ctx,
-        Atomic_Long &no_operation,
-        Atomic_Long &on_creation,
-        Atomic_Long &on_many_update,
-        Atomic_Long &on_many_upd_trigger,
-        Atomic_Long &on_deletion,
-        Atomic_Bool &create_data,
-        Atomic_Bool &update_data,
-        Atomic_Long &samples_read)
-    : ciao_context_ (
-        ::SL_ManyByMany::CCM_Receiver_Context::_duplicate (ctx))
-      , no_operation_ (no_operation)
-      , on_creation_ (on_creation)
-      , on_many_update_ (on_many_update)
-      , on_many_upd_trigger_ (on_many_upd_trigger)
-      , on_deletion_ (on_deletion)
-      , create_data_ (create_data)
-      , update_data_ (update_data)
-      , samples_read_ (samples_read)
-  {
-  }
-
-  info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::SL_ManyByMany::SLManyByManyConnector::StateListener
-
-  void
-  info_out_data_listener_exec_i::on_creation (const ::TestTopic & datum,
-  const ::CCM_DDS::ReadInfo & info)
-  {
-    ++this->on_creation_;
-    ACE_Time_Value tv;
-    tv <<= info.source_timestamp;
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("on_creation ReadInfo ")
-                          ACE_TEXT ("-> UTC date =%#T\n"),
-                          &tv));
-
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Statelistener:on_creation : ")
-                          ACE_TEXT ("Received datum for <%C> at %u\n"),
-                          datum.key.in (),
-                          datum.x));
-    // One of the data must have the key 'KEY_1' with x == 1
-    if (ACE_OS::strcmp (datum.key.in(), "KEY_1") == 0 && datum.x == 1L)
-      {
-        this->create_data_ = true;
-      }
-  }
-
-  void
-  info_out_data_listener_exec_i::on_one_update (const ::TestTopic & /* datum */,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    ++this->no_operation_;
-  }
-
-  void
-  info_out_data_listener_exec_i::on_many_updates (const ::TestTopicSeq & data,
-  const ::CCM_DDS::ReadInfoSeq & infos)
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("on_many_update triggered,")
-                          ACE_TEXT (" received sequence of ")
-                          ACE_TEXT ("<%u> samples\n"),
-                          infos.length()));
-    //number of times this is triggered
-    this->on_many_upd_trigger_ ++;
-
-    //number of total samples received
-    this->on_many_update_ += infos.length();
-    for(CORBA::ULong i = 0; i < infos.length(); ++i)
-      {
-        if (infos[i].instance_status != CCM_DDS::INSTANCE_UPDATED)
-          {
-            ACE_ERROR ((LM_ERROR,
-                        ACE_TEXT ("ERROR: did not receive the expected ")
-                        ACE_TEXT ("info.instance_status ")
-                        ACE_TEXT ("'CCM_DDS::INSTANCE_UPDATED' ")
-                        ACE_TEXT ("with operation 'on_many_updates' ")
-                        ACE_TEXT ("from StateListener in Receiver\n")
-                        ));
-
-          }
-        ACE_Time_Value tv;
-        tv <<= infos[i].source_timestamp;
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("on_many_updates ReadInfo ")
-                              ACE_TEXT ("-> UTC date =%#T\n"),
-                              &tv));
-      }
-    for (CORBA::ULong i = 0; i < data.length(); ++i)
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("on_many_updates info : Number <%d> :")
-                              ACE_TEXT (" received TestTopic_info ")
-                              ACE_TEXT ("for <%C> at %u\n"),
-                              i,
-                              data[i].key.in (),
-                              data[i].x));
-        // one of the data must have the key 'KEY_1' with x == 2
-        if (ACE_OS::strcmp(data[i].key,"KEY_1") == 0 && data[i].x == 2L)
-          {
-            this->update_data_ = true;
-          }
-       }
-
-    // When we have received all updates, check if there is
-    // something left in the cache
-    if(this->on_many_update_.value () == ON_MANY_EXPECTED)
-      {
-        try
-          {
-            SL_ManyByMany::SLManyByManyConnector::Reader_var reader =
-              this->ciao_context_->get_connection_info_out_data ();
-            if (::CORBA::is_nil (reader.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, "info_out_data_listener_exec_i::on_many_updates - "
-                          "ERROR: Reader seems nil\n"));
-              }
-            ::TestTopicSeq seq;
-            ::CCM_DDS::ReadInfoSeq infos;
-            reader->read_all (seq, infos);
-            this->samples_read_ += seq.length ();
-
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("info_out_data_listener_exec_i::on_many_updates - ")
-                                  ACE_TEXT ("Read <%u> samples\n"),
-                                  seq.length ()));
-          }
-        catch (const CCM_DDS::InternalError& ex)
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                        ACE_TEXT ("when using reader->read_all: index <%d> - retval <%d>\n"),
-                        ex.index, ex.error_code));
-          }
-      }
-  }
-
-  void
-  info_out_data_listener_exec_i::on_deletion (const ::TestTopic & datum,
-  const ::CCM_DDS::ReadInfo & info)
-  {
-    if (info.instance_status != CCM_DDS::INSTANCE_DELETED)
-      {
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("ERROR: did not receive the expected ")
-                    ACE_TEXT ("info.instance_status ")
-                    ACE_TEXT ("'CCM_DDS::INSTANCE_DELETED' with operation ")
-                    ACE_TEXT ("'on_deletion' from StateListener in Receiver\n")
-                   ));
-
-      }
-    else
-      {
-        // Because of the settings <serialize_key_with_dispose> and
-        // <propagate_dispose_of_unregistered_instances> in the QoS , we expect
-        // an existing datum.key
-        // Since these are RTI DDS specific QOS settings, we only need to test
-        // this in case RTI DDS
-#if (CIAO_DDS4CCM_NDDS==1)
-        if ((ACE_OS::strncmp (datum.key.in(), "KEY", 3) == 0  ) ||
-            (ACE_OS::strncmp (datum.key.in(), "many", 4) == 0  ))
-          {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Statelistener:on_deletion : ")
-                        ACE_TEXT ("Received datum for <%C> \n"),
-                        datum.key.in ()));
-            ++this->on_deletion_;
-           }
-        else
-          {
-            ACE_ERROR ((LM_ERROR,
-                        ACE_TEXT ("ERROR Statelistener:on_deletion : did not ")
-                        ACE_TEXT ("receive the expected datum, received <%C>")
-                        ACE_TEXT (", expected <KEY_.> or <many_.>\n"),
-                        datum.key.in ()));
-          }
-#else
-        ++this->on_deletion_;
-        ACE_UNUSED_ARG (datum);
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Statelistener:on_deletion : ")
-                    ACE_TEXT ("Received on_deletion event\n")));
-
-#endif
-      }
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_status_exec_i
-   */
-
-  info_out_status_exec_i::info_out_status_exec_i (
-        ::SL_ManyByMany::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::SL_ManyByMany::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_status_exec_i::~info_out_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : no_operation_ (0)
-      , on_creation_ (0)
-      , on_many_update_ (0)
-      , on_many_upd_trigger_ (0)
-      , on_deletion_ (0)
-      , create_data_ (false)
-      , update_data_ (false)
-      , reader_data_ (0)
-      , samples_read_ (0)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      read_action_Generator (*this),
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Receiver_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Receiver_exec_i::read_all (void)
-  {
-    ::SL_ManyByMany::SLManyByManyConnector::Reader_var reader =
-      this->ciao_context_->get_connection_info_out_data ();
-
-    if ( ::CORBA::is_nil (reader.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::read_all - "
-                  "Reader seems nil\n"));
-        return;
-      }
-    try
-      {
-       TestTopicSeq TestTopic_infos;
-        ::CCM_DDS::ReadInfoSeq readinfoseq;
-        reader->read_all (TestTopic_infos, readinfoseq);
-        this->reader_data_ += TestTopic_infos.length ();
-        for (CORBA::ULong i = 0; i < readinfoseq.length (); ++i)
-          {
-            ACE_Time_Value tv;
-            tv <<= readinfoseq[i].source_timestamp;
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL ReadInfo ")
-                                  ACE_TEXT ("-> UTC date =%#T\n"),
-                                  &tv));
-          }
-        for (CORBA::ULong i = 0; i < TestTopic_infos.length (); ++i)
-          {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL info : ")
-                        ACE_TEXT ("Number <%d> : received TestTopic_info for <%C> at %u\n"),
-                        i,
-                        TestTopic_infos[i].key.in (),
-                        TestTopic_infos[i].x));
-          }
-      }
-    catch (const CCM_DDS::InternalError& )
-      {
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::read_all - "
-                  "internal error or no data\n"));
-      }
-  }
-  // Component attributes and port operations.
-
-  ::SL_ManyByMany::SLManyByManyConnector::CCM_StateListener_ptr
-  Receiver_exec_i::get_info_out_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ()))
-      {
-        info_out_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_data_listener_exec_i (
-            this->ciao_context_.in (),
-            this->no_operation_,
-            this->on_creation_,
-            this->on_many_update_,
-            this->on_many_upd_trigger_,
-            this->on_deletion_,
-            this->create_data_,
-            this->update_data_,
-            this->samples_read_),
-            ::SL_ManyByMany::SLManyByManyConnector::CCM_StateListener::_nil ());
-
-          this->ciao_info_out_data_listener_ = tmp;
-      }
-
-    return
-      ::SL_ManyByMany::SLManyByManyConnector::CCM_StateListener::_duplicate (
-        this->ciao_info_out_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ()))
-      {
-        info_out_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_out_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_out_status_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::SL_ManyByMany::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    ::CCM_DDS::StateListenerControl_var lc =
-    this->ciao_context_->get_connection_info_out_data_control ();
-
-    if (::CORBA::is_nil (lc.in ()))
-      {
-         ACE_ERROR ((LM_INFO, "Receiver_exec_i::ccm_activate - "
-                   "ERROR:  Listener control receptacle is null!\n"));
-        throw ::CORBA::INTERNAL ();
-      }
-
-    lc->mode (::CCM_DDS::MANY_BY_MANY);
-    if (this->reactor ()->schedule_timer (this->ticker_,
-                                          0,
-                                        ACE_Time_Value(18, 0),
-                                        ACE_Time_Value(1, 0)) == -1)
-   //                                        ACE_Time_Value(1, 0),
-   //                                        ACE_Time_Value(1, 0)) == -1)
-      {
-         ACE_ERROR ((LM_INFO, "Receiver_exec_i::ccm_activate - "
-                   "ERROR:  Unable to schedule timer!\n"));
-      }
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    this->reactor ()->cancel_timer (this->ticker_);
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    if (this->no_operation_.value () > 0)
-      {
-         ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: did receive an unexpected ")
-                               ACE_TEXT ("operation 'on_one_update' from ")
-                               ACE_TEXT ("StateListener in Receiver\n")
-                    ));
-      }
-    else
-      {
-         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: did not receive an unexpected ")
-                               ACE_TEXT ("operation 'on_one_update' from ")
-                               ACE_TEXT ("StateListener in Receiver\n")
-                    ));
-      }
-
-    if (this->on_creation_.value () != ON_CREATION_EXPECTED)
-      {
-         ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: didn't receive the expected ")
-                               ACE_TEXT ("number of 'on_creation' calls: ")
-                               ACE_TEXT ("expected <%d> - received <%d>\n"),
-                               ON_CREATION_EXPECTED,
-                               this->on_creation_.value ()
-                    ));
-      }
-    else
-      {
-         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: did receive the expected ")
-                               ACE_TEXT ("number of 'on_creation' calls: ")
-                               ACE_TEXT ("expected <%d> - received <%d>\n"),
-                               ON_CREATION_EXPECTED,
-                               this->on_creation_.value ()
-                    ));
-      }
-
-    if (!this->create_data_ .value ())
-      {
-         ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: didn't receive the expected ")
-                               ACE_TEXT ("sample in 'on_creation' from ")
-                               ACE_TEXT ("StateListener in Receiver\n")
-                    ));
-      }
-    else
-      {
-         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: did receive the expected ")
-                               ACE_TEXT ("sample in 'on_creation' from ")
-                               ACE_TEXT ("StateListener in Receiver\n")
-                    ));
-      }
-
-    if(this->on_many_upd_trigger_.value  () < ON_MANY_TRIGGERED)
-      {
-         ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: didn't trigger the expected ")
-                               ACE_TEXT ("number of 'on_many_update': ")
-                               ACE_TEXT ("expected minimum <%d> - received <%d>\n"),
-                               ON_MANY_TRIGGERED,
-                               this->on_many_upd_trigger_.value ()
-                    ));
-      }
-    else
-      {
-         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: did trigger the minimum expected ")
-                               ACE_TEXT ("number of 'on_many_update': ")
-                               ACE_TEXT ("expected <%d> - received <%d>\n"),
-                               ON_MANY_TRIGGERED,
-                               this->on_many_upd_trigger_.value ()
-                    ));
-      }
-    if(this->on_many_update_.value  () != ON_MANY_EXPECTED)
-      {
-         ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: didn't receive the expected ")
-                               ACE_TEXT ("number of 'on_many_update' samples: ")
-                               ACE_TEXT ("expected <%d> - received <%d>\n"),
-                               ON_MANY_EXPECTED,
-                               this->on_many_update_.value ()
-                    ));
-      }
-    else
-      {
-         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: did receive the expected ")
-                               ACE_TEXT ("number of 'on_many_update' samples: ")
-                               ACE_TEXT ("expected <%d> - received <%d>, ")
-                               ACE_TEXT ("on_many_update triggered at <%d> times.\n"),
-                               ON_MANY_EXPECTED,
-                               this->on_many_update_.value (),
-                               ON_MANY_TRIGGERED
-                    ));
-      }
-
-    if (!this->update_data_.value ())
-      {
-         ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR:didn't receive the expected ")
-                               ACE_TEXT (" data with 'on_many_updates' from ")
-                               ACE_TEXT ("StateListener in Receiver\n")
-                    ));
-      }
-    else
-      {
-         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: did receive the expected ")
-                               ACE_TEXT ("sample in 'on_many_updates' from ")
-                               ACE_TEXT ("StateListener in Receiver\n")
-                    ));
-      }
-
-    if (this->on_deletion_.value () != ON_DELETION_EXPECTED)
-      {
-         ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: didn't receive the expected ")
-                               ACE_TEXT ("number of 'on_deletion' calls: ")
-                               ACE_TEXT ("expected <%d> - received <%d>\n"),
-                               ON_DELETION_EXPECTED,
-                               this->on_deletion_.value ()
-                    ));
-      }
-    else
-      {
-         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: did receive the expected ")
-                               ACE_TEXT ("number of 'on_deletion' calls: ")
-                               ACE_TEXT ("expected <%d> - received <%d>\n"),
-                               ON_DELETION_EXPECTED,
-                               this->on_deletion_.value ()
-                    ));
-      }
-
-    if (this->reader_data_.value () != ON_READER_EXPECTED)
-      {
-         ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: didn't read the expected ")
-                               ACE_TEXT ("number of samples: ")
-                               ACE_TEXT ("expected <%d> - received <%d>\n"),
-                               ON_READER_EXPECTED,
-                               this->reader_data_.value ()
-                    ));
-      }
-    else
-      {
-         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: read the expected ")
-                               ACE_TEXT ("number of samples: ")
-                               ACE_TEXT ("expected <%d> - received <%d>\n"),
-                               ON_READER_EXPECTED,
-                               this->reader_data_.value ()
-                    ));
-      }
-    if (this->samples_read_.value () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: read no samples\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: read <%u> samples\n"),
-                this->samples_read_.value ()));
-      }
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_SL_ManyByMany_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.h
deleted file mode 100644
index 03cb9f7ed7e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.h
+++ /dev/null
@@ -1,208 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_SL_MANYBYMANY_RECEIVER_EXEC_4U4QJF_H_
-#define CIAO_SL_MANYBYMANY_RECEIVER_EXEC_4U4QJF_H_
-
-#include /**/ "ace/pre.h"
-
-#include "SL_ManyByMany_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_SL_ManyByMany_Receiver_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::ULong > Atomic_Long;
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Bool;
-
-  class Receiver_exec_i;
-
-  /**
-   * Read action generator
-   */
-
-  class read_action_Generator
-    : public ACE_Event_Handler
-  {
-  public:
-    read_action_Generator (Receiver_exec_i &callback);
-
-    ~read_action_Generator ();
-
-    /// Handle the timeout.
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-
-  private:
-    /// Maintains a handle that actually process the event
-    Receiver_exec_i &pulse_callback_;
-
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  class info_out_data_listener_exec_i
-    : public virtual ::SL_ManyByMany::SLManyByManyConnector::CCM_StateListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_data_listener_exec_i (
-      ::SL_ManyByMany::CCM_Receiver_Context_ptr ctx,
-      Atomic_Long &no_operation,
-      Atomic_Long &on_creation,
-      Atomic_Long &on_many_update,
-      Atomic_Long &on_many_upd_trigger,
-      Atomic_Long &on_deletion,
-      Atomic_Bool &create_data,
-      Atomic_Bool &update_data,
-      Atomic_Long &samples_read);
-    virtual ~info_out_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from SL_ManyByMany::SLManyByManyConnector::StateListener. */
-
-    virtual
-    void on_creation (const ::TestTopic & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_one_update (const ::TestTopic & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_updates (const ::TestTopicSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-
-    virtual
-    void on_deletion (const ::TestTopic & datum,
-    const ::CCM_DDS::ReadInfo & info);
-    //@}
-
-  private:
-    ::SL_ManyByMany::CCM_Receiver_Context_var ciao_context_;
-     Atomic_Long &no_operation_;
-     Atomic_Long &on_creation_;
-     Atomic_Long &on_many_update_;
-     Atomic_Long &on_many_upd_trigger_;
-     Atomic_Long &on_deletion_;
-     Atomic_Bool &create_data_;
-     Atomic_Bool &update_data_;
-     Atomic_Long &samples_read_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_status_exec_i
-   */
-
-  class info_out_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_status_exec_i (
-      ::SL_ManyByMany::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::SL_ManyByMany::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::SL_ManyByMany::SLManyByManyConnector::CCM_StateListener_ptr
-    get_info_out_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_status (void);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void read_all(void);
-
-    //@}
-
-  private:
-    ::SL_ManyByMany::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::SL_ManyByMany::SLManyByManyConnector::CCM_StateListener_var ciao_info_out_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    read_action_Generator * ticker_;
-
-    Atomic_Long no_operation_;
-    Atomic_Long on_creation_;
-    Atomic_Long on_many_update_;
-    Atomic_Long on_many_upd_trigger_;
-    Atomic_Long on_deletion_;
-    Atomic_Bool create_data_;
-    Atomic_Bool update_data_;
-    Atomic_Long reader_data_;
-    Atomic_Long samples_read_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_SL_ManyByMany_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.idl b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.idl
deleted file mode 100644
index b823417508f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef DDS_SL_MANYBYMANY_SENDER_IDL
-#define DDS_SL_MANYBYMANY_SENDER_IDL
-
-#include "Connector/SL_ManyByMany_Connector.idl"
-
-module SL_ManyByMany
-{
-  component Sender
-  {
-     port ::SL_ManyByMany::SLManyByManyConnector::DDS_Update test_topic_update;
-     provides CCM_DDS::ConnectorStatusListener test_topic_connector_status;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc
deleted file mode 100644
index 4b24d1979fe..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc
+++ /dev/null
@@ -1,138 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_SL_ManyByMany_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_SL_ManyByMany_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_SL_MBM_Connector_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I..
-
-  IDL_Files {
-    SL_ManyByMany_Sender.idl
-  }
-}
-
-project(DDS_SL_ManyByMany_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_SL_ManyByMany_Sender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    SL_ManyByMany_SenderE.idl
-  }
-}
-
-project(DDS_SL_ManyByMany_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_SL_ManyByMany_Sender_lem_gen DDS_SL_ManyByMany_Sender_stub DDS_SL_ManyByMany_Base_stub
-  libs  += DDS_SL_ManyByMany_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_ManyByMany_SenderEC.cpp
-  }
-
-  Header_Files {
-    SL_ManyByMany_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    SL_ManyByMany_SenderEC.inl
-  }
-}
-
-project(DDS_SL_ManyByMany_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_SL_ManyByMany_Sender_idl_gen DDS_SL_ManyByMany_Base_stub DDS_SL_ManyByMany_Connector_stub
-  libs  += DDS_SL_ManyByMany_Base_stub DDS_SL_ManyByMany_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_ManyByMany_SenderC.cpp
-  }
-
-  Header_Files {
-    SL_ManyByMany_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    SL_ManyByMany_SenderC.inl
-  }
-}
-
-project(DDS_SL_ManyByMany_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_SL_ManyByMany_Sender_lem_stub DDS_SL_ManyByMany_Sender_stub DDS_SL_MBM_Connector_lem_stub DDS_SL_ManyByMany_Connector_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub DDS_SL_ManyByMany_Base_stub DDS_SL_MBM_Connector_lem_stub  DDS_SL_ManyByMany_Connector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_ManyByMany_Sender_exec.cpp
-  }
-
-  Header_Files {
-    SL_ManyByMany_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_SL_ManyByMany_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_SL_ManyByMany_Base_stub  DDS_SL_ManyByMany_Sender_lem_stub DDS_SL_ManyByMany_Connector_stub DDS_SL_ManyByMany_Connector_svnt DDS_SL_MBM_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                DDS_SL_ManyByMany_Base_stub DDS_SL_ManyByMany_Connector_stub  DDS_SL_ManyByMany_Connector_svnt DDS_SL_MBM_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_ManyByMany_SenderS.cpp
-    SL_ManyByMany_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    SL_ManyByMany_SenderS.h
-    SL_ManyByMany_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.cpp
deleted file mode 100644
index 95900c0c10e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.cpp
+++ /dev/null
@@ -1,544 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "SL_ManyByMany_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_SL_ManyByMany_Sender_Impl
-{
-  /**
-   * Write action generator
-   */
-  pulse_Generator::pulse_Generator (Sender_exec_i &callback)
-    : pulse_callback_ (callback)
-  {
-  }
-
-  int
-  pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    this->pulse_callback_.tick ();
-    return 0;
-  }
-
-  /**
-   * ConnectorStatusListener_exec_i
-   */
-
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (
-    Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic (
-    ::DDS::Topic_ptr /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status(
-    ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind status_kind)
-  {
-    if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS)
-      {
-        this->callback_.get_started ();
-      }
-  }
-
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : test_nr_(UPDATE_CREATE)
-    , test_ok_(true)
-    , started_ (false)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      pulse_Generator (*this),
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_test_topic_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i (*this);
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  ::CORBA::Boolean
-  Sender_exec_i::create_one (void)
-  {
-    TestTopic i = this->topic_seq_one_[0];
-    try
-      {
-        ::SL_ManyByMany::SLManyByManyConnector::Updater_var updater =
-          this->ciao_context_->get_connection_test_topic_update_data ();
-        if (::CORBA::is_nil (updater.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "Sender_exec_i::create_one - "
-                      "ERROR: Updater seems nil\n"));
-            return false;
-          }
-        updater->create_one (i);
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("SL_ManyByMany: create_one with instance key ")
-                    ACE_TEXT (" <%C>\n"),
-                    i.key.in ()));
-      }
-    catch (const CCM_DDS::AlreadyCreated &)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: AlreadyCreated ")
-                  ACE_TEXT ("with test updater create_one <%C>.\n"),
-                  i.key.in ()));
-        return false;
-      }
-    catch (const CCM_DDS::InternalError& )
-      {
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("Internal Error while create_one for <%C>.\n"),
-                    i.key.in ()));
-        return false;
-      }
-    return true;
-  }
-
-  ::CORBA::Boolean
-  Sender_exec_i::update_one (void)
-  {
-    //update already created instance with handle nil
-    TestTopic i = this->topic_seq_one_[0];
-    try
-      {
-        ::SL_ManyByMany::SLManyByManyConnector::Updater_var updater =
-          this->ciao_context_->get_connection_test_topic_update_data ();
-        if (::CORBA::is_nil (updater.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "Sender_exec_i::update_one - "
-                      "ERROR: Updater seems nil\n"));
-            return false;
-          }
-        i.x++;
-        updater->update_one (i, DDS::HANDLE_NIL);
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("Updater: update_one with already existing ")
-                    ACE_TEXT ("instance with DDS::HANDLE_NIL, key <%C>\n"),
-                    i.key.in ()));
-      }
-    catch (const CCM_DDS::NonExistent &)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent ")
-                             ACE_TEXT ("with test updater update_one <%C>.\n"),
-                       i.key.in ()));
-        return false;
-      }
-    catch (const CCM_DDS::InternalError& )
-      {
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("Internal Error while update_one for <%C>.\n"),
-                    i.key.in ()));
-        return false;
-      }
-    return true;
-  }
-
-  ::CORBA::Boolean
-  Sender_exec_i::delete_one (void)
-  {
-    //delete registered instance with DDS::HANDLE_NIL
-    TestTopic i = this->topic_seq_one_[0];
-    try
-      {
-        ::SL_ManyByMany::SLManyByManyConnector::Updater_var updater =
-          this->ciao_context_->get_connection_test_topic_update_data ();
-        if (::CORBA::is_nil (updater.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "Sender_exec_i::delete_one - "
-                      "ERROR: Updater seems nil\n"));
-            return false;
-          }
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Updater: delete_one with registered ")
-                              ACE_TEXT ("instance with DDS::HANDLE_NIL, ")
-                              ACE_TEXT ("key <%C>\n"),
-                              i.key.in ()));
-        updater->delete_one(i, DDS::HANDLE_NIL);
-      }
-    catch (const CCM_DDS::NonExistent &)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent ")
-                              ACE_TEXT ("with test updater delete_one <%C>.\n"),
-                              i.key.in ()));
-        return false;
-      }
-    catch (const CCM_DDS::InternalError& )
-      {
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("Internal Error while delete_one for <%C>.\n"),
-                    i.key.in ()));
-        return false;
-      }
-      return true;
-  }
-
-  ::CORBA::Boolean
-  Sender_exec_i::create_many (void)
-  {
-    //create many with no exception
-    try
-      {
-        ::SL_ManyByMany::SLManyByManyConnector::Updater_var updater =
-          this->ciao_context_->get_connection_test_topic_update_data ();
-        if (::CORBA::is_nil (updater.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "Sender_exec_i::create_many - "
-                      "ERROR: Updater seems nil\n"));
-            return false;
-          }
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("create_many : <%u> samples\n"),
-                         this->topic_seq_many_.length ()));
-        updater->create_many (this->topic_seq_many_);
-      }
-    catch (const CCM_DDS::NonExistent& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: ")
-                  ACE_TEXT ("NonExistent with test updater create_many\n")));
-        return false;
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-         ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                     ACE_TEXT ("in updater: create_many: index <%d> - retval <%d>\n"),
-                     ex.index, ex.error_code));
-         return false;
-
-      }
-    return true;
-  }
-
-  ::CORBA::Boolean
-  Sender_exec_i::update_many (void)
-  {
-    try
-      {
-        ::SL_ManyByMany::SLManyByManyConnector::Updater_var updater =
-          this->ciao_context_->get_connection_test_topic_update_data ();
-        if (::CORBA::is_nil (updater.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "Sender_exec_i::update_many - "
-                      "ERROR: Updater seems nil\n"));
-            return false;
-          }
-       for(CORBA::ULong i = 0; i < this->topic_seq_many_.length(); i++)
-          {
-            this->topic_seq_many_[i].x= i+ 10;
-          }
-        updater->update_many (this->topic_seq_many_);
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("update_many : written <%u> samples\n"),
-                   this->topic_seq_many_.length ()));
-        updater->is_coherent_write (false);
-
-      }
-    catch (const CCM_DDS::NonExistent& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater update_many.\n")));
-        return false;
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                     ACE_TEXT ("with update_many: index <%d> - retval <%d>\n"),
-                     ex.index, ex.error_code));
-        return false;
-      }
-    return true;
-  }
-
-  ::CORBA::Boolean
-  Sender_exec_i::delete_many (void)
-  {
-    try
-      {
-        ::SL_ManyByMany::SLManyByManyConnector::Updater_var updater =
-          this->ciao_context_->get_connection_test_topic_update_data ();
-        if (::CORBA::is_nil (updater.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "Sender_exec_i::delete_many - "
-                      "ERROR: Updater seems nil\n"));
-            return false;
-          }
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("delete_many : deleted <%u> samples\n"),
-                                          this->topic_seq_many_.length ()));
-        updater->delete_many (this->topic_seq_many_);
-      }
-    catch (const CCM_DDS::NonExistent& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent ")
-                              ACE_TEXT ("with test updater delete_many\n")));
-        return false;
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                              ACE_TEXT ("with test updater delete_many:")
-                              ACE_TEXT ("index <%d> - retval <%d>\n"),
-                              ex.index, ex.error_code));
-        return false;
-      }
-
-    return true;
-  }
-
-  void
-  Sender_exec_i::add_instances_of_topic (void)
-  {
-    CORBA::UShort total = 3;
-    this->topic_seq_one_.length (total);
-    //sequence for tests with .._one
-    for (int i = 1; i < (total + 1); i++)
-      {
-        char key[7];
-        TestTopic new_key;
-        ACE_OS::sprintf (key, "KEY_%d", i);
-        new_key.key = CORBA::string_dup(key);
-        new_key.x = i;
-        this->topic_seq_one_[i-1] = new_key;
-      }
-    //sequence for tests with .._many
-    this->topic_seq_many_.length (total);
-    for (int i = 1; i < (total + 1); i++)
-      {
-        char key[7];
-        TestTopic new_key;
-        ACE_OS::sprintf (key, "many_%d", i);
-        new_key.key = CORBA::string_dup(key);
-        new_key.x = i;
-        this->topic_seq_many_[i-1] = new_key;
-      }
-  }
-
-  void
-  Sender_exec_i::tick (void)
-  {
-    if (this->test_ok_.value ())
-     {
-       switch (this->test_nr_)
-         {
-          case UPDATE_CREATE:
-            this->test_ok_ = this->create_one ();
-            if(this->test_ok_.value ())
-              {
-                this->test_nr_ = UPDATE_ONE;
-              }
-            else
-              {
-                this->test_nr_ = END_TEST;
-              }
-            break;
-          case UPDATE_ONE:
-            this->test_ok_ = this->update_one ();
-            this->test_nr_ = DELETE_ONE;
-            break;
-          case DELETE_ONE:
-            this->test_ok_ = this->delete_one ();
-            this->test_nr_ = CREATE_MANY;
-            break;
-          case CREATE_MANY:
-            this->test_ok_ = this->create_many ();
-            if(this->test_ok_.value ())
-              {
-                this->test_nr_ = UPDATE_MANY;
-              }
-            else
-              {
-                this->test_nr_ = END_TEST;
-              }
-            this->test_nr_ = UPDATE_MANY;
-            break;
-          case UPDATE_MANY:
-            this->test_ok_ = this->update_many ();
-            this->test_nr_ = DELETE_MANY;
-            break;
-          case DELETE_MANY:
-            this->test_ok_ = this->delete_many ();
-            this->test_nr_ = END_TEST;
-            break;
-          default:
-            break;
-        }
-    }
-  }
-
-  void
-  Sender_exec_i::get_started (void)
-  {
-    this->started_ = true;
-    this->add_instances_of_topic ();
-    this->start ();
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    long sec = 2L;
-    long const usec = 0L;
-    if (this->reactor ()->schedule_timer (
-                this->ticker_,
-                0,
-                ACE_Time_Value (sec, usec),
-                ACE_Time_Value (sec, usec)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                              ACE_TEXT ("Error scheduling timer")));
-      }
-  }
-
-  void
-  Sender_exec_i::stop (void)
-  {
-    this->reactor ()->cancel_timer (this->ticker_);
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n")));
-  }
-
-  // Component attributes and port operations.
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::SL_ManyByMany::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    this->stop ();
-
-    if (!this->started_)
-      {
-        ACE_ERROR ((LM_ERROR,
-          "Sender_exec_i::ccm_passivate - "
-          "ERROR: No publication matched received. "
-          "Test didn't run\n"));
-      }
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_SL_ManyByMany_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.h
deleted file mode 100644
index 0c5b23f1ad4..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.h
+++ /dev/null
@@ -1,187 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_SL_MANYBYMANY_SENDER_EXEC_6XMS37_H_
-#define CIAO_SL_MANYBYMANY_SENDER_EXEC_6XMS37_H_
-
-#include /**/ "ace/pre.h"
-
-#include "SL_ManyByMany_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_SL_ManyByMany_Sender_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
-
-  class Sender_exec_i;
-
-  enum UPDATER_TEST {
-    UPDATE_CREATE,
-    UPDATE_ONE,
-    DELETE_ONE,
-    CREATE_MANY,
-    UPDATE_MANY,
-    DELETE_MANY,
-    END_TEST
-  };
-
-  /**
-   * Write action generator
-   */
-
-  class pulse_Generator :
-    public ACE_Event_Handler
-  {
-  public:
-    pulse_Generator (Sender_exec_i &callback);
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    Sender_exec_i &pulse_callback_;
-  };
-
-  /**
-   * ConnectorStatusListener_exec_i
-   */
-
-  class ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Sender_exec_i &callback);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-      void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                                 ::DDS::StatusKind status_kind);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_test_topic_connector_status (void);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void get_started (void);
-    void tick (void);
-    //@}
-
-  private:
-    ::SL_ManyByMany::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    //@}
-
-    //@{
-    /** User defined members. */
-    pulse_Generator * ticker_;
-
-    UPDATER_TEST test_nr_;
-    Atomic_Boolean test_ok_;
-
-    TestTopicSeq topic_seq_one_;
-    TestTopicSeq topic_seq_many_;
-
-    bool started_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void start (void);
-    void stop (void);
-    void add_instances_of_topic (void);
-
-    ::CORBA::Boolean create_one (void);
-    ::CORBA::Boolean update_one (void);
-    ::CORBA::Boolean delete_one (void);
-    ::CORBA::Boolean create_many (void);
-    ::CORBA::Boolean update_many (void);
-    ::CORBA::Boolean delete_many (void);
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_SL_ManyByMany_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/Plan.cdp
deleted file mode 100644
index 8ec10347d57..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/Plan.cdp
+++ /dev/null
@@ -1,407 +0,0 @@
-<!--  -->
-<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>SL_ManyByMany_Depl_1</label>
-  <UUID>SL_ManyByMany_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SL_ManyByMany_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SL_ManyByMany_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="SL_ManyByMany_ConnectorComponentImplementation">
-    <name>SL_ManyByMany_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="SL_ManyByMany_Connector_ExecArtifact" />
-    <artifact xmi:idref="SL_ManyByMany_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SL_ManyByMany_SLManyByManyConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SL_ManyByMany_SLManyByManyConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SL_ManyByMany_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SL_ManyByMany_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SL_ManyByMany_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SL_ManyByMany_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-  </instance>
-  <instance xmi:id="SL_ManyByMany_ConnectorComponentInstance">
-    <name>SL_ManyByMany_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SL_ManyByMany_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestQoS</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SlMbM_Library#SlMbMProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SL_ManyByMany_ConnectorComponentInstance2">
-    <name>SL_ManyByMany_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SL_ManyByMany_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestQoS</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SlMbM_Library#SlMbMProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-  </instance>
-
-  <connection>
-    <name>_listenercontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SL_ManyByMany_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_statelistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SL_ManyByMany_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_portstatuslistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SL_ManyByMany_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>info_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SL_ManyByMany_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>updater_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>test_topic_update_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>observable_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SL_ManyByMany_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>test_topic_connector_status_sender</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>test_topic_connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SL_ManyByMany_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="SL_ManyByMany_Connector_ExecArtifact">
-    <name>SL_ManyByMany_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_SL_ManyByMany_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="SL_ManyByMany_Connector_SvntArtifact">
-    <name>SL_ManyByMany_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_SL_ManyByMany_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="SL_ManyByMany_Connector_StubArtifact">
-    <name>SL_ManyByMany_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_SL_ManyByMany_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/SlMbM_Library.xml b/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/SlMbM_Library.xml
deleted file mode 100644
index 2080a71ca1e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/SlMbM_Library.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-
-  <qos_profile name="SlMbMProfile">
-    <!-- QoS used to configure the data writer created in the example code -->
-    <datawriter_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-        <max_blocking_time>
-          <sec>10</sec>
-          <nanosec>0</nanosec>
-        </max_blocking_time>
-      </reliability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-      <resource_limits>
-        <max_instances>4</max_instances>
-        <initial_instances>4</initial_instances>
-        <max_samples>25</max_samples>
-        <initial_samples>10</initial_samples>
-        <max_samples_per_instance>5</max_samples_per_instance>
-      </resource_limits>
-    </datawriter_qos>
-    <!-- QoS used to configure the data reader created in the example code -->
-    <datareader_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-      </reliability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-      <resource_limits>
-        <max_instances>4</max_instances>
-        <initial_instances>4</initial_instances>
-        <max_samples>25</max_samples>
-        <initial_samples>10</initial_samples>
-        <max_samples_per_instance>5</max_samples_per_instance>
-      </resource_limits>
-    </datareader_qos>
-  </qos_profile>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index ab40e123e60..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-Description
-XML QoS Profile
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="SlMbM_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="SlMbMProfile" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>10</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-       <resource_limits>
-          <max_instances>4</max_instances>
-          <initial_instances>4</initial_instances>
-          <max_samples>25</max_samples>
-          <initial_samples>10</initial_samples>
-          <max_samples_per_instance>5</max_samples_per_instance>
-        </resource_limits>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-          <serialize_key_with_dispose>BOOLEAN_TRUE</serialize_key_with_dispose>
-        </protocol>
-      </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-       <resource_limits>
-          <max_instances>4</max_instances>
-          <initial_instances>4</initial_instances>
-          <max_samples>25</max_samples>
-          <initial_samples>10</initial_samples>
-          <max_samples_per_instance>5</max_samples_per_instance>
-        </resource_limits>
-        <protocol>
-          <propagate_dispose_of_unregistered_instances>BOOLEAN_TRUE</propagate_dispose_of_unregistered_instances>
-        </protocol>
-      </datareader_qos>
-     </qos_profile>
-  </qos_library>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl
deleted file mode 100755
index c5b1964e047..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 30 seconds to allow task to complete\n";
-sleep (30);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/.gitignore b/CIAO/connectors/dds4ccm/tests/SLOneByOne/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl
deleted file mode 100644
index 551272ab7ec..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file   SL_OneByOne_Base.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef SL_ONEBYONE_BASE_IDL
-#define SL_ONEBYONE_BASE_IDL
-
-#pragma ndds typesupport "Base/SL_OneByOne_BaseSupport.h"
-#pragma opendds typesupport "Base/SL_OneByOne_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "TestTopic"
-#pragma DCPS_DATA_KEY "TestTopic key"
-
-struct TestTopic {
-  string key; //@key
-  long x;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TestTopic> TestTopicSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc
deleted file mode 100644
index 2e9e3dc6f6c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_SL_OneByOne_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_SL_OneByOne_Base_stub
-  dynamicflags += SL_ONEBYONE_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=SL_ONEBYONE_BASE_STUB_Export \
-              -Wb,stub_export_include=SL_OneByOne_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    SL_OneByOne_Base.idl
-  }
-
-  opendds_ts_flags += --export=SL_ONEBYONE_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    SL_OneByOne_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc
deleted file mode 100644
index b135115a86b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_SL_OneByOne_Base -l .. -o ../lib -u DDS SL_OneByOne_Connector"
-
-project(DDS_SL_OBO_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_SL_OneByOne_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SL_ONEBYONE_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=SL_OneByOne_Connector_stub_export.h \
-              -Wb,skel_export_macro=SL_ONEBYONE_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=SL_OneByOne_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=SL_ONEBYONE_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=SL_OneByOne_Connector_svnt_export.h \
-              -Wb,conn_export_macro=SL_ONEBYONE_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=SL_OneByOne_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    SL_OneByOne_Connector.idl
-  }
-}
-
-project(DDS_SL_OBO_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_SL_OBO_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=SL_ONEBYONE_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=SL_OneByOne_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    SL_OneByOne_ConnectorE.idl
-  }
-}
-
-project(DDS_SL_OBO_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_SL_OBO_Connector_lem_gen DDS_SL_OneByOne_Connector_stub DDS_SL_OneByOne_Base_stub
-  libs  += DDS_SL_OneByOne_Base_stub DDS_SL_OneByOne_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_SL_OBO_Connector_lem_stub
-  dynamicflags += SL_ONEBYONE_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_OneByOne_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    SL_OneByOne_ConnectorEC.h
-    SL_OneByOne_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    SL_OneByOne_ConnectorEC.inl
-  }
-}
-
-project(DDS_SL_OneByOne_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_SL_OBO_Connector_idl_gen DDS_SL_OneByOne_Base_stub
-  libs  += DDS_SL_OneByOne_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_SL_OneByOne_Connector_stub
-  dynamicflags += SL_ONEBYONE_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_OneByOne_ConnectorC.cpp
-  }
-
-  Header_Files {
-    SL_OneByOne_ConnectorC.h
-    SL_OneByOne_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    SL_OneByOne_ConnectorC.inl
-  }
-}
-
-project(DDS_SL_OneByOne_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_SL_OBO_Connector_lem_stub DDS_SL_OneByOne_Connector_stub DDS_SL_OneByOne_Base_stub
-  sharedname = DDS_SL_OneByOne_Connector_exec
-  libs += DDS_SL_OneByOne_Connector_stub DDS_SL_OBO_Connector_lem_stub DDS_SL_OneByOne_Base_stub DDS_SL_OneByOne_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SL_ONEBYONE_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_OneByOne_Connector_conn.cpp
-  }
-
-  Header_Files {
-    SL_OneByOne_Connector_conn.h
-    SL_OneByOne_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_SL_OneByOne_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_SL_OBO_Connector_lem_stub DDS_SL_OneByOne_Connector_exec DDS_SL_OneByOne_Connector_stub
-  sharedname  = DDS_SL_OneByOne_Connector_svnt
-  libs       += DDS_SL_OneByOne_Connector_stub \
-                DDS_SL_OBO_Connector_lem_stub  \
-                DDS_SL_OneByOne_Base_stub \
-                DDS_SL_OneByOne_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SL_ONEBYONE_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_OneByOne_ConnectorS.cpp
-    SL_OneByOne_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    SL_OneByOne_ConnectorS.h
-    SL_OneByOne_Connector_svnt.h
-    SL_OneByOne_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector.idl b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector.idl
deleted file mode 100644
index 3c00070f29c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file SL_OneByOne_Connector.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef SL_ONEBYONE_CONNECTOR_IDL_
-#define SL_ONEBYONE_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/SL_OneByOne_Base.idl"
-
-#pragma ciao lem "Connector/SL_OneByOne_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/SL_OneByOne_BaseTypeSupport.idl"
-#endif
-
-module SL_OneByOne
-{
-  module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> SL_OneByOneConnector;
-};
-
-#endif /* SL_OneByOne_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.idl b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.idl
deleted file mode 100644
index 60bb6a4d68d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @file
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/SL_OneByOne_Connector.idl"
-
-module SL_OneByOne
-{
-  component Receiver
-  {
-    port SL_OneByOneConnector::DDS_StateListen info_out;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc
deleted file mode 100644
index ca67a723ed7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc
+++ /dev/null
@@ -1,136 +0,0 @@
-project(DDS_SL_OneByOne_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_SL_OBO_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h \
-              -I..
-
-  IDL_Files {
-    SL_OneByOne_Receiver.idl
-  }
-}
-
-project(DDS_SL_OneByOne_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_SL_OneByOne_Receiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    SL_OneByOne_ReceiverE.idl
-  }
-}
-
-project(DDS_SL_OBO_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_SL_OneByOne_Receiver_lem_gen DDS_SL_OneByOne_Receiver_stub  DDS_SL_OneByOne_Connector_stub DDS_SL_OneByOne_Base_stub
-  libs  +=  Receiver_stub DDS_SL_OneByOne_Connector_stub DDS_SL_OneByOne_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_OneByOne_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    SL_OneByOne_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    SL_OneByOne_ReceiverEC.inl
-  }
-}
-
-project(DDS_SL_OneByOne_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_SL_OneByOne_Receiver_idl_gen  DDS_SL_OneByOne_Connector_stub DDS_SL_OneByOne_Base_stub DDS_SL_OBO_Connector_lem_gen
-  libs  += DDS_SL_OneByOne_Connector_stub DDS_SL_OneByOne_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_OneByOne_ReceiverC.cpp
-  }
-
-  Header_Files {
-    SL_OneByOne_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    SL_OneByOne_ReceiverC.inl
-  }
-}
-
-project(DDS_SL_OneByOne_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_SL_OBO_Receiver_lem_stub DDS_SL_OneByOne_Receiver_stub DDS_SL_OneByOne_Base_stub DDS_SL_OneByOne_Connector_stub DDS_SL_OBO_Connector_lem_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_SL_OneByOne_Base_stub DDS_SL_OneByOne_Connector_stub DDS_SL_OBO_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_OneByOne_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    SL_OneByOne_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_SL_OneByOne_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_SL_OBO_Receiver_lem_stub DDS_SL_OneByOne_Base_stub DDS_SL_OneByOne_Connector_stub DDS_SL_OneByOne_Connector_svnt DDS_SL_OneByOne_Receiver_exec DDS_SL_OBO_Connector_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_SL_OneByOne_Base_stub DDS_SL_OneByOne_Connector_stub DDS_SL_OneByOne_Connector_svnt Receiver_exec DDS_SL_OBO_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_OneByOne_ReceiverS.cpp
-    SL_OneByOne_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    SL_OneByOne_ReceiverS.h
-    SL_OneByOne_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp
deleted file mode 100644
index 76c657248b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp
+++ /dev/null
@@ -1,455 +0,0 @@
-// -*- C++ -*-
-#include "SL_OneByOne_Receiver_exec.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-#define ON_CREATION_EXPECTED 4
-#define ON_ONE_UPDATE_EXPECTED 4
-#define ON_DELETION_EXPECTED 4
-
-namespace CIAO_SL_OneByOne_Receiver_Impl
-{
-
-  /**
-   * Facet Executor Implementation Class: info_out_data_listener_exec_i
-   */
-  info_out_data_listener_exec_i::info_out_data_listener_exec_i (
-        ::SL_OneByOne::CCM_Receiver_Context_ptr ctx,
-        Atomic_Long &on_many_updates,
-        Atomic_Long &on_creation,
-        Atomic_Long &on_one_update,
-        Atomic_Long &on_deletion,
-        Atomic_Long &samples_read,
-        ACE_Thread_ID &thread_id)
-    : ciao_context_ (
-        ::SL_OneByOne::CCM_Receiver_Context::_duplicate (ctx))
-      , on_many_updates_ (on_many_updates)
-      , on_creation_ (on_creation)
-      , on_one_update_ (on_one_update)
-      , on_deletion_ (on_deletion)
-      , samples_read_ (samples_read)
-      , thread_id_  (thread_id)
-  {
-  }
-
-  info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::SL_OneByOne::SL_OneByOneConnector::StateListener
-
-  void
-  info_out_data_listener_exec_i::on_creation (const ::TestTopic & datum,
-  const ::CCM_DDS::ReadInfo & info)
-  {
-    ACE_Thread_ID t_id;
-    this->thread_id_ = t_id;
-    if (!datum.key.in() == 0 &&
-        info.instance_status == CCM_DDS::INSTANCE_CREATED)
-      {
-        ++this->on_creation_;
-      }
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("StateListener_exec_i::on_creation - ")
-                          ACE_TEXT ("Received sample: key <%C> - iteration <%d>\n"),
-                          datum.key.in (),
-                          datum.x));
-  }
-
-  void
-  info_out_data_listener_exec_i::on_one_update (const ::TestTopic & datum,
-  const ::CCM_DDS::ReadInfo & info)
-  {
-    if (info.instance_status != CCM_DDS::INSTANCE_UPDATED)
-      {
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("ERROR: did not receive the expected info.status ")
-                    ACE_TEXT ("'CCM_DDS::INSTANCE_UPDATED' ")
-                    ACE_TEXT ("with operation 'on_one_update' ")
-                    ACE_TEXT ("from StateListener in Receiver\n")));
-
-      }
-
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("StateListener_exec_i::on_one_update - ")
-                          ACE_TEXT ("Received sample: key <%C> - iteration <%d>\n"),
-                          datum.key.in (),
-                          datum.x));
-
-    if (!datum.key.in() == 0 &&
-        info.instance_status == CCM_DDS::INSTANCE_UPDATED)
-      {
-        ++this->on_one_update_;
-      }
-
-    // When we have received all updates, check if there is something
-    // left in the cache
-    if (this->on_one_update_.value () == ON_ONE_UPDATE_EXPECTED)
-      {
-        try
-          {
-            ::SL_OneByOne::SL_OneByOneConnector::Reader_var reader =
-              this->ciao_context_->get_connection_info_out_data ();
-            if (::CORBA::is_nil (reader.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, "info_out_data_listener_exec_i::on_one_update - "
-                          "ERROR: Reader seems nil\n"));
-              }
-            ::TestTopicSeq seq;
-            ::CCM_DDS::ReadInfoSeq infos;
-            reader->read_all (seq, infos);
-            this->samples_read_ += seq.length ();
-
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("StateListener_exec_i::on_one_update - ")
-                                  ACE_TEXT ("Read <%u> samples\n"),
-                                  seq.length ()));
-          }
-        catch (const CCM_DDS::InternalError& ex)
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                        ACE_TEXT ("when using reader->read_all: index <%d> - retval <%d>\n"),
-                        ex.index, ex.error_code));
-          }
-      }
-  }
-
-  void
-  info_out_data_listener_exec_i::on_many_updates (const ::TestTopicSeq & /* data */,
-  const ::CCM_DDS::ReadInfoSeq & infos)
-  {
-    this->on_many_updates_ += infos.length ();
-  }
-
-  void
-  info_out_data_listener_exec_i::on_deletion (const ::TestTopic & datum,
-  const ::CCM_DDS::ReadInfo & info)
-  {
-    if (info.instance_status != CCM_DDS::INSTANCE_DELETED)
-      {
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("ERROR: did not receive the expected info.status ")
-                    ACE_TEXT ("'CCM_DDS::INSTANCE_DELETED' ")
-                    ACE_TEXT ("with operation 'on_deletion' ")
-                    ACE_TEXT ("from StateListener in Receiver\n")));
-
-      }
-    else
-      {
-        // Because of the settings <serialize_key_with_dispose> and
-        // <propagate_dispose_of_unregistered_instances> in the QoS , we expect
-        // an existing datum.key
-        // Since these are RTI DDS specific QOS settings, we only need to test
-        // this in case RTI DDS
-#if (CIAO_DDS4CCM_NDDS==1)
-        if ((ACE_OS::strncmp (datum.key.in(), "KEY", 3) == 0  ) ||
-            (ACE_OS::strncmp (datum.key.in(), "many", 4) == 0  ))
-          {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Statelistener:on_deletion : ")
-                        ACE_TEXT ("Received datum for <%C> \n"),
-                        datum.key.in ()));
-            ++this->on_deletion_;
-           }
-        else
-          {
-            ACE_ERROR ((LM_ERROR,
-                        ACE_TEXT ("ERROR Statelistener:on_deletion : did not ")
-                        ACE_TEXT ("receive the expected datum, received <%C>")
-                        ACE_TEXT (", expected <KEY_.> or <many_.>\n"),
-                        datum.key.in ()));
-          }
-#else
-        ACE_UNUSED_ARG (datum);
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Statelistener:on_deletion : ")
-                    ACE_TEXT ("Received on_deletion event\n")));
-        ++this->on_deletion_;
-#endif
-      }
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_status_exec_i
-   */
-
-  info_out_status_exec_i::info_out_status_exec_i (
-        ::SL_OneByOne::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::SL_OneByOne::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_status_exec_i::~info_out_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : on_many_updates_ (0),
-      updater_data_ (0),
-      on_creation_ (0),
-      on_one_update_ (0),
-      on_deletion_ (0),
-      samples_read_ (0),
-      thread_id_listener_ (0, 0)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-
-  // Component attributes and port operations.
-
-  ::SL_OneByOne::SL_OneByOneConnector::CCM_StateListener_ptr
-  Receiver_exec_i::get_info_out_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ()))
-      {
-        info_out_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_data_listener_exec_i (
-            this->ciao_context_.in (),
-            this->on_many_updates_,
-            this->on_creation_,
-            this->on_one_update_,
-            this->on_deletion_,
-            this->samples_read_,
-            this->thread_id_listener_),
-          ::SL_OneByOne::SL_OneByOneConnector::CCM_StateListener::_nil ());
-
-          this->ciao_info_out_data_listener_ = tmp;
-      }
-
-    return
-      ::SL_OneByOne::SL_OneByOneConnector::CCM_StateListener::_duplicate (
-        this->ciao_info_out_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ()))
-      {
-        info_out_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_out_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_out_status_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::SL_OneByOne::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    ::CCM_DDS::StateListenerControl_var lc =
-    this->ciao_context_->get_connection_info_out_data_control ();
-
-    if (::CORBA::is_nil (lc.in ()))
-      {
-         ACE_ERROR ((LM_ERROR, ACE_TEXT ("Error:  Listener control receptacle is null!\n")));
-        throw ::CORBA::INTERNAL ();
-      }
-    lc->mode (::CCM_DDS::ONE_BY_ONE);
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    if (this->on_many_updates_.value () != 0)
-      {
-         ACE_ERROR ((LM_ERROR,
-                     ACE_TEXT ("ERROR: Received an unexpected ")
-                     ACE_TEXT ("number of samples on 'on_many_updates' ")
-                     ACE_TEXT ("expected <0> - received <%d>\n"),
-                     this->on_many_updates_.value ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("OK: Received the expected ")
-                    ACE_TEXT ("number of samples on 'on_many_updates' ")
-                    ACE_TEXT ("expected <0> - received <%d>\n"),
-                    this->on_many_updates_.value ()));
-      }
-    if (this->on_creation_.value () != ON_CREATION_EXPECTED)
-      {
-         ACE_ERROR ((LM_ERROR,
-                     ACE_TEXT ("ERROR: didn't receive the expected ")
-                     ACE_TEXT (" number of samples on 'on_creation' ")
-                     ACE_TEXT ("expected <%d> - received <%d>\n"),
-                     ON_CREATION_EXPECTED,
-                     this->on_creation_.value ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("OK: Received the expected ")
-                    ACE_TEXT ("number of samples on 'on_creation' ")
-                     ACE_TEXT ("expected <%d> - received <%d>\n"),
-                     ON_CREATION_EXPECTED,
-                     this->on_creation_.value ()));
-      }
-
-    if (this->on_one_update_.value () != ON_ONE_UPDATE_EXPECTED)
-      {
-         ACE_ERROR ((LM_ERROR,
-                     ACE_TEXT ("ERROR: didn't receive the expected ")
-                     ACE_TEXT (" number of samples on 'on_one_update' ")
-                     ACE_TEXT ("expected <%d> - received <%d>\n"),
-                     ON_ONE_UPDATE_EXPECTED,
-                     this->on_one_update_.value ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("OK: Received the expected ")
-                    ACE_TEXT ("number of samples on 'on_one_update' ")
-                    ACE_TEXT ("expected <%d> - received <%d>\n"),
-                    ON_ONE_UPDATE_EXPECTED,
-                    this->on_one_update_.value ()));
-      }
-
-    if (this->on_deletion_.value () != ON_DELETION_EXPECTED)
-      {
-         ACE_ERROR ((LM_ERROR,
-                     ACE_TEXT ("ERROR: didn't receive the expected ")
-                     ACE_TEXT ("number of samples on 'on_deletion' ")
-                     ACE_TEXT ("expected <%d> - received <%d>\n"),
-                     ON_DELETION_EXPECTED,
-                     this->on_deletion_.value ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("OK: Received the expected ")
-                    ACE_TEXT ("number of samples on 'on_deletion' ")
-                    ACE_TEXT ("expected <%d> - received <%d>\n"),
-                    ON_DELETION_EXPECTED,
-                    this->on_deletion_.value ()));
-      }
-    if (this->samples_read_.value () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: read no samples\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: read <%u> samples\n"),
-                this->samples_read_.value ()));
-      }
-
-    char ccm_buf [65];
-    ACE_Thread_ID ccm_thread_id;
-    ccm_thread_id.to_string (ccm_buf);
-
-    char list_buf [65];
-    this->thread_id_listener_.to_string (list_buf);
-
-
-    if (this->thread_id_listener_.id () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
-                              "Thread ID for StatusListener not set!\n"));
-      }
-    #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (this->thread_id_listener_ == ccm_thread_id)
-      {
-        ACE_DEBUG ((LM_DEBUG, "OK: "
-                              "Thread switch for StatusListener seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                               "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-     }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
-                              "Thread switch for StatusListener "
-                              "doesn't seem to work! "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    #else
-    else if (this->thread_id_listener_ == ccm_thread_id)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: StatusListener: "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "OK: StatusListener: "
-                              "DDS seems to use its own thread for its callback: "
-                               "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-     }
-    #endif
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_SL_OneByOne_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h
deleted file mode 100644
index d86034c23bd..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h
+++ /dev/null
@@ -1,179 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_SL_ONEBYONE_RECEIVER_EXEC_TKIVXN_H_
-#define CIAO_SL_ONEBYONE_RECEIVER_EXEC_TKIVXN_H_
-
-#include /**/ "ace/pre.h"
-
-#include "SL_OneByOne_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_SL_OneByOne_Receiver_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::ULong> Atomic_Long;
-
-  class Receiver_exec_i;
-
-  /**
-   * Provider Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  class info_out_data_listener_exec_i
-    : public virtual ::SL_OneByOne::SL_OneByOneConnector::CCM_StateListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_data_listener_exec_i (
-      ::SL_OneByOne::CCM_Receiver_Context_ptr ctx,
-      Atomic_Long &,
-      Atomic_Long &,
-      Atomic_Long &,
-      Atomic_Long &,
-      Atomic_Long &,
-      ACE_Thread_ID &);
-    virtual ~info_out_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from SL_OneByOne::SL_OneByOneConnector::StateListener. */
-
-    virtual
-    void on_creation (const ::TestTopic & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_one_update (const ::TestTopic & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_updates (const ::TestTopicSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-
-    virtual
-    void on_deletion (const ::TestTopic & datum,
-    const ::CCM_DDS::ReadInfo & info);
-    //@}
-
-  private:
-    ::SL_OneByOne::CCM_Receiver_Context_var ciao_context_;
-     Atomic_Long &on_many_updates_;
-     Atomic_Long &on_creation_;
-     Atomic_Long &on_one_update_;
-     Atomic_Long &on_deletion_;
-     Atomic_Long &samples_read_;
-     ACE_Thread_ID &thread_id_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_status_exec_i
-   */
-
-  class info_out_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_status_exec_i (
-      ::SL_OneByOne::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::SL_OneByOne::CCM_Receiver_Context_var ciao_context_;
-    Atomic_Long on_many_updates_;
-    Atomic_Long updater_data_;
-    Atomic_Long on_creation_;
-    Atomic_Long on_one_update_;
-    Atomic_Long on_deletion_;
-    ACE_Thread_ID thread_id_listener_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::SL_OneByOne::SL_OneByOneConnector::CCM_StateListener_ptr
-    get_info_out_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_status (void);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-
-    //@}
-
-  private:
-    ::SL_OneByOne::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::SL_OneByOne::SL_OneByOneConnector::CCM_StateListener_var ciao_info_out_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    Atomic_Long on_many_updates_;
-    Atomic_Long updater_data_;
-    Atomic_Long on_creation_;
-    Atomic_Long on_one_update_;
-    Atomic_Long on_deletion_;
-    Atomic_Long samples_read_;
-    ACE_Thread_ID thread_id_listener_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_SL_OneByOne_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.idl b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.idl
deleted file mode 100644
index 523b6d61086..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef DDS_SL_ONEBYONE_SENDER_IDL
-#define DDS_SL_ONEBYONE_SENDER_IDL
-
-#include "Connector/SL_OneByOne_Connector.idl"
-
-module SL_OneByOne
-{
-  component Sender
-  {
-     port SL_OneByOneConnector::DDS_Update test_topic_update;
-     provides CCM_DDS::ConnectorStatusListener test_topic_connector_status;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc
deleted file mode 100644
index e3710cc20e7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc
+++ /dev/null
@@ -1,138 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_SL_OneByOne_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_SL_OneByOne_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_SL_OBO_Connector_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I..
-
-  IDL_Files {
-    SL_OneByOne_Sender.idl
-  }
-}
-
-project(DDS_SL_OneByOne_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_SL_OneByOne_Sender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    SL_OneByOne_SenderE.idl
-  }
-}
-
-project(DDS_SL_OneByOne_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_SL_OneByOne_Sender_lem_gen DDS_SL_OneByOne_Sender_stub DDS_SL_OneByOne_Base_stub
-  libs  += DDS_SL_OneByOne_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_OneByOne_SenderEC.cpp
-  }
-
-  Header_Files {
-    SL_OneByOne_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    SL_OneByOne_SenderEC.inl
-  }
-}
-
-project(DDS_SL_OneByOne_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_SL_OneByOne_Sender_idl_gen DDS_SL_OneByOne_Base_stub DDS_SL_OneByOne_Connector_stub
-  libs  += DDS_SL_OneByOne_Base_stub DDS_SL_OneByOne_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_OneByOne_SenderC.cpp
-  }
-
-  Header_Files {
-    SL_OneByOne_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    SL_OneByOne_SenderC.inl
-  }
-}
-
-project(DDS_SL_OneByOne_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_SL_OneByOne_Sender_lem_stub DDS_SL_OneByOne_Sender_stub DDS_SL_OBO_Connector_lem_stub DDS_SL_OneByOne_Connector_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub DDS_SL_OneByOne_Base_stub DDS_SL_OBO_Connector_lem_stub  DDS_SL_OneByOne_Connector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_OneByOne_Sender_exec.cpp
-  }
-
-  Header_Files {
-    SL_OneByOne_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_SL_OneByOne_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_SL_OneByOne_Base_stub  DDS_SL_OneByOne_Sender_lem_stub DDS_SL_OneByOne_Connector_stub DDS_SL_OneByOne_Connector_svnt DDS_SL_OBO_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                DDS_SL_OneByOne_Base_stub DDS_SL_OneByOne_Connector_stub  DDS_SL_OneByOne_Connector_svnt DDS_SL_OBO_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_OneByOne_SenderS.cpp
-    SL_OneByOne_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    SL_OneByOne_SenderS.h
-    SL_OneByOne_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.cpp
deleted file mode 100644
index 408858409d7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.cpp
+++ /dev/null
@@ -1,482 +0,0 @@
-// -*- C++ -*-
-#include "SL_OneByOne_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_SL_OneByOne_Sender_Impl
-{
-  /**
-   * Write action generator
-   */
-  pulse_Generator::pulse_Generator (Sender_exec_i &callback)
-    : pulse_callback_ (callback)
-  {
-  }
-
-  int
-  pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    // Notify the subscribers
-    this->pulse_callback_.tick ();
-    return 0;
-  }
-
-    /**
-   * ConnectorStatusListener_exec_i
-   */
-
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (
-    Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic (
-    ::DDS::Topic_ptr /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status(
-    ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind status_kind)
-  {
-    if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS)
-      {
-        this->callback_.start ();
-      }
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-  Sender_exec_i::Sender_exec_i (void)
-    : test_nr_(UPDATE_CREATE),
-      test_ok_(true)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      pulse_Generator (*this),
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_test_topic_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i (*this);
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  CORBA::Boolean
-  Sender_exec_i::create_one (void)
-  {
-    TestTopic i = this->topic_seq_one_[0];
-    try
-      {
-        ::SL_OneByOne::SL_OneByOneConnector::Updater_var updater =
-          this->ciao_context_->get_connection_test_topic_update_data ();
-        if (::CORBA::is_nil (updater.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "Sender_exec_i::create_one - "
-                      "ERROR: Updater seems nil\n"));
-            return false;
-          }
-        updater->create_one (i);
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("SL_OneByOne: create_one with instance key <%C>\n"),
-                   i.key.in ()));
-      }
-    catch (const CCM_DDS::AlreadyCreated &)
-      {
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("Unexpected exception: AlreadyCreated with test updater create_one <%C>.\n"),
-                      i.key.in ()));
-        return false;
-      }
-    catch (const CCM_DDS::InternalError& )
-      {
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("Internal Error while create_one for <%C>.\n"),
-                      i.key.in ()));
-        return false;
-      }
-    return true;
-  }
-
-  CORBA::Boolean
-  Sender_exec_i::update_one (void)
-  {
-    //update already created instance with handle nil
-    TestTopic i = this->topic_seq_one_[0];
-    try
-      {
-        ::SL_OneByOne::SL_OneByOneConnector::Updater_var updater =
-          this->ciao_context_->get_connection_test_topic_update_data ();
-        if (::CORBA::is_nil (updater.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "Sender_exec_i::update_one - "
-                      "ERROR: Updater seems nil\n"));
-            return false;
-          }
-        updater->update_one (i, DDS::HANDLE_NIL);
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Updater: update_one with already existing instance with DDS::HANDLE_NIL, key <%C>\n"),
-                      i.key.in ()));
-      }
-    catch (const CCM_DDS::NonExistent &)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater update_one <%C>.\n"),
-                       i.key.in ()));
-        return false;
-      }
-    catch (const CCM_DDS::InternalError& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while update_one for <%C>.\n"),
-                        i.key.in ()));
-        return false;
-      }
-    return true;
-  }
-
-  CORBA::Boolean
-  Sender_exec_i::delete_one (void)
-  {
-    //delete registered instance with DDS::HANDLE_NIL
-    TestTopic i = this->topic_seq_one_[0];
-    try
-      {
-        ::SL_OneByOne::SL_OneByOneConnector::Updater_var updater =
-          this->ciao_context_->get_connection_test_topic_update_data ();
-        if (::CORBA::is_nil (updater.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "Sender_exec_i::delete_one - "
-                      "ERROR: Updater seems nil\n"));
-            return false;
-          }
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Updater: delete_one with registered instance with DDS::HANDLE_NIL, key <%C>\n"),
-                      i.key.in ()));
-        updater->delete_one (i, DDS::HANDLE_NIL);
-      }
-    catch (const CCM_DDS::NonExistent &)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater delete_one <%C>.\n"),
-                       i.key.in ()));
-        return false;
-      }
-    catch (const CCM_DDS::InternalError& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while delete_one for <%C>.\n"),
-                        i.key.in ()));
-        return false;
-      }
-    return true;
-  }
-
-  CORBA::Boolean
-  Sender_exec_i::create_many (void)
-  {
-    //create many with no exception
-    try
-      {
-        ::SL_OneByOne::SL_OneByOneConnector::Updater_var updater =
-          this->ciao_context_->get_connection_test_topic_update_data ();
-        if (::CORBA::is_nil (updater.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "Sender_exec_i::create_many - "
-                      "ERROR: Updater seems nil\n"));
-            return false;
-          }
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("create_many : <%u> samples\n"),
-                         this->topic_seq_many_.length ()));
-        updater->create_many (this->topic_seq_many_);
-      }
-    catch (const CCM_DDS::NonExistent& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater create_many\n")));
-        return false;
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-         ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                     ACE_TEXT ("in updater: create_many: index <%d> - retval <%d>\n"),
-                     ex.index, ex.error_code));
-         return false;
-
-      }
-    return true;
-  }
-
-  CORBA::Boolean
-  Sender_exec_i::update_many (void)
-  {
-    try
-      {
-        ::SL_OneByOne::SL_OneByOneConnector::Updater_var updater =
-          this->ciao_context_->get_connection_test_topic_update_data ();
-        if (::CORBA::is_nil (updater.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "Sender_exec_i::update_many - "
-                      "ERROR: Updater seems nil\n"));
-            return false;
-          }
-        updater->update_many (this->topic_seq_many_);
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("update_many : written <%u> samples\n"),
-                   this->topic_seq_many_.length ()));
-      }
-    catch (const CCM_DDS::NonExistent& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater update_many.\n")));
-        return false;
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                     ACE_TEXT ("with update_many: index <%d> - retval <%d>\n"),
-                     ex.index, ex.error_code));
-        return false;
-      }
-    return true;
-  }
-
-  CORBA::Boolean
-  Sender_exec_i::delete_many (void)
-  {
-    try
-      {
-        ::SL_OneByOne::SL_OneByOneConnector::Updater_var updater =
-          this->ciao_context_->get_connection_test_topic_update_data ();
-        if (::CORBA::is_nil (updater.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "Sender_exec_i::delete_many - "
-                      "ERROR: Updater seems nil\n"));
-            return false;
-          }
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("delete_many : deleted <%u> samples\n"),
-                                          this->topic_seq_many_.length ()));
-        updater->delete_many (this->topic_seq_many_);
-      }
-    catch (const CCM_DDS::NonExistent& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater delete_many\n")));
-        return false;
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                   ACE_TEXT ("with test updater delete_many: index <%d> - retval <%d>\n"),
-                   ex.index, ex.error_code));
-        return false;
-      }
-
-    return true;
-  }
-
-  void
-  Sender_exec_i::add_instances_of_topic ()
-  {
-    CORBA::UShort total = 3;
-    this->topic_seq_one_.length (total);
-    //sequence for tests with .._one
-    for (int i = 1; i < (total + 1); i++)
-      {
-        char key[7];
-        TestTopic new_key;
-        ACE_OS::sprintf (key, "KEY_%d", i);
-        new_key.key = CORBA::string_dup(key);
-        new_key.x = i;
-        this->topic_seq_one_[i-1] = new_key;
-      }
-    //sequence for tests with .._many
-    this->topic_seq_many_.length (total);
-    for (int i = 1; i < (total + 1); i++)
-      {
-        char key[7];
-        TestTopic new_key;
-        ACE_OS::sprintf (key, "many_%d", i);
-        new_key.key = CORBA::string_dup(key);
-        new_key.x = i;
-        this->topic_seq_many_[i-1] = new_key;
-      }
-  }
-
-  void
-  Sender_exec_i::tick ()
-  {
-    if(this->test_ok_.value())
-     {
-       switch (this->test_nr_)
-         {
-          case UPDATE_CREATE:
-            this->test_ok_ = this->create_one();
-            if(this->test_ok_.value())
-              {
-                this->test_nr_ = UPDATE_ONE;
-              }
-            else
-              {
-                this->test_nr_ = END_TEST;
-              }
-            break;
-          case UPDATE_ONE:
-            this->test_ok_ = this->update_one();
-            this->test_nr_ = DELETE_ONE;
-            break;
-          case DELETE_ONE:
-            this->test_ok_ = this->delete_one();
-            this->test_nr_ = CREATE_MANY;
-            break;
-          case CREATE_MANY:
-            this->test_ok_ = this->create_many();
-            if(this->test_ok_.value())
-              {
-                this->test_nr_ = UPDATE_MANY;
-              }
-            else
-              {
-                this->test_nr_ = END_TEST;
-              }
-            this->test_nr_ = UPDATE_MANY;
-            break;
-          case UPDATE_MANY:
-            this->test_ok_ = this->update_many();
-            this->test_nr_ = DELETE_MANY;
-            break;
-          case DELETE_MANY:
-            this->test_ok_ = this->delete_many();
-            this->test_nr_ = END_TEST;
-            break;
-          default:
-            break;
-        }
-    }
-  }
-  void
-  Sender_exec_i::start (void)
-  {
-    long sec = 1L;
-    long const usec = 0L;
-    if (this->reactor ()->schedule_timer (
-                this->ticker_,
-                0,
-                ACE_Time_Value (sec, usec),
-                ACE_Time_Value (sec, usec)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                               ACE_TEXT ("Error scheduling timer")));
-      }
-  }
-
-  void
-  Sender_exec_i::stop (void)
-  {
-    this->reactor ()->cancel_timer (this->ticker_);
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n")));
-  }
-
-
-  // Component attributes and port operations.
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::SL_OneByOne::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-    this->add_instances_of_topic ();
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    this->stop ();
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_SL_OneByOne_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.h
deleted file mode 100644
index 3fc8c6f80c7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.h
+++ /dev/null
@@ -1,160 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_SL_ONEBYONE_SENDER_EXEC_FHYBU2_H_
-#define CIAO_SL_ONEBYONE_SENDER_EXEC_FHYBU2_H_
-
-#include /**/ "ace/pre.h"
-
-#include "SL_OneByOne_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_SL_OneByOne_Sender_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
-
-  class Sender_exec_i;
-
-  enum UPDATER_TEST {
-    UPDATE_CREATE,
-    UPDATE_ONE,
-    DELETE_ONE,
-    CREATE_MANY,
-    UPDATE_MANY,
-    DELETE_MANY,
-    END_TEST
-  };
-
-  /**
-   * Write action generator
-   */
-
-  class pulse_Generator :
-    public ACE_Event_Handler
-  {
-  public:
-    pulse_Generator (Sender_exec_i &callback);
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    Sender_exec_i &pulse_callback_;
-  };
-
-    /**
-   * ConnectorStatusListener_exec_i
-   */
-
-  class ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Sender_exec_i &callback);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-      void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                                 ::DDS::StatusKind status_kind);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_test_topic_connector_status (void);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void tick (void);
-    void start (void);
-    //@}
-
-  private:
-    ::SL_OneByOne::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    //@}
-
-    //@{
-    /** User defined members. */
-    pulse_Generator * ticker_;
-
-    UPDATER_TEST test_nr_;
-    Atomic_Boolean test_ok_;
-    TestTopicSeq topic_seq_one_;
-    TestTopicSeq topic_seq_many_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void stop (void);
-    void add_instances_of_topic (void);
-    CORBA::Boolean create_one (void);
-    CORBA::Boolean update_one (void);
-    CORBA::Boolean delete_one (void);
-    CORBA::Boolean create_many (void);
-    CORBA::Boolean update_many (void);
-    CORBA::Boolean delete_many (void);
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_SL_OneByOne_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/Plan.cdp
deleted file mode 100644
index fa41bb138c5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/Plan.cdp
+++ /dev/null
@@ -1,407 +0,0 @@
-<!--  -->
-<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>SL_OneByOne_Depl_1</label>
-  <UUID>SL_OneByOne_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SL_OneByOne_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SL_OneByOne_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="SL_OneByOne_ConnectorComponentImplementation">
-    <name>SL_OneByOne_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="SL_OneByOne_Connector_ExecArtifact" />
-    <artifact xmi:idref="SL_OneByOne_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SL_OneByOne_SL_OneByOneConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SL_OneByOne_SL_OneByOneConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SL_OneByOne_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SL_OneByOne_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SL_OneByOne_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SL_OneByOne_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-  </instance>
-  <instance xmi:id="SL_OneByOne_ConnectorComponentInstance">
-    <name>SL_OneByOne_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SL_OneByOne_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestQoS</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SlObO_Library#SlObOProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SL_OneByOne_ConnectorComponentInstance2">
-    <name>SL_OneByOne_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SL_OneByOne_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestQoS</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SlObO_Library#SlObOProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-  </instance>
-
-  <connection>
-    <name>_listenercontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SL_OneByOne_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_statelistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SL_OneByOne_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_portstatuslistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SL_OneByOne_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>info_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SL_OneByOne_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>updater_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>test_topic_update_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>observable_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SL_OneByOne_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>test_topic_connector_status_sender</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>test_topic_connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SL_OneByOne_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="SL_OneByOne_Connector_ExecArtifact">
-    <name>SL_OneByOne_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_SL_OneByOne_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="SL_OneByOne_Connector_SvntArtifact">
-    <name>SL_OneByOne_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_SL_OneByOne_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="SL_OneByOne_Connector_StubArtifact">
-    <name>SL_OneByOne_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_SL_OneByOne_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/SlObO_Library.xml b/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/SlObO_Library.xml
deleted file mode 100644
index cb7c60bad56..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/SlObO_Library.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-
-  <qos_profile name="SlObOProfile">
-    <!-- QoS used to configure the data writer created in the example code -->
-    <datawriter_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-        <max_blocking_time>
-          <sec>10</sec>
-          <nanosec>0</nanosec>
-        </max_blocking_time>
-      </reliability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-      <resource_limits>
-        <max_instances>4</max_instances>
-        <initial_instances>4</initial_instances>
-        <max_samples>25</max_samples>
-        <initial_samples>10</initial_samples>
-        <max_samples_per_instance>5</max_samples_per_instance>
-      </resource_limits>
-    </datawriter_qos>
-    <!-- QoS used to configure the data reader created in the example code -->
-    <datareader_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-      </reliability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-      <resource_limits>
-        <max_instances>4</max_instances>
-        <initial_instances>4</initial_instances>
-        <max_samples>25</max_samples>
-        <initial_samples>10</initial_samples>
-        <max_samples_per_instance>5</max_samples_per_instance>
-      </resource_limits>
-    </datareader_qos>
-  </qos_profile>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index f246058c89d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-Description
-XML QoS Profile
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="SlObO_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="SlObOProfile" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>10</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-       <resource_limits>
-          <max_instances>4</max_instances>
-          <initial_instances>4</initial_instances>
-          <max_samples>25</max_samples>
-          <initial_samples>10</initial_samples>
-          <max_samples_per_instance>5</max_samples_per_instance>
-        </resource_limits>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-          <serialize_key_with_dispose>BOOLEAN_TRUE</serialize_key_with_dispose>
-        </protocol>
-      </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-       <resource_limits>
-          <max_instances>4</max_instances>
-          <initial_instances>4</initial_instances>
-          <max_samples>25</max_samples>
-          <initial_samples>10</initial_samples>
-          <max_samples_per_instance>5</max_samples_per_instance>
-        </resource_limits>
-        <protocol>
-          <propagate_dispose_of_unregistered_instances>BOOLEAN_TRUE</propagate_dispose_of_unregistered_instances>
-        </protocol>
-      </datareader_qos>
-     </qos_profile>
-  </qos_library>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl
deleted file mode 100755
index e83fc426475..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", "-m 1 -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with -m 1 -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 20 seconds to allow task to complete\n";
-sleep (20);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/.gitignore b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl
deleted file mode 100644
index 05209b3e2a5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file SetConnectorAttribute_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef SETCONNECTORATTRIBUTE_BASE_IDL
-#define SETCONNECTORATTRIBUTE_BASE_IDL
-
-#pragma ndds typesupport "Base/SetConnectorAttribute_BaseSupport.h"
-#pragma opendds typesupport "Base/SetConnectorAttribute_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "SetConnectorAttributeTest"
-
-struct SetConnectorAttributeTest {
-  string key;
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<SetConnectorAttributeTest> SetConnectorAttributeTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc
deleted file mode 100644
index fff9c36f8b5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_SCABase_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_SCABase_stub
-  dynamicflags += SETCONNECTORATTRIBUTE_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=SETCONNECTORATTRIBUTE_BASE_STUB_Export \
-              -Wb,stub_export_include=SetConnectorAttribute_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    SetConnectorAttribute_Base.idl
-  }
-
-  opendds_ts_flags += --export=SETCONNECTORATTRIBUTE_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    SetConnectorAttribute_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/.gitignore b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/.gitignore
deleted file mode 100644
index fb87effb565..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/Component_exec_export.h
-/Component_lem_stub_export.h
-/Component_stub_export.h
-/Component_svnt_export.h
-/SetConnectorAttribute_ComponentE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.idl b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.idl
deleted file mode 100644
index 1a8a3b78706..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @file SetConnectorAttribute_Component.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef COMPONENT_IDL
-#define COMPONENT_IDL
-
-#include "Connector/SetConnectorAttribute_Connector.idl"
-
-module SetConnectorAttribute
-{
-  component SetConnectorAttributeComponent
-  {
-    port SetConnectorAttributeTestConnector::DDS_Write info_write;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.mpc b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.mpc
deleted file mode 100644
index 9decee0420d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-project(SetAttribute_Component_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_SCAConnector_idl_gen
-  idlflags += -Wb,stub_export_macro=COMPONENT_STUB_Export \
-              -Wb,stub_export_include=Component_stub_export.h \
-              -Wb,skel_export_macro=COMPONENT_SVNT_Export \
-              -Wb,skel_export_include=Component_svnt_export.h \
-              -Wb,svnt_export_macro=COMPONENT_SVNT_Export \
-              -Wb,svnt_export_include=Component_svnt_export.h \
-              -Wb,exec_export_macro=COMPONENT_EXEC_Export \
-              -Wb,exec_export_include=Component_exec_export.h -I..
-
-  IDL_Files {
-    SetConnectorAttribute_Component.idl
-  }
-}
-
-project(SetAttribute_Component_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += SetAttribute_Component_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=COMPONENT_LEM_STUB_Export \
-              -Wb,stub_export_include=Component_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    SetConnectorAttribute_ComponentE.idl
-  }
-}
-
-project(SetAttribute_Component_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += SetAttribute_Component_lem_gen SetAttribute_Component_stub  \
-           DDS_SCAConnector_stub DDS_SCABase_stub
-  libs  +=  Component_stub DDS_SCAConnector_stub \
-            DDS_SCABase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Component_lem_stub
-  dynamicflags += COMPONENT_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SetConnectorAttribute_ComponentEC.cpp
-  }
-
-  Header_Files {
-    SetConnectorAttribute_ComponentEC.h
-    Component_lem_stub_export.h
-  }
-
-  Inline_Files {
-    SetAttribute_ComponentEC.inl
-  }
-}
-
-project(SetAttribute_Component_stub) : ccm_stub, dds4ccm_base {
-  after += SetAttribute_Component_idl_gen  DDS_SCAConnector_stub \
-           DDS_SCABase_stub DDS_SCAConnector_lem_gen
-  libs  += DDS_SCAConnector_stub DDS_SCABase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Component_stub
-  dynamicflags += COMPONENT_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SetConnectorAttribute_ComponentC.cpp
-  }
-
-  Header_Files {
-    SetConnectorAttribute_ComponentC.h
-    Component_stub_export.h
-  }
-
-  Inline_Files {
-    SetConnectorAttribute_ComponentC.inl
-  }
-}
-
-project(SetAttribute_Component_exec) : ciao_executor, dds4ccm_impl {
-  after   += SetAttribute_Component_lem_stub SetAttribute_Component_stub \
-             DDS_SCABase_stub DDS_SCAConnector_stub \
-             DDS_SCAConnector_lem_stub
-  sharedname = Component_exec
-  libs += Component_stub Component_lem_stub DDS_SCABase_stub \
-          DDS_SCAConnector_stub DDS_SCAConnector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COMPONENT_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SetConnectorAttribute_Component_exec.cpp
-  }
-
-  Header_Files {
-    SetConnectorAttribute_Component_exec.h
-    Component_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(SetAttribute_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   SetAttribute_Component_lem_stub DDS_SCABase_stub \
-                  DDS_SCAConnector_stub DDS_SCAConnector_svnt \
-                  SetAttribute_Component_exec DDS_SCAConnector_lem_stub
-  sharedname  = Component_svnt
-  libs       += Component_stub Component_lem_stub DDS_SCABase_stub \
-                DDS_SCAConnector_stub DDS_SCAConnector_svnt \
-                Component_exec DDS_SCAConnector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COMPONENT_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SetConnectorAttribute_ComponentS.cpp
-    SetConnectorAttribute_Component_svnt.cpp
-  }
-
-  Header_Files {
-    SetConnectorAttribute_ComponentS.h
-    SetConnectorAttribute_Component_svnt.h
-    Component_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.cpp
deleted file mode 100644
index 35a19a25c41..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.cpp
+++ /dev/null
@@ -1,203 +0,0 @@
-// -*- C++ -*-
-#include "SetConnectorAttribute_Component_exec.h"
-#include "Connector/SetConnectorAttribute_Connector_conn.h"
-
-#include "dds4ccm/impl/Utils.h"
-#if (CIAO_DDS4CCM_NDDS == 1)
-#include "dds4ccm/impl/ndds/DataWriter_T.h"
-#include "Base/SetConnectorAttribute_BaseSupport.h"
-#endif
-
-#define DOMAIN_ID_IN_DP 56
-#define TOPIC_NAME_IN_DP "SetConnectorAttribute"
-
-#define DW_MAX_BLOCKING_TIME_SEC 11
-#define DW_MAX_BLOCKING_TIME_NSEC 200
-
-namespace CIAO_SetConnectorAttribute_SetConnectorAttributeComponent_Impl
-{
-  //============================================================
-  // Component_exec_i
-  //============================================================
-  Component_exec_i::Component_exec_i (void)
-  {
-  }
-
-  Component_exec_i::~Component_exec_i (void)
-  {
-  }
-
-  void
-  Component_exec_i::check_topic_name (DDSTopic * tp)
-  {
-#if (CIAO_DDS4CCM_NDDS == 1)
-    if (ACE_OS::strcmp (tp->get_name (), TOPIC_NAME_IN_DP) == 0)
-      {
-        ACE_DEBUG ((LM_DEBUG, "Component_exec_i::check_topic_name - "
-                              "Topic name set properly.\n"));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "Component_exec_i::check_topic_name - "
-                              "Topic name not properly set: "
-                              "expected <%C> - retrieved <%C>\n",
-                              TOPIC_NAME_IN_DP,
-                              tp->get_name ()));
-      }
-#else
-    ACE_UNUSED_ARG (tp);
-#endif
-  }
-
-  void
-  Component_exec_i::check_domain_id (DDSPublisher * pub)
-  {
-#if (CIAO_DDS4CCM_NDDS == 1)
-    DDSDomainParticipant * part = pub->get_participant ();
-    if (part->get_domain_id () != DOMAIN_ID_IN_DP)
-      {
-        ACE_ERROR ((LM_ERROR, "Component_exec_i::check_domain_id - "
-                              "ERROR: Domain ID not set properly: "
-                              "expected <%u> - retrieved <%u>\n",
-                              DOMAIN_ID_IN_DP,
-                              part->get_domain_id ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "Component_exec_i::check_domain_id - "
-                              "Domain ID set properly.\n"));
-      }
-#else
-    ACE_UNUSED_ARG (pub);
-#endif
-  }
-
-  void
-  Component_exec_i::check_attributes (DDSDataWriter * dw)
-  {
-#if (CIAO_DDS4CCM_NDDS == 1)
-    // Check topic name
-    DDSTopic * tp = dw->get_topic ();
-    if (!tp)
-      {
-        ACE_ERROR ((LM_ERROR, "Component_exec_i::check_attributes - "
-                              "Unable to retrieve topic.\n"));
-      }
-    else
-      {
-        this->check_topic_name (tp);
-      }
-    //check domain id
-    ::DDSPublisher * pub = dw->get_publisher ();
-    if (!pub)
-      {
-        ACE_ERROR ((LM_ERROR, "Component_exec_i::check_attributes - "
-                              "Unable to retrieve Publisher.\n"));
-      }
-    else
-      {
-        this->check_domain_id (pub);
-        this->check_profile (pub);
-      }
-#else
-    ACE_UNUSED_ARG (dw);
-#endif
-  }
-
-  void
-  Component_exec_i::check_profile (DDSPublisher * pub)
-  {
-#if (CIAO_DDS4CCM_NDDS == 1)
-    DDS_DataWriterQos dw_qos;
-    pub->get_default_datawriter_qos (dw_qos);
-    if (dw_qos.reliability.max_blocking_time.sec == DW_MAX_BLOCKING_TIME_SEC &&
-        dw_qos.reliability.max_blocking_time.nanosec == DW_MAX_BLOCKING_TIME_NSEC)
-      {
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "Component_exec_i::check_profile - "
-                              "ERROR: Profile not set properly: "
-                              "expected sec <%u> - retrieved sec <%u> and "
-                              "expected nanosec <%u> - retrieved nanosec <%u>\n",
-                              dw_qos.reliability.max_blocking_time.sec,
-                              DW_MAX_BLOCKING_TIME_SEC,
-                              dw_qos.reliability.max_blocking_time.nanosec,
-                              DW_MAX_BLOCKING_TIME_NSEC));
-      }
-#else
-    ACE_UNUSED_ARG (pub);
-#endif
-  }
-
-  // Operations from Components::SessionComponent.
-  void
-  Component_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::SetConnectorAttribute::CCM_SetConnectorAttributeComponent_Context::_narrow (ctx);
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Component_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Component_exec_i::ccm_activate (void)
-  {
-#if (CIAO_DDS4CCM_NDDS == 1)
-    //check the settings on the connector
-    DDS::DataWriter_var dds_dw =
-      this->context_->get_connection_info_write_dds_entity ();
-
-    typedef ::CIAO::NDDS::DDS_DataWriter_Base DataWriter_type;
-    DataWriter_type * ccm_dds_dw = dynamic_cast <DataWriter_type*> (dds_dw.in ());
-    if (!ccm_dds_dw)
-      {
-        ACE_DEBUG ((LM_DEBUG, "ERROR: Component_exec_i::ccm_activate - "
-                              "Unable to cast\n"));
-        return;
-      }
-    DDSDataWriter * dw = ccm_dds_dw->get_rti_entity ();
-    if (dw)
-      {
-        this->check_attributes (dw);
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Component_exec_i::ccm_activate - "
-                              "Unable to retrieve DDSDataWriter.\n"));
-      }
-#endif
-  }
-
-  void
-  Component_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Component_exec_i::ccm_remove (void)
-  {
-  }
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_SetConnectorAttribute_Component_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Component_exec_i);
-
-    return retval;
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.h b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.h
deleted file mode 100644
index 1b1cd59e460..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_COMPONENT_EXEC_H_
-#define CIAO_COMPONENT_EXEC_H_
-
-#include "SetConnectorAttribute_ComponentEC.h"
-
-#include /**/ "Component_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-class DDSDataWriter;
-class DDSPublisher;
-class DDSTopic;
-
-namespace CIAO_SetConnectorAttribute_SetConnectorAttributeComponent_Impl
-{
-  //============================================================
-  // Component_exec_i
-  //============================================================
-  class COMPONENT_EXEC_Export Component_exec_i
-    : public virtual SetConnectorAttributeComponent_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Component_exec_i (void);
-    virtual ~Component_exec_i (void);
-
-    // Operations from Components::SessionComponent.
-    virtual void
-    set_session_context (
-      ::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete (void);
-
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-
-  private:
-    ::SetConnectorAttribute::CCM_SetConnectorAttributeComponent_Context_var context_;
-
-    void check_attributes (DDSDataWriter * dw);
-
-    void check_profile (DDSPublisher * pub);
-
-    void check_topic_name (DDSTopic * tp);
-
-    void check_domain_id (DDSPublisher * pub);
-
-  };
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_SetConnectorAttribute_Component_Impl (void);
-}
-
-#endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl
deleted file mode 100644
index a478d5e2387..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * @file SetConnectorAttribute_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef SETCONNECTORATTRIBUTE_CONNECTOR_IDL_
-#define SETCONNECTORATTRIBUTE_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/SetConnectorAttribute_Base.idl"
-
-#pragma ciao lem "Connector/SetConnectorAttribute_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/SetConnectorAttribute_BaseTypeSupport.idl"
-#endif
-
-module SetConnectorAttribute
-{
-  module ::CCM_DDS::Typed
-    < ::SetConnectorAttributeTest, ::SetConnectorAttributeTestSeq>
-    SetConnectorAttributeTestConnector;
-};
-
-#endif /* SetConnectorAttribute_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc
deleted file mode 100644
index 2fe6f6b22dd..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_SCABase -l .. -o ../lib -u DDS SetConnectorAttribute_Connector"
-
-project(DDS_SCAConnector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_SCABase_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SETCONNECTORATTRIBUTE_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=SetConnectorAttribute_Connector_stub_export.h \
-              -Wb,skel_export_macro=SETCONNECTORATTRIBUTE_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=SetConnectorAttribute_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=SETCONNECTORATTRIBUTE_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=SetConnectorAttribute_Connector_svnt_export.h \
-              -Wb,conn_export_macro=SETCONNECTORATTRIBUTE_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=SetConnectorAttribute_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    SetConnectorAttribute_Connector.idl
-  }
-}
-
-project(DDS_SCAConnector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_SCAConnector_idl_gen
-  idlflags += -Wb,stub_export_macro=SETCONNECTORATTRIBUTE_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=SetConnectorAttribute_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    SetConnectorAttribute_ConnectorE.idl
-  }
-}
-
-project(DDS_SCAConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_SCAConnector_lem_gen DDS_SCAConnector_stub DDS_SCABase_stub
-  libs  += DDS_SCABase_stub DDS_SCAConnector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_SCAConnector_lem_stub
-  dynamicflags += SETCONNECTORATTRIBUTE_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SetConnectorAttribute_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    SetConnectorAttribute_ConnectorEC.h
-    SetConnectorAttribute_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    SetConnectorAttribute_ConnectorEC.inl
-  }
-}
-
-project(DDS_SCAConnector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_SCAConnector_idl_gen DDS_SCABase_stub
-  libs  += DDS_SCABase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_SCAConnector_stub
-  dynamicflags += SETCONNECTORATTRIBUTE_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SetConnectorAttribute_ConnectorC.cpp
-  }
-
-  Header_Files {
-    SetConnectorAttribute_ConnectorC.h
-    SetConnectorAttribute_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    SetConnectorAttribute_ConnectorC.inl
-  }
-}
-
-project(DDS_SCAConnector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_SCAConnector_lem_stub DDS_SCAConnector_stub DDS_SCABase_stub
-  sharedname = DDS_SCAConnector_exec
-  libs += DDS_SCAConnector_stub DDS_SCAConnector_lem_stub DDS_SCABase_stub DDS_SCABase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SETCONNECTORATTRIBUTE_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SetConnectorAttribute_Connector_conn.cpp
-  }
-
-  Header_Files {
-    SetConnectorAttribute_Connector_conn.h
-    SetConnectorAttribute_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_SCAConnector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_SCAConnector_lem_stub DDS_SCAConnector_exec DDS_SCAConnector_stub
-  sharedname  = DDS_SCAConnector_svnt
-  libs       += DDS_SCAConnector_stub \
-                DDS_SCAConnector_lem_stub  \
-                DDS_SCABase_stub \
-                DDS_SCAConnector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SETCONNECTORATTRIBUTE_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SetConnectorAttribute_ConnectorS.cpp
-    SetConnectorAttribute_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    SetConnectorAttribute_ConnectorS.h
-    SetConnectorAttribute_Connector_svnt.h
-    SetConnectorAttribute_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/README b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/README
deleted file mode 100644
index ac5e8d56583..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/README
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-Tests whether the connector attribute are
-properly set by the D&C framework.
-The following connector attributes are defined in
-the deployment plan:
-  * key_fields
-  * domain_id
-  * qos_profile
-  * topic_name
-
-On ccm_activate in the connector, these values
-are checked.
-
-An error is reported for every mismatch.
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/Plan.cdp
deleted file mode 100644
index a71bb9d136f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/Plan.cdp
+++ /dev/null
@@ -1,209 +0,0 @@
-<!--  -->
-<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>SetConnectorAttributeAttribute_Depl_1</label>
-  <UUID>SetConnectorAttributeAttribute_Depl_1</UUID>
-
-  <implementation xmi:id="SetConnectorAttributeComponentImplementation">
-    <name>SetConnectorAttributeComponentmplementation</name>
-    <source/>
-    <artifact xmi:idref="Component_ExecArtifact" />
-    <artifact xmi:idref="Component_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SetConnectorAttribute_Component_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SetConnectorAttribute_SetConnectorAttributeComponent_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="SetConnectorAttributeConnectorImplementation">
-    <name>SetConnectorAttributeConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="SetConnectorAttributeConnector_ExecArtifact" />
-    <artifact xmi:idref="SetConnectorAttributeConnector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SetConnectorAttribute_SetConnectorAttributeTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SetConnectorAttribute_SetConnectorAttributeTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SetConnectorAttributeConnector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SetConnectorAttributeConnector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="SetConnectorAttributeComponentInstance">
-    <name>SetConnectorAttributeComponentInstance</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SetConnectorAttributeComponentImplementation" />
-  </instance>
-
-  <instance xmi:id="SetConnectorAttributeConnectorInstance">
-    <name>SetConnectorAttributeConnectorInstance</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SetConnectorAttributeConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SetConnectorAttribute</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>domain_id</name>
-      <value>
-        <type>
-          <kind>tk_long</kind>
-        </type>
-        <value>
-          <long>56</long>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>info_write_dds_entity</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SetConnectorAttributeComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SetConnectorAttributeConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="SetConnectorAttributeConnector_ExecArtifact">
-    <name>SetConnectorAttributeConnector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_SCAConnector_exec</location>
-  </artifact>
-  <artifact xmi:id="SetConnectorAttributeConnector_SvntArtifact">
-    <name>SetConnectorAttributeConnector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_SCAConnector_svnt</location>
-  </artifact>
-  <artifact xmi:id="SetConnectorAttributeConnector_StubArtifact">
-    <name>SetConnectorAttributeConnector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_SCAConnector_stub</location>
-  </artifact>
-
-  <artifact xmi:id="Component_ExecArtifact">
-    <name>Component_exec</name>
-    <source/>
-    <node/>
-    <location>Component_exec</location>
-  </artifact>
-  <artifact xmi:id="Component_SvntArtifact">
-    <name>Component_svnt</name>
-    <source/>
-    <node/>
-    <location>Component_svnt</location>
-  </artifact>
-  <artifact xmi:id="Component_StubArtifact">
-    <name>Component_stub</name>
-    <source/>
-    <node/>
-    <location>Component_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl
deleted file mode 100755
index 445ce8b9d56..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 1;
-@ports = ( 60001);
-@iorbases = ( "NodeApp1.ior" );
-@iorfiles = 0;
-@nodenames = ( "ComponentNode");
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 5 seconds to allow task to complete\n";
-sleep (5);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl
deleted file mode 100644
index e40a2ddecf6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * @file Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef BASE_IDL
-#define BASE_IDL
-
-#pragma ndds typesupport "Base/BaseSupport.h"
-#pragma opendds typesupport "Base/BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "SharedDPTest1"
-#pragma DCPS_DATA_KEY "SharedDPTest1 key1"
-
-#pragma DCPS_DATA_TYPE "SharedDPTest2"
-#pragma DCPS_DATA_KEY "SharedDPTest2 key2"
-
-#pragma DCPS_DATA_TYPE "SharedDPTest3"
-#pragma DCPS_DATA_KEY "SharedDPTest3 key3"
-
-struct SharedDPTest1 {
-  string key1;
-  long iteration1;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<SharedDPTest1> SharedDPTest1Seq;
-#endif
-
-struct SharedDPTest2 {
-  string key2;
-  long iteration2;
-};
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<SharedDPTest2> SharedDPTest2Seq;
-#endif
-
-struct SharedDPTest3 {
-  string key3;
-  long iteration3;
-};
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<SharedDPTest3> SharedDPTest3Seq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.mpc
deleted file mode 100644
index 5b485527e6a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_SharedDP_DDBase_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_SharedDP_DDBase_stub
-  dynamicflags += BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=BASE_STUB_Export \
-              -Wb,stub_export_include=Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    Base.idl
-  }
-
-  opendds_ts_flags += --export=BASE_STUB_Export
-
-  DDSGenerator_Files {
-    Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.idl
deleted file mode 100644
index b045aab8549..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_SHARED_DP_COMPONENT_IDL
-#define DDS_SHARED_DP_COMPONENT_IDL
-
-#include "Connector1/Connector1.idl"
-#include "Connector2/Connector2.idl"
-#include "Connector3/Connector3.idl"
-
-module SharedDP
-{
-  component SharedDPComponent
-  {
-    port SharedDP_Connector1::SharedDPTest1Connector::DDS_Write write1;
-    port SharedDP_Connector2::SharedDPTest2Connector::DDS_Write write2;
-    port SharedDP_Connector3::SharedDPTest3Connector::DDS_Write write3;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc
deleted file mode 100644
index a46e26c1bab..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc
+++ /dev/null
@@ -1,152 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_SharedDPBase -l ../lib -o ../lib -c controller -u DDS Component"
-
-project(DDS_SharedDP_DDComponent_idl_gen) : componentidldefaults, dds4ccm {
-    after += DDS_SharedDP_Connector1_idl_gen DDS_SharedDP_Connector2_idl_gen \
-    DDS_SharedDP_Connector3_idl_gen
-    custom_only = 1
-    idlflags += -Wb,stub_export_macro=COMPONENT_STUB_Export \
-    -Wb,stub_export_include=Component_stub_export.h \
-    -Wb,skel_export_macro=COMPONENT_SVNT_Export \
-    -Wb,skel_export_include=Component_svnt_export.h \
-    -Wb,svnt_export_macro=COMPONENT_SVNT_Export \
-    -Wb,svnt_export_include=Component_svnt_export.h \
-    -Wb,exec_export_macro=COMPONENT_EXEC_Export \
-    -Wb,exec_export_include=Component_exec_export.h \
-    -I ..
-
-    IDL_Files {
-        Component.idl
-    }
-}
-
-project(DDS_SharedDP_DDComponent_lem_gen) : ciaoidldefaults, dds4ccm {
-    after += DDS_SharedDP_DDComponent_idl_gen
-    custom_only = 1
-    idlflags += -Wb,stub_export_macro=COMPONENT_LEM_STUB_Export \
-    -Wb,stub_export_include=Component_lem_stub_export.h \
-    -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-    IDL_Files {
-        ComponentE.idl
-    }
-}
-
-project(DDS_SharedDP_DDComponent_lem_stub) : ccm_svnt, dds4ccm_base {
-    after += DDS_SharedDP_DDComponent_lem_gen DDS_SharedDP_DDComponent_stub DDS_SharedDP_DDBase_stub
-    libs  += DDS_SharedDP_DDBase_stub Component_stub
-    libpaths += ../lib
-    libout = ../lib
-    includes += ..
-    sharedname = Component_lem_stub
-    dynamicflags += COMPONENT_LEM_STUB_BUILD_DLL
-
-    IDL_Files {
-    }
-
-    Source_Files {
-        ComponentEC.cpp
-    }
-
-    Header_Files {
-        ComponentEC.h
-        Component_lem_stub_export.h
-    }
-
-    Inline_Files {
-        ComponentEC.inl
-    }
-}
-
-project(DDS_SharedDP_DDComponent_stub) : ccm_stub, dds4ccm_base {
-    after += DDS_SharedDP_DDComponent_idl_gen DDS_SharedDP_DDBase_stub \
-    DDS_SharedDP_Connector1_stub DDS_SharedDP_Connector2_stub DDS_SharedDP_Connector3_stub \
-    DDS_SharedDP_Connector1_lem_gen DDS_SharedDP_Connector2_lem_gen DDS_SharedDP_Connector3_lem_gen
-    libs  += DDS_SharedDP_DDBase_stub DDS_Connector1_stub DDS_Connector2_stub DDS_Connector3_stub
-    includes += ..
-    libpaths += ../lib
-    libout = ../lib
-    sharedname = Component_stub
-    dynamicflags += COMPONENT_STUB_BUILD_DLL
-
-    IDL_Files {
-    }
-
-    Source_Files {
-        ComponentC.cpp
-    }
-
-    Header_Files {
-        ComponentC.h
-        Component_stub_export.h
-    }
-
-    Inline_Files {
-        ComponentC.inl
-    }
-}
-
-project(DDS_SharedDP_DDComponent_exec) : ciao_executor, dds4ccm_impl {
-    after   += DDS_SharedDP_DDComponent_lem_stub DDS_SharedDP_DDComponent_stub \
-    DDS_SharedDP_Connector1_lem_stub DDS_SharedDP_Connector1_stub \
-    DDS_SharedDP_Connector2_lem_stub DDS_SharedDP_Connector2_stub \
-    DDS_SharedDP_Connector3_lem_stub DDS_SharedDP_Connector3_stub
-    sharedname = Component_exec
-    libs += Component_stub Component_lem_stub DDS_SharedDP_DDBase_stub \
-    DDS_Connector1_lem_stub DDS_Connector1_stub \
-    DDS_Connector2_lem_stub DDS_Connector2_stub \
-    DDS_Connector3_lem_stub DDS_Connector3_stub
-    libpaths += ../lib
-    includes += ..
-    libout = ../lib
-    dynamicflags += COMPONENT_EXEC_BUILD_DLL
-
-    IDL_Files {
-    }
-
-    Source_Files {
-        Component_exec.cpp
-    }
-
-    Header_Files {
-        Component_exec.h
-        Component_exec_export.h
-    }
-
-    Inline_Files {
-    }
-}
-
-project(DDS_SharedDP_DDComponent_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-    after      += DDS_SharedDP_DDBase_stub  DDS_SharedDP_DDComponent_lem_stub \
-    DDS_SharedDP_Connector1_stub DDS_SharedDP_Connector1_svnt  DDS_SharedDP_Connector1_lem_stub \
-    DDS_SharedDP_Connector2_stub DDS_SharedDP_Connector2_svnt  DDS_SharedDP_Connector2_lem_stub \
-    DDS_SharedDP_Connector3_stub DDS_SharedDP_Connector3_svnt  DDS_SharedDP_Connector3_lem_stub
-    sharedname  = Component_svnt
-    libs       += Component_stub Component_lem_stub  \
-    DDS_SharedDP_DDBase_stub \
-    DDS_Connector1_stub DDS_Connector1_svnt DDS_Connector1_lem_stub \
-    DDS_Connector2_stub DDS_Connector2_svnt DDS_Connector2_lem_stub \
-    DDS_Connector3_stub DDS_Connector3_svnt DDS_Connector3_lem_stub
-    libpaths += ../lib
-    libout = ../lib
-    includes += ..
-    dynamicflags += COMPONENT_SVNT_BUILD_DLL
-
-    IDL_Files {
-    }
-
-    Source_Files {
-        ComponentS.cpp
-        Component_svnt.cpp
-    }
-
-    Header_Files {
-        ComponentS.h
-        Component_svnt.h
-        Component_svnt_export.h
-    }
-
-    Inline_Files {
-    }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp
deleted file mode 100644
index de9cd29dc28..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp
+++ /dev/null
@@ -1,317 +0,0 @@
-// -*- C++ -*-
-#include "Component_exec.h"
-#include "ace/Log_Msg.h"
-
-#include "Connector1/Connector1_conn.h"
-#include "Connector2/Connector2_conn.h"
-#include "Connector3/Connector3_conn.h"
-
-namespace CIAO_SharedDP_SharedDPComponent_Impl
-{
-  //============================================================
-  // Component Executor Implementation Class: Component_exec_i
-  //============================================================
-
-  Component_exec_i::Component_exec_i (void)
-    : dp1_hnd_ (DDS::HANDLE_NIL)
-    , dp2_hnd_ (DDS::HANDLE_NIL)
-    , dp3_hnd_ (DDS::HANDLE_NIL)
-    , dp1_ptr_ (DDS::DomainParticipant::_nil ())
-    , dp2_ptr_ (DDS::DomainParticipant::_nil ())
-    , dp3_ptr_ (DDS::DomainParticipant::_nil ())
-  {
-  }
-
-  Component_exec_i::~Component_exec_i (void)
-  {
-  }
-
-  void
-  Component_exec_i::set_session_context (::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::SharedDP::CCM_SharedDPComponent_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Component_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Component_exec_i::ccm_activate (void)
-  {
-    try
-      {
-        ::DDS::DataWriter_var dw1 =
-          this->context_->get_connection_write1_dds_entity ();
-
-        if (::CORBA::is_nil (dw1.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - "
-                        "Datawriter 1 connection is NIL.\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-
-        ::CIAO::DDS4CCM::CCM_DataWriter * ccm_dw1 =
-          dynamic_cast < ::CIAO::DDS4CCM::CCM_DataWriter * > (dw1.in ());
-
-        if (ccm_dw1)
-          {
-            ::DDS::DataWriter_var tmp = ccm_dw1->get_dds_entity ();
-            if (! ::CORBA::is_nil (tmp.in ()))
-              {
-                ::DDS::Publisher_var publisher = tmp->get_publisher ();
-
-                if (! ::CORBA::is_nil (publisher.in ()))
-                  {
-                    ::DDS::DomainParticipant_var dp = publisher->get_participant ();
-
-                    if (! ::CORBA::is_nil (publisher.in ()))
-                      {
-
-                        this->dp1_hnd_ = dp->get_instance_handle ();
-                        this->dp1_ptr_ = dp.ptr ();
-                      }
-                    else
-                      {
-                        ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                    "Error getting DomainParticipant 1.\n"));
-                        throw ::CORBA::INTERNAL ();
-                      }
-                  }
-                else
-                  {
-                    ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                "Error getting Publisher 1.\n"));
-                    throw ::CORBA::INTERNAL ();
-                  }
-              }
-            else
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                            "Error getting DDS DataWriter 1.\n"));
-                throw ::CORBA::INTERNAL ();
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - "
-                        "Error casting DataWriter 1 to CCM DataWriter 1\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Unable to create dds_entity for writer1\n"));
-      }
-
-    try
-      {
-        ::DDS::DataWriter_var dw2 =
-          this->context_->get_connection_write2_dds_entity ();
-
-        if (::CORBA::is_nil (dw2.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - "
-                        "Datawriter 2 connection is NIL.\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-
-        ::CIAO::DDS4CCM::CCM_DataWriter * ccm_dw2 =
-          dynamic_cast < ::CIAO::DDS4CCM::CCM_DataWriter * > (dw2.in ());
-
-        if (ccm_dw2)
-          {
-            ::DDS::DataWriter_var tmp = ccm_dw2->get_dds_entity ();
-            if (! ::CORBA::is_nil (tmp.in ()))
-              {
-                ::DDS::Publisher_var publisher = tmp->get_publisher ();
-
-                if (! ::CORBA::is_nil (publisher.in ()))
-                  {
-                    ::DDS::DomainParticipant_var dp = publisher->get_participant ();
-
-                    if (! ::CORBA::is_nil (publisher.in ()))
-                      {
-
-                        this->dp2_hnd_ = dp->get_instance_handle ();
-                        this->dp2_ptr_ = dp.ptr ();
-                      }
-                    else
-                      {
-                        ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                    "Error getting DomainParticipant 2.\n"));
-                        throw ::CORBA::INTERNAL ();
-                      }
-                  }
-                else
-                  {
-                    ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                "Error getting Publisher 2.\n"));
-                    throw ::CORBA::INTERNAL ();
-                  }
-              }
-            else
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                            "Error getting DDS DataWriter 2.\n"));
-                throw ::CORBA::INTERNAL ();
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - "
-                        "Error casting DataWriter 2 to CCM DataWriter 2\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Unable to create dds_entity for writer2\n"));
-      }
-
-    try
-      {
-        ::DDS::DataWriter_var dw3 =
-          this->context_->get_connection_write3_dds_entity ();
-
-        if (::CORBA::is_nil (dw3.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - "
-                        "Datawriter 3 connection is NIL.\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-
-        ::CIAO::DDS4CCM::CCM_DataWriter * ccm_dw3 =
-          dynamic_cast < ::CIAO::DDS4CCM::CCM_DataWriter * > (dw3.in ());
-
-        if (ccm_dw3)
-          {
-            ::DDS::DataWriter_var tmp = ccm_dw3->get_dds_entity ();
-            if (! ::CORBA::is_nil (tmp.in ()))
-              {
-                ::DDS::Publisher_var publisher = tmp->get_publisher ();
-
-                if (! ::CORBA::is_nil (publisher.in ()))
-                  {
-                    ::DDS::DomainParticipant_var dp = publisher->get_participant ();
-
-                    if (! ::CORBA::is_nil (publisher.in ()))
-                      {
-                        this->dp3_hnd_ = dp->get_instance_handle ();
-                        this->dp3_ptr_ = dp.ptr ();
-                      }
-                    else
-                      {
-                        ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                    "Error getting DomainParticipant 3.\n"));
-                        throw ::CORBA::INTERNAL ();
-                      }
-                  }
-                else
-                  {
-                    ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                "Error getting Publisher 3.\n"));
-                    throw ::CORBA::INTERNAL ();
-                  }
-              }
-            else
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                            "Error getting DDS DataWriter 3.\n"));
-                throw ::CORBA::INTERNAL ();
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - "
-                        "Error casting DataWriter 3 to CCM DataWriter 3\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Unable to create dds_entity for writer3\n"));
-      }
-  }
-
-  void
-  Component_exec_i::ccm_passivate (void)
-  {
-    if (this->dp1_hnd_ == DDS::HANDLE_NIL)
-      ACE_ERROR ((LM_ERROR, "ERROR: Handle of DomainParticipant for Connector 1 seems to be NIL\n"));
-    if (this->dp2_hnd_ == DDS::HANDLE_NIL)
-      ACE_ERROR ((LM_ERROR, "ERROR: Handle of DomainParticipant for Connector 2 seems to be NIL\n"));
-    if (this->dp3_hnd_ == DDS::HANDLE_NIL)
-      ACE_ERROR ((LM_ERROR, "ERROR: Handle of DomainParticipant for Connector 3 seems to be NIL\n"));
-
-    if ((this->dp1_hnd_ != this->dp2_hnd_)
-#if (CIAO_DDS4CCM_OPENDDS==1)
-        && (this->dp1_ptr_ != this->dp2_ptr_)
-#endif
-        )
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Connector 1 and 2 don't seem to "
-                              "share the same DomainParticipant\n"));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "OK: Connector 1 and 2 seems to "
-                              "share the same DomainParticipant\n"));
-      }
-    if ((this->dp1_hnd_ == this->dp3_hnd_)
-#if (CIAO_DDS4CCM_OPENDDS==1)
-        && (this->dp1_ptr_ == this->dp3_ptr_)
-#endif
-       )
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Connector 1 and 3 seem to "
-                              "share the same DomainParticipant\n"));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "OK: Connector 1 and 3 seems to "
-                              "share the same DomainParticipant\n"));
-      }
-
-    if ((this->dp2_hnd_ == this->dp3_hnd_)
-#if (CIAO_DDS4CCM_OPENDDS==1)
-        && (this->dp2_ptr_ == this->dp3_ptr_)
-#endif
-       )
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Connector 2 and 3 seem to "
-                              "share the same DomainParticipant\n"));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "OK: Connector 2 and 3 seems to "
-                              "share the same DomainParticipant\n"));
-      }
-  }
-
-  void
-  Component_exec_i::ccm_remove (void)
-  {
-  }
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Component_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Component_exec_i);
-
-    return retval;
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.h b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.h
deleted file mode 100644
index dfcc1d903e7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_COMPONENT_EXEC_H_
-#define CIAO_COMPONENT_EXEC_H_
-
-
-#include "ComponentEC.h"
-
-#include /**/ "Component_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-class DDSDomainParticipant;
-
-namespace CIAO_SharedDP_SharedDPComponent_Impl
-{
-  class Component_exec_i
-    : public virtual SharedDPComponent_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Component_exec_i (void);
-    virtual ~Component_exec_i (void);
-
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete (void);
-
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-
-  private:
-    ::SharedDP::CCM_SharedDPComponent_Context_var context_;
-
-    ::DDS::InstanceHandle_t dp1_hnd_;
-    ::DDS::InstanceHandle_t dp2_hnd_;
-    ::DDS::InstanceHandle_t dp3_hnd_;
-    ::DDS::DomainParticipant_ptr dp1_ptr_;
-    ::DDS::DomainParticipant_ptr dp2_ptr_;
-    ::DDS::DomainParticipant_ptr dp3_ptr_;
-  };
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Component_Impl (void);
-}
-
-#endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl
deleted file mode 100644
index 4afe620e7f1..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * @file Connector1.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef SHARED_DP_CONNECTOR1_IDL_
-#define SHARED_DP_CONNECTOR1_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Base.idl"
-
-#pragma ciao lem "Connector1/Connector1E.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/BaseTypeSupport.idl"
-#endif
-
-module SharedDP_Connector1
-{
-  module ::CCM_DDS::Typed < ::SharedDPTest1, ::SharedDPTest1Seq> SharedDPTest1Connector;
-};
-
-
-
-#endif /* SHARED_DP_CONNECTOR1_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc
deleted file mode 100644
index d1e19f07670..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc
+++ /dev/null
@@ -1,140 +0,0 @@
-project(DDS_SharedDP_Connector1_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_SharedDP_DDBase_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR1_STUB_Export \
-              -Wb,stub_export_include=Connector1_stub_export.h \
-              -Wb,skel_export_macro=SHAREDDP_CONNECTOR1_SVNT_Export \
-              -Wb,skel_export_include=Connector1_svnt_export.h \
-              -Wb,svnt_export_macro=SHAREDDP_CONNECTOR1_SVNT_Export \
-              -Wb,svnt_export_include=Connector1_svnt_export.h \
-              -Wb,conn_export_macro=SHAREDDP_CONNECTOR1_CONN_Export \
-              -Wb,conn_export_include=Connector1_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Connector1.idl
-  }
-}
-
-project(DDS_SharedDP_Connector1_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_SharedDP_Connector1_idl_gen
-  idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR1_LEM_STUB_Export \
-              -Wb,stub_export_include=Connector1_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    Connector1E.idl
-  }
-}
-
-project(DDS_SharedDP_Connector1_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_SharedDP_Connector1_lem_gen DDS_SharedDP_Connector1_stub DDS_SharedDP_DDBase_stub
-  libs  += DDS_SharedDP_DDBase_stub DDS_Connector1_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Connector1_lem_stub
-  dynamicflags += SHAREDDP_CONNECTOR1_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector1EC.cpp
-  }
-
-  Header_Files {
-    Connector1EC.h
-    Connector1_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Connector1EC.inl
-  }
-}
-
-project(DDS_SharedDP_Connector1_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_SharedDP_Connector1_idl_gen DDS_SharedDP_DDBase_stub
-  libs  += DDS_SharedDP_DDBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Connector1_stub
-  dynamicflags += SHAREDDP_CONNECTOR1_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector1C.cpp
-  }
-
-  Header_Files {
-    Connector1C.h
-    Connector1_stub_export.h
-  }
-
-  Inline_Files {
-    Connector1C.inl
-  }
-}
-
-project(DDS_SharedDP_Connector1_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_SharedDP_Connector1_lem_stub DDS_SharedDP_Connector1_stub DDS_SharedDP_DDBase_stub
-  sharedname = DDS_Connector1_exec
-  libs += DDS_Connector1_stub DDS_Connector1_lem_stub DDS_SharedDP_DDBase_stub DDS_SharedDP_DDBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SHAREDDP_CONNECTOR1_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector1_conn.cpp
-  }
-
-  Header_Files {
-    Connector1_conn.h
-    Connector1_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_SharedDP_Connector1_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_SharedDP_Connector1_lem_stub DDS_SharedDP_Connector1_exec DDS_SharedDP_Connector1_stub
-  sharedname  = DDS_Connector1_svnt
-  libs       += DDS_Connector1_stub \
-                DDS_Connector1_lem_stub  \
-                DDS_SharedDP_DDBase_stub \
-                DDS_Connector1_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SHAREDDP_CONNECTOR1_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector1S.cpp
-    Connector1_svnt.cpp
-  }
-
-  Header_Files {
-    Connector1S.h
-    Connector1_svnt.h
-    Connector1_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl
deleted file mode 100644
index f38a634b931..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file Connector2.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef SHARED_DP_CONNECTOR2_IDL_
-#define SHARED_DP_CONNECTOR2_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Base.idl"
-
-#pragma ciao lem "Connector2/Connector2E.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/BaseTypeSupport.idl"
-#endif
-
-module SharedDP_Connector2
-{
-  module ::CCM_DDS::Typed < ::SharedDPTest2, ::SharedDPTest2Seq> SharedDPTest2Connector;
-};
-
-#endif /* SHARED_DP_CONNECTOR2_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc
deleted file mode 100644
index f3cff4041ac..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc
+++ /dev/null
@@ -1,140 +0,0 @@
-project(DDS_SharedDP_Connector2_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_SharedDP_DDBase_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR2_STUB_Export \
-              -Wb,stub_export_include=Connector2_stub_export.h \
-              -Wb,skel_export_macro=SHAREDDP_CONNECTOR2_SVNT_Export \
-              -Wb,skel_export_include=Connector2_svnt_export.h \
-              -Wb,svnt_export_macro=SHAREDDP_CONNECTOR2_SVNT_Export \
-              -Wb,svnt_export_include=Connector2_svnt_export.h \
-              -Wb,conn_export_macro=SHAREDDP_CONNECTOR2_CONN_Export \
-              -Wb,conn_export_include=Connector2_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Connector2.idl
-  }
-}
-
-project(DDS_SharedDP_Connector2_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_SharedDP_Connector2_idl_gen
-  idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR2_LEM_STUB_Export \
-              -Wb,stub_export_include=Connector2_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    Connector2E.idl
-  }
-}
-
-project(DDS_SharedDP_Connector2_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_SharedDP_Connector2_lem_gen DDS_SharedDP_Connector2_stub DDS_SharedDP_DDBase_stub
-  libs  += DDS_SharedDP_DDBase_stub DDS_Connector2_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Connector2_lem_stub
-  dynamicflags += SHAREDDP_CONNECTOR2_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector2EC.cpp
-  }
-
-  Header_Files {
-    Connector2EC.h
-    Connector2_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Connector2EC.inl
-  }
-}
-
-project(DDS_SharedDP_Connector2_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_SharedDP_Connector2_idl_gen DDS_SharedDP_DDBase_stub
-  libs  += DDS_SharedDP_DDBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Connector2_stub
-  dynamicflags += SHAREDDP_CONNECTOR2_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector2C.cpp
-  }
-
-  Header_Files {
-    Connector2C.h
-    Connector2_stub_export.h
-  }
-
-  Inline_Files {
-    Connector2C.inl
-  }
-}
-
-project(DDS_SharedDP_Connector2_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_SharedDP_Connector2_lem_stub DDS_SharedDP_Connector2_stub DDS_SharedDP_DDBase_stub
-  sharedname = DDS_Connector2_exec
-  libs += DDS_Connector2_stub DDS_Connector2_lem_stub DDS_SharedDP_DDBase_stub DDS_SharedDP_DDBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SHAREDDP_CONNECTOR2_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector2_conn.cpp
-  }
-
-  Header_Files {
-    Connector2_conn.h
-    Connector2_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_SharedDP_Connector2_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_SharedDP_Connector2_lem_stub DDS_SharedDP_Connector2_exec DDS_SharedDP_Connector2_stub
-  sharedname  = DDS_Connector2_svnt
-  libs       += DDS_Connector2_stub \
-                DDS_Connector2_lem_stub  \
-                DDS_SharedDP_DDBase_stub \
-                DDS_Connector2_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SHAREDDP_CONNECTOR2_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector2S.cpp
-    Connector2_svnt.cpp
-  }
-
-  Header_Files {
-    Connector2S.h
-    Connector2_svnt.h
-    Connector2_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl
deleted file mode 100644
index 19984701e26..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file Connector3.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef SHARED_DP_CONNECTOR3_IDL_
-#define SHARED_DP_CONNECTOR3_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Base.idl"
-
-#pragma ciao lem "Connector3/Connector3E.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/BaseTypeSupport.idl"
-#endif
-
-module SharedDP_Connector3
-{
-  module ::CCM_DDS::Typed < ::SharedDPTest3, ::SharedDPTest3Seq> SharedDPTest3Connector;
-};
-
-#endif /* SHARED_DP_CONNECTOR3_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc
deleted file mode 100644
index 2edb65e3de2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc
+++ /dev/null
@@ -1,140 +0,0 @@
-project(DDS_SharedDP_Connector3_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_SharedDP_DDBase_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR3_STUB_Export \
-              -Wb,stub_export_include=Connector3_stub_export.h \
-              -Wb,skel_export_macro=SHAREDDP_CONNECTOR3_SVNT_Export \
-              -Wb,skel_export_include=Connector3_svnt_export.h \
-              -Wb,svnt_export_macro=SHAREDDP_CONNECTOR3_SVNT_Export \
-              -Wb,svnt_export_include=Connector3_svnt_export.h \
-              -Wb,conn_export_macro=SHAREDDP_CONNECTOR3_CONN_Export \
-              -Wb,conn_export_include=Connector3_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Connector3.idl
-  }
-}
-
-project(DDS_SharedDP_Connector3_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_SharedDP_Connector3_idl_gen
-  idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR3_LEM_STUB_Export \
-              -Wb,stub_export_include=Connector3_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    Connector3E.idl
-  }
-}
-
-project(DDS_SharedDP_Connector3_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_SharedDP_Connector3_lem_gen DDS_SharedDP_Connector3_stub DDS_SharedDP_DDBase_stub
-  libs  += DDS_SharedDP_DDBase_stub DDS_Connector3_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Connector3_lem_stub
-  dynamicflags += SHAREDDP_CONNECTOR3_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector3EC.cpp
-  }
-
-  Header_Files {
-    Connector3EC.h
-    Connector3_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Connector3EC.inl
-  }
-}
-
-project(DDS_SharedDP_Connector3_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_SharedDP_Connector3_idl_gen DDS_SharedDP_DDBase_stub
-  libs  += DDS_SharedDP_DDBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Connector3_stub
-  dynamicflags += SHAREDDP_CONNECTOR3_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector3C.cpp
-  }
-
-  Header_Files {
-    Connector3C.h
-    Connector3_stub_export.h
-  }
-
-  Inline_Files {
-    Connector3C.inl
-  }
-}
-
-project(DDS_SharedDP_Connector3_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_SharedDP_Connector3_lem_stub DDS_SharedDP_Connector3_stub DDS_SharedDP_DDBase_stub
-  sharedname = DDS_Connector3_exec
-  libs += DDS_Connector3_stub DDS_Connector3_lem_stub DDS_SharedDP_DDBase_stub DDS_SharedDP_DDBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SHAREDDP_CONNECTOR3_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector3_conn.cpp
-  }
-
-  Header_Files {
-    Connector3_conn.h
-    Connector3_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_SharedDP_Connector3_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_SharedDP_Connector3_lem_stub DDS_SharedDP_Connector3_exec DDS_SharedDP_Connector3_stub
-  sharedname  = DDS_Connector3_svnt
-  libs       += DDS_Connector3_stub \
-                DDS_Connector3_lem_stub  \
-                DDS_SharedDP_DDBase_stub \
-                DDS_Connector3_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SHAREDDP_CONNECTOR3_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector3S.cpp
-    Connector3_svnt.cpp
-  }
-
-  Header_Files {
-    Connector3S.h
-    Connector3_svnt.h
-    Connector3_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Plan.cdp
deleted file mode 100644
index 03b9a8a9b3d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Plan.cdp
+++ /dev/null
@@ -1,445 +0,0 @@
-<!--  -->
-<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>SharedDPTest_Depl_1</label>
-  <UUID>SharedDPTest_Depl_1</UUID>
-
-  <implementation xmi:id="Connector1Implementation">
-    <name>Connector1Implementation</name>
-    <source/>
-    <artifact xmi:idref="Connector1_ExecArtifact" />
-    <artifact xmi:idref="Connector1_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SharedDP_Connector1_SharedDPTest1Connector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SharedDP_Connector1_SharedDPTest1Connector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DDS_Connector1_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DDS_Connector1_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Connector2Implementation">
-    <name>Connector2Implementation</name>
-    <source/>
-    <artifact xmi:idref="Connector2_ExecArtifact" />
-    <artifact xmi:idref="Connector2_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SharedDP_Connector2_SharedDPTest2Connector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SharedDP_Connector2_SharedDPTest2Connector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DDS_Connector2_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DDS_Connector2_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Connector3Implementation">
-    <name>Connector3Implementation</name>
-    <source/>
-    <artifact xmi:idref="Connector3_ExecArtifact" />
-    <artifact xmi:idref="Connector3_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SharedDP_Connector3_SharedDPTest3Connector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SharedDP_Connector3_SharedDPTest3Connector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DDS_Connector3_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DDS_Connector3_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="ComponentImplementation">
-    <name>ComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Component_ExecArtifact" />
-    <artifact xmi:idref="Component_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Component_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SharedDP_SharedDPComponent_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="Connector1Instance">
-    <name>Connector1Instance</name>
-    <node>ComponentNode</node>
-    <source/>
-    <implementation xmi:idref="Connector1Implementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SharedDP</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shared_Library#SharedProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Connector2Instance">
-    <name>Connector2Instance</name>
-    <node>ComponentNode</node>
-    <source/>
-    <implementation xmi:idref="Connector2Implementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SharedDP2</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shared_Library#SharedProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Connector3Instance">
-    <name>Connector3Instance</name>
-    <node>ComponentNode</node>
-    <source/>
-    <implementation xmi:idref="Connector3Implementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>StandaloneDP</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Standalone_Library#StandaloneProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ComponentInstance">
-    <name>Component</name>
-    <node>ComponentNode</node>
-    <source/>
-    <implementation xmi:idref="ComponentImplementation" />
-  </instance>
-
-  <connection>
-    <name>writer_connection1</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>write1_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Connector1Instance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection2</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>write2_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Connector2Instance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection3</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>write3_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Connector3Instance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Component_ExecArtifact">
-    <name>Component_exec</name>
-    <source/>
-    <node/>
-    <location>Component_exec</location>
-  </artifact>
-  <artifact xmi:id="Component_SvntArtifact">
-    <name>Component_svnt</name>
-    <source/>
-    <node/>
-    <location>Component_svnt</location>
-  </artifact>
-  <artifact xmi:id="Component_StubArtifact">
-    <name>Component_stub</name>
-    <source/>
-    <node/>
-    <location>Component_stub</location>
-  </artifact>
-
-  <artifact xmi:id="Connector1_ExecArtifact">
-    <name>DDS_Connector1_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Connector1_exec</location>
-  </artifact>
-  <artifact xmi:id="Connector1_SvntArtifact">
-    <name>DDS_Connector1_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Connector1_svnt</location>
-  </artifact>
-  <artifact xmi:id="Connector1_StubArtifact">
-    <name>DDS_Connector1_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Connector1_stub</location>
-  </artifact>
-
-  <artifact xmi:id="Connector2_ExecArtifact">
-    <name>DDS_Connector2_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Connector2_exec</location>
-  </artifact>
-  <artifact xmi:id="Connector2_SvntArtifact">
-    <name>DDS_Connector2_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Connector2_svnt</location>
-  </artifact>
-  <artifact xmi:id="Connector2_StubArtifact">
-    <name>DDS_Connector2_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Connector2_stub</location>
-  </artifact>
-
-  <artifact xmi:id="Connector3_ExecArtifact">
-    <name>DDS_Connector3_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Connector3_exec</location>
-  </artifact>
-  <artifact xmi:id="Connector3_SvntArtifact">
-    <name>DDS_Connector3_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Connector3_svnt</location>
-  </artifact>
-  <artifact xmi:id="Connector3_StubArtifact">
-    <name>DDS_Connector3_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Connector3_stub</location>
-  </artifact>
-
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Shared_Library.xml b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Shared_Library.xml
deleted file mode 100644
index 5424a2e910a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Shared_Library.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-
-  <qos_profile name="SharedProfile">
-    <datawriter_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-        <max_blocking_time>
-          <sec>10</sec>
-          <nanosec>0</nanosec>
-        </max_blocking_time>
-      </reliability>
-      <durability>
-        <kind>TRANSIENT_DURABILITY_QOS</kind>
-      </durability>
-      <history>
-        <kind>KEEP_LAST_HISTORY_QOS</kind>
-        <depth>20</depth>
-      </history>
-    </datawriter_qos>
-    <datareader_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-      </reliability>
-      <history>
-        <kind>KEEP_LAST_HISTORY_QOS</kind>
-        <depth>20</depth>
-      </history>
-      <durability>
-        <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-      </durability>
-    </datareader_qos>
-  </qos_profile>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Standalone_Library.xml b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Standalone_Library.xml
deleted file mode 100644
index 63e213c18d3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Standalone_Library.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-
-  <qos_profile name="StandaloneProfile">
-    <datawriter_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-        <max_blocking_time>
-          <sec>10</sec>
-          <nanosec>0</nanosec>
-        </max_blocking_time>
-      </reliability>
-      <durability>
-        <kind>TRANSIENT_DURABILITY_QOS</kind>
-      </durability>
-      <history>
-        <kind>KEEP_LAST_HISTORY_QOS</kind>
-        <depth>20</depth>
-      </history>
-    </datawriter_qos>
-    <datareader_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-      </reliability>
-      <history>
-        <kind>KEEP_LAST_HISTORY_QOS</kind>
-        <depth>20</depth>
-      </history>
-      <durability>
-        <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-      </durability>
-    </datareader_qos>
-  </qos_profile>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index f1018e84958..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <qos_library name="Shared_Library">
-    <qos_profile name="SharedProfile" is_default_qos="false">
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>10</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_LAST_HISTORY_QOS</kind>
-          <depth>20</depth>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_LAST_HISTORY_QOS</kind>
-          <depth>20</depth>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-  <qos_library name="Standalone_Library">
-    <qos_profile name="StandaloneProfile" is_default_qos="false">
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>10</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_LAST_HISTORY_QOS</kind>
-          <depth>20</depth>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_LAST_HISTORY_QOS</kind>
-          <depth>20</depth>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/run_test.pl
deleted file mode 100755
index c319b291048..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/run_test.pl
+++ /dev/null
@@ -1,237 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 1;
-@ports = ( 60001 );
-@iorbases = ( "NodeApp1.ior" );
-@iorfiles = 0;
-@nodenames = ( "ComponentNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 1 seconds to allow task to complete\n";
-sleep (1);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -s\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$E->SpawnWaitKill (3 * $tg_executor->ProcessStartWaitInterval ());
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Base/Base.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Base/Base.idl
deleted file mode 100644
index 0f28a5b3e74..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Base/Base.idl
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * @file Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef BASE_IDL
-#define BASE_IDL
-
-#pragma ndds typesupport "Base/BaseSupport.h"
-#pragma opendds typesupport "Base/BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "SharedDPTest1"
-#pragma DCPS_DATA_KEY "SharedDPTest1 key1"
-
-#pragma DCPS_DATA_TYPE "SharedDPTest2"
-#pragma DCPS_DATA_KEY "SharedDPTest2 key2"
-
-#pragma DCPS_DATA_TYPE "SharedDPTest3"
-#pragma DCPS_DATA_KEY "SharedDPTest3 key3"
-
-struct SharedDPTest1 {
-  string key1;
-  long iteration1;
-};
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<SharedDPTest1> SharedDPTest1Seq;
-#endif
-
-struct SharedDPTest2 {
-  string key2;
-  long iteration2;
-};
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<SharedDPTest2> SharedDPTest2Seq;
-#endif
-
-struct SharedDPTest3 {
-  string key3;
-  long iteration3;
-};
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<SharedDPTest3> SharedDPTest3Seq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Base/Base.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Base/Base.mpc
deleted file mode 100644
index d67aff8cde6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Base/Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (SharedDP_Diff_ID_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = SharedDP_Diff_ID_Base_stub
-  dynamicflags += BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=BASE_STUB_Export \
-              -Wb,stub_export_include=Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    Base.idl
-  }
-
-  opendds_ts_flags += --export=BASE_STUB_Export
-
-  DDSGenerator_Files {
-    Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component.idl
deleted file mode 100644
index b045aab8549..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_SHARED_DP_COMPONENT_IDL
-#define DDS_SHARED_DP_COMPONENT_IDL
-
-#include "Connector1/Connector1.idl"
-#include "Connector2/Connector2.idl"
-#include "Connector3/Connector3.idl"
-
-module SharedDP
-{
-  component SharedDPComponent
-  {
-    port SharedDP_Connector1::SharedDPTest1Connector::DDS_Write write1;
-    port SharedDP_Connector2::SharedDPTest2Connector::DDS_Write write2;
-    port SharedDP_Connector3::SharedDPTest3Connector::DDS_Write write3;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component.mpc
deleted file mode 100644
index e6a9418413f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component.mpc
+++ /dev/null
@@ -1,152 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_SharedDPBase -l ../lib -o ../lib -c controller -u DDS Component"
-
-project(SharedDP_Diff_ID_Component_idl_gen) : componentidldefaults, dds4ccm {
-    after += SharedDP_Diff_ID_Connector1_idl_gen SharedDP_Diff_ID_Connector2_idl_gen \
-    SharedDP_Diff_ID_Connector3_idl_gen
-    custom_only = 1
-    idlflags += -Wb,stub_export_macro=COMPONENT_STUB_Export \
-    -Wb,stub_export_include=Component_stub_export.h \
-    -Wb,skel_export_macro=COMPONENT_SVNT_Export \
-    -Wb,skel_export_include=Component_svnt_export.h \
-    -Wb,svnt_export_macro=COMPONENT_SVNT_Export \
-    -Wb,svnt_export_include=Component_svnt_export.h \
-    -Wb,exec_export_macro=COMPONENT_EXEC_Export \
-    -Wb,exec_export_include=Component_exec_export.h \
-    -I ..
-
-    IDL_Files {
-        Component.idl
-    }
-}
-
-project(SharedDP_Diff_ID_Component_lem_gen) : ciaoidldefaults, dds4ccm {
-    after += SharedDP_Diff_ID_Component_idl_gen
-    custom_only = 1
-    idlflags += -Wb,stub_export_macro=COMPONENT_LEM_STUB_Export \
-    -Wb,stub_export_include=Component_lem_stub_export.h \
-    -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-    IDL_Files {
-        ComponentE.idl
-    }
-}
-
-project(SharedDP_Diff_ID_Component_lem_stub) : ccm_svnt, dds4ccm_base {
-    after += SharedDP_Diff_ID_Component_lem_gen SharedDP_Diff_ID_Component_stub SharedDP_Diff_ID_Base_stub
-    libs  += SharedDP_Diff_ID_Base_stub Component_stub
-    libpaths += ../lib
-    libout = ../lib
-    includes += ..
-    sharedname = Component_lem_stub
-    dynamicflags += COMPONENT_LEM_STUB_BUILD_DLL
-
-    IDL_Files {
-    }
-
-    Source_Files {
-        ComponentEC.cpp
-    }
-
-    Header_Files {
-        ComponentEC.h
-        Component_lem_stub_export.h
-    }
-
-    Inline_Files {
-        ComponentEC.inl
-    }
-}
-
-project(SharedDP_Diff_ID_Component_stub) : ccm_stub, dds4ccm_base {
-    after += SharedDP_Diff_ID_Component_idl_gen SharedDP_Diff_ID_Base_stub \
-    SharedDP_Diff_ID_Connector1_stub SharedDP_Diff_ID_Connector2_stub SharedDP_Diff_ID_Connector3_stub \
-    SharedDP_Diff_ID_Connector1_lem_gen SharedDP_Diff_ID_Connector2_lem_gen SharedDP_Diff_ID_Connector3_lem_gen
-    libs  += SharedDP_Diff_ID_Base_stub DDS_Connector1_stub DDS_Connector2_stub DDS_Connector3_stub
-    includes += ..
-    libpaths += ../lib
-    libout = ../lib
-    sharedname = Component_stub
-    dynamicflags += COMPONENT_STUB_BUILD_DLL
-
-    IDL_Files {
-    }
-
-    Source_Files {
-        ComponentC.cpp
-    }
-
-    Header_Files {
-        ComponentC.h
-        Component_stub_export.h
-    }
-
-    Inline_Files {
-        ComponentC.inl
-    }
-}
-
-project(SharedDP_Diff_ID_Component_exec) : ciao_executor, dds4ccm_impl {
-    after   += SharedDP_Diff_ID_Component_lem_stub SharedDP_Diff_ID_Component_stub \
-    SharedDP_Diff_ID_Connector1_lem_stub SharedDP_Diff_ID_Connector1_stub \
-    SharedDP_Diff_ID_Connector2_lem_stub SharedDP_Diff_ID_Connector2_stub \
-    SharedDP_Diff_ID_Connector3_lem_stub SharedDP_Diff_ID_Connector3_stub
-    sharedname = Component_exec
-    libs += Component_stub Component_lem_stub SharedDP_Diff_ID_Base_stub \
-    DDS_Connector1_lem_stub DDS_Connector1_stub \
-    DDS_Connector2_lem_stub DDS_Connector2_stub \
-    DDS_Connector3_lem_stub DDS_Connector3_stub
-    libpaths += ../lib
-    includes += ..
-    libout = ../lib
-    dynamicflags += COMPONENT_EXEC_BUILD_DLL
-
-    IDL_Files {
-    }
-
-    Source_Files {
-        Component_exec.cpp
-    }
-
-    Header_Files {
-        Component_exec.h
-        Component_exec_export.h
-    }
-
-    Inline_Files {
-    }
-}
-
-project(SharedDP_Diff_ID_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-    after      += SharedDP_Diff_ID_Base_stub  SharedDP_Diff_ID_Component_lem_stub \
-    SharedDP_Diff_ID_Connector1_stub SharedDP_Diff_ID_Connector1_svnt  SharedDP_Diff_ID_Connector1_lem_stub \
-    SharedDP_Diff_ID_Connector2_stub SharedDP_Diff_ID_Connector2_svnt  SharedDP_Diff_ID_Connector2_lem_stub \
-    SharedDP_Diff_ID_Connector3_stub SharedDP_Diff_ID_Connector3_svnt  SharedDP_Diff_ID_Connector3_lem_stub
-    sharedname  = Component_svnt
-    libs       += Component_stub Component_lem_stub  \
-    SharedDP_Diff_ID_Base_stub \
-    DDS_Connector1_stub DDS_Connector1_svnt DDS_Connector1_lem_stub \
-    DDS_Connector2_stub DDS_Connector2_svnt DDS_Connector2_lem_stub \
-    DDS_Connector3_stub DDS_Connector3_svnt DDS_Connector3_lem_stub
-    libpaths += ../lib
-    libout = ../lib
-    includes += ..
-    dynamicflags += COMPONENT_SVNT_BUILD_DLL
-
-    IDL_Files {
-    }
-
-    Source_Files {
-        ComponentS.cpp
-        Component_svnt.cpp
-    }
-
-    Header_Files {
-        ComponentS.h
-        Component_svnt.h
-        Component_svnt_export.h
-    }
-
-    Inline_Files {
-    }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component_exec.cpp
deleted file mode 100644
index 8f4b7274dee..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component_exec.cpp
+++ /dev/null
@@ -1,316 +0,0 @@
-// -*- C++ -*-
-#include "Component_exec.h"
-#include "ace/Log_Msg.h"
-
-#include "Connector1/Connector1_conn.h"
-#include "Connector2/Connector2_conn.h"
-#include "Connector3/Connector3_conn.h"
-
-namespace CIAO_SharedDP_SharedDPComponent_Impl
-{
-  //============================================================
-  // Component Executor Implementation Class: Component_exec_i
-  //============================================================
-
-  Component_exec_i::Component_exec_i (void)
-    : dp1_hnd_ (DDS::HANDLE_NIL)
-    , dp2_hnd_ (DDS::HANDLE_NIL)
-    , dp3_hnd_ (DDS::HANDLE_NIL)
-    , dp1_ptr_ (DDS::DomainParticipant::_nil ())
-    , dp2_ptr_ (DDS::DomainParticipant::_nil ())
-    , dp3_ptr_ (DDS::DomainParticipant::_nil ())
-  {
-  }
-
-  Component_exec_i::~Component_exec_i (void)
-  {
-  }
-
-  void
-  Component_exec_i::set_session_context (::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::SharedDP::CCM_SharedDPComponent_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Component_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Component_exec_i::ccm_activate (void)
-  {
-    try
-      {
-        ::DDS::DataWriter_var dw1 =
-          this->context_->get_connection_write1_dds_entity ();
-
-        if (::CORBA::is_nil (dw1.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - "
-                        "Datawriter 1 connection is NIL.\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-
-        ::CIAO::DDS4CCM::CCM_DataWriter * ccm_dw1 =
-          dynamic_cast < ::CIAO::DDS4CCM::CCM_DataWriter * > (dw1.in ());
-
-        if (ccm_dw1)
-          {
-            ::DDS::DataWriter_var tmp = ccm_dw1->get_dds_entity ();
-            if (! ::CORBA::is_nil (tmp.in ()))
-              {
-                ::DDS::Publisher_var publisher = tmp->get_publisher ();
-
-                if (! ::CORBA::is_nil (publisher.in ()))
-                  {
-                    ::DDS::DomainParticipant_var dp = publisher->get_participant ();
-
-                    if (! ::CORBA::is_nil (publisher.in ()))
-                      {
-
-                        this->dp1_hnd_ = dp->get_instance_handle ();
-                        this->dp1_ptr_ = dp.ptr ();
-                      }
-                    else
-                      {
-                        ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                    "Error getting DomainParticipant 1.\n"));
-                        throw ::CORBA::INTERNAL ();
-                      }
-                  }
-                else
-                  {
-                    ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                "Error getting Publisher 1.\n"));
-                    throw ::CORBA::INTERNAL ();
-                  }
-              }
-            else
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                            "Error getting DDS DataWriter 1.\n"));
-                throw ::CORBA::INTERNAL ();
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - "
-                        "Error casting DataWriter 1 to CCM DataWriter 1\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Unable to create dds_entity for writer1\n"));
-      }
-
-    try
-      {
-        ::DDS::DataWriter_var dw2 =
-          this->context_->get_connection_write2_dds_entity ();
-
-        if (::CORBA::is_nil (dw2.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - "
-                        "Datawriter 2 connection is NIL.\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-
-        ::CIAO::DDS4CCM::CCM_DataWriter * ccm_dw2 =
-          dynamic_cast < ::CIAO::DDS4CCM::CCM_DataWriter * > (dw2.in ());
-
-        if (ccm_dw2)
-          {
-            ::DDS::DataWriter_var tmp = ccm_dw2->get_dds_entity ();
-            if (! ::CORBA::is_nil (tmp.in ()))
-              {
-                ::DDS::Publisher_var publisher = tmp->get_publisher ();
-
-                if (! ::CORBA::is_nil (publisher.in ()))
-                  {
-                    ::DDS::DomainParticipant_var dp = publisher->get_participant ();
-
-                    if (! ::CORBA::is_nil (publisher.in ()))
-                      {
-
-                        this->dp2_hnd_ = dp->get_instance_handle ();
-                        this->dp2_ptr_ = dp.ptr ();
-                      }
-                    else
-                      {
-                        ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                    "Error getting DomainParticipant 2.\n"));
-                        throw ::CORBA::INTERNAL ();
-                      }
-                  }
-                else
-                  {
-                    ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                "Error getting Publisher 2.\n"));
-                    throw ::CORBA::INTERNAL ();
-                  }
-              }
-            else
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                            "Error getting DDS DataWriter 2.\n"));
-                throw ::CORBA::INTERNAL ();
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - "
-                        "Error casting DataWriter 2 to CCM DataWriter 2\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Unable to create dds_entity for writer2\n"));
-      }
-
-    try
-      {
-        ::DDS::DataWriter_var dw3 =
-          this->context_->get_connection_write3_dds_entity ();
-
-        if (::CORBA::is_nil (dw3.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - "
-                        "Datawriter 3 connection is NIL.\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-
-        ::CIAO::DDS4CCM::CCM_DataWriter * ccm_dw3 =
-          dynamic_cast < ::CIAO::DDS4CCM::CCM_DataWriter * > (dw3.in ());
-
-        if (ccm_dw3)
-          {
-            ::DDS::DataWriter_var tmp = ccm_dw3->get_dds_entity ();
-            if (! ::CORBA::is_nil (tmp.in ()))
-              {
-                ::DDS::Publisher_var publisher = tmp->get_publisher ();
-
-                if (! ::CORBA::is_nil (publisher.in ()))
-                  {
-                    ::DDS::DomainParticipant_var dp = publisher->get_participant ();
-
-                    if (! ::CORBA::is_nil (publisher.in ()))
-                      {
-                        this->dp3_hnd_ = dp->get_instance_handle ();
-                        this->dp3_ptr_ = dp.ptr ();
-                      }
-                    else
-                      {
-                        ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                    "Error getting DomainParticipant 3.\n"));
-                        throw ::CORBA::INTERNAL ();
-                      }
-                  }
-                else
-                  {
-                    ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                "Error getting Publisher 3.\n"));
-                    throw ::CORBA::INTERNAL ();
-                  }
-              }
-            else
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                            "Error getting DDS DataWriter 3.\n"));
-                throw ::CORBA::INTERNAL ();
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - "
-                        "Error casting DataWriter 3 to CCM DataWriter 3\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Unable to create dds_entity for writer3\n"));
-      }
-  }
-
-  void
-  Component_exec_i::ccm_passivate (void)
-  {
-    if (this->dp1_hnd_ == DDS::HANDLE_NIL)
-      ACE_ERROR ((LM_ERROR, "ERROR: DomainParticipant for Connector 1 seems to be NIL\n"));
-    if (this->dp2_hnd_ == DDS::HANDLE_NIL)
-      ACE_ERROR ((LM_ERROR, "ERROR: DomainParticipant for Connector 2 seems to be NIL\n"));
-    if (this->dp3_hnd_ == DDS::HANDLE_NIL)
-      ACE_ERROR ((LM_ERROR, "ERROR: DomainParticipant for Connector 3 seems to be NIL\n"));
-  }
-
-  void
-  Component_exec_i::ccm_remove (void)
-  {
-    if ((this->dp1_hnd_ == this->dp2_hnd_)
-#if (CIAO_DDS4CCM_OPENDDS==1)
-        && (this->dp1_ptr_ == this->dp2_ptr_)
-#endif
-        )
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Connector 1 and 2 seem to "
-                              "share the same DomainParticipant. Based on the domain_id the "
-                              "domain participants should be different\n"));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "OK: Connector 1 and 2 don't seems to "
-                              "share the same DomainParticipant\n"));
-      }
-    if ((this->dp1_hnd_ == this->dp3_hnd_)
-#if (CIAO_DDS4CCM_OPENDDS==1)
-        && (this->dp1_ptr_ == this->dp3_ptr_)
-#endif
-        )
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Connector 1 and 3 seem to "
-                              "share the same DomainParticipant\n"));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "OK: Connector 1 and 3 don't seems to "
-                              "share the same DomainParticipant\n"));
-      }
-    if ((this->dp2_hnd_ == this->dp3_hnd_)
-#if (CIAO_DDS4CCM_OPENDDS==1)
-        && (this->dp2_ptr_ == this->dp3_ptr_)
-#endif
-        )
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Connector 2 and 3 seem to "
-                              "share the same DomainParticipant\n"));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "OK: Connector 2 and 3 don't seems to "
-                              "share the same DomainParticipant\n"));
-      }
-  }
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Component_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Component_exec_i);
-
-    return retval;
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component_exec.h b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component_exec.h
deleted file mode 100644
index dfcc1d903e7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component_exec.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_COMPONENT_EXEC_H_
-#define CIAO_COMPONENT_EXEC_H_
-
-
-#include "ComponentEC.h"
-
-#include /**/ "Component_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-class DDSDomainParticipant;
-
-namespace CIAO_SharedDP_SharedDPComponent_Impl
-{
-  class Component_exec_i
-    : public virtual SharedDPComponent_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Component_exec_i (void);
-    virtual ~Component_exec_i (void);
-
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete (void);
-
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-
-  private:
-    ::SharedDP::CCM_SharedDPComponent_Context_var context_;
-
-    ::DDS::InstanceHandle_t dp1_hnd_;
-    ::DDS::InstanceHandle_t dp2_hnd_;
-    ::DDS::InstanceHandle_t dp3_hnd_;
-    ::DDS::DomainParticipant_ptr dp1_ptr_;
-    ::DDS::DomainParticipant_ptr dp2_ptr_;
-    ::DDS::DomainParticipant_ptr dp3_ptr_;
-  };
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Component_Impl (void);
-}
-
-#endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector1/Connector1.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector1/Connector1.idl
deleted file mode 100644
index 4afe620e7f1..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector1/Connector1.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * @file Connector1.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef SHARED_DP_CONNECTOR1_IDL_
-#define SHARED_DP_CONNECTOR1_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Base.idl"
-
-#pragma ciao lem "Connector1/Connector1E.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/BaseTypeSupport.idl"
-#endif
-
-module SharedDP_Connector1
-{
-  module ::CCM_DDS::Typed < ::SharedDPTest1, ::SharedDPTest1Seq> SharedDPTest1Connector;
-};
-
-
-
-#endif /* SHARED_DP_CONNECTOR1_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector1/Connector1.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector1/Connector1.mpc
deleted file mode 100644
index 15b4e4419bc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector1/Connector1.mpc
+++ /dev/null
@@ -1,140 +0,0 @@
-project(SharedDP_Diff_ID_Connector1_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen SharedDP_Diff_ID_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR1_STUB_Export \
-              -Wb,stub_export_include=Connector1_stub_export.h \
-              -Wb,skel_export_macro=SHAREDDP_CONNECTOR1_SVNT_Export \
-              -Wb,skel_export_include=Connector1_svnt_export.h \
-              -Wb,svnt_export_macro=SHAREDDP_CONNECTOR1_SVNT_Export \
-              -Wb,svnt_export_include=Connector1_svnt_export.h \
-              -Wb,conn_export_macro=SHAREDDP_CONNECTOR1_CONN_Export \
-              -Wb,conn_export_include=Connector1_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Connector1.idl
-  }
-}
-
-project(SharedDP_Diff_ID_Connector1_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += SharedDP_Diff_ID_Connector1_idl_gen
-  idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR1_LEM_STUB_Export \
-              -Wb,stub_export_include=Connector1_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    Connector1E.idl
-  }
-}
-
-project(SharedDP_Diff_ID_Connector1_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += SharedDP_Diff_ID_Connector1_lem_gen SharedDP_Diff_ID_Connector1_stub SharedDP_Diff_ID_Base_stub
-  libs  += SharedDP_Diff_ID_Base_stub DDS_Connector1_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Connector1_lem_stub
-  dynamicflags += SHAREDDP_CONNECTOR1_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector1EC.cpp
-  }
-
-  Header_Files {
-    Connector1EC.h
-    Connector1_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Connector1EC.inl
-  }
-}
-
-project(SharedDP_Diff_ID_Connector1_stub) : ccm_stub, dds4ccm_base {
-  after += SharedDP_Diff_ID_Connector1_idl_gen SharedDP_Diff_ID_Base_stub
-  libs  += SharedDP_Diff_ID_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Connector1_stub
-  dynamicflags += SHAREDDP_CONNECTOR1_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector1C.cpp
-  }
-
-  Header_Files {
-    Connector1C.h
-    Connector1_stub_export.h
-  }
-
-  Inline_Files {
-    Connector1C.inl
-  }
-}
-
-project(SharedDP_Diff_ID_Connector1_exec) : ciao_executor, dds4ccm_impl {
-  after   += SharedDP_Diff_ID_Connector1_lem_stub SharedDP_Diff_ID_Connector1_stub SharedDP_Diff_ID_Base_stub
-  sharedname = DDS_Connector1_exec
-  libs += DDS_Connector1_stub DDS_Connector1_lem_stub SharedDP_Diff_ID_Base_stub SharedDP_Diff_ID_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SHAREDDP_CONNECTOR1_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector1_conn.cpp
-  }
-
-  Header_Files {
-    Connector1_conn.h
-    Connector1_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(SharedDP_Diff_ID_Connector1_svnt) : ciao_servant, dds4ccm_impl {
-  after      += SharedDP_Diff_ID_Connector1_lem_stub SharedDP_Diff_ID_Connector1_exec SharedDP_Diff_ID_Connector1_stub
-  sharedname  = DDS_Connector1_svnt
-  libs       += DDS_Connector1_stub \
-                DDS_Connector1_lem_stub  \
-                SharedDP_Diff_ID_Base_stub \
-                DDS_Connector1_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SHAREDDP_CONNECTOR1_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector1S.cpp
-    Connector1_svnt.cpp
-  }
-
-  Header_Files {
-    Connector1S.h
-    Connector1_svnt.h
-    Connector1_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector2/Connector2.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector2/Connector2.idl
deleted file mode 100644
index f38a634b931..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector2/Connector2.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file Connector2.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef SHARED_DP_CONNECTOR2_IDL_
-#define SHARED_DP_CONNECTOR2_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Base.idl"
-
-#pragma ciao lem "Connector2/Connector2E.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/BaseTypeSupport.idl"
-#endif
-
-module SharedDP_Connector2
-{
-  module ::CCM_DDS::Typed < ::SharedDPTest2, ::SharedDPTest2Seq> SharedDPTest2Connector;
-};
-
-#endif /* SHARED_DP_CONNECTOR2_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector2/Connector2.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector2/Connector2.mpc
deleted file mode 100644
index b1059bca0ca..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector2/Connector2.mpc
+++ /dev/null
@@ -1,140 +0,0 @@
-project(SharedDP_Diff_ID_Connector2_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen SharedDP_Diff_ID_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR2_STUB_Export \
-              -Wb,stub_export_include=Connector2_stub_export.h \
-              -Wb,skel_export_macro=SHAREDDP_CONNECTOR2_SVNT_Export \
-              -Wb,skel_export_include=Connector2_svnt_export.h \
-              -Wb,svnt_export_macro=SHAREDDP_CONNECTOR2_SVNT_Export \
-              -Wb,svnt_export_include=Connector2_svnt_export.h \
-              -Wb,conn_export_macro=SHAREDDP_CONNECTOR2_CONN_Export \
-              -Wb,conn_export_include=Connector2_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Connector2.idl
-  }
-}
-
-project(SharedDP_Diff_ID_Connector2_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += SharedDP_Diff_ID_Connector2_idl_gen
-  idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR2_LEM_STUB_Export \
-              -Wb,stub_export_include=Connector2_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    Connector2E.idl
-  }
-}
-
-project(SharedDP_Diff_ID_Connector2_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += SharedDP_Diff_ID_Connector2_lem_gen SharedDP_Diff_ID_Connector2_stub SharedDP_Diff_ID_Base_stub
-  libs  += SharedDP_Diff_ID_Base_stub DDS_Connector2_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Connector2_lem_stub
-  dynamicflags += SHAREDDP_CONNECTOR2_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector2EC.cpp
-  }
-
-  Header_Files {
-    Connector2EC.h
-    Connector2_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Connector2EC.inl
-  }
-}
-
-project(SharedDP_Diff_ID_Connector2_stub) : ccm_stub, dds4ccm_base {
-  after += SharedDP_Diff_ID_Connector2_idl_gen SharedDP_Diff_ID_Base_stub
-  libs  += SharedDP_Diff_ID_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Connector2_stub
-  dynamicflags += SHAREDDP_CONNECTOR2_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector2C.cpp
-  }
-
-  Header_Files {
-    Connector2C.h
-    Connector2_stub_export.h
-  }
-
-  Inline_Files {
-    Connector2C.inl
-  }
-}
-
-project(SharedDP_Diff_ID_Connector2_exec) : ciao_executor, dds4ccm_impl {
-  after   += SharedDP_Diff_ID_Connector2_lem_stub SharedDP_Diff_ID_Connector2_stub SharedDP_Diff_ID_Base_stub
-  sharedname = DDS_Connector2_exec
-  libs += DDS_Connector2_stub DDS_Connector2_lem_stub SharedDP_Diff_ID_Base_stub SharedDP_Diff_ID_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SHAREDDP_CONNECTOR2_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector2_conn.cpp
-  }
-
-  Header_Files {
-    Connector2_conn.h
-    Connector2_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(SharedDP_Diff_ID_Connector2_svnt) : ciao_servant, dds4ccm_impl {
-  after      += SharedDP_Diff_ID_Connector2_lem_stub SharedDP_Diff_ID_Connector2_exec SharedDP_Diff_ID_Connector2_stub
-  sharedname  = DDS_Connector2_svnt
-  libs       += DDS_Connector2_stub \
-                DDS_Connector2_lem_stub  \
-                SharedDP_Diff_ID_Base_stub \
-                DDS_Connector2_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SHAREDDP_CONNECTOR2_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector2S.cpp
-    Connector2_svnt.cpp
-  }
-
-  Header_Files {
-    Connector2S.h
-    Connector2_svnt.h
-    Connector2_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector3/Connector3.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector3/Connector3.idl
deleted file mode 100644
index 19984701e26..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector3/Connector3.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file Connector3.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef SHARED_DP_CONNECTOR3_IDL_
-#define SHARED_DP_CONNECTOR3_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Base.idl"
-
-#pragma ciao lem "Connector3/Connector3E.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/BaseTypeSupport.idl"
-#endif
-
-module SharedDP_Connector3
-{
-  module ::CCM_DDS::Typed < ::SharedDPTest3, ::SharedDPTest3Seq> SharedDPTest3Connector;
-};
-
-#endif /* SHARED_DP_CONNECTOR3_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector3/Connector3.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector3/Connector3.mpc
deleted file mode 100644
index f5c705f13a6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector3/Connector3.mpc
+++ /dev/null
@@ -1,140 +0,0 @@
-project(SharedDP_Diff_ID_Connector3_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen SharedDP_Diff_ID_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR3_STUB_Export \
-              -Wb,stub_export_include=Connector3_stub_export.h \
-              -Wb,skel_export_macro=SHAREDDP_CONNECTOR3_SVNT_Export \
-              -Wb,skel_export_include=Connector3_svnt_export.h \
-              -Wb,svnt_export_macro=SHAREDDP_CONNECTOR3_SVNT_Export \
-              -Wb,svnt_export_include=Connector3_svnt_export.h \
-              -Wb,conn_export_macro=SHAREDDP_CONNECTOR3_CONN_Export \
-              -Wb,conn_export_include=Connector3_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Connector3.idl
-  }
-}
-
-project(SharedDP_Diff_ID_Connector3_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += SharedDP_Diff_ID_Connector3_idl_gen
-  idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR3_LEM_STUB_Export \
-              -Wb,stub_export_include=Connector3_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    Connector3E.idl
-  }
-}
-
-project(SharedDP_Diff_ID_Connector3_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += SharedDP_Diff_ID_Connector3_lem_gen SharedDP_Diff_ID_Connector3_stub SharedDP_Diff_ID_Base_stub
-  libs  += SharedDP_Diff_ID_Base_stub DDS_Connector3_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Connector3_lem_stub
-  dynamicflags += SHAREDDP_CONNECTOR3_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector3EC.cpp
-  }
-
-  Header_Files {
-    Connector3EC.h
-    Connector3_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Connector3EC.inl
-  }
-}
-
-project(SharedDP_Diff_ID_Connector3_stub) : ccm_stub, dds4ccm_base {
-  after += SharedDP_Diff_ID_Connector3_idl_gen SharedDP_Diff_ID_Base_stub
-  libs  += SharedDP_Diff_ID_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Connector3_stub
-  dynamicflags += SHAREDDP_CONNECTOR3_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector3C.cpp
-  }
-
-  Header_Files {
-    Connector3C.h
-    Connector3_stub_export.h
-  }
-
-  Inline_Files {
-    Connector3C.inl
-  }
-}
-
-project(SharedDP_Diff_ID_Connector3_exec) : ciao_executor, dds4ccm_impl {
-  after   += SharedDP_Diff_ID_Connector3_lem_stub SharedDP_Diff_ID_Connector3_stub SharedDP_Diff_ID_Base_stub
-  sharedname = DDS_Connector3_exec
-  libs += DDS_Connector3_stub DDS_Connector3_lem_stub SharedDP_Diff_ID_Base_stub SharedDP_Diff_ID_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SHAREDDP_CONNECTOR3_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector3_conn.cpp
-  }
-
-  Header_Files {
-    Connector3_conn.h
-    Connector3_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(SharedDP_Diff_ID_Connector3_svnt) : ciao_servant, dds4ccm_impl {
-  after      += SharedDP_Diff_ID_Connector3_lem_stub SharedDP_Diff_ID_Connector3_exec SharedDP_Diff_ID_Connector3_stub
-  sharedname  = DDS_Connector3_svnt
-  libs       += DDS_Connector3_stub \
-                DDS_Connector3_lem_stub  \
-                SharedDP_Diff_ID_Base_stub \
-                DDS_Connector3_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SHAREDDP_CONNECTOR3_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector3S.cpp
-    Connector3_svnt.cpp
-  }
-
-  Header_Files {
-    Connector3S.h
-    Connector3_svnt.h
-    Connector3_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/Plan.cdp
deleted file mode 100644
index 1a86d6da026..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/Plan.cdp
+++ /dev/null
@@ -1,478 +0,0 @@
-<!--  -->
-<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>SharedDPTest_Depl_1</label>
-  <UUID>SharedDPTest_Depl_1</UUID>
-
-  <implementation xmi:id="Connector1Implementation">
-    <name>Connector1Implementation</name>
-    <source/>
-    <artifact xmi:idref="Connector1_ExecArtifact" />
-    <artifact xmi:idref="Connector1_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SharedDP_Connector1_SharedDPTest1Connector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SharedDP_Connector1_SharedDPTest1Connector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DDS_Connector1_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DDS_Connector1_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Connector2Implementation">
-    <name>Connector2Implementation</name>
-    <source/>
-    <artifact xmi:idref="Connector2_ExecArtifact" />
-    <artifact xmi:idref="Connector2_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SharedDP_Connector2_SharedDPTest2Connector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SharedDP_Connector2_SharedDPTest2Connector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DDS_Connector2_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DDS_Connector2_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Connector3Implementation">
-    <name>Connector3Implementation</name>
-    <source/>
-    <artifact xmi:idref="Connector3_ExecArtifact" />
-    <artifact xmi:idref="Connector3_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SharedDP_Connector3_SharedDPTest3Connector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SharedDP_Connector3_SharedDPTest3Connector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DDS_Connector3_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DDS_Connector3_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="ComponentImplementation">
-    <name>ComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Component_ExecArtifact" />
-    <artifact xmi:idref="Component_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Component_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SharedDP_SharedDPComponent_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="Connector1Instance">
-    <name>Connector1Instance</name>
-    <node>ComponentNode</node>
-    <source/>
-    <implementation xmi:idref="Connector1Implementation" />
-    <configProperty>
-      <name>domain_id</name>
-      <value>
-        <type>
-          <kind>tk_long</kind>
-        </type>
-        <value>
-          <long>97</long>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SharedDP</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shared_Library#SharedProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Connector2Instance">
-    <name>Connector2Instance</name>
-    <node>ComponentNode</node>
-    <source/>
-    <implementation xmi:idref="Connector2Implementation" />
-    <configProperty>
-      <name>domain_id</name>
-      <value>
-        <type>
-          <kind>tk_long</kind>
-        </type>
-        <value>
-          <long>98</long>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SharedDP2</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shared_Library#SharedProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Connector3Instance">
-    <name>Connector3Instance</name>
-    <node>ComponentNode</node>
-    <source/>
-    <implementation xmi:idref="Connector3Implementation" />
-    <configProperty>
-      <name>domain_id</name>
-      <value>
-        <type>
-          <kind>tk_long</kind>
-        </type>
-        <value>
-          <long>99</long>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SharedDP</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shared_Library#SharedProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ComponentInstance">
-    <name>Component</name>
-    <node>ComponentNode</node>
-    <source/>
-    <implementation xmi:idref="ComponentImplementation" />
-  </instance>
-
-  <connection>
-    <name>writer_connection1</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>write1_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Connector1Instance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection2</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>write2_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Connector2Instance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection3</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>write3_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Connector3Instance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Component_ExecArtifact">
-    <name>Component_exec</name>
-    <source/>
-    <node/>
-    <location>Component_exec</location>
-  </artifact>
-  <artifact xmi:id="Component_SvntArtifact">
-    <name>Component_svnt</name>
-    <source/>
-    <node/>
-    <location>Component_svnt</location>
-  </artifact>
-  <artifact xmi:id="Component_StubArtifact">
-    <name>Component_stub</name>
-    <source/>
-    <node/>
-    <location>Component_stub</location>
-  </artifact>
-
-  <artifact xmi:id="Connector1_ExecArtifact">
-    <name>DDS_Connector1_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Connector1_exec</location>
-  </artifact>
-  <artifact xmi:id="Connector1_SvntArtifact">
-    <name>DDS_Connector1_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Connector1_svnt</location>
-  </artifact>
-  <artifact xmi:id="Connector1_StubArtifact">
-    <name>DDS_Connector1_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Connector1_stub</location>
-  </artifact>
-
-  <artifact xmi:id="Connector2_ExecArtifact">
-    <name>DDS_Connector2_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Connector2_exec</location>
-  </artifact>
-  <artifact xmi:id="Connector2_SvntArtifact">
-    <name>DDS_Connector2_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Connector2_svnt</location>
-  </artifact>
-  <artifact xmi:id="Connector2_StubArtifact">
-    <name>DDS_Connector2_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Connector2_stub</location>
-  </artifact>
-
-  <artifact xmi:id="Connector3_ExecArtifact">
-    <name>DDS_Connector3_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Connector3_exec</location>
-  </artifact>
-  <artifact xmi:id="Connector3_SvntArtifact">
-    <name>DDS_Connector3_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Connector3_svnt</location>
-  </artifact>
-  <artifact xmi:id="Connector3_StubArtifact">
-    <name>DDS_Connector3_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Connector3_stub</location>
-  </artifact>
-
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/Shared_Library.xml b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/Shared_Library.xml
deleted file mode 100644
index 5424a2e910a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/Shared_Library.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-
-  <qos_profile name="SharedProfile">
-    <datawriter_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-        <max_blocking_time>
-          <sec>10</sec>
-          <nanosec>0</nanosec>
-        </max_blocking_time>
-      </reliability>
-      <durability>
-        <kind>TRANSIENT_DURABILITY_QOS</kind>
-      </durability>
-      <history>
-        <kind>KEEP_LAST_HISTORY_QOS</kind>
-        <depth>20</depth>
-      </history>
-    </datawriter_qos>
-    <datareader_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-      </reliability>
-      <history>
-        <kind>KEEP_LAST_HISTORY_QOS</kind>
-        <depth>20</depth>
-      </history>
-      <durability>
-        <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-      </durability>
-    </datareader_qos>
-  </qos_profile>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/Standalone_Library.xml b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/Standalone_Library.xml
deleted file mode 100644
index 63e213c18d3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/Standalone_Library.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-
-  <qos_profile name="StandaloneProfile">
-    <datawriter_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-        <max_blocking_time>
-          <sec>10</sec>
-          <nanosec>0</nanosec>
-        </max_blocking_time>
-      </reliability>
-      <durability>
-        <kind>TRANSIENT_DURABILITY_QOS</kind>
-      </durability>
-      <history>
-        <kind>KEEP_LAST_HISTORY_QOS</kind>
-        <depth>20</depth>
-      </history>
-    </datawriter_qos>
-    <datareader_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-      </reliability>
-      <history>
-        <kind>KEEP_LAST_HISTORY_QOS</kind>
-        <depth>20</depth>
-      </history>
-      <durability>
-        <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-      </durability>
-    </datareader_qos>
-  </qos_profile>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index f1018e84958..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <qos_library name="Shared_Library">
-    <qos_profile name="SharedProfile" is_default_qos="false">
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>10</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_LAST_HISTORY_QOS</kind>
-          <depth>20</depth>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_LAST_HISTORY_QOS</kind>
-          <depth>20</depth>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-  <qos_library name="Standalone_Library">
-    <qos_profile name="StandaloneProfile" is_default_qos="false">
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>10</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_LAST_HISTORY_QOS</kind>
-          <depth>20</depth>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_LAST_HISTORY_QOS</kind>
-          <depth>20</depth>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/run_test.pl
deleted file mode 100755
index 91749ec0bf3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/run_test.pl
+++ /dev/null
@@ -1,241 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-BEGIN {
-    undef $ENV{'DDS4CCM_DEFAULT_DOMAIN_ID'};
-}
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 1;
-@ports = ( 60001 );
-@iorbases = ( "NodeApp1.ior" );
-@iorfiles = 0;
-@nodenames = ( "ComponentNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 1 seconds to allow task to complete\n";
-sleep (1);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -s\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/README b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/README
deleted file mode 100644
index 6aaae0f6f81..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/README
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-To save resources, every subsequent connector with the same
-library name and profile name, should get the same domain-
-participant.
-
-There're three connectors. Two (Connector1 and Connector2)
-with the same library/profile name.
-One (Connector3) with a different library/profile name.
-
-The component checks the pointers of the domainparticipants.
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl
deleted file mode 100644
index b0c773f58de..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef BASE_IDL
-#define BASE_IDL
-
-#pragma ndds typesupport "Base/BaseSupport.h"
-#pragma opendds typesupport "Base/BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "SharedDPTest"
-#pragma DCPS_DATA_KEY "SharedDPTest key"
-
-struct SharedDPTest {
-  string key;
-  long iteration;
-};
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<SharedDPTest> SharedDPTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc
deleted file mode 100644
index 17ee2d5f8cc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_SharedDPBase_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_SharedDPBase_stub
-  dynamicflags += BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=BASE_STUB_Export \
-              -Wb,stub_export_include=Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    Base.idl
-  }
-
-  opendds_ts_flags += --export=BASE_STUB_Export
-
-  DDSGenerator_Files {
-    Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.idl
deleted file mode 100644
index a4023fa461c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_SHARED_DP_COMPONENT_IDL
-#define DDS_SHARED_DP_COMPONENT_IDL
-
-#include "Connector/Connector.idl"
-
-module SharedDP
-{
-  component SharedDPComponent
-  {
-    port SharedDPTestConnector::DDS_Write write1;
-    port SharedDPTestConnector::DDS_Write write2;
-    port SharedDPTestConnector::DDS_Write write3;
-    port SharedDPTestConnector::DDS_Write write4;
-
-    attribute boolean perform_test;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc
deleted file mode 100644
index ad292a53373..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc
+++ /dev/null
@@ -1,144 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_SharedDPBase -l ../lib -o ../lib -c controller -u DDS Component"
-
-project(DDS_SharedDPComponent_idl_gen) : componentidldefaults, dds4ccm {
-    after += DDS_SharedDP_Connector_idl_gen
-    custom_only = 1
-    idlflags += -Wb,stub_export_macro=COMPONENT_STUB_Export \
-    -Wb,stub_export_include=Component_stub_export.h \
-    -Wb,skel_export_macro=COMPONENT_SVNT_Export \
-    -Wb,skel_export_include=Component_svnt_export.h \
-    -Wb,svnt_export_macro=COMPONENT_SVNT_Export \
-    -Wb,svnt_export_include=Component_svnt_export.h \
-    -Wb,exec_export_macro=COMPONENT_EXEC_Export \
-    -Wb,exec_export_include=Component_exec_export.h \
-    -I ..
-
-    IDL_Files {
-        Component.idl
-    }
-}
-
-project(DDS_SharedDPComponent_lem_gen) : ciaoidldefaults, dds4ccm {
-    after += DDS_SharedDPComponent_idl_gen
-    custom_only = 1
-    idlflags += -Wb,stub_export_macro=COMPONENT_LEM_STUB_Export \
-    -Wb,stub_export_include=Component_lem_stub_export.h \
-    -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-    IDL_Files {
-        ComponentE.idl
-    }
-}
-
-project(DDS_SharedDPComponent_lem_stub) : ccm_svnt, dds4ccm_base {
-    after += DDS_SharedDPComponent_lem_gen DDS_SharedDPComponent_stub DDS_SharedDPBase_stub
-    libs  += DDS_SharedDPBase_stub Component_stub
-    libpaths += ../lib
-    libout = ../lib
-    includes += ..
-    sharedname = Component_lem_stub
-    dynamicflags += COMPONENT_LEM_STUB_BUILD_DLL
-
-    IDL_Files {
-    }
-
-    Source_Files {
-        ComponentEC.cpp
-    }
-
-    Header_Files {
-        ComponentEC.h
-        Component_lem_stub_export.h
-    }
-
-    Inline_Files {
-        ComponentEC.inl
-    }
-}
-
-project(DDS_SharedDPComponent_stub) : ccm_stub, dds4ccm_base {
-    after += DDS_SharedDPComponent_idl_gen DDS_SharedDPBase_stub \
-    DDS_SharedDP_Connector_lem_gen DDS_SharedDP_Connector_stub
-    libs  += DDS_SharedDPBase_stub DDS_Connector_stub
-    includes += ..
-    libpaths += ../lib
-    libout = ../lib
-    sharedname = Component_stub
-    dynamicflags += COMPONENT_STUB_BUILD_DLL
-
-    IDL_Files {
-    }
-
-    Source_Files {
-        ComponentC.cpp
-    }
-
-    Header_Files {
-        ComponentC.h
-        Component_stub_export.h
-    }
-
-    Inline_Files {
-        ComponentC.inl
-    }
-}
-
-project(DDS_SharedDPComponent_exec) : ciao_executor,  dds4ccm_impl {
-    after   += DDS_SharedDPComponent_lem_stub DDS_SharedDPComponent_stub \
-    DDS_SharedDP_Connector_lem_stub DDS_SharedDP_Connector_stub
-    sharedname = Component_exec
-    libs += Component_stub Component_lem_stub DDS_SharedDPBase_stub \
-    DDS_Connector_lem_stub DDS_Connector_stub
-    libpaths += ../lib
-    includes += ..
-    libout = ../lib
-    dynamicflags += COMPONENT_EXEC_BUILD_DLL
-
-    IDL_Files {
-    }
-
-    Source_Files {
-        Component_exec.cpp
-    }
-
-    Header_Files {
-        Component_exec.h
-        Component_exec_export.h
-    }
-
-    Inline_Files {
-    }
-}
-
-
-project(DDS_SharedDPComponent_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-    after      += DDS_SharedDPBase_stub  DDS_SharedDPComponent_lem_stub \
-    DDS_SharedDP_Connector_stub DDS_SharedDP_Connector_svnt \
-    DDS_SharedDP_Connector_lem_stub
-    sharedname  = Component_svnt
-    libs       += Component_stub Component_lem_stub  \
-    DDS_SharedDPBase_stub \
-    DDS_Connector_stub DDS_Connector_svnt DDS_Connector_lem_stub
-    libpaths += ../lib
-    libout = ../lib
-    includes += ..
-    dynamicflags += COMPONENT_SVNT_BUILD_DLL
-
-    IDL_Files {
-    }
-
-    Source_Files {
-        ComponentS.cpp
-        Component_svnt.cpp
-    }
-
-    Header_Files {
-        ComponentS.h
-        Component_svnt.h
-        Component_svnt_export.h
-    }
-
-    Inline_Files {
-    }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp
deleted file mode 100644
index 2f5bcdd7492..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp
+++ /dev/null
@@ -1,586 +0,0 @@
-// -*- C++ -*-
-// Test whether Connector 1,2 and 3 are sharing the same DomainParticipant.
-// Connector 4 should have a different DomainParticipant.
-// Also test whether Connector 1 and 2 share the same topic.
-
-#include "Component_exec.h"
-#include "ace/Log_Msg.h"
-
-#include "Connector/Connector_conn.h"
-
-const char * tp_name_conn_1_ = "SharedDP";
-const char * tp_name_conn_2_ = "SharedDP";
-const char * tp_name_conn_3_ = "SharedDP1";
-const char * tp_name_conn_4_ = "StandaloneDP";
-
-namespace CIAO_SharedDP_SharedDPComponent_Impl
-{
-  //============================================================
-  // Component Executor Implementation Class: Component_exec_i
-  //============================================================
-
-  Component_exec_i::Component_exec_i (void)
-    : perform_test_ (false)
-    , dp1_hnd_ (DDS::HANDLE_NIL)
-    , dp2_hnd_ (DDS::HANDLE_NIL)
-    , dp3_hnd_ (DDS::HANDLE_NIL)
-    , dp4_hnd_ (DDS::HANDLE_NIL)
-    , dp1_ptr_ (DDS::DomainParticipant::_nil ())
-    , dp2_ptr_ (DDS::DomainParticipant::_nil ())
-    , dp3_ptr_ (DDS::DomainParticipant::_nil ())
-    , dp4_ptr_ (DDS::DomainParticipant::_nil ())
-    , tp1_hnd_ (DDS::HANDLE_NIL)
-    , tp2_hnd_ (DDS::HANDLE_NIL)
-    , tp3_hnd_ (DDS::HANDLE_NIL)
-    , tp4_hnd_ (DDS::HANDLE_NIL)
-    , tp1_ptr_ (DDS::Topic::_nil ())
-    , tp2_ptr_ (DDS::Topic::_nil ())
-    , tp3_ptr_ (DDS::Topic::_nil ())
-    , tp4_ptr_ (DDS::Topic::_nil ())
-  {
-  }
-
-  Component_exec_i::~Component_exec_i (void)
-  {
-  }
-
-  void
-  Component_exec_i::set_session_context (::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::SharedDP::CCM_SharedDPComponent_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Component_exec_i::configuration_complete (void)
-  {
-  }
-
-  CORBA::Boolean
-  Component_exec_i::perform_test (void)
-  {
-    return this->perform_test_;
-  }
-
-  void
-  Component_exec_i::perform_test (CORBA::Boolean perform_test)
-  {
-    this->perform_test_ = perform_test;
-  }
-
-  void
-  Component_exec_i::ccm_activate (void)
-  {
-    try
-      {
-        ::DDS::DataWriter_var dw1 =
-          this->context_->get_connection_write1_dds_entity ();
-
-        if (::CORBA::is_nil (dw1.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - "
-                        "Datawriter 1 connection is NIL.\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-        ::CIAO::DDS4CCM::CCM_DataWriter * ccm_dw1 =
-          dynamic_cast < ::CIAO::DDS4CCM::CCM_DataWriter * > (dw1.in ());
-
-        if (ccm_dw1)
-          {
-            ::DDS::DataWriter_var tmp = ccm_dw1->get_dds_entity ();
-            if (! ::CORBA::is_nil (tmp.in ()))
-              {
-                ::DDS::Publisher_var publisher = tmp->get_publisher ();
-
-                if (! ::CORBA::is_nil (publisher.in ()))
-                  {
-                    ::DDS::DomainParticipant_var dp = publisher->get_participant ();
-
-                    if (! ::CORBA::is_nil (publisher.in ()))
-                      {
-
-                        this->dp1_hnd_ = dp->get_instance_handle ();
-                        this->dp1_ptr_ = dp.ptr();
-
-                        ::DDS::TopicDescription_var tpd = dp->lookup_topicdescription (tp_name_conn_1_);
-
-                        if (! ::CORBA::is_nil (tpd.in ()))
-                          {
-                            ::DDS::Topic_var topic = ::DDS::Topic::_narrow (tpd.in ());
-                            if (! ::CORBA::is_nil (topic.in ()))
-                              {
-                                this->tp1_hnd_ = topic->get_instance_handle ();
-                                this->tp1_ptr_ = topic.ptr ();
-                              }
-                            else
-                              {
-                                ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                            "Error narrowing TopicDescription 1 to Topic 1.\n"));
-                                throw ::CORBA::INTERNAL ();
-                              }
-                          }
-                        else
-                          {
-                            ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                        "Error getting TopicDescription 1.\n"));
-                            throw ::CORBA::INTERNAL ();
-                          }
-                      }
-                    else
-                      {
-                        ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                    "Error getting DomainParticipant 1.\n"));
-                        throw ::CORBA::INTERNAL ();
-                      }
-                  }
-                else
-                  {
-                    ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                "Error getting Publisher 1.\n"));
-                    throw ::CORBA::INTERNAL ();
-                  }
-              }
-            else
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                            "Error getting DDS DataWriter 1.\n"));
-                throw ::CORBA::INTERNAL ();
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - "
-                        "Error casting DataWriter 1 to CCM DataWriter 1\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Unable to create dds_entity for writer1\n"));
-      }
-
-    try
-      {
-        ::DDS::DataWriter_var dw2 =
-          this->context_->get_connection_write2_dds_entity ();
-
-        if (::CORBA::is_nil (dw2.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - "
-                        "Datawriter 2 connection is NIL.\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-        ::CIAO::DDS4CCM::CCM_DataWriter * ccm_dw2 =
-          dynamic_cast < ::CIAO::DDS4CCM::CCM_DataWriter * > (dw2.in ());
-
-        if (ccm_dw2)
-          {
-            ::DDS::DataWriter_var tmp = ccm_dw2->get_dds_entity ();
-            if (! ::CORBA::is_nil (tmp.in ()))
-              {
-                ::DDS::Publisher_var publisher = tmp->get_publisher ();
-
-                if (! ::CORBA::is_nil (publisher.in ()))
-                  {
-                    ::DDS::DomainParticipant_var dp = publisher->get_participant ();
-
-                    if (! ::CORBA::is_nil (publisher.in ()))
-                      {
-
-                        this->dp2_hnd_ = dp->get_instance_handle ();
-                        this->dp2_ptr_ = dp.ptr();
-
-                        ::DDS::TopicDescription_var tpd = dp->lookup_topicdescription (tp_name_conn_2_);
-
-                        if (! ::CORBA::is_nil (tpd.in ()))
-                          {
-                            ::DDS::Topic_var topic = ::DDS::Topic::_narrow (tpd.in ());
-                            if (! ::CORBA::is_nil (topic.in ()))
-                              {
-                                this->tp2_hnd_ = topic->get_instance_handle ();
-                                this->tp2_ptr_ = topic.ptr ();
-                              }
-                            else
-                              {
-                                ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                            "Error narrowing TopicDescription 2 to Topic 2.\n"));
-                                throw ::CORBA::INTERNAL ();
-                              }
-                          }
-                        else
-                          {
-                            ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                        "Error getting TopicDescription 2.\n"));
-                            throw ::CORBA::INTERNAL ();
-                          }
-                      }
-                    else
-                      {
-                        ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                    "Error getting DomainParticipant 2.\n"));
-                        throw ::CORBA::INTERNAL ();
-                      }
-                  }
-                else
-                  {
-                    ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                "Error getting Publisher 2.\n"));
-                    throw ::CORBA::INTERNAL ();
-                  }
-              }
-            else
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                            "Error getting DDS DataWriter 2.\n"));
-                throw ::CORBA::INTERNAL ();
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - "
-                        "Error casting DataWriter 2 to CCM DataWriter 2\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Unable to create dds_entity for writer2\n"));
-      }
-
-    try
-      {
-        ::DDS::DataWriter_var dw3 =
-          this->context_->get_connection_write3_dds_entity ();
-
-        if (::CORBA::is_nil (dw3.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - "
-                        "Datawriter 3 connection is NIL.\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-
-        ::CIAO::DDS4CCM::CCM_DataWriter * ccm_dw3 =
-          dynamic_cast < ::CIAO::DDS4CCM::CCM_DataWriter * > (dw3.in ());
-
-        if (ccm_dw3)
-          {
-            ::DDS::DataWriter_var tmp = ccm_dw3->get_dds_entity ();
-            if (! ::CORBA::is_nil (tmp.in ()))
-              {
-                ::DDS::Publisher_var publisher = tmp->get_publisher ();
-
-                if (! ::CORBA::is_nil (publisher.in ()))
-                  {
-                    ::DDS::DomainParticipant_var dp = publisher->get_participant ();
-
-                    if (! ::CORBA::is_nil (publisher.in ()))
-                      {
-
-                        this->dp3_hnd_ = dp->get_instance_handle ();
-                        this->dp3_ptr_ = dp.ptr();
-
-                        ::DDS::TopicDescription_var tpd = dp->lookup_topicdescription (tp_name_conn_3_);
-
-                        if (! ::CORBA::is_nil (tpd.in ()))
-                          {
-                            ::DDS::Topic_var topic = ::DDS::Topic::_narrow (tpd.in ());
-                            if (! ::CORBA::is_nil (topic.in ()))
-                              {
-                                this->tp3_hnd_ = topic->get_instance_handle ();
-                                this->tp3_ptr_ = topic.ptr ();
-                              }
-                            else
-                              {
-                                ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                            "Error narrowing TopicDescription 3 to Topic 3.\n"));
-                                throw ::CORBA::INTERNAL ();
-                              }
-                          }
-                        else
-                          {
-                            ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                        "Error getting TopicDescription 3.\n"));
-                            throw ::CORBA::INTERNAL ();
-                          }
-                      }
-                    else
-                      {
-                        ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                    "Error getting DomainParticipant 3.\n"));
-                        throw ::CORBA::INTERNAL ();
-                      }
-                  }
-                else
-                  {
-                    ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                "Error getting Publisher 3.\n"));
-                    throw ::CORBA::INTERNAL ();
-                  }
-              }
-            else
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                            "Error getting DDS DataWriter 3.\n"));
-                throw ::CORBA::INTERNAL ();
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - "
-                        "Error casting DataWriter 3 to CCM DataWriter 3\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Unable to create dds_entity for writer3\n"));
-      }
-    try
-      {
-        ::DDS::DataWriter_var dw4 =
-          this->context_->get_connection_write4_dds_entity ();
-
-        if (::CORBA::is_nil (dw4.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - "
-                        "Datawriter 4 connection is NIL.\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-
-        ::CIAO::DDS4CCM::CCM_DataWriter * ccm_dw4 =
-          dynamic_cast < ::CIAO::DDS4CCM::CCM_DataWriter * > (dw4.in ());
-
-        if (ccm_dw4)
-          {
-            ::DDS::DataWriter_var tmp = ccm_dw4->get_dds_entity ();
-            if (! ::CORBA::is_nil (tmp.in ()))
-              {
-                ::DDS::Publisher_var publisher = tmp->get_publisher ();
-
-                if (! ::CORBA::is_nil (publisher.in ()))
-                  {
-                    ::DDS::DomainParticipant_var dp = publisher->get_participant ();
-
-                    if (! ::CORBA::is_nil (publisher.in ()))
-                      {
-
-                        this->dp4_hnd_ = dp->get_instance_handle ();
-                        this->dp4_ptr_ = dp.ptr();
-
-                        if (this->perform_test_)
-                          {
-
-                            ::DDS::TopicDescription_var tpd = dp->lookup_topicdescription (tp_name_conn_4_);
-
-                            if (! ::CORBA::is_nil (tpd.in ()))
-                              {
-                                ::DDS::Topic_var topic = ::DDS::Topic::_narrow (tpd.in ());
-                                if (! ::CORBA::is_nil (topic.in ()))
-                                  {
-                                    this->tp4_hnd_ = topic->get_instance_handle ();
-                                    this->tp4_ptr_ = topic.ptr ();
-                                  }
-                                else
-                                  {
-                                    ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                                "Error narrowing TopicDescription 4 to Topic 4.\n"));
-                                    throw ::CORBA::INTERNAL ();
-                                  }
-                              }
-                            else
-                              {
-                                ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                            "Error getting TopicDescription 4.\n"));
-                                throw ::CORBA::INTERNAL ();
-                              }
-                          }
-                      }
-                    else
-                      {
-                        ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                    "Error getting DomainParticipant 4.\n"));
-                        throw ::CORBA::INTERNAL ();
-                      }
-                  }
-                else
-                  {
-                    ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                "Error getting Publisher 4.\n"));
-                    throw ::CORBA::INTERNAL ();
-                  }
-              }
-            else
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                            "Error getting DDS DataWriter 4.\n"));
-                throw ::CORBA::INTERNAL ();
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - "
-                        "Error casting DataWriter 4 to CCM DataWriter 4\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Unable to create dds_entity for writer4\n"));
-      }
-  }
-
-  void
-  Component_exec_i::ccm_passivate (void)
-  {
-    if (this->perform_test_)
-      {
-        if (this->dp1_hnd_ == DDS::HANDLE_NIL)
-          ACE_ERROR ((LM_ERROR, "ERROR: Handle for DomainParticipant for Connector 1 seems to be NIL\n"));
-        if (this->dp2_hnd_ == DDS::HANDLE_NIL)
-          ACE_ERROR ((LM_ERROR, "ERROR: Handle for DomainParticipant for Connector 2 seems to be NIL\n"));
-        if (this->dp3_hnd_ == DDS::HANDLE_NIL)
-          ACE_ERROR ((LM_ERROR, "ERROR: Handle for DomainParticipant for Connector 3 seems to be NIL\n"));
-        if (this->dp4_hnd_ == DDS::HANDLE_NIL)
-          ACE_ERROR ((LM_ERROR, "ERROR: Handle for DomainParticipant for Connector 4 seems to be NIL\n"));
-
-        if (this->tp1_hnd_ == DDS::HANDLE_NIL)
-          ACE_ERROR ((LM_ERROR, "ERROR: Handle for Topic for Connector 1 seems to be NIL\n"));
-        if (this->tp2_hnd_ == DDS::HANDLE_NIL)
-          ACE_ERROR ((LM_ERROR, "ERROR: Handle for Topic for Connector 2 seems to be NIL\n"));
-        if (this->tp3_hnd_ == DDS::HANDLE_NIL)
-          ACE_ERROR ((LM_ERROR, "ERROR: Handle for Topic for Connector 3 seems to be NIL\n"));
-        if (this->tp4_hnd_ == DDS::HANDLE_NIL)
-          ACE_ERROR ((LM_ERROR, "ERROR: Handle for Topic for Connector 4 seems to be NIL\n"));
-
-        //check shared DomainParticipants
-        if ((this->dp1_hnd_ != this->dp2_hnd_)
-#if (CIAO_DDS4CCM_OPENDDS==1)
-            && (this->dp1_ptr_ == this->dp2_ptr_)
-#endif
-            )
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Connector 1 and 2 don't seem to "
-                                  "share the same DomainParticipant\n"));
-          }
-        else
-          {
-            ACE_DEBUG ((LM_DEBUG, "OK: Connector 1 and 2 seems to "
-                                  "share the same DomainParticipant\n"));
-          }
-        if ((this->dp1_hnd_ == this->dp4_hnd_)
-#if (CIAO_DDS4CCM_OPENDDS==1)
-            && (this->dp1_ptr_ == this->dp4_ptr_)
-#endif
-            )
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Connector 1 and 4 seem to "
-                                  "share the same DomainParticipant\n"));
-          }
-        else
-          {
-            ACE_DEBUG ((LM_DEBUG, "OK: Connector 1 and 4 seems to "
-                                  "share the same DomainParticipant\n"));
-          }
-        if ((this->dp2_hnd_ == this->dp4_hnd_)
-#if (CIAO_DDS4CCM_OPENDDS==1)
-            && (this->dp2_ptr_ == this->dp4_ptr_)
-#endif
-            )
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Connector 2 and 4 seem to "
-                                  "share the same DomainParticipant\n"));
-          }
-        else
-          {
-            ACE_DEBUG ((LM_DEBUG, "OK: Connector 2 and 4 seems to "
-                                  "share the same DomainParticipant\n"));
-          }
-        if ((this->dp3_hnd_ == this->dp4_hnd_)
-#if (CIAO_DDS4CCM_OPENDDS==1)
-            && (this->dp3_ptr_ == this->dp4_ptr_)
-#endif
-            )
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Connector 3 and 4 seem to "
-                                  "share the same DomainParticipant\n"));
-          }
-        else
-          {
-            ACE_DEBUG ((LM_DEBUG, "OK: Connector 3 and 4 seems to "
-                                  "share the same DomainParticipant\n"));
-          }
-
-        //check shared Topics
-        if ((this->tp1_hnd_ != this->tp2_hnd_)
-#if (CIAO_DDS4CCM_OPENDDS==1)
-            && (this->tp1_ptr_ == this->tp2_ptr_)
-#endif
-            )
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Connector 1 and 2 don't seem to "
-                                  "share the same Topic\n"));
-          }
-        else
-          {
-            ACE_DEBUG ((LM_DEBUG, "OK: Connector 1 and 2 seems to "
-                                  "share the same Topic\n"));
-          }
-        if ((this->tp1_hnd_ == this->tp3_hnd_)
-#if (CIAO_DDS4CCM_OPENDDS==1)
-            && (this->tp1_ptr_ == this->tp3_ptr_)
-#endif
-            )
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Connector 1 and 3 seem to "
-                                  "share the same Topic\n"));
-          }
-        else
-          {
-            ACE_DEBUG ((LM_DEBUG, "OK: Connector 1 and 3 seems to "
-                                  "share the same Topic\n"));
-          }
-        if ((this->tp1_hnd_ == this->tp4_hnd_)
-#if (CIAO_DDS4CCM_OPENDDS==1)
-            && (this->tp1_ptr_ == this->tp4_ptr_)
-#endif
-            )
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Connector 1 and 4 seem to "
-                                  "share the same Topic\n"));
-          }
-        else
-          {
-            ACE_DEBUG ((LM_DEBUG, "OK: Connector 1 and 4 seems to "
-                                  "share the same Topic\n"));
-          }
-      }
-  }
-
-  void
-  Component_exec_i::ccm_remove (void)
-  {
-    if (!this->perform_test_)
-      {
-        ACE_DEBUG ((LM_DEBUG, "Don't test this component. It's used for compilation errors.\n"));
-      }
-  }
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Component_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Component_exec_i);
-
-    return retval;
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.h b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.h
deleted file mode 100644
index a7df9676a94..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_COMPONENT_EXEC_H_
-#define CIAO_COMPONENT_EXEC_H_
-
-
-#include "ComponentEC.h"
-
-#include /**/ "Component_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-class DDSDomainParticipant;
-class DDSTopic;
-
-namespace CIAO_SharedDP_SharedDPComponent_Impl
-{
-  class Component_exec_i
-    : public virtual SharedDPComponent_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Component_exec_i (void);
-    virtual ~Component_exec_i (void);
-
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete (void);
-
-    CORBA::Boolean perform_test (void);
-    void perform_test (CORBA::Boolean perform_test);
-
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-
-  private:
-    ::SharedDP::CCM_SharedDPComponent_Context_var context_;
-
-    CORBA::Boolean perform_test_;
-
-    ::DDS::InstanceHandle_t dp1_hnd_;
-    ::DDS::InstanceHandle_t dp2_hnd_;
-    ::DDS::InstanceHandle_t dp3_hnd_;
-    ::DDS::InstanceHandle_t dp4_hnd_;
-    ::DDS::DomainParticipant_ptr dp1_ptr_;
-    ::DDS::DomainParticipant_ptr dp2_ptr_;
-    ::DDS::DomainParticipant_ptr dp3_ptr_;
-    ::DDS::DomainParticipant_ptr dp4_ptr_;
-
-    ::DDS::InstanceHandle_t tp1_hnd_;
-    ::DDS::InstanceHandle_t tp2_hnd_;
-    ::DDS::InstanceHandle_t tp3_hnd_;
-    ::DDS::InstanceHandle_t tp4_hnd_;
-    ::DDS::Topic_ptr tp1_ptr_;
-    ::DDS::Topic_ptr tp2_ptr_;
-    ::DDS::Topic_ptr tp3_ptr_;
-    ::DDS::Topic_ptr tp4_ptr_;
-  };
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Component_Impl (void);
-}
-
-#endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.idl
deleted file mode 100644
index 8de1b7b7406..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef SHARED_DP_CONNECTOR_IDL_
-#define SHARED_DP_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Base.idl"
-
-#pragma ciao lem "Connector/ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/BaseTypeSupport.idl"
-#endif
-
-module SharedDP
-{
-  module ::CCM_DDS::Typed < ::SharedDPTest, ::SharedDPTestSeq> SharedDPTestConnector;
-};
-
-#endif /* SHARED_DP_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc
deleted file mode 100644
index 796bc84afab..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc
+++ /dev/null
@@ -1,138 +0,0 @@
-project(DDS_SharedDP_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_SharedDPBase_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=Connector_stub_export.h \
-              -Wb,skel_export_macro=SHAREDDP_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=Connector_svnt_export.h \
-              -Wb,svnt_export_macro=SHAREDDP_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=Connector_svnt_export.h \
-              -Wb,conn_export_macro=SHAREDDP_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Connector.idl
-  }
-}
-
-project(DDS_SharedDP_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_SharedDP_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    ConnectorE.idl
-  }
-}
-
-project(DDS_SharedDP_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_SharedDP_Connector_lem_gen DDS_SharedDP_Connector_stub DDS_SharedDPBase_stub
-  libs  += DDS_SharedDPBase_stub DDS_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Connector_lem_stub
-  dynamicflags += SHAREDDP_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ConnectorEC.cpp
-  }
-
-  Header_Files {
-    ConnectorEC.h
-    Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    ConnectorEC.inl
-  }
-}
-
-project(DDS_SharedDP_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_SharedDP_Connector_idl_gen DDS_SharedDPBase_stub
-  libs  += DDS_SharedDPBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Connector_stub
-  dynamicflags += SHAREDDP_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ConnectorC.cpp
-  }
-
-  Header_Files {
-    ConnectorC.h
-    Connector_stub_export.h
-  }
-
-  Inline_Files {
-    ConnectorC.inl
-  }
-}
-
-project(DDS_SharedDP_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_SharedDP_Connector_lem_stub DDS_SharedDP_Connector_stub DDS_SharedDPBase_stub
-  sharedname = DDS_Connector_exec
-  libs += DDS_Connector_stub DDS_Connector_lem_stub DDS_SharedDPBase_stub DDS_SharedDPBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SHAREDDP_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector_conn.cpp
-  }
-
-  Header_Files {
-    Connector_conn.h
-    Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_SharedDP_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_SharedDP_Connector_lem_stub DDS_SharedDP_Connector_exec DDS_SharedDP_Connector_stub
-  sharedname  = DDS_Connector_svnt
-  libs       += DDS_Connector_stub \
-                DDS_Connector_lem_stub  \
-                DDS_SharedDPBase_stub \
-                DDS_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SHAREDDP_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ConnectorS.cpp
-    Connector_svnt.cpp
-  }
-
-  Header_Files {
-    ConnectorS.h
-    Connector_svnt.h
-    Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/DefaultQoS.cdp b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/DefaultQoS.cdp
deleted file mode 100644
index 2da2dc43a17..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/DefaultQoS.cdp
+++ /dev/null
@@ -1,321 +0,0 @@
-<!--  -->
-<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>SharedDPTest_Depl</label>
-  <UUID>SharedDPTest_Depl</UUID>
-
-  <implementation xmi:id="ConnectorImplementation">
-    <name>ConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="Connector_ExecArtifact" />
-    <artifact xmi:idref="Connector_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SharedDP_SharedDPTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SharedDP_SharedDPTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DDS_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DDS_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="ComponentImplementation">
-    <name>ComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Component_ExecArtifact" />
-    <artifact xmi:idref="Component_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Component_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SharedDP_SharedDPComponent_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="Connector1Instance">
-    <name>Connector1Instance</name>
-    <node>ComponentNode</node>
-    <source/>
-    <implementation xmi:idref="ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SharedDP</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Connector2Instance">
-    <name>Connector2Instance</name>
-    <node>ComponentNode</node>
-    <source/>
-    <implementation xmi:idref="ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SharedDP</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Connector3Instance">
-    <name>Connector3Instance</name>
-    <node>ComponentNode</node>
-    <source/>
-    <implementation xmi:idref="ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SharedDP1</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Connector4Instance">
-    <name>Connector4Instance</name>
-    <node>ComponentNode</node>
-    <source/>
-    <implementation xmi:idref="ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>StandaloneDP</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Standalone_Library#StandaloneProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ComponentInstance">
-    <name>Component</name>
-    <node>ComponentNode</node>
-    <source/>
-    <implementation xmi:idref="ComponentImplementation" />
-  </instance>
-
-  <connection>
-    <name>writer_connection1</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>write1_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Connector1Instance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection2</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>write2_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Connector2Instance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection3</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>write3_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Connector3Instance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection4</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>write4_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Connector4Instance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Component_ExecArtifact">
-    <name>Component_exec</name>
-    <source/>
-    <node/>
-    <location>Component_exec</location>
-  </artifact>
-  <artifact xmi:id="Component_SvntArtifact">
-    <name>Component_svnt</name>
-    <source/>
-    <node/>
-    <location>Component_svnt</location>
-  </artifact>
-  <artifact xmi:id="Component_StubArtifact">
-    <name>Component_stub</name>
-    <source/>
-    <node/>
-    <location>Component_stub</location>
-  </artifact>
-
-  <artifact xmi:id="Connector_ExecArtifact">
-    <name>DDS_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Connector_SvntArtifact">
-    <name>DDS_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Connector_StubArtifact">
-    <name>DDS_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Connector_stub</location>
-  </artifact>
-
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Plan.cdp
deleted file mode 100644
index a05085cb5c7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Plan.cdp
+++ /dev/null
@@ -1,496 +0,0 @@
-<!--  -->
-<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>SharedDPTest_Depl</label>
-  <UUID>SharedDPTest_Depl</UUID>
-
-  <implementation xmi:id="ConnectorImplementation">
-    <name>ConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="Connector_ExecArtifact" />
-    <artifact xmi:idref="Connector_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SharedDP_SharedDPTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SharedDP_SharedDPTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DDS_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DDS_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="ComponentImplementation">
-    <name>ComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Component_ExecArtifact" />
-    <artifact xmi:idref="Component_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Component_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SharedDP_SharedDPComponent_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <!-- This connector is used to detect run_time errors,
-       not for functional testing.-->
-  <instance xmi:id="Connector0Instance">
-    <name>Connector0Instance</name>
-    <node>ComponentNode</node>
-    <source/>
-    <implementation xmi:idref="ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SharedDP</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shared_Library#SharedProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Connector1Instance">
-    <name>Connector1Instance</name>
-    <node>ComponentNode</node>
-    <source/>
-    <implementation xmi:idref="ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SharedDP</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shared_Library#SharedProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Connector2Instance">
-    <name>Connector2Instance</name>
-    <node>ComponentNode</node>
-    <source/>
-    <implementation xmi:idref="ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SharedDP</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shared_Library#SharedProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Connector3Instance">
-    <name>Connector3Instance</name>
-    <node>ComponentNode</node>
-    <source/>
-    <implementation xmi:idref="ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SharedDP1</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shared_Library#SharedProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Connector4Instance">
-    <name>Connector4Instance</name>
-    <node>ComponentNode</node>
-    <source/>
-    <implementation xmi:idref="ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>StandaloneDP</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Standalone_Library#StandaloneProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ComponentInstance">
-    <name>Component</name>
-    <node>ComponentNode</node>
-    <source/>
-    <implementation xmi:idref="ComponentImplementation" />
-    <configProperty>
-      <name>perform_test</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>true</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <!-- This component is used to detect run_time errors,
-       not for functional testing.-->
-  <instance xmi:id="Component0Instance">
-    <name>Component0</name>
-    <node>ComponentNode</node>
-    <source/>
-    <implementation xmi:idref="ComponentImplementation" />
-    <configProperty>
-      <name>perform_test</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>writer_connection01</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>write1_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Component0Instance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Connector0Instance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection02</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>write2_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Component0Instance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Connector0Instance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection03</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>write3_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Component0Instance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Connector0Instance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection04</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>write4_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Component0Instance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Connector0Instance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection1</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>write1_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Connector1Instance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection2</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>write2_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Connector2Instance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection3</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>write3_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Connector3Instance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection4</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>write4_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Connector4Instance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Component_ExecArtifact">
-    <name>Component_exec</name>
-    <source/>
-    <node/>
-    <location>Component_exec</location>
-  </artifact>
-  <artifact xmi:id="Component_SvntArtifact">
-    <name>Component_svnt</name>
-    <source/>
-    <node/>
-    <location>Component_svnt</location>
-  </artifact>
-  <artifact xmi:id="Component_StubArtifact">
-    <name>Component_stub</name>
-    <source/>
-    <node/>
-    <location>Component_stub</location>
-  </artifact>
-
-  <artifact xmi:id="Connector_ExecArtifact">
-    <name>DDS_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Connector_SvntArtifact">
-    <name>DDS_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Connector_StubArtifact">
-    <name>DDS_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Connector_stub</location>
-  </artifact>
-
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Shared_Library.xml b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Shared_Library.xml
deleted file mode 100644
index 5424a2e910a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Shared_Library.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-
-  <qos_profile name="SharedProfile">
-    <datawriter_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-        <max_blocking_time>
-          <sec>10</sec>
-          <nanosec>0</nanosec>
-        </max_blocking_time>
-      </reliability>
-      <durability>
-        <kind>TRANSIENT_DURABILITY_QOS</kind>
-      </durability>
-      <history>
-        <kind>KEEP_LAST_HISTORY_QOS</kind>
-        <depth>20</depth>
-      </history>
-    </datawriter_qos>
-    <datareader_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-      </reliability>
-      <history>
-        <kind>KEEP_LAST_HISTORY_QOS</kind>
-        <depth>20</depth>
-      </history>
-      <durability>
-        <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-      </durability>
-    </datareader_qos>
-  </qos_profile>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Standalone_Library.xml b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Standalone_Library.xml
deleted file mode 100644
index 63e213c18d3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Standalone_Library.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-
-  <qos_profile name="StandaloneProfile">
-    <datawriter_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-        <max_blocking_time>
-          <sec>10</sec>
-          <nanosec>0</nanosec>
-        </max_blocking_time>
-      </reliability>
-      <durability>
-        <kind>TRANSIENT_DURABILITY_QOS</kind>
-      </durability>
-      <history>
-        <kind>KEEP_LAST_HISTORY_QOS</kind>
-        <depth>20</depth>
-      </history>
-    </datawriter_qos>
-    <datareader_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-      </reliability>
-      <history>
-        <kind>KEEP_LAST_HISTORY_QOS</kind>
-        <depth>20</depth>
-      </history>
-      <durability>
-        <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-      </durability>
-    </datareader_qos>
-  </qos_profile>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index f1018e84958..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <qos_library name="Shared_Library">
-    <qos_profile name="SharedProfile" is_default_qos="false">
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>10</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_LAST_HISTORY_QOS</kind>
-          <depth>20</depth>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_LAST_HISTORY_QOS</kind>
-          <depth>20</depth>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-  <qos_library name="Standalone_Library">
-    <qos_profile name="StandaloneProfile" is_default_qos="false">
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>10</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_LAST_HISTORY_QOS</kind>
-          <depth>20</depth>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_LAST_HISTORY_QOS</kind>
-          <depth>20</depth>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test.pl
deleted file mode 100755
index da0f21d086e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test.pl
+++ /dev/null
@@ -1,244 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 1;
-@ports = ( 60001 );
-@iorbases = ( "NodeApp1.ior" );
-@iorfiles = 0;
-@nodenames = ( "ComponentNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 1 seconds to allow task to complete\n";
-sleep (1);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test_default_qos.pl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test_default_qos.pl
deleted file mode 100755
index f92d7ff050d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test_default_qos.pl
+++ /dev/null
@@ -1,244 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 1;
-@ports = ( 60001 );
-@iorbases = ( "NodeApp1.ior" );
-@iorfiles = 0;
-@nodenames = ( "ComponentNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "DefaultQoS.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 10 seconds to allow task to complete\n";
-sleep (10);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/.gitignore b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl
deleted file mode 100644
index 2bf9df0aa8a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file State_Connection_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef STATE_CONNECTION_TEST_BASE_IDL
-#define STATE_CONNECTION_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/State_Connection_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/State_Connection_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "State_ConnectionTest"
-#pragma DCPS_DATA_KEY "State_ConnectionTest key"
-
-struct State_ConnectionTest {
-  string key; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<State_ConnectionTest> State_ConnectionTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc
deleted file mode 100644
index 41b42c4fa91..00000000000
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_SCT_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_SCT_Base_stub
-  dynamicflags += STATE_CONNECTION_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=STATE_CONNECTION_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=State_Connection_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    State_Connection_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=STATE_CONNECTION_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    State_Connection_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.idl
deleted file mode 100644
index 5193d1a639b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file State_Connection_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef KEYED_TEST_CONNECTOR_IDL_
-#define KEYED_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/State_Connection_Test_Base.idl"
-
-#pragma ciao lem "Connector/State_Connection_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/State_Connection_Test_BaseTypeSupport.idl"
-#endif
-
-module State_Connection_Test
-{
-  module ::CCM_DDS::Typed < ::State_ConnectionTest, ::State_ConnectionTestSeq> State_ConnectionTestConnector;
-};
-
-#endif /* State_Connection_Test_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc
deleted file mode 100644
index 66c6ad49e7a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_SCT_Base -l .. -o ../lib -u DDS State_Connection_Test_Connector"
-
-project(DDS_SCT_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_SCT_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=STATE_CONNECTION_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=State_Connection_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=STATE_CONNECTION_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=State_Connection_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=STATE_CONNECTION_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=State_Connection_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=STATE_CONNECTION_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=State_Connection_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    State_Connection_Test_Connector.idl
-  }
-}
-
-project(DDS_SCT_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_SCT_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=STATE_CONNECTION_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=State_Connection_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    State_Connection_Test_ConnectorE.idl
-  }
-}
-
-project(DDS_SCT_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_SCT_Connector_lem_gen DDS_SCT_Connector_stub DDS_SCT_Base_stub
-  libs  += DDS_SCT_Base_stub DDS_SCT_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_SCT_Connector_lem_stub
-  dynamicflags += STATE_CONNECTION_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    State_Connection_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    State_Connection_Test_ConnectorEC.h
-    State_Connection_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    State_Connection_Test_ConnectorEC.inl
-  }
-}
-
-project(DDS_SCT_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_SCT_Connector_idl_gen DDS_SCT_Base_stub
-  libs  += DDS_SCT_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_SCT_Connector_stub
-  dynamicflags += STATE_CONNECTION_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    State_Connection_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    State_Connection_Test_ConnectorC.h
-    State_Connection_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    State_Connection_Test_ConnectorC.inl
-  }
-}
-
-project(DDS_SCT_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_SCT_Connector_lem_stub DDS_SCT_Connector_stub DDS_SCT_Base_stub
-  sharedname = DDS_SCT_Connector_exec
-  libs += DDS_SCT_Connector_stub DDS_SCT_Connector_lem_stub DDS_SCT_Base_stub DDS_SCT_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += STATE_CONNECTION_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    State_Connection_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    State_Connection_Test_Connector_conn.h
-    State_Connection_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_SCT_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_SCT_Connector_lem_stub DDS_SCT_Connector_exec DDS_SCT_Connector_stub
-  sharedname  = DDS_SCT_Connector_svnt
-  libs       += DDS_SCT_Connector_stub \
-                DDS_SCT_Connector_lem_stub  \
-                DDS_SCT_Base_stub \
-                DDS_SCT_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += STATE_CONNECTION_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    State_Connection_Test_ConnectorS.cpp
-    State_Connection_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    State_Connection_Test_ConnectorS.h
-    State_Connection_Test_Connector_svnt.h
-    State_Connection_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/README b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/README
deleted file mode 100644
index c51b76151fb..00000000000
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/README
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-This test tests all possible connections between
-a Sender and a DDS State connector and a Receiver and a
-DDS State connector.
-The Sender requests the following connections:
-  * An updater
-  * A DDS updater
-
-The Receiver expects the following listeners to be created:
-  * A DataListenerControl for the DDS_Listen port
-  * A 'normal' listener for the DDS_Listen port
-  * A StateListener for the DDS_StateListen port
-  * A PortStatusListener for the DDS_Get port
-  * A PortStatusListener for the DDS_Read port
-  * A PortStatusListener for the DDS_Listen port
-  * A PortStatusListener for the DDS_StateLisen port
-
-The Receiver requests the following connections:
-  * A reader for the DDS_Read port
-  * A DDS reader for the DDS_Read port
-  * A reader for the DDS_Get port
-  * A getter for the DDS_Get port
-  * A DDS reader for the DDS_Read port
-  * A reader for the DDS_Listen port
-  * A DataControlListener for the DDS_Listen port
-  * A DDS reader for the DDS_Listen port
-  * A reader for the DDS_StateListen port
-  * A StateListener for the DDS_StateListen port
-  * A DDS reader for the DDS_StateListen port
-
-This test tests every single connection and reports an error when
-a connections couldn't be esthablished.
-
-No actual read/write/listen operations are performed.
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/.gitignore b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/.gitignore
deleted file mode 100644
index ef8daae3a9e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/Receiver_exec_export.h
-/Receiver_lem_stub_export.h
-/Receiver_stub_export.h
-/Receiver_svnt_export.h
-/State_Connection_Test_ReceiverE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.idl
deleted file mode 100644
index 794d300cd01..00000000000
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/State_Connection_Test_Connector.idl"
-
-module State_Connection_Test
-{
-  component Receiver
-  {
-    port State_ConnectionTestConnector::DDS_Read info_read;
-    port State_ConnectionTestConnector::DDS_Get info_get;
-    port State_ConnectionTestConnector::DDS_Listen info_listen;
-    port State_ConnectionTestConnector::DDS_StateListen info_statelisten;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc
deleted file mode 100644
index b814225cca5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc
+++ /dev/null
@@ -1,135 +0,0 @@
-project(DDS_SCT_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_SCT_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h -I..
-
-  IDL_Files {
-    State_Connection_Test_Receiver.idl
-  }
-}
-
-project(DDS_SCT_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_SCT_Receiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    State_Connection_Test_ReceiverE.idl
-  }
-}
-
-project(DDS_SCT_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_SCT_Receiver_lem_gen DDS_SCT_Receiver_stub  DDS_SCT_Connector_stub DDS_SCT_Base_stub
-  libs  +=  Receiver_stub DDS_SCT_Connector_stub DDS_SCT_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    State_Connection_Test_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    State_Connection_Test_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    State_Connection_Test_ReceiverEC.inl
-  }
-}
-
-project(DDS_SCT_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_SCT_Receiver_idl_gen  DDS_SCT_Connector_stub DDS_SCT_Base_stub DDS_SCT_Connector_lem_gen
-  libs  += DDS_SCT_Connector_stub DDS_SCT_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    State_Connection_Test_ReceiverC.cpp
-  }
-
-  Header_Files {
-    State_Connection_Test_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    State_Connection_Test_ReceiverC.inl
-  }
-}
-
-project(DDS_SCT_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_SCT_Receiver_lem_stub DDS_SCT_Receiver_stub DDS_SCT_Base_stub DDS_SCT_Connector_stub DDS_SCT_Connector_lem_stub 
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_SCT_Base_stub DDS_SCT_Connector_stub DDS_SCT_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    State_Connection_Test_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    State_Connection_Test_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_SCT_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_SCT_Receiver_lem_stub DDS_SCT_Base_stub DDS_SCT_Connector_stub DDS_SCT_Connector_svnt DDS_SCT_Receiver_exec DDS_SCT_Connector_lem_stub 
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_SCT_Base_stub DDS_SCT_Connector_stub DDS_SCT_Connector_svnt Receiver_exec DDS_SCT_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    State_Connection_Test_ReceiverS.cpp
-    State_Connection_Test_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    State_Connection_Test_ReceiverS.h
-    State_Connection_Test_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.cpp
deleted file mode 100644
index 9600a7f9bf2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.cpp
+++ /dev/null
@@ -1,374 +0,0 @@
-// -*- C++ -*-
-#include "State_Connection_Test_Receiver_exec.h"
-#include "ace/Log_Msg.h"
-
-
-namespace CIAO_State_Connection_Test_Receiver_Impl
-{
-  //============================================================
-  // Component Executor Implementation Class: Receiver_exec_i
-  //============================================================
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : //DDS_Read
-      reader_data_ok_ (false),
-      reader_dds_entity_ok_ (false),
-      reader_filter_config_ok_ (false),
-      //DDS_Get
-      getter_data_ok_ (false),
-      getter_fresh_data_ok_ (false),
-      getter_dds_entity_ok_ (false),
-      getter_filter_config_ok_ (false),
-      //DDS_Listen
-      listen_data_ok_ (false),
-      listen_data_control_ok_ (false),
-      listen_dds_entity_ok_ (false),
-      listen_filter_config_ok_ (false),
-      //DDS_StateListen
-      statelisten_data_ok_ (false),
-      statelisten_data_control_ok_ (false),
-      statelisten_dds_entity_ok_ (false),
-      statelisten_filter_config_ok_ (false),
-      //Provides for DDS_Read
-      reader_port_status_created_ (false),
-      //Provides for DDS_Get
-      getter_port_status_created_ (false),
-      //Provides for DDS_Listen
-      listen_data_listener_created_ (false),
-      listen_port_status_created_ (false),
-      //Provides for DDS_StateListen
-      statelisten_data_listener_created_ (false),
-      statelisten_port_status_created_ (false)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_read_status (void)
-  {
-    this->reader_port_status_created_ = true;
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  //Provides for DDS_Get
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_get_status (void)
-  {
-    this->getter_port_status_created_ = true;
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  //Provides for DDS_Listen
-  ::State_Connection_Test::State_ConnectionTestConnector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_listen_data_listener ()
-  {
-    this->listen_data_listener_created_ = true;
-    return ::State_Connection_Test
-             ::State_ConnectionTestConnector
-             ::CCM_Listener::_nil ();
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_listen_status (void)
-  {
-    this->listen_port_status_created_ = true;
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  //Provides for DDS_StateListen
-  ::State_Connection_Test::State_ConnectionTestConnector::CCM_StateListener_ptr
-  Receiver_exec_i::get_info_statelisten_data_listener (void)
-  {
-    this->statelisten_data_listener_created_ = true;
-    return ::State_Connection_Test
-             ::State_ConnectionTestConnector
-             ::CCM_StateListener::_nil ();
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_statelisten_status (void)
-  {
-    this->statelisten_port_status_created_ = true;
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  // Operations from Components::SessionComponent.
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::State_Connection_Test::CCM_Receiver_Context::_narrow (ctx);
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    //DDS_Read
-    ::State_Connection_Test::State_ConnectionTestConnector::Reader_var reader_data =
-      this->context_->get_connection_info_read_data ();
-    this->reader_data_ok_ = ! ::CORBA::is_nil (reader_data);
-
-    ::DDS::DataReader_var reader_dds_entity =
-      this->context_->get_connection_info_read_dds_entity ();
-    this->reader_dds_entity_ok_ = ! ::CORBA::is_nil (reader_dds_entity);
-    ::CCM_DDS::ContentFilterSetting_var reader_filter_config =
-      this->context_->get_connection_info_read_filter_config ();
-    this->reader_filter_config_ok_ = ! ::CORBA::is_nil (reader_filter_config);
-
-    //DDS_Get
-    ::State_Connection_Test::State_ConnectionTestConnector::Reader_var getter_data =
-      this->context_->get_connection_info_get_data ();
-    this->getter_data_ok_ = ! ::CORBA::is_nil (getter_data);
-    ::State_Connection_Test::State_ConnectionTestConnector::Getter_var getter_fresh_data =
-      this->context_->get_connection_info_get_fresh_data ();
-    this->getter_fresh_data_ok_ = ! ::CORBA::is_nil (getter_fresh_data);
-    ::DDS::DataReader_var getter_dds_entity =
-      this->context_->get_connection_info_get_dds_entity ();
-    this->getter_dds_entity_ok_ = ! ::CORBA::is_nil (getter_dds_entity);
-    ::CCM_DDS::ContentFilterSetting_var getter_filter_config =
-      this->context_->get_connection_info_get_filter_config ();
-    this->getter_filter_config_ok_ = ! ::CORBA::is_nil (getter_filter_config);
-
-    //DDS_Listen
-    ::State_Connection_Test::State_ConnectionTestConnector::Reader_var listen_data =
-      this->context_->get_connection_info_listen_data ();
-    this->listen_data_ok_ = ! ::CORBA::is_nil (listen_data);
-    ::CCM_DDS::DataListenerControl_var  listen_data_control =
-      this->context_->get_connection_info_listen_data_control ();
-    this->listen_data_control_ok_ = ! ::CORBA::is_nil (listen_data_control);
-    ::DDS::DataReader_var listen_dds_entity =
-      this->context_->get_connection_info_listen_dds_entity ();
-    this->listen_dds_entity_ok_ = ! ::CORBA::is_nil (listen_dds_entity);
-    ::CCM_DDS::ContentFilterSetting_var listen_filter_config =
-      this->context_->get_connection_info_listen_filter_config ();
-    this->listen_filter_config_ok_ = ! ::CORBA::is_nil (listen_filter_config);
-
-    //DDS_StateListen
-    ::State_Connection_Test::State_ConnectionTestConnector::Reader_var statelisten_data =
-      this->context_->get_connection_info_statelisten_data ();
-    this->statelisten_data_ok_ = ! ::CORBA::is_nil (statelisten_data);
-    ::CCM_DDS::StateListenerControl_var statelisten_data_control =
-      this->context_->get_connection_info_statelisten_data_control ();
-    this->statelisten_data_control_ok_ = ! ::CORBA::is_nil (statelisten_data_control);
-    ::DDS::DataReader_var statelisten_dds_entity =
-      this->context_->get_connection_info_statelisten_dds_entity ();
-    this->statelisten_dds_entity_ok_ = ! ::CORBA::is_nil (statelisten_dds_entity);
-    ::CCM_DDS::ContentFilterSetting_var statelisten_filter_config =
-      this->context_->get_connection_info_statelisten_filter_config ();
-    this->statelisten_filter_config_ok_ = ! ::CORBA::is_nil (statelisten_filter_config);
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    //DDS_Read
-    if (!this->reader_data_ok_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get reader of DDS_Read failed\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get reader of DDS_Read passed\n")));
-      }
-    if (!this->reader_dds_entity_ok_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get DDS reader of DDS_Read failed\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get DDS reader of DDS_Read passed\n")));
-      }
-    if (!this->reader_filter_config_ok_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get filter config of DDS_Read failed\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get filter config of DDS_Read passed\n")));
-      }
-    //DDS_Get
-    if (!this->getter_data_ok_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get reader of DDS_Get failed\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get reader of DDS_Get passed\n")));
-      }
-
-    if (!this->getter_fresh_data_ok_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get getter of DDS_Get failed\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get getter of DDS_Get passed\n")));
-      }
-    if (!this->getter_dds_entity_ok_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get DDS reader of DDS_Get failed\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get DDS reader of DDS_Get passed\n")));
-      }
-    if (!this->getter_filter_config_ok_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get filter config of DDS_Get failed\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get filter config of DDS_Get passed\n")));
-      }
-    //DDS_Listen
-    if (!this->listen_data_ok_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get reader of DDS_Listen failed\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get reader of DDS_Listen passed\n")));
-      }
-    if (!this->listen_data_control_ok_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get data control of DDS_Listen failed\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get data control of DDS_Listen passed\n")));
-      }
-    if (!this->listen_dds_entity_ok_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get DDS reader of DDS_Listen failed\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get DDS reader of DDS_Listen passed\n")));
-      }
-    if (!this->listen_filter_config_ok_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get filter config of DDS_Listen failed\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get filter config of DDS_Listen passed\n")));
-      }
-    //DDS_StateListen
-    if (!this->statelisten_data_ok_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get reader of DDS_StateListen failed\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get reader of DDS_StateListen passed\n")));
-      }
-    if (!this->statelisten_data_control_ok_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get data control of DDS_StateListen failed\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get data control of DDS_StateListen passed\n")));
-      }
-    if (!this->statelisten_dds_entity_ok_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get DDS reader of DDS_StateListen failed\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get DDS reader of DDS_StateListen passed\n")));
-      }
-    if (!this->statelisten_filter_config_ok_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get filter config of DDS_StateListen failed\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get filter config of DDS_StateListen passed\n")));
-      }
-    //Provides for DDS_Read
-    if (!this->reader_port_status_created_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : PortStatusListener of DDS_Read not created\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : PortStatusListener of DDS_Read was created\n")));
-      }
-    //Provides for DDS_Get
-    if (!this->getter_port_status_created_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : PortStatusListener of DDS_Get not created\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : PortStatusListener of DDS_Get was created\n")));
-      }
-    //Provides for DDS_Listen
-    if (!this->listen_data_listener_created_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : DataListener of DDS_Listen not created\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : DataListener of DDS_Listen was created\n")));
-      }
-    if (!this->listen_port_status_created_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : PortStatusListener of DDS_Listen not created\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : PortStatusListener of DDS_Listen was created\n")));
-      }
-    //Provides for DDS_StateListen
-    if (!this->statelisten_data_listener_created_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : DataListener of DDS_StateListen not created\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : DataListener of DDS_StateListen was created\n")));
-      }
-    if (!this->statelisten_port_status_created_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : PortStatusListener of DDS_StateListen not created\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : PortStatusListener of DDS_StateListen was created\n")));
-      }
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_State_Connection_Test_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-
-    return retval;
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.h
deleted file mode 100644
index d4a731ebfce..00000000000
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.h
+++ /dev/null
@@ -1,112 +0,0 @@
-// -*- C++ -*-
-#ifndef STATE_CONNECTION_RECEIVER_EXEC_H_
-#define STATE_CONNECTION_RECEIVER_EXEC_H_
-
-#include "State_Connection_Test_ReceiverEC.h"
-
-#include /**/ "Receiver_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-
-
-namespace CIAO_State_Connection_Test_Receiver_Impl
-{
-  class RECEIVER_EXEC_Export Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    // Port operations.
-    //Provides for DDS_Read
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_read_status (void);
-
-    //Provides for DDS_Get
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_get_status (void);
-
-    //Provides for DDS_Listen
-    virtual ::State_Connection_Test
-            ::State_ConnectionTestConnector
-            ::CCM_Listener_ptr
-    get_info_listen_data_listener ();
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_listen_status (void);
-
-    //Provides for DDS_StateListen
-    virtual ::State_Connection_Test
-            ::State_ConnectionTestConnector
-            ::CCM_StateListener_ptr
-    get_info_statelisten_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_statelisten_status (void);
-
-
-    // Operations from Components::SessionComponent.
-    virtual void
-    set_session_context (
-      ::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete (void);
-
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-
-  private:
-    ::State_Connection_Test::CCM_Receiver_Context_var context_;
-
-    //DDS_Read
-    bool reader_data_ok_;
-    bool reader_dds_entity_ok_;
-    bool reader_filter_config_ok_;
-
-    //DDS_Get
-    bool getter_data_ok_;
-    bool getter_fresh_data_ok_;
-    bool getter_dds_entity_ok_;
-    bool getter_filter_config_ok_;
-
-    //DDS_Listen
-    bool listen_data_ok_;
-    bool listen_data_control_ok_;
-    bool listen_dds_entity_ok_;
-    bool listen_filter_config_ok_;
-
-    //DDS_StateListen
-    bool statelisten_data_ok_;
-    bool statelisten_data_control_ok_;
-    bool statelisten_dds_entity_ok_;
-    bool statelisten_filter_config_ok_;
-
-    //Provides for DDS_Read
-    bool reader_port_status_created_;
-
-    //Provides for DDS_Get
-    bool getter_port_status_created_;
-
-    //Provides for DDS_Listen
-    bool listen_data_listener_created_;
-    bool listen_port_status_created_;
-
-    //Provides for DDS_StateListen
-    bool statelisten_data_listener_created_;
-    bool statelisten_port_status_created_;
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_State_Connection_Test_Receiver_Impl (void);
-}
-
-#endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/.gitignore b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/.gitignore
deleted file mode 100644
index f4e05f574a0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/Sender_exec_export.h
-/Sender_lem_stub_export.h
-/Sender_stub_export.h
-/Sender_svnt_export.h
-/State_Connection_Test_SenderE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.idl
deleted file mode 100644
index c340f79e086..00000000000
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.idl
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_STATE_CONNECTION_TEST_SENDER_IDL
-#define DDS_STATE_CONNECTION_TEST_SENDER_IDL
-
-#include "Connector/State_Connection_Test_Connector.idl"
-
-module State_Connection_Test
-{
-  component Sender
-  {
-    port State_ConnectionTestConnector::DDS_Update info_update;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc
deleted file mode 100644
index bb2842d2a97..00000000000
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc
+++ /dev/null
@@ -1,138 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_SCT_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_SCT_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_SCT_Connector_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I ..
-
-  IDL_Files {
-    State_Connection_Test_Sender.idl
-  }
-}
-
-project(DDS_SCT_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_SCT_Sender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    State_Connection_Test_SenderE.idl
-  }
-}
-
-project(DDS_SCT_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_SCT_Sender_lem_gen DDS_SCT_Sender_stub DDS_SCT_Base_stub
-  libs  += DDS_SCT_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    State_Connection_Test_SenderEC.cpp
-  }
-
-  Header_Files {
-    State_Connection_Test_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    State_Connection_Test_SenderEC.inl
-  }
-}
-
-project(DDS_SCT_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_SCT_Sender_idl_gen DDS_SCT_Base_stub DDS_SCT_Connector_stub
-  libs  += DDS_SCT_Base_stub DDS_SCT_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    State_Connection_Test_SenderC.cpp
-  }
-
-  Header_Files {
-    State_Connection_Test_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    State_Connection_Test_SenderC.inl
-  }
-}
-
-project(DDS_SCT_Sender_exec) : ciao_executor, dds4ccm_base {
-  after   += DDS_SCT_Sender_lem_stub DDS_SCT_Sender_stub DDS_SCT_Connector_lem_stub DDS_SCT_Connector_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub DDS_SCT_Base_stub DDS_SCT_Connector_lem_stub DDS_SCT_Connector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    State_Connection_Test_Sender_exec.cpp
-  }
-
-  Header_Files {
-    State_Connection_Test_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_SCT_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_SCT_Base_stub  DDS_SCT_Sender_lem_stub DDS_SCT_Connector_stub DDS_SCT_Connector_svnt  DDS_SCT_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                DDS_SCT_Base_stub DDS_SCT_Connector_stub DDS_SCT_Connector_svnt DDS_SCT_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    State_Connection_Test_SenderS.cpp
-    State_Connection_Test_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    State_Connection_Test_SenderS.h
-    State_Connection_Test_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.cpp
deleted file mode 100644
index 51c54ac5dad..00000000000
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-// -*- C++ -*-
-#include "State_Connection_Test_Sender_exec.h"
-#include "ace/Guard_T.h"
-#include "ace/Log_Msg.h"
-
-
-
-namespace CIAO_State_Connection_Test_Sender_Impl
-{
-  //============================================================
-  // Component Executor Implementation Class: Sender_exec_i
-  //============================================================
-
-  Sender_exec_i::Sender_exec_i (void)
-    : updater_ok_ (false),
-      updater_dds_datawriter_ok_ (false)
-  {
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-
-  void
-  Sender_exec_i::set_session_context (::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::State_Connection_Test::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    ::State_Connection_Test::State_ConnectionTestConnector::Updater_var updater =
-        this->context_->get_connection_info_update_data ();
-    if (! ::CORBA::is_nil (updater.in ()))
-      {
-        this->updater_ok_ = true;
-      }
-    ::DDS::DataWriter_var  updater_dds_datawriter =
-        this->context_->get_connection_info_update_dds_entity ();
-    if (! ::CORBA::is_nil (updater_dds_datawriter.in ()))
-      {
-        this->updater_dds_datawriter_ok_ = true;
-      }
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    if (!this->updater_ok_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Sender : get updater failed\n")));
-      }
-    else
-      {
-        ACE_ERROR ((LM_DEBUG, ACE_TEXT ("Sender : Get updater passed\n")));
-      }
-    if (!this->updater_dds_datawriter_ok_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Sender : Get dds writer for DDS_Updater failed\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender : Get dds writer for DDS_Updater passed\n")));
-      }
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_State_Connection_Test_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.h
deleted file mode 100644
index 69d50c4c5d7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// -*- C++ -*-
-#ifndef STATE_CONNECTION_SENDER_EXEC_H_
-#define STATE_CONNECTION_SENDER_EXEC_H_
-
-#include "State_Connection_Test_SenderEC.h"
-
-#include /**/ "Sender_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-namespace CIAO_State_Connection_Test_Sender_Impl
-{
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete (void);
-
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-
-  private:
-    ::State_Connection_Test::CCM_Sender_Context_var context_;
-
-    bool updater_ok_;
-    bool updater_dds_datawriter_ok_;
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_State_Connection_Test_Sender_Impl (void);
-}
-
-#endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/Plan.cdp
deleted file mode 100644
index f9b124f4260..00000000000
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/Plan.cdp
+++ /dev/null
@@ -1,721 +0,0 @@
-<!--  -->
-<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>State_Connection_Test_Depl_1</label>
-  <UUID>State_Connection_Test_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_State_Connection_Test_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_State_Connection_Test_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="State_Connection_Test_ConnectorComponentImplementation">
-    <name>State_Connection_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="State_Connection_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="State_Connection_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_State_Connection_Test_State_ConnectionTestConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_State_Connection_Test_State_ConnectionTestConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>State_Connection_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>State_Connection_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_State_Connection_Test_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_State_Connection_Test_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-  </instance>
-  <instance xmi:id="State_Connection_Test_ConnectorComponentInstance">
-    <name>State_Connection_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="State_Connection_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>State_Connection_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="State_Connection_Test_ConnectorComponentInstance2">
-    <name>State_Connection_Test_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="State_Connection_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>State_Connection_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-  </instance>
-
-  <!-- SENDER COMPONENT CONNECTIONS -->
-  <connection>
-    <name>update_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_update_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>observable_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_Connection_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>update_dds_entity</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_update_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>observable_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_Connection_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <!-- RECEIVER COMPONENT CONNECTIONS -->
-  <!--   DDS_Get port -->
-  <connection>
-    <name>get_data_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>get_fresh_data_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_fresh_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_observer_fresh_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>get_dds_entity_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_observer_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>get_filter_config_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_filter_config</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_observer_filter_config</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <!--   DDS_Get mirrorport -->
-  <connection>
-    <name>get_status_mirrorport</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_observer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="State_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <!--   DDS_Read port -->
-  <connection>
-    <name>read_data_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_read_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>passive_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>read_dds_entity_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_read_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>passive_observer_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>read_filter_config_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_read_filter_config</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>passive_observer_filter_config</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <!--   DDS_Read mirrorport -->
-  <connection>
-    <name>read_status_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_read_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>passive_observer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="State_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <!--   DDS_Listen port -->
-  <connection>
-    <name>listen_data_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>listen_data_control_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_observer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>listen_dds_entity_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_observer_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>listen_filter_config_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_filter_config</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_observer_filter_config</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <!--   DDS_Listen mirrorport -->
-  <connection>
-    <name>listen_data_listener_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_observer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="State_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>listen_status_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_observer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="State_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <!--   DDS_StateListen port -->
-  <connection>
-    <name>statelisten_data_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_statelisten_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>statelisten_data_control_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_statelisten_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>statelisten_dds_entity_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_statelisten_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>statelisten_filter_config_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_statelisten_filter_config</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_filter_config</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <!--   DDS_Listen mirrorport -->
-  <connection>
-    <name>statelisten_data_listener_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_statelisten_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="State_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>statelisten_status_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_statelisten_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="State_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="State_Connection_Test_Connector_ExecArtifact">
-    <name>State_Connection_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_SCT_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="State_Connection_Test_Connector_SvntArtifact">
-    <name>State_Connection_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_SCT_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="State_Connection_Test_Connector_StubArtifact">
-    <name>State_Connection_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_SCT_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl
deleted file mode 100755
index 174721086cd..00000000000
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 10 seconds to allow task to complete\n";
-sleep (10);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -s\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/TimeConversion/.gitignore b/CIAO/connectors/dds4ccm/tests/TimeConversion/.gitignore
deleted file mode 100644
index e7dd623f96a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TimeConversion/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/TimeConversion
diff --git a/CIAO/connectors/dds4ccm/tests/TimeConversion/Time_Conversion.mpc b/CIAO/connectors/dds4ccm/tests/TimeConversion/Time_Conversion.mpc
deleted file mode 100644
index bdddf653517..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TimeConversion/Time_Conversion.mpc
+++ /dev/null
@@ -1,7 +0,0 @@
-project(DDS_TimeConversion) : taoexe, dds4ccm_base {
-  includes += $(CIAO_ROOT)
-  exename = TimeConversion
-  Source_Files {
-    time_conversion.cpp
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/TimeConversion/run_test.pl b/CIAO/connectors/dds4ccm/tests/TimeConversion/run_test.pl
deleted file mode 100755
index c8901833b9c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TimeConversion/run_test.pl
+++ /dev/null
@@ -1,27 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-     & eval 'exec perl -S $0 $argv:q'
-     if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{ACE_ROOT}/bin";
-use PerlACE::TestTarget;
-
-my $program = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
-
-$PROG = $program->CreateProcess ("TimeConversion", "");
-$program_status = $PROG->SpawnWaitKill ($program->ProcessStartWaitInterval());
-
-if ($program_status != 0) {
-    print STDERR "ERROR: TimeConversion returned $program_status\n";
-    exit 1;
-}
-
-$exit_status = $PROG->WaitKill ($program->ProcessStopWaitInterval());
-
-if ($exit_status != 0) {
-    print STDERR "ERROR: TimeConversion returned $server_status\n";
-    $status = 1;
-}
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp b/CIAO/connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp
deleted file mode 100644
index be4218bfc2c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-#include "dds4ccm/impl/TimeUtilities.h"
-#include "ace/OS_NS_sys_time.h"
-
-int
-ACE_TMAIN(int , ACE_TCHAR **)
-{
-  try
-    {
-      ::DDS::Time_t dds_time;
-      ACE_Time_Value ace_time = ACE_OS::gettimeofday ();
-
-      dds_time <<= ace_time;
-      if (dds_time.sec != ace_time.sec ())
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR : TimeConversion - Conversion from "
-                                "ACE_Time_Value to DDS::Time_t "
-                                "seconds expected <%u> - seconds found <%u>\n",
-                                ace_time.sec (), dds_time.sec));
-        }
-      else
-        {
-          ACE_DEBUG ((LM_DEBUG, "TimeConversion - Conversion from "
-                                "ACE_Time_Value to DDS::Time_t "
-                                "regarding seconds succeeded\n"));
-        }
-      if (dds_time.nanosec / 1000 != static_cast <CORBA::ULong>(ace_time.usec ()))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR : TimeConversion - Conversion from "
-                                "ACE_Time_Value to DDS::Time_t "
-                                "micro seconds expected <%u> - micro seconds found <%u>\n",
-                                ace_time.usec (), dds_time.nanosec/1000));
-        }
-      else
-        {
-          ACE_DEBUG ((LM_DEBUG, "TimeConversion - Conversion from "
-                                "ACE_Time_Value to DDS::Time_t "
-                                "regarding micro seconds succeeded\n"));
-        }
-
-      ::DDS::Time_t dds_now;
-      ACE_Time_Value ace_now = ACE_OS::gettimeofday ();
-      dds_now <<= ace_now;
-      //create real nanoseconds.
-      dds_now.nanosec = 1234567890;
-      ace_time <<= dds_now;
-
-      if (ace_time.sec () != dds_now.sec)
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR : TimeConversion - Conversion from "
-                                "DDS::Time_t to ACE_Time_Value "
-                                "seconds expected <%u> - seconds found <%u>\n",
-                                dds_now.sec, ace_time.sec ()));
-        }
-      else
-        {
-          ACE_DEBUG ((LM_DEBUG, "TimeConversion - Conversion from "
-                                "DDS::Time_t to ACE_Time_Value "
-                                "regarding seconds succeeded\n"));
-        }
-      // The resolution of an ACE_Time_Value is less than the resolution of a
-      // DDS::Time_T. Therefor don't multiply ace_time.usec by 1000 but devide
-      // dds_time.nanosec by 1000.
-      if (static_cast<CORBA::ULong>(ace_time.usec ()) != dds_now.nanosec/1000)
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR : TimeConversion - Conversion from "
-                                "DDS::Time_t to ACE_Time_Value "
-                                "nano seconds expected <%u> - nano seconds found <%u>\n",
-                                dds_now.nanosec/1000, ace_time.usec ()));
-        }
-      else
-        {
-          ACE_DEBUG ((LM_DEBUG, "TimeConversion - Conversion from "
-                                "DDS::Time_t to ACE_Time_Value "
-                                "regarding nano seconds succeeded\n"));
-        }
-    }
-  catch (const ::CORBA::Exception& ex)
-    {
-      ex._tao_print_exception ("Exception caught:");
-      return 1;
-    }
-
-  return 0;
-}
diff --git a/CIAO/connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.idl
deleted file mode 100644
index 836bd2dc353..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file TopicName_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef TOPICNAME_TEST_BASE_IDL
-#define TOPICNAME_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/TopicName_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/TopicName_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "TopicNameTest"
-#pragma DCPS_DATA_KEY "TopicNameTest symbol"
-
-struct TopicNameTest {
-  string symbol; //@key
-  long x;
-  long y;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TopicNameTest> TopicNameTestSeq;
-#endif
-
-#endif /* TOPICNAME_TEST_BASE_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.mpc
deleted file mode 100644
index 4fc0879f9f7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (TopicName_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = TopicName_Test_Base_stub
-  dynamicflags += TOPICNAME_EVENT_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=TOPICNAME_EVENT_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=TopicName_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    TopicName_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=TOPICNAME_EVENT_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    TopicName_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component.idl b/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component.idl
deleted file mode 100644
index 06c92dda676..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component.idl
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef COMPONENT_IDL
-#define COMPONENT_IDL
-
-#include "Connector/TopicName_Test_Connector.idl"
-
-module TopicName_Test
-{
-  component TopicNameTestComponent
-  {
-    port TopicNameTestConnector::DDS_Write info_write;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component.mpc
deleted file mode 100644
index 5a9be8f05a4..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-project(TopicName_Test_Component_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += TopicName_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=COMPONENT_STUB_Export \
-              -Wb,stub_export_include=Component_stub_export.h \
-              -Wb,skel_export_macro=COMPONENT_SVNT_Export \
-              -Wb,skel_export_include=Component_svnt_export.h \
-              -Wb,svnt_export_macro=COMPONENT_SVNT_Export \
-              -Wb,svnt_export_include=Component_svnt_export.h \
-              -Wb,exec_export_macro=COMPONENT_EXEC_Export \
-              -Wb,exec_export_include=Component_exec_export.h -I..
-
-  IDL_Files {
-    TopicName_Test_Component.idl
-  }
-}
-
-project(TopicName_Test_Component_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += TopicName_Test_Component_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=COMPONENT_LEM_STUB_Export \
-              -Wb,stub_export_include=Component_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    TopicName_Test_ComponentE.idl
-  }
-}
-
-project(TopicName_Test_Component_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += TopicName_Test_Component_lem_gen TopicName_Test_Component_stub  \
-           TopicName_Test_Connector_stub TopicName_Test_Base_stub
-  libs  +=  Component_stub TopicName_Test_Connector_stub \
-            TopicName_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Component_lem_stub
-  dynamicflags += COMPONENT_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TopicName_Test_ComponentEC.cpp
-  }
-
-  Header_Files {
-    TopicName_Test_ComponentEC.h
-    Component_lem_stub_export.h
-  }
-
-  Inline_Files {
-    TopicName_Test_ComponentEC.inl
-  }
-}
-
-project(TopicName_Test_Component_stub) : ccm_stub, dds4ccm_base {
-  after += TopicName_Test_Component_idl_gen  TopicName_Test_Connector_stub \
-           TopicName_Test_Base_stub TopicName_Test_Connector_lem_gen
-  libs  += TopicName_Test_Connector_stub TopicName_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Component_stub
-  dynamicflags += COMPONENT_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TopicName_Test_ComponentC.cpp
-  }
-
-  Header_Files {
-    TopicName_Test_ComponentC.h
-    Component_stub_export.h
-  }
-
-  Inline_Files {
-    TopicName_Test_ComponentC.inl
-  }
-}
-
-project(TopicName_Test_Component_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += TopicName_Test_Component_lem_stub TopicName_Test_Component_stub \
-             TopicName_Test_Base_stub TopicName_Test_Connector_stub \
-             TopicName_Test_Connector_lem_stub
-  sharedname = Component_exec
-  libs += Component_stub Component_lem_stub TopicName_Test_Base_stub \
-          TopicName_Test_Connector_stub TopicName_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COMPONENT_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TopicName_Test_Component_exec.cpp
-  }
-
-  Header_Files {
-    TopicName_Test_Component_exec.h
-    Component_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(TopicName_Test_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   TopicName_Test_Component_lem_stub TopicName_Test_Base_stub \
-                  TopicName_Test_Connector_stub TopicName_Test_Connector_svnt \
-                  TopicName_Test_Component_exec TopicName_Test_Connector_lem_stub
-  sharedname  = Component_svnt
-  libs       += Component_stub Component_lem_stub TopicName_Test_Base_stub \
-                TopicName_Test_Connector_stub TopicName_Test_Connector_svnt \
-                Component_exec TopicName_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COMPONENT_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TopicName_Test_ComponentS.cpp
-    TopicName_Test_Component_svnt.cpp
-  }
-
-  Header_Files {
-    TopicName_Test_ComponentS.h
-    TopicName_Test_Component_svnt.h
-    Component_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component_exec.cpp
deleted file mode 100644
index ad22e8c9db6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component_exec.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-// -*- C++ -*-
-#include "TopicName_Test_Component_exec.h"
-
-namespace CIAO_TopicName_Test_TopicNameTestComponent_Impl
-{
-  //============================================================
-  // Component_exec_i
-  //============================================================
-  Component_exec_i::Component_exec_i (void)
-  {
-  }
-
-  Component_exec_i::~Component_exec_i (void)
-  {
-  }
-
-  // Operations from Components::SessionComponent.
-  void
-  Component_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::TopicName_Test::CCM_TopicNameTestComponent_Context::_narrow (ctx);
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Component_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Component_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Component_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Component_exec_i::ccm_remove (void)
-  {
-  }
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_TopicName_Test_TopicNameTestComponent_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Component_exec_i);
-
-    return retval;
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component_exec.h b/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component_exec.h
deleted file mode 100644
index d89956045a0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component_exec.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_COMPONENT_EXEC_H_
-#define CIAO_COMPONENT_EXEC_H_
-
-#include "TopicName_Test_ComponentEC.h"
-
-#include /**/ "Component_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-namespace CIAO_TopicName_Test_TopicNameTestComponent_Impl
-{
-  //============================================================
-  // Component_exec_i
-  //============================================================
-  class COMPONENT_EXEC_Export Component_exec_i
-    : public virtual TopicNameTestComponent_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Component_exec_i (void);
-    virtual ~Component_exec_i (void);
-
-    // Operations from Components::SessionComponent.
-    virtual void
-    set_session_context (
-      ::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-
-  private:
-    ::TopicName_Test::CCM_TopicNameTestComponent_Context_var context_;
-  };
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_TopicName_Test_TopicNameTestComponent_Impl (void);
-}
-
-#endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.idl
deleted file mode 100644
index 5eff93b266e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file TopicName_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef TOPICNAME_EVENT_TEST_CONNECTOR_IDL_
-#define TOPICNAME_EVENT_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/TopicName_Test_Base.idl"
-
-#pragma ciao lem "Connector/TopicName_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/TopicName_Test_BaseTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::TopicNameTest, ::TopicNameTestSeq> TopicNameTestConnector;
-
-#endif /* TOPICNAME_EVENT_TEST_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.mpc
deleted file mode 100644
index 7856bf5cb00..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p TopicName_Test_Base -l .. -o ../lib -u DDS TopicName_Test_Connector"
-
-project(TopicName_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen TopicName_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=TOPICNAME_EVENT_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=TopicName_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=TOPICNAME_EVENT_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=TopicName_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=TOPICNAME_EVENT_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=TopicName_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=TOPICNAME_EVENT_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=TopicName_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    TopicName_Test_Connector.idl
-  }
-}
-
-project(TopicName_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += TopicName_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=TOPICNAME_EVENT_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=TopicName_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    TopicName_Test_ConnectorE.idl
-  }
-}
-
-project(TopicName_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += TopicName_Test_Connector_lem_gen TopicName_Test_Connector_stub TopicName_Test_Base_stub
-  libs  += TopicName_Test_Base_stub TopicName_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = TopicName_Test_Connector_lem_stub
-  dynamicflags += TOPICNAME_EVENT_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TopicName_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    TopicName_Test_ConnectorEC.h
-    TopicName_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    TopicName_Test_ConnectorEC.inl
-  }
-}
-
-project(TopicName_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += TopicName_Test_Connector_idl_gen TopicName_Test_Base_stub
-  libs  += TopicName_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = TopicName_Test_Connector_stub
-  dynamicflags += TOPICNAME_EVENT_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TopicName_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    TopicName_Test_ConnectorC.h
-    TopicName_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    TopicName_Test_ConnectorC.inl
-  }
-}
-
-project(TopicName_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += TopicName_Test_Connector_lem_stub TopicName_Test_Connector_stub TopicName_Test_Base_stub
-  sharedname = TopicName_Test_Connector_exec
-  libs += TopicName_Test_Connector_stub TopicName_Test_Connector_lem_stub TopicName_Test_Base_stub TopicName_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += TOPICNAME_EVENT_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TopicName_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    TopicName_Test_Connector_conn.h
-    TopicName_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(TopicName_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += TopicName_Test_Connector_lem_stub TopicName_Test_Connector_exec TopicName_Test_Connector_stub
-  sharedname  = TopicName_Test_Connector_svnt
-  libs       += TopicName_Test_Connector_stub \
-                TopicName_Test_Connector_lem_stub  \
-                TopicName_Test_Base_stub \
-                TopicName_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += TOPICNAME_EVENT_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TopicName_Test_ConnectorS.cpp
-    TopicName_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    TopicName_Test_ConnectorS.h
-    TopicName_Test_Connector_svnt.h
-    TopicName_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/TopicName/descriptors/TooLong.cdp b/CIAO/connectors/dds4ccm/tests/TopicName/descriptors/TooLong.cdp
deleted file mode 100644
index 523de92374b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TopicName/descriptors/TooLong.cdp
+++ /dev/null
@@ -1,191 +0,0 @@
-<!--  -->
-<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>TopicNameEventTest_Depl</label>
-  <UUID>TopicNameEventTest_Depl</UUID>
-
-  <implementation xmi:id="ComponentImplementation">
-    <name>ComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Component_ExecArtifact" />
-    <artifact xmi:idref="Component_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_TopicName_Test_TopicNameTestComponent_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_TopicName_Test_TopicNameTestComponent_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="TopicName_Test_ConnectorImplementation">
-    <name>TopicName_Test_ConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="TopicName_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="TopicName_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_TopicNameTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_TopicNameTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TopicName_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TopicName_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="ComponentInstance">
-    <name>Component</name>
-    <node>ComponentNode</node>
-    <source/>
-    <implementation xmi:idref="ComponentImplementation" />
-  </instance>
-
-  <instance xmi:id="TopicName_Test_ConnectorInstance">
-    <name>TopicName_Test_Connector</name>
-    <node>ComponentNode</node>
-    <source/>
-    <implementation xmi:idref="TopicName_Test_ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ABCEDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789ABCEDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789ABCEDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789ABCEDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789ABCEDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>write_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="TopicName_Test_ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-
-  <artifact xmi:id="TopicName_Test_Connector_ExecArtifact">
-    <name>TopicName_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>TopicName_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="TopicName_Test_Connector_SvntArtifact">
-    <name>TopicName_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>TopicName_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="TopicName_Test_Connector_StubArtifact">
-    <name>TopicName_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>TopicName_Test_Connector_stub</location>
-  </artifact>
-
-  <artifact xmi:id="Component_ExecArtifact">
-    <name>Component_exec</name>
-    <source/>
-    <node/>
-    <location>Component_exec</location>
-  </artifact>
-  <artifact xmi:id="Component_SvntArtifact">
-    <name>Component_svnt</name>
-    <source/>
-    <node/>
-    <location>Component_svnt</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/TopicName/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/TopicName/descriptors/run_test.pl
deleted file mode 100755
index 76a52f3bea5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TopicName/descriptors/run_test.pl
+++ /dev/null
@@ -1,231 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 1;
-@ports = ( 60001 );
-@iorbases = ( "NodeApp1.ior" );
-@iorfiles = 0;
-@nodenames = ( "ComponentNode" );
-
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run node daemon\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-              "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-if ($#ARGV == -1) {
-    opendir(DIR, ".");
-    @files = grep(/\.cdp$/,readdir(DIR));
-    closedir(DIR);
-}
-else {
-    @files = @ARGV;
-}
-
-create_targets ();
-init_ior_files ();
-
-foreach $file (@files) {
-    print "*********** Starting test for deployment $file ***********\n";
-
-    print STDERR "Starting Naming Service\n";
-
-    $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-    $NS->Spawn ();
-
-    if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                      $tg_naming->ProcessStartWaitInterval ()) == -1) {
-        print STDERR "ERROR: cannot find naming service IOR file\n";
-        $NS->Kill (); $NS->TimedWait (1);
-        exit 1;
-    }
-
-    $ns_running = 1;
-    # Set up NamingService environment
-    $ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-    # Invoke node daemon.
-    print "Invoking node daemon\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 = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-    $EM->Spawn ();
-
-    if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                    $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-open (OLDOUT, ">&STDOUT");
-open (STDOUT, ">" . File::Spec->devnull());
-open (OLDERR, ">&STDERR");
-open (STDERR, ">&STDOUT");
-
-    $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                                      "-x $file -k file://$ior_emfile");
-    $pl_status = $E->SpawnWaitKill (5 * $tg_executor->ProcessStartWaitInterval ());
-
-open (STDOUT, ">&OLDOUT");
-open (STDERR, ">&OLDERR");
-
-    if ($pl_status == 0) {
-        print STDERR "ERROR: plan_launcher didn't return errors.\n";
-
-        print "Sleeping 5 seconds to allow task to complete\n";
-        sleep (5);
-
-        print "Teardown the application\n";
-        $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                                          "-k file://$ior_emfile -x $file -s");
-        $E->SpawnWaitKill (5 * $tg_executor->ProcessStartWaitInterval ());
-        print "Executor finished.\n";
-    }
-    else {
-        print "OK. plan_launcher returned an expected value.\n";
-    }
-    delete_ior_files ();
-    kill_open_processes ();
-}
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopics/.gitignore b/CIAO/connectors/dds4ccm/tests/TwoTopics/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TwoTopics/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/.gitignore
deleted file mode 100644
index 95522399761..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/TwoTopics_Base.cxx
-/TwoTopics_Base.h
-/TwoTopics_BasePlugin.cxx
-/TwoTopics_BasePlugin.h
-/TwoTopics_BaseSupport.cxx
-/TwoTopics_BaseSupport.h
-/TwoTopics_Base_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl b/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl
deleted file mode 100644
index 3e182f08d90..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * @file TwoTopics_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef TWOTOPICS_BASE_IDL
-#define TWOTOPICS_BASE_IDL
-
-#pragma ndds typesupport "Base/TwoTopics_BaseSupport.h"
-#pragma opendds typesupport "Base/TwoTopics_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "HelloTopic"
-#pragma DCPS_DATA_KEY "HelloTopic hello"
-
-struct HelloTopic {
-  string hello; //@key
-  long iteration;
-};
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<HelloTopic> HelloTopicSeq;
-#endif
-
-#pragma DCPS_DATA_TYPE "GoodbyeTopic"
-#pragma DCPS_DATA_KEY "GoodbyeTopic goodbye"
-
-struct GoodbyeTopic {
-  string goodbye; //@key
-  long iteration;
-};
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<GoodbyeTopic> GoodbyeTopicSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc b/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc
deleted file mode 100644
index 06e4dace8ab..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_TwoTopics_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_TwoTopics_Base_stub
-  dynamicflags += TWOTOPICS_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=TWOTOPICS_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=TwoTopics_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    TwoTopics_Base.idl
-  }
-
-  opendds_ts_flags += --export=TWOTOPICS_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    TwoTopics_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/.gitignore
deleted file mode 100644
index 1586c6072eb..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/TwoTopics_ConnectorE.idl
-/TwoTopics_Connector_conn.cpp
-/TwoTopics_Connector_conn.h
-/TwoTopics_Connector_conn_export.h
-/TwoTopics_Connector_lem_stub_export.h
-/TwoTopics_Connector_stub_export.h
-/TwoTopics_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl b/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl
deleted file mode 100644
index 493f113abb8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * @file TwoTopics_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef TWOTOPICS_CONNECTOR_IDL_
-#define TWOTOPICS_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/TwoTopics_Base.idl"
-
-#pragma ciao lem "Connector/TwoTopics_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/TwoTopics_BaseTypeSupport.idl"
-#endif
-
-module TT_Connector
-{
-  module ::CCM_DDS::Typed < HelloTopic, HelloTopicSeq> HelloConnector;
-  module ::CCM_DDS::Typed < GoodbyeTopic, GoodbyeTopicSeq> GoodbyeConnector;
-};
-
-#endif /* TWOTOPICS_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc b/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc
deleted file mode 100644
index 1f9f23770fc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_TwoTopics_Base -l .. -o ../lib -u DDS TwoTopics_Connector"
-
-project(DDS_TwoTopics_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_TwoTopics_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=TWOTOPICS_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=TwoTopics_Connector_stub_export.h \
-              -Wb,skel_export_macro=TWOTOPICS_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=TwoTopics_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=TWOTOPICS_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=TwoTopics_Connector_svnt_export.h \
-              -Wb,conn_export_macro=TWOTOPICS_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=TwoTopics_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    TwoTopics_Connector.idl
-  }
-}
-
-project(DDS_TwoTopics_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_TwoTopics_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=TWOTOPICS_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=TwoTopics_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    TwoTopics_ConnectorE.idl
-  }
-}
-
-project(DDS_TwoTopics_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_TwoTopics_Connector_lem_gen DDS_TwoTopics_Connector_stub DDS_TwoTopics_Base_stub
-  libs  += DDS_TwoTopics_Base_stub DDS_TwoTopics_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_TwoTopics_Connector_lem_stub
-  dynamicflags += TWOTOPICS_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TwoTopics_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    TwoTopics_ConnectorEC.h
-    TwoTopics_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    TwoTopics_ConnectorEC.inl
-  }
-}
-
-project(DDS_TwoTopics_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_TwoTopics_Connector_idl_gen DDS_TwoTopics_Base_stub
-  libs  += DDS_TwoTopics_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_TwoTopics_Connector_stub
-  dynamicflags += TWOTOPICS_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TwoTopics_ConnectorC.cpp
-  }
-
-  Header_Files {
-    TwoTopics_ConnectorC.h
-    TwoTopics_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    TwoTopics_ConnectorC.inl
-  }
-}
-
-project(DDS_TwoTopics_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_TwoTopics_Connector_lem_stub DDS_TwoTopics_Connector_stub DDS_TwoTopics_Base_stub
-  sharedname = DDS_TwoTopics_Connector_exec
-  libs += DDS_TwoTopics_Connector_stub DDS_TwoTopics_Connector_lem_stub DDS_TwoTopics_Base_stub DDS_TwoTopics_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += TWOTOPICS_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TwoTopics_Connector_conn.cpp
-  }
-
-  Header_Files {
-    TwoTopics_Connector_conn.h
-    TwoTopics_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_TwoTopics_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_TwoTopics_Connector_lem_stub DDS_TwoTopics_Connector_exec DDS_TwoTopics_Connector_stub
-  sharedname  = DDS_TwoTopics_Connector_svnt
-  libs       += DDS_TwoTopics_Connector_stub \
-                DDS_TwoTopics_Connector_lem_stub  \
-                DDS_TwoTopics_Base_stub \
-                DDS_TwoTopics_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += TWOTOPICS_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TwoTopics_ConnectorS.cpp
-    TwoTopics_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    TwoTopics_ConnectorS.h
-    TwoTopics_Connector_svnt.h
-    TwoTopics_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/.gitignore b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl
deleted file mode 100644
index 665e3346f76..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * @file Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef CONNECTOR_IDL_
-#define CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-#include "Hello/HelloGoodbye.idl"
-#include "Goodbye/HelloGoodbye.idl"
-
-#pragma ciao lem "Connector/ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Hello/HelloGoodbyeTypeSupport.idl"
-# include "Goodbye/HelloGoodbyeTypeSupport.idl"
-#endif
-
-module Hello
-{
-  // Hello connector
-  module ::CCM_DDS::Typed < HelloGoodbye, HelloGoodbyeSeq> HelloConnector;
-};
-
-module Goodbye
-{
-  // Goodbye connector
-  module ::CCM_DDS::Typed < HelloGoodbye, HelloGoodbyeSeq> GoodbyeConnector;
-};
-
-module HelloGoodbye
-{
-  // Hello connector
-  module ::CCM_DDS::Typed < ::Hello::HelloGoodbye, ::Hello::HelloGoodbyeSeq> HelloConnector;
-
-  // Goodbye connector
-  module ::CCM_DDS::Typed < ::Goodbye::HelloGoodbye, ::Goodbye::HelloGoodbyeSeq> GoodbyeConnector;
-};
-
-// Hello connector
-module ::CCM_DDS::Typed < ::Hello::HelloGoodbye, ::Hello::HelloGoodbyeSeq> HelloConnector;
-
-// Goodbye connector
-module ::CCM_DDS::Typed < ::Goodbye::HelloGoodbye, ::Goodbye::HelloGoodbyeSeq> GoodbyeConnector;
-
-#endif /* CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc
deleted file mode 100644
index 1e547bc965b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-project(DDS_TTDN_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_Hello_Namespace_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=TWOTOPICSDIFFERENTNS_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=Connector_stub_export.h \
-              -Wb,skel_export_macro=TWOTOPICSDIFFERENTNS_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=Connector_svnt_export.h \
-              -Wb,svnt_export_macro=TWOTOPICSDIFFERENTNS_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=Connector_svnt_export.h \
-              -Wb,conn_export_macro=TWOTOPICSDIFFERENTNS_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Connector.idl
-  }
-}
-
-project(DDS_TTDN_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_TTDN_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=TWOTOPICSDIFFERENTNS_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    ConnectorE.idl
-  }
-}
-
-project(DDS_TTDN_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_TTDN_Connector_lem_gen DDS_TTDN_Connector_stub \
-           DDS_Goodbye_Namespace_Base_stub DDS_Hello_Namespace_Base_stub
-  libs  += DDS_Connector_stub \
-           DDS_Goodbye_Namespace_Base_stub DDS_Hello_Namespace_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Connector_lem_stub
-  dynamicflags += TWOTOPICSDIFFERENTNS_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ConnectorEC.cpp
-  }
-
-  Header_Files {
-    ConnectorEC.h
-    Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    ConnectorEC.inl
-  }
-}
-
-project(DDS_TTDN_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_TTDN_Connector_idl_gen \
-           DDS_Goodbye_Namespace_Base_stub DDS_Hello_Namespace_Base_stub
-  libs  += DDS_Goodbye_Namespace_Base_stub DDS_Hello_Namespace_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Connector_stub
-  dynamicflags += TWOTOPICSDIFFERENTNS_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ConnectorC.cpp
-  }
-
-  Header_Files {
-    ConnectorC.h
-    Connector_stub_export.h
-  }
-
-  Inline_Files {
-    ConnectorC.inl
-  }
-}
-
-project(DDS_TTDN_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after += DDS_TTDN_Connector_lem_stub DDS_TTDN_Connector_stub \
-           DDS_Goodbye_Namespace_Base_stub DDS_Hello_Namespace_Base_stub
-  libs  += DDS_Connector_stub DDS_Connector_lem_stub \
-           DDS_Goodbye_Namespace_Base_stub DDS_Hello_Namespace_Base_stub
-  sharedname = DDS_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += TWOTOPICSDIFFERENTNS_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector_conn.cpp
-  }
-
-  Header_Files {
-    Connector_conn.h
-    Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_TTDN_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_TTDN_Connector_lem_stub DDS_TTDN_Connector_exec \
-                DDS_Goodbye_Namespace_Base_stub DDS_Hello_Namespace_Base_stub \
-                DDS_TTDN_Connector_stub
-  libs       += DDS_Connector_stub \
-                DDS_Connector_lem_stub  \
-                DDS_Goodbye_Namespace_Base_stub DDS_Hello_Namespace_Base_stub \
-                DDS_Connector_exec
-  sharedname  = DDS_Connector_svnt
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += TWOTOPICSDIFFERENTNS_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ConnectorS.cpp
-    Connector_svnt.cpp
-  }
-
-  Header_Files {
-    ConnectorS.h
-    Connector_svnt.h
-    Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/.gitignore b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/.gitignore
deleted file mode 100644
index b33d6bb17e2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/Goodbye_stub_export.h
-/HelloGoodbye.cxx
-/HelloGoodbye.h
-/HelloGoodbyePlugin.cxx
-/HelloGoodbyePlugin.h
-/HelloGoodbyeSupport.cxx
-/HelloGoodbyeSupport.h
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.idl b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.idl
deleted file mode 100644
index 80e27a75c0a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.idl
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * @file HelloGoodbye.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef GOODBYE_IDL_
-#define GOODBYE_IDL_
-
-#pragma ndds typesupport "Goodbye/HelloGoodbyeSupport.h"
-#pragma opendds typesupport "Goodbye/HelloGoodbyeTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "Goodbye::HelloGoodbye"
-#pragma DCPS_DATA_KEY "Goodbye::HelloGoodbye goodbye"
-
-module Goodbye
-{
-  struct HelloGoodbye {
-    string goodbye;  //@key
-    long iteration;
-  };
-  #if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<HelloGoodbye> HelloGoodbyeSeq;
-#endif
-};
-
-#endif /* GOODBYE_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.mpc b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.mpc
deleted file mode 100644
index 77f20e7d0c9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_Goodbye_Namespace_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_Goodbye_Namespace_Base_stub
-  dynamicflags += GOODBYE_NAMESPACE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=GOODBYE_NAMESPACE_STUB_Export \
-              -Wb,stub_export_include=Goodbye_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    HelloGoodbye.idl
-  }
-
-  opendds_ts_flags += --export=GOODBYE_NAMESPACE_STUB_Export
-
-  DDSGenerator_Files {
-    HelloGoodbye.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/.gitignore b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/.gitignore
deleted file mode 100644
index 6c770338040..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/HelloGoodbye.cxx
-/HelloGoodbye.h
-/HelloGoodbyePlugin.cxx
-/HelloGoodbyePlugin.h
-/HelloGoodbyeSupport.cxx
-/HelloGoodbyeSupport.h
-/Hello_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.idl b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.idl
deleted file mode 100644
index d18f059326d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * @file HelloGoodbye.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef HELLO_IDL_
-#define HELLO_IDL_
-
-#pragma ndds typesupport "Hello/HelloGoodbyeSupport.h"
-#pragma opendds typesupport "Hello/HelloGoodbyeTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "Hello::HelloGoodbye"
-#pragma DCPS_DATA_KEY "Hello::HelloGoodbye hello"
-
-module Hello
-{
-  struct HelloGoodbye {
-    string hello;  //@key
-    long iteration;
-  };
-  #if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<HelloGoodbye> HelloGoodbyeSeq;
-#endif
-};
-
-
-#endif /* HELLO_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.mpc b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.mpc
deleted file mode 100644
index ac23ad4c2ee..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_Hello_Namespace_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_Hello_Namespace_Base_stub
-  dynamicflags += HELLO_NAMESPACE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=HELLO_NAMESPACE_STUB_Export \
-              -Wb,stub_export_include=Hello_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    HelloGoodbye.idl
-  }
-
-  opendds_ts_flags += --export=HELLO_NAMESPACE_STUB_Export
-
-  DDSGenerator_Files {
-    HelloGoodbye.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/TypeSupport/TypeSupport.mpc b/CIAO/connectors/dds4ccm/tests/TypeSupport/TypeSupport.mpc
deleted file mode 100644
index a193af51005..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TypeSupport/TypeSupport.mpc
+++ /dev/null
@@ -1,8 +0,0 @@
-project(DDS_TypeSupport_Test) : taoexe, typecode, dds4ccm_base {
-  includes += $(CIAO_ROOT)
-  exename = typesupport_test
-
-  Source_Files {
-    main.cpp
-  }
-}
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/TypeSupport/main.cpp b/CIAO/connectors/dds4ccm/tests/TypeSupport/main.cpp
deleted file mode 100644
index 7128ce31414..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TypeSupport/main.cpp
+++ /dev/null
@@ -1,297 +0,0 @@
-#include "ace/OS_main.h"
-#include "ace/Log_Msg.h"
-#include "ace/Env_Value_T.h"
-
-#if (CIAO_DDS4CCM_NDDS == 1)
-
-#include "dds4ccm/impl/ndds/TypeSupport.h"
-#include "dds4ccm/impl/ndds/DomainParticipant.h"
-#include "dds4ccm/impl/ndds/DomainParticipantFactory.h"
-
-typedef ::CIAO::NDDS::DDS_DomainParticipantFactory_i
-    DomainParticipantFactory;
-
-class TestTypeFactory : public ::CIAO::NDDS::DDS_TypeFactory_i
-{
-  virtual DDS::DataWriter_ptr create_datawriter (DDSDataWriter* ,
-                                                  ::DDS::DomainParticipant_ptr ,
-                                                  ::DDS::Publisher_ptr )
-  {
-    return ::DDS::DataWriter::_nil ();
-  }
-
-  virtual DDS::DataReader_ptr create_datareader (DDSDataReader* ,
-                                                  ::DDS::DomainParticipant_ptr ,
-                                                  ::DDS::Subscriber_ptr )
-  {
-    return ::DDS::DataReader::_nil ();
-  }
-};
-#endif
-
-int
-ACE_TMAIN (int , ACE_TCHAR **)
-{
-#if (CIAO_DDS4CCM_NDDS == 1)
-  // first turn on or off tracing
-  ACE_Env_Value<int> trace (ACE_TEXT("DDS4CCM_TRACE_ENABLE"), 0);
-  if (trace)
-    {
-      DDS4CCM_ENABLE_TRACE ();
-    }
-  else
-    {
-      DDS4CCM_DISABLE_TRACE ();
-    }
-  DDS4CCM_debug_level = 0;
-
-  int ret = 0;
-
-  try
-    {
-      int domain_id = 0;
-      ACE_Env_Value<int> id (ACE_TEXT("DDS4CCM_DEFAULT_DOMAIN_ID"), domain_id);
-      domain_id = id;
-
-      DomainParticipantFactory pf;
-
-      ::DDS::DomainParticipantQos qos;
-      ::DDS::DomainParticipant_var dp1 = pf.create_participant (
-                                            domain_id,
-                                            qos,
-                                            ::DDS::DomainParticipantListener::_nil (),
-                                            0);
-
-      ::DDS::DomainParticipant_var dp2  = pf.create_participant (
-                                            domain_id,
-                                            qos,
-                                            ::DDS::DomainParticipantListener::_nil (),
-                                            0);
-
-      const char * type1 = "DataType1";
-      const char * type2 = "DataType2";
-      const char * type3 = "DataType3";
-
-      TestTypeFactory * f1 = 0;
-      TestTypeFactory * f2 = 0;
-      TestTypeFactory * f3 = 0;
-
-      ACE_NEW_THROW_EX (f1,
-                        TestTypeFactory (),
-                        ::CORBA::NO_MEMORY ());
-      ACE_NEW_THROW_EX (f2,
-                        TestTypeFactory (),
-                        ::CORBA::NO_MEMORY ());
-      ACE_NEW_THROW_EX (f3,
-                        TestTypeFactory (),
-                        ::CORBA::NO_MEMORY ());
-
-      /// Register type 1 with f1
-      if (::CIAO::NDDS::DDS_TypeSupport_i::register_type(dp1.in(), type1, f1))
-        {
-          ACE_DEBUG ((LM_DEBUG, "OK - Type <%C> and Factory <%@> for DP1 successfully registered\n",
-                    type1, f1));
-        }
-      else
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR - Type <%C> and Factory <%@> for DP1 could not be registered\n",
-                    type1, f1));
-          ++ret;
-        }
-      /// DP1 should now contain one type-factory combination
-
-      /// Register the same factory again
-      if (::CIAO::NDDS::DDS_TypeSupport_i::register_type(dp1.in(), type1, f1))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR - Type <%C> and Factory <%@> for DP1 could be registered\n",
-                    type1, f1));
-          ++ret;
-        }
-      else
-        {
-          ACE_DEBUG ((LM_DEBUG, "OK - Type <%C> and Factory <%@> for DP1 could not be registered\n",
-                    type1, f1));
-        }
-      /// DP1 should now contain one type-factory combination
-
-      /// Register the same factory again but with another name
-      if (::CIAO::NDDS::DDS_TypeSupport_i::register_type(dp1.in(), type2, f1))
-        {
-          ACE_DEBUG ((LM_DEBUG, "OK - Type <%C> and Factory <%@> for DP1 could be registered\n",
-                    type2, f1));
-        }
-      else
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR - Type <%C> and Factory <%@> for DP1 could not be registered\n",
-                    type2, f1));
-          ++ret;
-        }
-      /// DP1 should now contain two type-factory combinations
-
-      /// Register the same type with another factory
-      if (::CIAO::NDDS::DDS_TypeSupport_i::register_type(dp1.in(), type2, f2))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR - Type <%C>  and Factory <%@> for DP1 could be registered\n",
-                    type2, f2));
-          ++ret;
-        }
-      else
-        {
-          ACE_DEBUG ((LM_DEBUG, "OK - Type <%C> and Factory <%@> for DP1 could not be registered\n",
-                    type2, f2));
-        }
-      /// DP1 should now contain two type-factory combinations
-
-      /// Just register type 3 with f3
-      if (::CIAO::NDDS::DDS_TypeSupport_i::register_type(dp1.in(), type3, f3))
-        {
-          ACE_DEBUG ((LM_DEBUG, "OK - Type <%C> and Factory <%@> for DP1 successfully registered\n",
-                    type3, f3));
-        }
-      else
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR - Type <%C> and Factory <%@> for DP1 could not be registered\n",
-                    type3, f3));
-          ++ret;
-        }
-      /// DP1 should now contain three type-factory combinations
-
-      /// Unregister an unused factory by using an unused domain participant
-      bool tmp = ::CIAO::NDDS::DDS_TypeSupport_i::unregister_type(dp2.in(), type1);
-
-      if (tmp)
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR - Unregistered type <%C> for DP2 could be unregistered\n",
-                    type1));
-          ++ret;
-        }
-      else
-        {
-          ACE_DEBUG ((LM_DEBUG, "OK - Unregistered type <%C> for DP2 could not be unregistered\n",
-                    type1));
-        }
-
-      /// Unregister a registered type by using a used domain participant
-      tmp = ::CIAO::NDDS::DDS_TypeSupport_i::unregister_type(dp1.in(), type1);
-
-      if (tmp)
-        {
-          ACE_DEBUG ((LM_DEBUG, "OK - Unregistered type <%C> for DP1 could be unregistered\n",
-                    type1));
-        }
-      else
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR - Unregistered type <%C> for DP1 could not be unregistered\n",
-                    type1));
-          ++ret;
-        }
-      /// DP1 should now contain two type-factory combinations
-
-      /// Unregister the same type and domain participant again
-      tmp = ::CIAO::NDDS::DDS_TypeSupport_i::unregister_type(dp1.in(), type1);
-
-      if (tmp)
-        {
-          ACE_DEBUG ((LM_DEBUG, "OK - Unregistered type <%C> for DP1 could be unregistered\n",
-                    type1));
-        }
-      else
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR - Unregistered type <%C> for DP1 could not be unregistered\n",
-                    type1));
-          ++ret;
-        }
-      /// DP1 should now contain two type-factory combinations
-
-      /// Call Close on TypeSupport. This should remove the last remaining entries.
-      ::CIAO::NDDS::DDS_TypeSupport_i::close();
-
-      /// Unregister the type and domain participant which should be removed by 'close'
-      tmp = ::CIAO::NDDS::DDS_TypeSupport_i::unregister_type(dp1.in(), type2);
-
-      if (tmp)
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR - Deleted type <%C> for DP1 could be unregistered\n",
-                    type2));
-          ++ret;
-        }
-      else
-        {
-          ACE_DEBUG ((LM_DEBUG, "OK - Deleted type <%C> for DP1 could not be unregistered\n",
-                    type2));
-        }
-
-      /// Unregister the type and domain participant which should be removed by 'close'
-      tmp = ::CIAO::NDDS::DDS_TypeSupport_i::unregister_type(dp1.in(), type3);
-
-      if (tmp)
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR - Deleted type <%C> for DP1 could be unregistered\n",
-                    type3));
-          ++ret;
-        }
-      else
-        {
-          ACE_DEBUG ((LM_DEBUG, "OK - Deleted type <%C> for DP1 could not be unregistered\n",
-                    type3));
-        }
-
-      /// Since we've invoked ::close f3 has been deleted. Therefor we need to create it again.
-      ACE_NEW_THROW_EX (f3,
-                        TestTypeFactory (),
-                        ::CORBA::NO_MEMORY ());
-
-
-      /// We should now be able to register type 3 again
-      if (::CIAO::NDDS::DDS_TypeSupport_i::register_type(dp1.in(), type3, f3))
-        {
-          ACE_DEBUG ((LM_DEBUG, "OK - Type <%C> and Factory <%@> for DP1 successfully registered\n",
-                    type3, f3));
-        }
-      else
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR - Type <%C> and Factory <%@> for DP1 could not be registered\n",
-                    type3, f3));
-          ++ret;
-        }
-      /// DP1 should now contain one type-factory combination
-
-      /// Call Close on TypeSupport. This should remove the last remaining entries.
-     ::CIAO::NDDS::DDS_TypeSupport_i::close();
-
-      /// No need to delete f1, f2, and f3 since ::close will delete them.
-      pf.delete_participant(dp1);
-      pf.delete_participant(dp2);
-
-#if (CIAO_DDS4CCM_NDDS==1)
-      DDSDomainParticipantFactory::finalize_instance ();
-#endif
-
-    }
-  catch (const ::CORBA::Exception& e)
-    {
-      e._tao_print_exception ("ACE_TMAIN - Caught unexpected "
-                              "CORBA exception\n");
-      return 1;
-    }
-  catch (...)
-    {
-      ACE_ERROR ((LM_ERROR, "ACE_TMAIN - ERROR: Caught unexpected "
-                            "exception\n"));
-      return 1;
-    }
-  if (ret == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG, "Test passed !\n"));
-    }
-  else
-    {
-      ACE_ERROR ((LM_ERROR, "%d errors found during test. \n",
-                  ret));
-    }
-  return ret;
-#else
-  ACE_DEBUG ((LM_DEBUG, "NDDS only test\n"));
-  return 0;
-#endif
-}
diff --git a/CIAO/connectors/dds4ccm/tests/TypeSupport/run_test.pl b/CIAO/connectors/dds4ccm/tests/TypeSupport/run_test.pl
deleted file mode 100755
index 07573f42369..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TypeSupport/run_test.pl
+++ /dev/null
@@ -1,27 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-     & eval 'exec perl -S $0 $argv:q'
-     if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{ACE_ROOT}/bin";
-use PerlACE::TestTarget;
-
-my $program = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
-
-$PROG = $program->CreateProcess ("typesupport_test", "");
-$program_status = $PROG->SpawnWaitKill ($program->ProcessStartWaitInterval());
-
-if ($program_status != 0) {
-    print STDERR "ERROR: typesupport_test returned $program_status\n";
-    exit 1;
-}
-
-$exit_status = $PROG->WaitKill ($program->ProcessStopWaitInterval());
-
-if ($exit_status != 0) {
-    print STDERR "ERROR: typesupport_test returned $server_status\n";
-    $status = 1;
-}
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/.gitignore b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl
deleted file mode 100644
index 42a3dad6ae0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file Unkeyed_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef UNKEYED_TEST_BASE_IDL
-#define UNKEYED_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/Unkeyed_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/Unkeyed_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "UnkeyedTest"
-
-struct UnkeyedTest {
-  string key;
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<UnkeyedTest> UnkeyedTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc
deleted file mode 100644
index a82c8c37555..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_Unkeyed_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_Unkeyed_Test_Base_stub
-  dynamicflags += UNKEYED_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=UNKEYED_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=Unkeyed_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    Unkeyed_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=UNKEYED_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    Unkeyed_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/.gitignore
deleted file mode 100644
index 1d95bf64721..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/Unkeyed_Test_ConnectorE.idl
-/Unkeyed_Test_Connector_conn.cpp
-/Unkeyed_Test_Connector_conn.h
-/Unkeyed_Test_Connector_conn_export.h
-/Unkeyed_Test_Connector_lem_stub_export.h
-/Unkeyed_Test_Connector_stub_export.h
-/Unkeyed_Test_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.idl
deleted file mode 100644
index 807df77e543..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file Unkeyed_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef UNKEYED_TEST_CONNECTOR_IDL_
-#define UNKEYED_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Unkeyed_Test_Base.idl"
-
-#pragma ciao lem "Connector/Unkeyed_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/Unkeyed_Test_BaseTypeSupport.idl"
-#endif
-
-module Unkeyed_Test
-{
-  module ::CCM_DDS::Typed < ::UnkeyedTest, ::UnkeyedTestSeq> UnkeyedTestConnector;
-};
-
-#endif /* Unkeyed_Test_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc
deleted file mode 100644
index 3a7a7dc1310..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc
+++ /dev/null
@@ -1,146 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_Unkeyed_Test_Base -l .. -o ../lib -u DDS Unkeyed_Test_Connector"
-
-project(DDS_Unkeyed_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_Unkeyed_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=UNKEYED_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=Unkeyed_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=UNKEYED_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=Unkeyed_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=UNKEYED_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=Unkeyed_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=UNKEYED_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Unkeyed_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Unkeyed_Test_Connector.idl
-  }
-}
-
-project(DDS_Unkeyed_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_Unkeyed_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=UNKEYED_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=Unkeyed_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    Unkeyed_Test_ConnectorE.idl
-  }
-}
-
-project(DDS_Unkeyed_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_Unkeyed_Test_Connector_lem_gen DDS_Unkeyed_Test_Connector_stub \
-           DDS_Unkeyed_Test_Base_stub
-  libs  += DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Unkeyed_Test_Connector_lem_stub
-  dynamicflags += UNKEYED_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Unkeyed_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    Unkeyed_Test_ConnectorEC.h
-    Unkeyed_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Unkeyed_Test_ConnectorEC.inl
-  }
-}
-
-project(DDS_Unkeyed_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_Unkeyed_Test_Connector_idl_gen DDS_Unkeyed_Test_Base_stub
-  libs  += DDS_Unkeyed_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Unkeyed_Test_Connector_stub
-  dynamicflags += UNKEYED_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Unkeyed_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    Unkeyed_Test_ConnectorC.h
-    Unkeyed_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    Unkeyed_Test_ConnectorC.inl
-  }
-}
-
-project(DDS_Unkeyed_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_Unkeyed_Test_Connector_lem_stub DDS_Unkeyed_Test_Connector_stub \
-             DDS_Unkeyed_Test_Base_stub
-  sharedname = DDS_Unkeyed_Test_Connector_exec
-  libs += DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Connector_lem_stub \
-          DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += UNKEYED_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Unkeyed_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    Unkeyed_Test_Connector_conn.h
-    Unkeyed_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_Unkeyed_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_Unkeyed_Test_Connector_lem_stub DDS_Unkeyed_Test_Connector_exec \
-                DDS_Unkeyed_Test_Connector_stub
-  sharedname  = DDS_Unkeyed_Test_Connector_svnt
-  libs       += DDS_Unkeyed_Test_Connector_stub \
-                DDS_Unkeyed_Test_Connector_lem_stub  \
-                DDS_Unkeyed_Test_Base_stub \
-                DDS_Unkeyed_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += UNKEYED_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Unkeyed_Test_ConnectorS.cpp
-    Unkeyed_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    Unkeyed_Test_ConnectorS.h
-    Unkeyed_Test_Connector_svnt.h
-    Unkeyed_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/README b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/README
deleted file mode 100644
index 8a26966f186..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/README
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-UnkeyedSamples consists of a Sender and a Receiver.
-The Sender writes samples unkeyed; the Receiver should
-receive the same number of samples. An error is printed
-when this isn't the case.
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/.gitignore b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/.gitignore
deleted file mode 100644
index 4829caba63b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/Receiver_exec_export.h
-/Receiver_lem_stub_export.h
-/Receiver_stub_export.h
-/Receiver_svnt_export.h
-/Unkeyed_Test_ReceiverE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.idl
deleted file mode 100644
index 45c30460219..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/Unkeyed_Test_Connector.idl"
-
-module Unkeyed_Test
-{
-  component Receiver
-  {
-    port UnkeyedTestConnector::DDS_Listen info_out;
-    provides CCM_DDS::ConnectorStatusListener info_out_connector_status;
-    attribute unsigned short iterations;
-    attribute unsigned short keys;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc
deleted file mode 100644
index 8afc8d0bf79..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc
+++ /dev/null
@@ -1,136 +0,0 @@
-project(DDS_Unkeyed_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_Unkeyed_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h \
-              -I..
-
-  IDL_Files {
-    Unkeyed_Test_Receiver.idl
-  }
-}
-
-project(DDS_Unkeyed_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_Unkeyed_Test_Receiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    Unkeyed_Test_ReceiverE.idl
-  }
-}
-
-project(DDS_Unkeyed_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_Unkeyed_Test_Receiver_lem_gen DDS_Unkeyed_Test_Receiver_stub  DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Base_stub
-  libs  +=  Receiver_stub DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Unkeyed_Test_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    Unkeyed_Test_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Unkeyed_Test_ReceiverEC.inl
-  }
-}
-
-project(DDS_Unkeyed_Test_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_Unkeyed_Test_Receiver_idl_gen  DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Connector_lem_gen
-  libs  += DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Unkeyed_Test_ReceiverC.cpp
-  }
-
-  Header_Files {
-    Unkeyed_Test_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    Unkeyed_Test_ReceiverC.inl
-  }
-}
-
-project(DDS_Unkeyed_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_Unkeyed_Test_Receiver_lem_stub DDS_Unkeyed_Test_Receiver_stub DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Connector_lem_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Unkeyed_Test_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    Unkeyed_Test_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_Unkeyed_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_Unkeyed_Test_Receiver_lem_stub DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Connector_svnt DDS_Unkeyed_Test_Receiver_exec DDS_Unkeyed_Test_Connector_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Connector_svnt Receiver_exec DDS_Unkeyed_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Unkeyed_Test_ReceiverS.cpp
-    Unkeyed_Test_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    Unkeyed_Test_ReceiverS.h
-    Unkeyed_Test_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp
deleted file mode 100644
index e5c788e651b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp
+++ /dev/null
@@ -1,370 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "Unkeyed_Test_Receiver_exec.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-namespace CIAO_Unkeyed_Test_Receiver_Impl
-{
-
-  /**
-   * Facet Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  info_out_data_listener_exec_i::info_out_data_listener_exec_i (
-        ::Unkeyed_Test::CCM_Receiver_Context_ptr ctx,
-        Atomic_ULong &received)
-    : ciao_context_ (
-        ::Unkeyed_Test::CCM_Receiver_Context::_duplicate (ctx))
-      , received_ (received)
-      , handle_ (DDS::HANDLE_NIL)
-  {
-  }
-
-  info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::Unkeyed_Test::UnkeyedTestConnector::Listener
-
-  void
-  info_out_data_listener_exec_i::on_one_data (const ::UnkeyedTest & datum,
-  const ::CCM_DDS::ReadInfo & info)
-  {
-    // From the first sample store the instance handle, the handle should be
-    // nil (RTI DDS) or stay the same (OpenDDS)
-    if (this->received_ == 0)
-      {
-        this->handle_ = info.instance_handle;
-      }
-    ++this->received_;
-
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("UnkeyedTest_Listener: ")
-            ACE_TEXT ("received keyed_test_info for <%C> at iteration <%u> for handle ")
-            DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER
-            ACE_TEXT ("\n"),
-            datum.key.in (),
-            datum.iteration,
-            DDS_INSTANCE_HANDLE_LOG (info.instance_handle)));
-    if ((info.instance_handle != ::DDS::HANDLE_NIL) &&
-        (this->handle_.value () != info.instance_handle))
-      {
-        ACE_ERROR ((LM_ERROR,
-                ACE_TEXT ("ERROR: UnkeyedTest_Listener::on_one_data: ")
-                ACE_TEXT ("received instance handle ")
-                DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER
-                ACE_TEXT (" should be nil or stay the same ")
-                ACE_TEXT ("for unkeyed data ")
-                ACE_TEXT ("key <%C> - iteration <%u>\n"),
-                DDS_INSTANCE_HANDLE_LOG (info.instance_handle),
-                datum.key.in (),
-                datum.iteration));
-      }
-    if (info.source_timestamp.sec == 0 &&
-        info.source_timestamp.nanosec == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: UnkeyedTest_Listener::on_one_data: "
-                            "source timestamp seems to be invalid (nil) "
-                            "key <%C> - iteration <%d>\n",
-                            datum.key.in (),
-                            datum.iteration));
-      }
-  }
-
-  void
-  info_out_data_listener_exec_i::on_many_data (const ::UnkeyedTestSeq & /* data */,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_status_exec_i
-   */
-
-  info_out_status_exec_i::info_out_status_exec_i (
-        ::Unkeyed_Test::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::Unkeyed_Test::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_status_exec_i::~info_out_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_connector_status_exec_i
-   */
-
-  info_out_connector_status_exec_i::info_out_connector_status_exec_i (
-        ::Unkeyed_Test::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::Unkeyed_Test::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_connector_status_exec_i::~info_out_connector_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-
-  void
-  info_out_connector_status_exec_i::on_inconsistent_topic (::DDS::Topic_ptr /* the_topic */,
-  const ::DDS::InconsistentTopicStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_requested_incompatible_qos (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedIncompatibleQosStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_sample_rejected (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleRejectedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_offered_deadline_missed (::DDS::DataWriter_ptr /* the_writer */,
-  const ::DDS::OfferedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_offered_incompatible_qos (::DDS::DataWriter_ptr /* the_writer */,
-  const ::DDS::OfferedIncompatibleQosStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_unexpected_status (::DDS::Entity_ptr /* the_entity */,
-  ::DDS::StatusKind /* status_kind */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : iterations_ (10)
-      , keys_ (3)
-      , received_ (0)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-
-  // Component attributes and port operations.
-
-  ::Unkeyed_Test::UnkeyedTestConnector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_out_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ()))
-      {
-        info_out_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_data_listener_exec_i (
-            this->ciao_context_.in (),
-            this->received_),
-            ::Unkeyed_Test::UnkeyedTestConnector::CCM_Listener::_nil ());
-
-          this->ciao_info_out_data_listener_ = tmp;
-      }
-
-    return
-      ::Unkeyed_Test::UnkeyedTestConnector::CCM_Listener::_duplicate (
-        this->ciao_info_out_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ()))
-      {
-        info_out_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_out_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_out_status_.in ());
-  }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Receiver_exec_i::get_info_out_connector_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_connector_status_.in ()))
-      {
-        info_out_connector_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_connector_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_ConnectorStatusListener::_nil ());
-
-          this->ciao_info_out_connector_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_ConnectorStatusListener::_duplicate (
-        this->ciao_info_out_connector_status_.in ());
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Receiver_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Receiver_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Unkeyed_Test::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    ::CCM_DDS::DataListenerControl_var lc =
-      this->ciao_context_->get_connection_info_out_data_control ();
-
-    if (::CORBA::is_nil (lc.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Error:  Listener control receptacle is null!\n")));
-        throw ::CORBA::INTERNAL ();
-      }
-
-    lc->mode (::CCM_DDS::ONE_BY_ONE);
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    ::CORBA::ULong expected = this->keys_ * this->iterations_;
-    ACE_DEBUG ((LM_INFO, "Receiver_exec_i summary: received <%u>\n",
-                this->received_.value ()));
-
-    if (this->received_.value () != expected)
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::ccm_remove - "
-                  "ERROR: Unexpected number of samples received: "
-                  "expected <%u> - received <%u>\n",
-                  expected,
-                  this->received_.value ()));
-      }
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Unkeyed_Test_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h
deleted file mode 100644
index f238945030d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h
+++ /dev/null
@@ -1,234 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_UNKEYED_TEST_RECEIVER_EXEC_SACODV_H_
-#define CIAO_UNKEYED_TEST_RECEIVER_EXEC_SACODV_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Unkeyed_Test_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_Unkeyed_Test_Receiver_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::ULong > Atomic_ULong;
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, DDS::InstanceHandle_t > Atomic_Handle;
-
-  /**
-   * Provider Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  class info_out_data_listener_exec_i
-    : public virtual ::Unkeyed_Test::UnkeyedTestConnector::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_data_listener_exec_i (
-      ::Unkeyed_Test::CCM_Receiver_Context_ptr ctx,
-      Atomic_ULong &);
-    virtual ~info_out_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from Unkeyed_Test::UnkeyedTestConnector::Listener. */
-
-    virtual
-    void on_one_data (const ::UnkeyedTest & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (const ::UnkeyedTestSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    ::Unkeyed_Test::CCM_Receiver_Context_var ciao_context_;
-    Atomic_ULong &received_;
-    Atomic_Handle handle_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_status_exec_i
-   */
-
-  class info_out_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_status_exec_i (
-      ::Unkeyed_Test::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::Unkeyed_Test::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_connector_status_exec_i
-   */
-
-  class info_out_connector_status_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_connector_status_exec_i (
-      ::Unkeyed_Test::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_connector_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-    const ::DDS::InconsistentTopicStatus & status);
-
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedIncompatibleQosStatus & status);
-
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleRejectedStatus & status);
-
-    virtual
-    void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-    const ::DDS::OfferedDeadlineMissedStatus & status);
-
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-    const ::DDS::OfferedIncompatibleQosStatus & status);
-
-    virtual
-    void on_unexpected_status (::DDS::Entity_ptr the_entity,
-    ::DDS::StatusKind status_kind);
-    //@}
-
-  private:
-    ::Unkeyed_Test::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::Unkeyed_Test::UnkeyedTestConnector::CCM_Listener_ptr
-    get_info_out_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_status (void);
-
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_info_out_connector_status (void);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-
-    //@}
-
-  private:
-    ::Unkeyed_Test::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::Unkeyed_Test::UnkeyedTestConnector::CCM_Listener_var ciao_info_out_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_;
-    ::CCM_DDS::CCM_ConnectorStatusListener_var ciao_info_out_connector_status_;
-
-    ::CORBA::UShort iterations_;
-
-    ::CORBA::UShort keys_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    Atomic_ULong received_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Unkeyed_Test_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/.gitignore b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/.gitignore
deleted file mode 100644
index d02ac4819e3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/Sender_exec_export.h
-/Sender_lem_stub_export.h
-/Sender_stub_export.h
-/Sender_svnt_export.h
-/Unkeyed_Test_SenderE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.idl
deleted file mode 100644
index aa31f073a0f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_KEYED_TEST_SENDER_IDL
-#define DDS_KEYED_TEST_SENDER_IDL
-
-#include "Connector/Unkeyed_Test_Connector.idl"
-
-module Unkeyed_Test
-{
-  component Sender
-  {
-    port UnkeyedTestConnector::DDS_Write info_write;
-    provides CCM_DDS::ConnectorStatusListener test_topic_connector_status;
-    attribute unsigned short rate;
-    attribute unsigned short iterations;
-    attribute unsigned short keys;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc
deleted file mode 100644
index 413980d9e47..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc
+++ /dev/null
@@ -1,138 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_Unkeyed_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_Unkeyed_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_Unkeyed_Test_Connector_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I..
-
-  IDL_Files {
-    Unkeyed_Test_Sender.idl
-  }
-}
-
-project(DDS_Unkeyed_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_Unkeyed_Test_Sender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    Unkeyed_Test_SenderE.idl
-  }
-}
-
-project(DDS_Unkeyed_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_Unkeyed_Test_Sender_lem_gen DDS_Unkeyed_Test_Sender_stub DDS_Unkeyed_Test_Base_stub
-  libs  += DDS_Unkeyed_Test_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Unkeyed_Test_SenderEC.cpp
-  }
-
-  Header_Files {
-    Unkeyed_Test_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Unkeyed_Test_SenderEC.inl
-  }
-}
-
-project(DDS_Unkeyed_Test_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_Unkeyed_Test_Sender_idl_gen DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Connector_stub
-  libs  += DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Unkeyed_Test_SenderC.cpp
-  }
-
-  Header_Files {
-    Unkeyed_Test_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    Unkeyed_Test_SenderC.inl
-  }
-}
-
-project(DDS_Unkeyed_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_Unkeyed_Test_Sender_lem_stub DDS_Unkeyed_Test_Sender_stub DDS_Unkeyed_Test_Connector_lem_stub DDS_Unkeyed_Test_Connector_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Connector_lem_stub DDS_Unkeyed_Test_Connector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Unkeyed_Test_Sender_exec.cpp
-  }
-
-  Header_Files {
-    Unkeyed_Test_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_Unkeyed_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_Unkeyed_Test_Base_stub  DDS_Unkeyed_Test_Sender_lem_stub DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Connector_svnt  DDS_Unkeyed_Test_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Connector_svnt DDS_Unkeyed_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Unkeyed_Test_SenderS.cpp
-    Unkeyed_Test_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    Unkeyed_Test_SenderS.h
-    Unkeyed_Test_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.cpp
deleted file mode 100644
index fd7ac4b155e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.cpp
+++ /dev/null
@@ -1,324 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "Unkeyed_Test_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_Unkeyed_Test_Sender_Impl
-{
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (
-    Sender_exec_i &callback)
-      : callback_ (callback)
-  {
-  }
-
-  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic (
-    ::DDS::Topic_ptr /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status(
-    ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind status_kind)
-  {
-    if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS)
-      {
-        this->callback_.start ();
-      }
-  }
-
-  /**
-   * Write action generator
-   */
-  pulse_Generator::pulse_Generator (Sender_exec_i &callback)
-    : pulse_callback_ (callback)
-  {
-  }
-
-  int
-  pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    // Notify the subscribers
-    this->pulse_callback_.tick ();
-    return 0;
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : rate_ (1)
-      , iterations_ (10)
-      , keys_ (3)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      pulse_Generator (*this),
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Sender_exec_i::tick ()
-  {
-    ::Unkeyed_Test::UnkeyedTestConnector::Writer_var writer
-      = this->ciao_context_->get_connection_info_write_data ();
-
-    if (this->last_key != this->ktests_.end ())
-      {
-        try
-          {
-            ++this->last_key->second->iteration;
-            writer->write_one (this->last_key->second, ::DDS::HANDLE_NIL);
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Written key <%C> with <%d>\n"),
-                    this->last_key->first.c_str (),
-                    this->last_key->second->iteration));
-          }
-        catch (const CCM_DDS::NonExistent& )
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Key info for <%C> not updated: <%C> didn't exist.\n"),
-                        this->last_key->first.c_str (), this->last_key->first.c_str ()));
-          }
-        catch (const CCM_DDS::InternalError& )
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error while updating key info for <%C>.\n"),
-                        this->last_key->first.c_str ()));
-          }
-        ++this->last_key;
-      }
-    else
-      {
-        // onto the next iteration
-        this->last_key = this->ktests_.begin ();
-        while (this->last_key != this->ktests_.end ())
-          {
-            if (this->last_key->second->iteration == this->iterations_)
-              {
-                //next key
-                ++this->last_key;
-              }
-            else
-              {
-                break;
-              }
-          }
-      }
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    // Calculate the interval time
-    long const usec = 1000000 / this->rate_;
-    if (this->reactor ()->schedule_timer (
-                this->ticker_,
-                0,
-                ACE_Time_Value (0, usec),
-                ACE_Time_Value (0, usec)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                              ACE_TEXT ("Error scheduling timer")));
-      }
-  }
-
-  void
-  Sender_exec_i::stop (void)
-  {
-    this->reactor ()->cancel_timer (this->ticker_);
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n")));
-  }
-
-  // Component attributes and port operations.
-
-  ::CORBA::UShort
-  Sender_exec_i::rate (void)
-  {
-    return this->rate_;
-  }
-
-  void
-  Sender_exec_i::rate (
-    const ::CORBA::UShort rate)
-  {
-    this->rate_ = rate;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_test_topic_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i (*this);
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Unkeyed_Test::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-    ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard,
-                        this->mutex_, CORBA::INTERNAL ());
-
-    for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i)
-      {
-        char key[7];
-        UnkeyedTest *new_key = new UnkeyedTest;
-        ACE_OS::sprintf (key, "KEY_%d", i);
-        new_key->key = CORBA::string_dup(key);
-        new_key->iteration = 0;
-
-        this->ktests_[key] = new_key;
-      }
-     this->last_key = this->ktests_.begin ();
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    this->stop ();
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Unkeyed_Test_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.h
deleted file mode 100644
index ef9ae64ec62..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.h
+++ /dev/null
@@ -1,184 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_UNKEYED_TEST_SENDER_EXEC_ENQT0J_H_
-#define CIAO_UNKEYED_TEST_SENDER_EXEC_ENQT0J_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Unkeyed_Test_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-#include <map>
-
-namespace CIAO_Unkeyed_Test_Sender_Impl
-{
-
-  class Sender_exec_i;
-
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  class SENDER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Sender_exec_i &callback);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-      void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                                 ::DDS::StatusKind status_kind);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Write action generator
-   */
-  class pulse_Generator :
-    public ACE_Event_Handler
-  {
-  public:
-    pulse_Generator (Sender_exec_i &callback);
-
-    virtual int handle_timeout (const ACE_Time_Value &tv, const void *arg);
-
-  private:
-    Sender_exec_i &pulse_callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CORBA::UShort rate (void);
-
-    virtual void rate (::CORBA::UShort rate);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_test_topic_connector_status(void);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void tick (void);
-    void start (void);
-    //@}
-
-  private:
-    ::Unkeyed_Test::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-
-    ::CORBA::UShort rate_;
-
-    ::CORBA::UShort iterations_;
-
-    ::CORBA::UShort keys_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    pulse_Generator * ticker_;
-
-    TAO_SYNCH_MUTEX mutex_;
-    typedef std::map<ACE_CString, UnkeyedTest_var> Unkeyed_Test_Table;
-    Unkeyed_Test_Table ktests_;
-    Unkeyed_Test_Table::iterator last_key;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void stop (void);
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Unkeyed_Test_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/Plan.cdp
deleted file mode 100644
index 6c5731e08f8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/Plan.cdp
+++ /dev/null
@@ -1,424 +0,0 @@
-<!--  -->
-<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>Unkeyed_Test_Depl_1</label>
-  <UUID>Unkeyed_Test_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Unkeyed_Test_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Unkeyed_Test_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Unkeyed_Test_ConnectorComponentImplementation">
-    <name>Unkeyed_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Unkeyed_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="Unkeyed_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Unkeyed_Test_UnkeyedTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Unkeyed_Test_UnkeyedTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Unkeyed_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Unkeyed_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Unkeyed_Test_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Unkeyed_Test_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>3</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="Unkeyed_Test_ConnectorComponentInstance">
-    <name>Unkeyed_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Unkeyed_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Unkeyed_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="Unkeyed_Test_ConnectorComponentInstance2">
-    <name>Unkeyed_Test_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Unkeyed_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Unkeyed_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>1</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>3</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Unkeyed_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>_datacontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Unkeyed_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_out_connector_status_receiver</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Unkeyed_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Unkeyed_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>test_topic_connector_status_sender</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>test_topic_connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Unkeyed_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="Unkeyed_Test_Connector_ExecArtifact">
-    <name>Unkeyed_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Unkeyed_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Unkeyed_Test_Connector_SvntArtifact">
-    <name>Unkeyed_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Unkeyed_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Unkeyed_Test_Connector_StubArtifact">
-    <name>Unkeyed_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Unkeyed_Test_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl
deleted file mode 100755
index 87984594507..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 60 seconds to allow task to complete\n";
-sleep (60);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/.gitignore b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl
deleted file mode 100644
index 1b569f4b6d0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * @file Writer_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef WRITER_BASE_IDL
-#define WRITER_BASE_IDL
-
-#pragma ndds typesupport "Base/Writer_BaseSupport.h"
-#pragma opendds typesupport "Base/Writer_BaseTypeSupportImpl.h"
-
-typedef sequence<octet> OctetSeq;
-
-#pragma DCPS_DATA_TYPE "WriterTest"
-
-struct WriterTest {
-  string key;
-  long iteration;
-  OctetSeq data;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<WriterTest> WriterTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc
deleted file mode 100644
index 7805092c82a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_UnkeyedWriterBase_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_UnkeyedWriterBase_stub
-  dynamicflags += WRITER_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=WRITER_BASE_STUB_Export \
-              -Wb,stub_export_include=Writer_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    Writer_Base.idl
-  }
-
-  opendds_ts_flags += --export=WRITER_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    Writer_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl
deleted file mode 100644
index 5969c7d1176..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file Writer_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef WRITER_CONNECTOR_IDL_
-#define WRITER_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Writer_Base.idl"
-
-#pragma ciao lem "Connector/Writer_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/Writer_BaseTypeSupport.idl"
-#endif
-
-module Writer
-{
-  module ::CCM_DDS::Typed < ::WriterTest, ::WriterTestSeq> WriterTestConnector;
-};
-
-#endif /* Writer_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc
deleted file mode 100644
index c4fe5d76d38..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc
+++ /dev/null
@@ -1,146 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_UnkeyedWriterBase -l .. -o ../lib -u DDS Writer_Connector"
-
-project(DDS_UnkeyedWriterConnector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_UnkeyedWriterBase_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=WRITER_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=Writer_Connector_stub_export.h \
-              -Wb,skel_export_macro=WRITER_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=Writer_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=WRITER_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=Writer_Connector_svnt_export.h \
-              -Wb,conn_export_macro=WRITER_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Writer_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Writer_Connector.idl
-  }
-}
-
-project(DDS_UnkeyedWriterConnector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_UnkeyedWriterConnector_idl_gen
-  idlflags += -Wb,stub_export_macro=WRITER_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=Writer_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    Writer_ConnectorE.idl
-  }
-}
-
-project(DDS_UnkeyedWriterConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_UnkeyedWriterConnector_lem_gen DDS_UnkeyedWriterConnector_stub \
-           DDS_UnkeyedWriterBase_stub
-  libs  += DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterConnector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_UnkeyedWriterConnector_lem_stub
-  dynamicflags += WRITER_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    Writer_ConnectorEC.h
-    Writer_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Writer_ConnectorEC.inl
-  }
-}
-
-project(DDS_UnkeyedWriterConnector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_UnkeyedWriterConnector_idl_gen DDS_UnkeyedWriterBase_stub
-  libs  += DDS_UnkeyedWriterBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_UnkeyedWriterConnector_stub
-  dynamicflags += WRITER_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_ConnectorC.cpp
-  }
-
-  Header_Files {
-    Writer_ConnectorC.h
-    Writer_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    Writer_ConnectorC.inl
-  }
-}
-
-project(DDS_UnkeyedWriterConnector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_UnkeyedWriterConnector_lem_stub DDS_UnkeyedWriterConnector_stub \
-             DDS_UnkeyedWriterBase_stub
-  sharedname = DDS_UnkeyedWriterConnector_exec
-  libs += DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterConnector_lem_stub \
-          DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += WRITER_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_Connector_conn.cpp
-  }
-
-  Header_Files {
-    Writer_Connector_conn.h
-    Writer_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_UnkeyedWriterConnector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_UnkeyedWriterConnector_lem_stub DDS_UnkeyedWriterConnector_exec \
-                DDS_UnkeyedWriterConnector_stub
-  sharedname  = DDS_UnkeyedWriterConnector_svnt
-  libs       += DDS_UnkeyedWriterConnector_stub \
-                DDS_UnkeyedWriterConnector_lem_stub  \
-                DDS_UnkeyedWriterBase_stub \
-                DDS_UnkeyedWriterConnector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += WRITER_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_ConnectorS.cpp
-    Writer_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    Writer_ConnectorS.h
-    Writer_Connector_svnt.h
-    Writer_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.idl
deleted file mode 100644
index 2d720fba655..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.idl
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/Writer_Connector.idl"
-
-module Writer
-{
-  component Receiver
-  {
-    port WriterTestConnector::DDS_Listen info_out;
-    attribute unsigned short iterations;
-    attribute unsigned short keys;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc
deleted file mode 100644
index 92d6d3c513d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc
+++ /dev/null
@@ -1,136 +0,0 @@
-project(DDS_UnkeyedWriterReceiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_UnkeyedWriterConnector_idl_gen
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h \
-              -I..
-
-  IDL_Files {
-    Writer_Receiver.idl
-  }
-}
-
-project(DDS_UnkeyedWriterReceiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_UnkeyedWriterReceiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    Writer_ReceiverE.idl
-  }
-}
-
-project(DDS_UnkeyedWriterReceiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_UnkeyedWriterReceiver_lem_gen DDS_UnkeyedWriterReceiver_stub  DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterBase_stub
-  libs  +=  Receiver_stub DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    Writer_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Writer_ReceiverEC.inl
-  }
-}
-
-project(DDS_UnkeyedWriterReceiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_UnkeyedWriterReceiver_idl_gen  DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterConnector_lem_gen
-  libs  += DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_ReceiverC.cpp
-  }
-
-  Header_Files {
-    Writer_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    Writer_ReceiverC.inl
-  }
-}
-
-project(DDS_UnkeyedWriterReceiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_UnkeyedWriterReceiver_lem_stub DDS_UnkeyedWriterReceiver_stub DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterConnector_lem_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterConnector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    Writer_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_UnkeyedWriterReceiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_UnkeyedWriterReceiver_lem_stub DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterConnector_svnt DDS_UnkeyedWriterReceiver_exec DDS_UnkeyedWriterConnector_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterConnector_svnt Receiver_exec DDS_UnkeyedWriterConnector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_ReceiverS.cpp
-    Writer_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    Writer_ReceiverS.h
-    Writer_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp
deleted file mode 100644
index dd94ab6a7d9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp
+++ /dev/null
@@ -1,267 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "Writer_Receiver_exec.h"
-
-namespace CIAO_Writer_Receiver_Impl
-{
-
-  /**
-   * Facet Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  info_out_data_listener_exec_i::info_out_data_listener_exec_i (
-        ::Writer::CCM_Receiver_Context_ptr ctx,
-        const ::CORBA::UShort iterations,
-        Atomic_ULong &samples_received)
-    : ciao_context_ (
-        ::Writer::CCM_Receiver_Context::_duplicate (ctx))
-      , iterations_ (iterations)
-      , samples_received_ (samples_received)
-  {
-  }
-
-  info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::Writer::WriterTestConnector::Listener
-
-  void
-  info_out_data_listener_exec_i::on_one_data (const ::WriterTest & datum,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    ++this->samples_received_;
-    ACE_DEBUG ((LM_ERROR, ACE_TEXT ("WriterTest_Listener::on_one_data ")
-            ACE_TEXT ("received writer info for <%C> at %u\n"),
-            datum.key.in (),
-            datum.iteration));
-    if (datum.iteration > this->iterations_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: received iteration ")
-                        ACE_TEXT ("greater than expected : ")
-                        ACE_TEXT ("expected <%u> - received <%u>\n"),
-                        this->iterations_, datum.iteration));
-      }
-    if (datum.iteration == 0)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: received iteration ")
-                        ACE_TEXT ("is zero\n")));
-      }
-  }
-
-  void
-  info_out_data_listener_exec_i::on_many_data (const ::WriterTestSeq & /* data */,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("WriterTest_Listener: ")
-            ACE_TEXT ("on_many_data has been called.\n")));
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_status_exec_i
-   */
-
-  info_out_status_exec_i::info_out_status_exec_i (
-        ::Writer::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::Writer::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_status_exec_i::~info_out_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : iterations_ (10)
-      , keys_ (5)
-      , samples_received_ (0)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-
-  // Component attributes and port operations.
-
-  ::Writer::WriterTestConnector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_out_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ()))
-      {
-        info_out_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_data_listener_exec_i (
-            this->ciao_context_.in (),
-            this->iterations () * this->keys (),
-            this->samples_received_),
-            ::Writer::WriterTestConnector::CCM_Listener::_nil ());
-
-          this->ciao_info_out_data_listener_ = tmp;
-      }
-
-    return
-      ::Writer::WriterTestConnector::CCM_Listener::_duplicate (
-        this->ciao_info_out_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ()))
-      {
-        info_out_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_out_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_out_status_.in ());
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Receiver_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Receiver_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Writer::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    ::CCM_DDS::DataListenerControl_var lc =
-    this->ciao_context_->get_connection_info_out_data_control ();
-
-    if (::CORBA::is_nil (lc.in ()))
-      {
-        ACE_ERROR ((LM_INFO, ACE_TEXT ("Error:  Listener control receptacle is null!\n")));
-        throw ::CORBA::INTERNAL ();
-      }
-    lc->mode (::CCM_DDS::ONE_BY_ONE);
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    if (this->samples_received_ != 2 * this->keys_ * this->iterations_)
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::ccm_remove - "
-                  "ERROR: Did not receive the expected number of samples: "
-                  "expected <%u> - received <%u>\n",
-                  2 * this->keys_ * this->iterations_,
-                  this->samples_received_.value ()));
-      }
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Writer_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.h
deleted file mode 100644
index 263b91d30cc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.h
+++ /dev/null
@@ -1,185 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_WRITER_RECEIVER_EXEC_00RRKG_H_
-#define CIAO_WRITER_RECEIVER_EXEC_00RRKG_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Writer_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_Writer_Receiver_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::ULong> Atomic_ULong;
-
-  /**
-   * Provider Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  class info_out_data_listener_exec_i
-    : public virtual ::Writer::WriterTestConnector::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_data_listener_exec_i (
-      ::Writer::CCM_Receiver_Context_ptr ctx,
-      const ::CORBA::UShort iterations,
-      Atomic_ULong &samples_received);
-    virtual ~info_out_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from Writer::WriterTestConnector::Listener. */
-
-    virtual
-    void on_one_data (const ::WriterTest & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (const ::WriterTestSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    ::Writer::CCM_Receiver_Context_var ciao_context_;
-    const ::CORBA::UShort iterations_;
-    Atomic_ULong &samples_received_;
-
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_status_exec_i
-   */
-
-  class info_out_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_status_exec_i (
-      ::Writer::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::Writer::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::Writer::WriterTestConnector::CCM_Listener_ptr
-    get_info_out_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_status (void);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-
-    //@}
-
-  private:
-    ::Writer::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::Writer::WriterTestConnector::CCM_Listener_var ciao_info_out_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_;
-
-    ::CORBA::UShort iterations_;
-
-    ::CORBA::UShort keys_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    Atomic_ULong samples_received_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Writer_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl
deleted file mode 100644
index 64984e084f9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_KEYED_TEST_SENDER_IDL
-#define DDS_KEYED_TEST_SENDER_IDL
-
-#include "Connector/Writer_Connector.idl"
-
-module Writer
-{
-  component Sender
-  {
-    port WriterTestConnector::DDS_Write info_write;
-    provides CCM_DDS::ConnectorStatusListener connector_status;
-
-    attribute unsigned short rate;
-    attribute unsigned short iterations;
-    attribute unsigned short keys;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc
deleted file mode 100644
index 34c6a6563d3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc
+++ /dev/null
@@ -1,138 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_UnkeyedWriterBase -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_UnkeyedWriterSender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_UnkeyedWriterConnector_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I ..
-
-  IDL_Files {
-    Writer_Sender.idl
-  }
-}
-
-project(DDS_UnkeyedWriterSender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_UnkeyedWriterSender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    Writer_SenderE.idl
-  }
-}
-
-project(DDS_UnkeyedWriterSender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_UnkeyedWriterSender_lem_gen DDS_UnkeyedWriterSender_stub DDS_UnkeyedWriterBase_stub
-  libs  += DDS_UnkeyedWriterBase_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_SenderEC.cpp
-  }
-
-  Header_Files {
-    Writer_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Writer_SenderEC.inl
-  }
-}
-
-project(DDS_UnkeyedWriterSender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_UnkeyedWriterSender_idl_gen DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterConnector_stub
-  libs  += DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterConnector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_SenderC.cpp
-  }
-
-  Header_Files {
-    Writer_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    Writer_SenderC.inl
-  }
-}
-
-project(DDS_UnkeyedWriterSender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_UnkeyedWriterSender_lem_stub DDS_UnkeyedWriterSender_stub DDS_UnkeyedWriterConnector_lem_stub DDS_UnkeyedWriterConnector_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterConnector_lem_stub DDS_UnkeyedWriterConnector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_Sender_exec.cpp
-  }
-
-  Header_Files {
-    Writer_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_UnkeyedWriterSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_UnkeyedWriterBase_stub  DDS_UnkeyedWriterSender_lem_stub DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterConnector_svnt  DDS_UnkeyedWriterConnector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterConnector_svnt DDS_UnkeyedWriterConnector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_SenderS.cpp
-    Writer_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    Writer_SenderS.h
-    Writer_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp
deleted file mode 100644
index 0b7d48b8c3a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp
+++ /dev/null
@@ -1,465 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "Writer_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_Writer_Sender_Impl
-{
-  /**
-   * ConnectorStatusListener_exec_i
-   */
-
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (
-    Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic (
-    ::DDS::Topic_ptr /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status(
-    ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind status_kind)
-  {
-    if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS)
-      {
-        ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_unexpected_status - "
-          "Publication matched received: starting the test\n"));
-
-        this->callback_.get_started ();
-      }
-  }
-
-  /**
-   * Pulse Generator
-   */
-
-  pulse_Generator::pulse_Generator (Sender_exec_i &callback)
-    : pulse_callback_ (callback)
-  {
-  }
-
-  int
-  pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    // Notify the subscribers
-    this->pulse_callback_.tick ();
-    return 0;
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : rate_ (1)
-      , iterations_ (15)
-      , keys_ (5)
-      , assignment_ (WRITE_UNKEYED)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      pulse_Generator (*this),
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i  (*this);
-  }
-
-  void
-  Sender_exec_i::reset_iterations ()
-  {
-    for (Writer_Table::iterator i = this->ktests_.begin ();
-         i != this->ktests_.end ();
-         ++i)
-      {
-        i->second->iteration = 0;
-      }
-  }
-
-  void
-  Sender_exec_i::start_new_assignment (WRITER_ASSIGNMENT assignment)
-  {
-    this->last_key = this->ktests_.begin ();
-    this->assignment_ = assignment;
-    reset_iterations ();
-  }
-
-  void
-  Sender_exec_i::write_unkeyed ()
-  {
-    if (this->last_key != this->ktests_.end ())
-      {
-        try
-          {
-            ::Writer::WriterTestConnector::Writer_var writer =
-              this->ciao_context_->get_connection_info_write_data ();
-
-            ++this->last_key->second->iteration;
-            OctetSeq_var reply_mesg = new OctetSeq (1);
-            reply_mesg->length (1);
-            this->last_key->second->data = reply_mesg;
-            writer->write_one (this->last_key->second, ::DDS::HANDLE_NIL);
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Written keyed <%C> - iteration <%d>\n"),
-                    this->last_key->first.c_str (),
-                    this->last_key->second->iteration));
-          }
-        catch (const CCM_DDS::InternalError& )
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                        ACE_TEXT ("while updating writer info for <%C>.\n"),
-                          this->last_key->first.c_str ()));
-          }
-        ++this->last_key;
-      }
-    else
-      {
-        //onto the next iteration
-        this->last_key = this->ktests_.begin ();
-        while (this->last_key != this->ktests_.end ())
-          {
-            if (this->last_key->second->iteration == this->iterations_)
-              {
-                //next key
-                ++this->last_key;
-              }
-            else
-              {
-                break;
-              }
-          }
-        if (this->last_key == this->ktests_.end ())
-          {
-            start_new_assignment (WRITE_MULTI);
-          }
-      }
-  }
-
-  void
-  Sender_exec_i::write_many ()
-  {
-    CORBA::ULong nr_samples = this->keys_ * this->iterations_;
-    WriterTestSeq write_many_no_excep;
-    write_many_no_excep.length (nr_samples);
-    //write with no exception
-    for (CORBA::ULong i = 1; i < nr_samples + 1; ++i)
-      {
-        WriterTest new_key;
-        new_key.key = CORBA::string_dup("KEY_1");
-        new_key.iteration = i;
-        OctetSeq_var reply_mesg = new OctetSeq (1);
-        reply_mesg->length (1);
-        new_key.data = reply_mesg;
-        write_many_no_excep[i-1] = new_key;
-      }
-    try
-      {
-        ::Writer::WriterTestConnector::Writer_var writer =
-          this->ciao_context_->get_connection_info_write_data ();
-
-        writer->write_many (write_many_no_excep);
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("write_many : written <%u> samples\n"),
-              write_many_no_excep.length ()));
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                    ACE_TEXT ("while write many writer info: index <%d> - retval <%d>\n"),
-                      ex.index, ex.error_code));
-      }
-    start_new_assignment (TEST_EXCEPTION);
-  }
-
-  void
-  Sender_exec_i::test_exception ()
-  {
-    if (this->last_key != this->ktests_.end ())
-      {
-        try
-          {
-            ::Writer::WriterTestConnector::Writer_var writer =
-              this->ciao_context_->get_connection_info_write_data ();
-
-            ++this->last_key->second->iteration;
-            long const length = 100000;
-            OctetSeq_var reply_mesg = new OctetSeq (length);
-            reply_mesg->length (length);
-            this->last_key->second->data = reply_mesg;
-            writer->write_one (this->last_key->second, ::DDS::HANDLE_NIL);
-#if (CIAO_DDS4CCM_NDDS==1)
-            // Sending large amount of data fails with RTI DDS
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: No InternalError ")
-                        ACE_TEXT ("caught while writing a large amount of data.\n")));
-#endif
-          }
-        catch (const CCM_DDS::InternalError& )
-          {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::test_exception: ")
-                        ACE_TEXT ("OK: Expected InternalErr received\n")));
-          }
-        ++this->last_key;
-      }
-    else
-      {
-        //onto the next iteration
-        this->last_key = this->ktests_.begin ();
-        while (this->last_key != this->ktests_.end ())
-          {
-            if (this->last_key->second->iteration == this->iterations_)
-              {
-                //next key
-                ++this->last_key;
-              }
-            else
-              {
-                break;
-              }
-          }
-      }
-    if (this->last_key == this->ktests_.end ())
-      {
-        start_new_assignment (WRITE_NONE);
-      }
-  }
-
-  void
-  Sender_exec_i::tick ()
-  {
-    switch (this->assignment_)
-      {
-        case WRITE_UNKEYED:
-          write_unkeyed ();
-          break;
-        case WRITE_MULTI:
-          write_many ();
-          break;
-        case TEST_EXCEPTION:
-          test_exception ();
-          break;
-        default:
-          break;
-      }
-  }
-
-  void
-  Sender_exec_i::get_started (void)
-  {
-    ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard,
-                        this->mutex_, CORBA::INTERNAL ());
-
-    for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i)
-      {
-        char key[7];
-        WriterTest *new_key = new WriterTest;
-        ACE_OS::sprintf (key, "KEY_%d", i);
-        new_key->key = CORBA::string_dup(key);
-        new_key->iteration = 1;
-
-        this->ktests_[key] = new_key;
-      }
-   this->start ();
-   this->last_key = this->ktests_.begin ();
-   reset_iterations ();
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    // calculate the interval time
-    long const usec = 1000000 / this->rate_;
-    if (this->reactor ()->schedule_timer (
-                this->ticker_,
-                0,
-                ACE_Time_Value (0, usec),
-                ACE_Time_Value (0, usec)) == -1)
-    {
-      ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                             ACE_TEXT ("Error scheduling timer")));
-    }
-  }
-
-  void
-  Sender_exec_i::stop (void)
-  {
-    this->reactor ()->cancel_timer (this->ticker_);
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n")));
-  }
-
-  // Component attributes and port operations.
-
-  ::CORBA::UShort
-  Sender_exec_i::rate (void)
-  {
-    return this->rate_;
-  }
-
-  void
-  Sender_exec_i::rate (
-    const ::CORBA::UShort rate)
-  {
-    this->rate_ = rate;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Writer::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    this->stop ();
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Writer_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.h
deleted file mode 100644
index 33d61634ba2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.h
+++ /dev/null
@@ -1,199 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_WRITER_SENDER_EXEC_ZEYVOW_H_
-#define CIAO_WRITER_SENDER_EXEC_ZEYVOW_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Writer_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-#include <map>
-
-namespace CIAO_Writer_Sender_Impl
-{
-  class Sender_exec_i;
-
-  enum WRITER_ASSIGNMENT {
-    WRITE_NONE,
-    WRITE_UNKEYED,
-    WRITE_MULTI,
-    TEST_EXCEPTION
-  };
-
-  /**
-   * ConnectorStatusListener_exec_i
-   */
-  class SENDER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Sender_exec_i &callback);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-      void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                                 ::DDS::StatusKind status_kind);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Pulse Generator
-   */
-  class pulse_Generator :
-    public ACE_Event_Handler
-  {
-  public:
-    pulse_Generator (Sender_exec_i &callback);
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    Sender_exec_i &pulse_callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_connector_status (void);
-
-    virtual ::CORBA::UShort rate (void);
-
-    virtual void rate (::CORBA::UShort rate);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void tick (void);
-    void get_started (void);
-    //@}
-
-  private:
-    ::Writer::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-
-    ::CORBA::UShort rate_;
-
-    ::CORBA::UShort iterations_;
-
-    ::CORBA::UShort keys_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    pulse_Generator * ticker_;
-
-    WRITER_ASSIGNMENT assignment_;
-
-    TAO_SYNCH_MUTEX mutex_;
-    typedef std::map<ACE_CString, WriterTest_var> Writer_Table;
-    Writer_Table ktests_;
-
-    Writer_Table::iterator last_key;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void start (void);
-    void stop (void);
-
-    void reset_iterations ();
-    void start_new_assignment (
-        WRITER_ASSIGNMENT assignment);
-    void write_unkeyed ();
-    void write_many ();
-    void test_exception ();
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Writer_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp
deleted file mode 100644
index be1f4f951d4..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp
+++ /dev/null
@@ -1,430 +0,0 @@
-<!--  -->
-<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>UnkeyedWriter_Depl_1</label>
-  <UUID>UnkeyedWriter_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Writer_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Writer_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Writer_ConnectorComponentImplementation">
-    <name>Writer_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Writer_Connector_ExecArtifact" />
-    <artifact xmi:idref="Writer_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Writer_WriterTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Writer_WriterTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Writer_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Writer_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Writer_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Writer_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <!-- should be equal to iterations in
-               Sender component -->
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <!-- should be equal to keys in
-               Sender component -->
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="Writer_ConnectorComponentInstance">
-    <name>Writer_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Writer_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>UnkeyedWriter</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-    <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>UnkeyedWriter_Library#UnkeyedWriterProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="Writer_ConnectorComponentInstance2">
-    <name>Writer_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Writer_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>UnkeyedWriter</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>UnkeyedWriter_Library#UnkeyedWriterProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>15</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Writer_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>_datacontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Writer_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Writer_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Writer_ConnectorComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="Writer_Connector_ExecArtifact">
-    <name>Writer_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_UnkeyedWriterConnector_exec</location>
-  </artifact>
-  <artifact xmi:id="Writer_Connector_SvntArtifact">
-    <name>Writer_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_UnkeyedWriterConnector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Writer_Connector_StubArtifact">
-    <name>Writer_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_UnkeyedWriterConnector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index 64605acaa45..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-Description
-XML QoS Profile
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="UnkeyedWriter_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="UnkeyedWriterProfile" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>10</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/UnkeyedWriter_Library.xml b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/UnkeyedWriter_Library.xml
deleted file mode 100644
index ef8ae685b98..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/UnkeyedWriter_Library.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-
-  <qos_profile name="UnkeyedWriterProfile">
-    <!-- QoS used to configure the data writer created in the example code -->
-    <datawriter_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-        <max_blocking_time>
-          <sec>10</sec>
-          <nanosec>0</nanosec>
-        </max_blocking_time>
-      </reliability>
-      <durability>
-        <kind>TRANSIENT_DURABILITY_QOS</kind>
-      </durability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-    </datawriter_qos>
-    <!-- QoS used to configure the data reader created in the example code -->
-    <datareader_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-      </reliability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-      <durability>
-        <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-      </durability>
-    </datareader_qos>
-  </qos_profile>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl
deleted file mode 100755
index 0667f786cde..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 60 seconds to allow task to complete\n";
-sleep (70);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/.gitignore b/CIAO/connectors/dds4ccm/tests/Updater/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Updater/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl b/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl
deleted file mode 100644
index e22773564d7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file Updater_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef UPDATER_BASE_IDL
-#define UPDATER_BASE_IDL
-
-#pragma ndds typesupport "Base/Updater_BaseSupport.h"
-#pragma opendds typesupport "Base/Updater_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "TestTopic"
-#pragma DCPS_DATA_KEY "TestTopic key"
-
-struct TestTopic {
-  string key; //@key
-  long x;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TestTopic> TestTopicSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc b/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc
deleted file mode 100644
index bc2dbfa7185..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_Updater_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_Updater_Base_stub
-  dynamicflags += UPDATER_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=UPDATER_BASE_STUB_Export \
-              -Wb,stub_export_include=Updater_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    Updater_Base.idl
-  }
-
-  opendds_ts_flags += --export=UPDATER_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    Updater_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl b/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl
deleted file mode 100644
index 16452237af8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file Updater_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef UPDATER_CONNECTOR_IDL_
-#define UPDATER_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Updater_Base.idl"
-
-#pragma ciao lem "Connector/Updater_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/Updater_BaseTypeSupport.idl"
-#endif
-
-module Updater
-{
-  module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> UpdaterConnector;
-};
-
-#endif /* UPDATER_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc
deleted file mode 100644
index 825b96d2719..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_Updater_Base -l .. -o ../lib -u DDS Updater_Connector"
-
-project(DDS_UPDATER_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_Updater_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=UPDATER_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=Updater_Connector_stub_export.h \
-              -Wb,skel_export_macro=UPDATER_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=Updater_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=UPDATER_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=Updater_Connector_svnt_export.h \
-              -Wb,conn_export_macro=UPDATER_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Updater_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Updater_Connector.idl
-  }
-}
-
-project(DDS_UPDATER_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_UPDATER_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=UPDATER_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=Updater_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    Updater_ConnectorE.idl
-  }
-}
-
-project(DDS_UPDATER_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_UPDATER_Connector_lem_gen DDS_Updater_Connector_stub DDS_Updater_Base_stub
-  libs  += DDS_Updater_Base_stub DDS_Updater_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_UPDATER_Connector_lem_stub
-  dynamicflags += UPDATER_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Updater_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    Updater_ConnectorEC.h
-    Updater_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Updater_ConnectorEC.inl
-  }
-}
-
-project(DDS_Updater_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_UPDATER_Connector_idl_gen DDS_Updater_Base_stub
-  libs  += DDS_Updater_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Updater_Connector_stub
-  dynamicflags += UPDATER_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Updater_ConnectorC.cpp
-  }
-
-  Header_Files {
-    Updater_ConnectorC.h
-    Updater_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    Updater_ConnectorC.inl
-  }
-}
-
-project(DDS_Updater_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_UPDATER_Connector_lem_stub DDS_Updater_Connector_stub DDS_Updater_Base_stub
-  sharedname = DDS_Updater_Connector_exec
-  libs += DDS_Updater_Connector_stub DDS_UPDATER_Connector_lem_stub DDS_Updater_Base_stub DDS_Updater_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += UPDATER_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Updater_Connector_conn.cpp
-  }
-
-  Header_Files {
-    Updater_Connector_conn.h
-    Updater_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_Updater_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_UPDATER_Connector_lem_stub DDS_Updater_Connector_exec DDS_Updater_Connector_stub
-  sharedname  = DDS_Updater_Connector_svnt
-  libs       += DDS_Updater_Connector_stub \
-                DDS_UPDATER_Connector_lem_stub  \
-                DDS_Updater_Base_stub \
-                DDS_Updater_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += UPDATER_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Updater_ConnectorS.cpp
-    Updater_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    Updater_ConnectorS.h
-    Updater_Connector_svnt.h
-    Updater_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.idl b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.idl
deleted file mode 100644
index 36538eada05..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @file
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/Updater_Connector.idl"
-
-module Updater
-{
-  component Receiver
-  {
-    port UpdaterConnector::DDS_Listen info_out;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc
deleted file mode 100644
index ee8c5815437..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc
+++ /dev/null
@@ -1,136 +0,0 @@
-project(DDS_Updater_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_UPDATER_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h \
-              -I..
-
-  IDL_Files {
-    Updater_Receiver.idl
-  }
-}
-
-project(DDS_Updater_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_Updater_Receiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    Updater_ReceiverE.idl
-  }
-}
-
-project(DDS_UPDATER_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_Updater_Receiver_lem_gen DDS_Updater_Receiver_stub  DDS_Updater_Connector_stub DDS_Updater_Base_stub
-  libs  +=  Receiver_stub DDS_Updater_Connector_stub DDS_Updater_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Updater_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    Updater_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Updater_ReceiverEC.inl
-  }
-}
-
-project(DDS_Updater_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_Updater_Receiver_idl_gen  DDS_Updater_Connector_stub DDS_Updater_Base_stub DDS_UPDATER_Connector_lem_gen
-  libs  += DDS_Updater_Connector_stub DDS_Updater_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Updater_ReceiverC.cpp
-  }
-
-  Header_Files {
-    Updater_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    Updater_ReceiverC.inl
-  }
-}
-
-project(DDS_Updater_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_UPDATER_Receiver_lem_stub DDS_Updater_Receiver_stub DDS_Updater_Base_stub DDS_Updater_Connector_stub DDS_UPDATER_Connector_lem_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_Updater_Base_stub DDS_Updater_Connector_stub DDS_UPDATER_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Updater_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    Updater_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_Updater_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_UPDATER_Receiver_lem_stub DDS_Updater_Base_stub DDS_Updater_Connector_stub DDS_Updater_Connector_svnt DDS_Updater_Receiver_exec DDS_UPDATER_Connector_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_Updater_Base_stub DDS_Updater_Connector_stub DDS_Updater_Connector_svnt Receiver_exec DDS_UPDATER_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Updater_ReceiverS.cpp
-    Updater_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    Updater_ReceiverS.h
-    Updater_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp
deleted file mode 100644
index 4ccbc02a680..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp
+++ /dev/null
@@ -1,278 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "Updater_Receiver_exec.h"
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-namespace CIAO_Updater_Receiver_Impl
-{
-
-  /**
-   * Facet Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  info_out_data_listener_exec_i::info_out_data_listener_exec_i (
-        ::Updater::CCM_Receiver_Context_ptr ctx,
-        ACE_Thread_ID &thread_id)
-    : ciao_context_ (
-        ::Updater::CCM_Receiver_Context::_duplicate (ctx))
-      , thread_id_ (thread_id)
-  {
-  }
-
-  info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::Updater::UpdaterConnector::Listener
-
-  void
-  info_out_data_listener_exec_i::on_one_data (const ::TestTopic & datum,
-  const ::CCM_DDS::ReadInfo & info)
-  {
-    ACE_Thread_ID t_id;
-    this->thread_id_ = t_id;
-
-    ACE_DEBUG ((LM_DEBUG, "ListenOneByOneTest_Listener_exec_i::on_one_data: "
-                            "key <%C> - iteration <%d>\n",
-                            datum.key.in (),
-                            datum.x));
-    if (::DDS::HANDLE_NIL == info.instance_handle)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: ListenOneByOneTest_Listener_exec_i::on_one_data: "
-                            "instance handle seems to be invalid "
-                            "key <%C> - iteration <%d>\n",
-                            datum.key.in (),
-                            datum.x));
-      }
-    if (info.source_timestamp.sec == 0 &&
-        info.source_timestamp.nanosec == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: ListenOneByOneTest_Listener_exec_i::on_one_data: "
-                            "source timestamp seems to be invalid (nil) "
-                            "key <%C> - iteration <%d>\n",
-                            datum.key.in (),
-                            datum.x));
-      }
-  }
-
-  void
-  info_out_data_listener_exec_i::on_many_data (const ::TestTopicSeq & /* data */,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_status_exec_i
-   */
-
-  info_out_status_exec_i::info_out_status_exec_i (
-        ::Updater::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::Updater::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_status_exec_i::~info_out_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : thread_id_listener_ (0, 0)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-
-  // Component attributes and port operations.
-
-  ::Updater::UpdaterConnector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_out_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ()))
-      {
-        info_out_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_data_listener_exec_i (
-            this->ciao_context_.in (),
-            this->thread_id_listener_),
-          ::Updater::UpdaterConnector::CCM_Listener::_nil ());
-
-          this->ciao_info_out_data_listener_ = tmp;
-      }
-
-    return
-      ::Updater::UpdaterConnector::CCM_Listener::_duplicate (
-        this->ciao_info_out_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ()))
-      {
-        info_out_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_out_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_out_status_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Updater::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    ::CCM_DDS::DataListenerControl_var dlc =
-        this->ciao_context_->get_connection_info_out_data_control ();
-    dlc->mode (::CCM_DDS::ONE_BY_ONE);
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    char ccm_buf [65];
-    ACE_Thread_ID ccm_thread_id;
-    ccm_thread_id.to_string (ccm_buf);
-
-    char list_buf [65];
-    this->thread_id_listener_.to_string(list_buf);
-    if (this->thread_id_listener_.id() == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
-                              "Thread ID for ReaderListener not set!\n"));
-      }
-#if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (this->thread_id_listener_ == ccm_thread_id)
-      {
-        ACE_DEBUG ((LM_DEBUG, "ONE_BY_ONE: "
-                              "Thread switch for ReaderListener seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: ONE_BY_ONE: "
-                              "Thread switch for ReaderListener "
-                              "doesn't seem to work! "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-  #else
-      else if (this->thread_id_listener_ == ccm_thread_id)
-        {
-        ACE_ERROR ((LM_ERROR, "ERROR: ONE_BY_ONE: ReaderListener: "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-     }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "ONE_BY_ONE: ReaderListener: "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    #endif
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Updater_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h
deleted file mode 100644
index a96430fb0ed..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h
+++ /dev/null
@@ -1,173 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_UPDATER_RECEIVER_EXEC_P7EWIN_H_
-#define CIAO_UPDATER_RECEIVER_EXEC_P7EWIN_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Updater_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_Updater_Receiver_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
-
-  class Receiver_exec_i;
-
-  /**
-   * Provider Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  class info_out_data_listener_exec_i
-    : public virtual ::Updater::UpdaterConnector::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_data_listener_exec_i (
-      ::Updater::CCM_Receiver_Context_ptr ctx,
-      ACE_Thread_ID &);
-    virtual ~info_out_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from Updater::UpdaterConnector::Listener. */
-
-    virtual
-    void on_one_data (const ::TestTopic & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (const ::TestTopicSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    ::Updater::CCM_Receiver_Context_var ciao_context_;
-    ACE_Thread_ID &thread_id_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_status_exec_i
-   */
-
-  class info_out_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_status_exec_i (
-      ::Updater::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::Updater::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::Updater::UpdaterConnector::CCM_Listener_ptr
-    get_info_out_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_status (void);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-
-    //@}
-
-  private:
-    ::Updater::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::Updater::UpdaterConnector::CCM_Listener_var ciao_info_out_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    ACE_Thread_ID thread_id_listener_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Updater_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.idl b/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.idl
deleted file mode 100644
index 8ae5f432194..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef DDS_UPDATER_SENDER_IDL
-#define DDS_UPDATER_SENDER_IDL
-
-#include "Connector/Updater_Connector.idl"
-
-module Updater
-{
-  component Sender
-  {
-    port UpdaterConnector::DDS_Update test_topic_update;
-    provides CCM_DDS::ConnectorStatusListener connector_status;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc b/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc
deleted file mode 100644
index 83da223de82..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc
+++ /dev/null
@@ -1,138 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_Updater_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_Updater_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_UPDATER_Connector_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I..
-
-  IDL_Files {
-    Updater_Sender.idl
-  }
-}
-
-project(DDS_Updater_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_Updater_Sender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    Updater_SenderE.idl
-  }
-}
-
-project(DDS_Updater_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_Updater_Sender_lem_gen DDS_Updater_Sender_stub DDS_Updater_Base_stub
-  libs  += DDS_Updater_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Updater_SenderEC.cpp
-  }
-
-  Header_Files {
-    Updater_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Updater_SenderEC.inl
-  }
-}
-
-project(DDS_Updater_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_Updater_Sender_idl_gen DDS_Updater_Base_stub DDS_Updater_Connector_stub
-  libs  += DDS_Updater_Base_stub DDS_Updater_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Updater_SenderC.cpp
-  }
-
-  Header_Files {
-    Updater_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    Updater_SenderC.inl
-  }
-}
-
-project(DDS_Updater_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_Updater_Sender_lem_stub DDS_Updater_Sender_stub DDS_UPDATER_Connector_lem_stub DDS_Updater_Connector_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub DDS_Updater_Base_stub DDS_UPDATER_Connector_lem_stub  DDS_Updater_Connector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Updater_Sender_exec.cpp
-  }
-
-  Header_Files {
-    Updater_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_Updater_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_Updater_Base_stub  DDS_Updater_Sender_lem_stub DDS_Updater_Connector_stub DDS_Updater_Connector_svnt DDS_UPDATER_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                DDS_Updater_Base_stub DDS_Updater_Connector_stub  DDS_Updater_Connector_svnt DDS_UPDATER_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Updater_SenderS.cpp
-    Updater_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    Updater_SenderS.h
-    Updater_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp
deleted file mode 100644
index c127816dfdd..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp
+++ /dev/null
@@ -1,773 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "Updater_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-namespace CIAO_Updater_Sender_Impl
-{
-
-  /**
-   * ConnectorStatusListener_exec_i
-   */
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (
-    Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic (
-    ::DDS::Topic_ptr /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status(
-    ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind status_kind)
-  {
-    if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS)
-      {
-        ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_unexpected_status - "
-          "Publication matched received: starting the test\n"));
-
-        this->callback_.get_started ();
-      }
-  }
-
-  /**
-   * Write action generator
-   */
-
-  pulse_Generator::pulse_Generator (Sender_exec_i &callback)
-    : pulse_callback_ (callback)
-  {
-  }
-
-  int
-  pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    // Notify the subscribers
-    this->pulse_callback_.tick ();
-    return 0;
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : test_nr_(UPDATE_CREATE),
-      test_ok_(true)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      pulse_Generator (*this),
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i  (*this);
-  }
-
-  CORBA::Boolean
-  Sender_exec_i::create_one (
-    ::Updater::UpdaterConnector::Updater_ptr updater)
-  {
-    TestTopic i = this->topic_seq_one_[0];
-    try
-      {
-        if (! ::CORBA::is_nil (updater) )
-          {
-            updater->create_one(i);
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Updater: create_one with instance key <%C>\n"),
-                         i.key.in ()));
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: updater_ is nil")));
-            return false;
-          }
-      }
-    catch(const CCM_DDS::AlreadyCreated &)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: AlreadyCreated with test updater create_one <%C>.\n"),
-                        i.key.in ()));
-        return false;
-      }
-    catch (const CCM_DDS::InternalError& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while create_one for <%C>.\n"),
-                        i.key.in ()));
-        return false;;
-      }
-    return true;
-  }
-
-  CORBA::Boolean
-  Sender_exec_i::create_one_already_exist (
-    ::Updater::UpdaterConnector::Updater_ptr updater)
-  {
-    TestTopic i = this->topic_seq_one_[0];
-    //try to create same instance again, this should erase an AlreadyCreated exception
-    try
-      {
-        updater->create_one (i);
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Updater: create_one with already existing instance key <%Cs>\n"),
-                      i.key.in ()));
-      }
-    catch(const CCM_DDS::AlreadyCreated &)
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Expected : Exception AlreadyCreated test updater create_one.\n")));
-        return true;
-      }
-    catch (const CCM_DDS::InternalError &)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while create_one for <%C>.\n"),
-                        i.key.in ()));
-      }
-    return false;
-  }
-
-  CORBA::Boolean
-  Sender_exec_i::update_one (
-    ::Updater::UpdaterConnector::Updater_ptr updater)
-  {
-    //update already created instance with handle nil
-    TestTopic i = this->topic_seq_one_[0];
-    try
-      {
-        updater->update_one(i, DDS::HANDLE_NIL);
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Updater: update_one with already existing instance with DDS::HANDLE_NIL, key <%C>\n"),
-                      i.key.in ()));
-      }
-    catch(const CCM_DDS::NonExistent &)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater update_one <%C>.\n"),
-                       i.key.in ()));
-        return false;
-      }
-    catch (const CCM_DDS::InternalError &)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while update_one for <%C>.\n"),
-                        i.key.in ()));
-        return false;
-      }
-    return true;
-  }
-
-  CORBA::Boolean
-  Sender_exec_i::update_one_not_registered (
-    ::Updater::UpdaterConnector::Updater_ptr updater)
-  {
-    //update a not yet registered instance, expect a NonExistent exception
-     //use second instance of table
-    TestTopic i = this->topic_seq_one_[1];
-    try
-      {
-        updater->update_one(i, DDS::HANDLE_NIL);
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Updater: update_one with unregistered instance, key <%C>\n"),
-                      i.key.in ()));
-      }
-    catch (const CCM_DDS::NonExistent &)
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Expected : Exception NonExistent test updater updater_one.\n")));
-        return true;
-      }
-    catch (const CCM_DDS::InternalError& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while update_one for <%C>.\n"),
-                        i.key.in ()));
-      }
-    return false;
-  }
-
-  CORBA::Boolean
-  Sender_exec_i::delete_one (
-    ::Updater::UpdaterConnector::Updater_ptr updater)
-  {
-    //delete registered instance with DDS::HANDLE_NIL
-    TestTopic i = this->topic_seq_one_[0];
-    try
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Updater: delete_one with registered instance with DDS::HANDLE_NIL, key <%C>\n"),
-                      i.key.in ()));
-        updater->delete_one(i, DDS::HANDLE_NIL);
-      }
-    catch(const CCM_DDS::NonExistent &)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater delete_one <%C>.\n"),
-                       i.key.in ()));
-        return false;
-      }
-    catch (const CCM_DDS::InternalError& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while delete_one for <%C>.\n"),
-                        i.key.in ()));
-        return false;
-      }
-    return true;
-  }
-
-  CORBA::Boolean
-  Sender_exec_i::delete_one_not_registered (
-    ::Updater::UpdaterConnector::Updater_ptr updater)
-  {
-    //delete non-existing instance, expect NonExistent exception
-    TestTopic i = this->topic_seq_one_[1];
-    try
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Updater: delete_one with not registered instance, key <%C>\n"),
-                     i.key.in ()));
-        updater->delete_one(i, DDS::HANDLE_NIL);
-      }
-    catch(const CCM_DDS::NonExistent &)
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Expected : Exception NonExistent test updater delete_one.\n")));
-        return true;
-      }
-    catch (const CCM_DDS::InternalError& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while delete_one for <%C>.\n"),
-                       i.key.in ()));
-      }
-    return false;
-  }
-
-  CORBA::Boolean
-  Sender_exec_i::update_and_delete_one_after_register (
-    ::Updater::UpdaterConnector::Updater_ptr updater)
-  {
-    // Update an instance after registering first, using a handle
-    TestTopic i = this->topic_seq_one_[2];
-    // Take third instance of table
-    DDS::InstanceHandle_t const hnd = updater->register_instance(i);
-    try
-      {
-        if (hnd != ::DDS::HANDLE_NIL)
-          {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Updater: update a new instance after registering instance, key <%C>\n"),
-                        i.key.in ()));
-            updater->update_one(i, hnd);
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("Error, invalid handle for <%C>.\n"),
-                          i.key.in ()));
-            return false;
-          }
-      }
-    catch(const CCM_DDS::NonExistent &)
-      {
-         ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater update_one using handle <%C>.\n"),
-                       i.key.in ()));
-         return false;
-      }
-    catch (const CCM_DDS::InternalError& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while update_one for <%C>.\n"),
-                        i.key.in ()));
-        return false;
-      }
-    //update an instance with an instance_handler belonging to an other instance
-    try
-      {
-        TestTopic y = this->topic_seq_one_[0];
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Updater: update an instance with an instance_handler belonging to an other instance\n")));
-        updater->update_one(y, hnd);
-      }
-    catch(const CCM_DDS::NonExistent &)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater update_one with incompatible datum and handle.\n")));
-        return false;
-      }
-    catch (const CCM_DDS::InternalError& ex )
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Expected : Exception InternalE. test updater update_one with incompatible datum and handle. ex %d\n"),ex.error_code));
-        return true;
-      }
-
-    try
-      {
-         i = this->topic_seq_one_[2];
-         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Updater: delete a instance with handle, key <%C>\n"),
-                    i.key.in ()));
-         updater->delete_one(i, hnd);
-      }
-    catch (const CCM_DDS::NonExistent &)
-      {
-         ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater delett_one with valid handler.\n")));
-         return false;
-      }
-    catch (const CCM_DDS::InternalError& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while delete_one for <%C>.\n"),
-                      i.key.in ()));
-        return false;
-      }
-    return true;
-  }
-
-  CORBA::Boolean
-  Sender_exec_i::create_many (
-    ::Updater::UpdaterConnector::Updater_ptr updater)
-  {
-    //create many with no exception
-    try
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("create_many : <%u> samples\n"),
-                         this->topic_seq_many_.length ()));
-        updater->create_many (this->topic_seq_many_);
-      }
-    catch(const CCM_DDS::NonExistent& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater create_many\n")));
-        return false;
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-         ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                     ACE_TEXT ("in updater: create_many: index <%d> - retval <%d>\n"),
-                     ex.index, ex.error_code));
-        return false;
-    }
-    //test create_many  with AlreadyCreated exception
-
-    try
-      {
-         updater->create_many (this->topic_seq_many_);
-         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("create_many which are already created : <%u> samples\n"),
-                       this->topic_seq_many_.length ()));
-
-      }
-    catch (const CCM_DDS::NonExistent & )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Unexpected Error ")
-                     ACE_TEXT ("in create_many , already created.\n")));
-         return false;
-      }
-    catch (const CCM_DDS::AlreadyCreated & )
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Expected : Exception AlreadyCreated test updater create_many.\n")));
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                     ACE_TEXT ("in test create_many,already created: index <%d> - retval <%d>\n"),
-                     ex.index, ex.error_code));
-        return false;
-      }
-    return true;
-  }
-
-  CORBA::Boolean
-  Sender_exec_i::update_many (
-    ::Updater::UpdaterConnector::Updater_ptr updater)
-  {
-    try
-      {
-        updater->update_many (this->topic_seq_many_);
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("update_many : written <%u> samples\n"),
-                   this->topic_seq_many_.length ()));
-      }
-    catch(const CCM_DDS::NonExistent& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater update_many.\n")));
-        return false;
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                     ACE_TEXT ("with update_many: index <%d> - retval <%d>\n"),
-                     ex.index, ex.error_code));
-        return false;
-      }
-    //update with exception
-    // make from the second and third instances a unregistered instance , see above
-    char key[7];
-    TestTopic test_key;
-    ACE_OS::sprintf (key, "XXX_%d",2);
-    test_key.key = CORBA::string_dup(key);
-    test_key.x = 2;
-    this->topic_seq_many_[1] = test_key;
-    ACE_OS::sprintf (key, "YYY_%d",3);
-    test_key.key = CORBA::string_dup(key);
-    test_key.x = 3;
-    this->topic_seq_many_[2] = test_key;
-    try
-      {
-        updater->update_many (this->topic_seq_many_);
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("create_many : <%u> samples\n"),
-                     this->topic_seq_many_.length ()));
-      }
-    catch (const CCM_DDS::NonExistent & ex)
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Expected : Exception NonExistent test updater update_many.\n"),
-                              ACE_TEXT ("index length expected = 2 and  value = %d, expected index[0] = 1 and value = %d.\n"),
-                              ex.indexes.length(),ex.indexes[0]));
-
-        if (ex.indexes.length() != 2 || ex.indexes[0] != 1 || ex.indexes[1] != 2)
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("create_many:expected exception: NonExistent gives wrong indexes.\n")));
-            return false;
-          }
-        else
-          {
-            return true;
-          }
-      }
-    catch (const CCM_DDS::InternalError& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                    ACE_TEXT ("test update_many with not registered instances\n")));
-      }
-    catch (const CCM_DDS::AlreadyCreated & )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: AlreadyCreated with test update_many with not registered instances.\n")));
-      }
-    return false;
-  }
-
-  CORBA::Boolean
-  Sender_exec_i::delete_many (
-    ::Updater::UpdaterConnector::Updater_ptr updater)
-  {
-    // delete_many with exception
-    // make from the second and third instances a unregistered instance
-    try
-      {
-        updater->delete_many (this->topic_seq_many_);
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("create_many : <%u> samples\n"),
-                       this->topic_seq_many_.length ()));
-      }
-    catch (const CCM_DDS::NonExistent & ex)
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Expected : Exception NonExistent test updater delete_many.\n"),
-                               ACE_TEXT ("index length expected = 2 and  value = %d, expected index[0] = 1 and value = %d.\n"),
-                               ex.indexes.length(),ex.indexes[0]));
-
-        if (ex.indexes.length() != 2 || ex.indexes[0] != 1 || ex.indexes[1] != 2)
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("delete_many:expected exception: NonExistent gives wrong indices.\n")));
-            return false;
-          }
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                    ACE_TEXT ("test updater delete_many with inregistered instances, info: index <%d> - retval <%d>\n"),
-                    ex.index, ex.error_code));
-        return false;
-      }
-    catch (const CCM_DDS::AlreadyCreated &)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: AlreadyCreated  with test updater delete_many.\n")));
-        return false;
-      }
-
-    // Delete many with no exception
-    // reset instances to original values
-    for (int i = 1; i < 4; i++)
-      {
-        char key[7];
-        TestTopic new_key;
-        ACE_OS::sprintf (key, "many_%d", i);
-        new_key.key = CORBA::string_dup(key);
-        new_key.x = i;
-        this->topic_seq_many_[i-1] = new_key;
-      }
-    try
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("delete_many : deleted <%u> samples\n"),
-                                          this->topic_seq_many_.length ()));
-
-        updater->delete_many (this->topic_seq_many_);
-        return true;
-      }
-    catch(const CCM_DDS::NonExistent& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater delete_many\n")));
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                  ACE_TEXT ("with test updater delete_many: index <%d> - retval <%d>\n"),
-                  ex.index, ex.error_code));
-      }
-    return false;
-  }
-
-  void
-  Sender_exec_i::add_instances_of_topic (void)
-  {
-    //make 2 sequences of instances as testdata
-    CORBA::UShort total = 3;
-    this->topic_seq_one_.length (total);
-    //sequence for tests with .._one
-    for (int i = 1; i < (total + 1); i++)
-      {
-        char key[7];
-        TestTopic new_key;
-        ACE_OS::sprintf (key, "KEY_%d", i);
-        new_key.key = CORBA::string_dup(key);
-        new_key.x = i;
-        this->topic_seq_one_[i-1] = new_key;
-      }
-    //sequence for tests with .._many
-    this->topic_seq_many_.length (total);
-    for (int i = 1; i < (total + 1); i++)
-      {
-        char key[7];
-        TestTopic new_key;
-        ACE_OS::sprintf (key, "many_%d", i);
-        new_key.key = CORBA::string_dup(key);
-        new_key.x = i;
-        this->topic_seq_many_[i-1] = new_key;
-      }
-  }
-
-  void
-  Sender_exec_i::tick (void)
-  {
-    if  (this->test_ok_.value())
-      {
-        ::Updater::UpdaterConnector::Updater_var updater =
-          this->ciao_context_->get_connection_test_topic_update_data ();
-        if (!::CORBA::is_nil (updater.in ()))
-          {
-            switch (this->test_nr_)
-              {
-                case UPDATE_CREATE:
-                  this->test_ok_ = this->create_one (updater.in ());
-                  if(this->test_ok_.value())
-                    {
-                      this->test_nr_ = UPDATE_CREATE_ALREADY_EXIST;
-                    }
-                  else
-                    {
-                      this->test_nr_ = END_TEST;
-                    }
-                  break;
-                case UPDATE_CREATE_ALREADY_EXIST:
-                  this->test_ok_ = this->create_one_already_exist (updater.in ());
-                  this->test_nr_ = UPDATE_ONE;
-                  break;
-                case UPDATE_ONE:
-                  this->test_ok_ = this->update_one (updater.in ());
-                  this->test_nr_ = UPDATE_ONE_NOT_REGISTERED;
-                  break;
-                case UPDATE_ONE_NOT_REGISTERED:
-                  this->test_ok_ = this->update_one_not_registered (updater.in ());
-                  this->test_nr_ = DELETE_ONE;
-                  break;
-                case DELETE_ONE:
-                  this->test_ok_ = this->delete_one (updater.in ());
-                  this->test_nr_ = DELETE_ONE_NOT_REGISTERED;
-                  break;
-                case DELETE_ONE_NOT_REGISTERED:
-                  this->test_ok_ = this->delete_one_not_registered (updater.in ());
-                  this->test_nr_ = UPDATE_DELETE_REGISTER;
-                  break;
-                case UPDATE_DELETE_REGISTER:
-                  this->test_ok_ = this->update_and_delete_one_after_register (updater.in ());
-                  this->test_nr_ = CREATE_MANY;
-                  break;
-                case CREATE_MANY:
-                  this->test_ok_ = this->create_many (updater.in ());
-                  if(this->test_ok_.value())
-                    {
-                      this->test_nr_ = UPDATE_MANY;
-                    }
-                  else
-                    {
-                      this->test_nr_ = END_TEST;
-                    }
-                  this->test_nr_ = UPDATE_MANY;
-                  break;
-                case UPDATE_MANY:
-                  this->test_ok_ = this->update_many (updater.in ());
-                  this->test_nr_ = DELETE_MANY;
-                  break;
-                case DELETE_MANY:
-                  this->test_ok_ = this->delete_many (updater.in ());
-                  this->test_nr_ = END_TEST;
-                  break;
-                default:
-                  break;
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "Sender_exec_i::tick - "
-                      "ERROR: Updater seems nil.\n"));
-            this->test_ok_ = false;
-          }
-      }
-  }
-
-  void
-  Sender_exec_i::get_started (void)
-  {
-    this->add_instances_of_topic ();
-    this->start ();
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    if (this->reactor ()->schedule_timer (
-                this->ticker_,
-                0,
-                ACE_Time_Value (3, 0),
-                ACE_Time_Value (3, 0)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                               ACE_TEXT ("Error scheduling timer")));
-      }
-  }
-
-  void
-  Sender_exec_i::stop (void)
-  {
-    this->reactor ()->cancel_timer (this->ticker_);
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n")));
-  }
-
-  // Component attributes and port operations.
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Updater::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    this->stop ();
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    if (!this->test_ok_.value())
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Error in Updater in Sender")));
-      }
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Updater_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.h
deleted file mode 100644
index 63fe557151d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.h
+++ /dev/null
@@ -1,201 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_UPDATER_SENDER_EXEC_QTARYT_H_
-#define CIAO_UPDATER_SENDER_EXEC_QTARYT_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Updater_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_Updater_Sender_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
-
-  class Sender_exec_i;
-
-  enum UPDATER_TEST {
-    UPDATE_CREATE,
-    UPDATE_CREATE_ALREADY_EXIST,
-    UPDATE_ONE,
-    UPDATE_ONE_NOT_REGISTERED,
-    DELETE_ONE,
-    DELETE_ONE_NOT_REGISTERED,
-    UPDATE_DELETE_REGISTER,
-    CREATE_MANY,
-    UPDATE_MANY,
-    DELETE_MANY,
-    END_TEST
-  };
-
-  /**
-   * ConnectorStatusListener_exec_i
-   */
-  class SENDER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Sender_exec_i &callback);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-      void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                                 ::DDS::StatusKind status_kind);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Pulse generator
-   */
-
-  class pulse_Generator :
-    public ACE_Event_Handler
-  {
-  public:
-    pulse_Generator (Sender_exec_i &callback);
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    Sender_exec_i &pulse_callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_connector_status (void);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void tick (void);
-    void get_started (void);
-    //@}
-
-  private:
-    ::Updater::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    //@}
-
-    //@{
-    /** User defined members. */
-    pulse_Generator * ticker_;
-
-    UPDATER_TEST test_nr_;
-    Atomic_Boolean test_ok_;
-    TestTopicSeq topic_seq_one_;
-    TestTopicSeq topic_seq_many_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void start (void);
-    void stop (void);
-    void add_instances_of_topic (void);
-
-    CORBA::Boolean create_one (
-      ::Updater::UpdaterConnector::Updater_ptr updater);
-    CORBA::Boolean create_one_already_exist (
-      ::Updater::UpdaterConnector::Updater_ptr updater);
-    CORBA::Boolean update_one (
-      ::Updater::UpdaterConnector::Updater_ptr updater);
-    CORBA::Boolean update_one_not_registered (
-      ::Updater::UpdaterConnector::Updater_ptr updater);
-    CORBA::Boolean delete_one (
-      ::Updater::UpdaterConnector::Updater_ptr updater);
-    CORBA::Boolean delete_one_not_registered (
-      ::Updater::UpdaterConnector::Updater_ptr updater);
-    CORBA::Boolean update_and_delete_one_after_register (
-      ::Updater::UpdaterConnector::Updater_ptr updater);
-    CORBA::Boolean create_many (
-      ::Updater::UpdaterConnector::Updater_ptr updater);
-    CORBA::Boolean update_many (
-      ::Updater::UpdaterConnector::Updater_ptr updater);
-    CORBA::Boolean delete_many (
-      ::Updater::UpdaterConnector::Updater_ptr updater);
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Updater_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/Updater/descriptors/Plan.cdp
deleted file mode 100644
index 8a2f5e8114c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Updater/descriptors/Plan.cdp
+++ /dev/null
@@ -1,390 +0,0 @@
-<!--  -->
-<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>Updater_Depl_1</label>
-  <UUID>Updater_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Updater_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Updater_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Updater_ConnectorComponentImplementation">
-    <name>Updater_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Updater_Connector_ExecArtifact" />
-    <artifact xmi:idref="Updater_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Updater_UpdaterConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Updater_UpdaterConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Updater_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Updater_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Updater_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Updater_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-  </instance>
-
-  <instance xmi:id="Updater_ConnectorComponentInstance">
-    <name>Updater_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Updater_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestQoS</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="Updater_ConnectorComponentInstance2">
-    <name>Updater_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Updater_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestQoS</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-  </instance>
-
-  <connection>
-    <name>_listenercontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_observer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Updater_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_statelistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_observer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Updater_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_portstatuslistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Updater_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>info_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Updater_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>updater_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>test_topic_update_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>observable_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Updater_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Updater_ConnectorComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="Updater_Connector_ExecArtifact">
-    <name>Updater_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Updater_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Updater_Connector_SvntArtifact">
-    <name>Updater_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Updater_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Updater_Connector_StubArtifact">
-    <name>Updater_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Updater_Connector_stub</location>
-  </artifact>
-
-
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/Updater/descriptors/run_test.pl
deleted file mode 100755
index b87434bef7e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Updater/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 60 seconds to allow task to complete\n";
-sleep (60);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -s\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/.gitignore b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/.gitignore
deleted file mode 100644
index 5b70c1e48f4..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/UCC_Test_Base.cxx
-/UCC_Test_Base.h
-/UCC_Test_BasePlugin.cxx
-/UCC_Test_BasePlugin.h
-/UCC_Test_BaseSupport.cxx
-/UCC_Test_BaseSupport.h
-/UCC_Test_Base_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.idl
deleted file mode 100644
index 1d489688614..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.idl
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * @file UCC_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef USERDATA_COPY_COUNT_TEST_BASE_IDL
-#define USERDATA_COPY_COUNT_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/UCC_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/UCC_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "UCCVariableSizedStructTest"
-#pragma DCPS_DATA_KEY "UCCVariableSizedStructTest symbol"
-
-struct UCCVariableSizedStructTest {
-  string symbol; //@key
-  long x;
-  long y;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<UCCVariableSizedStructTest> UCCVariableSizedStructTestSeq;
-#endif
-
-#pragma DCPS_DATA_TYPE "UCCFixedSizedStructTest"
-
-struct UCCFixedSizedStructTest {
-  long x;
-  long y;
-  long z;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<UCCFixedSizedStructTest> UCCFixedSizedStructTestSeq;
-#endif
-
-#endif /* USERDATA_COPY_COUNT_TEST_BASE_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.mpc
deleted file mode 100644
index af35527d256..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (UCC_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = UCC_Test_Base_stub
-  dynamicflags += USERDATA_COPY_COUNT_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=USERDATA_COPY_COUNT_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=UCC_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    UCC_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=USERDATA_COPY_COUNT_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    UCC_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/.gitignore b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/.gitignore
deleted file mode 100644
index 24bc50d2249..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/Component_exec_export.h
-/Component_lem_stub_export.h
-/Component_stub_export.h
-/Component_svnt_export.h
-/UCC_Test_ComponentE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component.idl b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component.idl
deleted file mode 100644
index 3ec41b3c515..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef COMPONENT_IDL
-#define COMPONENT_IDL
-
-#include "Connector/UCC_Test_Connector.idl"
-
-module UCC_Test
-{
-  component UCCTestComponent
-  {
-    port UCCVariableSizedStruct_Test::UCCVariableSizedStructTestConnector::DDS_Write var_size_write;
-    port UCCFixedSizeStruct_Test::UCCFixedSizedStructTestConnector::DDS_Write fixed_size_write;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component.mpc
deleted file mode 100644
index 5577d943f76..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component.mpc
+++ /dev/null
@@ -1,146 +0,0 @@
-project(UCC_Test_Component_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += UCC_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=COMPONENT_STUB_Export \
-              -Wb,stub_export_include=Component_stub_export.h \
-              -Wb,skel_export_macro=COMPONENT_SVNT_Export \
-              -Wb,skel_export_include=Component_svnt_export.h \
-              -Wb,svnt_export_macro=COMPONENT_SVNT_Export \
-              -Wb,svnt_export_include=Component_svnt_export.h \
-              -Wb,exec_export_macro=COMPONENT_EXEC_Export \
-              -Wb,exec_export_include=Component_exec_export.h \
-              -I..
-
-  IDL_Files {
-    UCC_Test_Component.idl
-  }
-}
-
-project(UCC_Test_Component_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += UCC_Test_Component_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=COMPONENT_LEM_STUB_Export \
-              -Wb,stub_export_include=Component_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    UCC_Test_ComponentE.idl
-  }
-}
-
-project(UCC_Test_Component_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += UCC_Test_Component_lem_gen UCC_Test_Component_stub  \
-           UCC_Test_Connector_stub UCC_Test_Base_stub
-  libs  +=  Component_stub UCC_Test_Connector_stub \
-            UCC_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Component_lem_stub
-  dynamicflags += COMPONENT_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    UCC_Test_ComponentEC.cpp
-  }
-
-  Header_Files {
-    UCC_Test_ComponentEC.h
-    Component_lem_stub_export.h
-  }
-
-  Inline_Files {
-    UCC_Test_ComponentEC.inl
-  }
-}
-
-project(UCC_Test_Component_stub) : ccm_stub, dds4ccm_base {
-  after += UCC_Test_Component_idl_gen  UCC_Test_Connector_stub \
-           UCC_Test_Base_stub UCC_Test_Connector_lem_gen
-  libs  += UCC_Test_Connector_stub UCC_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Component_stub
-  dynamicflags += COMPONENT_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    UCC_Test_ComponentC.cpp
-  }
-
-  Header_Files {
-    UCC_Test_ComponentC.h
-    Component_stub_export.h
-  }
-
-  Inline_Files {
-    UCC_Test_ComponentC.inl
-  }
-}
-
-project(UCC_Test_Component_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += UCC_Test_Component_lem_stub UCC_Test_Component_stub \
-             UCC_Test_Base_stub UCC_Test_Connector_stub \
-             UCC_Test_Connector_lem_stub
-  sharedname = Component_exec
-  libs += Component_stub Component_lem_stub UCC_Test_Base_stub \
-          UCC_Test_Connector_stub UCC_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COMPONENT_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    UCC_Test_Component_exec.cpp
-  }
-
-  Header_Files {
-    UCC_Test_Component_exec.h
-    Component_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(UCC_Test_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   UCC_Test_Component_lem_stub UCC_Test_Base_stub \
-                  UCC_Test_Connector_stub UCC_Test_Connector_svnt \
-                  UCC_Test_Component_exec UCC_Test_Connector_lem_stub
-  sharedname  = Component_svnt
-  libs       += Component_stub Component_lem_stub UCC_Test_Base_stub \
-                UCC_Test_Connector_stub UCC_Test_Connector_svnt \
-                Component_exec UCC_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COMPONENT_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    UCC_Test_ComponentS.cpp
-    UCC_Test_Component_svnt.cpp
-  }
-
-  Header_Files {
-    UCC_Test_ComponentS.h
-    UCC_Test_Component_svnt.h
-    Component_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component_exec.cpp
deleted file mode 100644
index 8b2d5ea2849..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component_exec.cpp
+++ /dev/null
@@ -1,322 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "UCC_Test_Component_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-#define NR_OF_KEYS 10
-
-namespace CIAO_UCC_Test_UCCTestComponent_Impl
-{
-  size_t UCCVariableSizedStructTest_i::count_ = 0;
-  size_t UCCVariableSizedStructTest_i::max_count_ = 0;
-  size_t UCCFixedSizedStructTest_i::count_ = 0;
-  size_t UCCFixedSizedStructTest_i::max_count_ = 0;
-
-  /**
-   * WriteVariableHandler
-   */
-
-  WriteVariableHandler::WriteVariableHandler (UCCTestComponent_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  WriteVariableHandler::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    this->callback_.write_variable ();
-    return 0;
-  }
-
-  /**
-   * WriteFixedHandler
-   */
-
-  WriteFixedHandler::WriteFixedHandler (UCCTestComponent_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  WriteFixedHandler::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    this->callback_.write_fixed ();
-    return 0;
-  }
-
-  /**
-   * Component Executor Implementation Class: UCCTestComponent_exec_i
-   */
-
-  UCCTestComponent_exec_i::UCCTestComponent_exec_i (void)
-  {
-    ACE_NEW_THROW_EX (this->var_rh_,
-                      WriteVariableHandler (*this),
-                      ::CORBA::NO_MEMORY ());
-    ACE_NEW_THROW_EX (this->fixed_rh_,
-                      WriteFixedHandler (*this),
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  UCCTestComponent_exec_i::~UCCTestComponent_exec_i (void)
-  {
-    delete this->var_rh_;
-    delete this->fixed_rh_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  UCCTestComponent_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  UCCTestComponent_exec_i::write_fixed (void)
-  {
-    ::UCCFixedSizeStruct_Test::UCCFixedSizedStructTestConnector::Writer_var fixed_writer
-      = this->ciao_context_->get_connection_fixed_size_write_data ();
-
-    ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard,
-                        this->fixed_mutex_, CORBA::INTERNAL ());
-    {
-      for (CORBA::UShort i = 1; i < NR_OF_KEYS + 1; ++i)
-        {
-          ACE_DEBUG ((LM_DEBUG, "Write fixed %i\n", i));
-          fixed_writer->write_one (*(this->fixed_samples_[i]), ::DDS::HANDLE_NIL);
-        }
-    }
-  }
-
-  void
-  UCCTestComponent_exec_i::write_variable (void)
-  {
-    ::UCCVariableSizedStruct_Test::UCCVariableSizedStructTestConnector::Writer_var var_writer
-      = this->ciao_context_->get_connection_var_size_write_data ();
-
-    ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard,
-                        this->var_mutex_, CORBA::INTERNAL ());
-    {
-      for (CORBA::UShort i = 1; i < NR_OF_KEYS + 1; ++i)
-        {
-          ACE_DEBUG ((LM_DEBUG, "Write variable %C\n", this->var_samples_[i]->symbol.in ()));
-          var_writer->write_one (*(this->var_samples_[i]), ::DDS::HANDLE_NIL);
-        }
-    }
-  }
-
-  void
-  UCCTestComponent_exec_i::create_fixed_sized_samples (void)
-  {
-    ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard,
-                        this->fixed_mutex_, CORBA::INTERNAL ());
-    ACE_DEBUG ((LM_DEBUG, "Component_exec_i::create_fixed_sized_samples - "
-                          "Create fixed sized samples.\n"));
-    for (::CORBA::UShort i = 1; i < NR_OF_KEYS + 1; ++i)
-      {
-        UCCFixedSizedStructTest_i* new_key = new UCCFixedSizedStructTest_i;
-        new_key->x = i;
-        new_key->y = new_key->x;
-        new_key->z = 2*i;
-
-        this->fixed_samples_[i] = new_key;
-      }
-  }
-
-  void
-  UCCTestComponent_exec_i::create_variable_sized_samples (void)
-  {
-    ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard,
-                        this->var_mutex_, CORBA::INTERNAL ());
-    ACE_DEBUG ((LM_DEBUG, "Component_exec_i::create_variable_sized_samples - "
-                      "Create variable sized samples\n"));
-    for (::CORBA::UShort i = 1; i < NR_OF_KEYS + 1; ++i)
-      {
-        UCCVariableSizedStructTest_i* new_key = new UCCVariableSizedStructTest_i;
-        char key[7];
-        ACE_OS::sprintf (key, "KEY_%d", i);
-        new_key->symbol = CORBA::string_dup (key);
-        new_key->x = i;
-        new_key->y = new_key->x;
-        this->var_samples_[i] = new_key;
-      }
-  }
-  // Component attributes and port operations.
-
-  // Operations from Components::SessionComponent.
-
-  void
-  UCCTestComponent_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::UCC_Test::CCM_UCCTestComponent_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  UCCTestComponent_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  UCCTestComponent_exec_i::ccm_activate (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Component_exec_i::ccm_activate - "
-                          "Create samples.\n"));
-    this->create_fixed_sized_samples ();
-    this->create_variable_sized_samples ();
-
-    if (this->reactor ()->schedule_timer (
-                this->var_rh_,
-                0,
-                ACE_Time_Value (2, 0),
-                ACE_Time_Value (1, 0)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Component_exec_i::ccm_activate : ")
-                              ACE_TEXT ("Error scheduling timer for variable sized struct.\n")));
-      }
-
-    if (this->reactor ()->schedule_timer (
-                this->fixed_rh_,
-                0,
-                ACE_Time_Value (2, 0),
-                ACE_Time_Value (1, 0)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Component_exec_i::ccm_activate : ")
-                              ACE_TEXT ("Error scheduling timer for fixed sized struct.\n")));
-      }
-  }
-
-  void
-  UCCTestComponent_exec_i::ccm_passivate (void)
-  {
-    this->reactor ()->cancel_timer (this->var_rh_);
-    this->reactor ()->cancel_timer (this->fixed_rh_);
-   }
-
-  void
-  UCCTestComponent_exec_i::ccm_remove (void)
-  {
-    for (::CORBA::UShort i = 1; i < NR_OF_KEYS + 1; ++i)
-      {
-        UCCVariableSizedStructTest_i* stype =this->var_samples_[i];
-        delete stype;
-      }
-
-    for (::CORBA::UShort i = 1; i < NR_OF_KEYS + 1; ++i)
-      {
-        UCCFixedSizedStructTest_i* stype =this->fixed_samples_[i];
-        delete stype;
-      }
-
-    this->var_samples_.clear ();
-    this->fixed_samples_.clear ();
-
-    // Check count_
-    if (UCCFixedSizedStructTest_i::count_ != 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Reference count for fixed sized "
-                              "samples is not 0. expected <0> - found <%d>\n",
-                              UCCFixedSizedStructTest_i::count_));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "Reference count for fixed sized "
-                              "samples is 0\n"));
-      }
-    if (UCCVariableSizedStructTest_i::count_ != 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Reference count for variable sized "
-                              "samples is not 0. expected <0> - found <%d>\n",
-                              UCCVariableSizedStructTest_i::count_));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "Reference count for variable sized "
-                              "samples is 0\n"));
-      }
-
-    // Check max_count_, for each sample we allocated an instance so we
-    // expect a count of 10
-    if (UCCFixedSizedStructTest_i::max_count_ != 10)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Maximum refence count for fixed sized "
-                              "samples is not ok, expected <10> - found <%d>\n",
-                              UCCFixedSizedStructTest_i::max_count_));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "Maximum reference count for fixed sized "
-                              "samples is 10\n"));
-      }
-    if (UCCVariableSizedStructTest_i::max_count_ != 10)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Maximum reference count for variable sized "
-                              "samples is not ok, expected <10> - found <%d>\n",
-                              UCCVariableSizedStructTest_i::max_count_));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "Maximum reference count for variable sized "
-                              "samples is 10\n"));
-      }
-  }
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_UCC_Test_UCCTestComponent_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      UCCTestComponent_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component_exec.h b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component_exec.h
deleted file mode 100644
index 906a83c7cfd..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component_exec.h
+++ /dev/null
@@ -1,202 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_UCC_TEST_COMPONENT_EXEC_GWWVKC_H_
-#define CIAO_UCC_TEST_COMPONENT_EXEC_GWWVKC_H_
-
-#include /**/ "ace/pre.h"
-
-#include "UCC_Test_ComponentEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Component_exec_export.h"
-#include "tao/LocalObject.h"
-
-#include <map>
-
-namespace CIAO_UCC_Test_UCCTestComponent_Impl
-{
-  struct UCCVariableSizedStructTest_i : UCCVariableSizedStructTest
-  {
-    static size_t count_;
-    static size_t max_count_;
-
-    UCCVariableSizedStructTest_i ()
-      {
-        ++count_;
-        if (count_ > max_count_)
-          {
-            max_count_ = count_;
-          }
-      }
-
-    ~UCCVariableSizedStructTest_i ()
-      {
-        --count_;
-      }
-  private:
-    UCCVariableSizedStructTest_i (const UCCVariableSizedStructTest_i &);
-    UCCVariableSizedStructTest_i operator = (const UCCVariableSizedStructTest_i &);
-
-  };
-
-  struct UCCFixedSizedStructTest_i : UCCFixedSizedStructTest
-  {
-    static size_t count_;
-    static size_t max_count_;
-
-    UCCFixedSizedStructTest_i ()
-      {
-        ++count_;
-        if (count_ > max_count_)
-          {
-            max_count_ = count_;
-          }
-      }
-
-    ~UCCFixedSizedStructTest_i ()
-      {
-        --count_;
-      }
-  private:
-    UCCFixedSizedStructTest_i (const UCCFixedSizedStructTest_i &);
-    UCCFixedSizedStructTest_i operator = (const UCCFixedSizedStructTest_i &);
-
-  };
-
-  class UCCTestComponent_exec_i;
-
-  //============================================================
-  // WriteVariableHandler
-  //============================================================
-  class WriteVariableHandler :
-    public ACE_Event_Handler
-  {
-  public:
-    WriteVariableHandler (UCCTestComponent_exec_i &callback);
-    int handle_timeout (const ACE_Time_Value &, const void *);
-  private:
-    UCCTestComponent_exec_i &callback_;
-  };
-
-  //============================================================
-  // WriteFixedHandler
-  //============================================================
-  class WriteFixedHandler :
-    public ACE_Event_Handler
-  {
-  public:
-    WriteFixedHandler (UCCTestComponent_exec_i &callback);
-    int handle_timeout (const ACE_Time_Value &, const void *);
-  private:
-    UCCTestComponent_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: UCCTestComponent_exec_i
-   */
-
-  class UCCTestComponent_exec_i
-    : public virtual UCCTestComponent_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    UCCTestComponent_exec_i (void);
-    virtual ~UCCTestComponent_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void write_variable (void);
-    void write_fixed (void);
-
-    //@}
-
-  private:
-    ::UCC_Test::CCM_UCCTestComponent_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    //@}
-
-    //@{
-    /** User defined members. */
-    /// Variable sized struct
-    WriteVariableHandler *var_rh_;
-
-    TAO_SYNCH_MUTEX var_mutex_;
-    typedef std::map< ::CORBA::UShort, UCCVariableSizedStructTest_i* > UCCVarSized_Table;
-    UCCVarSized_Table var_samples_;
-
-    /// Fixed sized struct
-    WriteFixedHandler *fixed_rh_;
-
-    TAO_SYNCH_MUTEX fixed_mutex_;
-    typedef std::map< ::CORBA::UShort, UCCFixedSizedStructTest_i* > UCCFixedSized_Table;
-    UCCFixedSized_Table fixed_samples_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    /// Variable sized struct
-    void create_variable_sized_samples (void);
-
-    /// Fixed sized struct
-    void create_fixed_sized_samples (void);
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_UCC_Test_UCCTestComponent_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/.gitignore
deleted file mode 100644
index 4cc50acd285..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/UCC_Test_ConnectorE.idl
-/UCC_Test_Connector_conn.cpp
-/UCC_Test_Connector_conn.h
-/UCC_Test_Connector_conn_export.h
-/UCC_Test_Connector_lem_stub_export.h
-/UCC_Test_Connector_stub_export.h
-/UCC_Test_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.idl
deleted file mode 100644
index e058fb2f905..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.idl
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * @file UCC_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef USERDATA_COPY_COUNT_TEST_CONNECTOR_IDL_
-#define USERDATA_COPY_COUNT_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/UCC_Test_Base.idl"
-
-#pragma ciao lem "Connector/UCC_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/UCC_Test_BaseTypeSupport.idl"
-#endif
-
-module UCCVariableSizedStruct_Test
-{
-  module ::CCM_DDS::Typed < ::UCCVariableSizedStructTest, ::UCCVariableSizedStructTestSeq> UCCVariableSizedStructTestConnector;
-};
-
-module UCCFixedSizeStruct_Test
-{
-  module ::CCM_DDS::Typed < ::UCCFixedSizedStructTest, ::UCCFixedSizedStructTestSeq> UCCFixedSizedStructTestConnector;
-};
-
-#endif /* USERDATA_COPY_COUNT_TEST_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.mpc
deleted file mode 100644
index ecb293b6ccc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p UCC_Test_Base -l .. -o ../lib -u DDS UCC_Test_Connector"
-
-project(UCC_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen UCC_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=USERDATA_COPY_COUNT_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=UCC_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=USERDATA_COPY_COUNT_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=UCC_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=USERDATA_COPY_COUNT_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=UCC_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=USERDATA_COPY_COUNT_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=UCC_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    UCC_Test_Connector.idl
-  }
-}
-
-project(UCC_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += UCC_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=USERDATA_COPY_COUNT_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=UCC_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    UCC_Test_ConnectorE.idl
-  }
-}
-
-project(UCC_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += UCC_Test_Connector_lem_gen UCC_Test_Connector_stub UCC_Test_Base_stub
-  libs  += UCC_Test_Base_stub UCC_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = UCC_Test_Connector_lem_stub
-  dynamicflags += USERDATA_COPY_COUNT_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    UCC_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    UCC_Test_ConnectorEC.h
-    UCC_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    UCC_Test_ConnectorEC.inl
-  }
-}
-
-project(UCC_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += UCC_Test_Connector_idl_gen UCC_Test_Base_stub
-  libs  += UCC_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = UCC_Test_Connector_stub
-  dynamicflags += USERDATA_COPY_COUNT_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    UCC_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    UCC_Test_ConnectorC.h
-    UCC_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    UCC_Test_ConnectorC.inl
-  }
-}
-
-project(UCC_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += UCC_Test_Connector_lem_stub UCC_Test_Connector_stub UCC_Test_Base_stub
-  sharedname = UCC_Test_Connector_exec
-  libs += UCC_Test_Connector_stub UCC_Test_Connector_lem_stub UCC_Test_Base_stub UCC_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += USERDATA_COPY_COUNT_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    UCC_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    UCC_Test_Connector_conn.h
-    UCC_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(UCC_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += UCC_Test_Connector_lem_stub UCC_Test_Connector_exec UCC_Test_Connector_stub
-  sharedname  = UCC_Test_Connector_svnt
-  libs       += UCC_Test_Connector_stub \
-                UCC_Test_Connector_lem_stub  \
-                UCC_Test_Base_stub \
-                UCC_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += USERDATA_COPY_COUNT_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    UCC_Test_ConnectorS.cpp
-    UCC_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    UCC_Test_ConnectorS.h
-    UCC_Test_Connector_svnt.h
-    UCC_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/descriptors/Plan.cdp
deleted file mode 100644
index a2b2d93ec0b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/descriptors/Plan.cdp
+++ /dev/null
@@ -1,283 +0,0 @@
-<!--  -->
-<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>UCCTest_Depl</label>
-  <UUID>UCCTest_Depl</UUID>
-
-  <implementation xmi:id="ComponentImplementation">
-    <name>ComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Component_ExecArtifact" />
-    <artifact xmi:idref="Component_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_UCC_Test_UCCTestComponent_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_UCC_Test_UCCTestComponent_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="TwoDim_UCC_Test_ConnectorImplementation">
-    <name>TwoDim_UCC_Test_ConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="UCC_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="UCC_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_UCCVariableSizedStruct_Test_UCCVariableSizedStructTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_UCCVariableSizedStruct_Test_UCCVariableSizedStructTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>UCC_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>UCC_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="ThreeDim_UCC_Test_ConnectorImplementation">
-    <name>ThreeDim_UCC_Test_ConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="UCC_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="UCC_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_UCCFixedSizeStruct_Test_UCCFixedSizedStructTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_UCCFixedSizeStruct_Test_UCCFixedSizedStructTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>UCC_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>UCC_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="ComponentInstance">
-    <name>Component</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ComponentImplementation" />
-  </instance>
-
-  <instance xmi:id="TwoDim_UCC_Test_ConnectorInstance">
-    <name>TwoDim_UCC_Test_Connector</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="TwoDim_UCC_Test_ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TwoDimensionalTopic</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ThreeDim_UCC_Test_ConnectorInstance">
-    <name>ThreeDim_UCC_Test_Connector</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ThreeDim_UCC_Test_ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ThreeDimensionalTopic</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>var_size_write_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>var_size_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="TwoDim_UCC_Test_ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>fixed_size_write_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>fixed_size_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ThreeDim_UCC_Test_ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="UCC_Test_Connector_ExecArtifact">
-    <name>UCC_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>UCC_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="UCC_Test_Connector_SvntArtifact">
-    <name>UCC_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>UCC_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="UCC_Test_Connector_StubArtifact">
-    <name>UCC_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>UCC_Test_Connector_stub</location>
-  </artifact>
-
-  <artifact xmi:id="Component_ExecArtifact">
-    <name>Component_exec</name>
-    <source/>
-    <node/>
-    <location>Component_exec</location>
-  </artifact>
-  <artifact xmi:id="Component_SvntArtifact">
-    <name>Component_svnt</name>
-    <source/>
-    <node/>
-    <location>Component_svnt</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/descriptors/run_test.pl
deleted file mode 100755
index dbe5a142f2b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 1;
-@ports = ( 60001 );
-@iorbases = ( "Component.ior" );
-@iorfiles = 0;
-@nodenames = ( "ComponentNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 10 seconds to allow task to complete\n";
-sleep (10);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -s\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/.gitignore b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/.gitignore
deleted file mode 100644
index 9fb033fd01c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/VTopic_Base.cxx
-/VTopic_Base.h
-/VTopic_BasePlugin.cxx
-/VTopic_BasePlugin.h
-/VTopic_BaseSupport.cxx
-/VTopic_BaseSupport.h
-/VTopic_Base_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl
deleted file mode 100644
index 851ed0ad11e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl
+++ /dev/null
@@ -1,118 +0,0 @@
-/**
- * @file   VTopic_Base.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef VTOPIC_BASE_IDL
-#define VTOPIC_BASE_IDL
-
-#pragma ndds typesupport "Base/VTopic_BaseSupport.h"
-#pragma opendds typesupport "Base/VTopic_BaseTypeSupportImpl.h"
-
-typedef octet octet_array[5];
-
-#pragma DCPS_DATA_TYPE "TestTopic"
-#pragma DCPS_DATA_KEY "TestTopic key"
-
-// Plain topic
-struct TestTopic {
-  string key; //@key
-  long x;
-};
-
-#pragma DCPS_DATA_TYPE "TopicString"
-#pragma DCPS_DATA_KEY "TopicString key"
-
-// String
-struct TopicString {
-  string key; //@key
-  string x_str;
-};
-
-#pragma DCPS_DATA_TYPE "TopicArray"
-#pragma DCPS_DATA_KEY "TopicArray key"
-
-// Arrays
-struct TopicArray {
-  string key; //@key
-  octet_array x_array;
- };
-
-// Unions
-union X_Union switch (short) {
-    case 0:
-      string x_test;
-    case 1:
-      long   x_long;
-};
-
-#pragma DCPS_DATA_TYPE "TopicUnion"
-#pragma DCPS_DATA_KEY "TopicUnion key"
-
-struct TopicUnion {
-  string key; //@key
-  X_Union x_uni;
-};
-
-// Sequence
-struct test {
-  short x_test;
-  string x_teststr;
-};
-
-typedef sequence<test> testSeq;
-
-#pragma DCPS_DATA_TYPE "TopicSeq"
-#pragma DCPS_DATA_KEY "TopicSeq key"
-
-struct TopicSeq {
-  string key; //@key
-  testSeq x_seq;
-};
-
-// ValueType
-valuetype X_Valuetype {
-  public string type;
-  public long x_long;
-};
-
-#if !defined (CIAO_DDS4CCM_OPENDDS)
-// OpenDDS doesn't support valuetype as topic member
-#pragma DCPS_DATA_TYPE "TopicValuetype"
-#pragma DCPS_DATA_KEY "TopicValuetype key"
-
-struct TopicValuetype {
-  string key; //@key
-  X_Valuetype x_vt;
-};
-#endif
-
-// Sequences
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TestTopic> TestTopicSeq;
-#endif
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TopicString> TopicStringSeq;
-#endif
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TopicArray> TopicArraySeq;
-#endif
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TopicUnion> TopicUnionSeq;
-#endif
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<X_Union> X_UnionSeq;
-#endif
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TopicSeq> TopicSeqSeq;
-#endif
-#if !defined (CIAO_DDS4CCM_OPENDDS)
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TopicValuetype> TopicValuetypeSeq;
-#endif
-#endif
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<X_Valuetype> X_ValuetypeSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc
deleted file mode 100644
index 1aa5f52cfda..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc
+++ /dev/null
@@ -1,25 +0,0 @@
-project (DDS_VTopic_Base_stub) : taoidldefaults, \
-                                 dds4ccm_ts_default, valuetype {
-  sharedname = DDS_VTopic_Base_stub
-  dynamicflags += VTOPIC_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS \
-              -Wb,stub_export_macro=VTOPIC_BASE_STUB_Export \
-              -Wb,stub_export_include=VTopic_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    VTopic_Base.idl
-  }
-
-  opendds_ts_flags += --export=VTOPIC_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    VTopic_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/.gitignore b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/.gitignore
deleted file mode 100644
index f6f1b6886a7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/VT_Array_ConnectorE.idl
-/VT_Array_Connector_conn.cpp
-/VT_Array_Connector_conn.h
-/VT_Array_Connector_conn_export.h
-/VT_Array_Connector_lem_stub_export.h
-/VT_Array_Connector_stub_export.h
-/VT_Array_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.idl
deleted file mode 100644
index 7bde349812c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file VT_Array_Connector.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef VT_ARRAY_CONNECTOR_IDL_
-#define VT_ARRAY_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/VTopic_Base.idl"
-
-#pragma ciao lem "Conn_Array/VT_Array_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/VTopic_BaseTypeSupport.idl"
-#endif
-
-module VTopic
-{
-  module ::CCM_DDS::Typed < ::TopicArray, ::TopicArraySeq> TopicArrayConnector;
-};
-
-#endif /* VT_ARRAY_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc
deleted file mode 100644
index b1b95129172..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc
+++ /dev/null
@@ -1,141 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_VTopic_Base -l .. -o ../lib -u DDS VT_Array_Connector"
-
-project(DDS_VT_ARRAY_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_VTopic_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=VT_ARRAY_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=VT_Array_Connector_stub_export.h \
-              -Wb,skel_export_macro=VT_ARRAY_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=VT_Array_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=VT_ARRAY_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=VT_Array_Connector_svnt_export.h \
-              -Wb,conn_export_macro=VT_ARRAY_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=VT_Array_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    VT_Array_Connector.idl
-  }
-}
-
-project(DDS_VT_ARRAY_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_VT_ARRAY_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=VT_ARRAY_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=VT_Array_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    VT_Array_ConnectorE.idl
-  }
-}
-
-project(DDS_VT_ARRAY_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_VT_ARRAY_Connector_lem_gen DDS_VT_Array_Connector_stub DDS_VTopic_Base_stub
-  libs  += DDS_VTopic_Base_stub DDS_VT_Array_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_VT_ARRAY_Connector_lem_stub
-  dynamicflags += VT_ARRAY_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VT_Array_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    VT_Array_ConnectorEC.h
-    VT_Array_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    VT_Array_ConnectorEC.inl
-  }
-}
-
-project(DDS_VT_Array_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_VT_ARRAY_Connector_idl_gen DDS_VTopic_Base_stub
-  libs  += DDS_VTopic_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_VT_Array_Connector_stub
-  dynamicflags += VT_ARRAY_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VT_Array_ConnectorC.cpp
-  }
-
-  Header_Files {
-    VT_Array_ConnectorC.h
-    VT_Array_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    VT_Array_ConnectorC.inl
-  }
-}
-
-project(DDS_VT_Array_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_VT_ARRAY_Connector_lem_stub DDS_VT_Array_Connector_stub DDS_VTopic_Base_stub
-  sharedname = DDS_VT_Array_Connector_exec
-  libs += DDS_VT_Array_Connector_stub DDS_VT_ARRAY_Connector_lem_stub DDS_VTopic_Base_stub DDS_VTopic_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += VT_ARRAY_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VT_Array_Connector_conn.cpp
-  }
-
-  Header_Files {
-    VT_Array_Connector_conn.h
-    VT_Array_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_VT_Array_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_VT_ARRAY_Connector_lem_stub DDS_VT_Array_Connector_exec DDS_VT_Array_Connector_stub
-  sharedname  = DDS_VT_Array_Connector_svnt
-  libs       += DDS_VT_Array_Connector_stub \
-                DDS_VT_ARRAY_Connector_lem_stub  \
-                DDS_VTopic_Base_stub \
-                DDS_VT_Array_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += VT_ARRAY_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VT_Array_ConnectorS.cpp
-    VT_Array_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    VT_Array_ConnectorS.h
-    VT_Array_Connector_svnt.h
-    VT_Array_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/.gitignore b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/.gitignore
deleted file mode 100644
index 18235baa020..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/VT_Seq_ConnectorE.idl
-/VT_Seq_Connector_conn.cpp
-/VT_Seq_Connector_conn.h
-/VT_Seq_Connector_conn_export.h
-/VT_Seq_Connector_lem_stub_export.h
-/VT_Seq_Connector_stub_export.h
-/VT_Seq_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.idl
deleted file mode 100644
index 89067ebe269..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file VT_Seq_Connector.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef VT_SEQ_CONNECTOR_IDL_
-#define VT_SEQ_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/VTopic_Base.idl"
-
-#pragma ciao lem "Conn_Seq/VT_Seq_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/VTopic_BaseTypeSupport.idl"
-#endif
-
-module VTopic
-{
-  module ::CCM_DDS::Typed < ::TopicSeq, ::TopicSeqSeq> TopicSeqConnector;
-};
-
-#endif /* VTopic_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc
deleted file mode 100644
index 8eba6b3a2ad..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc
+++ /dev/null
@@ -1,141 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_VTopic_Base -l .. -o ../lib -u DDS VT_Seq_Connector"
-
-project(DDS_VT_SEQ_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_VTopic_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=VT_SEQ_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=VT_Seq_Connector_stub_export.h \
-              -Wb,skel_export_macro=VT_SEQ_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=VT_Seq_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=VT_SEQ_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=VT_Seq_Connector_svnt_export.h \
-              -Wb,conn_export_macro=VT_SEQ_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=VT_Seq_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    VT_Seq_Connector.idl
-  }
-}
-
-project(DDS_VT_SEQ_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_VT_SEQ_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=VT_SEQ_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=VT_Seq_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    VT_Seq_ConnectorE.idl
-  }
-}
-
-project(DDS_VT_SEQ_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_VT_SEQ_Connector_lem_gen DDS_VT_Seq_Connector_stub DDS_VTopic_Base_stub
-  libs  += DDS_VTopic_Base_stub DDS_VT_Seq_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_VT_SEQ_Connector_lem_stub
-  dynamicflags += VT_SEQ_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VT_Seq_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    VT_Seq_ConnectorEC.h
-    VT_Seq_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    VT_Seq_ConnectorEC.inl
-  }
-}
-
-project(DDS_VT_Seq_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_VT_SEQ_Connector_idl_gen DDS_VTopic_Base_stub
-  libs  += DDS_VTopic_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_VT_Seq_Connector_stub
-  dynamicflags += VT_SEQ_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VT_Seq_ConnectorC.cpp
-  }
-
-  Header_Files {
-    VT_Seq_ConnectorC.h
-    VT_Seq_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    VT_Seq_ConnectorC.inl
-  }
-}
-
-project(DDS_VT_Seq_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_VT_SEQ_Connector_lem_stub DDS_VT_Seq_Connector_stub DDS_VTopic_Base_stub
-  sharedname = DDS_VT_Seq_Connector_exec
-  libs += DDS_VT_Seq_Connector_stub DDS_VT_SEQ_Connector_lem_stub DDS_VTopic_Base_stub DDS_VTopic_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += VT_SEQ_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VT_Seq_Connector_conn.cpp
-  }
-
-  Header_Files {
-    VT_Seq_Connector_conn.h
-    VT_Seq_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_VT_Seq_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_VT_SEQ_Connector_lem_stub DDS_VT_Seq_Connector_exec DDS_VT_Seq_Connector_stub
-  sharedname  = DDS_VT_Seq_Connector_svnt
-  libs       += DDS_VT_Seq_Connector_stub \
-                DDS_VT_SEQ_Connector_lem_stub  \
-                DDS_VTopic_Base_stub \
-                DDS_VT_Seq_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += VT_SEQ_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VT_Seq_ConnectorS.cpp
-    VT_Seq_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    VT_Seq_ConnectorS.h
-    VT_Seq_Connector_svnt.h
-    VT_Seq_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/.gitignore b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/.gitignore
deleted file mode 100644
index 3b0c72dc76e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/VT_String_ConnectorE.idl
-/VT_String_Connector_conn.cpp
-/VT_String_Connector_conn.h
-/VT_String_Connector_conn_export.h
-/VT_String_Connector_lem_stub_export.h
-/VT_String_Connector_stub_export.h
-/VT_String_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.idl
deleted file mode 100644
index 77638199e2d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file VT_String_Connector.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef VT_STRING_CONNECTOR_IDL_
-#define VT_STRING_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/VTopic_Base.idl"
-
-#pragma ciao lem "Conn_String/VT_String_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/VTopic_BaseTypeSupport.idl"
-#endif
-
-module VTopic
-{
-  module ::CCM_DDS::Typed < ::TopicString, ::TopicStringSeq> TopicStringConnector;
-};
-
-#endif /* VTopic_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc
deleted file mode 100644
index 480834a3807..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_VTopic_Base -l .. -o ../lib -u DDS VT_String_Connector"
-
-project(DDS_VT_STRING_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_VTopic_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=VT_STRING_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=VT_String_Connector_stub_export.h \
-              -Wb,skel_export_macro=VT_STRING_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=VT_String_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=VT_STRING_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=VT_String_Connector_svnt_export.h \
-              -Wb,conn_export_macro=VT_STRING_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=VT_String_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    VT_String_Connector.idl
-  }
-}
-
-project(DDS_VT_STRING_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_VT_STRING_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=VT_STRING_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=VT_String_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    VT_String_ConnectorE.idl
-  }
-}
-
-project(DDS_VT_STRING_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_VT_STRING_Connector_lem_gen DDS_VT_String_Connector_stub DDS_VTopic_Base_stub
-  libs  += DDS_VTopic_Base_stub DDS_VT_String_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_VT_STRING_Connector_lem_stub
-  dynamicflags += VT_STRING_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VT_String_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    VT_String_ConnectorEC.h
-    VT_String_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    VT_String_ConnectorEC.inl
-  }
-}
-
-project(DDS_VT_String_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_VT_STRING_Connector_idl_gen DDS_VTopic_Base_stub
-  libs  += DDS_VTopic_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_VT_String_Connector_stub
-  dynamicflags += VT_STRING_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VT_String_ConnectorC.cpp
-  }
-
-  Header_Files {
-    VT_String_ConnectorC.h
-    VT_String_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    VT_String_ConnectorC.inl
-  }
-}
-
-project(DDS_VT_String_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_VT_STRING_Connector_lem_stub DDS_VT_String_Connector_stub DDS_VTopic_Base_stub
-  sharedname = DDS_VT_String_Connector_exec
-  libs += DDS_VT_String_Connector_stub DDS_VT_STRING_Connector_lem_stub DDS_VTopic_Base_stub DDS_VTopic_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += VT_STRING_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VT_String_Connector_conn.cpp
-  }
-
-  Header_Files {
-    VT_String_Connector_conn.h
-    VT_String_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_VT_String_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_VT_STRING_Connector_lem_stub DDS_VT_String_Connector_exec DDS_VT_String_Connector_stub
-  sharedname  = DDS_VT_String_Connector_svnt
-  libs       += DDS_VT_String_Connector_stub \
-                DDS_VT_STRING_Connector_lem_stub  \
-                DDS_VTopic_Base_stub \
-                DDS_VT_String_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += VT_STRING_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VT_String_ConnectorS.cpp
-    VT_String_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    VT_String_ConnectorS.h
-    VT_String_Connector_svnt.h
-    VT_String_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/.gitignore b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/.gitignore
deleted file mode 100644
index f31e62c9ad2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/VT_Union_ConnectorE.idl
-/VT_Union_Connector_conn.cpp
-/VT_Union_Connector_conn.h
-/VT_Union_Connector_conn_export.h
-/VT_Union_Connector_lem_stub_export.h
-/VT_Union_Connector_stub_export.h
-/VT_Union_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.idl
deleted file mode 100644
index f24b37413ee..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.idl
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * @file VT_Union_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef VT_UNION_CONNECTOR_IDL_
-#define VT_UNION_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/VTopic_Base.idl"
-
-#pragma ciao lem "Conn_Union/VT_Union_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/VTopic_BaseTypeSupport.idl"
-#endif
-
-module VTopic
-{
-  module ::CCM_DDS::Typed < ::TopicUnion, ::TopicUnionSeq> TopicUnionConnector;
-#if !defined (CIAO_DDS4CCM_OPENDDS)
-  module ::CCM_DDS::Typed < ::X_Union, ::X_UnionSeq> X_UnionConnector;
-#else
-  module ::CCM_DDS::Typed < ::TopicString, ::TopicStringSeq> X_UnionConnector;
-#endif
-};
-
-#endif /* VT_UNION_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.mpc
deleted file mode 100644
index c517a48c0c4..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.mpc
+++ /dev/null
@@ -1,140 +0,0 @@
-project(DDS_VT_UNION_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_VTopic_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=VT_UNION_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=VT_Union_Connector_stub_export.h \
-              -Wb,skel_export_macro=VT_UNION_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=VT_Union_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=VT_UNION_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=VT_Union_Connector_svnt_export.h \
-              -Wb,conn_export_macro=VT_UNION_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=VT_Union_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    VT_Union_Connector.idl
-  }
-}
-
-project(DDS_VT_UNION_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_VT_UNION_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=VT_UNION_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=VT_Union_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    VT_Union_ConnectorE.idl
-  }
-}
-
-project(DDS_VT_UNION_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_VT_UNION_Connector_lem_gen DDS_VT_Union_Connector_stub DDS_VTopic_Base_stub
-  libs  += DDS_VTopic_Base_stub DDS_VT_Union_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_VT_UNION_Connector_lem_stub
-  dynamicflags += VT_UNION_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VT_Union_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    VT_Union_ConnectorEC.h
-    VT_Union_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    VT_Union_ConnectorEC.inl
-  }
-}
-
-project(DDS_VT_Union_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_VT_UNION_Connector_idl_gen DDS_VTopic_Base_stub
-  libs  += DDS_VTopic_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_VT_Union_Connector_stub
-  dynamicflags += VT_UNION_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VT_Union_ConnectorC.cpp
-  }
-
-  Header_Files {
-    VT_Union_ConnectorC.h
-    VT_Union_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    VT_Union_ConnectorC.inl
-  }
-}
-
-project(DDS_VT_Union_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_VT_UNION_Connector_lem_stub DDS_VT_Union_Connector_stub DDS_VTopic_Base_stub
-  sharedname = DDS_VT_Union_Connector_exec
-  libs += DDS_VT_Union_Connector_stub DDS_VT_UNION_Connector_lem_stub DDS_VTopic_Base_stub DDS_VTopic_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += VT_UNION_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VT_Union_Connector_conn.cpp
-  }
-
-  Header_Files {
-    VT_Union_Connector_conn.h
-    VT_Union_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_VT_Union_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_VT_UNION_Connector_lem_stub DDS_VT_Union_Connector_exec \
-                DDS_VT_Union_Connector_stub
-  sharedname  = DDS_VT_Union_Connector_svnt
-  libs       += DDS_VT_Union_Connector_stub \
-                DDS_VT_UNION_Connector_lem_stub  \
-                DDS_VTopic_Base_stub \
-                DDS_VT_Union_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += VT_UNION_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VT_Union_ConnectorS.cpp
-    VT_Union_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    VT_Union_ConnectorS.h
-    VT_Union_Connector_svnt.h
-    VT_Union_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/.gitignore b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/.gitignore
deleted file mode 100644
index b4c58344475..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/VT_Valuetype_ConnectorE.idl
-/VT_Valuetype_Connector_conn.cpp
-/VT_Valuetype_Connector_conn.h
-/VT_Valuetype_Connector_conn_export.h
-/VT_Valuetype_Connector_lem_stub_export.h
-/VT_Valuetype_Connector_stub_export.h
-/VT_Valuetype_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.idl
deleted file mode 100644
index d77be1c18e3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.idl
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * @file VT_Valuetype_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef VT_VALUETYPE_CONNECTOR_IDL_
-#define VT_VALUETYPE_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/VTopic_Base.idl"
-
-#pragma ciao lem "Conn_Valuetype/VT_Valuetype_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/VTopic_BaseTypeSupport.idl"
-#endif
-
-module VTopic
-{
-#if !defined (CIAO_DDS4CCM_OPENDDS)
-  module ::CCM_DDS::Typed < ::TopicValuetype, ::TopicValuetypeSeq> TopicValuetypeConnector;
-#else
-  // Just use another topic, that way we get a connector
-  module ::CCM_DDS::Typed < ::TopicString, ::TopicStringSeq> TopicValuetypeConnector;
-#endif
-};
-
-#endif /* VT_VALUETYPE_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.mpc
deleted file mode 100644
index 41549b931ce..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.mpc
+++ /dev/null
@@ -1,140 +0,0 @@
-project(DDS_VT_VALUETYPE_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=VT_VALUETYPE_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=VT_Valuetype_Connector_stub_export.h \
-              -Wb,skel_export_macro=VT_VALUETYPE_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=VT_Valuetype_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=VT_VALUETYPE_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=VT_Valuetype_Connector_svnt_export.h \
-              -Wb,conn_export_macro=VT_VALUETYPE_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=VT_Valuetype_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    VT_Valuetype_Connector.idl
-  }
-}
-
-project(DDS_VT_VALUETYPE_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_VT_VALUETYPE_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=VT_VALUETYPE_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=VT_Valuetype_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    VT_Valuetype_ConnectorE.idl
-  }
-}
-
-project(DDS_VT_VALUETYPE_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_VT_VALUETYPE_Connector_lem_gen DDS_VT_Valuetype_Connector_stub DDS_VTopic_Base_stub 
-  libs  += DDS_VTopic_Base_stub DDS_VT_Valuetype_Connector_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_VT_VALUETYPE_Connector_lem_stub
-  dynamicflags += VT_VALUETYPE_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VT_Valuetype_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    VT_Valuetype_ConnectorEC.h
-    VT_Valuetype_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    VT_Valuetype_ConnectorEC.inl
-  }
-}
-
-project(DDS_VT_Valuetype_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_VT_VALUETYPE_Connector_idl_gen DDS_VTopic_Base_stub
-  libs  += DDS_VTopic_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_VT_Valuetype_Connector_stub
-  dynamicflags += VT_VALUETYPE_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VT_Valuetype_ConnectorC.cpp
-  }
-
-  Header_Files {
-    VT_Valuetype_ConnectorC.h
-    VT_Valuetype_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    VT_Valuetype_ConnectorC.inl
-  }
-}
-
-project(DDS_VT_Valuetype_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_VT_VALUETYPE_Connector_lem_stub DDS_VT_Valuetype_Connector_stub DDS_VTopic_Base_stub
-  sharedname = DDS_VT_Valuetype_Connector_exec
-  libs += DDS_VT_Valuetype_Connector_stub DDS_VT_VALUETYPE_Connector_lem_stub DDS_VTopic_Base_stub DDS_VTopic_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += VT_VALUETYPE_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VT_Valuetype_Connector_conn.cpp
-  }
-
-  Header_Files {
-    VT_Valuetype_Connector_conn.h
-    VT_Valuetype_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_VT_Valuetype_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_VT_VALUETYPE_Connector_lem_stub DDS_VT_Valuetype_Connector_exec \
-                DDS_VT_Valuetype_Connector_stub 
-  sharedname  = DDS_VT_Valuetype_Connector_svnt
-  libs       += DDS_VT_Valuetype_Connector_stub \
-                DDS_VT_VALUETYPE_Connector_lem_stub  \
-                DDS_VTopic_Base_stub \
-                DDS_VT_Valuetype_Connector_exec 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += VT_VALUETYPE_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VT_Valuetype_ConnectorS.cpp
-    VT_Valuetype_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    VT_Valuetype_ConnectorS.h
-    VT_Valuetype_Connector_svnt.h
-    VT_Valuetype_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/.gitignore
deleted file mode 100644
index 87fede18822..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/VTopic_ConnectorE.idl
-/VTopic_Connector_conn.cpp
-/VTopic_Connector_conn.h
-/VTopic_Connector_conn_export.h
-/VTopic_Connector_lem_stub_export.h
-/VTopic_Connector_stub_export.h
-/VTopic_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.idl
deleted file mode 100644
index 5fb041c38ba..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file VTopic_Connector.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef VTOPIC_CONNECTOR_IDL_
-#define VTOPIC_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/VTopic_Base.idl"
-
-#pragma ciao lem "Connector/VTopic_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/VTopic_BaseTypeSupport.idl"
-#endif
-
-module VTopic
-{
-  module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> TestTopicConnector;
-};
-
-#endif /* VTopic_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc
deleted file mode 100644
index f453a351a0b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_VTopic_Base -l .. -o ../lib -u DDS VTopic_Connector"
-
-project(DDS_VTopic_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_VTopic_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=VTOPIC_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=VTopic_Connector_stub_export.h \
-              -Wb,skel_export_macro=VTOPIC_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=VTopic_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=VTOPIC_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=VTopic_Connector_svnt_export.h \
-              -Wb,conn_export_macro=VTOPIC_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=VTopic_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    VTopic_Connector.idl
-  }
-}
-
-project(DDS_VTopic_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_VTopic_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=VTOPIC_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=VTopic_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    VTopic_ConnectorE.idl
-  }
-}
-
-project(DDS_VTopic_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_VTopic_Connector_lem_gen DDS_VTopic_Connector_stub DDS_VTopic_Base_stub
-  libs  += DDS_VTopic_Base_stub DDS_VTopic_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_VTopic_Connector_lem_stub
-  dynamicflags += VTOPIC_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTopic_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    VTopic_ConnectorEC.h
-    VTopic_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    VTopic_ConnectorEC.inl
-  }
-}
-
-project(DDS_VTopic_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_VTopic_Connector_idl_gen DDS_VTopic_Base_stub
-  libs  += DDS_VTopic_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_VTopic_Connector_stub
-  dynamicflags += VTOPIC_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTopic_ConnectorC.cpp
-  }
-
-  Header_Files {
-    VTopic_ConnectorC.h
-    VTopic_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    VTopic_ConnectorC.inl
-  }
-}
-
-project(DDS_VTopic_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_VTopic_Connector_lem_stub DDS_VTopic_Connector_stub DDS_VTopic_Base_stub
-  sharedname = DDS_VTopic_Connector_exec
-  libs += DDS_VTopic_Connector_stub DDS_VTopic_Connector_lem_stub DDS_VTopic_Base_stub DDS_VTopic_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += VTOPIC_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTopic_Connector_conn.cpp
-  }
-
-  Header_Files {
-    VTopic_Connector_conn.h
-    VTopic_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_VTopic_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_VTopic_Connector_lem_stub DDS_VTopic_Connector_exec DDS_VTopic_Connector_stub
-  sharedname  = DDS_VTopic_Connector_svnt
-  libs       += DDS_VTopic_Connector_stub \
-                DDS_VTopic_Connector_lem_stub  \
-                DDS_VTopic_Base_stub \
-                DDS_VTopic_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += VTOPIC_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTopic_ConnectorS.cpp
-    VTopic_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    VTopic_ConnectorS.h
-    VTopic_Connector_svnt.h
-    VTopic_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/.gitignore b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/.gitignore
deleted file mode 100644
index d15d8965d3e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/Receiver_exec_export.h
-/Receiver_lem_stub_export.h
-/Receiver_stub_export.h
-/Receiver_svnt_export.h
-/VTopic_ReceiverE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.idl
deleted file mode 100644
index 596e652a286..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.idl
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * @file
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/VTopic_Connector.idl"
-
-module VTopic
-{
-  component Receiver
-  {
-    port TestTopicConnector::DDS_Listen info_out;
-    provides CCM_DDS::ConnectorStatusListener connector_status;
-   };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc
deleted file mode 100644
index 096d14bb5f7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc
+++ /dev/null
@@ -1,166 +0,0 @@
-project(DDS_VTopic_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_VTopic_Connector_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h \
-              -I ..
-
-  IDL_Files {
-    VTopic_Receiver.idl
-  }
-}
-
-project(DDS_VTopic_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_VTopic_Receiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    VTopic_ReceiverE.idl
-  }
-}
-
-project(DDS_VTopic_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_VTopic_Receiver_lem_gen DDS_VTopic_Receiver_stub DDS_VTopic_Base_stub
-  libs  += DDS_VTopic_Base_stub Receiver_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTopic_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    VTopic_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    VTopic_ReceiverEC.inl
-  }
-}
-
-project(DDS_VTopic_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_VTopic_Receiver_idl_gen DDS_VTopic_Base_stub \
-           DDS_VTopic_Connector_lem_stub DDS_VTopic_Connector_stub \
-           DDS_VT_String_Connector_lem_stub DDS_VT_String_Connector_stub \
-           DDS_VT_Array_Connector_lem_stub DDS_VT_Array_Connector_stub \
-           DDS_VT_Valuetype_Connector_lem_stub DDS_VT_Valuetype_Connector_stub \
-           DDS_VT_Union_Connector_lem_stub DDS_VT_Union_Connector_stub \
-           DDS_VT_Seq_Connector_lem_stub DDS_VT_Seq_Connector_stub
-  libs  += DDS_VTopic_Base_stub DDS_VTopic_Connector_stub  DDS_VT_Array_Connector_stub \
-           DDS_VT_Valuetype_Connector_stub DDS_VT_Union_Connector_stub \
-           DDS_VT_String_Connector_stub DDS_VT_Seq_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTopic_ReceiverC.cpp
-  }
-
-  Header_Files {
-    VTopic_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    VTopic_ReceiverC.inl
-  }
-}
-
-project(DDS_VTopic_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after     += DDS_VTopic_Receiver_lem_stub DDS_VTopic_Receiver_stub \
-               DDS_VTopic_Connector_lem_stub  DDS_VTopic_Connector_stub\
-               DDS_VT_Array_Connector_lem_stub DDS_VT_Array_Connector_stub \
-               DDS_VT_String_Connector_lem_stub DDS_VT_String_Connector_stub \
-               DDS_VT_Valuetype_Connector_lem_stub DDS_VT_Valuetype_Connector_stub \
-               DDS_VT_Union_Connector_lem_stub DDS_VT_Union_Connector_stub \
-               DDS_VT_Seq_Connector_lem_stub DDS_VT_Seq_Connector_stub 
-  sharedname = Receiver_exec
-  libs      += Receiver_stub Receiver_lem_stub DDS_VTopic_Base_stub DDS_VTopic_Connector_lem_stub \
-               DDS_VTopic_Connector_stub DDS_VT_Array_Connector_stub DDS_VT_String_Connector_stub \
-               DDS_VT_Valuetype_Connector_stub DDS_VT_Union_Connector_stub \
-               DDS_VT_Seq_Connector_stub 
-  libpaths  += ../lib
-  includes  += ..
-  libout = ../lib
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTopic_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    VTopic_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_VTopic_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_VTopic_Base_stub  DDS_VTopic_Receiver_lem_stub \
-                DDS_VT_String_Connector_stub DDS_VT_String_Connector_svnt DDS_VT_String_Connector_lem_stub \
-                DDS_VT_Seq_Connector_stub DDS_VT_Seq_Connector_svnt DDS_VT_Seq_Connector_lem_stub\
-                DDS_VT_Array_Connector_stub DDS_VT_Array_Connector_svnt DDS_VT_Array_Connector_lem_stub \
-                DDS_VT_Valuetype_Connector_stub DDS_VT_Valuetype_Connector_svnt DDS_VT_Valuetype_Connector_lem_stub \
-                DDS_VT_Union_Connector_stub DDS_VT_Union_Connector_svnt DDS_VT_Union_Connector_lem_stub \
-                DDS_VTopic_Connector_stub DDS_VTopic_Connector_svnt DDS_VTopic_Connector_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub \
-                DDS_VTopic_Base_stub \
-                DDS_VTopic_Connector_stub DDS_VTopic_Connector_svnt \
-                DDS_VT_Array_Connector_stub DDS_VT_Array_Connector_svnt \
-                DDS_VT_String_Connector_stub DDS_VT_String_Connector_svnt \
-                DDS_VT_Seq_Connector_stub DDS_VT_Seq_Connector_svnt \
-                DDS_VT_Valuetype_Connector_stub DDS_VT_Valuetype_Connector_svnt \
-                DDS_VT_Union_Connector_stub DDS_VT_Union_Connector_svnt
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTopic_ReceiverS.cpp
-    VTopic_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    VTopic_ReceiverS.h
-    VTopic_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.cpp
deleted file mode 100644
index 532551382f1..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-// -*- C++ -*-
-//Test for different topictypes with DDS_Event connector, look for 'SUBSCRIPTION_MATCHED_STATUS
-
-#include "VTopic_Receiver_exec.h"
-#include "ace/Log_Msg.h"
-#include "dds4ccm/impl/Utils.h"
-
-namespace CIAO_VTopic_Receiver_Impl
-{
-//============================================================
-  // Facet Executor Implementation Class: ConnectorStatusListener_exec_i
-  //============================================================
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (
-    Atomic_Boolean &subscription_matched)
-    : subscription_matched_ (subscription_matched)
-  {
-  }
-
-  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic (
-    ::DDS::Topic_ptr /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos(
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected(
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status(
-    ::DDS::Entity_ptr the_entity,
-    ::DDS::StatusKind  status_kind)
-  {
-    if (! ::CORBA::is_nil (the_entity) &&
-        status_kind == ::DDS::SUBSCRIPTION_MATCHED_STATUS)
-      {
-        this->subscription_matched_ = true;
-      }
-  }
-
-  //============================================================
-  // Component Executor Implementation Class: Receiver_exec_iTestTopic_RawListener_exec_i ();
-  //============================================================
-  Receiver_exec_i::Receiver_exec_i (void)
-    : subscription_matched_ (false)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-  // Port operations.
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Receiver_exec_i::get_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i (this->subscription_matched_);
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_status (void)
-  {
-    return CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::VTopic::TestTopicConnector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_out_data_listener (void)
-  {
-    return ::VTopic::TestTopicConnector::CCM_Listener::_nil ();
-  }
-
-
-  // Operations from Components::SessionComponent.
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::VTopic::CCM_Receiver_Context::_narrow (ctx);
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-     if(!this->subscription_matched_.value ())
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: did not receive the expected ")
-                               ACE_TEXT ("states 'SUBSCRIPTION_MATCHED_STATUS' in Receiver\n")
-                    ));
-      }
-    else
-      {
-         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Received the expected ")
-                               ACE_TEXT ("'SUBSCRIPTION_MATCHED_STATUS' in Receiver\n")
-                    ));
-      }
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_VTopic_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.h
deleted file mode 100644
index 2358cf76e53..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.h
+++ /dev/null
@@ -1,92 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_RECEIVER_EXEC_H_
-#define CIAO_RECEIVER_EXEC_H_
-
-#include "VTopic_ReceiverEC.h"
-
-#include /**/ "Receiver_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-
-
-namespace CIAO_VTopic_Receiver_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
-
-  class Receiver_exec_i;
-
-  class RECEIVER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Atomic_Boolean &);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-    void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                     const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-    void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                               ::DDS::StatusKind  status_kind);
-
-  private:
-    Atomic_Boolean &subscription_matched_;
-  };
-
-  class RECEIVER_EXEC_Export Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-   // Supported operations and attributes.
-   // Port operations.
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_connector_status (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_status (void);
-
-    virtual ::VTopic::TestTopicConnector::CCM_Listener_ptr
-    get_info_out_data_listener (void);
-
-    // Operations from Components::SessionComponent.
-    virtual void
-    set_session_context (
-      ::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-
-  private:
-    ::VTopic::CCM_Receiver_Context_var context_;
-    Atomic_Boolean subscription_matched_;
-};
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_VTopic_Receiver_Impl (void);
-}
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/.gitignore b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/.gitignore
deleted file mode 100644
index abf3e87655b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/Sender_exec_export.h
-/Sender_lem_stub_export.h
-/Sender_stub_export.h
-/Sender_svnt_export.h
-/VTopic_SenderE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.idl
deleted file mode 100644
index 1f865a9eee5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef DDS_VTOPIC_SENDER_IDL
-#define DDS_VTOPIC_SENDER_IDL
-
-#include "Connector/VTopic_Connector.idl"
-
-module VTopic
-{
-  component Sender
-  {
-    port TestTopicConnector::DDS_Write info_write;
-    provides CCM_DDS::ConnectorStatusListener connector_status;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc
deleted file mode 100644
index 875462836f2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc
+++ /dev/null
@@ -1,169 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_VTopic_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_VTopic_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_VTopic_Connector_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I ..
-
-  IDL_Files {
-    VTopic_Sender.idl
-  }
-}
-
-project(DDS_VTopic_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_VTopic_Sender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    VTopic_SenderE.idl
-  }
-}
-
-project(DDS_VTopic_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_VTopic_Sender_lem_gen DDS_VTopic_Sender_stub DDS_VTopic_Base_stub
-  libs  += DDS_VTopic_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTopic_SenderEC.cpp
-  }
-
-  Header_Files {
-    VTopic_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    VTopic_SenderEC.inl
-  }
-}
-
-project(DDS_VTopic_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_VTopic_Sender_idl_gen DDS_VTopic_Base_stub \
-           DDS_VTopic_Connector_lem_stub DDS_VTopic_Connector_stub \
-           DDS_VT_String_Connector_lem_stub DDS_VT_String_Connector_stub \
-           DDS_VT_Array_Connector_lem_stub DDS_VT_Array_Connector_stub \
-           DDS_VT_Valuetype_Connector_lem_stub DDS_VT_Valuetype_Connector_stub \
-           DDS_VT_Union_Connector_lem_stub DDS_VT_Union_Connector_stub \
-           DDS_VT_Seq_Connector_lem_stub DDS_VT_Seq_Connector_stub
-  libs  += DDS_VTopic_Base_stub DDS_VTopic_Connector_stub \
-           DDS_VT_Array_Connector_stub DDS_VT_String_Connector_stub \
-           DDS_VT_Seq_Connector_stub DDS_VT_Valuetype_Connector_stub \
-           DDS_VT_Union_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTopic_SenderC.cpp
-  }
-
-  Header_Files {
-    VTopic_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    VTopic_SenderC.inl
-  }
-}
-
-project(DDS_VTopic_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_VTopic_Sender_lem_stub DDS_VTopic_Sender_stub \
-             DDS_VTopic_Connector_lem_stub DDS_VTopic_Connector_stub \
-             DDS_VT_Array_Connector_lem_stub DDS_VT_Array_Connector_stub \
-             DDS_VT_Valuetype_Connector_lem_stub DDS_VT_Valuetype_Connector_stub \
-             DDS_VT_Union_Connector_lem_stub DDS_VT_Union_Connector_stub \
-             DDS_VT_String_Connector_lem_stub DDS_VT_String_Connector_stub \
-             DDS_VT_Seq_Connector_lem_stub DDS_VT_Seq_Connector_stub 
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub DDS_VTopic_Base_stub \
-          DDS_VTopic_Connector_lem_stub DDS_VTopic_Connector_stub \
-          DDS_VT_Array_Connector_stub DDS_VT_String_Connector_stub \
-          DDS_VT_Seq_Connector_stub DDS_VT_Valuetype_Connector_stub \
-          DDS_VT_Union_Connector_stub 
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTopic_Sender_exec.cpp
-  }
-
-  Header_Files {
-    VTopic_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_VTopic_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_VTopic_Base_stub  DDS_VTopic_Sender_lem_stub \
-                DDS_VTopic_Connector_stub DDS_VTopic_Connector_svnt DDS_VTopic_Connector_lem_stub \
-                DDS_VT_Array_Connector_stub DDS_VT_Array_Connector_svnt DDS_VT_Array_Connector_lem_stub \
-                DDS_VT_Valuetype_Connector_stub DDS_VT_Valuetype_Connector_svnt DDS_VT_Valuetype_Connector_lem_stub \
-                DDS_VT_Union_Connector_stub DDS_VT_Union_Connector_svnt DDS_VT_Union_Connector_lem_stub \
-                DDS_VT_String_Connector_stub DDS_VT_String_Connector_svnt DDS_VT_String_Connector_lem_stub \
-                DDS_VT_Seq_Connector_stub DDS_VT_Seq_Connector_svnt DDS_VT_Seq_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                DDS_VTopic_Base_stub \
-                DDS_VTopic_Connector_stub DDS_VTopic_Connector_svnt \
-                DDS_VT_Array_Connector_stub DDS_VT_Array_Connector_svnt \
-                DDS_VT_Valuetype_Connector_stub DDS_VT_Valuetype_Connector_svnt \
-                DDS_VT_Union_Connector_stub DDS_VT_Union_Connector_svnt \
-                DDS_VT_String_Connector_stub DDS_VT_String_Connector_svnt \
-                DDS_VT_Seq_Connector_stub DDS_VT_Seq_Connector_svnt
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTopic_SenderS.cpp
-    VTopic_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    VTopic_SenderS.h
-    VTopic_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.cpp
deleted file mode 100644
index 9bfe71d10d6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.cpp
+++ /dev/null
@@ -1,139 +0,0 @@
-// -*- C++ -*-
-
-//Test different topic types, with DDS_EVENT connectors,  look for 'PUBLICATION_MATCHED_STATUS
-#include "VTopic_Sender_exec.h"
-#include "ace/Log_Msg.h"
-#include "dds4ccm/impl/Utils.h"
-
-namespace CIAO_VTopic_Sender_Impl
-{
-  //============================================================
-  // Facet Executor Implementation Class: ConnectorStatusListener_exec_i
-  //============================================================
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (
-    Atomic_Boolean &publication_matched)
-    : publication_matched_ (publication_matched)
-  {
-  }
-
-  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic(
-    ::DDS::Topic_ptr /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos(
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected(
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status(
-    ::DDS::Entity_ptr the_entity,
-    ::DDS::StatusKind  status_kind)
-  {
-    if (! ::CORBA::is_nil (the_entity) &&
-        status_kind == ::DDS::PUBLICATION_MATCHED_STATUS)
-      {
-        this->publication_matched_ = true;
-      }
-  }
-
-  //============================================================
-  // Component Executor Implementation Class: Sender_exec_i
-  //============================================================
-  Sender_exec_i::Sender_exec_i (void)
-    : publication_matched_ (false)
-  {
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-  }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_connector_status (void)
-
-  {
-    return new ConnectorStatusListener_exec_i (this->publication_matched_);
-  }
-
-  // Supported operations and attributes.
-  void
-  Sender_exec_i::set_session_context (::Components::SessionContext_ptr ctx)
-  {
-    this->context_ = ::VTopic::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-   }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    if(!this->publication_matched_.value ())
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: did not receive the expected ")
-                               ACE_TEXT ("states 'PUBLICATION_MATCHED_STATUS' in Sender\n")
-                    ));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Received the expected ")
-                               ACE_TEXT ("'PUBLICATION_MATCHED_STATUS' in Sender\n")
-                    ));
-      }
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_VTopic_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.h
deleted file mode 100644
index 501bb50c7f8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.h
+++ /dev/null
@@ -1,81 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_SENDER_EXEC_H_
-#define CIAO_SENDER_EXEC_H_
-
-#include "VTopic_SenderEC.h"
-
-#include /**/ "Sender_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-namespace CIAO_VTopic_Sender_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
-
-  class Sender_exec_i;
-
-  class SENDER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Atomic_Boolean &);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-    void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                     const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-    void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                               ::DDS::StatusKind  status_kind);
-  private:
-    Atomic_Boolean &publication_matched_;
-  };
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-
-    // Port operations.
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_connector_status(void);
-
-  private:
-    ::VTopic::CCM_Sender_Context_var context_;
-
-    Atomic_Boolean publication_matched_;
-};
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_VTopic_Sender_Impl (void);
-
-}
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/Plan.cdp
deleted file mode 100644
index a224e9d2671..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/Plan.cdp
+++ /dev/null
@@ -1,1247 +0,0 @@
-<!--  -->
-<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>VTopic_Depl_1</label>
-  <UUID>VTopic_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_VTopic_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_VTopic_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="VTopic_ConnectorComponentImplementation">
-    <name>VTopic_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="VTopic_Connector_ExecArtifact" />
-    <artifact xmi:idref="VTopic_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_VTopic_TestTopicConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_VTopic_TestTopicConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>VTopic_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>VTopic_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="VT_String_ConnectorComponentImplementation">
-    <name>VT_String_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="VT_String_Connector_ExecArtifact" />
-    <artifact xmi:idref="VT_String_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_VTopic_TopicStringConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_VTopic_TopicStringConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>VT_String_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>VT_String_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="VT_Array_ConnectorComponentImplementation">
-    <name>VT_Array_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="VT_Array_Connector_ExecArtifact" />
-    <artifact xmi:idref="VT_Array_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_VTopic_TopicArrayConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_VTopic_TopicArrayConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>VT_Array_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>VT_Array_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="VT_Valuetype_ConnectorComponentImplementation">
-    <name>VT_Valuetype_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="VT_Valuetype_Connector_ExecArtifact" />
-    <artifact xmi:idref="VT_Valuetype_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_VTopic_TopicValuetypeConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_VTopic_TopicValuetypeConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>VT_Valuetype_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>VT_Valuetype_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="VT_Union_ConnectorComponentImplementation">
-    <name>VT_Union_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="VT_Union_Connector_ExecArtifact" />
-    <artifact xmi:idref="VT_Union_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_VTopic_TopicUnionConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_VTopic_TopicUnionConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>VT_Union_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>VT_Union_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="VT_X_Union_ConnectorComponentImplementation">
-    <name>VT_X_Union_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="VT_Union_Connector_ExecArtifact" />
-    <artifact xmi:idref="VT_Union_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_VTopic_X_UnionConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_VTopic_X_UnionConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>VT_Union_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>VT_Union_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="VT_Seq_ConnectorComponentImplementation">
-    <name>VT_Seq_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="VT_Seq_Connector_ExecArtifact" />
-    <artifact xmi:idref="VT_Seq_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_VTopic_TopicSeqConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_VTopic_TopicSeqConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>VT_Seq_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>VT_Seq_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_VTopic_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_VTopic_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-  </instance>
-
-  <instance xmi:id="VTopic_ConnectorComponentInstance">
-    <name>VTopic_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="VTopic_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestUS</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="VTopic_ConnectorComponentInstance2">
-    <name>VTopic_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="VTopic_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestUS</string>
-        </value>
-      </value>
-    </configProperty>
-   </instance>
-
-  <instance xmi:id="VT_String_ConnectorComponentInstance">
-    <name>VT_String_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="VT_String_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestString</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="VT_String_ConnectorComponentInstance2">
-    <name>VT_String_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="VT_String_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestString</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="VT_Array_ConnectorComponentInstance">
-    <name>VT_Array_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="VT_Array_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestArray</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="VT_Array_ConnectorComponentInstance2">
-    <name>VT_Array_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="VT_Array_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestArray</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="VT_Valuetype_ConnectorComponentInstance">
-    <name>VT_Valuetype_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="VT_Valuetype_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestValuetype</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="VT_Valuetype_ConnectorComponentInstance2">
-    <name>VT_Valuetype_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="VT_Valuetype_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestValuetype</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="VT_Union_ConnectorComponentInstance">
-    <name>VT_Union_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="VT_Union_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestUnion</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="VT_Union_ConnectorComponentInstance2">
-    <name>VT_Union_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="VT_Union_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestUnion</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="VT_X_Union_ConnectorComponentInstance">
-    <name>VT_X_Union_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="VT_X_Union_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Test_X_Union</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="VT_X_Union_ConnectorComponentInstance2">
-    <name>VT_X_Union_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="VT_X_Union_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Test_X_Union</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="VT_Seq_ConnectorComponentInstance">
-    <name>VT_Seq_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="VT_Seq_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestSeq</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="VT_Seq_ConnectorComponentInstance2">
-    <name>VT_Seq_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="VT_Seq_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestSeq</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-  </instance>
-
-  <!--
-      *****************************
-      Regular connector connections
-      *****************************
-  -->
-  <connection>
-    <name>connector_status_receiver</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="VTopic_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>connector_status_sender</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="VTopic_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <!-- connection in order to establish a publication_matched
-  -->
-  <connection>
-    <name>test_topic_info_write</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="VTopic_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <!-- connection in order to establish a subscription_matched
-       -->
-  <connection>
-    <name>test_topic_info_out</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="VTopic_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <!--
-      *****************************
-      String connector connections
-      *****************************
-  -->
-  <connection>
-    <name>connector_status_receiver_string</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="VT_String_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>connector_status_sender_string</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="VT_String_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <!--
-      *****************************
-      Array connector connections
-      *****************************
-  -->
-  <connection>
-    <name>connector_status_receiver_array</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="VT_Array_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>connector_status_sender_array</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="VT_Array_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <!--
-      *****************************
-      ValueType connector connections
-      *****************************
-  -->
-  <connection>
-    <name>connector_status_receiver_valuetype</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="VT_Valuetype_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>connector_status_sender_valuetype</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="VT_Valuetype_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <!--
-      *****************************
-      Union connector connections
-      *****************************
-  -->
-  <connection>
-    <name>connector_status_receiver_union</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="VT_Union_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>connector_status_sender_union</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="VT_Union_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status_receiver_x_union</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="VT_X_Union_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>connector_status_sender_x_union</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="VT_X_Union_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <!--
-      *****************************
-      Sequence connector connections
-      *****************************
-  -->
-  <connection>
-    <name>connector_status_receiver_seq</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="VT_Seq_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>connector_status_sender_seq</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="VT_Seq_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="VTopic_Connector_ExecArtifact">
-    <name>VTopic_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_VTopic_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="VTopic_Connector_SvntArtifact">
-    <name>VTopic_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_VTopic_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="VTopic_Connector_StubArtifact">
-    <name>VTopic_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_VTopic_Connector_stub</location>
-  </artifact>
-
-  <artifact xmi:id="VT_String_Connector_ExecArtifact">
-    <name>VT_String_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_VT_String_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="VT_String_Connector_SvntArtifact">
-    <name>VT_String_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_VT_String_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="VT_String_Connector_StubArtifact">
-    <name>VT_String_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDSVT_String_Connector_stub</location>
-  </artifact>
-
-  <artifact xmi:id="VT_Array_Connector_ExecArtifact">
-    <name>VT_Array_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_VT_Array_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="VT_Array_Connector_SvntArtifact">
-    <name>VT_Array_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_VT_Array_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="VT_Array_Connector_StubArtifact">
-    <name>VT_Array_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_VT_Array_Connector_stub</location>
-  </artifact>
-
-  <artifact xmi:id="VT_Valuetype_Connector_ExecArtifact">
-    <name>VT_Valuetype_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_VT_Valuetype_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="VT_Valuetype_Connector_SvntArtifact">
-    <name>VT_Valuetype_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_VT_Valuetype_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="VT_Valuetype_Connector_StubArtifact">
-    <name>VT_Valuetype_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_VT_Valuetype_Connector_stub</location>
-  </artifact>
-
-  <artifact xmi:id="VT_Union_Connector_ExecArtifact">
-    <name>VT_Union_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_VT_Union_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="VT_Union_Connector_SvntArtifact">
-    <name>VT_Union_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_VT_Union_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="VT_Union_Connector_StubArtifact">
-    <name>VT_Union_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_VT_Union_Connector_stub</location>
-  </artifact>
-
-  <artifact xmi:id="VT_Seq_Connector_ExecArtifact">
-    <name>VT_Seq_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_VT_Seq_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="VT_Seq_Connector_SvntArtifact">
-    <name>VT_Seq_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_VT_Seq_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="VT_Seq_Connector_StubArtifact">
-    <name>VT_Seq_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_VT_Seq_Connector_stub</location>
-  </artifact>
-
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl
deleted file mode 100755
index 7badf0431b3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 10 seconds to allow task to complete\n";
-sleep (10);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill (4 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/.gitignore b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl
deleted file mode 100644
index 0d4e8b46db4..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl
+++ /dev/null
@@ -1,118 +0,0 @@
-/**
- * @file   VTopics_Base.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef VTOPICS_BASE_IDL
-#define VTOPICS_BASE_IDL
-
-#pragma ndds typesupport "Base/VTopics_BaseSupport.h"
-#pragma opendds typesupport "Base/VTopics_BaseTypeSupportImpl.h"
-
-typedef octet octet_array[5];
-
-#pragma DCPS_DATA_TYPE "TestTopic"
-#pragma DCPS_DATA_KEY "TestTopic key"
-
-// Plain Topic
-struct TestTopic {
-  string key; //@key
-  long x;
-};
-
-#pragma DCPS_DATA_TYPE "TopicString"
-#pragma DCPS_DATA_KEY "TopicString key"
-
-// String
-struct TopicString {
-  string key; //@key
-  string x_str;
-};
-
-#pragma DCPS_DATA_TYPE "TopicArray"
-#pragma DCPS_DATA_KEY "TopicArray key"
-
-// Arrays
-struct TopicArray {
-  string key; //@key
-  octet_array x_array;
-};
-
-// Unions
-union X_Union switch (short) {
-  case 0:
-    string x_test;
-  case 1:
-    long   x_long;
-};
-
-#pragma DCPS_DATA_TYPE "TopicUnion"
-#pragma DCPS_DATA_KEY "TopicUnion key"
-
-struct TopicUnion {
-  string key; //@key
-  X_Union x_uni;
-};
-
-// Sequence
-struct test {
-  short x_test;
-  string x_teststr;
-};
-
-typedef sequence<test> testSeq;
-
-#pragma DCPS_DATA_TYPE "TopicSeq"
-#pragma DCPS_DATA_KEY "TopicSeq key"
-
-struct TopicSeq {
-  string key; //@key
-  testSeq x_seq;
-};
-
- // ValueType
-valuetype X_Valuetype {
-  public string type;
-  public long x_long;
-};
-
-#if !defined (CIAO_DDS4CCM_OPENDDS)
-// OpenDDS doesn't support valuetype as topic member
-#pragma DCPS_DATA_TYPE "TopicValuetype"
-#pragma DCPS_DATA_KEY "TopicValuetype key"
-
-struct TopicValuetype {
-  string key; //@key
-  X_Valuetype x_vt;
-};
-#endif
-
-// Sequences
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TestTopic> TestTopicSeq;
-#endif
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TopicString> TopicStringSeq;
-#endif
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TopicArray> TopicArraySeq;
-#endif
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TopicUnion> TopicUnionSeq;
-#endif
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<X_Union> X_UnionSeq;
-#endif
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TopicSeq> TopicSeqSeq;
-#endif
-#if !defined (CIAO_DDS4CCM_OPENDDS)
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TopicValuetype> TopicValuetypeSeq;
-#endif
-#endif
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<X_Valuetype> X_ValuetypeSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc
deleted file mode 100644
index 93338d3676d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc
+++ /dev/null
@@ -1,25 +0,0 @@
-project (DDS_VTopics_Base_stub) : taoidldefaults, \
-                                  dds4ccm_ts_default, valuetype {
-  sharedname = DDS_VTopics_Base_stub
-  dynamicflags += VTOPICS_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS \
-              -Wb,stub_export_macro=VTOPICS_BASE_STUB_Export \
-              -Wb,stub_export_include=VTopics_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    VTopics_Base.idl
-  }
-
-  opendds_ts_flags += --export=VTOPICS_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    VTopics_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.idl
deleted file mode 100644
index ec502e9d437..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file VTS_Array_Connector.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef VTS_ARRAY_CONNECTOR_IDL_
-#define VTS_ARRAY_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/VTopics_Base.idl"
-
-#pragma ciao lem "Conn_Array/VTS_Array_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/VTopics_BaseTypeSupport.idl"
-#endif
-
-module VTopics
-{
-  module ::CCM_DDS::Typed < ::TopicArray, ::TopicArraySeq> TopicArrayConnector;
-};
-
-#endif /* VTS_Array_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc
deleted file mode 100644
index c522762166e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc
+++ /dev/null
@@ -1,141 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_VTopics_Base -l .. -o ../lib -u DDS VTS_Array_Connector"
-
-project(DDS_VTS_ARRAY_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_VTopics_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=VTS_ARRAY_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=VTS_Array_Connector_stub_export.h \
-              -Wb,skel_export_macro=VTS_ARRAY_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=VTS_Array_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=VTS_ARRAY_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=VTS_Array_Connector_svnt_export.h \
-              -Wb,conn_export_macro=VTS_ARRAY_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=VTS_Array_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    VTS_Array_Connector.idl
-  }
-}
-
-project(DDS_VTS_ARRAY_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_VTS_ARRAY_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=VTS_ARRAY_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=VTS_Array_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    VTS_Array_ConnectorE.idl
-  }
-}
-
-project(DDS_VTS_ARRAY_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_VTS_ARRAY_Connector_lem_gen DDS_VTS_Array_Connector_stub DDS_VTopics_Base_stub
-  libs  += DDS_VTopics_Base_stub DDS_VTS_Array_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_VTS_ARRAY_Connector_lem_stub
-  dynamicflags += VTS_ARRAY_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTS_Array_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    VTS_Array_ConnectorEC.h
-    VTS_Array_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    VTS_Array_ConnectorEC.inl
-  }
-}
-
-project(DDS_VTS_Array_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_VTS_ARRAY_Connector_idl_gen DDS_VTopics_Base_stub
-  libs  += DDS_VTopics_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_VTS_Array_Connector_stub
-  dynamicflags += VTS_ARRAY_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTS_Array_ConnectorC.cpp
-  }
-
-  Header_Files {
-    VTS_Array_ConnectorC.h
-    VTS_Array_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    VTS_Array_ConnectorC.inl
-  }
-}
-
-project(DDS_VTS_Array_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_VTS_ARRAY_Connector_lem_stub DDS_VTS_Array_Connector_stub DDS_VTopics_Base_stub
-  sharedname = DDS_VTS_Array_Connector_exec
-  libs += DDS_VTS_Array_Connector_stub DDS_VTS_ARRAY_Connector_lem_stub DDS_VTopics_Base_stub DDS_VTopics_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += VTS_ARRAY_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTS_Array_Connector_conn.cpp
-  }
-
-  Header_Files {
-    VTS_Array_Connector_conn.h
-    VTS_Array_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_VTS_Array_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_VTS_ARRAY_Connector_lem_stub DDS_VTS_Array_Connector_exec DDS_VTS_Array_Connector_stub
-  sharedname  = DDS_VTS_Array_Connector_svnt
-  libs       += DDS_VTS_Array_Connector_stub \
-                DDS_VTS_ARRAY_Connector_lem_stub  \
-                DDS_VTopics_Base_stub \
-                DDS_VTS_Array_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += VTS_ARRAY_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTS_Array_ConnectorS.cpp
-    VTS_Array_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    VTS_Array_ConnectorS.h
-    VTS_Array_Connector_svnt.h
-    VTS_Array_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl
deleted file mode 100644
index 4dfa1f811e8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file VTS_Seq_Connector.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef VTS_SEQ_CONNECTOR_IDL_
-#define VTS_SEQ_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/VTopics_Base.idl"
-
-#pragma ciao lem "Conn_Seq/VTS_Seq_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/VTopics_BaseTypeSupport.idl"
-#endif
-
-module VTopics
-{
-  module ::CCM_DDS::Typed < ::TopicSeq, ::TopicSeqSeq> TopicSeqConnector;
-};
-
-#endif /* VTS_SEQ_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc
deleted file mode 100644
index 757e94922d2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc
+++ /dev/null
@@ -1,141 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_VTopics_Base -l .. -o ../lib -u DDS VTS_Seq_Connector"
-
-project(DDS_VTS_SEQ_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_VTopics_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=VTS_SEQ_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=VTS_Seq_Connector_stub_export.h \
-              -Wb,skel_export_macro=VTS_SEQ_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=VTS_Seq_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=VTS_SEQ_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=VTS_Seq_Connector_svnt_export.h \
-              -Wb,conn_export_macro=VTS_SEQ_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=VTS_Seq_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    VTS_Seq_Connector.idl
-  }
-}
-
-project(DDS_VTS_SEQ_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_VTS_SEQ_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=VTS_SEQ_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=VTS_Seq_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    VTS_Seq_ConnectorE.idl
-  }
-}
-
-project(DDS_VTS_SEQ_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_VTS_SEQ_Connector_lem_gen DDS_VTS_Seq_Connector_stub DDS_VTopics_Base_stub
-  libs  += DDS_VTopics_Base_stub DDS_VTS_Seq_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_VTS_SEQ_Connector_lem_stub
-  dynamicflags += VTS_SEQ_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTS_Seq_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    VTS_Seq_ConnectorEC.h
-    VTS_Seq_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    VTS_Seq_ConnectorEC.inl
-  }
-}
-
-project(DDS_VTS_Seq_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_VTS_SEQ_Connector_idl_gen DDS_VTopics_Base_stub
-  libs  += DDS_VTopics_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_VTS_Seq_Connector_stub
-  dynamicflags += VTS_SEQ_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTS_Seq_ConnectorC.cpp
-  }
-
-  Header_Files {
-    VTS_Seq_ConnectorC.h
-    VTS_Seq_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    VTS_Seq_ConnectorC.inl
-  }
-}
-
-project(DDS_VTS_Seq_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_VTS_SEQ_Connector_lem_stub DDS_VTS_Seq_Connector_stub DDS_VTopics_Base_stub
-  sharedname = DDS_VTS_Seq_Connector_exec
-  libs += DDS_VTS_Seq_Connector_stub DDS_VTS_SEQ_Connector_lem_stub DDS_VTopics_Base_stub DDS_VTopics_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += VTS_SEQ_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTS_Seq_Connector_conn.cpp
-  }
-
-  Header_Files {
-    VTS_Seq_Connector_conn.h
-    VTS_Seq_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_VTS_Seq_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_VTS_SEQ_Connector_lem_stub DDS_VTS_Seq_Connector_exec DDS_VTS_Seq_Connector_stub
-  sharedname  = DDS_VTS_Seq_Connector_svnt
-  libs       += DDS_VTS_Seq_Connector_stub \
-                DDS_VTS_SEQ_Connector_lem_stub  \
-                DDS_VTopics_Base_stub \
-                DDS_VTS_Seq_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += VTS_SEQ_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTS_Seq_ConnectorS.cpp
-    VTS_Seq_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    VTS_Seq_ConnectorS.h
-    VTS_Seq_Connector_svnt.h
-    VTS_Seq_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.idl
deleted file mode 100644
index d224a66f793..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file VTS_String_Connector.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef VTS_STRING_CONNECTOR_IDL_
-#define VTS_STRING_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/VTopics_Base.idl"
-
-#pragma ciao lem "Conn_String/VTS_String_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/VTopics_BaseTypeSupport.idl"
-#endif
-
-module VTopics
-{
-  module ::CCM_DDS::Typed < ::TopicString, ::TopicStringSeq> TopicStringConnector;
-};
-
-#endif /* VTS_STRING_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc
deleted file mode 100644
index 58edb6b9ad4..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_VTopics_Base -l .. -o ../lib -u DDS VTS_String_Connector"
-
-project(DDS_VTS_STRING_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_VTopics_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=VTS_STRING_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=VTS_String_Connector_stub_export.h \
-              -Wb,skel_export_macro=VTS_STRING_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=VTS_String_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=VTS_STRING_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=VTS_String_Connector_svnt_export.h \
-              -Wb,conn_export_macro=VTS_STRING_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=VTS_String_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    VTS_String_Connector.idl
-  }
-}
-
-project(DDS_VTS_STRING_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_VTS_STRING_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=VTS_STRING_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=VTS_String_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    VTS_String_ConnectorE.idl
-  }
-}
-
-project(DDS_VTS_STRING_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_VTS_STRING_Connector_lem_gen DDS_VTS_String_Connector_stub DDS_VTopics_Base_stub
-  libs  += DDS_VTopics_Base_stub DDS_VTS_String_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_VTS_STRING_Connector_lem_stub
-  dynamicflags += VTS_STRING_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTS_String_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    VTS_String_ConnectorEC.h
-    VTS_String_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    VTS_String_ConnectorEC.inl
-  }
-}
-
-project(DDS_VTS_String_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_VTS_STRING_Connector_idl_gen DDS_VTopics_Base_stub
-  libs  += DDS_VTopics_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_VTS_String_Connector_stub
-  dynamicflags += VTS_STRING_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTS_String_ConnectorC.cpp
-  }
-
-  Header_Files {
-    VTS_String_ConnectorC.h
-    VTS_String_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    VTS_String_ConnectorC.inl
-  }
-}
-
-project(DDS_VTS_String_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_VTS_STRING_Connector_lem_stub DDS_VTS_String_Connector_stub DDS_VTopics_Base_stub
-  sharedname = DDS_VTS_String_Connector_exec
-  libs += DDS_VTS_String_Connector_stub DDS_VTS_STRING_Connector_lem_stub DDS_VTopics_Base_stub DDS_VTopics_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += VTS_STRING_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTS_String_Connector_conn.cpp
-  }
-
-  Header_Files {
-    VTS_String_Connector_conn.h
-    VTS_String_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_VTS_String_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_VTS_STRING_Connector_lem_stub DDS_VTS_String_Connector_exec DDS_VTS_String_Connector_stub
-  sharedname  = DDS_VTS_String_Connector_svnt
-  libs       += DDS_VTS_String_Connector_stub \
-                DDS_VTS_STRING_Connector_lem_stub  \
-                DDS_VTopics_Base_stub \
-                DDS_VTS_String_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += VTS_STRING_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTS_String_ConnectorS.cpp
-    VTS_String_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    VTS_String_ConnectorS.h
-    VTS_String_Connector_svnt.h
-    VTS_String_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.idl
deleted file mode 100644
index f728c9d2cdc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.idl
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * @file VTS_Union_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef VT_UNION_CONNECTOR_IDL_
-#define VT_UNION_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/VTopics_Base.idl"
-
-#pragma ciao lem "Conn_Union/VTS_Union_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/VTopics_BaseTypeSupport.idl"
-#endif
-
-module VTopic
-{
-  module ::CCM_DDS::Typed < ::TopicUnion, ::TopicUnionSeq> TopicUnionConnector;
-#if !defined (CIAO_DDS4CCM_OPENDDS)
-  module ::CCM_DDS::Typed < ::X_Union, ::X_UnionSeq> X_UnionConnector;
-#else
-  // Just use another topic, that way we get a connector
-  module ::CCM_DDS::Typed < ::TopicString, ::TopicStringSeq> X_UnionConnector;
-#endif
-};
-
-#endif /* VT_UNION_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.mpc
deleted file mode 100644
index 104300fd1bc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.mpc
+++ /dev/null
@@ -1,140 +0,0 @@
-project(DDS_VTS_Union_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_VTopics_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=VT_UNION_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=VTS_Union_Connector_stub_export.h \
-              -Wb,skel_export_macro=VT_UNION_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=VTS_Union_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=VT_UNION_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=VTS_Union_Connector_svnt_export.h \
-              -Wb,conn_export_macro=VT_UNION_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=VTS_Union_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    VTS_Union_Connector.idl
-  }
-}
-
-project(DDS_VTS_Union_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_VTS_Union_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=VT_UNION_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=VTS_Union_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    VTS_Union_ConnectorE.idl
-  }
-}
-
-project(DDS_VTS_Union_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_VTS_Union_Connector_lem_gen DDS_VTS_Union_Connector_stub DDS_VTopics_Base_stub
-  libs  += DDS_VTopics_Base_stub DDS_VTS_Union_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_VTS_Union_Connector_lem_stub
-  dynamicflags += VT_UNION_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTS_Union_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    VTS_Union_ConnectorEC.h
-    VTS_Union_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    VTS_Union_ConnectorEC.inl
-  }
-}
-
-project(DDS_VTS_Union_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_VTS_Union_Connector_idl_gen DDS_VTopics_Base_stub
-  libs  += DDS_VTopics_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_VTS_Union_Connector_stub
-  dynamicflags += VT_UNION_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTS_Union_ConnectorC.cpp
-  }
-
-  Header_Files {
-    VTS_Union_ConnectorC.h
-    VTS_Union_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    VTS_Union_ConnectorC.inl
-  }
-}
-
-project(DDS_VTS_Union_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_VTS_Union_Connector_lem_stub DDS_VTS_Union_Connector_stub DDS_VTopics_Base_stub
-  sharedname = DDS_VTS_Union_Connector_exec
-  libs += DDS_VTS_Union_Connector_stub DDS_VTS_Union_Connector_lem_stub DDS_VTopics_Base_stub DDS_VTopics_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += VT_UNION_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTS_Union_Connector_conn.cpp
-  }
-
-  Header_Files {
-    VTS_Union_Connector_conn.h
-    VTS_Union_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_VTS_Union_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_VTS_Union_Connector_lem_stub DDS_VTS_Union_Connector_exec \
-                DDS_VTS_Union_Connector_stub
-  sharedname  = DDS_VTS_Union_Connector_svnt
-  libs       += DDS_VTS_Union_Connector_stub \
-                DDS_VTS_Union_Connector_lem_stub  \
-                DDS_VTopics_Base_stub \
-                DDS_VTS_Union_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += VT_UNION_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTS_Union_ConnectorS.cpp
-    VTS_Union_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    VTS_Union_ConnectorS.h
-    VTS_Union_Connector_svnt.h
-    VTS_Union_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.idl
deleted file mode 100644
index fc61e9b9eea..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.idl
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * @file VTS_Valuetype_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef VTS_VALUE_TYPE_CONNECTOR_IDL_
-#define VTS_VALUE_TYPE_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/VTopics_Base.idl"
-
-#pragma ciao lem "Conn_Valuetype/VTS_Valuetype_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/VTopics_BaseTypeSupport.idl"
-#endif
-
-module VTopics
-{
-#if !defined (CIAO_DDS4CCM_OPENDDS)
-  module ::CCM_DDS::Typed < ::TopicValuetype, ::TopicValuetypeSeq> TopicValuetypeConnector;
-#else
-  // Just use another topic, that way we get a connector
-  module ::CCM_DDS::Typed < ::TopicString, ::TopicStringSeq> TopicValuetypeConnector;
-#endif
-};
-
-#endif /* VTS_VALUE_TYPE_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.mpc
deleted file mode 100644
index a46ce3bfc4d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.mpc
+++ /dev/null
@@ -1,143 +0,0 @@
-project(DDS_VTS_Valuetype_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_VTopics_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=VTS_VALUE_TYPE_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=VTS_Valuetype_Connector_stub_export.h \
-              -Wb,skel_export_macro=VTS_VALUE_TYPE_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=VTS_Valuetype_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=VTS_VALUE_TYPE_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=VTS_Valuetype_Connector_svnt_export.h \
-              -Wb,conn_export_macro=VTS_VALUE_TYPE_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=VTS_Valuetype_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    VTS_Valuetype_Connector.idl
-  }
-}
-
-project(DDS_VTS_Valuetype_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_VTS_Valuetype_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=VTS_VALUE_TYPE_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=VTS_Valuetype_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    VTS_Valuetype_ConnectorE.idl
-  }
-}
-
-project(DDS_VTS_VALUE_TYPE_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_VTS_Valuetype_Connector_lem_gen DDS_VTS_Valuetype_Connector_stub \
-           DDS_VTopics_Base_stub
-  libs  += DDS_VTopics_Base_stub DDS_VTS_Valuetype_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_VTS_VALUE_TYPE_Connector_lem_stub
-  dynamicflags += VTS_VALUE_TYPE_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTS_Valuetype_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    VTS_Valuetype_ConnectorEC.h
-    VTS_Valuetype_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    VTS_Valuetype_ConnectorEC.inl
-  }
-}
-
-project(DDS_VTS_Valuetype_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_VTS_Valuetype_Connector_idl_gen DDS_VTopics_Base_stub
-  libs  += DDS_VTopics_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_VTS_Valuetype_Connector_stub
-  dynamicflags += VTS_VALUE_TYPE_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTS_Valuetype_ConnectorC.cpp
-  }
-
-  Header_Files {
-    VTS_Valuetype_ConnectorC.h
-    VTS_Valuetype_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    VTS_Valuetype_ConnectorC.inl
-  }
-}
-
-project(DDS_VTS_Valuetype_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_VTS_VALUE_TYPE_Connector_lem_stub DDS_VTS_Valuetype_Connector_stub \
-             DDS_VTopics_Base_stub
-  sharedname = DDS_VTS_Valuetype_Connector_exec
-  libs += DDS_VTS_Valuetype_Connector_stub DDS_VTS_VALUE_TYPE_Connector_lem_stub \
-          DDS_VTopics_Base_stub DDS_VTopics_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += VTS_VALUE_TYPE_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTS_Valuetype_Connector_conn.cpp
-  }
-
-  Header_Files {
-    VTS_Valuetype_Connector_conn.h
-    VTS_Valuetype_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_VTS_Valuetype_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_VTS_VALUE_TYPE_Connector_lem_stub DDS_VTS_Valuetype_Connector_exec\
-                DDS_VTS_Valuetype_Connector_stub
-  sharedname  = DDS_VTS_Valuetype_Connector_svnt
-  libs       += DDS_VTS_Valuetype_Connector_stub \
-                DDS_VTS_VALUE_TYPE_Connector_lem_stub  \
-                DDS_VTopics_Base_stub \
-                DDS_VTS_Valuetype_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += VTS_VALUE_TYPE_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTS_Valuetype_ConnectorS.cpp
-    VTS_Valuetype_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    VTS_Valuetype_ConnectorS.h
-    VTS_Valuetype_Connector_svnt.h
-    VTS_Valuetype_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.idl
deleted file mode 100644
index 8e454b7fe4a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file VTopics_Connector.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef VTOPICS_CONNECTOR_IDL_
-#define VTOPICS_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/VTopics_Base.idl"
-
-#pragma ciao lem "Connector/VTopics_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/VTopics_BaseTypeSupport.idl"
-#endif
-
-module VTopics
-{
-  module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> TestTopicConnector;
-};
-
-#endif /* VTopics_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc
deleted file mode 100644
index 0b49ebf7e6e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_VTopics_Base -l .. -o ../lib -u DDS VTopics_Connector"
-
-project(DDS_VTopics_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_VTopics_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=VTOPICS_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=VTopics_Connector_stub_export.h \
-              -Wb,skel_export_macro=VTOPICS_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=VTopics_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=VTOPICS_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=VTopics_Connector_svnt_export.h \
-              -Wb,conn_export_macro=VTOPICS_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=VTopics_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    VTopics_Connector.idl
-  }
-}
-
-project(DDS_VTopics_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_VTopics_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=VTOPICS_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=VTopics_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    VTopics_ConnectorE.idl
-  }
-}
-
-project(DDS_VTopics_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_VTopics_Connector_lem_gen DDS_VTopics_Connector_stub DDS_VTopics_Base_stub
-  libs  += DDS_VTopics_Base_stub DDS_VTopics_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_VTopics_Connector_lem_stub
-  dynamicflags += VTOPICS_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTopics_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    VTopics_ConnectorEC.h
-    VTopics_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    VTopics_ConnectorEC.inl
-  }
-}
-
-project(DDS_VTopics_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_VTopics_Connector_idl_gen DDS_VTopics_Base_stub
-  libs  += DDS_VTopics_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_VTopics_Connector_stub
-  dynamicflags += VTOPICS_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTopics_ConnectorC.cpp
-  }
-
-  Header_Files {
-    VTopics_ConnectorC.h
-    VTopics_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    VTopics_ConnectorC.inl
-  }
-}
-
-project(DDS_VTopics_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_VTopics_Connector_lem_stub DDS_VTopics_Connector_stub DDS_VTopics_Base_stub
-  sharedname = DDS_VTopics_Connector_exec
-  libs += DDS_VTopics_Connector_stub DDS_VTopics_Connector_lem_stub DDS_VTopics_Base_stub DDS_VTopics_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += VTOPICS_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTopics_Connector_conn.cpp
-  }
-
-  Header_Files {
-    VTopics_Connector_conn.h
-    VTopics_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_VTopics_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_VTopics_Connector_lem_stub DDS_VTopics_Connector_exec DDS_VTopics_Connector_stub
-  sharedname  = DDS_VTopics_Connector_svnt
-  libs       += DDS_VTopics_Connector_stub \
-                DDS_VTopics_Connector_lem_stub  \
-                DDS_VTopics_Base_stub \
-                DDS_VTopics_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += VTOPICS_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTopics_ConnectorS.cpp
-    VTopics_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    VTopics_ConnectorS.h
-    VTopics_Connector_svnt.h
-    VTopics_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.idl
deleted file mode 100644
index c90d09b525e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.idl
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * @file
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/VTopics_Connector.idl"
-
-module VTopics
-{
-  component Receiver
-  {
-    port TestTopicConnector::DDS_Listen info_out;
-    provides CCM_DDS::ConnectorStatusListener connector_status;
-   };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc
deleted file mode 100644
index 6e2ffd342cc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc
+++ /dev/null
@@ -1,170 +0,0 @@
-project(DDS_VTopics_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_VTopics_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h -I..
-
-  IDL_Files {
-    VTopics_Receiver.idl
-  }
-}
-
-project(DDS_VTopics_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_VTopics_Receiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    VTopics_ReceiverE.idl
-  }
-}
-
-project(DDS_VTopics_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_VTopics_Receiver_lem_gen DDS_VTopics_Receiver_stub DDS_VTopics_Base_stub \
-           DDS_VTopics_Connector_stub DDS_VTS_String_Connector_stub \
-           DDS_VTS_Array_Connector_stub DDS_VTS_Seq_Connector_stub \
-           DDS_VTS_Valuetype_Connector_stub DDS_VTS_Union_Connector_stub
-  libs  +=  Receiver_stub DDS_VTopics_Connector_stub DDS_VTS_String_Connector_stub \
-            DDS_VTS_Array_Connector_stub DDS_VTS_Seq_Connector_stub DDS_VTopics_Base_stub \
-            DDS_VTS_Valuetype_Connector_stub DDS_VTS_Union_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTopics_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    VTopics_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    VTopics_ReceiverEC.inl
-  }
-}
-
-project(DDS_VTopics_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_VTopics_Receiver_idl_gen DDS_VTopics_Base_stub \
-           DDS_VTopics_Connector_stub DDS_VTopics_Connector_lem_gen \
-           DDS_VTS_String_Connector_stub DDS_VTS_String_Connector_lem_gen \
-           DDS_VTS_Array_Connector_stub DDS_VTS_Array_Connector_lem_gen \
-           DDS_VTS_Valuetype_Connector_stub DDS_VTS_Valuetype_Connector_lem_gen \
-           DDS_VTS_Union_Connector_stub DDS_VTS_Union_Connector_lem_gen \
-           DDS_VTS_Seq_Connector_stub DDS_VTS_Seq_Connector_lem_gen
-  libs  += DDS_VTopics_Connector_stub DDS_VTS_Valuetype_Connector_stub \
-           DDS_VTS_String_Connector_stub DDS_VTS_Array_Connector_stub \
-           DDS_VTS_Union_Connector_stub DDS_VTS_Seq_Connector_stub \
-           DDS_VTopics_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTopics_ReceiverC.cpp
-  }
-
-  Header_Files {
-    VTopics_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    VTopics_ReceiverC.inl
-  }
-}
-
-project(DDS_VTopics_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after     += DDS_VTopics_Receiver_lem_stub DDS_VTopics_Receiver_stub DDS_VTopics_Base_stub \
-               DDS_VTopics_Connector_stub DDS_VTopics_Connector_lem_stub \
-               DDS_VTS_String_Connector_stub DDS_VTS_String_Connector_lem_stub \
-               DDS_VTS_Array_Connector_stub DDS_VTS_Array_Connector_lem_stub \
-               DDS_VTS_Valuetype_Connector_stub DDS_VTS_Valuetype_Connector_lem_stub \
-               DDS_VTS_Union_Connector_stub DDS_VTS_Union_Connector_lem_stub \
-               DDS_VTS_Seq_Connector_stub DDS_VTS_Seq_Connector_lem_stub 
-  sharedname = Receiver_exec
-  libs      += Receiver_stub Receiver_lem_stub DDS_VTopics_Base_stub \
-               DDS_VTopics_Connector_stub DDS_VTS_String_Connector_stub \
-               DDS_VTS_Array_Connector_stub DDS_VTS_Seq_Connector_stub \
-               DDS_VTopics_Connector_lem_stub \
-               DDS_VTS_Valuetype_Connector_stub DDS_VTS_Union_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTopics_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    VTopics_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_VTopics_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_VTopics_Receiver_lem_stub DDS_VTopics_Base_stub DDS_VTopics_Receiver_exec \
-                DDS_VTopics_Connector_stub DDS_VTopics_Connector_svnt DDS_VTopics_Connector_lem_stub \
-                DDS_VTS_String_Connector_stub DDS_VTS_String_Connector_svnt DDS_VTS_String_Connector_lem_stub \
-                DDS_VTS_Array_Connector_stub DDS_VTS_Array_Connector_svnt DDS_VTS_Array_Connector_lem_stub \
-                DDS_VTS_Valuetype_Connector_stub DDS_VTS_Valuetype_Connector_svnt DDS_VTS_Valuetype_Connector_lem_stub \
-                DDS_VTS_Union_Connector_stub DDS_VTS_Union_Connector_svnt DDS_VTS_Union_Connector_lem_stub \
-                DDS_VTS_Seq_Connector_stub DDS_VTS_Seq_Connector_svnt DDS_VTS_Seq_Connector_lem_stub 
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_VTopics_Base_stub \
-                DDS_VTopics_Connector_stub DDS_VTS_String_Connector_stub DDS_VTS_Array_Connector_stub DDS_VTS_Seq_Connector_stub \
-                DDS_VTopics_Connector_svnt DDS_VTS_String_Connector_svnt DDS_VTS_Array_Connector_svnt DDS_VTS_Seq_Connector_svnt  \
-                DDS_VTS_Valuetype_Connector_svnt DDS_VTS_Valuetype_Connector_stub \
-                DDS_VTS_Union_Connector_svnt DDS_VTS_Union_Connector_stub \
-                Receiver_exec DDS_VTopics_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTopics_ReceiverS.cpp
-    VTopics_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    VTopics_ReceiverS.h
-    VTopics_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.cpp
deleted file mode 100644
index 72da2d96393..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-// -*- C++ -*-
-//Test for different topic types , with DDS_STATE connector, look for 'SUBSCRIPTION_MATCHED_STATUS
-
-#include "VTopics_Receiver_exec.h"
-#include "dds4ccm/impl/Utils.h"
-
-
-namespace CIAO_VTopics_Receiver_Impl
-{
-//============================================================
-  // Facet Executor Implementation Class: ConnectorStatusListener_exec_i
-  //============================================================
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (
-    Atomic_Boolean &subscription_matched)
-    : subscription_matched_ (subscription_matched)
-  {
-  }
-
-  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic (
-     ::DDS::Topic_ptr /*the_topic*/,
-     const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-     const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed (
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos (
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status (
-    ::DDS::Entity_ptr the_entity,
-    ::DDS::StatusKind  status_kind)
-  {
-    if (! ::CORBA::is_nil(the_entity) &&
-        status_kind == DDS::SUBSCRIPTION_MATCHED_STATUS)
-      {
-        this->subscription_matched_ = true;
-      }
-  }
-
-  //============================================================
-  // Receiver_exec_i
-  //============================================================
-  Receiver_exec_i::Receiver_exec_i (void)
-    : subscription_matched_ (false)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Port operations.
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Receiver_exec_i::get_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i (this->subscription_matched_);
-  }
-
-  ::VTopics::TestTopicConnector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_out_data_listener (void)
-  {
-    return ::VTopics::TestTopicConnector::CCM_Listener::_nil ();
-  }
-
-  CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_status (void)
-  {
-    return CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  // Operations from Components::SessionComponent.
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::VTopics::CCM_Receiver_Context::_narrow (ctx);
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-     if(!this->subscription_matched_.value ())
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: did not receive the expected ")
-                              ACE_TEXT ("status 'SUBSCRIPTION_MATCHED_STATUS' ")
-                              ACE_TEXT ("in Receiver\n")
-                    ));
-      }
-    else
-      {
-         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Received the expected ")
-                               ACE_TEXT ("'SUBSCRIPTION_MATCHED_STATUS' ")
-                               ACE_TEXT ("in Receiver\n")
-                    ));
-      }
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_VTopics_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.h
deleted file mode 100644
index 9e15ddc171a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.h
+++ /dev/null
@@ -1,90 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_RECEIVER_EXEC_H_
-#define CIAO_RECEIVER_EXEC_H_
-
-#include "VTopics_ReceiverEC.h"
-
-#include /**/ "Receiver_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-namespace CIAO_VTopics_Receiver_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
-
-  class Receiver_exec_i;
-
-  class RECEIVER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Atomic_Boolean &);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-    void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                     const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-    void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                               ::DDS::StatusKind  status_kind);
-
-  private:
-    Atomic_Boolean &subscription_matched_;
-  };
-
-  class RECEIVER_EXEC_Export Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-   // Supported operations and attributes.
-   // Port operations.
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_connector_status (void);
-
-    virtual ::VTopics::TestTopicConnector::CCM_Listener_ptr
-    get_info_out_data_listener (void);
-
-    virtual CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_status (void);
-
-    // Operations from Components::SessionComponent.
-    virtual void
-    set_session_context (
-      ::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-
-  private:
-    ::VTopics::CCM_Receiver_Context_var context_;
-    Atomic_Boolean subscription_matched_;
-};
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_VTopics_Receiver_Impl (void);
-}
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.idl
deleted file mode 100644
index 3236c47642c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef DDS_VTOPICS_SENDER_IDL
-#define DDS_VTOPICS_SENDER_IDL
-
-#include "Connector/VTopics_Connector.idl"
-
-module VTopics
-{
-  component Sender
-  {
-    port TestTopicConnector::DDS_Update info_write;
-    provides CCM_DDS::ConnectorStatusListener connector_status;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc
deleted file mode 100644
index b0467e6d7c3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc
+++ /dev/null
@@ -1,166 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_VTopics_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_VTopics_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_VTopics_Connector_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I ..
-
-  IDL_Files {
-    VTopics_Sender.idl
-  }
-}
-
-project(DDS_VTopics_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_VTopics_Sender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    VTopics_SenderE.idl
-  }
-}
-
-project(DDS_VTopics_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_VTopics_Sender_lem_gen DDS_VTopics_Sender_stub DDS_VTopics_Base_stub
-  libs  += DDS_VTopics_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTopics_SenderEC.cpp
-  }
-
-  Header_Files {
-    VTopics_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    VTopics_SenderEC.inl
-  }
-}
-
-project(DDS_VTopics_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_VTopics_Sender_idl_gen DDS_VTopics_Base_stub \
-           DDS_VTopics_Connector_stub DDS_VTS_String_Connector_stub \
-           DDS_VTS_Array_Connector_stub DDS_VTS_Valuetype_Connector_stub \
-           DDS_VTS_Union_Connector_stub DDS_VTS_Seq_Connector_stub
-  libs  += DDS_VTopics_Base_stub DDS_VTopics_Connector_stub  \
-           DDS_VTS_String_Connector_stub DDS_VTS_Array_Connector_stub \
-           DDS_VTS_Seq_Connector_stub DDS_VTS_Valuetype_Connector_stub \
-           DDS_VTS_Union_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTopics_SenderC.cpp
-  }
-
-  Header_Files {
-    VTopics_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    VTopics_SenderC.inl
-  }
-}
-
-project(DDS_VTopics_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_VTopics_Sender_lem_stub DDS_VTopics_Sender_stub \
-             DDS_VTopics_Connector_lem_stub DDS_VTopics_Connector_stub \
-             DDS_VTS_String_Connector_lem_stub DDS_VTS_String_Connector_stub \
-             DDS_VTS_Array_Connector_lem_stub DDS_VTS_Array_Connector_stub \
-             DDS_VTS_Valuetype_Connector_lem_stub DDS_VTS_Valuetype_Connector_stub \
-             DDS_VTS_Union_Connector_lem_stub DDS_VTS_Union_Connector_stub \
-             DDS_VTS_Seq_Connector_lem_stub DDS_VTS_Seq_Connector_stub 
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub DDS_VTopics_Base_stub \
-          DDS_VTopics_Connector_lem_stub DDS_VTopics_Connector_stub \
-          DDS_VTS_String_Connector_stub DDS_VTS_Array_Connector_stub \
-          DDS_VTS_Valuetype_Connector_stub DDS_VTS_Seq_Connector_stub \
-          DDS_VTS_Union_Connector_stub 
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTopics_Sender_exec.cpp
-  }
-
-  Header_Files {
-    VTopics_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_VTopics_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_VTopics_Base_stub  DDS_VTopics_Sender_lem_stub \
-                DDS_VTopics_Connector_stub DDS_VTopics_Connector_svnt DDS_VTopics_Connector_lem_stub \
-                DDS_VTS_String_Connector_stub DDS_VTS_String_Connector_svnt DDS_VTS_String_Connector_lem_stub \
-                DDS_VTS_Array_Connector_stub DDS_VTS_Array_Connector_svnt DDS_VTS_Array_Connector_lem_stub \
-                DDS_VTS_Valuetype_Connector_stub DDS_VTS_Valuetype_Connector_svnt DDS_VTS_Valuetype_Connector_lem_stub \
-                DDS_VTS_Union_Connector_stub DDS_VTS_Union_Connector_svnt DDS_VTS_Union_Connector_lem_stub \
-                DDS_VTS_Seq_Connector_stub DDS_VTS_Seq_Connector_svnt DDS_VTS_Seq_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                DDS_VTopics_Base_stub \
-                DDS_VTopics_Connector_stub DDS_VTopics_Connector_svnt \
-                DDS_VTS_String_Connector_stub DDS_VTS_String_Connector_svnt \
-                DDS_VTS_Array_Connector_stub DDS_VTS_Array_Connector_svnt \
-                DDS_VTS_Valuetype_Connector_stub DDS_VTS_Valuetype_Connector_svnt \
-                DDS_VTS_Union_Connector_stub DDS_VTS_Union_Connector_svnt \
-                DDS_VTS_Seq_Connector_stub DDS_VTS_Seq_Connector_svnt
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTopics_SenderS.cpp
-    VTopics_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    VTopics_SenderS.h
-    VTopics_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.cpp
deleted file mode 100644
index be057adabaf..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-// -*- C++ -*-
-
-//Test different topic types, with DDS_STATE connector, look for 'PUBLICATION_MATCHED_STATUS
-#include "VTopics_Sender_exec.h"
-#include "dds4ccm/impl/Utils.h"
-
-namespace CIAO_VTopics_Sender_Impl
-{
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (
-    Atomic_Boolean &publication_matched)
-    : publication_matched_ (publication_matched)
-  {
-  }
-
-  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic(
-     ::DDS::Topic_ptr /*the_topic*/,
-     const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed (
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos (
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status (
-    ::DDS::Entity_ptr the_entity,
-    ::DDS::StatusKind  status_kind)
-  {
-    if (! ::CORBA::is_nil (the_entity) &&
-        status_kind == DDS::PUBLICATION_MATCHED_STATUS)
-      {
-        this->publication_matched_ = true;
-      }
-    }
-  //============================================================
-  // Component Executor Implementation Class: Sender_exec_i
-  //============================================================
-
-  Sender_exec_i::Sender_exec_i (void)
-    : publication_matched_ (false)
-  {
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-  }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i (this->publication_matched_);
-  }
-
-  // Supported operations and attributes.
-  void
-  Sender_exec_i::set_session_context (::Components::SessionContext_ptr ctx)
-  {
-    this->context_ = ::VTopics::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-   }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    if(!this->publication_matched_.value ())
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: did not receive the expected ")
-                              ACE_TEXT ("states 'PUBLICATION_MATCHED_STATUS' ")
-                              ACE_TEXT ("in Sender\n")
-                    ));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Received the expected ")
-                              ACE_TEXT ("'PUBLICATION_MATCHED_STATUS' ")
-                              ACE_TEXT ("in Sender\n")
-                    ));
-      }
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_VTopics_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.h
deleted file mode 100644
index 38404213210..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.h
+++ /dev/null
@@ -1,82 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_SENDER_EXEC_H_
-#define CIAO_SENDER_EXEC_H_
-
-
-#include "VTopics_SenderEC.h"
-
-#include /**/ "Sender_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-namespace CIAO_VTopics_Sender_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
-
-  class Sender_exec_i;
-
-  class SENDER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-    public:
-    ConnectorStatusListener_exec_i (Atomic_Boolean &);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                  const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                  const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                  const DDS::SampleRejectedStatus & status);
-    virtual
-    void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                  const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                  const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-    void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                  ::DDS::StatusKind  status_kind);
-  private:
-    Atomic_Boolean &publication_matched_;
-  };
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-
-    // Port operations.
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_connector_status (void);
-
-  private:
-    ::VTopics::CCM_Sender_Context_var context_;
-
-    Atomic_Boolean publication_matched_;
-};
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_VTopics_Sender_Impl (void);
-
-}
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/Plan.cdp
deleted file mode 100644
index 61d6b37adcc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/Plan.cdp
+++ /dev/null
@@ -1,1095 +0,0 @@
-<!--  -->
-<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>VTopics_Depl_1</label>
-  <UUID>VTopics_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_VTopics_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_VTopics_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="VTopics_ConnectorComponentImplementation">
-    <name>VTopics_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="VTopics_Connector_ExecArtifact" />
-    <artifact xmi:idref="VTopics_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_VTopics_TestTopicConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_VTopics_TestTopicConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>VTopics_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>VTopics_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="VTS_String_ConnectorComponentImplementation">
-    <name>VTS_String_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="VTS_String_Connector_ExecArtifact" />
-    <artifact xmi:idref="VTS_String_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_VTopics_TopicStringConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_VTopics_TopicStringConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>VTS_String_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>VTS_String_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="VTS_Array_ConnectorComponentImplementation">
-    <name>VTS_Array_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="VTS_Array_Connector_ExecArtifact" />
-    <artifact xmi:idref="VTS_Array_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_VTopics_TopicArrayConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_VTopics_TopicArrayConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>VTS_Array_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>VTS_Array_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="VTS_Seq_ConnectorComponentImplementation">
-    <name>VTS_Seq_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="VTS_Seq_Connector_ExecArtifact" />
-    <artifact xmi:idref="VTS_Seq_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_VTopics_TopicSeqConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_VTopics_TopicSeqConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>VTS_Seq_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>VTS_Seq_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="VTS_Union_ConnectorComponentImplementation">
-    <name>VTS_Union_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="VTS_Union_Connector_ExecArtifact" />
-    <artifact xmi:idref="VTS_Union_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_VTopic_TopicUnionConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_VTopic_TopicUnionConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>VTS_Union_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>VTS_Union_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="VT_X_Union_ConnectorComponentImplementation">
-    <name>VT_X_Union_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="VTS_Union_Connector_ExecArtifact" />
-    <artifact xmi:idref="VTS_Union_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_VTopic_X_UnionConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_VTopic_X_UnionConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>VTS_Union_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>VTS_Union_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_VTopics_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_VTopics_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-  </instance>
-
-  <instance xmi:id="VTopics_ConnectorComponentInstance">
-    <name>VTopics_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="VTopics_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestUS</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="VTopics_ConnectorComponentInstance2">
-    <name>VTopics_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="VTopics_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestUS</string>
-        </value>
-      </value>
-    </configProperty>
-   </instance>
-
-  <instance xmi:id="VTS_String_ConnectorComponentInstance">
-    <name>VTS_String_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="VTS_String_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestString</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="VTS_String_ConnectorComponentInstance2">
-    <name>VTS_String_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="VTS_String_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestString</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="VTS_Array_ConnectorComponentInstance">
-    <name>VTS_Array_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="VTS_Array_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestArray</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="VTS_Array_ConnectorComponentInstance2">
-    <name>VTS_Array_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="VTS_Array_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestArray</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="VTS_Seq_ConnectorComponentInstance">
-    <name>VTS_Seq_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="VTS_Seq_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestSeq</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="VTS_Seq_ConnectorComponentInstance2">
-    <name>VTS_Seq_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="VTS_Seq_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestSeq</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="VTS_Union_ConnectorComponentInstance">
-    <name>VTS_Union_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="VTS_Union_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestUnion</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="VTS_Union_ConnectorComponentInstance2">
-    <name>VTS_Union_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="VTS_Union_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestUnion</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="VT_X_Union_ConnectorComponentInstance">
-    <name>VT_X_Union_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="VT_X_Union_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Test_X_Union</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="VT_X_Union_ConnectorComponentInstance2">
-    <name>VT_X_Union_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="VT_X_Union_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Test_X_Union</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-  </instance>
-
-  <!--
-      *****************************
-      Regular connector connections
-      *****************************
-  -->
-  <connection>
-    <name>connector_status_receiver</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="VTopics_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>connector_status_sender</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="VTopics_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <!-- connection in order to establish a publication_matched
-       -->
-  <connection>
-    <name>info_write_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>observable_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="VTopics_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <!-- connection in order to establish a subscription_matched
-       -->
-  <connection>
-    <name>info_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="VTopics_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <!--
-      *****************************
-      String connector connections
-      *****************************
-  -->
-  <connection>
-    <name>connector_status_receiver_string</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="VTS_String_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>connector_status_sender_string</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="VTS_String_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <!--
-      *****************************
-      Array connector connections
-      *****************************
-  -->
-  <connection>
-    <name>connector_status_receiver_array</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="VTS_Array_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>connector_status_sender_array</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="VTS_Array_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <!--
-      *****************************
-      Sequence connector connections
-      *****************************
-  -->
-  <connection>
-    <name>connector_status_receiver_seq</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="VTS_Seq_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>connector_status_sender_seq</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="VTS_Seq_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <!--
-      *****************************
-      Union connector connections
-      *****************************
-      -->
-  <connection>
-    <name>connector_status_receiver_union</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="VTS_Union_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>connector_status_sender_union</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="VTS_Union_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status_receiver_x_union</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="VT_X_Union_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>connector_status_sender_x_union</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="VT_X_Union_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="VTopics_Connector_ExecArtifact">
-    <name>VTopics_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_VTopics_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="VTopics_Connector_SvntArtifact">
-    <name>VTopics_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_VTopics_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="VTopics_Connector_StubArtifact">
-    <name>VTopics_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_VTopics_Connector_stub</location>
-  </artifact>
-
-  <artifact xmi:id="VTS_String_Connector_ExecArtifact">
-    <name>VTS_String_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_VTS_String_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="VTS_String_Connector_SvntArtifact">
-    <name>VTS_String_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_VTS_String_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="VTS_String_Connector_StubArtifact">
-    <name>VTS_String_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDSVTS_String_Connector_stub</location>
-  </artifact>
-
-  <artifact xmi:id="VTS_Array_Connector_ExecArtifact">
-    <name>VTS_Array_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_VTS_Array_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="VTS_Array_Connector_SvntArtifact">
-    <name>VTS_Array_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_VTS_Array_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="VTS_Array_Connector_StubArtifact">
-    <name>VTS_Array_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_VTS_Array_Connector_stub</location>
-  </artifact>
-
-  <artifact xmi:id="VTS_Seq_Connector_ExecArtifact">
-    <name>VTS_Seq_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_VTS_Seq_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="VTS_Seq_Connector_SvntArtifact">
-    <name>VTS_Seq_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_VTS_Seq_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="VTS_Seq_Connector_StubArtifact">
-    <name>VTS_Seq_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_VTS_Seq_Connector_stub</location>
-  </artifact>
-
-  <artifact xmi:id="VTS_Union_Connector_ExecArtifact">
-    <name>VTS_Union_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_VTS_Union_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="VTS_Union_Connector_SvntArtifact">
-    <name>VTS_Union_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_VTS_Union_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="VTS_Union_Connector_StubArtifact">
-    <name>VTS_Union_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_VTS_Union_Connector_stub</location>
-  </artifact>
-
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl
deleted file mode 100755
index 460cd1064d0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 10 seconds to allow task to complete\n";
-sleep (10);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors/Plan.cdp
deleted file mode 100644
index dd5eec3f2fc..00000000000
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors/Plan.cdp
+++ /dev/null
@@ -1,498 +0,0 @@
-<!--  -->
-<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>Shapes_Depl_1</label>
-  <UUID>Shapes_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Receiver_comp_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Receiver_comp_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shapes_Receiver_comp_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shapes_Receiver_comp_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="ControlComponentImplementation">
-    <name>ControlComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Control_ExecArtifact" />
-    <artifact xmi:idref="Control_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Control_comp_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Control_comp_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shapes_Control_comp_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shapes_Control_comp_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Shapes_ConnectorComponentImplementation">
-    <name>Shapes_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Shapes_Connector_ExecArtifact" />
-    <artifact xmi:idref="Shapes_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_ShapeType_conn_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_ShapeType_conn_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shapes_ShapeType_conn_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shapes_ShapeType_conn_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Sender_comp_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Sender_comp_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shapes_Sender_comp_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shapes_Sender_comp_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-  </instance>
-
-  <instance xmi:id="ControlComponentInstance">
-    <name>ControlComponent</name>
-    <node>ControlNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ControlComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>10</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_x</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>225</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_y</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>250</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_size</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>25</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>resize_shape</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>true</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Shapes_SenderConnectorInstance">
-    <name>Shapes_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Shapes_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Square</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>domain_id</name>
-      <value>
-        <type>
-          <kind>tk_long</kind>
-        </type>
-        <value>
-          <long>0</long> <!-- 0 to work with RTI shapes demo-->
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Shapes_ReceiverConnectorInstance">
-    <name>Shapes_ReceiverConnectorInstance</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Shapes_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Square</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>domain_id</name>
-      <value>
-        <type>
-          <kind>tk_long</kind>
-        </type>
-        <value>
-          <long>0</long> <!-- 0 to work with RTI shapes demo-->
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-  </instance>
-
-  <connection>
-    <name>_listenercontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Shapes_ReceiverConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Shapes_ReceiverConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Shapes_SenderConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>control_connection</name>
-    <internalEndpoint>
-      <portName>control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ControlComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Shapes_Sender_comp_exec</name>
-    <source/>
-    <node/>
-    <location>Shapes_Sender_comp_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Shapes_Sender_comp_svnt</name>
-    <source/>
-    <node/>
-    <location>Shapes_Sender_comp_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="Shapes_Connector_ExecArtifact">
-    <name>Shapes_ShapeType_conn_exec</name>
-    <source/>
-    <node/>
-    <location>Shapes_ShapeType_conn_exec</location>
-  </artifact>
-  <artifact xmi:id="Shapes_Connector_SvntArtifact">
-    <name>Shapes_ShapeType_conn_svnt</name>
-    <source/>
-    <node/>
-    <location>Shapes_ShapeType_conn_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Shapes_Receiver_comp_exec</name>
-    <source/>
-    <node/>
-    <location>Shapes_Receiver_comp_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Shapes_Receiver_comp_svnt</name>
-    <source/>
-    <node/>
-    <location>Shapes_Receiver_comp_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-  <artifact xmi:id="Control_ExecArtifact">
-    <name>Shapes_Control_comp_exec</name>
-    <source/>
-    <node/>
-    <location>Shapes_Control_comp_exec</location>
-  </artifact>
-  <artifact xmi:id="Control_SvntArtifact">
-    <name>Shapes_Control_comp_svnt</name>
-    <source/>
-    <node/>
-    <location>Shapes_Control_comp_svnt</location>
-  </artifact>
-  <artifact xmi:id="Control_StubArtifact">
-    <name>Control_stub</name>
-    <source/>
-    <node/>
-    <location>Control_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/scripts/run_test.pl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/scripts/run_test.pl
deleted file mode 100755
index c26991213af..00000000000
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/scripts/run_test.pl
+++ /dev/null
@@ -1,242 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 3;
-@ports = ( 60001, 60002, 60004 );
-@iorbases = ( "Sender.ior", "Receiver.ior", "Controller.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode", "ControlNode" );
-
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "../descriptors/Plan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../../lib');
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemon ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill (); $EM->TimedWait (1);
-    }
-
-    if ($ns_running == 1) {
-        $NS->Kill (); $NS->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-sub run_node_daemons {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-        print "Run dance_node_manager with $d_param\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-            print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-            for (; $i >= 0; --$i) {
-                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-            }
-            return -1;
-        }
-    }
-    return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 30 seconds to allow task to complete\n";
-sleep (30);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp.idl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp.idl
deleted file mode 100644
index 8598a8786b8..00000000000
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef SHAPES_CONTROL_COMP_IDL_
-#define SHAPES_CONTROL_COMP_IDL_
-
-#include "Shapes_Control_obj.idl"
-
-#include <Components.idl>
-
-module Shapes
-{
-  component Control_comp
-  {
-    uses Shapes::Control_obj control;
-
-    attribute unsigned long rate;
-    attribute unsigned short max_x;
-    attribute unsigned short max_y;
-    attribute unsigned short max_size;
-    attribute boolean resize_shape;
-  };
-};
-
-#endif /* SHAPES_CONTROL_COMP_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp.mpc
deleted file mode 100644
index e7ffebbd33f..00000000000
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp.mpc
+++ /dev/null
@@ -1,177 +0,0 @@
-project(Shapes_Control_idl_gen) : componentidldefaults {
-  after += Shapes_Control_obj_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SHAPES_CONTROL_COMP_STUB_Export \
-              -Wb,stub_export_include=Shapes_Control_comp_stub_export.h \
-              -Wb,svnt_export_macro=SHAPES_CONTROL_COMP_SVNT_Export \
-              -Wb,svnt_export_include=Shapes_Control_comp_svnt_export.h \
-              -Wb,exec_export_macro=SHAPES_CONTROL_COMP_EXEC_Export \
-              -Wb,exec_export_include=Shapes_Control_comp_exec_export.h \
-              -I../ports \
-              -I../../ports \
-              -o GeneratedCode
-
-  IDL_Files {
-    Shapes_Control_comp.idl
-    gendir = GeneratedCode
-  }
-}
-
-project(Shapes_Control_executor_gen) : componentidldefaults {
-  requires += dummy_label
-  custom_only = 1
-  idlflags += -Gexr -SS -Sci \
-              -I../ports \
-              -I../../ports \
-              -Wb,exec_export_macro=SHAPES_CONTROL_COMP_EXEC_Export \
-              -Wb,exec_export_include=Shapes_Control_comp_exec_export.h \
-              -o ../../../Tutorial/Code/Shapes_Control_comp
-
-  IDL_Files {
-    Shapes_Control_comp.idl
-  }
-}
-
-project(Shapes_Control_lem_gen) : ciaoidldefaults {
-  after += Shapes_Control_idl_gen Shapes_Control_obj_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SHAPES_CONTROL_COMP_LEM_STUB_Export \
-              -Wb,stub_export_include=Shapes_Control_comp_lem_stub_export.h \
-              -SS -Gxhst \
-              -I../ports \
-              -I../../ports/GeneratedCode \
-              -I../../ports \
-              -o GeneratedCode
-
-  IDL_Files {
-    GeneratedCode/Shapes_Control_compE.idl
-    gendir = GeneratedCode
-  }
-}
-
-project(Shapes_Control_comp_lem_stub) : ccm_svnt {
-  after += Shapes_Control_lem_gen Shapes_Control_comp_stub Shapes_ShapeType_msg_stub \
-           Shapes_Control_obj_stub
-
-  libs  += Shapes_ShapeType_msg_stub Shapes_Control_comp_stub Shapes_Control_obj_stub
-  libpaths += ../../lib
-  libout = ../../lib
-
-  includes += ../../ports/GeneratedCode ../ports/GeneratedCode
-
-  sharedname = Shapes_Control_comp_lem_stub
-  dynamicflags += SHAPES_CONTROL_COMP_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GeneratedCode/Shapes_Control_compEC.cpp
-  }
-
-  Header_Files {
-    GeneratedCode/Shapes_Control_compEC.h
-    GeneratedCode/Shapes_Control_comp_lem_stub_export.h
-  }
-
-  Inline_Files {
-    GeneratedCode/Shapes_Control_compEC.inl
-  }
-}
-
-project(Shapes_Control_comp_stub) : ccm_stub {
-  after += Shapes_Control_idl_gen Shapes_ShapeType_msg_stub \
-           Shapes_Control_obj_stub Shapes_Control_obj_lem_stub
-
-  libs  += Shapes_ShapeType_msg_stub Shapes_Control_obj_stub
-  libpaths += ../../lib
-  libout = ../../lib
-
-  includes += ../../ports/GeneratedCode ../ports/GeneratedCode
-
-  sharedname = Shapes_Control_comp_stub
-  dynamicflags += SHAPES_CONTROL_COMP_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GeneratedCode/Shapes_Control_compC.cpp
-  }
-
-  Header_Files {
-    GeneratedCode/Shapes_Control_compC.h
-    GeneratedCode/Shapes_Control_comp_stub_export.h
-  }
-
-  Inline_Files {
-    GeneratedCode/Shapes_Control_compC.inl
-  }
-}
-
-project(Shapes_Control_comp_exec) : ciao_executor {
-  after   += Shapes_Control_comp_lem_stub Shapes_Control_comp_stub \
-             Shapes_Control_obj_lem_stub
-
-  libs += Shapes_Control_comp_stub Shapes_Control_comp_lem_stub Shapes_ShapeType_msg_stub \
-          Shapes_Control_obj_lem_stub Shapes_Control_obj_stub
-  libpaths += ../../lib
-  libout = ../../lib
-
-  includes += ./GeneratedCode ../ports/GeneratedCode ../../ports/GeneratedCode
-
-  sharedname = Shapes_Control_comp_exec
-  dynamicflags += SHAPES_CONTROL_COMP_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Shapes_Control_comp_exec.cpp
-  }
-
-  Header_Files {
-    Shapes_Control_comp_exec.h
-    Shapes_Control_comp_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(Shapes_Control_comp_svnt) : ciao_servant {
-  after      += Shapes_ShapeType_msg_stub  Shapes_Control_comp_lem_stub \
-                Shapes_Control_comp_stub Shapes_Control_obj_svnt \
-                Shapes_Control_obj_lem_stub
-
-  libs       += Shapes_Control_comp_stub Shapes_Control_comp_lem_stub  \
-                Shapes_ShapeType_msg_stub \
-                Shapes_Control_obj_stub Shapes_Control_obj_svnt \
-                Shapes_Control_obj_lem_stub
-  libpaths += ../../lib
-  libout = ../../lib
-
-  includes += ../ports/GeneratedCode ../../ports/GeneratedCode
-
-  sharedname  = Shapes_Control_comp_svnt
-  dynamicflags += SHAPES_CONTROL_COMP_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GeneratedCode/Shapes_Control_compS.cpp
-    GeneratedCode/Shapes_Control_comp_svnt.cpp
-  }
-
-  Header_Files {
-    GeneratedCode/Shapes_Control_compS.h
-    GeneratedCode/Shapes_Control_comp_svnt.h
-    GeneratedCode/Shapes_Control_comp_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.cpp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.cpp
deleted file mode 100644
index cb003dee25f..00000000000
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.cpp
+++ /dev/null
@@ -1,297 +0,0 @@
-// -*- C++ -*-
-#include "Shapes_Control_comp_exec.h"
-#include "tao/ORB_Core.h"
-
-#include "ace/Guard_T.h"
-#include "ace/Log_Msg.h"
-#include "ace/Reactor.h"
-
-#define MIN_SIZE 5
-
-namespace CIAO_Shapes_Control_comp_Impl
-{
-  //============================================================
-  // pulse_Generator
-  //============================================================
-  pulse_Generator::pulse_Generator (Control_comp_exec_i &callback)
-    : pulse_callback_ (callback)
-  {
-  }
-
-  pulse_Generator::~pulse_Generator ()
-  {
-  }
-
-  int
-  pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    this->pulse_callback_.tick ();
-    return 0;
-  }
-
-  //============================================================
-  // Component Executor Implementation Class: Control_comp_exec_i
-  //============================================================
-
-  Control_comp_exec_i::Control_comp_exec_i (void)
-    : rate_ (0)
-      , max_x_ (100)
-      , max_y_ (100)
-      , max_size_ (25)
-      , resize_shape_ (false)
-      , x_increasing_ (false)
-      , y_increasing_ (false)
-      , size_increasing_ (false)
-      , current_size_ (ACE_OS::rand () % max_size_)
-      , current_x_ (ACE_OS::rand () % max_x_)
-      , current_y_ (ACE_OS::rand () % max_y_)
-  {
-    this->ticker_ = new pulse_Generator (*this);
-  }
-
-  Control_comp_exec_i::~Control_comp_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Control_comp_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Control_comp_exec_i::tick ()
-  {
-    if (this->x_increasing_)
-      {
-        ++this->current_x_;
-        this->x_increasing_ = this->current_x_ + 1 <= this->max_x_;
-      }
-    else
-      {
-        --this->current_x_;
-        this->x_increasing_ = this->current_x_ - 1 < 0;
-      }
-    if (this->y_increasing_)
-      {
-        ++this->current_y_;
-        this->y_increasing_ = this->current_y_ + 1 <= this->max_y_;
-      }
-    else
-      {
-        --this->current_y_;
-        this->y_increasing_ = this->current_y_ - 1 < 0;
-      }
-    if (resize_shape ())
-      {
-        if (this->size_increasing_)
-          {
-            ++this->current_size_;
-            this->size_increasing_ = this->current_size_ + 1 <= this->max_size_;
-          }
-        else
-          {
-            if (this->current_size_ == MIN_SIZE)
-              {
-                this->size_increasing_ = true;
-              }
-            else
-              {
-                --this->current_size_;
-                this->size_increasing_ = this->current_size_ - 1 < 0;
-              }
-          }
-      }
-    ::Shapes::Control_obj_var control =
-      this->ciao_context_->get_connection_control ();
-    if (! ::CORBA::is_nil (control))
-      {
-        if (control->setSize (this->current_size_) == ::Shapes::RETURN_ERROR)
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("Control_comp_exec_i::tick : ")
-                                  ACE_TEXT ("Setting shapes size\n")));
-          }
-        else
-          {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Control_comp_exec_i::tick : ")
-                                  ACE_TEXT ("Size set to <%u>.\n"),
-                                  this->current_size_));
-          }
-        if (control->setLocation (this->current_x_,
-                                  this->current_y_) == ::Shapes::RETURN_ERROR)
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("Control_comp_exec_i::tick : ")
-                                  ACE_TEXT ("Setting shapes location\n")));
-          }
-        else
-          {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Control_comp_exec_i::tick : ")
-                                  ACE_TEXT ("Location set to <%u>, <%u>.\n"),
-                                  this->current_x_,
-                                  this->current_y_));
-          }
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to control shapes\n")));
-      }
-   }
-
-  void
-  Control_comp_exec_i::start (void)
-  {
-    // calculate the interval time
-    long const usec = 1000000 / this->rate_;
-    if (this->reactor ()->schedule_timer (
-                this->ticker_,
-                0,
-                ACE_Time_Value (0, usec),
-                ACE_Time_Value (0, usec)) == -1)
-    {
-      ACE_ERROR ((LM_ERROR, ACE_TEXT ("Control_comp_exec_i::start : ")
-                            ACE_TEXT ("Error scheduling timer\n")));
-    }
-  }
-
-  void
-  Control_comp_exec_i::stop (void)
-  {
-    this->reactor ()->cancel_timer (this->ticker_);
-  }
-
-  // Component attributes and port operations.
-
-  ::CORBA::ULong
-  Control_comp_exec_i::rate (void)
-  {
-    return this->rate_;
-  }
-
-  void
-  Control_comp_exec_i::rate (
-    const ::CORBA::ULong rate)
-  {
-    this->rate_ = rate;
-  }
-
-  ::CORBA::UShort
-  Control_comp_exec_i::max_x (void)
-  {
-    return this->max_x_;
-  }
-
-  void
-  Control_comp_exec_i::max_x (
-    const ::CORBA::UShort max_x)
-  {
-    this->max_x_ = max_x;
-  }
-
-  ::CORBA::UShort
-  Control_comp_exec_i::max_y (void)
-  {
-    return this->max_y_;
-  }
-
-  void
-  Control_comp_exec_i::max_y (
-    const ::CORBA::UShort max_y)
-  {
-    this->max_y_ = max_y;
-  }
-
-  ::CORBA::UShort
-  Control_comp_exec_i::max_size (void)
-  {
-    return this->max_size_;
-  }
-
-  void
-  Control_comp_exec_i::max_size (
-    const ::CORBA::UShort max_size)
-  {
-    this->max_size_ = max_size;
-  }
-
-  ::CORBA::Boolean
-  Control_comp_exec_i::resize_shape (void)
-  {
-    return this->resize_shape_;
-  }
-
-  void
-  Control_comp_exec_i::resize_shape (
-    const ::CORBA::Boolean resize_shape)
-  {
-    this->resize_shape_ = resize_shape;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Control_comp_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Shapes::CCM_Control_comp_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Control_comp_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Control_comp_exec_i::ccm_activate (void)
-  {
-     this->start ();
-  }
-
-  void
-  Control_comp_exec_i::ccm_passivate (void)
-  {
-    this->stop ();
-  }
-
-  void
-  Control_comp_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SHAPES_CONTROL_COMP_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Shapes_Control_comp_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Control_comp_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.h b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.h
deleted file mode 100644
index af65894f21e..00000000000
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.h
+++ /dev/null
@@ -1,216 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v2.1.1
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_SHAPES_CONTROL_COMP_EXEC_WWONQX_H_
-#define CIAO_SHAPES_CONTROL_COMP_EXEC_WWONQX_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Shapes_Control_compEC.h"
-
-#include /**/ "Shapes_Control_comp_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-/// Namespace for implementation of Shapes::Control_comp component
-namespace CIAO_Shapes_Control_comp_Impl
-{
-  class Control_comp_exec_i;
-
-  //============================================================
-  // pulse_Generator
-  //============================================================
-  class pulse_Generator : public ACE_Event_Handler
-  {
-  public:
-    pulse_Generator (Control_comp_exec_i &callback);
-
-    virtual ~pulse_Generator ();
-
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    Control_comp_exec_i &pulse_callback_;
-  };
-
-  /// Component Executor Implementation Class: Control_comp_exec_i
-  class SHAPES_CONTROL_COMP_EXEC_Export Control_comp_exec_i
-    : public virtual Control_comp_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    /// Constructor
-    Control_comp_exec_i (void);
-    /// Destructor
-    virtual ~Control_comp_exec_i (void);
-
-    /** @name Supported operations and attributes. */
-    //@{
-
-    //@}
-
-    /** @name Component attributes and port operations. */
-    //@{
-
-    /// Getter for rate attribute
-    /// @return value of rate attribute
-    virtual ::CORBA::ULong rate (
-      void);
-
-    /// Setter for rate attribute
-    /// @param[in] rate - New value for rate attribute
-    virtual void rate (
-      ::CORBA::ULong rate);
-
-    /// Getter for max_x attribute
-    /// @return value of max_x attribute
-    virtual ::CORBA::UShort max_x (
-      void);
-
-    /// Setter for max_x attribute
-    /// @param[in] max_x - New value for max_x attribute
-    virtual void max_x (
-      ::CORBA::UShort max_x);
-
-    /// Getter for max_y attribute
-    /// @return value of max_y attribute
-    virtual ::CORBA::UShort max_y (
-      void);
-
-    /// Setter for max_y attribute
-    /// @param[in] max_y - New value for max_y attribute
-    virtual void max_y (
-      ::CORBA::UShort max_y);
-
-    /// Getter for max_size attribute
-    /// @return value of max_size attribute
-    virtual ::CORBA::UShort max_size (
-      void);
-
-    /// Setter for max_size attribute
-    /// @param[in] max_size - New value for max_size attribute
-    virtual void max_size (
-      ::CORBA::UShort max_size);
-
-    /// Getter for resize_shape attribute
-    /// @return value of resize_shape attribute
-    virtual ::CORBA::Boolean resize_shape (
-      void);
-
-    /// Setter for resize_shape attribute
-    /// @param[in] resize_shape - New value for resize_shape attribute
-    virtual void resize_shape (
-      ::CORBA::Boolean resize_shape);
-    //@}
-
-    /** @name Session component operations */
-    //@{
-
-    /// Setter for container context for this component
-    /// @param[in] ctx - Container context
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-
-    /// Component state change method to configuration_complete state
-    virtual void configuration_complete (void);
-
-    /// Component state change method to activated state
-    virtual void ccm_activate (void);
-
-    /// Component state change method to passivated state
-    virtual void ccm_passivate (void);
-
-    /// Component state change method to removed state
-    virtual void ccm_remove (void);
-    //@}
-
-    /** @name User defined public operations. */
-    //@{
-    void tick (void);
-    //@}
-
-  private:
-    /// Context for component instance. Used for all middleware communication
-    ::Shapes::CCM_Control_comp_Context_var ciao_context_;
-
-    /** @name Component attributes. */
-    //@{
-
-    /// Class member storing value of rate attribute
-    ::CORBA::ULong rate_;
-
-    /// Class member storing value of max_x attribute
-    ::CORBA::UShort max_x_;
-
-    /// Class member storing value of max_y attribute
-    ::CORBA::UShort max_y_;
-
-    /// Class member storing value of max_size attribute
-    ::CORBA::UShort max_size_;
-
-    /// Class member storing value of resize_shape attribute
-    ::CORBA::Boolean resize_shape_;
-    //@}
-
-    /** @name Component facets. */
-    //@{
-    //@}
-
-    /** @name User defined members. */
-    //@{
-    bool x_increasing_;
-    bool y_increasing_;
-    bool size_increasing_;
-
-    ::CORBA::UShort current_size_;
-    ::CORBA::UShort current_x_;
-    ::CORBA::UShort current_y_;
-
-    pulse_Generator * ticker_;
-
-    //@}
-
-    /** @name User defined private operations. */
-    //@{
-    void start (void);
-    void stop (void);
-    //@}
-
-    /// Get the ACE_Reactor
-    /// @return non-owning pointer to reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  /// Factory method and library entry point used by the middleware
-  /// @return new component instance
-  extern "C"  SHAPES_CONTROL_COMP_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Shapes_Control_comp_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.idl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.idl
deleted file mode 100644
index de2946a8d7f..00000000000
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.idl
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef SHAPES_RECEIVER_COMP_IDL_
-#define SHAPES_RECEIVER_COMP_IDL_
-
-#include "Shapes_ShapeType_conn.idl"
-
-module Shapes
-{
-  component Receiver_comp
-  {
-    port ShapeType_conn::DDS_Listen info_out;
-  };
-};
-
-#endif /* SHAPES_RECEIVER_COMP_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.mpc
deleted file mode 100644
index b7166aea155..00000000000
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.mpc
+++ /dev/null
@@ -1,173 +0,0 @@
-project(Shapes_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += Shapes_ShapeType_conn_idl_gen
-  idlflags += -Wb,stub_export_macro=SHAPES_RECEIVER_COMP_STUB_Export \
-              -Wb,stub_export_include=Shapes_Receiver_comp_stub_export.h \
-              -Wb,svnt_export_macro=SHAPES_RECEIVER_COMP_SVNT_Export \
-              -Wb,svnt_export_include=Shapes_Receiver_comp_svnt_export.h \
-              -Wb,exec_export_macro=SHAPES_RECEIVER_COMP_EXEC_Export \
-              -Wb,exec_export_include=Shapes_Receiver_comp_exec_export.h \
-              -I../../ports \
-              -o GeneratedCode
-
-  IDL_Files {
-    Shapes_Receiver_comp.idl
-    gendir = GeneratedCode
-  }
-}
-
-project(Shapes_Receiver_executor_gen) : componentidldefaults, dds4ccm {
-  requires += dummy_label
-  custom_only = 1
-  idlflags += -Gex -SS -Sci \
-              -I../../ports \
-              -Wb,exec_export_macro=SHAPES_RECEIVER_COMP_EXEC_Export \
-              -Wb,exec_export_include=Shapes_Receiver_comp_exec_export.h \
-              -o ../../../Tutorial/Code/Shapes_Receiver_comp
-
-  IDL_Files {
-    Shapes_Receiver_comp.idl
-  }
-}
-
-project(Shapes_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += Shapes_Receiver_idl_gen Shapes_Sender_idl_lem_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SHAPES_RECEIVER_COMP_LEM_STUB_Export \
-              -Wb,stub_export_include=Shapes_Receiver_comp_lem_stub_export.h \
-              -SS -Gxhst \
-              -I../../ports \
-              -I../../ports/GeneratedCode \
-              -o GeneratedCode
-
-  IDL_Files {
-    GeneratedCode/Shapes_Receiver_compE.idl
-    gendir = GeneratedCode
-  }
-}
-
-project(Shapes_Receiver_comp_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += Shapes_Receiver_lem_gen Shapes_Receiver_comp_stub  Shapes_ShapeType_conn_stub \
-           Shapes_ShapeType_msg_stub
-
-  libs  += Shapes_Receiver_comp_stub Shapes_ShapeType_conn_stub Shapes_ShapeType_msg_stub
-  libpaths += ../../lib
-  libout = ../../lib
-
-  includes += ../../ports ../../ports/GeneratedCode
-
-  sharedname = Shapes_Receiver_comp_lem_stub
-  dynamicflags += SHAPES_RECEIVER_COMP_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GeneratedCode/Shapes_Receiver_compEC.cpp
-  }
-
-  Header_Files {
-    GeneratedCode/Shapes_Receiver_compEC.h
-    GeneratedCode/Shapes_Receiver_comp_lem_stub_export.h
-  }
-
-  Inline_Files {
-    GeneratedCode/Shapes_Receiver_compEC.inl
-  }
-}
-
-project(Shapes_Receiver_comp_stub) : ccm_stub, dds4ccm_base {
-  after += Shapes_Receiver_idl_gen Shapes_ShapeType_conn_stub \
-           Shapes_ShapeType_msg_stub Shapes_ShapeType_conn_lem_gen
-
-  libs  += Shapes_ShapeType_conn_stub Shapes_ShapeType_msg_stub
-  libpaths += ../../lib
-  libout = ../../lib
-
-  includes += ../../ports ../../ports/GeneratedCode
-
-  sharedname = Shapes_Receiver_comp_stub
-  dynamicflags += SHAPES_RECEIVER_COMP_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GeneratedCode/Shapes_Receiver_compC.cpp
-  }
-
-  Header_Files {
-    GeneratedCode/Shapes_Receiver_compC.h
-    GeneratedCode/Shapes_Receiver_comp_stub_export.h
-  }
-
-  Inline_Files {
-    GeneratedCode/Shapes_Receiver_compC.inl
-  }
-}
-
-project(Shapes_Receiver_comp_exec) : ciao_executor, dds4ccm_lem_stub {
-  after += Shapes_Receiver_comp_lem_stub Shapes_Receiver_comp_stub \
-           Shapes_ShapeType_msg_stub Shapes_ShapeType_conn_stub Shapes_ShapeType_conn_lem_stub
-  libs += Shapes_Receiver_comp_stub Shapes_Receiver_comp_lem_stub Shapes_ShapeType_msg_stub \
-          Shapes_ShapeType_conn_stub Shapes_ShapeType_conn_lem_stub
-  libpaths += ../../lib
-  libout = ../../lib
-
-  includes += ./GeneratedCode ../ports/GeneratedCode ../../ports ../../ports/GeneratedCode
-
-  sharedname = Shapes_Receiver_comp_exec
-  dynamicflags += SHAPES_RECEIVER_COMP_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Shapes_Receiver_comp_exec.cpp
-  }
-
-  Header_Files {
-    Shapes_Receiver_comp_exec.h
-    GeneratedCode/Shapes_Receiver_comp_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(Shapes_Receiver_comp_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += Shapes_Receiver_comp_lem_stub Shapes_ShapeType_msg_stub \
-                Shapes_ShapeType_conn_stub Shapes_ShapeType_conn_svnt Shapes_Receiver_comp_exec \
-                Shapes_ShapeType_conn_lem_stub
-
-  libs       += Shapes_Receiver_comp_stub Shapes_Receiver_comp_lem_stub Shapes_ShapeType_msg_stub \
-                Shapes_ShapeType_conn_stub Shapes_ShapeType_conn_svnt Shapes_Receiver_comp_exec \
-                Shapes_ShapeType_conn_lem_stub
-  libpaths += ../../lib
-  libout = ../../lib
-
-  includes += ../ports/GeneratedCode ../../ports ../../ports/GeneratedCode
-
-  sharedname  = Shapes_Receiver_comp_svnt
-  dynamicflags += SHAPES_RECEIVER_COMP_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GeneratedCode/Shapes_Receiver_compS.cpp
-    GeneratedCode/Shapes_Receiver_comp_svnt.cpp
-  }
-
-  Header_Files {
-    GeneratedCode/Shapes_Receiver_compS.h
-    GeneratedCode/Shapes_Receiver_comp_svnt.h
-    GeneratedCode/Shapes_Receiver_comp_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.cpp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.cpp
deleted file mode 100644
index dbabbb9eaa9..00000000000
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.cpp
+++ /dev/null
@@ -1,188 +0,0 @@
-// -*- C++ -*-
-#include "Shapes_Receiver_comp_exec.h"
-
-namespace CIAO_Shapes_Receiver_comp_Impl
-{
-
-  //============================================================
-  // Facet Executor Implementation Class: info_out_data_listener_exec_i
-  //============================================================
-
-  info_out_data_listener_exec_i::info_out_data_listener_exec_i (
-        ::Shapes::CCM_Receiver_comp_Context_ptr ctx)
-    : ciao_context_ (
-        ::Shapes::CCM_Receiver_comp_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::Shapes::ShapeType_conn::Listener
-
-  void
-  info_out_data_listener_exec_i::on_one_data (const ::ShapeType & datum,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ShapeType_Listener: ")
-            ACE_TEXT ("received shape_info for <%C> at %u:%u:%u\n"),
-            datum.color.in (),
-            datum.x,
-            datum.y,
-            datum.shapesize));
-  }
-
-  void
-  info_out_data_listener_exec_i::on_many_data (const ::ShapeTypeSeq & /* data */,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    /* Your code here. */
-  }
-
-  //============================================================
-  // Facet Executor Implementation Class: info_out_status_exec_i
-  //============================================================
-
-  info_out_status_exec_i::info_out_status_exec_i (
-        ::Shapes::CCM_Receiver_comp_Context_ptr ctx)
-    : ciao_context_ (
-        ::Shapes::CCM_Receiver_comp_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_status_exec_i::~info_out_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  //============================================================
-  // Component Executor Implementation Class: Receiver_comp_exec_i
-  //============================================================
-
-  Receiver_comp_exec_i::Receiver_comp_exec_i (void){
-  }
-
-  Receiver_comp_exec_i::~Receiver_comp_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-
-  // Component attributes and port operations.
-
-  ::Shapes::ShapeType_conn::CCM_Listener_ptr
-  Receiver_comp_exec_i::get_info_out_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ()))
-      {
-        info_out_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_data_listener_exec_i (
-            this->ciao_context_.in ()),
-            ::Shapes::ShapeType_conn::CCM_Listener::_nil ());
-
-          this->ciao_info_out_data_listener_ = tmp;
-      }
-
-    return
-      ::Shapes::ShapeType_conn::CCM_Listener::_duplicate (
-        this->ciao_info_out_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_comp_exec_i::get_info_out_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ()))
-      {
-        info_out_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_out_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_out_status_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_comp_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Shapes::CCM_Receiver_comp_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_comp_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_comp_exec_i::ccm_activate (void)
-  {
-    ::CCM_DDS::DataListenerControl_var lc =
-    this->ciao_context_->get_connection_info_out_data_control ();
-    if (::CORBA::is_nil (lc.in ()))
-      {
-        ACE_ERROR ((LM_INFO, ACE_TEXT ("Error:  Listener control receptacle is null!\n")));
-        throw ::CORBA::INTERNAL ();
-      }
-
-    lc->mode (::CCM_DDS::ONE_BY_ONE);
-  }
-
-  void
-  Receiver_comp_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_comp_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SHAPES_RECEIVER_COMP_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Shapes_Receiver_comp_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_comp_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.h b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.h
deleted file mode 100644
index 0e7b8082298..00000000000
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.h
+++ /dev/null
@@ -1,201 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v2.1.1
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_SHAPES_RECEIVER_COMP_EXEC_MNXIMZ_H_
-#define CIAO_SHAPES_RECEIVER_COMP_EXEC_MNXIMZ_H_
-
-
-#include /**/ "ace/pre.h"
-
-#include "Shapes_Receiver_compEC.h"
-
-#include /**/ "Shapes_Receiver_comp_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-/// Namespace for implementation of Shapes::Receiver_comp component
-namespace CIAO_Shapes_Receiver_comp_Impl
-{
-
-  ///  Executor implementation class for info_out_data_listener facet
-  class SHAPES_RECEIVER_COMP_EXEC_Export info_out_data_listener_exec_i
-    : public virtual ::Shapes::ShapeType_conn::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    /// Constructor
-    /// @param[in] ctx - Container context
-    info_out_data_listener_exec_i (
-      ::Shapes::CCM_Receiver_comp_Context_ptr ctx);
-    /// Destructor
-    virtual ~info_out_data_listener_exec_i (void);
-
-    /** @name Operations and attributes from Shapes::ShapeType_conn::Listener */
-    //@{
-
-    virtual
-    void on_one_data (
-      const ::ShapeType & datum,
-      const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (
-      const ::ShapeTypeSeq & data,
-      const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    /// Context for component instance. Used for all middleware communication.
-    ::Shapes::CCM_Receiver_comp_Context_var ciao_context_;
-  };
-
-  ///  Executor implementation class for info_out_status facet
-  class SHAPES_RECEIVER_COMP_EXEC_Export info_out_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    /// Constructor
-    /// @param[in] ctx - Container context
-    info_out_status_exec_i (
-      ::Shapes::CCM_Receiver_comp_Context_ptr ctx);
-    /// Destructor
-    virtual ~info_out_status_exec_i (void);
-
-    /** @name Operations and attributes from CCM_DDS::PortStatusListener */
-    //@{
-
-    virtual
-    void on_requested_deadline_missed (
-      ::DDS::DataReader_ptr the_reader,
-      const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (
-      ::DDS::DataReader_ptr the_reader,
-      const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    /// Context for component instance. Used for all middleware communication.
-    ::Shapes::CCM_Receiver_comp_Context_var ciao_context_;
-  };
-
-  /// Component Executor Implementation Class: Receiver_comp_exec_i
-  class SHAPES_RECEIVER_COMP_EXEC_Export Receiver_comp_exec_i
-    : public virtual Receiver_comp_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    /// Constructor
-    Receiver_comp_exec_i (void);
-    /// Destructor
-    virtual ~Receiver_comp_exec_i (void);
-
-    /** @name Supported operations and attributes. */
-    //@{
-
-    //@}
-
-    /** @name Component attributes and port operations. */
-    //@{
-
-    /// Factory method and getter for info_out_data_listener facet
-    /// @return existing instance of facet if one exists, else creates one
-    virtual ::Shapes::ShapeType_conn::CCM_Listener_ptr
-    get_info_out_data_listener (void);
-
-    /// Factory method and getter for info_out_status facet
-    /// @return existing instance of facet if one exists, else creates one
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_status (void);
-    //@}
-
-    /** @name Session component operations */
-    //@{
-
-    /// Setter for container context for this component
-    /// @param[in] ctx - Container context
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-
-    /// Component state change method to configuration_complete state
-    virtual void configuration_complete (void);
-
-    /// Component state change method to activated state
-    virtual void ccm_activate (void);
-
-    /// Component state change method to passivated state
-    virtual void ccm_passivate (void);
-
-    /// Component state change method to removed state
-    virtual void ccm_remove (void);
-    //@}
-
-    /** @name User defined public operations. */
-    //@{
-
-    //@}
-
-  private:
-    /// Context for component instance. Used for all middleware communication
-    ::Shapes::CCM_Receiver_comp_Context_var ciao_context_;
-
-    /** @name Component attributes. */
-    //@{
-    //@}
-
-    /** @name Component facets. */
-    //@{
-
-    /// Object reference to info_out_data_listener facet
-    ::Shapes::ShapeType_conn::CCM_Listener_var ciao_info_out_data_listener_;
-
-    /// Object reference to info_out_status facet
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_;
-    //@}
-
-    /** @name User defined members. */
-    //@{
-
-    //@}
-
-    /** @name User defined private operations. */
-    //@{
-
-    //@}
-  };
-
-  /// Factory method and library entry point used by the middleware
-  /// @return new component instance
-  extern "C" SHAPES_RECEIVER_COMP_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Shapes_Receiver_comp_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.idl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.idl
deleted file mode 100644
index da2808eb22b..00000000000
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.idl
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef SHAPES_SENDER_COMP_IDL_
-#define SHAPES_SENDER_COMP_IDL_
-
-#include "Shapes_ShapeType_conn.idl"
-#include "Shapes_Control_obj.idl"
-
-module Shapes
-{
-  component Sender_comp
-  {
-    port ShapeType_conn::DDS_Write info_write;
-
-    provides Shapes::Control_obj control;
-  };
-};
-
-#endif /* SHAPES_SENDER_COMP_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc
deleted file mode 100644
index 4b5d07c5924..00000000000
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc
+++ /dev/null
@@ -1,181 +0,0 @@
-project(Shapes_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += Shapes_ShapeType_conn_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SHAPES_SENDER_COMP_STUB_Export \
-              -Wb,stub_export_include=Shapes_Sender_comp_stub_export.h \
-              -Wb,svnt_export_macro=SHAPES_SENDER_COMP_SVNT_Export \
-              -Wb,svnt_export_include=Shapes_Sender_comp_svnt_export.h \
-              -Wb,exec_export_macro=SHAPES_SENDER_COMP_EXEC_Export \
-              -Wb,exec_export_include=Shapes_Sender_comp_exec_export.h \
-              -I../../ports \
-              -o GeneratedCode
-
-  IDL_Files {
-    Shapes_Sender_comp.idl
-    gendir = GeneratedCode
-  }
-}
-
-project(Shapes_Sender_executor_gen) : componentidldefaults, dds4ccm {
-  requires += dummy_label
-  custom_only = 1
-  idlflags += -Gex -SS -Sci \
-              -I../ports \
-              -I../../ports \
-              -Wb,exec_export_macro=SHAPES_SENDER_COMP_EXEC_Export \
-              -Wb,exec_export_include=Shapes_Sender_comp_exec_export.h \
-              -o ../../../Tutorial/Code/Shapes_Sender_comp
-
-  IDL_Files {
-    Shapes_Sender_comp.idl
-  }
-}
-
-project(Shapes_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += Shapes_Sender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SHAPES_SENDER_COMP_LEM_STUB_Export \
-              -Wb,stub_export_include=Shapes_Sender_comp_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors \
-              -I../../ports \
-              -I../../ports/GeneratedCode \
-              -o GeneratedCode
-
-  IDL_Files {
-    GeneratedCode/Shapes_Sender_compE.idl
-    gendir = GeneratedCode
-  }
-}
-
-project(Shapes_Sender_comp_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += Shapes_Sender_lem_gen Shapes_Sender_comp_stub Shapes_ShapeType_msg_stub
-
-  libs  += Shapes_ShapeType_msg_stub Shapes_Sender_comp_stub
-  libpaths += ../../lib
-  libout = ../../lib
-
-  includes += ../../ports ../../ports/GeneratedCode
-
-  sharedname = Shapes_Sender_comp_lem_stub
-  dynamicflags += SHAPES_SENDER_COMP_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GeneratedCode/Shapes_Sender_compEC.cpp
-  }
-
-  Header_Files {
-    GeneratedCode/Shapes_Sender_compEC.h
-    GeneratedCode/Shapes_Sender_comp_lem_stub_export.h
-  }
-
-  Inline_Files {
-    GeneratedCode/Shapes_Sender_compEC.inl
-  }
-}
-
-project(Shapes_Sender_comp_stub) : ccm_stub, dds4ccm_base {
-  after += Shapes_Sender_idl_gen Shapes_ShapeType_msg_stub \
-           Shapes_ShapeType_conn_stub Shapes_Control_obj_stub
-
-  libs  += Shapes_ShapeType_msg_stub Shapes_ShapeType_conn_stub \
-           Shapes_Control_obj_stub
-  libpaths += ../../lib
-  libout = ../../lib
-
-  includes += ../../ports ../../ports/GeneratedCode
-
-  sharedname = Shapes_Sender_comp_stub
-  dynamicflags += SHAPES_SENDER_COMP_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GeneratedCode/Shapes_Sender_compC.cpp
-  }
-
-  Header_Files {
-    GeneratedCode/Shapes_Sender_compC.h
-    GeneratedCode/Shapes_Sender_comp_stub_export.h
-  }
-
-  Inline_Files {
-    GeneratedCode/Shapes_Sender_compC.inl
-  }
-}
-
-project(Shapes_Sender_comp_exec) : ciao_executor, dds4ccm_base {
-  after   += Shapes_Sender_comp_lem_stub Shapes_Sender_comp_stub Shapes_ShapeType_conn_lem_stub \
-             Shapes_ShapeType_conn_stub Shapes_Control_comp_lem_stub Shapes_Control_obj_lem_stub \
-             Shapes_defn_stub Shapes_Control_obj_stub
-
-  libs += Shapes_Sender_comp_stub Shapes_Sender_comp_lem_stub Shapes_ShapeType_msg_stub \
-          Shapes_ShapeType_conn_lem_stub Shapes_ShapeType_conn_stub Shapes_Control_comp_lem_stub \
-          Shapes_Control_obj_lem_stub Shapes_defn_stub Shapes_Control_obj_stub
-  libpaths += ../../lib
-  libout = ../../lib
-
-  includes += ./GeneratedCode ../ports/GeneratedCode ../../ports ../../ports/GeneratedCode
-
-  sharedname = Shapes_Sender_comp_exec
-  dynamicflags += SHAPES_SENDER_COMP_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Shapes_Sender_comp_exec.cpp
-  }
-
-  Header_Files {
-    Shapes_Sender_comp_exec.h
-    Shapes_Sender_comp_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(Shapes_Sender_comp_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += Shapes_ShapeType_msg_stub  Shapes_Sender_comp_lem_stub \
-                Shapes_ShapeType_conn_stub Shapes_ShapeType_conn_svnt \
-                Shapes_ShapeType_conn_lem_stub Shapes_Control_comp_svnt \
-                Shapes_Control_obj_stub Shapes_Control_obj_svnt \
-                Shapes_Control_obj_lem_stub
-
-  libs       += Shapes_Sender_comp_stub Shapes_Sender_comp_lem_stub  \
-                Shapes_ShapeType_msg_stub \
-                Shapes_ShapeType_conn_stub Shapes_ShapeType_conn_svnt \
-                Shapes_ShapeType_conn_lem_stub Shapes_Control_comp_svnt \
-                Shapes_Control_obj_stub Shapes_Control_obj_svnt \
-                Shapes_Control_obj_lem_stub
-  libpaths += ../../lib
-  libout = ../../lib
-
-  includes += ../ports/GeneratedCode ../../ports ../../ports/GeneratedCode
-
-  sharedname  = Shapes_Sender_comp_svnt
-  dynamicflags += SHAPES_SENDER_COMP_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GeneratedCode/Shapes_Sender_compS.cpp
-    GeneratedCode/Shapes_Sender_comp_svnt.cpp
-  }
-
-  Header_Files {
-    GeneratedCode/Shapes_Sender_compS.h
-    GeneratedCode/Shapes_Sender_comp_svnt.h
-    GeneratedCode/Shapes_Sender_comp_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.cpp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.cpp
deleted file mode 100644
index 1388ed8c152..00000000000
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.cpp
+++ /dev/null
@@ -1,236 +0,0 @@
-// -*- C++ -*-
-#include "Shapes_Sender_comp_exec.h"
-
-namespace CIAO_Shapes_Sender_comp_Impl
-{
-
-  //============================================================
-  // Facet Executor Implementation Class: control_exec_i
-  //============================================================
-
-  control_exec_i::control_exec_i (
-        ::Shapes::CCM_Sender_comp_Context_ptr ctx,
-        Sender_comp_exec_i &callback)
-    : ciao_context_ (
-        ::Shapes::CCM_Sender_comp_Context::_duplicate (ctx)),
-      callback_ (callback)
-  {
-  }
-
-  control_exec_i::~control_exec_i (void)
-  {
-  }
-
-  // Operations from ::Shapes::Control_obj
-
-  ::Shapes::ReturnStatus
-  control_exec_i::setSize (::CORBA::UShort size)
-  {
-    return this->callback_.setSize (size);
-  }
-
-  ::Shapes::ReturnStatus
-  control_exec_i::setLocation (::CORBA::UShort x,
-  ::CORBA::UShort y)
-  {
-    return this->callback_.setLocation (x, y);
-  }
-
-  //============================================================
-  // Component Executor Implementation Class: Sender_comp_exec_i
-  //============================================================
-
-  Sender_comp_exec_i::Sender_comp_exec_i (void)
-    : instance_handle_ (::DDS::HANDLE_NIL)
-  {
-    this->square_.x = 10;
-    this->square_.y = 10;
-    this->square_.shapesize = 1;
-    this->square_.color = CORBA::string_dup("GREEN");
-  }
-
-  Sender_comp_exec_i::~Sender_comp_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-  ::Shapes::ReturnStatus
-  Sender_comp_exec_i::setSize (::CORBA::UShort size)
-  {
-    this->square_.shapesize = size;
-    return this->update_square ();
-  }
-
-  ::Shapes::ReturnStatus
-  Sender_comp_exec_i::setLocation (::CORBA::UShort x,
-                              ::CORBA::UShort y)
-   {
-    this->square_.x = x;
-    this->square_.y = y;
-    return this->update_square ();
-  }
-
-  ::Shapes::ReturnStatus
-  Sender_comp_exec_i::update_square ()
-  {
-    ::Shapes::ShapeType_conn::Writer_var writer =
-      this->ciao_context_->get_connection_info_write_data ();
-    if (::CORBA::is_nil (writer.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::update_square - ")
-                              ACE_TEXT ("Unable to write: write_data is nil.\n")));
-        return ::Shapes::RETURN_ERROR;
-      }
-
-    try
-      {
-        writer->write_one (this->square_, this->instance_handle_);
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("UPDATED Shape_info for <%C> %u:%u:%u\n"),
-                  this->square_.color.in (),
-                  this->square_.x,
-                  this->square_.y,
-                  this->square_.shapesize));
-      }
-    catch (const CCM_DDS::NonExistent& )
-      {
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("Shape_info for <%C> not updated: <%C> didn't exist.\n"),
-                    this->square_.color.in (), this->square_.color.in ()));
-      }
-    catch (const CCM_DDS::InternalError& )
-      {
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("Internal Error while updating Shape_info for <%C>.\n"),
-                    this->square_.color.in ()));
-      }
-    return ::Shapes::RETURN_OK;
-  }
-
-  // Component attributes and port operations.
-
-  ::Shapes::CCM_Control_obj_ptr
-  Sender_comp_exec_i::get_control (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_control_.in ()))
-      {
-        control_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          control_exec_i (
-            this->ciao_context_.in (),
-            *this),
-            ::Shapes::CCM_Control_obj::_nil ());
-
-          this->ciao_control_ = tmp;
-      }
-
-    return
-      ::Shapes::CCM_Control_obj::_duplicate (
-        this->ciao_control_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_comp_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Shapes::CCM_Sender_comp_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_comp_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_comp_exec_i::ccm_activate (void)
-  {
-    ::Shapes::ShapeType_conn::Writer_var writer =
-      this->ciao_context_->get_connection_info_write_data ();
-    if (::CORBA::is_nil (writer.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::update_square - ")
-                              ACE_TEXT ("Unable to write: write_data is nil.\n")));
-        throw ::CORBA::INTERNAL ();
-      }
-
-    try
-      {
-        this->instance_handle_ = writer->register_instance (this->square_);
-        //Register shape with dds.
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("REGISTER Shape_info for <%C> %u:%u:%u\n"),
-                      this->square_.color.in (),
-                      this->square_.x,
-                      this->square_.y,
-                      this->square_.shapesize));
-      }
-    catch (const CCM_DDS::AlreadyCreated& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Shape_info for <%C> already created.\n"),
-                    this->square_.color.in ()));
-      }
-    catch (const CCM_DDS::InternalError& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while creating Shape_info for <%C>.\n"),
-                      this->square_.color.in ()));
-      }
-  }
-
-  void
-  Sender_comp_exec_i::ccm_passivate (void)
-  {
-    ::Shapes::ShapeType_conn::Writer_var writer =
-      this->ciao_context_->get_connection_info_write_data ();
-    if (::CORBA::is_nil (writer.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::update_square - ")
-                              ACE_TEXT ("Unable to write: write_data is nil.\n")));
-        throw ::CORBA::INTERNAL ();
-      }
-
-    try
-      {
-        writer->unregister_instance (this->square_,
-                                     this->instance_handle_);
-      }
-    catch (const CCM_DDS::NonExistent& )
-      {
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("Shape_info for <%C> not deleted: <%C> didn't exist.\n"),
-                    this->square_.color.in (),
-                    this->square_.color.in ()));
-      }
-    catch (const CCM_DDS::InternalError& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while deleting Shape_info for <%C>.\n"),
-                    this->square_.color.in ()));
-      }
-  }
-
-  void
-  Sender_comp_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SHAPES_SENDER_COMP_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Shapes_Sender_comp_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_comp_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.h b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.h
deleted file mode 100644
index 98a2fdc5524..00000000000
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.h
+++ /dev/null
@@ -1,168 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v2.1.1
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_SHAPES_SENDER_COMP_EXEC_IEMJ0O_H_
-#define CIAO_SHAPES_SENDER_COMP_EXEC_IEMJ0O_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Shapes_Sender_compEC.h"
-
-#include /**/ "Shapes_Sender_comp_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-/// Namespace for implementation of Shapes::Sender_comp component
-namespace CIAO_Shapes_Sender_comp_Impl
-{
-  class Sender_comp_exec_i;
-
-  ///  Executor implementation class for control facet
-  class SHAPES_SENDER_COMP_EXEC_Export control_exec_i
-    : public virtual ::Shapes::CCM_Control_obj,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    /// Constructor
-    /// @param[in] ctx - Container context
-    control_exec_i (
-      ::Shapes::CCM_Sender_comp_Context_ptr ctx,
-       Sender_comp_exec_i &callback);
-    /// Destructor
-    virtual ~control_exec_i (void);
-
-    /** @name Operations and attributes from Shapes::Control_obj */
-    //@{
-
-    virtual
-    ::Shapes::ReturnStatus setSize (
-      ::CORBA::UShort size);
-
-    virtual
-    ::Shapes::ReturnStatus setLocation (
-      ::CORBA::UShort x,
-      ::CORBA::UShort y);
-    //@}
-
-  private:
-    /// Context for component instance. Used for all middleware communication.
-    ::Shapes::CCM_Sender_comp_Context_var ciao_context_;
-    Sender_comp_exec_i &callback_;
-  };
-
-  /// Component Executor Implementation Class: Sender_comp_exec_i
-  class SHAPES_SENDER_COMP_EXEC_Export Sender_comp_exec_i
-    : public virtual Sender_comp_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    /// Constructor
-    Sender_comp_exec_i (void);
-    /// Destructor
-    virtual ~Sender_comp_exec_i (void);
-
-    /** @name Supported operations and attributes. */
-    //@{
-
-    //@}
-
-    /** @name Component attributes and port operations. */
-    //@{
-
-    /// Factory method and getter for control facet
-    /// @return existing instance of facet if one exists, else creates one
-    virtual ::Shapes::CCM_Control_obj_ptr
-    get_control (void);
-    //@}
-
-    /** @name Session component operations */
-    //@{
-
-    /// Setter for container context for this component
-    /// @param[in] ctx - Container context
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-
-    /// Component state change method to configuration_complete state
-    virtual void configuration_complete (void);
-
-    /// Component state change method to activated state
-    virtual void ccm_activate (void);
-
-    /// Component state change method to passivated state
-    virtual void ccm_passivate (void);
-
-    /// Component state change method to removed state
-    virtual void ccm_remove (void);
-    //@}
-
-    /** @name User defined public operations. */
-    //@{
-    ::Shapes::ReturnStatus setSize (::CORBA::UShort size);
-
-    ::Shapes::ReturnStatus setLocation (::CORBA::UShort x,
-                                         ::CORBA::UShort y);
-    //@}
-
-  private:
-    /// Context for component instance. Used for all middleware communication
-    ::Shapes::CCM_Sender_comp_Context_var ciao_context_;
-
-    /** @name Component attributes. */
-    //@{
-    //@}
-
-    /** @name Component facets. */
-    //@{
-
-    /// Object reference to control facet
-    ::Shapes::CCM_Control_obj_var ciao_control_;
-    //@}
-
-    /** @name User defined members. */
-    //@{
-    ::DDS::InstanceHandle_t instance_handle_;
-     ShapeType square_;
-
-    //@}
-
-    /** @name User defined private operations. */
-    //@{
-     ::Shapes::ReturnStatus update_square (void);
-
-    //@}
-
-  };
-
-  /// Factory method and library entry point used by the middleware
-  /// @return new component instance
-  extern "C"  SHAPES_SENDER_COMP_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Shapes_Sender_comp_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes.mpb b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes.mpb
deleted file mode 100644
index 7451cb5a808..00000000000
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-feature (dds4ccm_ndds) {
-  dds_ts_flags += -d GeneratedCode
-}
-
-feature (dds4ccm_opendds) {
-  dds_ts_flags += -o GeneratedCode
-}
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_Control_obj.idl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_Control_obj.idl
deleted file mode 100644
index 05c8c85d842..00000000000
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_Control_obj.idl
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef SHAPES_CONTROL_IDL_
-#define SHAPES_CONTROL_IDL_
-
-#include "Shapes_defn.idl"
-
-#pragma ciao lem "Shapes_Control_objE.idl"
-
-module Shapes
-{
-  interface Control_obj
-  {
-    ReturnStatus setSize (in unsigned short size);
-    ReturnStatus setLocation (in unsigned short x,
-                              in unsigned short y);
-  };
-};
-
-#endif /* SHAPES_CONTROL_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_Control_obj.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_Control_obj.mpc
deleted file mode 100644
index 56b3a6be4c5..00000000000
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_Control_obj.mpc
+++ /dev/null
@@ -1,125 +0,0 @@
-project(Shapes_Control_obj_idl_gen) : componentidldefaults {
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SHAPES_CONTROL_STUB_Export \
-              -Wb,stub_export_include=Shapes_Control_obj_stub_export.h \
-              -Wb,skel_export_macro=SHAPES_CONTROL_SVNT_Export \
-              -Wb,skel_export_include=Shapes_Control_obj_svnt_export.h \
-              -Wb,svnt_export_macro=SHAPES_CONTROL_SVNT_Export \
-              -Wb,svnt_export_include=Shapes_Control_obj_svnt_export.h \
-              -Wb,exec_export_macro=SHAPES_CONTROL_EXEC_Export \
-              -Wb,exec_export_include=Shapes_Control_obj_exec_export.h \
-              -o GeneratedCode
-
-  IDL_Files {
-    Shapes_Control_obj.idl
-    gendir = GeneratedCode
-  }
-}
-
-project(Shapes_Control_obj_lem_gen) : ciaoidldefaults {
-  after += Shapes_Control_obj_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SHAPES_CONTROL_LEM_STUB_Export \
-              -Wb,stub_export_include=Shapes_Control_obj_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ./GeneratedCode \
-              -o GeneratedCode
-
-  IDL_Files {
-    GeneratedCode/Shapes_Control_objE.idl
-    gendir = GeneratedCode
-  }
-}
-
-project(Shapes_Control_obj_lem_stub) : ccm_svnt {
-  after += Shapes_Control_obj_lem_gen Shapes_Control_obj_stub
-
-  libs  += Shapes_Control_obj_stub
-  libpaths += ../lib
-  libout = ../lib
-
-  includes += ./GeneratedCode
-
-  sharedname = Shapes_Control_obj_lem_stub
-  dynamicflags += SHAPES_CONTROL_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GeneratedCode/Shapes_Control_objEC.cpp
-  }
-
-  Header_Files {
-    GeneratedCode/Shapes_Control_objEC.h
-    GeneratedCode/Shapes_Control_obj_lem_stub_export.h
-  }
-
-  Inline_Files {
-    GeneratedCode/Shapes_Control_objEC.inl
-  }
-}
-
-project(Shapes_Control_obj_stub) : ccm_stub {
-  after += Shapes_Control_obj_idl_gen Shapes_defn_idl_gen Shapes_defn_stub
-
-  libs  += Shapes_defn_stub
-  libpaths += ../lib
-  libout = ../lib
-
-  includes += ./GeneratedCode
-
-  sharedname = Shapes_Control_obj_stub
-  dynamicflags += SHAPES_CONTROL_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GeneratedCode/Shapes_Control_objC.cpp
-  }
-
-  Header_Files {
-    GeneratedCode/Shapes_Control_objC.h
-    GeneratedCode/Shapes_Control_obj_stub_export.h
-  }
-
-  Inline_Files {
-    GeneratedCode/Shapes_Control_objC.inl
-  }
-}
-
-
-project(Shapes_Control_obj_svnt) : ciao_servant {
-  after      += Shapes_Control_obj_lem_stub Shapes_Control_obj_stub \
-                Shapes_defn_idl_gen Shapes_defn_stub
-
-  libs       += Shapes_Control_obj_stub Shapes_Control_obj_lem_stub \
-                Shapes_defn_stub
-  libpaths += ../lib
-  libout = ../lib
-
-  includes += ./GeneratedCode
-
-  sharedname  = Shapes_Control_obj_svnt
-  dynamicflags += SHAPES_CONTROL_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GeneratedCode/Shapes_Control_objS.cpp
-    GeneratedCode/Shapes_Control_obj_svnt.cpp
-  }
-
-  Header_Files {
-    GeneratedCode/Shapes_Control_objS.h
-    GeneratedCode/Shapes_Control_obj_svnt.h
-    GeneratedCode/Shapes_Control_obj_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.idl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.idl
deleted file mode 100644
index 0938585b051..00000000000
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.idl
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef SHAPES_SHAPETYPE_CONN_IDL_
-#define SHAPES_SHAPETYPE_CONN_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Shapes_ShapeType_msg.idl"
-
-#pragma ciao lem "Shapes_ShapeType_connE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-#include "GeneratedCode/Shapes_ShapeType_msgTypeSupport.idl"
-#endif
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<ShapeType> ShapeTypeSeq;
-#endif
-
-module Shapes
-{
-  module ::CCM_DDS::Typed < ::ShapeType, ::ShapeTypeSeq> ShapeType_conn;
-};
-
-#endif /* SHAPES_SHAPETYPE_CONN_IDL_ */
-
-
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.mpc
deleted file mode 100644
index 2666434317d..00000000000
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.mpc
+++ /dev/null
@@ -1,152 +0,0 @@
-project(Shapes_ShapeType_conn_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen Shapes_ShapeType_msg_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SHAPES_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=Shapes_ShapeType_conn_stub_export.h \
-              -Wb,skel_export_macro=SHAPES_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=Shapes_ShapeType_conn_svnt_export.h \
-              -Wb,svnt_export_macro=SHAPES_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=Shapes_ShapeType_conn_svnt_export.h \
-              -Wb,conn_export_macro=SHAPES_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Shapes_ShapeType_conn_conn_export.h \
-              -I .. -o GeneratedCode
-
-
-  IDL_Files {
-    Shapes_ShapeType_conn.idl
-    gendir = GeneratedCode
-  }
-}
-
-project(Shapes_ShapeType_conn_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += Shapes_ShapeType_conn_idl_gen
-  idlflags += -Wb,stub_export_macro=SHAPES_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=Shapes_ShapeType_conn_lem_stub_export.h \
-              -SS -Gxhst \
-              -I .. -o GeneratedCode
-
-  IDL_Files {
-    GeneratedCode/Shapes_ShapeType_connE.idl
-    gendir = GeneratedCode
-  }
-}
-
-project(Shapes_ShapeType_conn_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += Shapes_ShapeType_conn_lem_gen Shapes_ShapeType_conn_stub Shapes_ShapeType_msg_stub
-
-  libs  += Shapes_ShapeType_msg_stub Shapes_ShapeType_conn_stub
-  libpaths += ../lib
-  libout = ../lib
-
-  includes += .
-
-  sharedname = Shapes_ShapeType_conn_lem_stub
-  dynamicflags += SHAPES_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GeneratedCode/Shapes_ShapeType_connEC.cpp
-  }
-
-  Header_Files {
-    GeneratedCode/Shapes_ShapeType_connEC.h
-    GeneratedCode/Shapes_ShapeType_conn_lem_stub_export.h
-  }
-
-  Inline_Files {
-    GeneratedCode/Shapes_ShapeType_connEC.inl
-  }
-}
-
-project(Shapes_ShapeType_conn_stub) : ccm_stub, dds4ccm_base {
-  after += Shapes_ShapeType_conn_idl_gen Shapes_ShapeType_msg_stub
-
-  libs  += Shapes_ShapeType_msg_stub
-  libpaths += ../lib
-  libout = ../lib
-
-  includes += . ..
-
-  sharedname = Shapes_ShapeType_conn_stub
-  dynamicflags += SHAPES_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GeneratedCode/Shapes_ShapeType_connC.cpp
-  }
-
-  Header_Files {
-    GeneratedCode/Shapes_ShapeType_connC.h
-    GeneratedCode/Shapes_ShapeType_conn_stub_export.h
-  }
-
-  Inline_Files {
-    GeneratedCode/Shapes_ShapeType_connC.inl
-  }
-}
-
-project(Shapes_ShapeType_conn_exec) : ciao_executor, dds4ccm_impl {
-  after   += Shapes_ShapeType_conn_lem_stub Shapes_ShapeType_conn_stub
-
-  libs += Shapes_ShapeType_conn_stub Shapes_ShapeType_conn_lem_stub Shapes_ShapeType_msg_stub
-  libpaths += ../lib
-  libout = ../lib
-
-  includes += .
-
-  sharedname = Shapes_ShapeType_conn_exec
-  dynamicflags += SHAPES_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GeneratedCode/Shapes_ShapeType_conn_conn.cpp
-  }
-
-  Header_Files {
-    GeneratedCode/Shapes_ShapeType_conn_conn.h
-    GeneratedCode/Shapes_ShapeType_conn_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(Shapes_ShapeType_conn_svnt) : ciao_servant, dds4ccm_impl {
-  after += Shapes_ShapeType_conn_lem_stub Shapes_ShapeType_conn_exec Shapes_ShapeType_conn_stub
-
-  libs += Shapes_ShapeType_conn_stub Shapes_ShapeType_conn_lem_stub Shapes_ShapeType_msg_stub Shapes_ShapeType_conn_exec
-  libpaths += ../lib
-  libout = ../lib
-
-  includes += .
-
-  sharedname  = Shapes_ShapeType_conn_svnt
-  dynamicflags += SHAPES_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GeneratedCode/Shapes_ShapeType_connS.cpp
-    GeneratedCode/Shapes_ShapeType_conn_svnt.cpp
-  }
-
-  Header_Files {
-    GeneratedCode/Shapes_ShapeType_connS.h
-    GeneratedCode/Shapes_ShapeType_conn_svnt.h
-    GeneratedCode/Shapes_ShapeType_conn_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.idl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.idl
deleted file mode 100644
index 014bef4b7b4..00000000000
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef SHAPES_SHAPETYPE_MSG_IDL_
-#define SHAPES_SHAPETYPE_MSG_IDL_
-
-#pragma ndds typesupport "Shapes_ShapeType_msgSupport.h"
-#pragma opendds typesupport "Shapes_ShapeType_msgTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "ShapeType"
-#pragma DCPS_DATA_KEY "ShapeType color"
-
-
-typedef string<128> color_type;
-
-struct ShapeType {
-  color_type color; //@key
-  long x;
-  long y;
-  long shapesize;
-};
-
-#pragma keylist ShapeType color
-
-#endif /* SHAPES_SHAPETYPE_MSG_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.mpc
deleted file mode 100644
index 8d04e3bfb80..00000000000
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.mpc
+++ /dev/null
@@ -1,27 +0,0 @@
-project (Shapes_ShapeType_msg_stub) : taoidldefaults, dds4ccm_ts_default, Shapes {
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=SHAPES_MSG_STUB_Export \
-              -Wb,stub_export_include=Shapes_ShapeType_msg_stub_export.h \
-              -o GeneratedCode
-
-  libout = ../lib
-
-  sharedname = Shapes_ShapeType_msg_stub
-  dynamicflags += SHAPES_MSG_STUB_BUILD_DLL
-
-  IDL_Files {
-    idlflags += -Gxhst
-    gendir = GeneratedCode
-    Shapes_ShapeType_msg.idl
-  }
-
-  opendds_ts_flags += --export=SHAPES_MSG_STUB_Export
-
-  DDSGenerator_Files {
-    Shapes_ShapeType_msg.idl
-    gendir = GeneratedCode
-  }
-
-  Source_Files {
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_defn.idl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_defn.idl
deleted file mode 100644
index a1af31c4139..00000000000
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_defn.idl
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef SHAPES_DEFN_IDL_
-#define SHAPES_DEFN_IDL_
-
-module Shapes
-{
-  enum ReturnStatus
-  {
-    RETURN_OK,
-    RETURN_ERROR
-  };
-};
-
-#endif /* SHAPES_DEFN_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_defn.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_defn.mpc
deleted file mode 100644
index 1baeefa1ad9..00000000000
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_defn.mpc
+++ /dev/null
@@ -1,41 +0,0 @@
-project(Shapes_defn_idl_gen) : taoidldefaults {
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SHAPES_CONTROL_STUB_Export \
-              -Wb,stub_export_include=Shapes_defn_stub_export.h \
-              -SS -Gxhst \
-              -o GeneratedCode
-
-  IDL_Files {
-    Shapes_defn.idl
-    gendir = GeneratedCode
-  }
-}
-
-
-project(Shapes_defn_stub) : ccm_stub {
-  after += Shapes_defn_idl_gen
-
-  libpaths += ../lib
-  libout = ../lib
-
-  includes += ./GeneratedCode
-
-  sharedname = Shapes_defn_stub
-  dynamicflags += SHAPES_CONTROL_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GeneratedCode/Shapes_defnC.cpp
-  }
-
-  Header_Files {
-    GeneratedCode/Shapes_defnC.h
-    GeneratedCode/Shapes_defn_stub_export.h
-  }
-
-  Inline_Files {
-    GeneratedCode/Shapes_defnC.inl
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/01_general.html b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/01_general.html
deleted file mode 100644
index be4a3920885..00000000000
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/01_general.html
+++ /dev/null
@@ -1,131 +0,0 @@
-<!--//  -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <title>DDS4CCM Tutorial Shapes - General</title>
-</head>
-
-<body>
-  <table width="100%" border="0">
-    <tr>
-      <td align="left"></td>
-      <td align="center"><img width="4%" height="5%" src="./images/images.png"/></td>
-      <td align="right"><a href="./02_idl.html">Next</a></td>
-    </tr>
-  </table>
-  <hr />
-
-  <h1>General</h1>
-  <p>
-    This tutorial explains how to use a DDS4CCM connector in
-    combination with a CCM component.<br/>
-  </p>
-
-  <h2>System</h2>
-  <p>
-    The system consists of three components:
-    <ul>
-      <li>A sender component</li>
-      <li>A receiver component</li>
-      <li>A controller component</li>
-    </ul>
-    In this tutorial RTI DDS is used to transfer data from the sender to the receiver.
-    Since the sender and receiver are separate components, each use a DDS4CCM connector.<br/>
-    The exchanged data consists of a struct (ShapeType) with the following
-    members:
-    <ul>
-      <li>color : represents the color of the shape.</li>
-      <li>x : represents the location on the x-axis.</li>
-      <li>y : represents the location on the y-axis</li>
-      <li>shapesize : represents the size of the shape.</li>
-    </ul>
-    Separate DDS Topics are used to represent different shapes, i.e., Circle,
-    Square, and Triangle.<br/>
-    The color field is a DDS "key" value, which causes DDS to treat each color
-    as an unique "instance" of a shape.<br/>
-    Each of these instances is registered with DDS and is independently 
-    maintained in regards to Quality of Service (QoS).<br/>  
-    The controller controls the location and size of the registered shape.<br/>
-    The sender registers a shape instance with DDS and transfers the data received
-    from the controller to DDS.<br/>
-    The receiver listens to DDS and receives the updates regarding the shapes data.
-  </p>
-  <img width="60%" height="40%" src="./images/system.png" />
-  <p>
-    This tutorial works in conjuntion with the RTI Shapes demo
-    (available for download from http://www.rti.com/downloads/index.html).
-  </p>
-
-  <h2>Directory structure</h2>
-  <p>
-    The following convention is used:
-    <ul>
-      <li>|--<b>*_asm</b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-          : Directory contains an assembly.
-      </li>
-      <li>&nbsp;&nbsp;&nbsp;&nbsp;|--<b>ports</b>
-          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-          : Directory contains common IDL code for the assembly.
-      </li>
-      <li>&nbsp;&nbsp;&nbsp;&nbsp;|--<b>*_comp</b>&nbsp;&nbsp;&nbsp;
-          : Directory contains an component.
-      </li>
-      <li>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|--
-          <b>ports</b>&nbsp;&nbsp;
-           : Directory contains common IDL code for the component.
-      </li>
-      <li>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|--&nbsp;&nbsp;
-          <b>src</b>&nbsp;&nbsp;&nbsp;
-          : Directory contains the IDL and *_exec-files for the component.
-      </li>
-    </ul>
-  </p>
-
-  <h2>File naming convention</h2>
-  <p>
-    The following convention is used:
-    <ul>
-      <li><b>*_defn.idl</b> - These files will contain definitions,
-          like enumerations, constants and so on<br/>
-          Typically located in *_asm/ports.
-      </li>
-      <li><b>*_msg.idl</b> - These files will contain the messages (data structure)
-          send by DDS.<br/>
-          Typically located in *_asm/ports.
-      </li>
-      <li><b>*_conn.idl</b> - These files will contain the connector
-          declarations.<br/>
-          Typically located in *_asm/ports.
-      </li>
-      <li><b>*_obj.idl</b> - These files will contain the interfaces between
-          components.<br/>
-          Typically located in *_asm/*_comp/ports.
-      </li>
-      <li><b>*_comp.idl</b> - These files will contain the component declaration.<br/>
-          Typically located in *_asm/*_comp/src.
-      </li>
-    </ul>
-  </p>
-
-  <h2>Additional conventions</h2>
-  <p>
-    <ul>
-      <li>MPC files are located in the same directory as the IDL and executor
-          files.
-      </li>
-      <li>Files that were generated by the TAO IDL compiler or the RTI DDS gen
-          compiler should be located in a subdirectory. In this tutorial the name
-          of this subdirectory is &quot;GeneratedCode&quot;.
-      </li>
-    </u>
-  </p>
-
-  <hr />
-  <table width="100%" border="0">
-    <tr>
-      <td align="left"></td>
-      <td align="center"><img width="4%" height="5%" src="./images/images.png"/></td>
-      <td align="right"><a href="./02_idl.html">Next</a></td>
-    </tr>
-  </table>
-</body>
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/02_idl.html b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/02_idl.html
deleted file mode 100644
index 083835fa201..00000000000
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/02_idl.html
+++ /dev/null
@@ -1,194 +0,0 @@
-<!--//  -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <title>DDS4CCM Tutorial Shapes - IDL</title>
-</head>
-
-<body>
-  <table width="100%" border="0">
-    <tr>
-      <td align="left"><a href="./01_general.html">Previous<a></td>
-      <td align="center"><img width="4%" height="5%" src="./images/images.png"/></td>
-      <td align="right"><a href="./03_executors.html">Next</a></td>
-    </tr>
-  </table>
-  <hr />
-
-  <h1>IDL files</h1>
-  <p>
-    The IDL files are generated by the modeling tools.<br/>
-    To understand this shapes tutorial better, the following is an overview of
-    which IDL files are generated.
-  </p>
-
-  <h2>Common IDL files</h2>
-  <p>
-    Below a simplied represenation of the common IDL files. Use the links to view
-    the file itself.<br/>
-    The following IDL files can be found in Shapes_asm/ports:
-    <ul>
-      <li><a href="../Shapes_asm/ports/Shapes_defn.idl">Shapes_defn.idl<a><br/>
-          <code><b>module</b> Shapes<br/>
-            {<br/>
-            &nbsp;&nbsp;<b>enum</b> ReturnStatus<br/>
-            &nbsp;&nbsp;{<br/>
-            &nbsp;&nbsp;&nbsp;&nbsp;RETURN_OK,<br/>
-            &nbsp;&nbsp;&nbsp;&nbsp;RETURN_ERROR<br/>
-            &nbsp;&nbsp;};<br/>};
-          </code>
-      </li>
-      <li><a href="../Shapes_asm/ports/Shapes_conn.idl">Shapes_conn.idl<a><br/>
-          <code><b>module</b> Shapes<br/>
-            {<br/>
-            &nbsp;&nbsp;<b>typedef</b> <b>sequence</b><ShapeType> ShapeTypeSeq;<br/>
-            &nbsp;&nbsp;<b>module</b> ::CCM_DDS::Typed < ::ShapeType, ShapeTypeSeq>
-            ShapeType_conn;<br/>
-            };<br/>
-          </code>
-          This IDL contains the declaration of the DDS4CCM connector. The used
-          module is typed.
-      </li>
-      <li><a href="../Shapes_asm/ports/Shapes_msg.idl">Shapes_msg.idl<a><br/>
-          <code><b>struct</b> ShapeType {<br/>
-            &nbsp;&nbsp;<font color="red">string</font> color; <font color="grey">//@key</font><br/>
-            &nbsp;&nbsp;<font color="red">long</font> x;<br/>
-            &nbsp;&nbsp;<font color="red">long</font> y;<br/>
-            &nbsp;&nbsp;<font color="red">long</font> shapesize;<br/>
-            };<br/>
-          </code>
-          The ShapeType struct is the the data structure that is send from the
-          sender to the receiver through DDS. In DDS, a single instantiation
-          of this struct is called a sample.<br/>
-          This file is also used as input for the RTI DDS code generator (rtiddsgen). Since we're
-          using RTI DDS in this example, the key value for this struct is defined with
-          <code>//@key</code> as shown above.  The key value indicates to DDS that
-          QoS features may apply to every unique instance of  the color field
-          (e.g. a "red" square is a different instance than a "green" square).
-      </li>
-    </ul>
-  </p>
-
-  <h2>Controller IDL files</h2>
-  <p>
-    The controller is used to modify the location and the size of the registered
-    shape by invoking methods on the sender component.
-    These methods are part of an interface which the sender should provide. The
-    controller uses this interface.<br/>
-    The interface declaration is in
-    <a href="../Shapes_asm/Shapes_Control_comp/ports/Shapes_Control_obj.idl">
-      Shapes_asm/Shapes_Control_comp/ports/Shapes_Control_obj.idl<a><br/>
-    The IDL looks like this:
-  </p>
-  <p>
-    <br/><code><b>module</b> Shapes<br/>
-    {<br/>
-    &nbsp;&nbsp;<b>interface</b> Control_obj<br/>
-    &nbsp;&nbsp;{<br/>
-    &nbsp;&nbsp;&nbsp;&nbsp;ReturnStatus setSize (<b>in unsigned</b> <font color="red">short</font> size);<br/>
-    &nbsp;&nbsp;&nbsp;&nbsp;ReturnStatus setLocation (<b>in unsigned</b> <font color="red">short</font> x,<br/>
-    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<b>in unsigned</b> <font color="red">short</font> y);<br/>
-    &nbsp;&nbsp;};<br/>
-    };<br/>
-    </code><br/>
-    The controller component periodically calls the setSize and setLocation methods
-    on the sender component.
-  </p>
-  <p>
-    The component IDL file itself is located in
-    <a href="../Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp.idl">
-      Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp.idl<a><br/>
-    and looks like this:
-  </p>
-  <p>
-    <br/><code><b>module</b> Shapes<br/>
-    {<br/>
-    &nbsp;&nbsp;<b>component</b> Control_comp<br/>
-    &nbsp;&nbsp;{<br/>
-    &nbsp;&nbsp;&nbsp;&nbsp;<b>uses</b> Shapes::Control_obj control;<br/><br/>
-    &nbsp;&nbsp;&nbsp;&nbsp;<b>attribute unsigned</b> <font color="red">long</font> rate;<br/>
-    &nbsp;&nbsp;&nbsp;&nbsp;<b>attribute unsigned</b> <font color="red">short</font> max_x;<br/>
-    &nbsp;&nbsp;&nbsp;&nbsp;<b>attribute unsigned</b> <font color="red">short</font> max_y;<br/>
-    &nbsp;&nbsp;&nbsp;&nbsp;<b>attribute unsigned</b> <font color="red">short</font> max_size;<br/>
-    &nbsp;&nbsp;&nbsp;&nbsp;<b>attribute</b> <font color="red">boolean</font> resize_shape;<br/>
-    &nbsp;&nbsp;};<br/>};<br/>
-    </code>
-  </p>
-  <p>
-    The controller uses the Control_obj interface.
-  </p>
-  <p>
-    The following attributes are used:
-    <ul>
-      <li>rate&nbsp;&nbsp;: Controls the rate in which the controller component
-          sends update to the sender.
-      </li>
-      <li>Since the shapes moves about in a rectangle shaped window, one should
-        set the boundaries of this rectangle:
-        <ul>
-          <li>max_x&nbsp;&nbsp;: Sets the width of the rectangle shaped window.</li>
-          <li>max_y&nbsp;&nbsp;: Sets the height of the rectangle shaped window.</li>
-        </ul>
-      </li>
-      <li>max_size&nbsp;&nbsp;: Set the maximum size of the registered shape.
-      </li>
-      <li>resize_shape&nbsp;&nbsp;: Indicates wether the shape is resizeable.
-      </li>
-    </ul>
-    The attributes are set by the deployment plan and cannot be changed throughout
-    the lifecycle of the controller component.
-  </p>
-
-  <h2>Sender IDL file</h2>
-  <p>
-    The moment the controller invokes setSize or setLocation, the sender translates
-    the received size and location into the ShapeType struct. After that, it'll
-    present the updated struct to DDS, by calling write_one on the DDS_Write port.
-    The IDL file of the Sender component looks like this:<br/>
-    <br/><code><b>module</b> Shapes<br/>
-    {<br/>
-    &nbsp;&nbsp;<b>component</b> Sender_comp<br/>
-    &nbsp;&nbsp;{<br/>
-    &nbsp;&nbsp;&nbsp;&nbsp;<b>port</b> ShapeType_conn::DDS_Write info_write;<br/>
-    &nbsp;&nbsp;&nbsp;&nbsp;<b>provides</b> Shapes::Control_obj control;<br/>
-    &nbsp;&nbsp;};<br/>};
-    </code><br/><br/>
-    The IDL file is located in
-    <a href="../Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.idl">
-      Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.idl<a><br/>
-  </p>
-  <p>
-    The Sender uses the DDS_Write port of the DDS4CCM connector to write data to DDS.<br/>
-    The Sender provides the Control_obj interface to the Controller component. This
-    means that the sender component implements the Control_obj interface so that the
-    controller is able to invoke the provided methods.
-  </p>
-
-  <h2>Receiver IDL file</h2>
-  <p>
-    The receiver is &quot;listening&quot; to DDS. Once the shape has been
-    updated by the sender, DDS will invoke a callback method on the DDS4CCM connector
-    which in turn calls the receiver component and will pass the updated data to
-    the receiver.<br/>
-    The receiver should provide the DDS4CCM connector with an interface which the
-    DDS4CCM connector should invoke the moment he gets a callback from DDS.
-    To establish this, the receiver component IDL should look like this:<br/>
-    <br/>
-    <code><b>module</b> Shapes<br/>
-      {<br/>
-      &nbsp;&nbsp;component Receiver_comp<br/>
-      &nbsp;&nbsp;{<br/>
-      &nbsp;&nbsp;&nbsp;&nbsp;<b>port</b> ShapeType_conn::DDS_Listen info_out;<br/>
-      &nbsp;&nbsp;};<br/>};<br/>
-    </code>
-  </p>
-
-  <hr />
-  <table width="100%" border="0">
-    <tr>
-      <td align="left"><a href="./01_general.html">Previous<a></td>
-      <td align="center"><img width="4%" height="5%" src="./images/images.png"/></td>
-      <td align="right"><a href="./03_executors.html">Next</a></td>
-    </tr>
-  </table>
-</body>
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/03_executors.html b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/03_executors.html
deleted file mode 100644
index 77d83f5a3b4..00000000000
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/03_executors.html
+++ /dev/null
@@ -1,128 +0,0 @@
-<!--//  -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <title>DDS4CCM Tutorial Shapes - Executors</title>
-</head>
-
-<body>
-  <table width="100%" border="0">
-    <tr>
-      <td align="left"><a href="./02_idl.html">Previous<a></td>
-      <td align="center"><img width="4%" height="5%" src="./images/images.png"/></td>
-      <td align="right"><a href="./04_dds4ccm.html">Next<a></td>
-    </tr>
-  </table>
-  <hr />
-
-  <h1>Executors</h1>
-  <p>
-    Once the IDL files are created, the business logic for the components should
-    be implemented. Since components can be complex, we can use the IDL compiler
-    to create empty executor files. This part of the tutorial explains how this
-    can be done.
-  </p>
-
-  <h2>Controller</h2>
-  <p>
-    In a command shell windows, navigate to the &quot;src&quot; directory of the
-    component directory of the Controller (Shapes_asm/Shapes_Control_comp/src).
-    After that, invoke the TAO IDL compiler by running the following command:
-  </p>
-  <p>
-    <code>
-        tao_idl -I../ports -I../ports/GeneratedCode
-        -I../../ports -I%TAO_ROOT% -I%TAO_ROOT%/tao -I%CIAO_ROOT%
-        -I%CIAO_ROOT%/ccm -I%CIAO_ROOT%/ciao -Gexr
-        -Wb,exec_export_macro=SHAPES_CONTROL_COMP_EXEC_Export
-        -Wb,exec_export_include=Shapes_Control_comp_exec_export.h
-        Shapes_Control_comp.idl
-    </code>
-    <br/><br/>
-    This will generate the executor file with &quot;
-    Shapes_Control_comp_exec.cpp&quot; as name. Once generated, the user should
-    implement the business logic for the controller.<br/><br/>
-
-    The generated code cpp can be found
-    <a href="./Code/Shapes_Control_comp/Shapes_Control_comp_exec.cpp">here</a>.
-    The header can be found
-    <a href="./Code/Shapes_Control_comp/Shapes_Control_comp_exec.h">here</a>
-    <br/>
-
-    The implemented executor cpp can be found
-    <a href="../Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.cpp">
-    here</a> and the header can be found
-    <a href="../Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.h">
-    here</a><br/>
-    <br/>
-  </p>
-
-  <h2>Sender</h2>
-  <p>
-    Navigate to the Shapes_asm/Shapes_Sender_comp/src and invoke the TAO IDL
-    compiler by running the following command:
-  </p>
-  <p>
-    <code>
-        tao_idl -I../ports -I../../Shapes_Control_comp/ports
-        -I../ports/GeneratedCode -I../../ports -I%TAO_ROOT%
-        -I%TAO_ROOT%/tao -I%CIAO_ROOT% -I%CIAO_ROOT%/ccm -I%CIAO_ROOT%/ciao
-        -I%CIAO_ROOT%/connectors/dds4ccm/idl
-        -Wb,exec_export_macro=SHAPES_SENDER_COMP_EXEC_Export
-        -Wb,exec_export_include=Shapes_Sender_comp_exec_export.h
-        -DCIAO_DDS4CCM_NDDS -Gex Shapes_Sender_comp.idl
-    </code>
-    <br/><br/>
-    The generated cpp code can be found
-    <a href="./Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.cpp">here</a>.
-    The header can be found
-    <a href="./Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.h">here</a>.
-    <br/>
-    The implemented executor cpp can be found
-    <a href="../Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.cpp">
-    here</a> and the header can be found
-    <a href="../Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.h">
-    here</a><br/>
-    <br/>
-    <br/>
-  </p>
-
-  <h2>Receiver</h2>
-  <p>
-    Navigate to the Shapes_asm/Shapes_Receiver_comp/src and invoke the TAO IDL
-    compiler by running the following command:
-  </p>
-   <p>
-    <code>
-        tao_idl -I../ports -I../../Shapes_Control_comp/ports
-        -I../ports/GeneratedCode -I../../ports -I%TAO_ROOT%
-        -I%TAO_ROOT%/tao -I%CIAO_ROOT% -I%CIAO_ROOT%/ccm -I%CIAO_ROOT%/ciao
-        -I%CIAO_ROOT%/connectors/dds4ccm/idl
-        -Wb,exec_export_macro=SHAPES_RECEIVER_COMP_EXEC_Export
-        -Wb,exec_export_include=Shapes_Receiver_comp_exec_export.h
-        -DCIAO_DDS4CCM_NDDS -Gex Shapes_Receiver_comp.idl
-    </code>
-    <br/><br/>
-    The generated code can be found
-    <a href="./Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.cpp">here</a>.
-    The header can be found
-    <a href="./Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.h">here</a>.
-    <br/>
-    The implemented executor can be found
-    <a href="../Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.cpp">
-    here</a> and the header can be found
-    <a href="../Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.h">
-    here</a><br/>
-    <br/>
-  </p>
-
-
-  <hr />
-  <table width="100%" border="0">
-    <tr>
-      <td align="left"><a href="./02_idl.html">Previous<a></td>
-      <td align="center"><img width="4%" height="5%" src="./images/images.png"/></td>
-      <td align="right"><a href="./04_dds4ccm.html">Next<a></td>
-    </tr>
-  </table>
-</body>
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/04_dds4ccm.html b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/04_dds4ccm.html
deleted file mode 100644
index 0334951bcd0..00000000000
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/04_dds4ccm.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<!--//  -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <title>DDS4CCM Tutorial Shapes - DDS4CCM</title>
-</head>
-
-<body>
-  <table width="100%" border="0">
-    <tr>
-      <td align="left"><a href="./03_executors.html">Previous<a></td>
-      <td align="center"><img width="4%" height="5%" src="./images/images.png"/></td>
-      <td align="right"><a href="./05_coding.html">Next<a></td>
-    </tr>
-  </table>
-  <hr />
-
-  <h1>DDS4CCM basics</h1>
-  <p>
-    The DDS4CCM connector itself is a CCM component placed between your component
-    and DDS itself.<br/>
-    In DDS there're basically two entities which exchange data: DataWriters and
-    DataReaders. To gain access to these entities, the DDS4CCM connector offers
-    two basic types of ports (connectors) : DDS_Event and DDS_State.
-    These basic ports have extended ports which allow the user to access the actual
-    datareaders and datawriters. It'll depend on the functionality of your component
-    which type of basic port you're going to use.<br/>
-    A DDS_Event DDS4CCM connector consists of the following extented ports:
-    <ul>
-      <li>A DDS_Write port</li>
-      <li>A DDS_Get port</li>
-      <li>A DDS_Listen port</li>
-    </ul>
-    A DDS_State DDS4CCM connector consists of the following extended ports:
-    <ul>
-      <li>A DDS_Update port</li>
-      <li>A DDS_Read port</li>
-      <li>A DDS_Get port</li>
-      <li>A DDS_Listen port</li>
-      <li>A DDS_StateListen port</li>
-    </ul>
-  </p>
-  <p>
-    See <a href="../../../idl/ccm_dds.idl">ccm_dds.idl<a> for a complete overview
-    of connector types, extend ports and their methods.
-  </p>
-  <h2>Example</h2>
-  <p>
-    The Sender component of this Shapes tutorial writes a ShapeType struct (sample)
-    to DDS every time the Controller invokes setSize or setLocation.
-    The Sender therefor is connected to a DDS_Event connector and uses the
-    DDS_Write extended port. To write a sample, the Sender uses the write_one method
-    of the DDS_Write extended port (see ccm_dds.idl and the Shapes Sender
-    executor file).
-  </p>
-  <p>
-    The Receiver listens to DDS for data. DDS invokes a listener callback method (
-    on_data_available) on the DDS4CCM connector which in turn invokes the
-    on_data_available method on the Receiver component. To establish all this
-    the Receiver is connected to a DDS_Event connector and uses the DDS_Listen
-    extended port (see ccm_dds.idl and the Shapes Receiver executor file).
-  </p>
-  <p>
-    All this will be discussed in more detail later in this tutorial.
-  </p>
-
-  <hr />
-  <table width="100%" border="0">
-    <tr>
-      <td align="left"><a href="./03_executors.html">Previous<a></td>
-      <td align="center"><img width="4%" height="5%" src="./images/images.png"/></td>
-      <td align="right"><a href="./05_coding.html">Next<a></td>
-    </tr>
-  </table>
-</body>
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/05_coding.html b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/05_coding.html
deleted file mode 100644
index 6577991ca59..00000000000
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/05_coding.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--//  -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <title>DDS4CCM Tutorial Shapes - Coding guidelines</title>
-</head>
-
-<body>
-  <table width="100%" border="0">
-    <tr>
-      <td align="left"><a href="./04_dds4ccm.html">Previous<a></td>
-      <td align="center"><img width="4%" height="5%" src="./images/images.png"/></td>
-      <td align="right"><a href="./06_compilation.html">Next<a></td>
-    </tr>
-  </table>
-  <hr />
-
-  <h1>Coding guidelines</h1>
-
-  <hr />
-  <table width="100%" border="0">
-    <tr>
-      <td align="left"><a href="./04_dds4ccm.html">Previous<a></td>
-      <td align="center"><img width="4%" height="5%" src="./images/images.png"/></td>
-      <td align="right"><a href="./06_compilation.html">Next<a></td>
-    </tr>
-  </table>
-</body>
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/06_compilation.html b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/06_compilation.html
deleted file mode 100644
index fed4dfae73f..00000000000
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/06_compilation.html
+++ /dev/null
@@ -1,248 +0,0 @@
-<!--//  -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <title>DDS4CCM Tutorial Shapes - Compilation and deployment</title>
-</head>
-
-<body>
-  <table width="100%" border="0">
-    <tr>
-      <td align="left"><a href="./05_coding.html">Previous<a></td>
-      <td align="center"><img width="4%" height="5%" src="./images/images.png"/></td>
-      <td align="right"></td>
-    </tr>
-  </table>
-  <hr />
-
-  <h1>Compilation and deployment<h2>
-
-  <h2>Compilation</h2>
-  <p>
-    Once all the code has been written, compilation of the code would be the next
-    step.<br/>
-    MPC is used in order to create the Makefiles and projects files. All MPC files
-    that are needed for this tutorial are in the same directory as the accompanying
-    IDL and executor files.<br/>
-
-    In order to make the GNU make files or the Visual Studio project files,
-    the following steps should be performed :
-    <ul>
-      <li>Start a command shell and navigate to : <br/>
-          <code>%CIAO_ROOT%/connectors/dds4ccm/tutorials/Shapes/Shapes_asm</code>
-      </li>
-      <li>Run<br/>
-        <ul>
-          <li><code>perl %ACE_ROOT%/bin/mwc.pl -type vc9</code> to create Visual
-              Studio 2008 project files.
-          </li>
-          <li><code>perl %ACE_ROOT%/bin/mwc.pl -type gnuace</code> to create
-              the GNU make files.
-          </li>
-        </ul>
-        <li>Now compile the code like you're used to.
-        </li>
-      </li>
-    </ul>
-  </p>
-  <p>
-    If all went well, all libraries are in the Shapes_asm/lib directory.
-  </p>
-  <h2>Deployment</h2>
-  <p>
-    Once all binaries are compiled, they're ready to be deployed. In this tutorial
-    we are using DAnCE to deploy our system.<br/>
-    DAnCE starts a system in two phases :
-    <ol>
-      <li>configuration_complete</li>
-      <li>ccm_activate</li>
-    </ol>
-    DAnCE shuts down a system again in two phases :
-    <ol>
-      <li>passivate</li>
-      <li>ccm_remove</li>
-    </ol>
-    Each component should have these four methods implemented. The business logic
-    implemented in each step depends on you implementation.<br/>
-
-    There're several processes taking care of the total deployment process.
-    See the DAnCE documentation for more information about which processes there
-    are and what their responsibilities are.<br/>
-    DAnCE will start and shutdown a system with the aid of a deployment plan. A
-    deployment plan describes which artifacts must run on which nodes and which
-    components are connected to eachother via which interface (more on this later).
-    All connections between components are made before 'configuration_complete' is
-    called.
-  <p>
-    The deployment plan will be generated by the modelling tools but we take a
-    brief look at the most important items of a deployment plan. A deployment plan
-    is a XML based file which is devided into the following (main) sections:<br/>
-    <ul>
-      <li>Implementations</li>
-      <li>Entry points</li>
-      <li>Instances</li>
-      <li>Connections</li>
-      <li>Artifacts</li>
-    </ul>
-  </p>
-
-  <b><i>All deployment code fragments mentioned in the rest of this tutorial are
-    *NO* exports of any modelling tool.</i></b>
-
-  <h3>Implementations and Entry Points</h3>
-  <p>
-    This defines which executor and servant artifacts (binaries) should be
-    used. Implementations also defines which entry points in the binaries
-    should be used. <a href="./Code/Deployment/implementation.cdp">This<a> file shows the
-    implementation section of the controller.<br/>
-    Beware that artifacts and entry points are exact otherwise deployment will
-    fail.<br>
-  </p>
-
-  <h3>Instances</h3>
-  <p>
-    Instances define which artifacts run on which node. Every fysical artifact in
-    the system results in one instance. The &lt;node&gt; section refers to the
-    fysical node on which this instance will be deployed.<br/>
-    An instance always refers to an implementation.
-    It's possible that more than one instance refers to the same implementation.<br/>
-    The instance section also provide the initial values of all attributes
-    defined on the component.<br/>
-    <a href="./Code/Deployment/instance.cdp">This</a> file shows the instance section of
-    the controller.<br/>
-  </p>
-
-  <h3>Connections</h3>
-  <p>
-    A connection section defines which components are connected together.
-    To define a connection one should know which type of DDS4CCM connector is used.
-    <br/><br/>
-    <b>Example</b><br/>
-    The sender component is connected to a DDS4CCM connector via the DDS_Write
-    extented port of the DDS_Event basic port. The DDS_Write port for the
-    DDS_Event connector is called 'supplier' and the Writer interface on this
-    extented port is called 'data' (see ccm_dds.idl). In Shapes_Sender_comp.idl,
-    the DDS_Write port is called 'info_write'. The DDS4CCM connector provide
-    the writer interface, the Sender component uses this.<br/>
-    The connection is 'local' since a connector and a component are always running
-    in the same process.<br/>
-    Now that we have got all the data we need to know to make a connection
-    between the Sender and DDS4CCM connector regarding the writer port.<br/><br/>
-
-    &lt;<b>connection</b>&gt;<br/>
-    &nbsp;&nbsp;&lt;<b>name</b>&gt;writer_connection&lt;<b>/name</b>&gt;
-    <font color="grey">//unique name of the connection</font><br/>
-    &nbsp;&nbsp;&lt;<b>deployRequirement</b>&gt;<br/>
-    &nbsp;&nbsp;&nbsp;&nbsp;&lt;<b>name</b>&gt;edu.dre.vanderbilt.DAnCE.ConnectionType&lt;<b>/name</b>&gt;<br/>
-    &nbsp;&nbsp;&nbsp;&nbsp;&lt;<b>resourceType</b>&gt;Local_Interface&lt;<b>/resourceType</b>&gt;
-    <font color="grey">//The connection between the Sender and the DDS4CCM connector is 'local'</font><br/>
-    &nbsp;&nbsp;&lt;<b>deployRequirement</b>&gt;<br/>
-    &nbsp;&nbsp;&lt;<b>internalEndpoint</b>&gt;
-    <font color="grey">//First endpoint (the Sender component).</font><br/>
-    &nbsp;&nbsp;&nbsp;&nbsp;<font color="grey">//PortName is defined as follows</font><br/>
-    &nbsp;&nbsp;&nbsp;&nbsp;<font color="grey">//&lt;name_of_port_in_sender_component_idl&gt;_&lt;
-    name_of_interface_in_extended_port&gt;(see ccm_dds.idl)</font><br/>
-    &nbsp;&nbsp;&nbsp;&nbsp;&lt;<b>portName</b>&gt;info_write_data&lt;<b>/portName</b>&gt;<br/>
-    &nbsp;&nbsp;&nbsp;&nbsp;&lt;<b>provider</b>&gt;false&lt;<b>/provider</b>&gt;
-    <font color="grey">//The Sender component doens't provide the interface</font><br/>
-    &nbsp;&nbsp;&nbsp;&nbsp;&lt;<b>kind</b>&gt;SimplexReceptacle&lt;<b>/kind</b>&gt;<br/>
-    &nbsp;&nbsp;&nbsp;&nbsp;&lt;<b>instance</b> xmi:idref="SenderComponentInstance" /&gt;
-    <font color="grey">//Reference to the artifact (the Sender component instance in this case)</font><br/>
-    &nbsp;&nbsp;&lt;<b>/internalEndpoint</b>&gt;<br/>
-    &nbsp;&nbsp;&lt;<b>internalEndpoint</b>&gt;
-    <font color="grey">//First endpoint (the Sender component).</font><br/>
-    &nbsp;&nbsp;&nbsp;&nbsp;<font color="grey">//PortName is defined as follows</font><br/>
-    &nbsp;&nbsp;&nbsp;&nbsp;<font color="grey">//&lt;name_of_port_in_dds4ccm_connector&gt;_&lt;
-    name_of_interface_in_extended_port&gt;(see ccm_dds.idl)</font><br/>
-    &nbsp;&nbsp;&nbsp;&nbsp;&lt;<b>portName</b>&gt;supplier_data&lt;<b>/portName</b>&gt;<br/>
-    &nbsp;&nbsp;&nbsp;&nbsp;&lt;<b>provider</b>&gt;true&lt;<b>/provider</b>&gt;
-    <font color="grey">//The DDS4CCM connector provides this interface</font><br/>
-    &nbsp;&nbsp;&nbsp;&nbsp;&lt;<b>kind</b>&gt;Facet&lt;<b>/kind</b>&gt;<br/>
-    &nbsp;&nbsp;&nbsp;&nbsp;&lt;<b>instance</b> xmi:idref="Shapes_SenderConnectorInstance" /&gt;
-    <font color="grey">//The reference to the connector instance.</font><br/>
-    &nbsp;&nbsp;&lt;<b>/internalEndpoint</b>&gt;<br/>
-    &lt;<b>/connection</b>&gt;<br/>
-  </p>
-  <p>
-    Take a look at <a href="./Code/Deployment/connections.cdp">this</a> file to see which
-    connection should be made by DAnCE in order to run the shapes system properly.
-    Also take a look at the connection between the Controller and the Sender. This
-    one is different because no DDS4CCM connector is used.
-  </p>
-  <p>
-    When the deployment tools (in this case DAnCE) deploys this system, it'll connect
-    all defined connectors before the system is started (i.e. before configuration_complete
-    is called on a component).<br/>
-  </p>
-  <h4>Coding connections</h4>
-  <p>
-    Every component has got a context. The context is set by DAnCE and is
-    the 'gateway' to all other component your component is connected to. The
-    context caches all these connections so that the user doesn't need to
-    cache those in his/her component.
-  </p>
-  <p>
-    <b><u>Sender</u></b><br/>
-    The Sender uses the writer connection of the DDS_Write extented port of the
-    DDS_Event basic port. The following code retrieves the connection to the
-    Writer interface from the context.
-    <br/>
-    <code>::Shapes::ShapeType_conn::Writer_var writer =
-      this->context_->get_connection_info_write_data ();</code>
-    <br/>
-  </p>
-
-  <p>
-    <b><u>Controller</u></b><br/>
-    The Controller uses the 'Control_obj' interface of the Sender component.
-    Since this isn't a connection to a DDS4CCM connector, the code is rather
-    simple. Looking at the IDL of the sender and receiver, the following code can be
-    constructed in order to get the connection the Control_obj interface:
-    <br/>
-    <code>::Shapes::Control_obj_var control =
-      this->context_->get_connection_control ();</code>
-    <br/>
-  </p>
-
-  <p>
-    <b><u>Receiver</u></b><br/>
-    The Receiver 'listens' to DDS and thus should provide a callback for the
-    DDS4CCM connector. Please take a look at the generated code of the executor
-    <a href="./Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.cpp">code</a>
-    of the receiver to see how this can be done.<br/>
-    By default, a DDS4CCM connector is not listening so one should instruct the
-    DDS4CCM connector to start listening to samples. Therefor
-    a DataListenerControl interface (data_control) is available. The following
-    code ensures that the DDS4CCM connector starts listening to the desired samples.
-    <br/>
-    <code>
-      ::CCM_DDS::DataListenerControl_var lc =
-      this->context_->get_connection_info_out_data_control ();<br/>
-      lc->mode (::CCM_DDS::ONE_BY_ONE);<br/>
-    </code><br/>
-    This ensures that 'on_one_data' is gets invoked by the DDS4CCM connector
-    for each sample.<br/>
-    It's also possible to use ::CCM_DDS::MANY_BY_MANY. This will make sure that
-    on_many_data on the listeners callback gets invoked by the DDS4CCM connector.<br/>
-    To turn off listening, just call <code>lc->mode (::CCM_DDS::NOT_ENABLED);</code>
-    <br/>
-  </p>
-
-  <h3>Artifacts</h3>
-  Artifacts sections contains the names of the binaries. See
-  <a href="./Code/Deployment/artifacts.cdp">this</a> files for an overview of all
-  artifacts in the shapes system.
-
-  <h3>Complete plan</h3>
-  <a href="./Code/Deployment/Plan.cdp">This</a> file shows the complete deployment
-  plan.<br/>
-
-  <hr />
-  <table width="100%" border="0">
-    <tr>
-      <td align="left"><a href="./05_coding.html">Previous<a></td>
-      <td align="center"><img width="4%" height="5%" src="./images/images.png"/></td>
-      <td align="right"></td>
-    </tr>
-  </table>
-</body>
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Deployment/Plan.cdp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Deployment/Plan.cdp
deleted file mode 100644
index 1f6e5eaa907..00000000000
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Deployment/Plan.cdp
+++ /dev/null
@@ -1,476 +0,0 @@
-<!--  -->
-<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>Shapes_Depl_1</label>
-  <UUID>Shapes_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Receiver_comp_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Receiver_comp_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shapes_Receiver_comp_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shapes_Receiver_comp_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="ControlComponentImplementation">
-    <name>ControlComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Control_ExecArtifact" />
-    <artifact xmi:idref="Control_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Control_comp_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Control_comp_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shapes_Control_comp_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shapes_Control_comp_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Shapes_ConnectorComponentImplementation">
-    <name>Shapes_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Shapes_Connector_ExecArtifact" />
-    <artifact xmi:idref="Shapes_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_ShapesConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_ShapesConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shapes_conn_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shapes_conn_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Sender_comp_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_Sender_comp_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shapes_Sender_comp_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shapes_Sender_comp_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-  </instance>
-
-  <instance xmi:id="ControlComponentInstance">
-    <name>ControlComponent</name>
-    <node>ControlNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ControlComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>100</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_x</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>225</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_y</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>250</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_size</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>25</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>resize_shape</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>true</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Shapes_SenderConnectorInstance">
-    <name>Shapes_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Shapes_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Square</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Shapes_ReceiverConnectorInstance">
-    <name>Shapes_ReceiverConnectorInstance</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Shapes_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Square</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-  </instance>
-
-  <connection>
-    <name>_listenercontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Shapes_ReceiverConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Shapes_ReceiverConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Shapes_SenderConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>control_connection</name>
-    <internalEndpoint>
-      <portName>control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ControlComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Shapes_Sender_comp_exec</name>
-    <source/>
-    <node/>
-    <location>Shapes_Sender_comp_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Shapes_Sender_comp_svnt</name>
-    <source/>
-    <node/>
-    <location>Shapes_Sender_comp_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="Shapes_Connector_ExecArtifact">
-    <name>Shapes_conn_exec</name>
-    <source/>
-    <node/>
-    <location>Shapes_conn_exec</location>
-  </artifact>
-  <artifact xmi:id="Shapes_Connector_SvntArtifact">
-    <name>Shapes_conn_svnt</name>
-    <source/>
-    <node/>
-    <location>Shapes_conn_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Shapes_Receiver_comp_exec</name>
-    <source/>
-    <node/>
-    <location>Shapes_Receiver_comp_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Shapes_Receiver_comp_svnt</name>
-    <source/>
-    <node/>
-    <location>Shapes_Receiver_comp_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-  <artifact xmi:id="Control_ExecArtifact">
-    <name>Shapes_Control_comp_exec</name>
-    <source/>
-    <node/>
-    <location>Shapes_Control_comp_exec</location>
-  </artifact>
-  <artifact xmi:id="Control_SvntArtifact">
-    <name>Shapes_Control_comp_svnt</name>
-    <source/>
-    <node/>
-    <location>Shapes_Control_comp_svnt</location>
-  </artifact>
-  <artifact xmi:id="Control_StubArtifact">
-    <name>Control_stub</name>
-    <source/>
-    <node/>
-    <location>Control_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Deployment/artifacts.cdp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Deployment/artifacts.cdp
deleted file mode 100644
index 6b655fd5a44..00000000000
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Deployment/artifacts.cdp
+++ /dev/null
@@ -1,67 +0,0 @@
-<!--  -->
-<artifact xmi:id="Sender_ExecArtifact">
-  <name>Shapes_Sender_comp_exec</name>
-  <source/>
-  <node/>
-  <location>Shapes_Sender_comp_exec</location>
-</artifact>
-<artifact xmi:id="Sender_SvntArtifact">
-  <name>Shapes_Sender_comp_svnt</name>
-  <source/>
-  <node/>
-  <location>Shapes_Sender_comp_svnt</location>
-</artifact>
-<artifact xmi:id="Sender_StubArtifact">
-  <name>Sender_stub</name>
-  <source/>
-  <node/>
-  <location>Sender_stub</location>
-</artifact>
-<artifact xmi:id="Shapes_Connector_ExecArtifact">
-  <name>Shapes_ShapeType_conn_exec</name>
-  <source/>
-  <node/>
-  <location>Shapes_ShapeType_conn_exec</location>
-</artifact>
-<artifact xmi:id="Shapes_Connector_SvntArtifact">
-  <name>Shapes_ShapeType_conn_svnt</name>
-  <source/>
-  <node/>
-  <location>Shapes_ShapeType_conn_svnt</location>
-</artifact>
-<artifact xmi:id="Receiver_ExecArtifact">
-  <name>Shapes_Receiver_comp_exec</name>
-  <source/>
-  <node/>
-  <location>Shapes_Receiver_comp_exec</location>
-</artifact>
-<artifact xmi:id="Receiver_SvntArtifact">
-  <name>Shapes_Receiver_comp_svnt</name>
-  <source/>
-  <node/>
-  <location>Shapes_Receiver_comp_svnt</location>
-</artifact>
-<artifact xmi:id="Receiver_StubArtifact">
-  <name>Receiver_stub</name>
-  <source/>
-  <node/>
-  <location>Receiver_stub</location>
-</artifact>
-<artifact xmi:id="Control_ExecArtifact">
-  <name>Shapes_Control_comp_exec</name>
-  <source/>
-  <node/>
-  <location>Shapes_Control_comp_exec</location>
-</artifact>
-<artifact xmi:id="Control_SvntArtifact">
-  <name>Shapes_Control_comp_svnt</name>
-  <source/>
-  <node/>
-  <location>Shapes_Control_comp_svnt</location>
-</artifact>
-<artifact xmi:id="Control_StubArtifact">
-  <name>Control_stub</name>
-  <source/>
-  <node/>
-  <location>Control_stub</location>
-</artifact>
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Deployment/connections.cdp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Deployment/connections.cdp
deleted file mode 100644
index 8c351d5c1bf..00000000000
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Deployment/connections.cdp
+++ /dev/null
@@ -1,75 +0,0 @@
-<!--  -->
-<connection>
-  <name>_listenercontrol</name>
-  <deployRequirement>
-    <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-    <resourceType>Local_Interface</resourceType>
-  </deployRequirement>
-  <internalEndpoint>
-    <portName>info_out_data_control</portName>
-    <provider>false</provider>
-    <kind>SimplexReceptacle</kind>
-    <instance xmi:idref="ReceiverComponentInstance" />
-  </internalEndpoint>
-  <internalEndpoint>
-    <portName>push_consumer_data_control</portName>
-    <provider>true</provider>
-    <kind>Facet</kind>
-    <instance xmi:idref="Shapes_ReceiverConnectorInstance" />
-  </internalEndpoint>
-</connection>
-<connection>
-  <name>_listener</name>
-  <deployRequirement>
-    <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-    <resourceType>Local_Interface</resourceType>
-  </deployRequirement>
-  <internalEndpoint>
-    <portName>info_out_data_listener</portName>
-    <provider>true</provider>
-    <kind>Facet</kind>
-    <instance xmi:idref="ReceiverComponentInstance" />
-  </internalEndpoint>
-  <internalEndpoint>
-    <portName>push_consumer_data_listener</portName>
-    <provider>false</provider>
-    <kind>SimplexReceptacle</kind>
-    <instance xmi:idref="Shapes_ReceiverConnectorInstance" />
-  </internalEndpoint>
-</connection>
-
-<connection>
-  <name>writer_connection</name>
-  <deployRequirement>
-    <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-    <resourceType>Local_Interface</resourceType>
-  </deployRequirement>
-  <internalEndpoint>
-    <portName>info_write_data</portName>
-    <provider>false</provider>
-    <kind>SimplexReceptacle</kind>
-    <instance xmi:idref="SenderComponentInstance" />
-  </internalEndpoint>
-  <internalEndpoint>
-    <portName>supplier_data</portName>
-    <provider>true</provider>
-    <kind>Facet</kind>
-    <instance xmi:idref="Shapes_SenderConnectorInstance" />
-  </internalEndpoint>
-</connection>
-
-<connection>
-  <name>control_connection</name>
-  <internalEndpoint>
-    <portName>control</portName>
-    <provider>false</provider>
-    <kind>SimplexReceptacle</kind>
-    <instance xmi:idref="ControlComponentInstance" />
-  </internalEndpoint>
-  <internalEndpoint>
-    <portName>control</portName>
-    <provider>true</provider>
-    <kind>Facet</kind>
-    <instance xmi:idref="SenderComponentInstance" />
-  </internalEndpoint>
-</connection>
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Deployment/implementation.cdp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Deployment/implementation.cdp
deleted file mode 100644
index da5875f9d89..00000000000
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Deployment/implementation.cdp
+++ /dev/null
@@ -1,52 +0,0 @@
-<!--  -->
-<implementation xmi:id="ControlComponentImplementation">
-  <name>ControlComponentImplementation</name>
-  <source/>
-  <artifact xmi:idref="Control_ExecArtifact" />
-  <artifact xmi:idref="Control_SvntArtifact" />
-  <execParameter>
-    <!-- entrypoint as exec parameter (see 10.6.1) -->
-    <name>component factory</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>create_Shapes_Control_comp_Impl</string>
-      </value>
-    </value>
-  </execParameter>
-  <execParameter>
-    <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>create_Shapes_Control_comp_Servant</string>
-      </value>
-    </value>
-  </execParameter>
-  <execParameter>
-    <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>Shapes_Control_comp_svnt</string>
-      </value>
-    </value>
-  </execParameter>
-  <execParameter>
-    <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>Shapes_Control_comp_exec</string>
-      </value>
-    </value>
-  </execParameter>
-</implementation>
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Deployment/instance.cdp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Deployment/instance.cdp
deleted file mode 100644
index ba80b20e273..00000000000
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Deployment/instance.cdp
+++ /dev/null
@@ -1,63 +0,0 @@
-<!--  -->
-<instance xmi:id="ControlComponentInstance">
-  <name>ControlComponent</name>
-  <node>ControlNode</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="ControlComponentImplementation" />
-  <configProperty>
-    <name>rate</name>
-    <value>
-      <type>
-        <kind>tk_ulong</kind>
-      </type>
-      <value>
-        <ulong>100</ulong>
-      </value>
-    </value>
-  </configProperty>
-  <configProperty>
-    <name>max_x</name>
-    <value>
-      <type>
-        <kind>tk_ushort</kind>
-      </type>
-      <value>
-        <ushort>225</ushort>
-      </value>
-    </value>
-  </configProperty>
-  <configProperty>
-    <name>max_y</name>
-    <value>
-      <type>
-        <kind>tk_ushort</kind>
-      </type>
-      <value>
-        <ushort>250</ushort>
-      </value>
-    </value>
-  </configProperty>
-  <configProperty>
-    <name>max_size</name>
-    <value>
-      <type>
-        <kind>tk_ushort</kind>
-      </type>
-      <value>
-        <ushort>25</ushort>
-      </value>
-    </value>
-  </configProperty>
-  <configProperty>
-    <name>resize_shape</name>
-    <value>
-      <type>
-        <kind>tk_boolean</kind>
-      </type>
-      <value>
-        <boolean>true</boolean>
-      </value>
-    </value>
-  </configProperty>
-</instance>
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.cpp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.cpp
deleted file mode 100644
index 8f34f6c8fca..00000000000
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.cpp
+++ /dev/null
@@ -1,190 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v2.2.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "Shapes_Control_comp_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_Shapes_Control_comp_Impl
-{
-
-  /**
-   * Component Executor Implementation Class: Control_comp_exec_i
-   */
-
-  Control_comp_exec_i::Control_comp_exec_i (void)
-    : rate_ (0)
-      , max_x_ (0)
-      , max_y_ (0)
-      , max_size_ (0)
-      , resize_shape_ (false)
-  {
-  }
-
-  Control_comp_exec_i::~Control_comp_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Control_comp_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  // Component attributes and port operations.
-
-  ::CORBA::ULong
-  Control_comp_exec_i::rate (void)
-  {
-    return this->rate_;
-  }
-
-  void
-  Control_comp_exec_i::rate (
-    const ::CORBA::ULong rate)
-  {
-    this->rate_ = rate;
-  }
-
-  ::CORBA::UShort
-  Control_comp_exec_i::max_x (void)
-  {
-    return this->max_x_;
-  }
-
-  void
-  Control_comp_exec_i::max_x (
-    const ::CORBA::UShort max_x)
-  {
-    this->max_x_ = max_x;
-  }
-
-  ::CORBA::UShort
-  Control_comp_exec_i::max_y (void)
-  {
-    return this->max_y_;
-  }
-
-  void
-  Control_comp_exec_i::max_y (
-    const ::CORBA::UShort max_y)
-  {
-    this->max_y_ = max_y;
-  }
-
-  ::CORBA::UShort
-  Control_comp_exec_i::max_size (void)
-  {
-    return this->max_size_;
-  }
-
-  void
-  Control_comp_exec_i::max_size (
-    const ::CORBA::UShort max_size)
-  {
-    this->max_size_ = max_size;
-  }
-
-  ::CORBA::Boolean
-  Control_comp_exec_i::resize_shape (void)
-  {
-    return this->resize_shape_;
-  }
-
-  void
-  Control_comp_exec_i::resize_shape (
-    const ::CORBA::Boolean resize_shape)
-  {
-    this->resize_shape_ = resize_shape;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Control_comp_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Shapes::CCM_Control_comp_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Control_comp_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Control_comp_exec_i::ccm_activate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Control_comp_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Control_comp_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SHAPES_CONTROL_COMP_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Shapes_Control_comp_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Control_comp_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.h b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.h
deleted file mode 100644
index 2a07fae5118..00000000000
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.h
+++ /dev/null
@@ -1,188 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v2.2.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO__________TUTORIAL_CODE_SHAPES_CONTROL_COMP_SHAPES_CONTROL_COMP_EXEC_XHYU6V_H_
-#define CIAO__________TUTORIAL_CODE_SHAPES_CONTROL_COMP_SHAPES_CONTROL_COMP_EXEC_XHYU6V_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Shapes_Control_compEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Shapes_Control_comp_exec_export.h"
-#include "tao/LocalObject.h"
-
-/// Namespace for implementation of Shapes::Control_comp component
-namespace CIAO_Shapes_Control_comp_Impl
-{
-
-  /// Component Executor Implementation Class: Control_comp_exec_i
-  class Control_comp_exec_i
-    : public virtual Control_comp_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    /// Constructor
-    Control_comp_exec_i (void);
-    /// Destructor
-    virtual ~Control_comp_exec_i (void);
-
-    /** @name Supported operations and attributes. */
-    //@{
-
-    //@}
-
-    /** @name Component attributes and port operations. */
-    //@{
-
-    /// Getter for rate attribute
-    /// @return value of rate attribute
-    virtual ::CORBA::ULong rate (
-      void);
-
-    /// Setter for rate attribute
-    /// @param[in] rate - New value for rate attribute
-    virtual void rate (
-      ::CORBA::ULong rate);
-
-    /// Getter for max_x attribute
-    /// @return value of max_x attribute
-    virtual ::CORBA::UShort max_x (
-      void);
-
-    /// Setter for max_x attribute
-    /// @param[in] max_x - New value for max_x attribute
-    virtual void max_x (
-      ::CORBA::UShort max_x);
-
-    /// Getter for max_y attribute
-    /// @return value of max_y attribute
-    virtual ::CORBA::UShort max_y (
-      void);
-
-    /// Setter for max_y attribute
-    /// @param[in] max_y - New value for max_y attribute
-    virtual void max_y (
-      ::CORBA::UShort max_y);
-
-    /// Getter for max_size attribute
-    /// @return value of max_size attribute
-    virtual ::CORBA::UShort max_size (
-      void);
-
-    /// Setter for max_size attribute
-    /// @param[in] max_size - New value for max_size attribute
-    virtual void max_size (
-      ::CORBA::UShort max_size);
-
-    /// Getter for resize_shape attribute
-    /// @return value of resize_shape attribute
-    virtual ::CORBA::Boolean resize_shape (
-      void);
-
-    /// Setter for resize_shape attribute
-    /// @param[in] resize_shape - New value for resize_shape attribute
-    virtual void resize_shape (
-      ::CORBA::Boolean resize_shape);
-    //@}
-
-    /** @name Session component operations */
-    //@{
-
-    /// Setter for container context for this component
-    /// @param[in] ctx - Container context
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-
-    /// Component state change method to configuration_complete state
-    virtual void configuration_complete (void);
-
-    /// Component state change method to activated state
-    virtual void ccm_activate (void);
-
-    /// Component state change method to passivated state
-    virtual void ccm_passivate (void);
-
-    /// Component state change method to removed state
-    virtual void ccm_remove (void);
-    //@}
-
-    /** @name User defined public operations. */
-    //@{
-
-    //@}
-
-  private:
-    /// Context for component instance. Used for all middleware communication
-    ::Shapes::CCM_Control_comp_Context_var ciao_context_;
-
-    /** @name Component attributes. */
-    //@{
-
-    /// Class member storing value of rate attribute
-    ::CORBA::ULong rate_;
-
-    /// Class member storing value of max_x attribute
-    ::CORBA::UShort max_x_;
-
-    /// Class member storing value of max_y attribute
-    ::CORBA::UShort max_y_;
-
-    /// Class member storing value of max_size attribute
-    ::CORBA::UShort max_size_;
-
-    /// Class member storing value of resize_shape attribute
-    ::CORBA::Boolean resize_shape_;
-    //@}
-
-    /** @name Component facets. */
-    //@{
-    //@}
-
-    /** @name User defined members. */
-    //@{
-
-    //@}
-
-    /** @name User defined private operations. */
-    //@{
-
-    //@}
-
-    /// Get the ACE_Reactor
-    /// @return non-owning pointer to reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  /// Factory method and library entry point used by the middleware
-  /// @return new component instance
-  extern "C" SHAPES_CONTROL_COMP_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Shapes_Control_comp_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.cpp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.cpp
deleted file mode 100644
index 88276924d3e..00000000000
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.cpp
+++ /dev/null
@@ -1,204 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v2.2.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "Shapes_Receiver_comp_exec.h"
-
-namespace CIAO_Shapes_Receiver_comp_Impl
-{
-
-  /**
-   * Facet Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  info_out_data_listener_exec_i::info_out_data_listener_exec_i (
-        ::Shapes::CCM_Receiver_comp_Context_ptr ctx)
-    : ciao_context_ (
-        ::Shapes::CCM_Receiver_comp_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::Shapes::ShapeType_conn::Listener
-
-  void
-  info_out_data_listener_exec_i::on_one_data (
-    const ::ShapeType & /* datum */,
-    const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_data_listener_exec_i::on_many_data (
-    const ::ShapeTypeSeq & /* data */,
-    const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_status_exec_i
-   */
-
-  info_out_status_exec_i::info_out_status_exec_i (
-        ::Shapes::CCM_Receiver_comp_Context_ptr ctx)
-    : ciao_context_ (
-        ::Shapes::CCM_Receiver_comp_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_status_exec_i::~info_out_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_out_status_exec_i::on_requested_deadline_missed (
-    ::DDS::DataReader_ptr /* the_reader */,
-    const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_status_exec_i::on_sample_lost (
-    ::DDS::DataReader_ptr /* the_reader */,
-    const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_comp_exec_i
-   */
-
-  Receiver_comp_exec_i::Receiver_comp_exec_i (void)
-  {
-  }
-
-  Receiver_comp_exec_i::~Receiver_comp_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-
-  // Component attributes and port operations.
-
-  ::Shapes::ShapeType_conn::CCM_Listener_ptr
-  Receiver_comp_exec_i::get_info_out_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ()))
-      {
-        info_out_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_data_listener_exec_i (
-            this->ciao_context_.in ()),
-            ::Shapes::ShapeType_conn::CCM_Listener::_nil ());
-
-          this->ciao_info_out_data_listener_ = tmp;
-      }
-
-    return
-      ::Shapes::ShapeType_conn::CCM_Listener::_duplicate (
-        this->ciao_info_out_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_comp_exec_i::get_info_out_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ()))
-      {
-        info_out_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_out_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_out_status_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_comp_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Shapes::CCM_Receiver_comp_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_comp_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_comp_exec_i::ccm_activate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_comp_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_comp_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SHAPES_RECEIVER_COMP_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Shapes_Receiver_comp_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_comp_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.h b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.h
deleted file mode 100644
index dfe4eb7b1d8..00000000000
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.h
+++ /dev/null
@@ -1,199 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v2.2.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO__________TUTORIAL_CODE_SHAPES_RECEIVER_COMP_SHAPES_RECEIVER_COMP_EXEC_FFZ1QM_H_
-#define CIAO__________TUTORIAL_CODE_SHAPES_RECEIVER_COMP_SHAPES_RECEIVER_COMP_EXEC_FFZ1QM_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Shapes_Receiver_compEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Shapes_Receiver_comp_exec_export.h"
-#include "tao/LocalObject.h"
-
-/// Namespace for implementation of Shapes::Receiver_comp component
-namespace CIAO_Shapes_Receiver_comp_Impl
-{
-
-  ///  Executor implementation class for info_out_data_listener facet
-  class info_out_data_listener_exec_i
-    : public virtual ::Shapes::ShapeType_conn::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    /// Constructor
-    /// @param[in] ctx - Container context
-    info_out_data_listener_exec_i (
-      ::Shapes::CCM_Receiver_comp_Context_ptr ctx);
-    /// Destructor
-    virtual ~info_out_data_listener_exec_i (void);
-
-    /** @name Operations and attributes from Shapes::ShapeType_conn::Listener */
-    //@{
-
-    virtual
-    void on_one_data (
-      const ::ShapeType & datum,
-      const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (
-      const ::ShapeTypeSeq & data,
-      const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    /// Context for component instance. Used for all middleware communication.
-    ::Shapes::CCM_Receiver_comp_Context_var ciao_context_;
-  };
-
-  ///  Executor implementation class for info_out_status facet
-  class info_out_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    /// Constructor
-    /// @param[in] ctx - Container context
-    info_out_status_exec_i (
-      ::Shapes::CCM_Receiver_comp_Context_ptr ctx);
-    /// Destructor
-    virtual ~info_out_status_exec_i (void);
-
-    /** @name Operations and attributes from CCM_DDS::PortStatusListener */
-    //@{
-
-    virtual
-    void on_requested_deadline_missed (
-      ::DDS::DataReader_ptr the_reader,
-      const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (
-      ::DDS::DataReader_ptr the_reader,
-      const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    /// Context for component instance. Used for all middleware communication.
-    ::Shapes::CCM_Receiver_comp_Context_var ciao_context_;
-  };
-
-  /// Component Executor Implementation Class: Receiver_comp_exec_i
-  class Receiver_comp_exec_i
-    : public virtual Receiver_comp_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    /// Constructor
-    Receiver_comp_exec_i (void);
-    /// Destructor
-    virtual ~Receiver_comp_exec_i (void);
-
-    /** @name Supported operations and attributes. */
-    //@{
-
-    //@}
-
-    /** @name Component attributes and port operations. */
-    //@{
-
-    /// Factory method and getter for info_out_data_listener facet
-    /// @return existing instance of facet if one exists, else creates one
-    virtual ::Shapes::ShapeType_conn::CCM_Listener_ptr
-    get_info_out_data_listener (void);
-
-    /// Factory method and getter for info_out_status facet
-    /// @return existing instance of facet if one exists, else creates one
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_status (void);
-    //@}
-
-    /** @name Session component operations */
-    //@{
-
-    /// Setter for container context for this component
-    /// @param[in] ctx - Container context
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-
-    /// Component state change method to configuration_complete state
-    virtual void configuration_complete (void);
-
-    /// Component state change method to activated state
-    virtual void ccm_activate (void);
-
-    /// Component state change method to passivated state
-    virtual void ccm_passivate (void);
-
-    /// Component state change method to removed state
-    virtual void ccm_remove (void);
-    //@}
-
-    /** @name User defined public operations. */
-    //@{
-
-    //@}
-
-  private:
-    /// Context for component instance. Used for all middleware communication
-    ::Shapes::CCM_Receiver_comp_Context_var ciao_context_;
-
-    /** @name Component attributes. */
-    //@{
-    //@}
-
-    /** @name Component facets. */
-    //@{
-
-    /// Object reference to info_out_data_listener facet
-    ::Shapes::ShapeType_conn::CCM_Listener_var ciao_info_out_data_listener_;
-
-    /// Object reference to info_out_status facet
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_;
-    //@}
-
-    /** @name User defined members. */
-    //@{
-
-    //@}
-
-    /** @name User defined private operations. */
-    //@{
-
-    //@}
-  };
-
-  /// Factory method and library entry point used by the middleware
-  /// @return new component instance
-  extern "C" SHAPES_RECEIVER_COMP_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Shapes_Receiver_comp_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.cpp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.cpp
deleted file mode 100644
index a27e899cf0a..00000000000
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.cpp
+++ /dev/null
@@ -1,152 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v2.2.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "Shapes_Sender_comp_exec.h"
-
-namespace CIAO_Shapes_Sender_comp_Impl
-{
-
-  /**
-   * Facet Executor Implementation Class: control_exec_i
-   */
-
-  control_exec_i::control_exec_i (
-        ::Shapes::CCM_Sender_comp_Context_ptr ctx)
-    : ciao_context_ (
-        ::Shapes::CCM_Sender_comp_Context::_duplicate (ctx))
-  {
-  }
-
-  control_exec_i::~control_exec_i (void)
-  {
-  }
-
-  // Operations from ::Shapes::Control_obj
-
-  ::Shapes::ReturnStatus
-  control_exec_i::setSize (
-    ::CORBA::UShort /* size */)
-  {
-    /* Your code here. */
-    return static_cast< ::Shapes::ReturnStatus> (0UL);
-  }
-
-  ::Shapes::ReturnStatus
-  control_exec_i::setLocation (
-    ::CORBA::UShort /* x */,
-    ::CORBA::UShort /* y */)
-  {
-    /* Your code here. */
-    return static_cast< ::Shapes::ReturnStatus> (0UL);
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_comp_exec_i
-   */
-
-  Sender_comp_exec_i::Sender_comp_exec_i (void)
-  {
-  }
-
-  Sender_comp_exec_i::~Sender_comp_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-
-  // Component attributes and port operations.
-
-  ::Shapes::CCM_Control_obj_ptr
-  Sender_comp_exec_i::get_control (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_control_.in ()))
-      {
-        control_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          control_exec_i (
-            this->ciao_context_.in ()),
-            ::Shapes::CCM_Control_obj::_nil ());
-
-          this->ciao_control_ = tmp;
-      }
-
-    return
-      ::Shapes::CCM_Control_obj::_duplicate (
-        this->ciao_control_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_comp_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Shapes::CCM_Sender_comp_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_comp_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_comp_exec_i::ccm_activate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_comp_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_comp_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SHAPES_SENDER_COMP_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Shapes_Sender_comp_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_comp_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.h b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.h
deleted file mode 100644
index 86fe2659cc0..00000000000
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.h
+++ /dev/null
@@ -1,158 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v2.2.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO__________TUTORIAL_CODE_SHAPES_SENDER_COMP_SHAPES_SENDER_COMP_EXEC_V6KYIS_H_
-#define CIAO__________TUTORIAL_CODE_SHAPES_SENDER_COMP_SHAPES_SENDER_COMP_EXEC_V6KYIS_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Shapes_Sender_compEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Shapes_Sender_comp_exec_export.h"
-#include "tao/LocalObject.h"
-
-/// Namespace for implementation of Shapes::Sender_comp component
-namespace CIAO_Shapes_Sender_comp_Impl
-{
-
-  ///  Executor implementation class for control facet
-  class control_exec_i
-    : public virtual ::Shapes::CCM_Control_obj,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    /// Constructor
-    /// @param[in] ctx - Container context
-    control_exec_i (
-      ::Shapes::CCM_Sender_comp_Context_ptr ctx);
-    /// Destructor
-    virtual ~control_exec_i (void);
-
-    /** @name Operations and attributes from Shapes::Control_obj */
-    //@{
-
-    virtual
-    ::Shapes::ReturnStatus setSize (
-      ::CORBA::UShort size);
-
-    virtual
-    ::Shapes::ReturnStatus setLocation (
-      ::CORBA::UShort x,
-      ::CORBA::UShort y);
-    //@}
-
-  private:
-    /// Context for component instance. Used for all middleware communication.
-    ::Shapes::CCM_Sender_comp_Context_var ciao_context_;
-  };
-
-  /// Component Executor Implementation Class: Sender_comp_exec_i
-  class Sender_comp_exec_i
-    : public virtual Sender_comp_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    /// Constructor
-    Sender_comp_exec_i (void);
-    /// Destructor
-    virtual ~Sender_comp_exec_i (void);
-
-    /** @name Supported operations and attributes. */
-    //@{
-
-    //@}
-
-    /** @name Component attributes and port operations. */
-    //@{
-
-    /// Factory method and getter for control facet
-    /// @return existing instance of facet if one exists, else creates one
-    virtual ::Shapes::CCM_Control_obj_ptr
-    get_control (void);
-    //@}
-
-    /** @name Session component operations */
-    //@{
-
-    /// Setter for container context for this component
-    /// @param[in] ctx - Container context
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-
-    /// Component state change method to configuration_complete state
-    virtual void configuration_complete (void);
-
-    /// Component state change method to activated state
-    virtual void ccm_activate (void);
-
-    /// Component state change method to passivated state
-    virtual void ccm_passivate (void);
-
-    /// Component state change method to removed state
-    virtual void ccm_remove (void);
-    //@}
-
-    /** @name User defined public operations. */
-    //@{
-
-    //@}
-
-  private:
-    /// Context for component instance. Used for all middleware communication
-    ::Shapes::CCM_Sender_comp_Context_var ciao_context_;
-
-    /** @name Component attributes. */
-    //@{
-    //@}
-
-    /** @name Component facets. */
-    //@{
-
-    /// Object reference to control facet
-    ::Shapes::CCM_Control_obj_var ciao_control_;
-    //@}
-
-    /** @name User defined members. */
-    //@{
-
-    //@}
-
-    /** @name User defined private operations. */
-    //@{
-
-    //@}
-  };
-
-  /// Factory method and library entry point used by the middleware
-  /// @return new component instance
-  extern "C" SHAPES_SENDER_COMP_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Shapes_Sender_comp_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/images/images.png b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/images/images.png
deleted file mode 100644
index 74c8b80912c..00000000000
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/images/images.png
+++ /dev/null
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/images/system.png b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/images/system.png
deleted file mode 100644
index 244210cd285..00000000000
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/images/system.png
+++ /dev/null